[283945] Prevent EObjects from being passed to a repository

https://bugs.eclipse.org/bugs/show_bug.cgi?id=283945

2 files changed, 2 insertions, 24 deletions

diff --git a/plugins/org.eclipse.emf.cdo.common.db/src/org/eclipse/emf/cdo/common/db/CDOCommonDBUtil.java b/plugins/org.eclipse.emf.cdo.common.db/src/org/eclipse/emf/cdo/common/db/CDOCommonDBUtil.java
index cffacf6fa9..946668bccc 100644
--- a/plugins/org.eclipse.emf.cdo.common.db/src/org/eclipse/emf/cdo/common/db/CDOCommonDBUtil.java
+++ b/plugins/org.eclipse.emf.cdo.common.db/src/org/eclipse/emf/cdo/common/db/CDOCommonDBUtil.java
@@ -11,7 +11,6 @@
  */
 package org.eclipse.emf.cdo.common.db;
 
-import org.eclipse.emf.cdo.common.id.CDOIDProvider;
 import org.eclipse.emf.cdo.common.internal.db.cache.DBRevisionCache;
 import org.eclipse.emf.cdo.common.model.CDOPackageRegistry;
 import org.eclipse.emf.cdo.common.revision.CDOListFactory;
@@ -37,13 +36,11 @@ public final class CDOCommonDBUtil
    * TODO Add all config parameters!
    */
   public static CDORevisionCache createDBCache(IDBAdapter dbAdapter, IDBConnectionProvider dbConnectionProvider,
-      CDOIDProvider idProvider, CDOListFactory listFactory, CDOPackageRegistry packageRegistry,
-      CDORevisionFactory revisionFactory)
+      CDOListFactory listFactory, CDOPackageRegistry packageRegistry, CDORevisionFactory revisionFactory)
   {
     DBRevisionCache cache = new DBRevisionCache();
     cache.setDBAdapter(dbAdapter);
     cache.setDBConnectionProvider(dbConnectionProvider);
-    cache.setIdProvider(idProvider);
     cache.setListFactory(listFactory);
     cache.setPackageRegistry(packageRegistry);
     cache.setRevisionFactory(revisionFactory);
diff --git a/plugins/org.eclipse.emf.cdo.common.db/src/org/eclipse/emf/cdo/common/internal/db/cache/DBRevisionCache.java b/plugins/org.eclipse.emf.cdo.common.db/src/org/eclipse/emf/cdo/common/internal/db/cache/DBRevisionCache.java
index e153ea6d14..3571fd24b4 100644
--- a/plugins/org.eclipse.emf.cdo.common.db/src/org/eclipse/emf/cdo/common/internal/db/cache/DBRevisionCache.java
+++ b/plugins/org.eclipse.emf.cdo.common.db/src/org/eclipse/emf/cdo/common/internal/db/cache/DBRevisionCache.java
@@ -12,7 +12,6 @@
 package org.eclipse.emf.cdo.common.internal.db.cache;
 
 import org.eclipse.emf.cdo.common.id.CDOID;
-import org.eclipse.emf.cdo.common.id.CDOIDProvider;
 import org.eclipse.emf.cdo.common.internal.db.AbstractQueryStatement;
 import org.eclipse.emf.cdo.common.internal.db.AbstractUpdateStatement;
 import org.eclipse.emf.cdo.common.internal.db.DBRevisionCacheUtil;
@@ -57,8 +56,6 @@ import java.util.List;
  */
 public class DBRevisionCache extends Lifecycle implements CDORevisionCache
 {
-  private CDOIDProvider idProvider;
-
   private CDOListFactory listFactory;
 
   private CDOPackageRegistry packageRegistry;
@@ -73,16 +70,6 @@ public class DBRevisionCache extends Lifecycle implements CDORevisionCache
   {
   }
 
-  public CDOIDProvider getIdProvider()
-  {
-    return idProvider;
-  }
-
-  public void setIdProvider(CDOIDProvider idProvider)
-  {
-    this.idProvider = idProvider;
-  }
-
   public CDOListFactory getListFactory()
   {
     return listFactory;
@@ -602,7 +589,7 @@ public class DBRevisionCache extends Lifecycle implements CDORevisionCache
         if (revision.isResourceNode())
         {
           preparedStatement.setString(6, DBRevisionCacheUtil.getResourceNodeName(revision));
-          CDOID containerID = (CDOID)revision.getContainerID();
+          CDOID containerID = revision.getContainerID();
           preparedStatement.setString(7, containerID.toURIFragment());
         }
         else
@@ -712,7 +699,6 @@ public class DBRevisionCache extends Lifecycle implements CDORevisionCache
   protected void doBeforeActivate() throws Exception
   {
     super.doBeforeActivate();
-    checkState(idProvider, "idProvider"); //$NON-NLS-1$
     checkState(listFactory, "listFactory");//$NON-NLS-1$
     checkState(packageRegistry, "packageRegistry"); //$NON-NLS-1$
     checkState(revisionFactory, "revisionFactory"); //$NON-NLS-1$
@@ -836,11 +822,6 @@ public class DBRevisionCache extends Lifecycle implements CDORevisionCache
       {
         return packageRegistry;
       }
-
-      public CDOIDProvider getIDProvider()
-      {
-        return idProvider;
-      }
     };
   }