primary key validation

4 files changed, 58 insertions, 58 deletions

diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/JavaEntityTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/JavaEntityTests.java
index 730a378353..9d30cd8ec3 100644
--- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/JavaEntityTests.java
+++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/JavaEntityTests.java
@@ -379,7 +379,7 @@ public class JavaEntityTests extends ContextModelTestCase
 		entity.getDiscriminatorColumn().setSpecifiedName("BAR");
 		entity.getGeneratorContainer().addTableGenerator();
 		entity.getGeneratorContainer().addSequenceGenerator();
-		entity.getIdClassReference().setIdClassName("myIdClass");
+		entity.getIdClassReference().setSpecifiedIdClassName("myIdClass");
 		entity.getQueryContainer().addNamedNativeQuery(0);
 		entity.getQueryContainer().addNamedQuery(0);
 		
@@ -418,7 +418,7 @@ public class JavaEntityTests extends ContextModelTestCase
 		entity.getDiscriminatorColumn().setSpecifiedName("BAR");
 		entity.getGeneratorContainer().addTableGenerator();
 		entity.getGeneratorContainer().addSequenceGenerator();
-		entity.getIdClassReference().setIdClassName("myIdClass");
+		entity.getIdClassReference().setSpecifiedIdClassName("myIdClass");
 		entity.getQueryContainer().addNamedNativeQuery(0);
 		entity.getQueryContainer().addNamedQuery(0);
 		
@@ -457,7 +457,7 @@ public class JavaEntityTests extends ContextModelTestCase
 		entity.getDiscriminatorColumn().setSpecifiedName("BAR");
 		entity.getGeneratorContainer().addTableGenerator();
 		entity.getGeneratorContainer().addSequenceGenerator();
-		entity.getIdClassReference().setIdClassName("myIdClass");
+		entity.getIdClassReference().setSpecifiedIdClassName("myIdClass");
 		entity.getQueryContainer().addNamedNativeQuery(0);
 		entity.getQueryContainer().addNamedQuery(0);
 		
@@ -3209,20 +3209,20 @@ public class JavaEntityTests extends ContextModelTestCase
 		
 		JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME);
 		
-		assertNull(getJavaEntity().getIdClassReference().getIdClassName());
+		assertNull(getJavaEntity().getIdClassReference().getSpecifiedIdClassName());
 		assertNull(getJavaEntity().getIdClassReference().getIdClass());
 		assertNull(typeResource.getAnnotation(IdClassAnnotation.ANNOTATION_NAME));
 		
 		IdClassAnnotation idClass = (IdClassAnnotation) typeResource.addAnnotation(IdClassAnnotation.ANNOTATION_NAME);	
 		getJpaProject().synchronizeContextModel();
-		assertNull(getJavaEntity().getIdClassReference().getIdClassName());
+		assertNull(getJavaEntity().getIdClassReference().getSpecifiedIdClassName());
 		assertNotNull(typeResource.getAnnotation(IdClassAnnotation.ANNOTATION_NAME));
 		
 		// test setting id class name to nonexistent class.  test class name is set, but class is null
 		String nonExistentIdClassName = PACKAGE_NAME + ".Foo";
 		idClass.setValue(nonExistentIdClassName);
 		getJpaProject().synchronizeContextModel();
-		assertEquals(nonExistentIdClassName, getJavaEntity().getIdClassReference().getIdClassName());
+		assertEquals(nonExistentIdClassName, getJavaEntity().getIdClassReference().getSpecifiedIdClassName());
 		assertEquals(nonExistentIdClassName, ((IdClassAnnotation) typeResource.getAnnotation(IdClassAnnotation.ANNOTATION_NAME)).getValue());
 		assertNull(getJavaEntity().getIdClassReference().getIdClass());
 		
@@ -3230,14 +3230,14 @@ public class JavaEntityTests extends ContextModelTestCase
 		String existentIdClassName = PACKAGE_NAME + ".TestTypeId";
 		idClass.setValue(existentIdClassName);
 		getJpaProject().synchronizeContextModel();
