xml attribute mapping morphing

1 files changed, 417 insertions, 175 deletions

diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/XmlEmbeddedIdMappingTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/XmlEmbeddedIdMappingTests.java
index f7d52f9cb0..68cb0c7bb6 100644
--- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/XmlEmbeddedIdMappingTests.java
+++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/XmlEmbeddedIdMappingTests.java
@@ -10,26 +10,38 @@
  *******************************************************************************/
 package org.eclipse.jpt.core.tests.internal.context.orm;
 
-import java.util.ListIterator;
+import java.util.Iterator;
+import org.eclipse.jdt.core.IType;
 import org.eclipse.jpt.core.internal.IMappingKeys;
 import org.eclipse.jpt.core.internal.JptCorePlugin;
-import org.eclipse.jpt.core.internal.context.orm.XmlAttributeOverride;
-import org.eclipse.jpt.core.internal.context.orm.XmlEmbeddedIdMapping;
+import org.eclipse.jpt.core.internal.context.base.IAttributeOverride;
+import org.eclipse.jpt.core.internal.context.base.IBasicMapping;
+import org.eclipse.jpt.core.internal.context.base.IEmbeddedIdMapping;
+import org.eclipse.jpt.core.internal.context.base.IEmbeddedMapping;
+import org.eclipse.jpt.core.internal.context.base.IIdMapping;
+import org.eclipse.jpt.core.internal.context.base.IManyToManyMapping;
+import org.eclipse.jpt.core.internal.context.base.IManyToOneMapping;
+import org.eclipse.jpt.core.internal.context.base.IOneToManyMapping;
+import org.eclipse.jpt.core.internal.context.base.IOneToOneMapping;
+import org.eclipse.jpt.core.internal.context.base.ITransientMapping;
+import org.eclipse.jpt.core.internal.context.base.IVersionMapping;
 import org.eclipse.jpt.core.internal.context.orm.XmlPersistentAttribute;
 import org.eclipse.jpt.core.internal.context.orm.XmlPersistentType;
-import org.eclipse.jpt.core.internal.resource.orm.EmbeddedId;
-import org.eclipse.jpt.core.internal.resource.orm.OrmFactory;
+import org.eclipse.jpt.core.internal.resource.java.JPA;
 import org.eclipse.jpt.core.internal.resource.persistence.PersistenceFactory;
 import org.eclipse.jpt.core.internal.resource.persistence.XmlMappingFileRef;
 import org.eclipse.jpt.core.tests.internal.context.ContextModelTestCase;
