diff options
Diffstat (limited to 'jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaOneToOneMappingTests.java')
| -rw-r--r-- | jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaOneToOneMappingTests.java | 549 |
1 files changed, 277 insertions, 272 deletions
diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaOneToOneMappingTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaOneToOneMappingTests.java index d4a49e7180..37f87fa678 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaOneToOneMappingTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaOneToOneMappingTests.java @@ -12,6 +12,10 @@ package org.eclipse.jpt.jpa.core.tests.internal.context.java; import java.util.Iterator; import java.util.ListIterator; import org.eclipse.jdt.core.ICompilationUnit; +import org.eclipse.jpt.common.core.resource.java.JavaResourceAnnotatedElement.Kind; +import org.eclipse.jpt.common.core.resource.java.JavaResourceField; +import org.eclipse.jpt.common.core.resource.java.JavaResourceType; +import org.eclipse.jpt.common.core.resource.java.NestableAnnotation; import org.eclipse.jpt.common.core.tests.internal.projects.TestJavaProject.SourceWriter; import org.eclipse.jpt.common.utility.internal.CollectionTools; import org.eclipse.jpt.common.utility.internal.iterators.ArrayIterator; @@ -43,17 +47,12 @@ import org.eclipse.jpt.jpa.core.resource.java.EmbeddedAnnotation; import org.eclipse.jpt.jpa.core.resource.java.EmbeddedIdAnnotation; import org.eclipse.jpt.jpa.core.resource.java.IdAnnotation; import org.eclipse.jpt.jpa.core.resource.java.JPA; -import org.eclipse.jpt.jpa.core.resource.java.JavaResourcePersistentAttribute; -import org.eclipse.jpt.jpa.core.resource.java.JavaResourcePersistentType; import org.eclipse.jpt.jpa.core.resource.java.JoinColumnAnnotation; -import org.eclipse.jpt.jpa.core.resource.java.JoinColumnsAnnotation; import org.eclipse.jpt.jpa.core.resource.java.ManyToManyAnnotation; import org.eclipse.jpt.jpa.core.resource.java.ManyToOneAnnotation; -import org.eclipse.jpt.jpa.core.resource.java.NestableAnnotation; import org.eclipse.jpt.jpa.core.resource.java.OneToManyAnnotation; import org.eclipse.jpt.jpa.core.resource.java.OneToOneAnnotation; import org.eclipse.jpt.jpa.core.resource.java.PrimaryKeyJoinColumnAnnotation; -import org.eclipse.jpt.jpa.core.resource.java.PrimaryKeyJoinColumnsAnnotation; import org.eclipse.jpt.jpa.core.resource.java.TransientAnnotation; import org.eclipse.jpt.jpa.core.resource.java.VersionAnnotation; import org.eclipse.jpt.jpa.core.tests.internal.context.ContextModelTestCase; @@ -214,7 +213,7 @@ public class JavaOneToOneMappingTests extends ContextModelTestCase createTestEntityWithOneToOneMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToOneMapping oneToOneMapping = (OneToOneMapping) persistentAttribute.getMapping(); JoinColumnRelationshipStrategy joinColumns = oneToOneMapping.getRelationship().getJoinColumnStrategy(); joinColumns.addSpecifiedJoinColumn(0); @@ -224,18 +223,18 @@ public class JavaOneToOneMappingTests extends ContextModelTestCase assertTrue(persistentAttribute.getMapping() instanceof BasicMapping); assertFalse(persistentAttribute.getMapping().isDefault()); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - assertNull(attributeResource.getAnnotation(OneToOneAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getAnnotation(BasicAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(JoinColumnAnnotation.ANNOTATION_NAME)); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + assertNull(resourceField.getAnnotation(OneToOneAnnotation.ANNOTATION_NAME)); + assertNotNull(resourceField.getAnnotation(BasicAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(0, JoinColumnAnnotation.ANNOTATION_NAME)); } public void testMorphToDefault() throws Exception { createTestEntityWithOneToOneMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToOneMapping oneToOneMapping = (OneToOneMapping) persistentAttribute.getMapping(); JoinColumnRelationshipStrategy joinColumns = oneToOneMapping.getRelationship().getJoinColumnStrategy(); joinColumns.addSpecifiedJoinColumn(0); @@ -244,17 +243,17 @@ public class JavaOneToOneMappingTests extends ContextModelTestCase persistentAttribute.setMappingKey(MappingKeys.NULL_ATTRIBUTE_MAPPING_KEY); assertTrue(persistentAttribute.getMapping().isDefault()); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - assertNull(attributeResource.getAnnotation(OneToOneAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(JoinColumnAnnotation.ANNOTATION_NAME)); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + assertNull(resourceField.getAnnotation(OneToOneAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(0, JoinColumnAnnotation.ANNOTATION_NAME)); } public void testMorphToVersionMapping() throws Exception { createTestEntityWithOneToOneMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToOneMapping oneToOneMapping = (OneToOneMapping) persistentAttribute.getMapping(); JoinColumnRelationshipStrategy joinColumns = oneToOneMapping.getRelationship().getJoinColumnStrategy(); joinColumns.addSpecifiedJoinColumn(0); @@ -264,18 +263,18 @@ public class JavaOneToOneMappingTests extends ContextModelTestCase assertTrue(persistentAttribute.getMapping() instanceof VersionMapping); assertFalse(persistentAttribute.getMapping().isDefault()); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - assertNull(attributeResource.getAnnotation(OneToOneAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getAnnotation(VersionAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(JoinColumnAnnotation.ANNOTATION_NAME)); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + assertNull(resourceField.getAnnotation(OneToOneAnnotation.ANNOTATION_NAME)); + assertNotNull(resourceField.getAnnotation(VersionAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(0, JoinColumnAnnotation.ANNOTATION_NAME)); } public void testMorphToIdMapping() throws Exception { createTestEntityWithOneToOneMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToOneMapping oneToOneMapping = (OneToOneMapping) persistentAttribute.getMapping(); JoinColumnRelationshipStrategy joinColumns = oneToOneMapping.getRelationship().getJoinColumnStrategy(); joinColumns.addSpecifiedJoinColumn(0); @@ -285,18 +284,18 @@ public class JavaOneToOneMappingTests extends ContextModelTestCase assertTrue(persistentAttribute.getMapping() instanceof IdMapping); assertFalse(persistentAttribute.getMapping().isDefault()); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - assertNull(attributeResource.getAnnotation(OneToOneAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getAnnotation(IdAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(JoinColumnAnnotation.ANNOTATION_NAME)); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + assertNull(resourceField.getAnnotation(OneToOneAnnotation.ANNOTATION_NAME)); + assertNotNull(resourceField.getAnnotation(IdAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(0, JoinColumnAnnotation.ANNOTATION_NAME)); } public void testMorphToEmbeddedMapping() throws Exception { createTestEntityWithOneToOneMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToOneMapping oneToOneMapping = (OneToOneMapping) persistentAttribute.getMapping(); JoinColumnRelationshipStrategy joinColumns = oneToOneMapping.getRelationship().getJoinColumnStrategy(); joinColumns.addSpecifiedJoinColumn(0); @@ -306,18 +305,18 @@ public class JavaOneToOneMappingTests extends ContextModelTestCase assertTrue(persistentAttribute.getMapping() instanceof EmbeddedMapping); assertFalse(persistentAttribute.getMapping().isDefault()); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - assertNull(attributeResource.getAnnotation(OneToOneAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getAnnotation(EmbeddedAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(JoinColumnAnnotation.ANNOTATION_NAME)); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + assertNull(resourceField.getAnnotation(OneToOneAnnotation.ANNOTATION_NAME)); + assertNotNull(resourceField.getAnnotation(EmbeddedAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(0, JoinColumnAnnotation.ANNOTATION_NAME)); } public void testMorphToEmbeddedIdMapping() throws Exception { createTestEntityWithOneToOneMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToOneMapping oneToOneMapping = (OneToOneMapping) persistentAttribute.getMapping(); JoinColumnRelationshipStrategy joinColumns = oneToOneMapping.getRelationship().getJoinColumnStrategy(); joinColumns.addSpecifiedJoinColumn(0); @@ -327,18 +326,18 @@ public class JavaOneToOneMappingTests extends ContextModelTestCase assertTrue(persistentAttribute.getMapping() instanceof EmbeddedIdMapping); assertFalse(persistentAttribute.getMapping().isDefault()); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - assertNull(attributeResource.getAnnotation(OneToOneAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getAnnotation(EmbeddedIdAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(JoinColumnAnnotation.ANNOTATION_NAME)); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + assertNull(resourceField.getAnnotation(OneToOneAnnotation.ANNOTATION_NAME)); + assertNotNull(resourceField.getAnnotation(EmbeddedIdAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(0, JoinColumnAnnotation.ANNOTATION_NAME)); } public void testMorphToTransientMapping() throws Exception { createTestEntityWithOneToOneMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToOneMapping oneToOneMapping = (OneToOneMapping) persistentAttribute.getMapping(); JoinColumnRelationshipStrategy joinColumns = oneToOneMapping.getRelationship().getJoinColumnStrategy(); joinColumns.addSpecifiedJoinColumn(0); @@ -348,18 +347,18 @@ public class JavaOneToOneMappingTests extends ContextModelTestCase assertTrue(persistentAttribute.getMapping() instanceof TransientMapping); assertFalse(persistentAttribute.getMapping().isDefault()); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - assertNull(attributeResource.getAnnotation(OneToOneAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getAnnotation(TransientAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(JoinColumnAnnotation.ANNOTATION_NAME)); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + assertNull(resourceField.getAnnotation(OneToOneAnnotation.ANNOTATION_NAME)); + assertNotNull(resourceField.getAnnotation(TransientAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(0, JoinColumnAnnotation.ANNOTATION_NAME)); } public void testMorphToManyToOneMapping() throws Exception { createTestEntityWithOneToOneMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToOneMapping oneToOneMapping = (OneToOneMapping) persistentAttribute.getMapping(); JoinColumnRelationshipStrategy joinColumns = oneToOneMapping.getRelationship().getJoinColumnStrategy(); joinColumns.addSpecifiedJoinColumn(0); @@ -369,18 +368,18 @@ public class JavaOneToOneMappingTests extends ContextModelTestCase assertTrue(persistentAttribute.getMapping() instanceof ManyToOneMapping); assertFalse(persistentAttribute.getMapping().isDefault()); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - assertNull(attributeResource.getAnnotation(OneToOneAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getAnnotation(ManyToOneAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getAnnotation(JoinColumnAnnotation.ANNOTATION_NAME)); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + assertNull(resourceField.getAnnotation(OneToOneAnnotation.ANNOTATION_NAME)); + assertNotNull(resourceField.getAnnotation(ManyToOneAnnotation.ANNOTATION_NAME)); + assertNotNull(resourceField.getAnnotation(0, JoinColumnAnnotation.ANNOTATION_NAME)); } public void testMorphToOneToManyMapping() throws Exception { createTestEntityWithOneToOneMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToOneMapping oneToOneMapping = (OneToOneMapping) persistentAttribute.getMapping(); JoinColumnRelationshipStrategy joinColumns = oneToOneMapping.getRelationship().getJoinColumnStrategy(); joinColumns.addSpecifiedJoinColumn(0); @@ -390,18 +389,18 @@ public class JavaOneToOneMappingTests extends ContextModelTestCase assertTrue(persistentAttribute.getMapping() instanceof OneToManyMapping); assertFalse(persistentAttribute.getMapping().isDefault()); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - assertNull(attributeResource.getAnnotation(OneToOneAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getAnnotation(OneToManyAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getAnnotation(JoinColumnAnnotation.ANNOTATION_NAME)); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + assertNull(resourceField.getAnnotation(OneToOneAnnotation.ANNOTATION_NAME)); + assertNotNull(resourceField.getAnnotation(OneToManyAnnotation.ANNOTATION_NAME)); + assertNotNull(resourceField.getAnnotation(0, JoinColumnAnnotation.ANNOTATION_NAME)); } public void testMorphToManyToManyMapping() throws Exception { createTestEntityWithOneToOneMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToOneMapping oneToOneMapping = (OneToOneMapping) persistentAttribute.getMapping(); JoinColumnRelationshipStrategy joinColumns = oneToOneMapping.getRelationship().getJoinColumnStrategy(); joinColumns.addSpecifiedJoinColumn(0); @@ -411,11 +410,11 @@ public class JavaOneToOneMappingTests extends ContextModelTestCase assertTrue(persistentAttribute.getMapping() instanceof ManyToManyMapping); assertFalse(persistentAttribute.getMapping().isDefault()); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - assertNull(attributeResource.getAnnotation(OneToOneAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getAnnotation(ManyToManyAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(JoinColumnAnnotation.ANNOTATION_NAME)); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + assertNull(resourceField.getAnnotation(OneToOneAnnotation.ANNOTATION_NAME)); + assertNotNull(resourceField.getAnnotation(ManyToManyAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(0, JoinColumnAnnotation.ANNOTATION_NAME)); } @@ -423,12 +422,12 @@ public class JavaOneToOneMappingTests extends ContextModelTestCase createTestEntityWithOneToOneMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToOneMapping oneToOneMapping = (OneToOneMapping) persistentAttribute.getMapping(); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - OneToOneAnnotation oneToOneAnnotation = (OneToOneAnnotation) attributeResource.getAnnotation(OneToOneAnnotation.ANNOTATION_NAME); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + OneToOneAnnotation oneToOneAnnotation = (OneToOneAnnotation) resourceField.getAnnotation(OneToOneAnnotation.ANNOTATION_NAME); assertNull(oneToOneMapping.getSpecifiedTargetEntity()); assertNull(oneToOneAnnotation.getTargetEntity()); @@ -450,12 +449,12 @@ public class JavaOneToOneMappingTests extends ContextModelTestCase createTestEntityWithOneToOneMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToOneMapping oneToOneMapping = (OneToOneMapping) persistentAttribute.getMapping(); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - OneToOneAnnotation oneToOne = (OneToOneAnnotation) attributeResource.getAnnotation(OneToOneAnnotation.ANNOTATION_NAME); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + OneToOneAnnotation oneToOne = (OneToOneAnnotation) resourceField.getAnnotation(OneToOneAnnotation.ANNOTATION_NAME); assertNull(oneToOneMapping.getSpecifiedTargetEntity()); assertNull(oneToOne.getTargetEntity()); @@ -475,13 +474,13 @@ public class JavaOneToOneMappingTests extends ContextModelTestCase createTestEntityWithOneToOneMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToOneMapping oneToOneMapping = (OneToOneMapping) persistentAttribute.getMapping(); MappedByRelationshipStrategy mappedBy = oneToOneMapping.getRelationship().getMappedByStrategy(); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - OneToOneAnnotation oneToOne = (OneToOneAnnotation) attributeResource.getAnnotation(OneToOneAnnotation.ANNOTATION_NAME); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + OneToOneAnnotation oneToOne = (OneToOneAnnotation) resourceField.getAnnotation(OneToOneAnnotation.ANNOTATION_NAME); assertNull(mappedBy.getMappedByAttribute()); assertNull(oneToOne.getMappedBy()); @@ -503,13 +502,13 @@ public class JavaOneToOneMappingTests extends ContextModelTestCase createTestEntityWithOneToOneMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToOneMapping oneToOneMapping = (OneToOneMapping) persistentAttribute.getMapping(); MappedByRelationshipStrategy mappedBy = oneToOneMapping.getRelationship().getMappedByStrategy(); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - OneToOneAnnotation oneToOne = (OneToOneAnnotation) attributeResource.getAnnotation(OneToOneAnnotation.ANNOTATION_NAME); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + OneToOneAnnotation oneToOne = (OneToOneAnnotation) resourceField.getAnnotation(OneToOneAnnotation.ANNOTATION_NAME); assertNull(mappedBy.getMappedByAttribute()); assertNull(oneToOne.getMappedBy()); @@ -529,12 +528,12 @@ public class JavaOneToOneMappingTests extends ContextModelTestCase createTestEntityWithOneToOneMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToOneMapping oneToOneMapping = (OneToOneMapping) persistentAttribute.getMapping(); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - OneToOneAnnotation oneToOne = (OneToOneAnnotation) attributeResource.getAnnotation(OneToOneAnnotation.ANNOTATION_NAME); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + OneToOneAnnotation oneToOne = (OneToOneAnnotation) resourceField.getAnnotation(OneToOneAnnotation.ANNOTATION_NAME); assertNull(oneToOneMapping.getSpecifiedOptional()); assertNull(oneToOne.getOptional()); @@ -562,12 +561,12 @@ public class JavaOneToOneMappingTests extends ContextModelTestCase createTestEntityWithOneToOneMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToOneMapping oneToOneMapping = (OneToOneMapping) persistentAttribute.getMapping(); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - OneToOneAnnotation oneToOne = (OneToOneAnnotation) attributeResource.getAnnotation(OneToOneAnnotation.ANNOTATION_NAME); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + OneToOneAnnotation oneToOne = (OneToOneAnnotation) resourceField.getAnnotation(OneToOneAnnotation.ANNOTATION_NAME); assertNull(oneToOneMapping.getSpecifiedOptional()); assertNull(oneToOne.getOptional()); @@ -592,12 +591,12 @@ public class JavaOneToOneMappingTests extends ContextModelTestCase createTestEntityWithOneToOneMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToOneMapping oneToOneMapping = (OneToOneMapping) persistentAttribute.getMapping(); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - OneToOneAnnotation oneToOne = (OneToOneAnnotation) attributeResource.getAnnotation(OneToOneAnnotation.ANNOTATION_NAME); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + OneToOneAnnotation oneToOne = (OneToOneAnnotation) resourceField.getAnnotation(OneToOneAnnotation.ANNOTATION_NAME); assertNull(oneToOneMapping.getSpecifiedFetch()); assertNull(oneToOne.getFetch()); @@ -624,12 +623,12 @@ public class JavaOneToOneMappingTests extends ContextModelTestCase createTestEntityWithOneToOneMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToOneMapping oneToOneMapping = (OneToOneMapping) persistentAttribute.getMapping(); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - OneToOneAnnotation oneToOne = (OneToOneAnnotation) attributeResource.getAnnotation(OneToOneAnnotation.ANNOTATION_NAME); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + OneToOneAnnotation oneToOne = (OneToOneAnnotation) resourceField.getAnnotation(OneToOneAnnotation.ANNOTATION_NAME); assertNull(oneToOneMapping.getSpecifiedFetch()); assertNull(oneToOne.getFetch()); @@ -653,69 +652,69 @@ public class JavaOneToOneMappingTests extends ContextModelTestCase createTestEntityWithOneToOneMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToOneMapping oneToOneMapping = (OneToOneMapping) persistentAttribute.getMapping(); JoinColumnRelationshipStrategy joinColumns = oneToOneMapping.getRelationship().getJoinColumnStrategy(); - ListIterator<? extends JoinColumn> specifiedJoinColumns = joinColumns.specifiedJoinColumns(); + ListIterator<? extends JoinColumn> specifiedJoinColumns = joinColumns.getSpecifiedJoinColumns().iterator(); assertFalse(specifiedJoinColumns.hasNext()); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); //add an annotation to the resource model and verify the context model is updated - JoinColumnAnnotation joinColumn = (JoinColumnAnnotation) attributeResource.addAnnotation(0, JPA.JOIN_COLUMN, JPA.JOIN_COLUMNS); + JoinColumnAnnotation joinColumn = (JoinColumnAnnotation) resourceField.addAnnotation(0, JPA.JOIN_COLUMN); joinColumn.setName("FOO"); getJpaProject().synchronizeContextModel(); - specifiedJoinColumns = joinColumns.specifiedJoinColumns(); + specifiedJoinColumns = joinColumns.getSpecifiedJoinColumns().iterator(); assertEquals("FOO", specifiedJoinColumns.next().getName()); assertFalse(specifiedJoinColumns.hasNext()); - joinColumn = (JoinColumnAnnotation) attributeResource.addAnnotation(0, JPA.JOIN_COLUMN, JPA.JOIN_COLUMNS); + joinColumn = (JoinColumnAnnotation) resourceField.addAnnotation(0, JPA.JOIN_COLUMN); joinColumn.setName("BAR"); getJpaProject().synchronizeContextModel(); - specifiedJoinColumns = joinColumns.specifiedJoinColumns(); + specifiedJoinColumns = joinColumns.getSpecifiedJoinColumns().iterator(); assertEquals("BAR", specifiedJoinColumns.next().getName()); assertEquals("FOO", specifiedJoinColumns.next().getName()); assertFalse(specifiedJoinColumns.hasNext()); - joinColumn = (JoinColumnAnnotation) attributeResource.addAnnotation(0, JPA.JOIN_COLUMN, JPA.JOIN_COLUMNS); + joinColumn = (JoinColumnAnnotation) resourceField.addAnnotation(0, JPA.JOIN_COLUMN); joinColumn.setName("BAZ"); getJpaProject().synchronizeContextModel(); - specifiedJoinColumns = joinColumns.specifiedJoinColumns(); + specifiedJoinColumns = joinColumns.getSpecifiedJoinColumns().iterator(); assertEquals("BAZ", specifiedJoinColumns.next().getName()); assertEquals("BAR", specifiedJoinColumns.next().getName()); assertEquals("FOO", specifiedJoinColumns.next().getName()); assertFalse(specifiedJoinColumns.hasNext()); //move an annotation to the resource model and verify the context model is updated - attributeResource.moveAnnotation(1, 0, JPA.JOIN_COLUMNS); + resourceField.moveAnnotation(1, 0, JPA.JOIN_COLUMN); getJpaProject().synchronizeContextModel(); - specifiedJoinColumns = joinColumns.specifiedJoinColumns(); + specifiedJoinColumns = joinColumns.getSpecifiedJoinColumns().iterator(); assertEquals("BAR", specifiedJoinColumns.next().getName()); assertEquals("BAZ", specifiedJoinColumns.next().getName()); assertEquals("FOO", specifiedJoinColumns.next().getName()); assertFalse(specifiedJoinColumns.hasNext()); - attributeResource.removeAnnotation(0, JPA.JOIN_COLUMN, JPA.JOIN_COLUMNS); + resourceField.removeAnnotation(0, JPA.JOIN_COLUMN); getJpaProject().synchronizeContextModel(); - specifiedJoinColumns = joinColumns.specifiedJoinColumns(); + specifiedJoinColumns = joinColumns.getSpecifiedJoinColumns().iterator(); assertEquals("BAZ", specifiedJoinColumns.next().getName()); assertEquals("FOO", specifiedJoinColumns.next().getName()); assertFalse(specifiedJoinColumns.hasNext()); - attributeResource.removeAnnotation(0, JPA.JOIN_COLUMN, JPA.JOIN_COLUMNS); + resourceField.removeAnnotation(0, JPA.JOIN_COLUMN); getJpaProject().synchronizeContextModel(); - specifiedJoinColumns = joinColumns.specifiedJoinColumns(); + specifiedJoinColumns = joinColumns.getSpecifiedJoinColumns().iterator(); assertEquals("FOO", specifiedJoinColumns.next().getName()); assertFalse(specifiedJoinColumns.hasNext()); - attributeResource.removeAnnotation(0, JPA.JOIN_COLUMN, JPA.JOIN_COLUMNS); + resourceField.removeAnnotation(0, JPA.JOIN_COLUMN); getJpaProject().synchronizeContextModel(); - specifiedJoinColumns = joinColumns.specifiedJoinColumns(); + specifiedJoinColumns = joinColumns.getSpecifiedJoinColumns().iterator(); assertFalse(specifiedJoinColumns.hasNext()); } @@ -727,49 +726,49 @@ public class JavaOneToOneMappingTests extends ContextModelTestCase createTestEntityWithOneToOneMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToOneMapping oneToOneMapping = (OneToOneMapping) persistentAttribute.getMapping(); JoinColumnRelationshipStrategy joinColumns = oneToOneMapping.getRelationship().getJoinColumnStrategy(); - assertEquals(0, joinColumns.specifiedJoinColumnsSize()); + assertEquals(0, joinColumns.getSpecifiedJoinColumnsSize()); joinColumns.addSpecifiedJoinColumn(0); - assertEquals(1, joinColumns.specifiedJoinColumnsSize()); + assertEquals(1, joinColumns.getSpecifiedJoinColumnsSize()); joinColumns.removeSpecifiedJoinColumn(0); - assertEquals(0, joinColumns.specifiedJoinColumnsSize()); + assertEquals(0, joinColumns.getSpecifiedJoinColumnsSize()); } public void testJoinColumnsSize() throws Exception { createTestEntityWithOneToOneMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToOneMapping oneToOneMapping = (OneToOneMapping) persistentAttribute.getMapping(); JoinColumnRelationshipStrategy joinColumns = oneToOneMapping.getRelationship().getJoinColumnStrategy(); - assertEquals(1, joinColumns.joinColumnsSize()); + assertEquals(1, joinColumns.getJoinColumnsSize()); joinColumns.addSpecifiedJoinColumn(0); - assertEquals(1, joinColumns.joinColumnsSize()); + assertEquals(1, joinColumns.getJoinColumnsSize()); joinColumns.addSpecifiedJoinColumn(0); - assertEquals(2, joinColumns.joinColumnsSize()); + assertEquals(2, joinColumns.getJoinColumnsSize()); joinColumns.removeSpecifiedJoinColumn(0); joinColumns.removeSpecifiedJoinColumn(0); - assertEquals(1, joinColumns.joinColumnsSize()); + assertEquals(1, joinColumns.getJoinColumnsSize()); //if non-owning side of the relationship then no default join column oneToOneMapping.getRelationship().getMappedByStrategy().setMappedByAttribute("foo"); - assertEquals(0, joinColumns.joinColumnsSize()); + assertEquals(0, joinColumns.getJoinColumnsSize()); } public void testAddSpecifiedJoinColumn() throws Exception { createTestEntityWithOneToOneMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToOneMapping oneToOneMapping = (OneToOneMapping) persistentAttribute.getMapping(); JoinColumnRelationshipStrategy joinColumns = oneToOneMapping.getRelationship().getJoinColumnStrategy(); @@ -777,10 +776,10 @@ public class JavaOneToOneMappingTests extends ContextModelTestCase joinColumns.addSpecifiedJoinColumn(0).setSpecifiedName("BAR"); joinColumns.addSpecifiedJoinColumn(0).setSpecifiedName("BAZ"); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); Iterator<NestableAnnotation> joinColumnsIterator = - attributeResource.annotations(JoinColumnAnnotation.ANNOTATION_NAME, JoinColumnsAnnotation.ANNOTATION_NAME); + resourceField.getAnnotations(JPA.JOIN_COLUMN).iterator(); assertEquals("BAZ", ((JoinColumnAnnotation) joinColumnsIterator.next()).getName()); assertEquals("BAR", ((JoinColumnAnnotation) joinColumnsIterator.next()).getName()); @@ -792,7 +791,7 @@ public class JavaOneToOneMappingTests extends ContextModelTestCase createTestEntityWithOneToOneMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToOneMapping oneToOneMapping = (OneToOneMapping) persistentAttribute.getMapping(); JoinColumnRelationshipStrategy joinColumns = oneToOneMapping.getRelationship().getJoinColumnStrategy(); @@ -800,10 +799,10 @@ public class JavaOneToOneMappingTests extends ContextModelTestCase joinColumns.addSpecifiedJoinColumn(1).setSpecifiedName("BAR"); joinColumns.addSpecifiedJoinColumn(2).setSpecifiedName("BAZ"); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); Iterator<NestableAnnotation> joinColumnsIterator = - attributeResource.annotations(JoinColumnAnnotation.ANNOTATION_NAME, JoinColumnsAnnotation.ANNOTATION_NAME); + resourceField.getAnnotations(JPA.JOIN_COLUMN).iterator(); assertEquals("FOO", ((JoinColumnAnnotation) joinColumnsIterator.next()).getName()); assertEquals("BAR", ((JoinColumnAnnotation) joinColumnsIterator.next()).getName()); @@ -814,7 +813,7 @@ public class JavaOneToOneMappingTests extends ContextModelTestCase createTestEntityWithOneToOneMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToOneMapping oneToOneMapping = (OneToOneMapping) persistentAttribute.getMapping(); JoinColumnRelationshipStrategy joinColumns = oneToOneMapping.getRelationship().getJoinColumnStrategy(); @@ -822,48 +821,48 @@ public class JavaOneToOneMappingTests extends ContextModelTestCase joinColumns.addSpecifiedJoinColumn(1).setSpecifiedName("BAR"); joinColumns.addSpecifiedJoinColumn(2).setSpecifiedName("BAZ"); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); - assertEquals(3, CollectionTools.size(attributeResource.annotations(JoinColumnAnnotation.ANNOTATION_NAME, JoinColumnsAnnotation.ANNOTATION_NAME))); + assertEquals(3, resourceField.getAnnotationsSize(JPA.JOIN_COLUMN)); joinColumns.removeSpecifiedJoinColumn(1); - Iterator<NestableAnnotation> joinColumnResources = attributeResource.annotations(JoinColumnAnnotation.ANNOTATION_NAME, JoinColumnsAnnotation.ANNOTATION_NAME); + Iterator<NestableAnnotation> joinColumnResources = resourceField.getAnnotations(JPA.JOIN_COLUMN).iterator(); assertEquals("FOO", ((JoinColumnAnnotation) joinColumnResources.next()).getName()); assertEquals("BAZ", ((JoinColumnAnnotation) joinColumnResources.next()).getName()); assertFalse(joinColumnResources.hasNext()); - Iterator<? extends JoinColumn> joinColumnsIterator = joinColumns.specifiedJoinColumns(); + Iterator<? extends JoinColumn> joinColumnsIterator = joinColumns.getSpecifiedJoinColumns().iterator(); assertEquals("FOO", joinColumnsIterator.next().getName()); assertEquals("BAZ", joinColumnsIterator.next().getName()); assertFalse(joinColumnsIterator.hasNext()); joinColumns.removeSpecifiedJoinColumn(1); - joinColumnResources = attributeResource.annotations(JoinColumnAnnotation.ANNOTATION_NAME, JoinColumnsAnnotation.ANNOTATION_NAME); + joinColumnResources = resourceField.getAnnotations(JPA.JOIN_COLUMN).iterator(); assertEquals("FOO", ((JoinColumnAnnotation) joinColumnResources.next()).getName()); assertFalse(joinColumnResources.hasNext()); - joinColumnsIterator = joinColumns.specifiedJoinColumns(); + joinColumnsIterator = joinColumns.getSpecifiedJoinColumns().iterator(); assertEquals("FOO", joinColumnsIterator.next().getName()); assertFalse(joinColumnsIterator.hasNext()); joinColumns.removeSpecifiedJoinColumn(0); - joinColumnResources = attributeResource.annotations(JoinColumnAnnotation.ANNOTATION_NAME, JoinColumnsAnnotation.ANNOTATION_NAME); + joinColumnResources = resourceField.getAnnotations(JPA.JOIN_COLUMN).iterator(); assertFalse(joinColumnResources.hasNext()); - joinColumnsIterator = joinColumns.specifiedJoinColumns(); + joinColumnsIterator = joinColumns.getSpecifiedJoinColumns().iterator(); assertFalse(joinColumnsIterator.hasNext()); - assertNull(attributeResource.getAnnotation(JoinColumnsAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(0, JoinColumnAnnotation.ANNOTATION_NAME)); } public void testMoveSpecifiedJoinColumn() throws Exception { createTestEntityWithOneToOneMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToOneMapping oneToOneMapping = (OneToOneMapping) persistentAttribute.getMapping(); JoinColumnRelationshipStrategy joinColumns = oneToOneMapping.getRelationship().getJoinColumnStrategy(); @@ -871,31 +870,32 @@ public class JavaOneToOneMappingTests extends ContextModelTestCase joinColumns.addSpecifiedJoinColumn(1).setSpecifiedName("BAR"); joinColumns.addSpecifiedJoinColumn(2).setSpecifiedName("BAZ"); - JavaResourcePersistentAttribute attributeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME).persistableAttributes().next(); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); - Iterator<NestableAnnotation> javaJoinColumns = attributeResource.annotations(JoinColumnAnnotation.ANNOTATION_NAME, JoinColumnsAnnotation.ANNOTATION_NAME); + Iterator<NestableAnnotation> javaJoinColumns = resourceField.getAnnotations(JPA.JOIN_COLUMN).iterator(); assertEquals(3, CollectionTools.size(javaJoinColumns)); joinColumns.moveSpecifiedJoinColumn(2, 0); - ListIterator<? extends JoinColumn> primaryKeyJoinColumns = joinColumns.specifiedJoinColumns(); + ListIterator<? extends JoinColumn> primaryKeyJoinColumns = joinColumns.getSpecifiedJoinColumns().iterator(); assertEquals("BAR", primaryKeyJoinColumns.next().getSpecifiedName()); assertEquals("BAZ", primaryKeyJoinColumns.next().getSpecifiedName()); assertEquals("FOO", primaryKeyJoinColumns.next().getSpecifiedName()); - javaJoinColumns = attributeResource.annotations(JoinColumnAnnotation.ANNOTATION_NAME, JoinColumnsAnnotation.ANNOTATION_NAME); + javaJoinColumns = resourceField.getAnnotations(JPA.JOIN_COLUMN).iterator(); assertEquals("BAR", ((JoinColumnAnnotation) javaJoinColumns.next()).getName()); assertEquals("BAZ", ((JoinColumnAnnotation) javaJoinColumns.next()).getName()); assertEquals("FOO", ((JoinColumnAnnotation) javaJoinColumns.next()).getName()); joinColumns.moveSpecifiedJoinColumn(0, 1); - primaryKeyJoinColumns = joinColumns.specifiedJoinColumns(); + primaryKeyJoinColumns = joinColumns.getSpecifiedJoinColumns().iterator(); assertEquals("BAZ", primaryKeyJoinColumns.next().getSpecifiedName()); assertEquals("BAR", primaryKeyJoinColumns.next().getSpecifiedName()); assertEquals("FOO", primaryKeyJoinColumns.next().getSpecifiedName()); - javaJoinColumns = attributeResource.annotations(JoinColumnAnnotation.ANNOTATION_NAME, JoinColumnsAnnotation.ANNOTATION_NAME); + javaJoinColumns = resourceField.getAnnotations(JPA.JOIN_COLUMN).iterator(); assertEquals("BAZ", ((JoinColumnAnnotation) javaJoinColumns.next()).getName()); assertEquals("BAR", ((JoinColumnAnnotation) javaJoinColumns.next()).getName()); assertEquals("FOO", ((JoinColumnAnnotation) javaJoinColumns.next()).getName()); @@ -905,54 +905,55 @@ public class JavaOneToOneMappingTests extends ContextModelTestCase createTestEntityWithOneToOneMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToOneMapping oneToOneMapping = (OneToOneMapping) persistentAttribute.getMapping(); JoinColumnRelationshipStrategy joinColumns = oneToOneMapping.getRelationship().getJoinColumnStrategy(); - JavaResourcePersistentAttribute attributeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME).persistableAttributes().next(); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); - ((JoinColumnAnnotation) attributeResource.addAnnotation(0, JoinColumnAnnotation.ANNOTATION_NAME, JoinColumnsAnnotation.ANNOTATION_NAME)).setName("FOO"); - ((JoinColumnAnnotation) attributeResource.addAnnotation(1, JoinColumnAnnotation.ANNOTATION_NAME, JoinColumnsAnnotation.ANNOTATION_NAME)).setName("BAR"); - ((JoinColumnAnnotation) attributeResource.addAnnotation(2, JoinColumnAnnotation.ANNOTATION_NAME, JoinColumnsAnnotation.ANNOTATION_NAME)).setName("BAZ"); + ((JoinColumnAnnotation) resourceField.addAnnotation(0, JPA.JOIN_COLUMN)).setName("FOO"); + ((JoinColumnAnnotation) resourceField.addAnnotation(1, JPA.JOIN_COLUMN)).setName("BAR"); + ((JoinColumnAnnotation) resourceField.addAnnotation(2, JPA.JOIN_COLUMN)).setName("BAZ"); getJpaProject().synchronizeContextModel(); - ListIterator<? extends JoinColumn> joinColumnsIterator = joinColumns.specifiedJoinColumns(); + ListIterator<? extends JoinColumn> joinColumnsIterator = joinColumns.getSpecifiedJoinColumns().iterator(); assertEquals("FOO", joinColumnsIterator.next().getName()); assertEquals("BAR", joinColumnsIterator.next().getName()); assertEquals("BAZ", joinColumnsIterator.next().getName()); assertFalse(joinColumnsIterator.hasNext()); - attributeResource.moveAnnotation(2, 0, JoinColumnsAnnotation.ANNOTATION_NAME); + resourceField.moveAnnotation(2, 0, JoinColumnAnnotation.ANNOTATION_NAME); getJpaProject().synchronizeContextModel(); - joinColumnsIterator = joinColumns.specifiedJoinColumns(); + joinColumnsIterator = joinColumns.getSpecifiedJoinColumns().iterator(); assertEquals("BAR", joinColumnsIterator.next().getName()); assertEquals("BAZ", joinColumnsIterator.next().getName()); assertEquals("FOO", joinColumnsIterator.next().getName()); assertFalse(joinColumnsIterator.hasNext()); - attributeResource.moveAnnotation(0, 1, JoinColumnsAnnotation.ANNOTATION_NAME); + resourceField.moveAnnotation(0, 1, JoinColumnAnnotation.ANNOTATION_NAME); getJpaProject().synchronizeContextModel(); - joinColumnsIterator = joinColumns.specifiedJoinColumns(); + joinColumnsIterator = joinColumns.getSpecifiedJoinColumns().iterator(); assertEquals("BAZ", joinColumnsIterator.next().getName()); assertEquals("BAR", joinColumnsIterator.next().getName()); assertEquals("FOO", joinColumnsIterator.next().getName()); assertFalse(joinColumnsIterator.hasNext()); - attributeResource.removeAnnotation(1, JoinColumnAnnotation.ANNOTATION_NAME, JoinColumnsAnnotation.ANNOTATION_NAME); + resourceField.removeAnnotation(1, JPA.JOIN_COLUMN); getJpaProject().synchronizeContextModel(); - joinColumnsIterator = joinColumns.specifiedJoinColumns(); + joinColumnsIterator = joinColumns.getSpecifiedJoinColumns().iterator(); assertEquals("BAZ", joinColumnsIterator.next().getName()); assertEquals("FOO", joinColumnsIterator.next().getName()); assertFalse(joinColumnsIterator.hasNext()); - attributeResource.removeAnnotation(1, JoinColumnAnnotation.ANNOTATION_NAME, JoinColumnsAnnotation.ANNOTATION_NAME); + resourceField.removeAnnotation(1, JPA.JOIN_COLUMN); getJpaProject().synchronizeContextModel(); - joinColumnsIterator = joinColumns.specifiedJoinColumns(); + joinColumnsIterator = joinColumns.getSpecifiedJoinColumns().iterator(); assertEquals("BAZ", joinColumnsIterator.next().getName()); assertFalse(joinColumnsIterator.hasNext()); - attributeResource.removeAnnotation(0, JoinColumnAnnotation.ANNOTATION_NAME, JoinColumnsAnnotation.ANNOTATION_NAME); + resourceField.removeAnnotation(0, JPA.JOIN_COLUMN); getJpaProject().synchronizeContextModel(); - joinColumnsIterator = joinColumns.specifiedJoinColumns(); + joinColumnsIterator = joinColumns.getSpecifiedJoinColumns().iterator(); assertFalse(joinColumnsIterator.hasNext()); } @@ -960,14 +961,14 @@ public class JavaOneToOneMappingTests extends ContextModelTestCase createTestEntityWithOneToOneMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToOneMapping oneToOneMapping = (OneToOneMapping) persistentAttribute.getMapping(); JoinColumnRelationshipStrategy joinColumns = oneToOneMapping.getRelationship().getJoinColumnStrategy(); assertTrue(joinColumns.getDefaultJoinColumn().isDefault()); joinColumns.addSpecifiedJoinColumn(0); - JoinColumn specifiedJoinColumn = joinColumns.specifiedJoinColumns().next(); + JoinColumn specifiedJoinColumn = joinColumns.getSpecifiedJoinColumns().iterator().next(); assertFalse(specifiedJoinColumn.isDefault()); assertNull(joinColumns.getDefaultJoinColumn()); @@ -981,7 +982,7 @@ public class JavaOneToOneMappingTests extends ContextModelTestCase addXmlClassRef(PACKAGE_NAME + ".Address"); addXmlClassRef(PACKAGE_NAME + ".State"); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToOneMapping oneToOneMapping = (OneToOneMapping) persistentAttribute.getMapping(); Iterator<String> attributeNames = @@ -1015,7 +1016,7 @@ public class JavaOneToOneMappingTests extends ContextModelTestCase createTestTargetEntityAddress(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToOneMapping oneToOneMapping = (OneToOneMapping) persistentAttribute.getMapping(); //targetEntity not in the persistence unit, default still set, handled by validation @@ -1029,7 +1030,7 @@ public class JavaOneToOneMappingTests extends ContextModelTestCase oneToOneMapping.setSpecifiedTargetEntity("foo"); assertEquals(PACKAGE_NAME + ".Address", oneToOneMapping.getDefaultTargetEntity()); - ListIterator<ClassRef> classRefs = getPersistenceUnit().specifiedClassRefs(); + ListIterator<ClassRef> classRefs = getPersistenceUnit().getSpecifiedClassRefs().iterator(); classRefs.next(); ClassRef addressClassRef = classRefs.next(); JavaPersistentType addressPersistentType = addressClassRef.getJavaPersistentType(); @@ -1045,7 +1046,7 @@ public class JavaOneToOneMappingTests extends ContextModelTestCase addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); addXmlClassRef(PACKAGE_NAME + ".Address"); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToOneMapping oneToOneMapping = (OneToOneMapping) persistentAttribute.getMapping(); assertNull(oneToOneMapping.getDefaultTargetEntity()); @@ -1057,7 +1058,7 @@ public class JavaOneToOneMappingTests extends ContextModelTestCase addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); addXmlClassRef(PACKAGE_NAME + ".Address"); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToOneMapping oneToOneMapping = (OneToOneMapping) persistentAttribute.getMapping(); assertNull(oneToOneMapping.getDefaultTargetEntity()); @@ -1068,7 +1069,7 @@ public class JavaOneToOneMappingTests extends ContextModelTestCase createTestTargetEntityAddress(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToOneMapping oneToOneMapping = (OneToOneMapping) persistentAttribute.getMapping(); assertEquals(PACKAGE_NAME + ".Address", oneToOneMapping.getTargetEntity()); @@ -1084,7 +1085,7 @@ public class JavaOneToOneMappingTests extends ContextModelTestCase createTestEntityWithValidOneToOneMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToOneMapping oneToOneMapping = (OneToOneMapping) persistentAttribute.getMapping(); //targetEntity not in the persistence unit @@ -1093,7 +1094,7 @@ public class JavaOneToOneMappingTests extends ContextModelTestCase //add targetEntity to the persistence unit, now target entity should resolve createTestTargetEntityAddress(); addXmlClassRef(PACKAGE_NAME + ".Address"); - ListIterator<ClassRef> classRefs = getPersistenceUnit().specifiedClassRefs(); + ListIterator<ClassRef> classRefs = getPersistenceUnit().getSpecifiedClassRefs().iterator(); classRefs.next(); ClassRef addressClassRef = classRefs.next(); TypeMapping addressTypeMapping = addressClassRef.getJavaPersistentType().getMapping(); @@ -1116,69 +1117,69 @@ public class JavaOneToOneMappingTests extends ContextModelTestCase createTestEntityWithOneToOneMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToOneMapping oneToOneMapping = (OneToOneMapping) persistentAttribute.getMapping(); PrimaryKeyJoinColumnRelationshipStrategy strategy = oneToOneMapping.getRelationship().getPrimaryKeyJoinColumnStrategy(); - Iterator<PrimaryKeyJoinColumn> primaryKeyJoinColumns = CollectionTools.iterable(strategy.primaryKeyJoinColumns()).iterator(); + Iterator<? extends PrimaryKeyJoinColumn> primaryKeyJoinColumns = strategy.getPrimaryKeyJoinColumns().iterator(); assertFalse(primaryKeyJoinColumns.hasNext()); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); //add an annotation to the resource model and verify the context model is updated - PrimaryKeyJoinColumnAnnotation joinColumn = (PrimaryKeyJoinColumnAnnotation) attributeResource.addAnnotation(0, JPA.PRIMARY_KEY_JOIN_COLUMN, JPA.PRIMARY_KEY_JOIN_COLUMNS); + PrimaryKeyJoinColumnAnnotation joinColumn = (PrimaryKeyJoinColumnAnnotation) resourceField.addAnnotation(0, JPA.PRIMARY_KEY_JOIN_COLUMN); joinColumn.setName("FOO"); getJpaProject().synchronizeContextModel(); - primaryKeyJoinColumns = (Iterator<PrimaryKeyJoinColumn>) strategy.primaryKeyJoinColumns(); + primaryKeyJoinColumns = strategy.getPrimaryKeyJoinColumns().iterator(); assertEquals("FOO", primaryKeyJoinColumns.next().getName()); assertFalse(primaryKeyJoinColumns.hasNext()); - joinColumn = (PrimaryKeyJoinColumnAnnotation) attributeResource.addAnnotation(0, JPA.PRIMARY_KEY_JOIN_COLUMN, JPA.PRIMARY_KEY_JOIN_COLUMNS); + joinColumn = (PrimaryKeyJoinColumnAnnotation) resourceField.addAnnotation(0, JPA.PRIMARY_KEY_JOIN_COLUMN); joinColumn.setName("BAR"); getJpaProject().synchronizeContextModel(); - primaryKeyJoinColumns = (Iterator<PrimaryKeyJoinColumn>) strategy.primaryKeyJoinColumns(); + primaryKeyJoinColumns = strategy.getPrimaryKeyJoinColumns().iterator(); assertEquals("BAR", primaryKeyJoinColumns.next().getName()); assertEquals("FOO", primaryKeyJoinColumns.next().getName()); assertFalse(primaryKeyJoinColumns.hasNext()); - joinColumn = (PrimaryKeyJoinColumnAnnotation) attributeResource.addAnnotation(0, JPA.PRIMARY_KEY_JOIN_COLUMN, JPA.PRIMARY_KEY_JOIN_COLUMNS); + joinColumn = (PrimaryKeyJoinColumnAnnotation) resourceField.addAnnotation(0, JPA.PRIMARY_KEY_JOIN_COLUMN); joinColumn.setName("BAZ"); getJpaProject().synchronizeContextModel(); - primaryKeyJoinColumns = (Iterator<PrimaryKeyJoinColumn>) strategy.primaryKeyJoinColumns(); + primaryKeyJoinColumns = strategy.getPrimaryKeyJoinColumns().iterator(); assertEquals("BAZ", primaryKeyJoinColumns.next().getName()); assertEquals("BAR", primaryKeyJoinColumns.next().getName()); assertEquals("FOO", primaryKeyJoinColumns.next().getName()); assertFalse(primaryKeyJoinColumns.hasNext()); //move an annotation to the resource model and verify the context model is updated - attributeResource.moveAnnotation(1, 0, JPA.PRIMARY_KEY_JOIN_COLUMNS); + resourceField.moveAnnotation(1, 0, JPA.PRIMARY_KEY_JOIN_COLUMN); getJpaProject().synchronizeContextModel(); - primaryKeyJoinColumns = (Iterator<PrimaryKeyJoinColumn>) strategy.primaryKeyJoinColumns(); + primaryKeyJoinColumns = strategy.getPrimaryKeyJoinColumns().iterator(); assertEquals("BAR", primaryKeyJoinColumns.next().getName()); assertEquals("BAZ", primaryKeyJoinColumns.next().getName()); assertEquals("FOO", primaryKeyJoinColumns.next().getName()); assertFalse(primaryKeyJoinColumns.hasNext()); - attributeResource.removeAnnotation(0, JPA.PRIMARY_KEY_JOIN_COLUMN, JPA.PRIMARY_KEY_JOIN_COLUMNS); + resourceField.removeAnnotation(0, JPA.PRIMARY_KEY_JOIN_COLUMN); getJpaProject().synchronizeContextModel(); - primaryKeyJoinColumns = (Iterator<PrimaryKeyJoinColumn>) strategy.primaryKeyJoinColumns(); + primaryKeyJoinColumns = strategy.getPrimaryKeyJoinColumns().iterator(); assertEquals("BAZ", primaryKeyJoinColumns.next().getName()); assertEquals("FOO", primaryKeyJoinColumns.next().getName()); assertFalse(primaryKeyJoinColumns.hasNext()); - attributeResource.removeAnnotation(0, JPA.PRIMARY_KEY_JOIN_COLUMN, JPA.PRIMARY_KEY_JOIN_COLUMNS); + resourceField.removeAnnotation(0, JPA.PRIMARY_KEY_JOIN_COLUMN); getJpaProject().synchronizeContextModel(); - primaryKeyJoinColumns = (Iterator<PrimaryKeyJoinColumn>) strategy.primaryKeyJoinColumns(); + primaryKeyJoinColumns = strategy.getPrimaryKeyJoinColumns().iterator(); assertEquals("FOO", primaryKeyJoinColumns.next().getName()); assertFalse(primaryKeyJoinColumns.hasNext()); - attributeResource.removeAnnotation(0, JPA.PRIMARY_KEY_JOIN_COLUMN, JPA.PRIMARY_KEY_JOIN_COLUMNS); + resourceField.removeAnnotation(0, JPA.PRIMARY_KEY_JOIN_COLUMN); getJpaProject().synchronizeContextModel(); - primaryKeyJoinColumns = (Iterator<PrimaryKeyJoinColumn>) strategy.primaryKeyJoinColumns(); + primaryKeyJoinColumns = strategy.getPrimaryKeyJoinColumns().iterator(); assertFalse(primaryKeyJoinColumns.hasNext()); } @@ -1186,25 +1187,25 @@ public class JavaOneToOneMappingTests extends ContextModelTestCase createTestEntityWithOneToOneMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToOneMapping oneToOneMapping = (OneToOneMapping) persistentAttribute.getMapping(); PrimaryKeyJoinColumnRelationshipStrategy strategy = oneToOneMapping.getRelationship().getPrimaryKeyJoinColumnStrategy(); - assertEquals(0, strategy.primaryKeyJoinColumnsSize()); + assertEquals(0, strategy.getPrimaryKeyJoinColumnsSize()); strategy.addPrimaryKeyJoinColumn(0); - assertEquals(1, strategy.primaryKeyJoinColumnsSize()); + assertEquals(1, strategy.getPrimaryKeyJoinColumnsSize()); strategy.removePrimaryKeyJoinColumn(0); - assertEquals(0, strategy.primaryKeyJoinColumnsSize()); + assertEquals(0, strategy.getPrimaryKeyJoinColumnsSize()); } public void testAddPrimaryKeyJoinColumn() throws Exception { createTestEntityWithOneToOneMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToOneMapping oneToOneMapping = (OneToOneMapping) persistentAttribute.getMapping(); PrimaryKeyJoinColumnRelationshipStrategy strategy = oneToOneMapping.getRelationship().getPrimaryKeyJoinColumnStrategy(); @@ -1213,9 +1214,9 @@ public class JavaOneToOneMappingTests extends ContextModelTestCase strategy.addPrimaryKeyJoinColumn(0).setSpecifiedName("BAR"); strategy.addPrimaryKeyJoinColumn(0).setSpecifiedName("BAZ"); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - Iterator<NestableAnnotation> joinColumns = attributeResource.annotations(PrimaryKeyJoinColumnAnnotation.ANNOTATION_NAME, PrimaryKeyJoinColumnsAnnotation.ANNOTATION_NAME); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + Iterator<NestableAnnotation> joinColumns = resourceField.getAnnotations(JPA.PRIMARY_KEY_JOIN_COLUMN).iterator(); assertEquals("BAZ", ((PrimaryKeyJoinColumnAnnotation) joinColumns.next()).getName()); assertEquals("BAR", ((PrimaryKeyJoinColumnAnnotation) joinColumns.next()).getName()); @@ -1227,7 +1228,7 @@ public class JavaOneToOneMappingTests extends ContextModelTestCase createTestEntityWithOneToOneMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToOneMapping oneToOneMapping = (OneToOneMapping) persistentAttribute.getMapping(); PrimaryKeyJoinColumnRelationshipStrategy strategy = oneToOneMapping.getRelationship().getPrimaryKeyJoinColumnStrategy(); @@ -1236,9 +1237,9 @@ public class JavaOneToOneMappingTests extends ContextModelTestCase strategy.addPrimaryKeyJoinColumn(1).setSpecifiedName("BAR"); strategy.addPrimaryKeyJoinColumn(2).setSpecifiedName("BAZ"); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - Iterator<NestableAnnotation> joinColumns = attributeResource.annotations(PrimaryKeyJoinColumnAnnotation.ANNOTATION_NAME, PrimaryKeyJoinColumnsAnnotation.ANNOTATION_NAME); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + Iterator<NestableAnnotation> joinColumns = resourceField.getAnnotations(JPA.PRIMARY_KEY_JOIN_COLUMN).iterator(); assertEquals("FOO", ((PrimaryKeyJoinColumnAnnotation) joinColumns.next()).getName()); assertEquals("BAR", ((PrimaryKeyJoinColumnAnnotation) joinColumns.next()).getName()); @@ -1250,7 +1251,7 @@ public class JavaOneToOneMappingTests extends ContextModelTestCase createTestEntityWithOneToOneMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToOneMapping oneToOneMapping = (OneToOneMapping) persistentAttribute.getMapping(); PrimaryKeyJoinColumnRelationshipStrategy strategy = oneToOneMapping.getRelationship().getPrimaryKeyJoinColumnStrategy(); @@ -1259,48 +1260,48 @@ public class JavaOneToOneMappingTests extends ContextModelTestCase strategy.addPrimaryKeyJoinColumn(1).setSpecifiedName("BAR"); strategy.addPrimaryKeyJoinColumn(2).setSpecifiedName("BAZ"); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); - assertEquals(3, CollectionTools.size(attributeResource.annotations(PrimaryKeyJoinColumnAnnotation.ANNOTATION_NAME, PrimaryKeyJoinColumnsAnnotation.ANNOTATION_NAME))); + assertEquals(3, resourceField.getAnnotationsSize(JPA.PRIMARY_KEY_JOIN_COLUMN)); strategy.removePrimaryKeyJoinColumn(1); - Iterator<NestableAnnotation> joinColumnResources = attributeResource.annotations(PrimaryKeyJoinColumnAnnotation.ANNOTATION_NAME, PrimaryKeyJoinColumnsAnnotation.ANNOTATION_NAME); + Iterator<NestableAnnotation> joinColumnResources = resourceField.getAnnotations(JPA.PRIMARY_KEY_JOIN_COLUMN).iterator(); assertEquals("FOO", ((PrimaryKeyJoinColumnAnnotation) joinColumnResources.next()).getName()); assertEquals("BAZ", ((PrimaryKeyJoinColumnAnnotation) joinColumnResources.next()).getName()); assertFalse(joinColumnResources.hasNext()); - Iterator<PrimaryKeyJoinColumn> joinColumns = (Iterator<PrimaryKeyJoinColumn>) strategy.primaryKeyJoinColumns(); + Iterator<? extends PrimaryKeyJoinColumn> joinColumns = strategy.getPrimaryKeyJoinColumns().iterator(); assertEquals("FOO", joinColumns.next().getName()); assertEquals("BAZ", joinColumns.next().getName()); assertFalse(joinColumns.hasNext()); strategy.removePrimaryKeyJoinColumn(1); - joinColumnResources = attributeResource.annotations(PrimaryKeyJoinColumnAnnotation.ANNOTATION_NAME, PrimaryKeyJoinColumnsAnnotation.ANNOTATION_NAME); + joinColumnResources = resourceField.getAnnotations(JPA.PRIMARY_KEY_JOIN_COLUMN).iterator(); assertEquals("FOO", ((PrimaryKeyJoinColumnAnnotation) joinColumnResources.next()).getName()); assertFalse(joinColumnResources.hasNext()); - joinColumns = (Iterator<PrimaryKeyJoinColumn>) strategy.primaryKeyJoinColumns(); + joinColumns = strategy.getPrimaryKeyJoinColumns().iterator(); assertEquals("FOO", joinColumns.next().getName()); assertFalse(joinColumns.hasNext()); strategy.removePrimaryKeyJoinColumn(0); - joinColumnResources = attributeResource.annotations(PrimaryKeyJoinColumnAnnotation.ANNOTATION_NAME, PrimaryKeyJoinColumnsAnnotation.ANNOTATION_NAME); + joinColumnResources = resourceField.getAnnotations(JPA.PRIMARY_KEY_JOIN_COLUMN).iterator(); assertFalse(joinColumnResources.hasNext()); - joinColumns = (Iterator<PrimaryKeyJoinColumn>) strategy.primaryKeyJoinColumns(); + joinColumns = strategy.getPrimaryKeyJoinColumns().iterator(); assertFalse(joinColumns.hasNext()); - assertNull(attributeResource.getAnnotation(PrimaryKeyJoinColumnsAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(0, PrimaryKeyJoinColumnAnnotation.ANNOTATION_NAME)); } public void testMovePrimaryKeyJoinColumn() throws Exception { createTestEntityWithOneToOneMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToOneMapping oneToOneMapping = (OneToOneMapping) persistentAttribute.getMapping(); PrimaryKeyJoinColumnRelationshipStrategy strategy = oneToOneMapping.getRelationship().getPrimaryKeyJoinColumnStrategy(); @@ -1309,31 +1310,32 @@ public class JavaOneToOneMappingTests extends ContextModelTestCase strategy.addPrimaryKeyJoinColumn(1).setSpecifiedName("BAR"); strategy.addPrimaryKeyJoinColumn(2).setSpecifiedName("BAZ"); - JavaResourcePersistentAttribute attributeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME).persistableAttributes().next(); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); - Iterator<NestableAnnotation> javaJoinColumns = attributeResource.annotations(PrimaryKeyJoinColumnAnnotation.ANNOTATION_NAME, PrimaryKeyJoinColumnsAnnotation.ANNOTATION_NAME); + Iterator<NestableAnnotation> javaJoinColumns = resourceField.getAnnotations(JPA.PRIMARY_KEY_JOIN_COLUMN).iterator(); assertEquals(3, CollectionTools.size(javaJoinColumns)); strategy.movePrimaryKeyJoinColumn(2, 0); - ListIterator<PrimaryKeyJoinColumn> primaryKeyJoinColumns = (ListIterator<PrimaryKeyJoinColumn>) strategy.primaryKeyJoinColumns(); + ListIterator<? extends PrimaryKeyJoinColumn> primaryKeyJoinColumns = strategy.getPrimaryKeyJoinColumns().iterator(); assertEquals("BAR", primaryKeyJoinColumns.next().getSpecifiedName()); assertEquals("BAZ", primaryKeyJoinColumns.next().getSpecifiedName()); assertEquals("FOO", primaryKeyJoinColumns.next().getSpecifiedName()); - javaJoinColumns = attributeResource.annotations(PrimaryKeyJoinColumnAnnotation.ANNOTATION_NAME, PrimaryKeyJoinColumnsAnnotation.ANNOTATION_NAME); + javaJoinColumns = resourceField.getAnnotations(JPA.PRIMARY_KEY_JOIN_COLUMN).iterator(); assertEquals("BAR", ((PrimaryKeyJoinColumnAnnotation) javaJoinColumns.next()).getName()); assertEquals("BAZ", ((PrimaryKeyJoinColumnAnnotation) javaJoinColumns.next()).getName()); assertEquals("FOO", ((PrimaryKeyJoinColumnAnnotation) javaJoinColumns.next()).getName()); strategy.movePrimaryKeyJoinColumn(0, 1); - primaryKeyJoinColumns = (ListIterator<PrimaryKeyJoinColumn>) strategy.primaryKeyJoinColumns(); + primaryKeyJoinColumns = strategy.getPrimaryKeyJoinColumns().iterator(); assertEquals("BAZ", primaryKeyJoinColumns.next().getSpecifiedName()); assertEquals("BAR", primaryKeyJoinColumns.next().getSpecifiedName()); assertEquals("FOO", primaryKeyJoinColumns.next().getSpecifiedName()); - javaJoinColumns = attributeResource.annotations(PrimaryKeyJoinColumnAnnotation.ANNOTATION_NAME, PrimaryKeyJoinColumnsAnnotation.ANNOTATION_NAME); + javaJoinColumns = resourceField.getAnnotations(JPA.PRIMARY_KEY_JOIN_COLUMN).iterator(); assertEquals("BAZ", ((PrimaryKeyJoinColumnAnnotation) javaJoinColumns.next()).getName()); assertEquals("BAR", ((PrimaryKeyJoinColumnAnnotation) javaJoinColumns.next()).getName()); assertEquals("FOO", ((PrimaryKeyJoinColumnAnnotation) javaJoinColumns.next()).getName()); @@ -1343,55 +1345,56 @@ public class JavaOneToOneMappingTests extends ContextModelTestCase createTestEntityWithOneToOneMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME).persistableAttributes().next(); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToOneMapping oneToOneMapping = (OneToOneMapping) persistentAttribute.getMapping(); PrimaryKeyJoinColumnRelationshipStrategy strategy = oneToOneMapping.getRelationship().getPrimaryKeyJoinColumnStrategy(); - ((PrimaryKeyJoinColumnAnnotation) attributeResource.addAnnotation(0, PrimaryKeyJoinColumnAnnotation.ANNOTATION_NAME, PrimaryKeyJoinColumnsAnnotation.ANNOTATION_NAME)).setName("FOO"); - ((PrimaryKeyJoinColumnAnnotation) attributeResource.addAnnotation(1, PrimaryKeyJoinColumnAnnotation.ANNOTATION_NAME, PrimaryKeyJoinColumnsAnnotation.ANNOTATION_NAME)).setName("BAR"); - ((PrimaryKeyJoinColumnAnnotation) attributeResource.addAnnotation(2, PrimaryKeyJoinColumnAnnotation.ANNOTATION_NAME, PrimaryKeyJoinColumnsAnnotation.ANNOTATION_NAME)).setName("BAZ"); + ((PrimaryKeyJoinColumnAnnotation) resourceField.addAnnotation(0, JPA.PRIMARY_KEY_JOIN_COLUMN)).setName("FOO"); + ((PrimaryKeyJoinColumnAnnotation) resourceField.addAnnotation(1, JPA.PRIMARY_KEY_JOIN_COLUMN)).setName("BAR"); + ((PrimaryKeyJoinColumnAnnotation) resourceField.addAnnotation(2, JPA.PRIMARY_KEY_JOIN_COLUMN)).setName("BAZ"); getJpaProject().synchronizeContextModel(); - ListIterator<PrimaryKeyJoinColumn> joinColumns = (ListIterator<PrimaryKeyJoinColumn>) strategy.primaryKeyJoinColumns(); + ListIterator<? extends PrimaryKeyJoinColumn> joinColumns = strategy.getPrimaryKeyJoinColumns().iterator(); assertEquals("FOO", joinColumns.next().getName()); assertEquals("BAR", joinColumns.next().getName()); assertEquals("BAZ", joinColumns.next().getName()); assertFalse(joinColumns.hasNext()); - attributeResource.moveAnnotation(2, 0, PrimaryKeyJoinColumnsAnnotation.ANNOTATION_NAME); + resourceField.moveAnnotation(2, 0, PrimaryKeyJoinColumnAnnotation.ANNOTATION_NAME); getJpaProject().synchronizeContextModel(); - joinColumns = (ListIterator<PrimaryKeyJoinColumn>) strategy.primaryKeyJoinColumns(); + joinColumns = strategy.getPrimaryKeyJoinColumns().iterator(); assertEquals("BAR", joinColumns.next().getName()); assertEquals("BAZ", joinColumns.next().getName()); assertEquals("FOO", joinColumns.next().getName()); assertFalse(joinColumns.hasNext()); - attributeResource.moveAnnotation(0, 1, PrimaryKeyJoinColumnsAnnotation.ANNOTATION_NAME); + resourceField.moveAnnotation(0, 1, PrimaryKeyJoinColumnAnnotation.ANNOTATION_NAME); getJpaProject().synchronizeContextModel(); - joinColumns = (ListIterator<PrimaryKeyJoinColumn>) strategy.primaryKeyJoinColumns(); + joinColumns = strategy.getPrimaryKeyJoinColumns().iterator(); assertEquals("BAZ", joinColumns.next().getName()); assertEquals("BAR", joinColumns.next().getName()); assertEquals("FOO", joinColumns.next().getName()); assertFalse(joinColumns.hasNext()); - attributeResource.removeAnnotation(1, PrimaryKeyJoinColumnAnnotation.ANNOTATION_NAME, PrimaryKeyJoinColumnsAnnotation.ANNOTATION_NAME); + resourceField.removeAnnotation(1, JPA.PRIMARY_KEY_JOIN_COLUMN); getJpaProject().synchronizeContextModel(); - joinColumns = (ListIterator<PrimaryKeyJoinColumn>) strategy.primaryKeyJoinColumns(); + joinColumns = strategy.getPrimaryKeyJoinColumns().iterator(); assertEquals("BAZ", joinColumns.next().getName()); assertEquals("FOO", joinColumns.next().getName()); assertFalse(joinColumns.hasNext()); - attributeResource.removeAnnotation(1, PrimaryKeyJoinColumnAnnotation.ANNOTATION_NAME, PrimaryKeyJoinColumnsAnnotation.ANNOTATION_NAME); + resourceField.removeAnnotation(1, JPA.PRIMARY_KEY_JOIN_COLUMN); getJpaProject().synchronizeContextModel(); - joinColumns = (ListIterator<PrimaryKeyJoinColumn>) strategy.primaryKeyJoinColumns(); + joinColumns = strategy.getPrimaryKeyJoinColumns().iterator(); assertEquals("BAZ", joinColumns.next().getName()); assertFalse(joinColumns.hasNext()); - attributeResource.removeAnnotation(0, PrimaryKeyJoinColumnAnnotation.ANNOTATION_NAME, PrimaryKeyJoinColumnsAnnotation.ANNOTATION_NAME); + resourceField.removeAnnotation(0, JPA.PRIMARY_KEY_JOIN_COLUMN); getJpaProject().synchronizeContextModel(); - joinColumns = (ListIterator<PrimaryKeyJoinColumn>) strategy.primaryKeyJoinColumns(); + joinColumns = strategy.getPrimaryKeyJoinColumns().iterator(); assertFalse(joinColumns.hasNext()); } @@ -1399,38 +1402,39 @@ public class JavaOneToOneMappingTests extends ContextModelTestCase createTestEntityWithOneToOneMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute resourceAttribute = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME).persistableAttributes().next(); - OneToOneAnnotation annotation = (OneToOneAnnotation) resourceAttribute.getAnnotation(JPA.ONE_TO_ONE); - PersistentAttribute contextAttribute = getJavaPersistentType().attributes().next(); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + OneToOneAnnotation annotation = (OneToOneAnnotation) resourceField.getAnnotation(JPA.ONE_TO_ONE); + PersistentAttribute contextAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToOneMapping mapping = (OneToOneMapping) contextAttribute.getMapping(); OneToOneRelationship rel = mapping.getRelationship(); - assertNull(resourceAttribute.getAnnotation(JPA.JOIN_COLUMN)); - assertNull(resourceAttribute.getAnnotation(JPA.PRIMARY_KEY_JOIN_COLUMN)); + assertNull(resourceField.getAnnotation(0, JPA.JOIN_COLUMN)); + assertNull(resourceField.getAnnotation(0, JPA.PRIMARY_KEY_JOIN_COLUMN)); assertNull(annotation.getMappedBy()); assertTrue(rel.strategyIsJoinColumn()); assertFalse(rel.strategyIsPrimaryKeyJoinColumn()); assertFalse(rel.strategyIsMappedBy()); rel.setStrategyToPrimaryKeyJoinColumn(); - assertNull(resourceAttribute.getAnnotation(JPA.JOIN_COLUMN)); - assertNotNull(resourceAttribute.getAnnotation(JPA.PRIMARY_KEY_JOIN_COLUMN)); + assertNull(resourceField.getAnnotation(0, JPA.JOIN_COLUMN)); + assertNotNull(resourceField.getAnnotation(0, JPA.PRIMARY_KEY_JOIN_COLUMN)); assertNull(annotation.getMappedBy()); assertFalse(rel.strategyIsJoinColumn()); assertTrue(rel.strategyIsPrimaryKeyJoinColumn()); assertFalse(rel.strategyIsMappedBy()); rel.setStrategyToMappedBy(); - assertNull(resourceAttribute.getAnnotation(JPA.JOIN_COLUMN)); - assertNull(resourceAttribute.getAnnotation(JPA.PRIMARY_KEY_JOIN_COLUMN)); + assertNull(resourceField.getAnnotation(0, JPA.JOIN_COLUMN)); + assertNull(resourceField.getAnnotation(0, JPA.PRIMARY_KEY_JOIN_COLUMN)); assertNotNull(annotation.getMappedBy()); assertFalse(rel.strategyIsJoinColumn()); assertFalse(rel.strategyIsPrimaryKeyJoinColumn()); assertTrue(rel.strategyIsMappedBy()); rel.setStrategyToJoinColumn(); - assertNull(resourceAttribute.getAnnotation(JPA.JOIN_COLUMN)); - assertNull(resourceAttribute.getAnnotation(JPA.PRIMARY_KEY_JOIN_COLUMN)); + assertNull(resourceField.getAnnotation(0, JPA.JOIN_COLUMN)); + assertNull(resourceField.getAnnotation(0, JPA.PRIMARY_KEY_JOIN_COLUMN)); assertNull(annotation.getMappedBy()); assertTrue(rel.strategyIsJoinColumn()); assertFalse(rel.strategyIsPrimaryKeyJoinColumn()); @@ -1441,23 +1445,24 @@ public class JavaOneToOneMappingTests extends ContextModelTestCase createTestEntityWithOneToOneMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute resourceAttribute = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME).persistableAttributes().next(); - OneToOneAnnotation annotation = (OneToOneAnnotation) resourceAttribute.getAnnotation(JPA.ONE_TO_ONE); - PersistentAttribute contextAttribute = getJavaPersistentType().attributes().next(); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + OneToOneAnnotation annotation = (OneToOneAnnotation) resourceField.getAnnotation(JPA.ONE_TO_ONE); + PersistentAttribute contextAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToOneMapping mapping = (OneToOneMapping) contextAttribute.getMapping(); OneToOneRelationship rel = mapping.getRelationship(); - assertNull(resourceAttribute.getAnnotation(JPA.JOIN_COLUMN)); - assertNull(resourceAttribute.getAnnotation(JPA.PRIMARY_KEY_JOIN_COLUMN)); + assertNull(resourceField.getAnnotation(0, JPA.JOIN_COLUMN)); + assertNull(resourceField.getAnnotation(0, JPA.PRIMARY_KEY_JOIN_COLUMN)); assertNull(annotation.getMappedBy()); assertTrue(rel.strategyIsJoinColumn()); assertFalse(rel.strategyIsPrimaryKeyJoinColumn()); assertFalse(rel.strategyIsMappedBy()); - resourceAttribute.addAnnotation(JPA.PRIMARY_KEY_JOIN_COLUMN); + resourceField.addAnnotation(0, JPA.PRIMARY_KEY_JOIN_COLUMN); getJpaProject().synchronizeContextModel(); - assertNull(resourceAttribute.getAnnotation(JPA.JOIN_COLUMN)); - assertNotNull(resourceAttribute.getAnnotation(JPA.PRIMARY_KEY_JOIN_COLUMN)); + assertNull(resourceField.getAnnotation(0, JPA.JOIN_COLUMN)); + assertNotNull(resourceField.getAnnotation(0, JPA.PRIMARY_KEY_JOIN_COLUMN)); assertNull(annotation.getMappedBy()); assertFalse(rel.strategyIsJoinColumn()); assertTrue(rel.strategyIsPrimaryKeyJoinColumn()); @@ -1465,26 +1470,26 @@ public class JavaOneToOneMappingTests extends ContextModelTestCase annotation.setMappedBy("foo"); getJpaProject().synchronizeContextModel(); - assertNull(resourceAttribute.getAnnotation(JPA.JOIN_COLUMN)); - assertNotNull(resourceAttribute.getAnnotation(JPA.PRIMARY_KEY_JOIN_COLUMN)); + assertNull(resourceField.getAnnotation(0, JPA.JOIN_COLUMN)); + assertNotNull(resourceField.getAnnotation(0, JPA.PRIMARY_KEY_JOIN_COLUMN)); assertNotNull(annotation.getMappedBy()); assertFalse(rel.strategyIsJoinColumn()); assertFalse(rel.strategyIsPrimaryKeyJoinColumn()); assertTrue(rel.strategyIsMappedBy()); - resourceAttribute.addAnnotation(JPA.JOIN_COLUMN); + resourceField.addAnnotation(0, JPA.JOIN_COLUMN); getJpaProject().synchronizeContextModel(); - assertNotNull(resourceAttribute.getAnnotation(JPA.JOIN_COLUMN)); - assertNotNull(resourceAttribute.getAnnotation(JPA.PRIMARY_KEY_JOIN_COLUMN)); + assertNotNull(resourceField.getAnnotation(0, JPA.JOIN_COLUMN)); + assertNotNull(resourceField.getAnnotation(0, JPA.PRIMARY_KEY_JOIN_COLUMN)); assertNotNull(annotation.getMappedBy()); assertFalse(rel.strategyIsJoinColumn()); assertFalse(rel.strategyIsPrimaryKeyJoinColumn()); assertTrue(rel.strategyIsMappedBy()); - resourceAttribute.removeAnnotation(JPA.PRIMARY_KEY_JOIN_COLUMN); + resourceField.removeAnnotation(0, JPA.PRIMARY_KEY_JOIN_COLUMN); getJpaProject().synchronizeContextModel(); - assertNotNull(resourceAttribute.getAnnotation(JPA.JOIN_COLUMN)); - assertNull(resourceAttribute.getAnnotation(JPA.PRIMARY_KEY_JOIN_COLUMN)); + assertNotNull(resourceField.getAnnotation(0, JPA.JOIN_COLUMN)); + assertNull(resourceField.getAnnotation(0, JPA.PRIMARY_KEY_JOIN_COLUMN)); assertNotNull(annotation.getMappedBy()); assertFalse(rel.strategyIsJoinColumn()); assertFalse(rel.strategyIsPrimaryKeyJoinColumn()); @@ -1492,17 +1497,17 @@ public class JavaOneToOneMappingTests extends ContextModelTestCase annotation.setMappedBy(null); getJpaProject().synchronizeContextModel(); - assertNotNull(resourceAttribute.getAnnotation(JPA.JOIN_COLUMN)); - assertNull(resourceAttribute.getAnnotation(JPA.PRIMARY_KEY_JOIN_COLUMN)); + assertNotNull(resourceField.getAnnotation(0, JPA.JOIN_COLUMN)); + assertNull(resourceField.getAnnotation(0, JPA.PRIMARY_KEY_JOIN_COLUMN)); assertNull(annotation.getMappedBy()); assertTrue(rel.strategyIsJoinColumn()); assertFalse(rel.strategyIsPrimaryKeyJoinColumn()); assertFalse(rel.strategyIsMappedBy()); - resourceAttribute.removeAnnotation(JPA.JOIN_COLUMN); + resourceField.removeAnnotation(0, JPA.JOIN_COLUMN); getJpaProject().synchronizeContextModel(); - assertNull(resourceAttribute.getAnnotation(JPA.JOIN_COLUMN)); - assertNull(resourceAttribute.getAnnotation(JPA.PRIMARY_KEY_JOIN_COLUMN)); + assertNull(resourceField.getAnnotation(0, JPA.JOIN_COLUMN)); + assertNull(resourceField.getAnnotation(0, JPA.PRIMARY_KEY_JOIN_COLUMN)); assertNull(annotation.getMappedBy()); assertTrue(rel.strategyIsJoinColumn()); assertFalse(rel.strategyIsPrimaryKeyJoinColumn()); |