-		assertEquals(existentIdClassName, getJavaEntity().getIdClassReference().getIdClassName());
+		assertEquals(existentIdClassName, getJavaEntity().getIdClassReference().getSpecifiedIdClassName());
 		assertEquals(existentIdClassName, ((IdClassAnnotation) typeResource.getAnnotation(IdClassAnnotation.ANNOTATION_NAME)).getValue());
 		assertNotNull(getJavaEntity().getIdClassReference().getIdClass());
 		
 		//test setting  @IdClass value to null, IdClass annotation is removed
 		idClass.setValue(null);
 		getJpaProject().synchronizeContextModel();
-		assertNull(getJavaEntity().getIdClassReference().getIdClassName());
+		assertNull(getJavaEntity().getIdClassReference().getSpecifiedIdClassName());
 		assertNull(typeResource.getAnnotation(IdClassAnnotation.ANNOTATION_NAME));
 		assertNull(getJavaEntity().getIdClassReference().getIdClass());
 		
@@ -3246,7 +3246,7 @@ public class JavaEntityTests extends ContextModelTestCase
 		idClass.setValue(existentIdClassName);
 		typeResource.removeAnnotation(IdClassAnnotation.ANNOTATION_NAME);
 		getJpaProject().synchronizeContextModel();
-		assertNull(getJavaEntity().getIdClassReference().getIdClassName());
+		assertNull(getJavaEntity().getIdClassReference().getSpecifiedIdClassName());
 		assertNull(typeResource.getAnnotation(IdClassAnnotation.ANNOTATION_NAME));
 		assertNull(getJavaEntity().getIdClassReference().getIdClass());
 	}
@@ -3258,24 +3258,24 @@ public class JavaEntityTests extends ContextModelTestCase
 		
 		JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME);
 		
-		assertNull(getJavaEntity().getIdClassReference().getIdClassName());
+		assertNull(getJavaEntity().getIdClassReference().getSpecifiedIdClassName());
 		assertNull(typeResource.getAnnotation(IdClassAnnotation.ANNOTATION_NAME));
 		assertNull(getJavaEntity().getIdClassReference().getIdClass());
 		
 		String nonExistentIdClassName = PACKAGE_NAME + ".Foo";
-		getJavaEntity().getIdClassReference().setIdClassName(nonExistentIdClassName);
+		getJavaEntity().getIdClassReference().setSpecifiedIdClassName(nonExistentIdClassName);
 		assertEquals(nonExistentIdClassName, ((IdClassAnnotation) typeResource.getAnnotation(IdClassAnnotation.ANNOTATION_NAME)).getValue());
-		assertEquals(nonExistentIdClassName, getJavaEntity().getIdClassReference().getIdClassName());
+		assertEquals(nonExistentIdClassName, getJavaEntity().getIdClassReference().getSpecifiedIdClassName());
 		assertNull(getJavaEntity().getIdClassReference().getIdClass());
 		
 		String existentIdClassName = PACKAGE_NAME + ".TestTypeId";
-		getJavaEntity().getIdClassReference().setIdClassName(existentIdClassName);
+		getJavaEntity().getIdClassReference().setSpecifiedIdClassName(existentIdClassName);
 		assertEquals(existentIdClassName, ((IdClassAnnotation) typeResource.getAnnotation(IdClassAnnotation.ANNOTATION_NAME)).getValue());
-		assertEquals(existentIdClassName, getJavaEntity().getIdClassReference().getIdClassName());
+		assertEquals(existentIdClassName, getJavaEntity().getIdClassReference().getSpecifiedIdClassName());
 		assertNotNull(getJavaEntity().getIdClassReference().getIdClass());
 		
-		getJavaEntity().getIdClassReference().setIdClassName(null);
-		assertNull(getJavaEntity().getIdClassReference().getIdClassName());
+		getJavaEntity().getIdClassReference().setSpecifiedIdClassName(null);
+		assertNull(getJavaEntity().getIdClassReference().getSpecifiedIdClassName());
 		assertNull(typeResource.getAnnotation(IdClassAnnotation.ANNOTATION_NAME));
 		assertNull(getJavaEntity().getIdClassReference().getIdClass());
 	}
diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/JavaMappedSuperclassTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/JavaMappedSuperclassTests.java
index 3b1e543035..dc16827d7e 100644
--- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/JavaMappedSuperclassTests.java
+++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/JavaMappedSuperclassTests.java
@@ -61,7 +61,7 @@ public class JavaMappedSuperclassTests extends ContextModelTestCase
 		addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME);
 				
 		MappedSuperclass mappedSuperclass = (MappedSuperclass) getJavaPersistentType().getMapping();
-		mappedSuperclass.getIdClassReference().setIdClassName("myIdClass");
+		mappedSuperclass.getIdClassReference().setSpecifiedIdClassName("myIdClass");
 		
 		getJavaPersistentType().setMappingKey(MappingKeys.ENTITY_TYPE_MAPPING_KEY);
 		assertTrue(getJavaPersistentType().getMapping() instanceof Entity);
@@ -76,7 +76,7 @@ public class JavaMappedSuperclassTests extends ContextModelTestCase
 		addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME);
 				
 		MappedSuperclass mappedSuperclass = (MappedSuperclass) getJavaPersistentType().getMapping();
-		mappedSuperclass.getIdClassReference().setIdClassName("myIdClass");
+		mappedSuperclass.getIdClassReference().setSpecifiedIdClassName("myIdClass");
 
 		getJavaPersistentType().setMappingKey(MappingKeys.EMBEDDABLE_TYPE_MAPPING_KEY);
 		assertTrue(getJavaPersistentType().getMapping() instanceof Embeddable);
@@ -91,7 +91,7 @@ public class JavaMappedSuperclassTests extends ContextModelTestCase
 		addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME);
 				
 		MappedSuperclass mappedSuperclass = (MappedSuperclass) getJavaPersistentType().getMapping();
-		mappedSuperclass.getIdClassReference().setIdClassName("myIdClass");
+		mappedSuperclass.getIdClassReference().setSpecifiedIdClassName("myIdClass");
 
 		getJavaPersistentType().setMappingKey(MappingKeys.NULL_TYPE_MAPPING_KEY);
 		assertTrue(getJavaPersistentType().getMapping() instanceof JavaNullTypeMapping);
@@ -212,32 +212,32 @@ public class JavaMappedSuperclassTests extends ContextModelTestCase
 		IdClassReference idClassRef = mappedSuperclass.getIdClassReference();
 		
 		assertNull(typeResource.getAnnotation(IdClassAnnotation.ANNOTATION_NAME));
-		assertNull(idClassRef.getIdClassName());
+		assertNull(idClassRef.getSpecifiedIdClassName());
 		assertNull(idClassRef.getIdClass());
 		
 		IdClassAnnotation idClass = (IdClassAnnotation) typeResource.addAnnotation(IdClassAnnotation.ANNOTATION_NAME);	
 		assertNotNull(typeResource.getAnnotation(IdClassAnnotation.ANNOTATION_NAME));
-		assertNull(idClassRef.getIdClassName());
+		assertNull(idClassRef.getSpecifiedIdClassName());
 		assertNull(idClassRef.getIdClass());
 		
 		// test setting id class name to nonexistent class.  test class name is set, but class is null
 		String nonExistentIdClassName = PACKAGE_NAME + ".Foo";
 		idClass.setValue(nonExistentIdClassName);
 		assertEquals(nonExistentIdClassName, ((IdClassAnnotation) typeResource.getAnnotation(IdClassAnnotation.ANNOTATION_NAME)).getValue());
-		assertEquals(nonExistentIdClassName, idClassRef.getIdClassName());
+		assertEquals(nonExistentIdClassName, idClassRef.getSpecifiedIdClassName());
 		assertNull(idClassRef.getIdClass());
 		
 		// test setting id class name to existent class.  test class name is set and class is not null
 		String existentIdClassName = PACKAGE_NAME + ".TestTypeId";
 		idClass.setValue(existentIdClassName);
 		assertEquals(existentIdClassName, ((IdClassAnnotation) typeResource.getAnnotation(IdClassAnnotation.ANNOTATION_NAME)).getValue());
-		assertEquals(existentIdClassName, idClassRef.getIdClassName());
+		assertEquals(existentIdClassName, idClassRef.getSpecifiedIdClassName());
 		assertNotNull(idClassRef.getIdClass());
 		
 		//test setting  @IdClass value to null, IdClass annotation is removed
 		idClass.setValue(null);
 		assertNull(typeResource.getAnnotation(IdClassAnnotation.ANNOTATION_NAME));
