[234829] [Hibernate] Problem with containingClass of CDOFeatures

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

4 files changed, 26 insertions, 15 deletions

diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/CDOFeature.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/CDOFeature.java
index 4e3f8d6203..35c1cfa9c0 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/CDOFeature.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/CDOFeature.java
@@ -29,8 +29,6 @@ public interface CDOFeature extends CDOModelElement
 
   public CDOClass getReferenceType();
 
-  public CDOClassProxy getReferenceTypeProxy();
-
   public CDOClass getContainingClass();
 
   public CDOPackage getContainingPackage();
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/model/CDOFeatureImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/model/CDOFeatureImpl.java
index 76b2a8a3dd..1c05546d44 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/model/CDOFeatureImpl.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/model/CDOFeatureImpl.java
@@ -51,7 +51,7 @@ public class CDOFeatureImpl extends CDOModelElementImpl implements InternalCDOFe
 
   private boolean containment;
 
-  private CDOClassProxy referenceType;
+  private CDOClassProxy referenceTypeProxy;
 
   public CDOFeatureImpl()
   {
@@ -75,13 +75,13 @@ public class CDOFeatureImpl extends CDOModelElementImpl implements InternalCDOFe
     }
   }
 
-  public CDOFeatureImpl(CDOClass containingClass, int featureID, String name, CDOClassProxy referenceType,
+  public CDOFeatureImpl(CDOClass containingClass, int featureID, String name, CDOClassProxy referenceTypeProxy,
       boolean many, boolean containment)
   {
     super(name);
-    if (referenceType == null)
+    if (referenceTypeProxy == null)
     {
-      throw new IllegalArgumentException("referenceType == null");
+      throw new IllegalArgumentException("referenceTypeProxy == null");
     }
 
     this.containingClass = containingClass;
@@ -89,7 +89,7 @@ public class CDOFeatureImpl extends CDOModelElementImpl implements InternalCDOFe
     type = CDOType.OBJECT;
     this.many = many;
     this.containment = containment;
-    this.referenceType = referenceType;
+    this.referenceTypeProxy = referenceTypeProxy;
     if (MODEL.isEnabled())
     {
       MODEL.format("Created {0}", this);
@@ -125,7 +125,7 @@ public class CDOFeatureImpl extends CDOModelElementImpl implements InternalCDOFe
         PROTOCOL.format("Read reference type: classRef={0}", classRef);
       }
 
-      referenceType = new CDOClassProxy(classRef, containingClass.getContainingPackage().getPackageManager());
+      referenceTypeProxy = new CDOClassProxy(classRef, containingClass.getContainingPackage().getPackageManager());
     }
   }
 
@@ -146,7 +146,7 @@ public class CDOFeatureImpl extends CDOModelElementImpl implements InternalCDOFe
 
     if (isReference())
     {
-      CDOClassRef classRef = referenceType.getClassRef();
+      CDOClassRef classRef = referenceTypeProxy.getClassRef();
       if (PROTOCOL.isEnabled())
       {
         PROTOCOL.format("Writing reference type: classRef={0}", classRef);
@@ -238,28 +238,33 @@ public class CDOFeatureImpl extends CDOModelElementImpl implements InternalCDOFe
 
   public CDOClass getReferenceType()
   {
-    if (referenceType == null)
+    if (referenceTypeProxy == null)
     {
       return null;
     }
 
-    return referenceType.getCdoClass();
+    return referenceTypeProxy.getCdoClass();
+  }
+
+  public void setReferenceType(CDOClassRef cdoClassRef)
+  {
+    referenceTypeProxy = new CDOClassProxy(cdoClassRef, getPackageManager());
   }
 
   public void setReferenceType(CDOClass cdoClass)
   {
-    referenceType = new CDOClassProxy(cdoClass);
+    referenceTypeProxy = new CDOClassProxy(cdoClass);
   }
 
   public CDOClassProxy getReferenceTypeProxy()
   {
-    return referenceType;
+    return referenceTypeProxy;
   }
 
   @Override
   public String toString()
   {
-    return MessageFormat.format("CDOFeature(ID={0}, name={1}, type={2}, referenceType={3})", featureID, getName(),
+    return MessageFormat.format("CDOFeature(ID={0}, name={1}, type={2}, referenceTypeProxy={3})", featureID, getName(),
         getType(), getReferenceTypeProxy());
   }
 
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/InternalCDOFeature.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/InternalCDOFeature.java
index d37bdfad9c..ba48483614 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/InternalCDOFeature.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/InternalCDOFeature.java
@@ -11,6 +11,8 @@
 package org.eclipse.emf.cdo.spi.common;
 
 import org.eclipse.emf.cdo.common.model.CDOClass;
+import org.eclipse.emf.cdo.common.model.CDOClassProxy;
+import org.eclipse.emf.cdo.common.model.CDOClassRef;
 import org.eclipse.emf.cdo.common.model.CDOFeature;
 
 /**
@@ -18,9 +20,14 @@ import org.eclipse.emf.cdo.common.model.CDOFeature;
  */
 public interface InternalCDOFeature extends CDOFeature, InternalCDOModelElement
 {
+  public CDOClassProxy getReferenceTypeProxy();
+
   public void setContainingClass(CDOClass containingClass);
 
   public void setFeatureIndex(int featureIndex);
 
+  public void setReferenceType(CDOClassRef cdoClassRef);
+
+  @Deprecated
   public void setReferenceType(CDOClass cdoClass);
 }
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/DBStoreWriter.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/DBStoreWriter.java
index 7b775d232c..df8ed692ec 100644
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/DBStoreWriter.java
+++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/DBStoreWriter.java
@@ -23,6 +23,7 @@ import org.eclipse.emf.cdo.server.db.IDBStoreWriter;
 import org.eclipse.emf.cdo.server.db.IMappingStrategy;
 import org.eclipse.emf.cdo.server.internal.db.bundle.OM;
 import org.eclipse.emf.cdo.spi.common.InternalCDOClass;
+import org.eclipse.emf.cdo.spi.common.InternalCDOFeature;
 
 import org.eclipse.net4j.db.DBException;
 import org.eclipse.net4j.db.DBUtil;
@@ -176,7 +177,7 @@ public class DBStoreWriter extends DBStoreReader implements IDBStoreWriter
     String name = feature.getName();
     int featureID = feature.getFeatureID();
     int type = feature.getType().getTypeID();
-    CDOClassProxy reference = feature.getReferenceTypeProxy();
+    CDOClassProxy reference = ((InternalCDOFeature)feature).getReferenceTypeProxy();
     String packageURI = reference == null ? null : reference.getPackageURI();
     int classifierID = reference == null ? 0 : reference.getClassifierID();
     boolean many = feature.isMany();