You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by aa...@apache.org on 2009/11/16 14:23:37 UTC
svn commit: r880740 - in
/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src:
main/java/org/apache/cayenne/cache/ main/java/org/apache/cayenne/query/
main/java/org/apache/cayenne/remote/ test/java/org/apache/cayenne/query/
Author: aadamchik
Date: Mon Nov 16 13:23:37 2009
New Revision: 880740
URL: http://svn.apache.org/viewvc?rev=880740&view=rev
Log:
CAY-1310 Remove everything deprecated in 3.0
second pass, more to go
Modified:
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/cache/NestedQueryCache.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/QueryMetadata.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/remote/IncrementalQuery.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/test/java/org/apache/cayenne/query/EJBQLQueryTest.java
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/cache/NestedQueryCache.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/cache/NestedQueryCache.java?rev=880740&r1=880739&r2=880740&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/cache/NestedQueryCache.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/cache/NestedQueryCache.java Mon Nov 16 13:23:37 2009
@@ -157,14 +157,6 @@
return mdDelegate.getFetchOffset();
}
- /**
- * @deprecated since 3.0
- */
- @Deprecated
- public int getFetchStartIndex() {
- return mdDelegate.getFetchStartIndex();
- }
-
public ObjEntity getObjEntity() {
return mdDelegate.getObjEntity();
}
@@ -201,10 +193,6 @@
return mdDelegate.isRefreshingObjects();
}
- public boolean isResolvingInherited() {
- return mdDelegate.isResolvingInherited();
- }
-
public int getStatementFetchSize() {
return mdDelegate.getStatementFetchSize();
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/QueryMetadata.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/QueryMetadata.java?rev=880740&r1=880739&r2=880740&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/QueryMetadata.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/QueryMetadata.java Mon Nov 16 13:23:37 2009
@@ -78,30 +78,6 @@
public static final boolean FETCHING_DATA_ROWS_DEFAULT = false;
/**
- * @deprecated since 3.0
- */
- @Deprecated
- public static final String REFRESHING_OBJECTS_PROPERTY = "cayenne.GenericSelectQuery.refreshingObjects";
-
- /**
- * @deprecated since 3.0
- */
- @Deprecated
- public static final boolean REFRESHING_OBJECTS_DEFAULT = true;
-
- /**
- * @deprecated since 3.0. Inheritance resolving is not optional anymore.
- */
- @Deprecated
- public static final String RESOLVING_INHERITED_PROPERTY = "cayenne.GenericSelectQuery.resolvingInherited";
-
- /**
- * @deprecated since 3.0. Inheritance resolving is not optional anymore.
- */
- @Deprecated
- public static final boolean RESOLVING_INHERITED_DEFAULT = true;
-
- /**
* @since 3.0
*/
public static final String CACHE_STRATEGY_PROPERTY = "cayenne.GenericSelectQuery.cacheStrategy";
@@ -191,15 +167,6 @@
boolean isRefreshingObjects();
/**
- * Returns true if objects fetched via this query should be fully resolved according
- * to the inheritance hierarchy.
- *
- * @deprecated since 3.0. Inheritance resolving is not optional anymore.
- */
- @Deprecated
- boolean isResolvingInherited();
-
- /**
* Returns query page size. Page size is a hint to Cayenne that query should be
* performed page by page, instead of retrieving all results at once. If the value
* returned is less than or equal to zero, no paging should occur.
@@ -213,11 +180,6 @@
*/
int getFetchOffset();
- /**
- * @deprecated since 3.0, renamed to {@link #getFetchOffset()}.
- */
- @Deprecated
- int getFetchStartIndex();
/**
* Returns the limit on the maximum number of records that can be returned by this
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/remote/IncrementalQuery.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/remote/IncrementalQuery.java?rev=880740&r1=880739&r2=880740&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/remote/IncrementalQuery.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/remote/IncrementalQuery.java Mon Nov 16 13:23:37 2009
@@ -102,14 +102,6 @@
return metadata.getFetchOffset();
}
- /**
- * @deprecated since 3.0
- */
- @Deprecated
- public int getFetchStartIndex() {
- return metadata.getFetchStartIndex();
- }
-
public ObjEntity getObjEntity() {
return metadata.getObjEntity();
}
@@ -138,22 +130,10 @@
return metadata.isFetchingDataRows();
}
- /**
- * @deprecated since 3.0
- */
- @Deprecated
public boolean isRefreshingObjects() {
return metadata.isRefreshingObjects();
}
- /**
- * @deprecated since 3.0. Inheritance resolving is not optional anymore.
- */
- @Deprecated
- public boolean isResolvingInherited() {
- return metadata.isResolvingInherited();
- }
-
public int getStatementFetchSize() {
return metadata.getStatementFetchSize();
}
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=880740&r1=880739&r2=880740&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 Mon Nov 16 13:23:37 2009
@@ -106,14 +106,6 @@
return metadata.getFetchOffset();
}
- /**
- * @deprecated since 3.0
- */
- @Deprecated
- public int getFetchStartIndex() {
- return metadata.getFetchStartIndex();
- }
-
public ObjEntity getObjEntity() {
return metadata.getObjEntity();
}
@@ -146,10 +138,6 @@
return metadata.isRefreshingObjects();
}
- public boolean isResolvingInherited() {
- return metadata.isResolvingInherited();
- }
-
public int getStatementFetchSize() {
return metadata.getStatementFetchSize();
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/query/EJBQLQueryTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/query/EJBQLQueryTest.java?rev=880740&r1=880739&r2=880740&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/query/EJBQLQueryTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/query/EJBQLQueryTest.java Mon Nov 16 13:23:37 2009
@@ -186,7 +186,6 @@
assertFalse(md.isFetchingDataRows());
assertTrue(md.isRefreshingObjects());
- assertTrue(md.isResolvingInherited());
assertEquals(QueryCacheStrategy.NO_CACHE, md.getCacheStrategy());
}