-		assertNull(idClassRef.getIdClassName());
+		assertNull(idClassRef.getSpecifiedIdClassName());
 		assertNull(idClassRef.getIdClass());
 		
 		//reset @IdClass value and then remove @IdClass
@@ -246,7 +246,7 @@ public class JavaMappedSuperclassTests extends ContextModelTestCase
 		typeResource.removeAnnotation(IdClassAnnotation.ANNOTATION_NAME);
 		getJpaProject().synchronizeContextModel();
 		assertNull(typeResource.getAnnotation(IdClassAnnotation.ANNOTATION_NAME));
-		assertNull(idClassRef.getIdClassName());
+		assertNull(idClassRef.getSpecifiedIdClassName());
 		assertNull(idClassRef.getIdClass());		
 	}
 	
@@ -260,24 +260,24 @@ public class JavaMappedSuperclassTests extends ContextModelTestCase
 		IdClassReference idClassRef = mappedSuperclass.getIdClassReference();
 		
 		assertNull(typeResource.getAnnotation(IdClassAnnotation.ANNOTATION_NAME));
-		assertNull(idClassRef.getIdClassName());
+		assertNull(idClassRef.getSpecifiedIdClassName());
 		assertNull(idClassRef.getIdClass());
 		
 		String nonExistentIdClassName = PACKAGE_NAME + ".Foo";
-		idClassRef.setIdClassName(nonExistentIdClassName);
+		idClassRef.setSpecifiedIdClassName(nonExistentIdClassName);
 		assertEquals(nonExistentIdClassName, ((IdClassAnnotation) typeResource.getAnnotation(IdClassAnnotation.ANNOTATION_NAME)).getValue());
-		assertEquals(nonExistentIdClassName, idClassRef.getIdClassName());
+		assertEquals(nonExistentIdClassName, idClassRef.getSpecifiedIdClassName());
 		assertNull(idClassRef.getIdClass());
 		
 		String existentIdClassName = PACKAGE_NAME + ".TestTypeId";
-		idClassRef.setIdClassName(existentIdClassName);
+		idClassRef.setSpecifiedIdClassName(existentIdClassName);
 		assertEquals(existentIdClassName, ((IdClassAnnotation) typeResource.getAnnotation(IdClassAnnotation.ANNOTATION_NAME)).getValue());
-		assertEquals(existentIdClassName, idClassRef.getIdClassName());
+		assertEquals(existentIdClassName, idClassRef.getSpecifiedIdClassName());
 		assertNotNull(idClassRef.getIdClass());
 		
-		idClassRef.setIdClassName(null);
+		idClassRef.setSpecifiedIdClassName(null);
 		assertNull(typeResource.getAnnotation(IdClassAnnotation.ANNOTATION_NAME));
-		assertNull(idClassRef.getIdClassName());
+		assertNull(idClassRef.getSpecifiedIdClassName());
 		assertNull(idClassRef.getIdClass());
 	}
 }
diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmEntityTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmEntityTests.java
index 9df4728213..f34f064734 100644
--- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmEntityTests.java
+++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmEntityTests.java
@@ -2616,30 +2616,30 @@ public class OrmEntityTests extends ContextModelTestCase
 		IdClassReference idClassRef = ormEntity.getIdClassReference();
 		
 		assertNull(entityResource.getIdClass());
-		assertNull(idClassRef.getIdClassName());
+		assertNull(idClassRef.getSpecifiedIdClassName());
 		assertNull(idClassRef.getIdClass());
 		
 		entityResource.setIdClass(OrmFactory.eINSTANCE.createXmlIdClass());
 		assertNotNull(entityResource.getIdClass());
-		assertNull(idClassRef.getIdClassName());
+		assertNull(idClassRef.getSpecifiedIdClassName());
 		assertNull(idClassRef.getIdClass());
 		
 		String nonExistentIdClassName = PACKAGE_NAME + ".Foo";
 		entityResource.getIdClass().setClassName(nonExistentIdClassName);
 		assertEquals(nonExistentIdClassName, entityResource.getIdClass().getClassName());
