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 13:41:30 UTC
svn commit: r880730 [2/2] - in /cayenne/main/trunk/framework:
cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/
cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/types/
cayenne-jdk1.5-unpublished/src/main/java/org/apache/cay...
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=880730&r1=880729&r2=880730&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 12:41:26 2009
@@ -36,48 +36,6 @@
public interface QueryMetadata {
/**
- * A cache policy that disables caching of query results.
- *
- * @deprecated since 3.0 use {@link QueryCacheStrategy} enum.
- */
- @Deprecated
- public static final String NO_CACHE = "nocache";
-
- /**
- * A cache policy ruling that query results shall be cached separately for each
- * DataContext.
- *
- * @deprecated since 3.0 use {@link QueryCacheStrategy} enum.
- */
- @Deprecated
- public static final String LOCAL_CACHE = "localcache";
-
- /**
- * Same as {@link #LOCAL_CACHE}, only forcing any current cache expiration.
- *
- * @deprecated since 3.0 use {@link QueryCacheStrategy} enum.
- */
- @Deprecated
- public static final String LOCAL_CACHE_REFRESH = "localcache_refresh";
-
- /**
- * A cache policy ruling that query results shall be stored in a shared cache
- * accessible by all DataContexts.
- *
- * @deprecated since 3.0 use {@link QueryCacheStrategy} enum.
- */
- @Deprecated
- public static final String SHARED_CACHE = "sharedcache";
-
- /**
- * Same as {@link #SHARED_CACHE}, only forcing any current cache expiration.
- *
- * @deprecated since 3.0 use {@link QueryCacheStrategy} enum.
- */
- @Deprecated
- public static final String SHARED_CACHE_REFRESH = "sharedcache_refresh";
-
- /**
* Defines the name of the property for the query {@link #getFetchLimit() fetch limit}
* .
*/
@@ -144,12 +102,6 @@
public static final boolean RESOLVING_INHERITED_DEFAULT = true;
/**
- * @deprecated since 3.0 use {@value #CACHE_STRATEGY_PROPERTY}
- */
- @Deprecated
- public static final String CACHE_POLICY_PROPERTY = "cayenne.GenericSelectQuery.cachePolicy";
-
- /**
* @since 3.0
*/
public static final String CACHE_STRATEGY_PROPERTY = "cayenne.GenericSelectQuery.cacheStrategy";
@@ -160,12 +112,6 @@
public static final String CACHE_GROUPS_PROPERTY = "cayenne.GenericSelectQuery.cacheGroups";
/**
- * @deprecated since 3.0 use {@link QueryCacheStrategy} enum.
- */
- @Deprecated
- public static final String CACHE_POLICY_DEFAULT = NO_CACHE;
-
- /**
* Defines the name of the property for the query {@link #getStatementFetchSize() fetch
* size}.
*
@@ -206,15 +152,6 @@
*/
DataMap getDataMap();
- /**
- * Returns query cache policy, which can be one of {@link #NO_CACHE},
- * {@link #LOCAL_CACHE}, or {@link #SHARED_CACHE}. NO_CACHE is generally a default
- * policy.
- *
- * @deprecated since 3.0 {@link #getCacheStrategy()} replaces this method.
- */
- @Deprecated
- String getCachePolicy();
/**
* Returns a caching strategy for this query.
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=880730&r1=880729&r2=880730&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 Mon Nov 16 12:41:26 2009
@@ -109,15 +109,6 @@
}
/**
- * @deprecated since 3.0 {@link #getCacheStrategy()} replaces this method.
- */
- @Deprecated
- public String getCachePolicy() {
- return (overrideExists(QueryMetadata.CACHE_POLICY_PROPERTY)) ? (String) overrides
- .get(QueryMetadata.CACHE_POLICY_PROPERTY) : info.getCachePolicy();
- }
-
- /**
* @since 3.0
*/
public QueryCacheStrategy getCacheStrategy() {
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/SQLTemplate.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/SQLTemplate.java?rev=880730&r1=880729&r2=880730&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/SQLTemplate.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/SQLTemplate.java Mon Nov 16 12:41:26 2009
@@ -320,23 +320,6 @@
}
/**
- * @deprecated since 3.0 {@link #getCacheStrategy()} replaces this method.
- */
- @Deprecated
- public String getCachePolicy() {
- return metaData.getCachePolicy();
- }
-
- /**
- * @deprecated since 3.0 {@link #setCacheStrategy(QueryCacheStrategy)} replaces this
- * method.
- */
- @Deprecated
- public void setCachePolicy(String policy) {
- metaData.setCachePolicy(policy);
- }
-
- /**
* @since 3.0
*/
public QueryCacheStrategy getCacheStrategy() {
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/SelectQuery.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/SelectQuery.java?rev=880730&r1=880729&r2=880730&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/SelectQuery.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/SelectQuery.java Mon Nov 16 12:41:26 2009
@@ -497,25 +497,6 @@
}
/**
- * @since 1.1
- * @deprecated since 3.0 {@link #getCacheStrategy()} replaces this method.
- */
- @Deprecated
- public String getCachePolicy() {
- return metaData.getCachePolicy();
- }
-
- /**
- * @since 1.1
- * @deprecated since 3.0 {@link #setCacheStrategy(QueryCacheStrategy)} replaces this
- * method.
- */
- @Deprecated
- public void setCachePolicy(String policy) {
- metaData.setCachePolicy(policy);
- }
-
- /**
* @since 3.0
*/
public QueryCacheStrategy getCacheStrategy() {
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=880730&r1=880729&r2=880730&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 12:41:26 2009
@@ -80,14 +80,6 @@
}
/**
- * @deprecated since 3.0 in favor of 'getCacheStrategy'.
- */
- @Deprecated
- public String getCachePolicy() {
- return metadata.getCachePolicy();
- }
-
- /**
* @since 3.0
*/
public QueryCacheStrategy getCacheStrategy() {
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=880730&r1=880729&r2=880730&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 12:41:26 2009
@@ -86,14 +86,6 @@
return metadata.getCacheGroups();
}
- /**
- * @deprecated since 3.0 in favor of 'getCacheStrategy'.
- */
- @Deprecated
- public String getCachePolicy() {
- return metadata.getCachePolicy();
- }
-
public QueryCacheStrategy getCacheStrategy() {
return metadata.getCacheStrategy();
}
@@ -230,11 +222,6 @@
}
@Override
- public String getCachePolicy() {
- return query.getCachePolicy();
- }
-
- @Override
public int getFetchLimit() {
return query.getFetchLimit();
}
@@ -338,16 +325,11 @@
}
@Override
- public void setCacheGroups(String[] cachGroups) {
+ public void setCacheGroups(String... cachGroups) {
query.setCacheGroups(cachGroups);
}
@Override
- public void setCachePolicy(String policy) {
- query.setCachePolicy(policy);
- }
-
- @Override
public void setDistinct(boolean distinct) {
query.setDistinct(distinct);
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/remote/RangeQuery.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/remote/RangeQuery.java?rev=880730&r1=880729&r2=880730&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/remote/RangeQuery.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/remote/RangeQuery.java Mon Nov 16 12:41:26 2009
@@ -113,14 +113,6 @@
}
/**
- * @deprecated since 3.0 in favor of 'getCacheStrategy'.
- */
- @Deprecated
- public String getCachePolicy() {
- return QueryMetadata.NO_CACHE;
- }
-
- /**
* @since 3.0
*/
public QueryCacheStrategy getCacheStrategy() {
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/art/StringET1ExtendedType.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/art/StringET1ExtendedType.java?rev=880730&r1=880729&r2=880730&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/art/StringET1ExtendedType.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/art/StringET1ExtendedType.java Mon Nov 16 12:41:26 2009
@@ -23,8 +23,6 @@
import java.sql.ResultSet;
import org.apache.cayenne.access.types.ExtendedType;
-import org.apache.cayenne.map.DbAttribute;
-import org.apache.cayenne.validation.ValidationResult;
public class StringET1ExtendedType implements ExtendedType {
@@ -57,16 +55,4 @@
statement.setNull(pos, type);
}
}
-
- /**
- * @deprecated
- */
- public boolean validateProperty(
- Object source,
- String property,
- Object value,
- DbAttribute dbAttribute,
- ValidationResult validationResult) {
- return true;
- }
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CayenneContextPaginatedListCachingTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CayenneContextPaginatedListCachingTest.java?rev=880730&r1=880729&r2=880730&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CayenneContextPaginatedListCachingTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CayenneContextPaginatedListCachingTest.java Mon Nov 16 12:41:26 2009
@@ -21,9 +21,9 @@
import java.util.List;
import org.apache.cayenne.access.ClientServerChannel;
-import org.apache.cayenne.query.Ordering;
-import org.apache.cayenne.query.QueryMetadata;
+import org.apache.cayenne.query.QueryCacheStrategy;
import org.apache.cayenne.query.SelectQuery;
+import org.apache.cayenne.query.SortOrder;
import org.apache.cayenne.remote.ClientChannel;
import org.apache.cayenne.remote.service.LocalConnection;
import org.apache.cayenne.testdo.mt.ClientMtTable1;
@@ -59,9 +59,9 @@
createTestData("prepare");
SelectQuery query = new SelectQuery(ClientMtTable1.class);
- query.addOrdering(ClientMtTable1.GLOBAL_ATTRIBUTE1_PROPERTY, Ordering.ASC);
+ query.addOrdering(ClientMtTable1.GLOBAL_ATTRIBUTE1_PROPERTY, SortOrder.ASCENDING);
query.setPageSize(3);
- query.setCachePolicy(QueryMetadata.LOCAL_CACHE);
+ query.setCacheStrategy(QueryCacheStrategy.LOCAL_CACHE);
List<?> result1 = context.performQuery(query);
assertEquals(7, result1.size());
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CayenneContextWithDataContextTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CayenneContextWithDataContextTest.java?rev=880730&r1=880729&r2=880730&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CayenneContextWithDataContextTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CayenneContextWithDataContextTest.java Mon Nov 16 12:41:26 2009
@@ -28,7 +28,7 @@
import org.apache.cayenne.map.LifecycleEvent;
import org.apache.cayenne.query.ObjectIdQuery;
import org.apache.cayenne.query.Ordering;
-import org.apache.cayenne.query.QueryMetadata;
+import org.apache.cayenne.query.QueryCacheStrategy;
import org.apache.cayenne.query.SelectQuery;
import org.apache.cayenne.reflect.LifecycleCallbackRegistry;
import org.apache.cayenne.remote.ClientChannel;
@@ -72,7 +72,7 @@
CayenneContext clientContext = new CayenneContext(channel);
SelectQuery query = new SelectQuery(ClientMtTable1.class);
- query.setCachePolicy(QueryMetadata.LOCAL_CACHE);
+ query.setCacheStrategy(QueryCacheStrategy.LOCAL_CACHE);
assertEquals(0, clientContext.getQueryCache().size());
assertEquals(0, context.getQueryCache().size());
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextPaginatedQueryTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextPaginatedQueryTest.java?rev=880730&r1=880729&r2=880730&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextPaginatedQueryTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextPaginatedQueryTest.java Mon Nov 16 12:41:26 2009
@@ -21,9 +21,9 @@
import java.util.List;
import org.apache.art.Artist;
-import org.apache.cayenne.query.Ordering;
-import org.apache.cayenne.query.QueryMetadata;
+import org.apache.cayenne.query.QueryCacheStrategy;
import org.apache.cayenne.query.SelectQuery;
+import org.apache.cayenne.query.SortOrder;
import org.apache.cayenne.unit.CayenneCase;
public class DataContextPaginatedQueryTest extends CayenneCase {
@@ -35,8 +35,8 @@
DataContext context = createDataContext();
SelectQuery query = new SelectQuery(Artist.class);
- query.addOrdering(Artist.ARTIST_NAME_PROPERTY, Ordering.ASC);
- query.setCachePolicy(QueryMetadata.LOCAL_CACHE);
+ query.addOrdering(Artist.ARTIST_NAME_PROPERTY, SortOrder.ASCENDING);
+ query.setCacheStrategy(QueryCacheStrategy.LOCAL_CACHE);
query.setPageSize(5);
List<?> results1 = context.performQuery(query);
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextPrefetchTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextPrefetchTest.java?rev=880730&r1=880729&r2=880730&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextPrefetchTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextPrefetchTest.java Mon Nov 16 12:41:26 2009
@@ -41,7 +41,7 @@
import org.apache.cayenne.map.ObjRelationship;
import org.apache.cayenne.query.Ordering;
import org.apache.cayenne.query.PrefetchTreeNode;
-import org.apache.cayenne.query.QueryMetadata;
+import org.apache.cayenne.query.QueryCacheStrategy;
import org.apache.cayenne.query.SelectQuery;
/**
@@ -517,7 +517,7 @@
SelectQuery q = new SelectQuery("Painting");
q.addPrefetch("toArtist");
q.setName("__testPrefetchToOneSharedCache__" + System.currentTimeMillis());
- q.setCachePolicy(QueryMetadata.SHARED_CACHE);
+ q.setCacheStrategy(QueryCacheStrategy.SHARED_CACHE);
context.performQuery(q);
@@ -554,7 +554,7 @@
SelectQuery q = new SelectQuery("Painting");
q.addPrefetch("toArtist");
q.setName("__testPrefetchToOneLocalCache__" + System.currentTimeMillis());
- q.setCachePolicy(QueryMetadata.LOCAL_CACHE);
+ q.setCacheStrategy(QueryCacheStrategy.LOCAL_CACHE);
context.performQuery(q);
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextRefreshQueryTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextRefreshQueryTest.java?rev=880730&r1=880729&r2=880730&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextRefreshQueryTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextRefreshQueryTest.java Mon Nov 16 12:41:26 2009
@@ -27,9 +27,10 @@
import org.apache.cayenne.ValueHolder;
import org.apache.cayenne.exp.Expression;
import org.apache.cayenne.exp.ExpressionFactory;
-import org.apache.cayenne.query.QueryMetadata;
+import org.apache.cayenne.query.QueryCacheStrategy;
import org.apache.cayenne.query.RefreshQuery;
import org.apache.cayenne.query.SelectQuery;
+import org.apache.cayenne.query.SortOrder;
import org.apache.cayenne.unit.CayenneCase;
public class DataContextRefreshQueryTest extends CayenneCase {
@@ -41,7 +42,7 @@
DataContext context = createDataContext();
SelectQuery q = new SelectQuery(Artist.class);
- q.addOrdering("db:ARTIST_ID", true);
+ q.addOrdering("db:ARTIST_ID", SortOrder.ASCENDING);
List artists = context.performQuery(q);
Artist a1 = (Artist) artists.get(0);
@@ -187,8 +188,8 @@
Painting.PAINTING_TITLE_PROPERTY,
"P2");
SelectQuery q = new SelectQuery(Painting.class, qual);
- q.addOrdering("db:PAINTING_ID", true);
- q.setCachePolicy(QueryMetadata.LOCAL_CACHE);
+ q.addOrdering("db:PAINTING_ID", SortOrder.ASCENDING);
+ q.setCacheStrategy(QueryCacheStrategy.LOCAL_CACHE);
q.setCacheGroups("X");
List paints = context.performQuery(q);
@@ -244,8 +245,8 @@
Painting.PAINTING_TITLE_PROPERTY,
"P2");
SelectQuery q = new SelectQuery(Painting.class, qual);
- q.addOrdering("db:PAINTING_ID", true);
- q.setCachePolicy(QueryMetadata.SHARED_CACHE);
+ q.addOrdering("db:PAINTING_ID", SortOrder.ASCENDING);
+ q.setCacheStrategy(QueryCacheStrategy.SHARED_CACHE);
q.setCacheGroups("X");
List paints = context.performQuery(q);
@@ -301,8 +302,8 @@
Painting.PAINTING_TITLE_PROPERTY,
"P2");
SelectQuery q = new SelectQuery(Painting.class, qual);
- q.addOrdering("db:PAINTING_ID", true);
- q.setCachePolicy(QueryMetadata.LOCAL_CACHE);
+ q.addOrdering("db:PAINTING_ID", SortOrder.ASCENDING);
+ q.setCacheStrategy(QueryCacheStrategy.LOCAL_CACHE);
q.setCacheGroups("X");
List paints = context.performQuery(q);
@@ -356,7 +357,7 @@
DataContext context = createDataContext();
SelectQuery q = new SelectQuery(Artist.class);
- q.addOrdering("db:ARTIST_ID", true);
+ q.addOrdering("db:ARTIST_ID", SortOrder.ASCENDING);
List artists = context.performQuery(q);
Artist a1 = (Artist) artists.get(0);
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataNodeTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataNodeTest.java?rev=880730&r1=880729&r2=880730&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataNodeTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataNodeTest.java Mon Nov 16 12:41:26 2009
@@ -17,7 +17,6 @@
* under the License.
****************************************************************/
-
package org.apache.cayenne.access;
import org.apache.cayenne.dba.JdbcAdapter;
@@ -69,22 +68,15 @@
assertNull(node.getAdapter());
JdbcAdapter a1 = new JdbcAdapter();
- a1.setSupportsFkConstraints(true);
node.setAdapter(a1);
assertSame(a1, node.getAdapter());
assertSame(sorter, node.getEntitySorter());
JdbcAdapter a2 = new JdbcAdapter();
- a2.setSupportsFkConstraints(false);
node.setAdapter(a2);
assertSame(a2, node.getAdapter());
assertSame(sorter, node.getEntitySorter());
-
- // flip FK flag and reset the same adapter, see if sorter has changed
- a2.setSupportsFkConstraints(true);
- node.setAdapter(a2);
- assertSame(sorter, node.getEntitySorter());
}
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/types/MockExtendedType.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/types/MockExtendedType.java?rev=880730&r1=880729&r2=880730&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/types/MockExtendedType.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/types/MockExtendedType.java Mon Nov 16 12:41:26 2009
@@ -23,9 +23,6 @@
import java.sql.PreparedStatement;
import java.sql.ResultSet;
-import org.apache.cayenne.map.DbAttribute;
-import org.apache.cayenne.validation.ValidationResult;
-
public class MockExtendedType implements ExtendedType {
protected Class objectClass;
@@ -42,15 +39,6 @@
return objectClass.getName();
}
- public boolean validateProperty(
- Object source,
- String property,
- Object value,
- DbAttribute dbAttribute,
- ValidationResult validationResult) {
- return true;
- }
-
public void setJdbcObject(
PreparedStatement statement,
Object value,
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/dba/MockDbAdapter.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/dba/MockDbAdapter.java?rev=880730&r1=880729&r2=880730&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/dba/MockDbAdapter.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/dba/MockDbAdapter.java Mon Nov 16 12:41:26 2009
@@ -57,10 +57,6 @@
return null;
}
- public boolean supportsFkConstraints() {
- return false;
- }
-
public boolean supportsUniqueConstraints() {
return false;
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/jira/CAY_207StringType1.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/jira/CAY_207StringType1.java?rev=880730&r1=880729&r2=880730&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/jira/CAY_207StringType1.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/jira/CAY_207StringType1.java Mon Nov 16 12:41:26 2009
@@ -23,53 +23,40 @@
import java.sql.PreparedStatement;
import java.sql.ResultSet;
-import org.apache.cayenne.access.types.AbstractType;
-import org.apache.cayenne.map.DbAttribute;
-import org.apache.cayenne.validation.ValidationResult;
-
-/**
- */
-public class CAY_207StringType1 extends AbstractType {
+import org.apache.cayenne.access.types.ExtendedType;
+
+public class CAY_207StringType1 implements ExtendedType {
- @Override
public String getClassName() {
return CAY_207String1.class.getName();
}
- @Override
public Object materializeObject(CallableStatement rs, int index, int type)
throws Exception {
return new CAY_207String1(rs.getString(index));
}
- @Override
public Object materializeObject(ResultSet rs, int index, int type) throws Exception {
return new CAY_207String1(rs.getString(index));
}
- @Override
public void setJdbcObject(
PreparedStatement statement,
Object value,
int pos,
int type,
- int precision) throws Exception {
+ int scale) throws Exception {
if (value instanceof CAY_207String1) {
value = ((CAY_207String1) value).string;
}
- super.setJdbcObject(statement, value, pos, type, precision);
+ if (scale != -1) {
+ statement.setObject(pos, value, type, scale);
+ }
+ else {
+ statement.setObject(pos, value, type);
+ }
}
- @Override
- public boolean validateProperty(
- Object source,
- String property,
- Object value,
- DbAttribute dbAttribute,
- ValidationResult validationResult) {
- return true;
- }
}
-
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/jira/CAY_207StringType2.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/jira/CAY_207StringType2.java?rev=880730&r1=880729&r2=880730&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/jira/CAY_207StringType2.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/jira/CAY_207StringType2.java Mon Nov 16 12:41:26 2009
@@ -23,53 +23,42 @@
import java.sql.PreparedStatement;
import java.sql.ResultSet;
-import org.apache.cayenne.access.types.AbstractType;
-import org.apache.cayenne.map.DbAttribute;
-import org.apache.cayenne.validation.ValidationResult;
+import org.apache.cayenne.access.types.ExtendedType;
/**
*/
-public class CAY_207StringType2 extends AbstractType {
+public class CAY_207StringType2 implements ExtendedType {
- @Override
public String getClassName() {
return CAY_207String2.class.getName();
}
- @Override
public Object materializeObject(CallableStatement rs, int index, int type)
throws Exception {
return new CAY_207String2(rs.getString(index));
}
- @Override
public Object materializeObject(ResultSet rs, int index, int type) throws Exception {
return new CAY_207String2(rs.getString(index));
}
- @Override
public void setJdbcObject(
PreparedStatement statement,
Object value,
int pos,
int type,
- int precision) throws Exception {
+ int scale) throws Exception {
if (value instanceof CAY_207String2) {
value = ((CAY_207String2) value).string;
}
- super.setJdbcObject(statement, value, pos, type, precision);
+ if (scale != -1) {
+ statement.setObject(pos, value, type, scale);
+ }
+ else {
+ statement.setObject(pos, value, type);
+ }
}
- @Override
- public boolean validateProperty(
- Object source,
- String property,
- Object value,
- DbAttribute dbAttribute,
- ValidationResult validationResult) {
- return true;
- }
}
-