[hibernate-commits] Hibernate SVN: r11457 - trunk/HibernateExt/shards/src/test/org/hibernate/shards.
Author: max.ross
Date: 2007-05-02 02:18:10 -0400 (Wed, 02 May 2007)
New Revision: 11457
Modified:
trunk/HibernateExt/shards/src/test/org/hibernate/shards/ShardDefaultMock.java
Log:
adding merge() to Shard interface
Modified: trunk/HibernateExt/shards/src/test/org/hibernate/shards/ShardDefaultMock.java
===================================================================
---
trunk/HibernateExt/shards/src/test/org/hibernate/shards/ShardDefaultMock.java 2007-05-02
06:17:34 UTC (rev 11456)
+++
trunk/HibernateExt/shards/src/test/org/hibernate/shards/ShardDefaultMock.java 2007-05-02
06:18:10 UTC (rev 11457)
@@ -18,6 +18,11 @@
package org.hibernate.shards;
+import org.hibernate.Criteria;
+import org.hibernate.LockMode;
+import org.hibernate.Query;
+import org.hibernate.classic.Session;
+import org.hibernate.engine.SessionFactoryImplementor;
import org.hibernate.shards.criteria.CriteriaEvent;
import org.hibernate.shards.criteria.CriteriaId;
import org.hibernate.shards.criteria.ShardedCriteria;
@@ -26,12 +31,6 @@
import org.hibernate.shards.query.ShardedQuery;
import org.hibernate.shards.session.OpenSessionEvent;
-import org.hibernate.Criteria;
-import org.hibernate.LockMode;
-import org.hibernate.Query;
-import org.hibernate.classic.Session;
-import org.hibernate.engine.SessionFactoryImplementor;
-
import java.io.Serializable;
import java.util.List;
import java.util.Set;
@@ -148,4 +147,12 @@
public Object uniqueResult(QueryId queryId) {
throw new UnsupportedOperationException();
}
+
+ public void merge(Object object) {
+ throw new UnsupportedOperationException();
+ }
+
+ public void merge(String entityName, Object object) {
+ throw new UnsupportedOperationException();
+ }
}