-		assertEquals(nonExistentIdClassName, idClassRef.getIdClassName());
+		assertEquals(nonExistentIdClassName, idClassRef.getSpecifiedIdClassName());
 		assertNull(idClassRef.getIdClass());
 		
 		String existentIdClassName = PACKAGE_NAME + ".TestTypeId";
 		entityResource.getIdClass().setClassName(existentIdClassName);
 		assertEquals(existentIdClassName, entityResource.getIdClass().getClassName());
-		assertEquals(existentIdClassName, idClassRef.getIdClassName());
+		assertEquals(existentIdClassName, idClassRef.getSpecifiedIdClassName());
 		assertNotNull(idClassRef.getIdClass());
 		
 		//test setting  @IdClass value to null, id-class tag is not removed
 		entityResource.getIdClass().setClassName(null);
 		assertNotNull(entityResource.getIdClass());
-		assertNull(idClassRef.getIdClassName());
+		assertNull(idClassRef.getSpecifiedIdClassName());
 		assertNull(idClassRef.getIdClass());
 		
 		//reset @IdClass value and then remove id-class tag
@@ -2647,7 +2647,7 @@ public class OrmEntityTests extends ContextModelTestCase
 		entityResource.getIdClass().setClassName("model.Foo");
 		entityResource.setIdClass(null);
 		assertNull(entityResource.getIdClass());
-		assertNull(idClassRef.getIdClassName());
+		assertNull(idClassRef.getSpecifiedIdClassName());
 		assertNull(idClassRef.getIdClass());
 	}
 	
@@ -2661,24 +2661,24 @@ public class OrmEntityTests extends ContextModelTestCase
 		IdClassReference idClassRef = ormEntity.getIdClassReference();
 		
 		assertNull(entityResource.getIdClass());
-		assertNull(idClassRef.getIdClassName());
+		assertNull(idClassRef.getSpecifiedIdClassName());
 		assertNull(idClassRef.getIdClass());
 		
 		String nonExistentIdClassName = PACKAGE_NAME + ".Foo";
-		idClassRef.setIdClassName(nonExistentIdClassName);
+		idClassRef.setSpecifiedIdClassName(nonExistentIdClassName);
 		assertEquals(nonExistentIdClassName, entityResource.getIdClass().getClassName());
-		assertEquals(nonExistentIdClassName, idClassRef.getIdClassName());
+		assertEquals(nonExistentIdClassName, idClassRef.getSpecifiedIdClassName());
 		assertNull(idClassRef.getIdClass());
 		
 		String existentIdClassName = PACKAGE_NAME + ".TestTypeId";
-		idClassRef.setIdClassName(existentIdClassName);
+		idClassRef.setSpecifiedIdClassName(existentIdClassName);
 		assertEquals(existentIdClassName, entityResource.getIdClass().getClassName());
-		assertEquals(existentIdClassName, idClassRef.getIdClassName());
+		assertEquals(existentIdClassName, idClassRef.getSpecifiedIdClassName());
 		assertNotNull(idClassRef.getIdClass());
 		
-		idClassRef.setIdClassName(null);
+		idClassRef.setSpecifiedIdClassName(null);
 		assertNull(entityResource.getIdClass());
-		assertNull(idClassRef.getIdClassName());
+		assertNull(idClassRef.getSpecifiedIdClassName());
 		assertNull(idClassRef.getIdClass());
 	}
 
diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmMappedSuperclassTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmMappedSuperclassTests.java
index 9e0f9d80f0..a2d0e581c0 100644
--- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmMappedSuperclassTests.java
+++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmMappedSuperclassTests.java
@@ -318,30 +318,30 @@ public class OrmMappedSuperclassTests extends ContextModelTestCase
 		IdClassReference idClassRef = ormMappedSuperclass.getIdClassReference();
 		
 		assertNull(mappedSuperclassResource.getIdClass());
-		assertNull(idClassRef.getIdClassName());
+		assertNull(idClassRef.getSpecifiedIdClassName());
 		assertNull(idClassRef.getIdClass());
 		
 		mappedSuperclassResource.setIdClass(OrmFactory.eINSTANCE.createXmlIdClass());
 		assertNotNull(mappedSuperclassResource.getIdClass());