+import org.eclipse.jpt.utility.internal.iterators.ArrayIterator;
 
 public class XmlEmbeddedIdMappingTests extends ContextModelTestCase
 {
+	private static final String ATTRIBUTE_OVERRIDE_NAME = "city";
+	private static final String ATTRIBUTE_OVERRIDE_COLUMN_NAME = "E_CITY";
+
 	public XmlEmbeddedIdMappingTests(String name) {
 		super(name);
 	}
 	
-	
 	@Override
 	protected void setUp() throws Exception {
 		super.setUp();
@@ -38,194 +50,424 @@ public class XmlEmbeddedIdMappingTests extends ContextModelTestCase
 		xmlPersistenceUnit().getMappingFiles().add(mappingFileRef);
 		persistenceResource().save(null);
 	}
-
-	public void testUpdateName() throws Exception {
-		XmlPersistentType xmlPersistentType = entityMappings().addXmlPersistentType(IMappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo");
-		XmlPersistentAttribute xmlPersistentAttribute = xmlPersistentType.addSpecifiedPersistentAttribute(IMappingKeys.EMBEDDED_ID_ATTRIBUTE_MAPPING_KEY, "embeddedIdMapping");
-		XmlEmbeddedIdMapping xmlEmbeddedIdMapping = (XmlEmbeddedIdMapping) xmlPersistentAttribute.getMapping();
-		EmbeddedId embeddedIdResource = ormResource().getEntityMappings().getEntities().get(0).getAttributes().getEmbeddedIds().get(0);
-		
-		assertEquals("embeddedIdMapping", xmlEmbeddedIdMapping.getName());
-		assertEquals("embeddedIdMapping", embeddedIdResource.getName());
-				
-		//set name in the resource model, verify context model updated
-		embeddedIdResource.setName("newName");
-		assertEquals("newName", xmlEmbeddedIdMapping.getName());
-		assertEquals("newName", embeddedIdResource.getName());
 	
-		//set name to null in the resource model
-		embeddedIdResource.setName(null);
-		assertNull(xmlEmbeddedIdMapping.getName());
-		assertNull(embeddedIdResource.getName());
+	private void createEntityAnnotation() throws Exception {
+		this.createAnnotationAndMembers("Entity", "String name() default \"\";");		
 	}
 	
-	public void testModifyName() throws Exception {
-		XmlPersistentType xmlPersistentType = entityMappings().addXmlPersistentType(IMappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo");
-		XmlPersistentAttribute xmlPersistentAttribute = xmlPersistentType.addSpecifiedPersistentAttribute(IMappingKeys.EMBEDDED_ID_ATTRIBUTE_MAPPING_KEY, "embeddedIdMapping");
-		XmlEmbeddedIdMapping xmlEmbeddedIdMapping = (XmlEmbeddedIdMapping) xmlPersistentAttribute.getMapping();
-		EmbeddedId embeddedIdResource = ormResource().getEntityMappings().getEntities().get(0).getAttributes().getEmbeddedIds().get(0);
-		
-		assertEquals("embeddedIdMapping", xmlEmbeddedIdMapping.getName());
-		assertEquals("embeddedIdMapping", embeddedIdResource.getName());
-				
-		//set name in the context model, verify resource model updated
-		xmlEmbeddedIdMapping.setName("newName");
-		assertEquals("newName", xmlEmbeddedIdMapping.getName());
-		assertEquals("newName", embeddedIdResource.getName());
+	private void createEmbeddedIdAnnotation() throws Exception{
+		this.createAnnotationAndMembers("EmbeddedId", "");		
+	}
 	
-		//set name to null in the context model
-		xmlEmbeddedIdMapping.setName(null);
-		assertNull(xmlEmbeddedIdMapping.getName());
-		assertNull(embeddedIdResource.getName());
+	private void createColumnAnnotation() throws Exception {
+		this.createAnnotationAndMembers("Column", 
+			"String name() default \"\";" +
+			"boolean unique() default false;" +
+			"boolean nullable() default true;" +
+			"boolean insertable() default true;" +
+			"boolean updatable() default true;" +
+			"String columnDefinition() default \"\";" +
+			"String table() default \"\";" +
+			"int length() default 255;" +
+			"int precision() default 0;" +
+			"int scale() default 0;");		
 	}
 	
-	public void testAddSpecifiedAttributeOverride() throws Exception {
-		XmlPersistentType xmlPersistentType = entityMappings().addXmlPersistentType(IMappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo");
-		XmlPersistentAttribute xmlPersistentAttribute = xmlPersistentType.addSpecifiedPersistentAttribute(IMappingKeys.EMBEDDED_ID_ATTRIBUTE_MAPPING_KEY, "embeddedIdMapping");
-		XmlEmbeddedIdMapping xmlEmbeddedIdMapping = (XmlEmbeddedIdMapping) xmlPersistentAttribute.getMapping();
-		EmbeddedId embeddedIdResource = ormResource().getEntityMappings().getEntities().get(0).getAttributes().getEmbeddedIds().get(0);
-		
-		XmlAttributeOverride attributeOverride = xmlEmbeddedIdMapping.addSpecifiedAttributeOverride(0);
-		ormResource().save(null);
-		attributeOverride.setName("FOO");
-		ormResource().save(null);
-				
-		assertEquals("FOO", embeddedIdResource.getAttributeOverrides().get(0).getName());
-		
-		XmlAttributeOverride attributeOverride2 = xmlEmbeddedIdMapping.addSpecifiedAttributeOverride(0);
-		ormResource().save(null);
-		attributeOverride2.setName("BAR");
-		ormResource().save(null);
-		
-		assertEquals("BAR", embeddedIdResource.getAttributeOverrides().get(0).getName());
-		assertEquals("FOO", embeddedIdResource.getAttributeOverrides().get(1).getName());
-		
-		XmlAttributeOverride attributeOverride3 = xmlEmbeddedIdMapping.addSpecifiedAttributeOverride(1);
-		ormResource().save(null);
-		attributeOverride3.setName("BAZ");
-		ormResource().save(null);
-		
-		assertEquals("BAR", embeddedIdResource.getAttributeOverrides().get(0).getName());
-		assertEquals("BAZ", embeddedIdResource.getAttributeOverrides().get(1).getName());
-		assertEquals("FOO", embeddedIdResource.getAttributeOverrides().get(2).getName());
-		
-		ListIterator<XmlAttributeOverride> attributeOverrides = xmlEmbeddedIdMapping.specifiedAttributeOverrides();
-		assertEquals(attributeOverride2, attributeOverrides.next());
-		assertEquals(attributeOverride3, attributeOverrides.next());
-		assertEquals(attributeOverride, attributeOverrides.next());
-		
-		attributeOverrides = xmlEmbeddedIdMapping.specifiedAttributeOverrides();
-		assertEquals("BAR", attributeOverrides.next().getName());
-		assertEquals("BAZ", attributeOverrides.next().getName());
-		assertEquals("FOO", attributeOverrides.next().getName());
+	private void createAttributeOverrideAnnotation() throws Exception {
+		createColumnAnnotation();
+		this.createAnnotationAndMembers("AttributeOverride", 
+			"String name();" +
+			"Column column();");		
 	}
+	private IType createTestEntityEmbeddedIdMapping() throws Exception {
+		createEntityAnnotation();
+		createEmbeddedIdAnnotation();
+		createAttributeOverrideAnnotation();
+		return this.createTestType(new DefaultAnnotationWriter() {
+			@Override
+			public Iterator<String> imports() {
+				return new ArrayIterator<String>(JPA.ENTITY, JPA.EMBEDDED_ID, JPA.ATTRIBUTE_OVERRIDE, JPA.COLUMN);
+			}
+			@Override
+			public void appendTypeAnnotationTo(StringBuilder sb) {
+				sb.append("@Entity");
+			}
+			
+			@Override
+			public void appendIdFieldAnnotationTo(StringBuilder sb) {
+				sb.append(CR);
+				sb.append("    @EmbeddedId");
+				sb.append(CR);
+				sb.append("    @AttributeOverride(name=\"" + ATTRIBUTE_OVERRIDE_NAME + "\", column=@Column(name=\"" + ATTRIBUTE_OVERRIDE_COLUMN_NAME + "\"))");
+				sb.append(CR);
+				sb.append("    private Address address;").append(CR);
+				sb.append(CR);
+				sb.append("    @Id");				
+			}
+		});
+	}	
 	
-	public void testRemoveSpecifiedAttributeOverride() throws Exception {
-		XmlPersistentType xmlPersistentType = entityMappings().addXmlPersistentType(IMappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo");
-		XmlPersistentAttribute xmlPersistentAttribute = xmlPersistentType.addSpecifiedPersistentAttribute(IMappingKeys.EMBEDDED_ID_ATTRIBUTE_MAPPING_KEY, "embeddedIdMapping");
-		XmlEmbeddedIdMapping xmlEmbeddedIdMapping = (XmlEmbeddedIdMapping) xmlPersistentAttribute.getMapping();
-		EmbeddedId embeddedIdResource = ormResource().getEntityMappings().getEntities().get(0).getAttributes().getEmbeddedIds().get(0);
 
-		xmlEmbeddedIdMapping.addSpecifiedAttributeOverride(0).setName("FOO");
-		xmlEmbeddedIdMapping.addSpecifiedAttributeOverride(1).setName("BAR");
-		xmlEmbeddedIdMapping.addSpecifiedAttributeOverride(2).setName("BAZ");
+//	public void testUpdateName() throws Exception {
+//		XmlPersistentType xmlPersistentType = entityMappings().addXmlPersistentType(IMappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo");
+//		XmlPersistentAttribute xmlPersistentAttribute = xmlPersistentType.addSpecifiedPersistentAttribute(IMappingKeys.EMBEDDED_ID_ATTRIBUTE_MAPPING_KEY, "embeddedIdMapping");
+//		XmlEmbeddedIdMapping xmlEmbeddedIdMapping = (XmlEmbeddedIdMapping) xmlPersistentAttribute.getMapping();
+//		EmbeddedId embeddedIdResource = ormResource().getEntityMappings().getEntities().get(0).getAttributes().getEmbeddedIds().get(0);
+//		
+//		assertEquals("embeddedIdMapping", xmlEmbeddedIdMapping.getName());
+//		assertEquals("embeddedIdMapping", embeddedIdResource.getName());
+//				
+//		//set name in the resource model, verify context model updated
+//		embeddedIdResource.setName("newName");
+//		assertEquals("newName", xmlEmbeddedIdMapping.getName());
+//		assertEquals("newName", embeddedIdResource.getName());
+//	
+//		//set name to null in the resource model
+//		embeddedIdResource.setName(null);
+//		assertNull(xmlEmbeddedIdMapping.getName());
+//		assertNull(embeddedIdResource.getName());
+//	}
+//	
+//	public void testModifyName() throws Exception {
+//		XmlPersistentType xmlPersistentType = entityMappings().addXmlPersistentType(IMappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo");
+//		XmlPersistentAttribute xmlPersistentAttribute = xmlPersistentType.addSpecifiedPersistentAttribute(IMappingKeys.EMBEDDED_ID_ATTRIBUTE_MAPPING_KEY, "embeddedIdMapping");
+//		XmlEmbeddedIdMapping xmlEmbeddedIdMapping = (XmlEmbeddedIdMapping) xmlPersistentAttribute.getMapping();
+//		EmbeddedId embeddedIdResource = ormResource().getEntityMappings().getEntities().get(0).getAttributes().getEmbeddedIds().get(0);
+//		
+//		assertEquals("embeddedIdMapping", xmlEmbeddedIdMapping.getName());
+//		assertEquals("embeddedIdMapping", embeddedIdResource.getName());
+//				
+//		//set name in the context model, verify resource model updated
+//		xmlEmbeddedIdMapping.setName("newName");
+//		assertEquals("newName", xmlEmbeddedIdMapping.getName());
+//		assertEquals("newName", embeddedIdResource.getName());
+//	
+//		//set name to null in the context model
+//		xmlEmbeddedIdMapping.setName(null);
+//		assertNull(xmlEmbeddedIdMapping.getName());
+//		assertNull(embeddedIdResource.getName());
+//	}
+//	
+//	public void testAddSpecifiedAttributeOverride() throws Exception {
+//		XmlPersistentType xmlPersistentType = entityMappings().addXmlPersistentType(IMappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo");
+//		XmlPersistentAttribute xmlPersistentAttribute = xmlPersistentType.addSpecifiedPersistentAttribute(IMappingKeys.EMBEDDED_ID_ATTRIBUTE_MAPPING_KEY, "embeddedIdMapping");
+//		XmlEmbeddedIdMapping xmlEmbeddedIdMapping = (XmlEmbeddedIdMapping) xmlPersistentAttribute.getMapping();
+//		EmbeddedId embeddedIdResource = ormResource().getEntityMappings().getEntities().get(0).getAttributes().getEmbeddedIds().get(0);
+//		
+//		XmlAttributeOverride attributeOverride = xmlEmbeddedIdMapping.addSpecifiedAttributeOverride(0);
+//		ormResource().save(null);
+//		attributeOverride.setName("FOO");
+//		ormResource().save(null);
+//				
+//		assertEquals("FOO", embeddedIdResource.getAttributeOverrides().get(0).getName());
+//		
+//		XmlAttributeOverride attributeOverride2 = xmlEmbeddedIdMapping.addSpecifiedAttributeOverride(0);
+//		ormResource().save(null);
+//		attributeOverride2.setName("BAR");
+//		ormResource().save(null);
+//		
+//		assertEquals("BAR", embeddedIdResource.getAttributeOverrides().get(0).getName());
+//		assertEquals("FOO", embeddedIdResource.getAttributeOverrides().get(1).getName());
+//		
+//		XmlAttributeOverride attributeOverride3 = xmlEmbeddedIdMapping.addSpecifiedAttributeOverride(1);
+//		ormResource().save(null);
+//		attributeOverride3.setName("BAZ");
+//		ormResource().save(null);
+//		
+//		assertEquals("BAR", embeddedIdResource.getAttributeOverrides().get(0).getName());
+//		assertEquals("BAZ", embeddedIdResource.getAttributeOverrides().get(1).getName());
+//		assertEquals("FOO", embeddedIdResource.getAttributeOverrides().get(2).getName());
+//		
+//		ListIterator<XmlAttributeOverride> attributeOverrides = xmlEmbeddedIdMapping.specifiedAttributeOverrides();
+//		assertEquals(attributeOverride2, attributeOverrides.next());
+//		assertEquals(attributeOverride3, attributeOverrides.next());
+//		assertEquals(attributeOverride, attributeOverrides.next());
+//		
+//		attributeOverrides = xmlEmbeddedIdMapping.specifiedAttributeOverrides();
+//		assertEquals("BAR", attributeOverrides.next().getName());
+//		assertEquals("BAZ", attributeOverrides.next().getName());
+//		assertEquals("FOO", attributeOverrides.next().getName());
+//	}
+//	
+//	public void testRemoveSpecifiedAttributeOverride() throws Exception {
+//		XmlPersistentType xmlPersistentType = entityMappings().addXmlPersistentType(IMappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo");
+//		XmlPersistentAttribute xmlPersistentAttribute = xmlPersistentType.addSpecifiedPersistentAttribute(IMappingKeys.EMBEDDED_ID_ATTRIBUTE_MAPPING_KEY, "embeddedIdMapping");
+//		XmlEmbeddedIdMapping xmlEmbeddedIdMapping = (XmlEmbeddedIdMapping) xmlPersistentAttribute.getMapping();
+//		EmbeddedId embeddedIdResource = ormResource().getEntityMappings().getEntities().get(0).getAttributes().getEmbeddedIds().get(0);
+//
+//		xmlEmbeddedIdMapping.addSpecifiedAttributeOverride(0).setName("FOO");
+//		xmlEmbeddedIdMapping.addSpecifiedAttributeOverride(1).setName("BAR");
+//		xmlEmbeddedIdMapping.addSpecifiedAttributeOverride(2).setName("BAZ");
+//		
+//		assertEquals(3, embeddedIdResource.getAttributeOverrides().size());
+//		
+//		xmlEmbeddedIdMapping.removeSpecifiedAttributeOverride(0);
+//		assertEquals(2, embeddedIdResource.getAttributeOverrides().size());
+//		assertEquals("BAR", embeddedIdResource.getAttributeOverrides().get(0).getName());
+//		assertEquals("BAZ", embeddedIdResource.getAttributeOverrides().get(1).getName());
+//
+//		xmlEmbeddedIdMapping.removeSpecifiedAttributeOverride(0);
+//		assertEquals(1, embeddedIdResource.getAttributeOverrides().size());
+//		assertEquals("BAZ", embeddedIdResource.getAttributeOverrides().get(0).getName());
+//		
+//		xmlEmbeddedIdMapping.removeSpecifiedAttributeOverride(0);
+//		assertEquals(0, embeddedIdResource.getAttributeOverrides().size());
+//	}
+//	
+//	public void testMoveSpecifiedAttributeOverride() throws Exception {
+//		XmlPersistentType xmlPersistentType = entityMappings().addXmlPersistentType(IMappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo");
+//		XmlPersistentAttribute xmlPersistentAttribute = xmlPersistentType.addSpecifiedPersistentAttribute(IMappingKeys.EMBEDDED_ID_ATTRIBUTE_MAPPING_KEY, "embeddedIdMapping");
+//		XmlEmbeddedIdMapping xmlEmbeddedIdMapping = (XmlEmbeddedIdMapping) xmlPersistentAttribute.getMapping();
+//		EmbeddedId embeddedIdResource = ormResource().getEntityMappings().getEntities().get(0).getAttributes().getEmbeddedIds().get(0);
+//
+//		xmlEmbeddedIdMapping.addSpecifiedAttributeOverride(0).setName("FOO");
+//		xmlEmbeddedIdMapping.addSpecifiedAttributeOverride(1).setName("BAR");
+//		xmlEmbeddedIdMapping.addSpecifiedAttributeOverride(2).setName("BAZ");
+//		
+//		assertEquals(3, embeddedIdResource.getAttributeOverrides().size());
+//		
+//		
+//		xmlEmbeddedIdMapping.moveSpecifiedAttributeOverride(2, 0);
+//		ListIterator<XmlAttributeOverride> attributeOverrides = xmlEmbeddedIdMapping.specifiedAttributeOverrides();
+//		assertEquals("BAR", attributeOverrides.next().getName());
+//		assertEquals("BAZ", attributeOverrides.next().getName());
+//		assertEquals("FOO", attributeOverrides.next().getName());
+//
+//		assertEquals("BAR", embeddedIdResource.getAttributeOverrides().get(0).getName());
+//		assertEquals("BAZ", embeddedIdResource.getAttributeOverrides().get(1).getName());
+//		assertEquals("FOO", embeddedIdResource.getAttributeOverrides().get(2).getName());
+//
+//
+//		xmlEmbeddedIdMapping.moveSpecifiedAttributeOverride(0, 1);
+//		attributeOverrides = xmlEmbeddedIdMapping.specifiedAttributeOverrides();
+//		assertEquals("BAZ", attributeOverrides.next().getName());
+//		assertEquals("BAR", attributeOverrides.next().getName());
+//		assertEquals("FOO", attributeOverrides.next().getName());
+//
+//		assertEquals("BAZ", embeddedIdResource.getAttributeOverrides().get(0).getName());
+//		assertEquals("BAR", embeddedIdResource.getAttributeOverrides().get(1).getName());
+//		assertEquals("FOO", embeddedIdResource.getAttributeOverrides().get(2).getName());
+//	}
+//	
+//	public void testUpdateAttributeOverrides() throws Exception {
+//		XmlPersistentType xmlPersistentType = entityMappings().addXmlPersistentType(IMappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo");
+//		XmlPersistentAttribute xmlPersistentAttribute = xmlPersistentType.addSpecifiedPersistentAttribute(IMappingKeys.EMBEDDED_ID_ATTRIBUTE_MAPPING_KEY, "embeddedIdMapping");
+//		XmlEmbeddedIdMapping xmlEmbeddedIdMapping = (XmlEmbeddedIdMapping) xmlPersistentAttribute.getMapping();
+//		EmbeddedId embeddedIdResource = ormResource().getEntityMappings().getEntities().get(0).getAttributes().getEmbeddedIds().get(0);
+//		
+//		embeddedIdResource.getAttributeOverrides().add(OrmFactory.eINSTANCE.createAttributeOverrideImpl());
+//		embeddedIdResource.getAttributeOverrides().add(OrmFactory.eINSTANCE.createAttributeOverrideImpl());
+//		embeddedIdResource.getAttributeOverrides().add(OrmFactory.eINSTANCE.createAttributeOverrideImpl());
+//		
+//		embeddedIdResource.getAttributeOverrides().get(0).setName("FOO");
+//		embeddedIdResource.getAttributeOverrides().get(1).setName("BAR");
+//		embeddedIdResource.getAttributeOverrides().get(2).setName("BAZ");
+//
+//		ListIterator<XmlAttributeOverride> attributeOverrides = xmlEmbeddedIdMapping.specifiedAttributeOverrides();
+//		assertEquals("FOO", attributeOverrides.next().getName());
+//		assertEquals("BAR", attributeOverrides.next().getName());
+//		assertEquals("BAZ", attributeOverrides.next().getName());
+//		assertFalse(attributeOverrides.hasNext());
+//		
+//		embeddedIdResource.getAttributeOverrides().move(2, 0);
+//		attributeOverrides = xmlEmbeddedIdMapping.specifiedAttributeOverrides();
+//		assertEquals("BAR", attributeOverrides.next().getName());
+//		assertEquals("BAZ", attributeOverrides.next().getName());
+//		assertEquals("FOO", attributeOverrides.next().getName());
+//		assertFalse(attributeOverrides.hasNext());
+//
+//		embeddedIdResource.getAttributeOverrides().move(0, 1);
+//		attributeOverrides = xmlEmbeddedIdMapping.specifiedAttributeOverrides();
+//		assertEquals("BAZ", attributeOverrides.next().getName());
+//		assertEquals("BAR", attributeOverrides.next().getName());
+//		assertEquals("FOO", attributeOverrides.next().getName());
+//		assertFalse(attributeOverrides.hasNext());
+//
+//		embeddedIdResource.getAttributeOverrides().remove(1);
+//		attributeOverrides = xmlEmbeddedIdMapping.specifiedAttributeOverrides();
+//		assertEquals("BAZ", attributeOverrides.next().getName());
+//		assertEquals("FOO", attributeOverrides.next().getName());
+//		assertFalse(attributeOverrides.hasNext());
+//
+//		embeddedIdResource.getAttributeOverrides().remove(1);
+//		attributeOverrides = xmlEmbeddedIdMapping.specifiedAttributeOverrides();
+//		assertEquals("BAZ", attributeOverrides.next().getName());
+//		assertFalse(attributeOverrides.hasNext());
+//		
+//		embeddedIdResource.getAttributeOverrides().remove(0);
+//		assertFalse(xmlEmbeddedIdMapping.specifiedAttributeOverrides().hasNext());
+//	}
+	
+	public void testEmbeddedIdMorphToIdMapping() throws Exception {
+		createTestEntityEmbeddedIdMapping();
+		XmlPersistentType xmlPersistentType = entityMappings().addXmlPersistentType(IMappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME);
+		XmlPersistentAttribute xmlPersistentAttribute = xmlPersistentType.addSpecifiedPersistentAttribute(IMappingKeys.EMBEDDED_ID_ATTRIBUTE_MAPPING_KEY, "embeddedId");
 		
-		assertEquals(3, embeddedIdResource.getAttributeOverrides().size());
+		IEmbeddedIdMapping embeddedIdMapping = (IEmbeddedIdMapping) xmlPersistentAttribute.getMapping();
+		assertFalse(embeddedIdMapping.isDefault());
+		IAttributeOverride attributeOverride = embeddedIdMapping.addSpecifiedAttributeOverride(0);
+		attributeOverride.setName("override");
+		attributeOverride.getColumn().setSpecifiedName("OVERRIDE_COLUMN");
+		assertFalse(embeddedIdMapping.isDefault());
 		
-		xmlEmbeddedIdMapping.removeSpecifiedAttributeOverride(0);
-		assertEquals(2, embeddedIdResource.getAttributeOverrides().size());
-		assertEquals("BAR", embeddedIdResource.getAttributeOverrides().get(0).getName());
-		assertEquals("BAZ", embeddedIdResource.getAttributeOverrides().get(1).getName());
-
-		xmlEmbeddedIdMapping.removeSpecifiedAttributeOverride(0);
-		assertEquals(1, embeddedIdResource.getAttributeOverrides().size());
-		assertEquals("BAZ", embeddedIdResource.getAttributeOverrides().get(0).getName());
+		xmlPersistentAttribute.setSpecifiedMappingKey(IMappingKeys.ID_ATTRIBUTE_MAPPING_KEY);
+		assertEquals(1, xmlPersistentType.specifiedAttributesSize());
+		assertEquals(xmlPersistentAttribute, xmlPersistentType.specifiedAttributes().next());
+		assertTrue(xmlPersistentAttribute.getMapping() instanceof IIdMapping);
+		assertEquals("embeddedId", xmlPersistentAttribute.getMapping().getName());
+	}
+	
+	public void testEmbeddedIdMorphToVersionMapping() throws Exception {
+		createTestEntityEmbeddedIdMapping();
+		XmlPersistentType xmlPersistentType = entityMappings().addXmlPersistentType(IMappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME);
+		XmlPersistentAttribute xmlPersistentAttribute = xmlPersistentType.addSpecifiedPersistentAttribute(IMappingKeys.EMBEDDED_ID_ATTRIBUTE_MAPPING_KEY, "embeddedId");
 		
-		xmlEmbeddedIdMapping.removeSpecifiedAttributeOverride(0);
-		assertEquals(0, embeddedIdResource.getAttributeOverrides().size());
+		IEmbeddedIdMapping embeddedIdMapping = (IEmbeddedIdMapping) xmlPersistentAttribute.getMapping();
+		assertFalse(embeddedIdMapping.isDefault());
+		IAttributeOverride attributeOverride = embeddedIdMapping.addSpecifiedAttributeOverride(0);
+		attributeOverride.setName("override");
+		attributeOverride.getColumn().setSpecifiedName("OVERRIDE_COLUMN");
+		assertFalse(embeddedIdMapping.isDefault());
+		
+		xmlPersistentAttribute.setSpecifiedMappingKey(IMappingKeys.VERSION_ATTRIBUTE_MAPPING_KEY);
+		assertEquals(1, xmlPersistentType.specifiedAttributesSize());
+		assertEquals(xmlPersistentAttribute, xmlPersistentType.specifiedAttributes().next());
+		assertTrue(xmlPersistentAttribute.getMapping() instanceof IVersionMapping);
+		assertEquals("embeddedId", xmlPersistentAttribute.getMapping().getName());
 	}
 	
-	public void testMoveSpecifiedAttributeOverride() throws Exception {
-		XmlPersistentType xmlPersistentType = entityMappings().addXmlPersistentType(IMappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo");
-		XmlPersistentAttribute xmlPersistentAttribute = xmlPersistentType.addSpecifiedPersistentAttribute(IMappingKeys.EMBEDDED_ID_ATTRIBUTE_MAPPING_KEY, "embeddedIdMapping");
-		XmlEmbeddedIdMapping xmlEmbeddedIdMapping = (XmlEmbeddedIdMapping) xmlPersistentAttribute.getMapping();
-		EmbeddedId embeddedIdResource = ormResource().getEntityMappings().getEntities().get(0).getAttributes().getEmbeddedIds().get(0);
-
-		xmlEmbeddedIdMapping.addSpecifiedAttributeOverride(0).setName("FOO");
-		xmlEmbeddedIdMapping.addSpecifiedAttributeOverride(1).setName("BAR");
-		xmlEmbeddedIdMapping.addSpecifiedAttributeOverride(2).setName("BAZ");
+	public void testEmbeddedIdMorphToTransientMapping() throws Exception {
+		createTestEntityEmbeddedIdMapping();
+		XmlPersistentType xmlPersistentType = entityMappings().addXmlPersistentType(IMappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME);
+		XmlPersistentAttribute xmlPersistentAttribute = xmlPersistentType.addSpecifiedPersistentAttribute(IMappingKeys.EMBEDDED_ID_ATTRIBUTE_MAPPING_KEY, "embeddedId");
 		
-		assertEquals(3, embeddedIdResource.getAttributeOverrides().size());
+		IEmbeddedIdMapping embeddedIdMapping = (IEmbeddedIdMapping) xmlPersistentAttribute.getMapping();
+		assertFalse(embeddedIdMapping.isDefault());
+		IAttributeOverride attributeOverride = embeddedIdMapping.addSpecifiedAttributeOverride(0);
+		attributeOverride.setName("override");
+		attributeOverride.getColumn().setSpecifiedName("OVERRIDE_COLUMN");
+		assertFalse(embeddedIdMapping.isDefault());
 		
+		xmlPersistentAttribute.setSpecifiedMappingKey(IMappingKeys.TRANSIENT_ATTRIBUTE_MAPPING_KEY);
+		assertEquals(1, xmlPersistentType.specifiedAttributesSize());
+		assertEquals(xmlPersistentAttribute, xmlPersistentType.specifiedAttributes().next());
+		assertTrue(xmlPersistentAttribute.getMapping() instanceof ITransientMapping);
+		assertEquals("embeddedId", xmlPersistentAttribute.getMapping().getName());
+	}
+	
+	public void testEmbeddedIdMorphToBasicMapping() throws Exception {
+		createTestEntityEmbeddedIdMapping();
+		XmlPersistentType xmlPersistentType = entityMappings().addXmlPersistentType(IMappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME);
+		XmlPersistentAttribute xmlPersistentAttribute = xmlPersistentType.addSpecifiedPersistentAttribute(IMappingKeys.EMBEDDED_ID_ATTRIBUTE_MAPPING_KEY, "embeddedId");
 		
-		xmlEmbeddedIdMapping.moveSpecifiedAttributeOverride(2, 0);
-		ListIterator<XmlAttributeOverride> attributeOverrides = xmlEmbeddedIdMapping.specifiedAttributeOverrides();
-		assertEquals("BAR", attributeOverrides.next().getName());
-		assertEquals("BAZ", attributeOverrides.next().getName());
-		assertEquals("FOO", attributeOverrides.next().getName());
-
-		assertEquals("BAR", embeddedIdResource.getAttributeOverrides().get(0).getName());
-		assertEquals("BAZ", embeddedIdResource.getAttributeOverrides().get(1).getName());
-		assertEquals("FOO", embeddedIdResource.getAttributeOverrides().get(2).getName());
-
-
-		xmlEmbeddedIdMapping.moveSpecifiedAttributeOverride(0, 1);
-		attributeOverrides = xmlEmbeddedIdMapping.specifiedAttributeOverrides();
-		assertEquals("BAZ", attributeOverrides.next().getName());
-		assertEquals("BAR", attributeOverrides.next().getName());
-		assertEquals("FOO", attributeOverrides.next().getName());
-
-		assertEquals("BAZ", embeddedIdResource.getAttributeOverrides().get(0).getName());
-		assertEquals("BAR", embeddedIdResource.getAttributeOverrides().get(1).getName());
-		assertEquals("FOO", embeddedIdResource.getAttributeOverrides().get(2).getName());
+		IEmbeddedIdMapping embeddedIdMapping = (IEmbeddedIdMapping) xmlPersistentAttribute.getMapping();
+		assertFalse(embeddedIdMapping.isDefault());
+		IAttributeOverride attributeOverride = embeddedIdMapping.addSpecifiedAttributeOverride(0);
+		attributeOverride.setName("override");
+		attributeOverride.getColumn().setSpecifiedName("OVERRIDE_COLUMN");
+		assertFalse(embeddedIdMapping.isDefault());
+		
+		xmlPersistentAttribute.setSpecifiedMappingKey(IMappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY);
+		assertEquals(1, xmlPersistentType.specifiedAttributesSize());
+		assertEquals(xmlPersistentAttribute, xmlPersistentType.specifiedAttributes().next());
+		assertTrue(xmlPersistentAttribute.getMapping() instanceof IBasicMapping);
+		assertEquals("embeddedId", xmlPersistentAttribute.getMapping().getName());
 	}
 	
-	public void testUpdateAttributeOverrides() throws Exception {
-		XmlPersistentType xmlPersistentType = entityMappings().addXmlPersistentType(IMappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo");
-		XmlPersistentAttribute xmlPersistentAttribute = xmlPersistentType.addSpecifiedPersistentAttribute(IMappingKeys.EMBEDDED_ID_ATTRIBUTE_MAPPING_KEY, "embeddedIdMapping");
-		XmlEmbeddedIdMapping xmlEmbeddedIdMapping = (XmlEmbeddedIdMapping) xmlPersistentAttribute.getMapping();
-		EmbeddedId embeddedIdResource = ormResource().getEntityMappings().getEntities().get(0).getAttributes().getEmbeddedIds().get(0);
-		
-		embeddedIdResource.getAttributeOverrides().add(OrmFactory.eINSTANCE.createAttributeOverrideImpl());
-		embeddedIdResource.getAttributeOverrides().add(OrmFactory.eINSTANCE.createAttributeOverrideImpl());
-		embeddedIdResource.getAttributeOverrides().add(OrmFactory.eINSTANCE.createAttributeOverrideImpl());
-		
-		embeddedIdResource.getAttributeOverrides().get(0).setName("FOO");
-		embeddedIdResource.getAttributeOverrides().get(1).setName("BAR");
-		embeddedIdResource.getAttributeOverrides().get(2).setName("BAZ");
-
-		ListIterator<XmlAttributeOverride> attributeOverrides = xmlEmbeddedIdMapping.specifiedAttributeOverrides();
-		assertEquals("FOO", attributeOverrides.next().getName());
-		assertEquals("BAR", attributeOverrides.next().getName());
-		assertEquals("BAZ", attributeOverrides.next().getName());
-		assertFalse(attributeOverrides.hasNext());
-		
-		embeddedIdResource.getAttributeOverrides().move(2, 0);
-		attributeOverrides = xmlEmbeddedIdMapping.specifiedAttributeOverrides();
-		assertEquals("BAR", attributeOverrides.next().getName());
-		assertEquals("BAZ", attributeOverrides.next().getName());
-		assertEquals("FOO", attributeOverrides.next().getName());
-		assertFalse(attributeOverrides.hasNext());
-
-		embeddedIdResource.getAttributeOverrides().move(0, 1);
-		attributeOverrides = xmlEmbeddedIdMapping.specifiedAttributeOverrides();
-		assertEquals("BAZ", attributeOverrides.next().getName());
-		assertEquals("BAR", attributeOverrides.next().getName());
-		assertEquals("FOO", attributeOverrides.next().getName());
-		assertFalse(attributeOverrides.hasNext());
-
-		embeddedIdResource.getAttributeOverrides().remove(1);
-		attributeOverrides = xmlEmbeddedIdMapping.specifiedAttributeOverrides();
-		assertEquals("BAZ", attributeOverrides.next().getName());
-		assertEquals("FOO", attributeOverrides.next().getName());
-		assertFalse(attributeOverrides.hasNext());
-
-		embeddedIdResource.getAttributeOverrides().remove(1);
-		attributeOverrides = xmlEmbeddedIdMapping.specifiedAttributeOverrides();
-		assertEquals("BAZ", attributeOverrides.next().getName());
-		assertFalse(attributeOverrides.hasNext());
+	public void testEmbeddedIdMorphToEmbeddedMapping() throws Exception {
+		createTestEntityEmbeddedIdMapping();
+		XmlPersistentType xmlPersistentType = entityMappings().addXmlPersistentType(IMappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME);
+		XmlPersistentAttribute xmlPersistentAttribute = xmlPersistentType.addSpecifiedPersistentAttribute(IMappingKeys.EMBEDDED_ID_ATTRIBUTE_MAPPING_KEY, "embeddedId");
+		
+		IEmbeddedIdMapping embeddedIdMapping = (IEmbeddedIdMapping) xmlPersistentAttribute.getMapping();
+		assertFalse(embeddedIdMapping.isDefault());
+		IAttributeOverride attributeOverride = embeddedIdMapping.addSpecifiedAttributeOverride(0);
+		attributeOverride.setName("override");
+		attributeOverride.getColumn().setSpecifiedName("OVERRIDE_COLUMN");
+		assertFalse(embeddedIdMapping.isDefault());
+		
+		xmlPersistentAttribute.setSpecifiedMappingKey(IMappingKeys.EMBEDDED_ATTRIBUTE_MAPPING_KEY);
+		assertEquals(1, xmlPersistentType.specifiedAttributesSize());
+		assertEquals(xmlPersistentAttribute, xmlPersistentType.specifiedAttributes().next());
+		assertTrue(xmlPersistentAttribute.getMapping() instanceof IEmbeddedMapping);
+		assertEquals("embeddedId", xmlPersistentAttribute.getMapping().getName());
+		attributeOverride = ((IEmbeddedMapping) xmlPersistentAttribute.getMapping()).specifiedAttributeOverrides().next();
+		assertEquals("override", attributeOverride.getName());
+		assertEquals("OVERRIDE_COLUMN", attributeOverride.getColumn().getSpecifiedName());
+	}
+	
+	public void testEmbeddedIdMorphToOneToOneMapping() throws Exception {
+		createTestEntityEmbeddedIdMapping();
+		XmlPersistentType xmlPersistentType = entityMappings().addXmlPersistentType(IMappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME);
+		XmlPersistentAttribute xmlPersistentAttribute = xmlPersistentType.addSpecifiedPersistentAttribute(IMappingKeys.EMBEDDED_ID_ATTRIBUTE_MAPPING_KEY, "embeddedId");
+		
+		IEmbeddedIdMapping embeddedIdMapping = (IEmbeddedIdMapping) xmlPersistentAttribute.getMapping();
+		assertFalse(embeddedIdMapping.isDefault());
+		IAttributeOverride attributeOverride = embeddedIdMapping.addSpecifiedAttributeOverride(0);
+		attributeOverride.setName("override");
+		attributeOverride.getColumn().setSpecifiedName("OVERRIDE_COLUMN");
+		assertFalse(embeddedIdMapping.isDefault());
+		
+		xmlPersistentAttribute.setSpecifiedMappingKey(IMappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY);
+		assertEquals(1, xmlPersistentType.specifiedAttributesSize());
+		assertEquals(xmlPersistentAttribute, xmlPersistentType.specifiedAttributes().next());
+		assertTrue(xmlPersistentAttribute.getMapping() instanceof IOneToOneMapping);
+		assertEquals("embeddedId", xmlPersistentAttribute.getMapping().getName());
+	}
+	
+	public void testEmbeddedIdMorphToOneToManyMapping() throws Exception {
+		createTestEntityEmbeddedIdMapping();
+		XmlPersistentType xmlPersistentType = entityMappings().addXmlPersistentType(IMappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME);
+		XmlPersistentAttribute xmlPersistentAttribute = xmlPersistentType.addSpecifiedPersistentAttribute(IMappingKeys.EMBEDDED_ID_ATTRIBUTE_MAPPING_KEY, "embeddedId");
+		
+		IEmbeddedIdMapping embeddedIdMapping = (IEmbeddedIdMapping) xmlPersistentAttribute.getMapping();
+		assertFalse(embeddedIdMapping.isDefault());
+		IAttributeOverride attributeOverride = embeddedIdMapping.addSpecifiedAttributeOverride(0);
+		attributeOverride.setName("override");
+		attributeOverride.getColumn().setSpecifiedName("OVERRIDE_COLUMN");
+		assertFalse(embeddedIdMapping.isDefault());
 		
-		embeddedIdResource.getAttributeOverrides().remove(0);
-		assertFalse(xmlEmbeddedIdMapping.specifiedAttributeOverrides().hasNext());
+		xmlPersistentAttribute.setSpecifiedMappingKey(IMappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY);
+		assertEquals(1, xmlPersistentType.specifiedAttributesSize());
+		assertEquals(xmlPersistentAttribute, xmlPersistentType.specifiedAttributes().next());
+		assertTrue(xmlPersistentAttribute.getMapping() instanceof IOneToManyMapping);
+		assertEquals("embeddedId", xmlPersistentAttribute.getMapping().getName());
 	}
+	
+	public void testEmbeddedIdMorphToManyToOneMapping() throws Exception {
+		createTestEntityEmbeddedIdMapping();
+		XmlPersistentType xmlPersistentType = entityMappings().addXmlPersistentType(IMappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME);
+		XmlPersistentAttribute xmlPersistentAttribute = xmlPersistentType.addSpecifiedPersistentAttribute(IMappingKeys.EMBEDDED_ID_ATTRIBUTE_MAPPING_KEY, "embeddedId");
+		
+		IEmbeddedIdMapping embeddedIdMapping = (IEmbeddedIdMapping) xmlPersistentAttribute.getMapping();
+		assertFalse(embeddedIdMapping.isDefault());
+		IAttributeOverride attributeOverride = embeddedIdMapping.addSpecifiedAttributeOverride(0);
+		attributeOverride.setName("override");
+		attributeOverride.getColumn().setSpecifiedName("OVERRIDE_COLUMN");
+		assertFalse(embeddedIdMapping.isDefault());
+		
+		xmlPersistentAttribute.setSpecifiedMappingKey(IMappingKeys.MANY_TO_ONE_ATTRIBUTE_MAPPING_KEY);
+		assertTrue(xmlPersistentAttribute.getMapping() instanceof IManyToOneMapping);
+		assertEquals("embeddedId", xmlPersistentAttribute.getMapping().getName());
+	}
+	
+	public void testEmbeddedIdMorphToManyToManyMapping() throws Exception {
+		createTestEntityEmbeddedIdMapping();
+		XmlPersistentType xmlPersistentType = entityMappings().addXmlPersistentType(IMappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME);
+		XmlPersistentAttribute xmlPersistentAttribute = xmlPersistentType.addSpecifiedPersistentAttribute(IMappingKeys.EMBEDDED_ID_ATTRIBUTE_MAPPING_KEY, "embeddedId");
+		
+		IEmbeddedIdMapping embeddedIdMapping = (IEmbeddedIdMapping) xmlPersistentAttribute.getMapping();
+		assertFalse(embeddedIdMapping.isDefault());
+		IAttributeOverride attributeOverride = embeddedIdMapping.addSpecifiedAttributeOverride(0);
+		attributeOverride.setName("override");
+		attributeOverride.getColumn().setSpecifiedName("OVERRIDE_COLUMN");
+		assertFalse(embeddedIdMapping.isDefault());
+		
+		xmlPersistentAttribute.setSpecifiedMappingKey(IMappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY);
+		assertEquals(1, xmlPersistentType.specifiedAttributesSize());
+		assertEquals(xmlPersistentAttribute, xmlPersistentType.specifiedAttributes().next());
+		assertTrue(xmlPersistentAttribute.getMapping() instanceof IManyToManyMapping);
+		assertEquals("embeddedId", xmlPersistentAttribute.getMapping().getName());
+	}
+
 }
\ No newline at end of file