[251307] [Hibernate] Implement resources in a hierarchical structure

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

3 files changed, 6 insertions, 23 deletions

diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/DBStoreAccessor.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/DBStoreAccessor.java
index ba6d4d9ad8..699050f5ca 100644
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/DBStoreAccessor.java
+++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/DBStoreAccessor.java
@@ -327,12 +327,6 @@ public class DBStoreAccessor extends StoreAccessor implements IDBStoreAccessor
     return revision;
   }
 
-  public CDOID readResourceID(CDOID folderID, String name, long timeStamp)
-  {
-    IMappingStrategy mappingStrategy = getStore().getMappingStrategy();
-    return mappingStrategy.readResourceID(this, folderID, name, timeStamp);
-  }
-
   /**
    * @since 2.0
    */
@@ -489,7 +483,7 @@ public class DBStoreAccessor extends StoreAccessor implements IDBStoreAccessor
         String name = feature.getName();
         int featureID = feature.getFeatureID();
         int type = feature.getType().getTypeID();
-        CDOClassProxy reference = (feature).getReferenceTypeProxy();
+        CDOClassProxy reference = feature.getReferenceTypeProxy();
         String packageURI = reference == null ? null : reference.getPackageURI();
         int classifierID = reference == null ? 0 : reference.getClassifierID();
         boolean many = feature.isMany();
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/HorizontalClassMapping.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/HorizontalClassMapping.java
index ee399334a5..f31b86275e 100644
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/HorizontalClassMapping.java
+++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/HorizontalClassMapping.java
@@ -16,8 +16,8 @@ import org.eclipse.emf.cdo.common.model.CDOFeature;
 import org.eclipse.emf.cdo.common.model.resource.CDOResourceNodeClass;
 import org.eclipse.emf.cdo.common.revision.CDORevision;
 import org.eclipse.emf.cdo.server.IPackageManager;
+import org.eclipse.emf.cdo.server.IRepository;
 import org.eclipse.emf.cdo.server.db.IDBStoreAccessor;
-import org.eclipse.emf.cdo.server.db.IMappingStrategy;
 
 /**
  * @author Eike Stepper
@@ -50,18 +50,17 @@ public class HorizontalClassMapping extends ClassMapping
   @Override
   protected void checkDuplicateResources(IDBStoreAccessor accessor, CDORevision revision) throws IllegalStateException
   {
-    // If auditing is not supported this is checked by a table index (see constructor)
-    IMappingStrategy mappingStrategy = getMappingStrategy();
-    if (mappingStrategy.getStore().getRepository().isSupportingAudits())
+    IRepository repository = getMappingStrategy().getStore().getRepository();
+    if (repository.isSupportingAudits())
     {
-      IPackageManager packageManager = mappingStrategy.getStore().getRepository().getPackageManager();
+      IPackageManager packageManager = repository.getPackageManager();
       CDOResourceNodeClass resourceNodeClass = packageManager.getCDOResourcePackage().getCDOResourceNodeClass();
       CDOFeature resourceNameFeature = resourceNodeClass.getCDONameFeature();
 
       CDOID folderID = (CDOID)revision.getData().getContainerID();
       String name = (String)revision.getData().get(resourceNameFeature, 0);
 
-      if (mappingStrategy.readResourceID(accessor, folderID, name, revision.getCreated()) != null)
+      if (accessor.readResourceID(folderID, name, revision.getCreated()) != null)
       {
         throw new IllegalStateException("Duplicate resource or folder: " + name + " in folder " + folderID);
       }
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/MappingStrategy.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/MappingStrategy.java
index ab45cc4dc4..3fd4193b88 100644
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/MappingStrategy.java
+++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/MappingStrategy.java
@@ -22,8 +22,6 @@ import org.eclipse.emf.cdo.common.model.resource.CDOResourceFolderClass;
 import org.eclipse.emf.cdo.common.model.resource.CDOResourceNodeClass;
 import org.eclipse.emf.cdo.common.model.resource.CDOResourcePackage;
 import org.eclipse.emf.cdo.common.revision.CDORevision;
-import org.eclipse.emf.cdo.server.IStoreAccessor;
-import org.eclipse.emf.cdo.server.StoreUtil;
 import org.eclipse.emf.cdo.server.IStoreAccessor.QueryResourcesContext;
 import org.eclipse.emf.cdo.server.db.IClassMapping;
 import org.eclipse.emf.cdo.server.db.IDBStore;
@@ -310,14 +308,6 @@ public abstract class MappingStrategy extends Lifecycle implements IMappingStrat
     };
   }
 
-  public CDOID readResourceID(IDBStoreAccessor accessor, CDOID folderID, String name, long timeStamp)
-  {
-    IStoreAccessor.QueryResourcesContext.ExactMatch context = StoreUtil.createExactMatchContext(folderID, name,
-        timeStamp);
-    queryResources(accessor, context);
-    return context.getResourceID();
-  }
-
   public void queryResources(IDBStoreAccessor accessor, QueryResourcesContext context)
   {
     CDOID folderID = context.getFolderID();