-		assertNull(idClassRef.getIdClassName());
+		assertNull(idClassRef.getSpecifiedIdClassName());
 		assertNull(idClassRef.getIdClass());
 		
 		String nonExistentIdClassName = PACKAGE_NAME + ".Foo";
 		mappedSuperclassResource.getIdClass().setClassName(nonExistentIdClassName);
 		assertEquals(nonExistentIdClassName, mappedSuperclassResource.getIdClass().getClassName());
-		assertEquals(nonExistentIdClassName, idClassRef.getIdClassName());
+		assertEquals(nonExistentIdClassName, idClassRef.getSpecifiedIdClassName());
 		assertNull(idClassRef.getIdClass());
 		
 		String existentIdClassName = PACKAGE_NAME + ".TestTypeId";
 		mappedSuperclassResource.getIdClass().setClassName(existentIdClassName);
 		assertEquals(existentIdClassName, mappedSuperclassResource.getIdClass().getClassName());
-		assertEquals(existentIdClassName, idClassRef.getIdClassName());
+		assertEquals(existentIdClassName, idClassRef.getSpecifiedIdClassName());
 		assertNotNull(idClassRef.getIdClass());
 		
 		//test setting  @IdClass value to null, id-class tag is not removed
 		mappedSuperclassResource.getIdClass().setClassName(null);
 		assertNotNull(mappedSuperclassResource.getIdClass());
-		assertNull(idClassRef.getIdClassName());
+		assertNull(idClassRef.getSpecifiedIdClassName());
 		assertNull(idClassRef.getIdClass());
 		
 		//reset @IdClass value and then remove id-class tag
@@ -349,7 +349,7 @@ public class OrmMappedSuperclassTests extends ContextModelTestCase
 		mappedSuperclassResource.getIdClass().setClassName("model.Foo");
 		mappedSuperclassResource.setIdClass(null);
 		assertNull(mappedSuperclassResource.getIdClass());
-		assertNull(idClassRef.getIdClassName());
+		assertNull(idClassRef.getSpecifiedIdClassName());
 		assertNull(idClassRef.getIdClass());
 	}
 	
@@ -363,24 +363,24 @@ public class OrmMappedSuperclassTests extends ContextModelTestCase
 		IdClassReference idClassRef = ormMappedSuperclass.getIdClassReference();
 		
 		assertNull(mappedSuperclassResource.getIdClass());
-		assertNull(idClassRef.getIdClassName());
+		assertNull(idClassRef.getSpecifiedIdClassName());
 		assertNull(idClassRef.getIdClass());
 		
 		String nonExistentIdClassName = PACKAGE_NAME + ".Foo";
-		idClassRef.setIdClassName(nonExistentIdClassName);
+		idClassRef.setSpecifiedIdClassName(nonExistentIdClassName);
 		assertEquals(nonExistentIdClassName, mappedSuperclassResource.getIdClass().getClassName());
-		assertEquals(nonExistentIdClassName, idClassRef.getIdClassName());
+		assertEquals(nonExistentIdClassName, idClassRef.getSpecifiedIdClassName());
 		assertNull(idClassRef.getIdClass());
 		
 		String existentIdClassName = PACKAGE_NAME + ".TestTypeId";
-		idClassRef.setIdClassName(existentIdClassName);
+		idClassRef.setSpecifiedIdClassName(existentIdClassName);
 		assertEquals(existentIdClassName, mappedSuperclassResource.getIdClass().getClassName());
-		assertEquals(existentIdClassName, idClassRef.getIdClassName());
+		assertEquals(existentIdClassName, idClassRef.getSpecifiedIdClassName());
 		assertNotNull(idClassRef.getIdClass());
 		
-		idClassRef.setIdClassName(null);
+		idClassRef.setSpecifiedIdClassName(null);
 		assertNull(mappedSuperclassResource.getIdClass());
-		assertNull(idClassRef.getIdClassName());
+		assertNull(idClassRef.getSpecifiedIdClassName());
 		assertNull(idClassRef.getIdClass());
 	}
 }
\ No newline at end of file