diff options
Diffstat (limited to 'jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/v2_0/context/java/EclipseLink2_0JavaEntityTests.java')
| -rw-r--r-- | jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/v2_0/context/java/EclipseLink2_0JavaEntityTests.java | 525 |
1 files changed, 258 insertions, 267 deletions
diff --git a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/v2_0/context/java/EclipseLink2_0JavaEntityTests.java b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/v2_0/context/java/EclipseLink2_0JavaEntityTests.java index 5325595b5f..1e520f001b 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/v2_0/context/java/EclipseLink2_0JavaEntityTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/v2_0/context/java/EclipseLink2_0JavaEntityTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009, 2010 Oracle. All rights reserved. + * Copyright (c) 2009, 2011 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html. @@ -12,8 +12,10 @@ package org.eclipse.jpt.jpa.eclipselink.core.tests.internal.v2_0.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.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.core.tests.internal.utility.jdt.AnnotationTestCase.DefaultAnnotationWriter; import org.eclipse.jpt.common.utility.internal.CollectionTools; import org.eclipse.jpt.common.utility.internal.iterators.ArrayIterator; import org.eclipse.jpt.jpa.core.MappingKeys; @@ -30,7 +32,9 @@ import org.eclipse.jpt.jpa.core.context.PersistentType; import org.eclipse.jpt.jpa.core.context.VirtualAssociationOverride; import org.eclipse.jpt.jpa.core.context.VirtualAttributeOverride; import org.eclipse.jpt.jpa.core.context.java.JavaAssociationOverride; +import org.eclipse.jpt.jpa.core.context.java.JavaAssociationOverrideContainer; import org.eclipse.jpt.jpa.core.context.java.JavaAttributeOverride; +import org.eclipse.jpt.jpa.core.context.java.JavaAttributeOverrideContainer; import org.eclipse.jpt.jpa.core.context.java.JavaEntity; import org.eclipse.jpt.jpa.core.context.java.JavaVirtualAssociationOverride; import org.eclipse.jpt.jpa.core.context.java.JavaVirtualAttributeOverride; @@ -43,12 +47,8 @@ import org.eclipse.jpt.jpa.core.jpa2.context.persistence.options.SharedCacheMode import org.eclipse.jpt.jpa.core.jpa2.resource.java.Cacheable2_0Annotation; import org.eclipse.jpt.jpa.core.jpa2.resource.java.JPA2_0; import org.eclipse.jpt.jpa.core.resource.java.AssociationOverrideAnnotation; -import org.eclipse.jpt.jpa.core.resource.java.AssociationOverridesAnnotation; import org.eclipse.jpt.jpa.core.resource.java.AttributeOverrideAnnotation; -import org.eclipse.jpt.jpa.core.resource.java.AttributeOverridesAnnotation; import org.eclipse.jpt.jpa.core.resource.java.JPA; -import org.eclipse.jpt.jpa.core.resource.java.JavaResourcePersistentType; -import org.eclipse.jpt.jpa.core.resource.java.NestableAnnotation; import org.eclipse.jpt.jpa.eclipselink.core.EclipseLinkMappingKeys; import org.eclipse.jpt.jpa.eclipselink.core.tests.internal.v2_0.context.EclipseLink2_0ContextModelTestCase; @@ -404,7 +404,7 @@ public class EclipseLink2_0JavaEntityTests extends EclipseLink2_0ContextModelTes assertFalse(overridableAttributes.hasNext()); - ListIterator<ClassRef> classRefs = getPersistenceUnit().specifiedClassRefs(); + ListIterator<ClassRef> classRefs = getPersistenceUnit().getSpecifiedClassRefs().iterator(); classRefs.next(); JavaEntity abstractEntity = (JavaEntity) classRefs.next().getJavaPersistentType().getMapping(); overridableAttributes = abstractEntity.allOverridableAttributeNames(); @@ -428,7 +428,7 @@ public class EclipseLink2_0JavaEntityTests extends EclipseLink2_0ContextModelTes assertFalse(overridableAssociations.hasNext()); - ListIterator<ClassRef> classRefs = getPersistenceUnit().specifiedClassRefs(); + ListIterator<ClassRef> classRefs = getPersistenceUnit().getSpecifiedClassRefs().iterator(); classRefs.next(); JavaEntity abstractEntity = (JavaEntity) classRefs.next().getJavaPersistentType().getMapping(); overridableAssociations = abstractEntity.allOverridableAssociationNames(); @@ -469,65 +469,65 @@ public class EclipseLink2_0JavaEntityTests extends EclipseLink2_0ContextModelTes createTestEntity(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - AttributeOverrideContainer overrideContainer = getJavaEntity().getAttributeOverrideContainer(); - ListIterator<JavaAttributeOverride> specifiedAttributeOverrides = (ListIterator<JavaAttributeOverride>) overrideContainer.specifiedOverrides(); + JavaAttributeOverrideContainer overrideContainer = getJavaEntity().getAttributeOverrideContainer(); + ListIterator<JavaAttributeOverride> specifiedAttributeOverrides = overrideContainer.getSpecifiedOverrides().iterator(); assertFalse(specifiedAttributeOverrides.hasNext()); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); //add an annotation to the resource model and verify the context model is updated - AttributeOverrideAnnotation attributeOverride = (AttributeOverrideAnnotation) typeResource.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + AttributeOverrideAnnotation attributeOverride = (AttributeOverrideAnnotation) resourceType.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE); attributeOverride.setName("FOO"); getJpaProject().synchronizeContextModel(); - specifiedAttributeOverrides = (ListIterator<JavaAttributeOverride>) overrideContainer.specifiedOverrides(); + specifiedAttributeOverrides = overrideContainer.getSpecifiedOverrides().iterator(); assertEquals("FOO", specifiedAttributeOverrides.next().getName()); assertFalse(specifiedAttributeOverrides.hasNext()); - attributeOverride = (AttributeOverrideAnnotation) typeResource.addAnnotation(1, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + attributeOverride = (AttributeOverrideAnnotation) resourceType.addAnnotation(1, JPA.ATTRIBUTE_OVERRIDE); attributeOverride.setName("BAR"); getJpaProject().synchronizeContextModel(); - specifiedAttributeOverrides = (ListIterator<JavaAttributeOverride>) overrideContainer.specifiedOverrides(); + specifiedAttributeOverrides = overrideContainer.getSpecifiedOverrides().iterator(); assertEquals("FOO", specifiedAttributeOverrides.next().getName()); assertEquals("BAR", specifiedAttributeOverrides.next().getName()); assertFalse(specifiedAttributeOverrides.hasNext()); - attributeOverride = (AttributeOverrideAnnotation) typeResource.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + attributeOverride = (AttributeOverrideAnnotation) resourceType.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE); attributeOverride.setName("BAZ"); getJpaProject().synchronizeContextModel(); - specifiedAttributeOverrides = (ListIterator<JavaAttributeOverride>) overrideContainer.specifiedOverrides(); + specifiedAttributeOverrides = overrideContainer.getSpecifiedOverrides().iterator(); assertEquals("BAZ", specifiedAttributeOverrides.next().getName()); assertEquals("FOO", specifiedAttributeOverrides.next().getName()); assertEquals("BAR", specifiedAttributeOverrides.next().getName()); assertFalse(specifiedAttributeOverrides.hasNext()); //move an annotation to the resource model and verify the context model is updated - typeResource.moveAnnotation(1, 0, JPA.ATTRIBUTE_OVERRIDES); + resourceType.moveAnnotation(1, 0, JPA.ATTRIBUTE_OVERRIDE); getJpaProject().synchronizeContextModel(); - specifiedAttributeOverrides = (ListIterator<JavaAttributeOverride>) overrideContainer.specifiedOverrides(); + specifiedAttributeOverrides = overrideContainer.getSpecifiedOverrides().iterator(); assertEquals("FOO", specifiedAttributeOverrides.next().getName()); assertEquals("BAZ", specifiedAttributeOverrides.next().getName()); assertEquals("BAR", specifiedAttributeOverrides.next().getName()); assertFalse(specifiedAttributeOverrides.hasNext()); - typeResource.removeAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + resourceType.removeAnnotation(0, JPA.ATTRIBUTE_OVERRIDE); getJpaProject().synchronizeContextModel(); - specifiedAttributeOverrides = (ListIterator<JavaAttributeOverride>) overrideContainer.specifiedOverrides(); + specifiedAttributeOverrides = overrideContainer.getSpecifiedOverrides().iterator(); assertEquals("BAZ", specifiedAttributeOverrides.next().getName()); assertEquals("BAR", specifiedAttributeOverrides.next().getName()); assertFalse(specifiedAttributeOverrides.hasNext()); - typeResource.removeAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + resourceType.removeAnnotation(0, JPA.ATTRIBUTE_OVERRIDE); getJpaProject().synchronizeContextModel(); - specifiedAttributeOverrides = (ListIterator<JavaAttributeOverride>) overrideContainer.specifiedOverrides(); + specifiedAttributeOverrides = overrideContainer.getSpecifiedOverrides().iterator(); assertEquals("BAR", specifiedAttributeOverrides.next().getName()); assertFalse(specifiedAttributeOverrides.hasNext()); - typeResource.removeAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + resourceType.removeAnnotation(0, JPA.ATTRIBUTE_OVERRIDE); getJpaProject().synchronizeContextModel(); - specifiedAttributeOverrides = (ListIterator<JavaAttributeOverride>) overrideContainer.specifiedOverrides(); + specifiedAttributeOverrides = overrideContainer.getSpecifiedOverrides().iterator(); assertFalse(specifiedAttributeOverrides.hasNext()); } @@ -538,18 +538,17 @@ public class EclipseLink2_0JavaEntityTests extends EclipseLink2_0ContextModelTes addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); addXmlClassRef(FULLY_QUALIFIED_SUB_TYPE_NAME); - ListIterator<ClassRef> classRefs = getPersistenceUnit().specifiedClassRefs(); + ListIterator<ClassRef> classRefs = getPersistenceUnit().getSpecifiedClassRefs().iterator(); classRefs.next(); JavaEntity javaEntity = (JavaEntity) classRefs.next().getJavaPersistentType().getMapping(); AttributeOverrideContainer overrideContainer = javaEntity.getAttributeOverrideContainer(); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_SUB_TYPE_NAME); - assertEquals(SUB_TYPE_NAME, typeResource.getName()); - assertNull(typeResource.getAnnotation(AttributeOverrideAnnotation.ANNOTATION_NAME)); - assertNull(typeResource.getAnnotation(AttributeOverridesAnnotation.ANNOTATION_NAME)); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_SUB_TYPE_NAME, Kind.TYPE); + assertEquals(SUB_TYPE_NAME, resourceType.getName()); + assertNull(resourceType.getAnnotation(0, AttributeOverrideAnnotation.ANNOTATION_NAME)); - assertEquals(3, overrideContainer.virtualOverridesSize()); - VirtualAttributeOverride virtualAttributeOverride = overrideContainer.virtualOverrides().next(); + assertEquals(3, overrideContainer.getVirtualOverridesSize()); + VirtualAttributeOverride virtualAttributeOverride = overrideContainer.getVirtualOverrides().iterator().next(); assertEquals("id", virtualAttributeOverride.getName()); assertEquals("id", virtualAttributeOverride.getColumn().getName()); assertEquals(SUB_TYPE_NAME, virtualAttributeOverride.getColumn().getTable()); @@ -561,29 +560,27 @@ public class EclipseLink2_0JavaEntityTests extends EclipseLink2_0ContextModelTes idMapping.getColumn().setSpecifiedName("FOO"); idMapping.getColumn().setSpecifiedTable("BAR"); - assertEquals(SUB_TYPE_NAME, typeResource.getName()); - assertNull(typeResource.getAnnotation(AttributeOverrideAnnotation.ANNOTATION_NAME)); - assertNull(typeResource.getAnnotation(AttributeOverridesAnnotation.ANNOTATION_NAME)); + assertEquals(SUB_TYPE_NAME, resourceType.getName()); + assertNull(resourceType.getAnnotation(0, AttributeOverrideAnnotation.ANNOTATION_NAME)); - assertEquals(3, overrideContainer.virtualOverridesSize()); - virtualAttributeOverride = overrideContainer.virtualOverrides().next(); + assertEquals(3, overrideContainer.getVirtualOverridesSize()); + virtualAttributeOverride = overrideContainer.getVirtualOverrides().iterator().next(); assertEquals("id", virtualAttributeOverride.getName()); assertEquals("FOO", virtualAttributeOverride.getColumn().getName()); assertEquals("BAR", virtualAttributeOverride.getColumn().getTable()); idMapping.getColumn().setSpecifiedName(null); idMapping.getColumn().setSpecifiedTable(null); - assertEquals(SUB_TYPE_NAME, typeResource.getName()); - assertNull(typeResource.getAnnotation(AttributeOverrideAnnotation.ANNOTATION_NAME)); - assertNull(typeResource.getAnnotation(AttributeOverridesAnnotation.ANNOTATION_NAME)); + assertEquals(SUB_TYPE_NAME, resourceType.getName()); + assertNull(resourceType.getAnnotation(0, AttributeOverrideAnnotation.ANNOTATION_NAME)); - virtualAttributeOverride = overrideContainer.virtualOverrides().next(); + virtualAttributeOverride = overrideContainer.getVirtualOverrides().iterator().next(); assertEquals("id", virtualAttributeOverride.getName()); assertEquals("id", virtualAttributeOverride.getColumn().getName()); assertEquals(SUB_TYPE_NAME, virtualAttributeOverride.getColumn().getTable()); virtualAttributeOverride.convertToSpecified(); - assertEquals(2, overrideContainer.virtualOverridesSize()); + assertEquals(2, overrideContainer.getVirtualOverridesSize()); } public void testDefaultAttributeOverridesEntityHierachy() throws Exception { @@ -593,18 +590,17 @@ public class EclipseLink2_0JavaEntityTests extends EclipseLink2_0ContextModelTes addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); addXmlClassRef(FULLY_QUALIFIED_SUB_TYPE_NAME); - ListIterator<ClassRef> classRefs = getPersistenceUnit().specifiedClassRefs(); + ListIterator<ClassRef> classRefs = getPersistenceUnit().getSpecifiedClassRefs().iterator(); classRefs.next(); JavaEntity javaEntity = (JavaEntity) classRefs.next().getJavaPersistentType().getMapping(); AttributeOverrideContainer overrideContainer = javaEntity.getAttributeOverrideContainer(); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_SUB_TYPE_NAME); - assertEquals(SUB_TYPE_NAME, typeResource.getName()); - assertNull(typeResource.getAnnotation(AttributeOverrideAnnotation.ANNOTATION_NAME)); - assertNull(typeResource.getAnnotation(AttributeOverridesAnnotation.ANNOTATION_NAME)); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_SUB_TYPE_NAME, Kind.TYPE); + assertEquals(SUB_TYPE_NAME, resourceType.getName()); + assertNull(resourceType.getAnnotation(0, AttributeOverrideAnnotation.ANNOTATION_NAME)); - assertEquals(3, overrideContainer.virtualOverridesSize()); - VirtualAttributeOverride virtualAttributeOverride = overrideContainer.virtualOverrides().next(); + assertEquals(3, overrideContainer.getVirtualOverridesSize()); + VirtualAttributeOverride virtualAttributeOverride = overrideContainer.getVirtualOverrides().iterator().next(); assertEquals("id", virtualAttributeOverride.getName()); assertEquals("id", virtualAttributeOverride.getColumn().getName()); assertEquals(SUB_TYPE_NAME, virtualAttributeOverride.getColumn().getTable()); @@ -616,29 +612,27 @@ public class EclipseLink2_0JavaEntityTests extends EclipseLink2_0ContextModelTes idMapping.getColumn().setSpecifiedName("FOO"); idMapping.getColumn().setSpecifiedTable("BAR"); - assertEquals(SUB_TYPE_NAME, typeResource.getName()); - assertNull(typeResource.getAnnotation(AttributeOverrideAnnotation.ANNOTATION_NAME)); - assertNull(typeResource.getAnnotation(AttributeOverridesAnnotation.ANNOTATION_NAME)); + assertEquals(SUB_TYPE_NAME, resourceType.getName()); + assertNull(resourceType.getAnnotation(0, AttributeOverrideAnnotation.ANNOTATION_NAME)); - assertEquals(3, overrideContainer.virtualOverridesSize()); - virtualAttributeOverride = overrideContainer.virtualOverrides().next(); + assertEquals(3, overrideContainer.getVirtualOverridesSize()); + virtualAttributeOverride = overrideContainer.getVirtualOverrides().iterator().next(); assertEquals("id", virtualAttributeOverride.getName()); assertEquals("FOO", virtualAttributeOverride.getColumn().getName()); assertEquals("BAR", virtualAttributeOverride.getColumn().getTable()); idMapping.getColumn().setSpecifiedName(null); idMapping.getColumn().setSpecifiedTable(null); - assertEquals(SUB_TYPE_NAME, typeResource.getName()); - assertNull(typeResource.getAnnotation(AttributeOverrideAnnotation.ANNOTATION_NAME)); - assertNull(typeResource.getAnnotation(AttributeOverridesAnnotation.ANNOTATION_NAME)); + assertEquals(SUB_TYPE_NAME, resourceType.getName()); + assertNull(resourceType.getAnnotation(0, AttributeOverrideAnnotation.ANNOTATION_NAME)); - virtualAttributeOverride = overrideContainer.virtualOverrides().next(); + virtualAttributeOverride = overrideContainer.getVirtualOverrides().iterator().next(); assertEquals("id", virtualAttributeOverride.getName()); assertEquals("id", virtualAttributeOverride.getColumn().getName()); assertEquals(SUB_TYPE_NAME, virtualAttributeOverride.getColumn().getTable()); virtualAttributeOverride.convertToSpecified(); - assertEquals(2, overrideContainer.virtualOverridesSize()); + assertEquals(2, overrideContainer.getVirtualOverridesSize()); } public void testSpecifiedAttributeOverridesSize() throws Exception { @@ -646,18 +640,18 @@ public class EclipseLink2_0JavaEntityTests extends EclipseLink2_0ContextModelTes addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); AttributeOverrideContainer overrideContainer = getJavaEntity().getAttributeOverrideContainer(); - assertEquals(0, overrideContainer.specifiedOverridesSize()); + assertEquals(0, overrideContainer.getSpecifiedOverridesSize()); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); //add an annotation to the resource model and verify the context model is updated - AttributeOverrideAnnotation attributeOverride = (AttributeOverrideAnnotation) typeResource.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + AttributeOverrideAnnotation attributeOverride = (AttributeOverrideAnnotation) resourceType.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE); attributeOverride.setName("FOO"); - attributeOverride = (AttributeOverrideAnnotation) typeResource.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + attributeOverride = (AttributeOverrideAnnotation) resourceType.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE); attributeOverride.setName("BAR"); getJpaProject().synchronizeContextModel(); - assertEquals(2, overrideContainer.specifiedOverridesSize()); + assertEquals(2, overrideContainer.getSpecifiedOverridesSize()); } public void testDefaultAttributeOverridesSize() throws Exception { @@ -668,16 +662,16 @@ public class EclipseLink2_0JavaEntityTests extends EclipseLink2_0ContextModelTes addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); AttributeOverrideContainer overrideContainer = getJavaEntity().getAttributeOverrideContainer(); - assertEquals(3, overrideContainer.virtualOverridesSize()); + assertEquals(3, overrideContainer.getVirtualOverridesSize()); - overrideContainer.virtualOverrides().next().convertToSpecified(); - assertEquals(2, overrideContainer.virtualOverridesSize()); + overrideContainer.getVirtualOverrides().iterator().next().convertToSpecified(); + assertEquals(2, overrideContainer.getVirtualOverridesSize()); - overrideContainer.virtualOverrides().next().convertToSpecified(); - assertEquals(1, overrideContainer.virtualOverridesSize()); + overrideContainer.getVirtualOverrides().iterator().next().convertToSpecified(); + assertEquals(1, overrideContainer.getVirtualOverridesSize()); - overrideContainer.virtualOverrides().next().convertToSpecified(); - assertEquals(0, overrideContainer.virtualOverridesSize()); + overrideContainer.getVirtualOverrides().iterator().next().convertToSpecified(); + assertEquals(0, overrideContainer.getVirtualOverridesSize()); } public void testAttributeOverridesSize() throws Exception { @@ -688,20 +682,20 @@ public class EclipseLink2_0JavaEntityTests extends EclipseLink2_0ContextModelTes addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); AttributeOverrideContainer overrideContainer = getJavaEntity().getAttributeOverrideContainer(); - assertEquals(3, overrideContainer.overridesSize()); + assertEquals(3, overrideContainer.getOverridesSize()); - overrideContainer.virtualOverrides().next().convertToSpecified(); - assertEquals(3, overrideContainer.overridesSize()); + overrideContainer.getVirtualOverrides().iterator().next().convertToSpecified(); + assertEquals(3, overrideContainer.getOverridesSize()); - overrideContainer.virtualOverrides().next().convertToSpecified(); - assertEquals(3, overrideContainer.overridesSize()); + overrideContainer.getVirtualOverrides().iterator().next().convertToSpecified(); + assertEquals(3, overrideContainer.getOverridesSize()); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_SUB_TYPE_NAME); - AttributeOverrideAnnotation annotation = (AttributeOverrideAnnotation) typeResource.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_SUB_TYPE_NAME, Kind.TYPE); + AttributeOverrideAnnotation annotation = (AttributeOverrideAnnotation) resourceType.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE); annotation.setName("bar"); getJpaProject().synchronizeContextModel(); - assertEquals(4, overrideContainer.overridesSize()); + assertEquals(4, overrideContainer.getOverridesSize()); } public void testAttributeOverrideSetVirtual() throws Exception { @@ -712,11 +706,11 @@ public class EclipseLink2_0JavaEntityTests extends EclipseLink2_0ContextModelTes addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); AttributeOverrideContainer overrideContainer = getJavaEntity().getAttributeOverrideContainer(); - overrideContainer.virtualOverrides().next().convertToSpecified(); - overrideContainer.virtualOverrides().next().convertToSpecified(); + overrideContainer.getVirtualOverrides().iterator().next().convertToSpecified(); + overrideContainer.getVirtualOverrides().iterator().next().convertToSpecified(); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_SUB_TYPE_NAME); - Iterator<NestableAnnotation> attributeOverrides = typeResource.annotations(AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverridesAnnotation.ANNOTATION_NAME); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_SUB_TYPE_NAME, Kind.TYPE); + Iterator<NestableAnnotation> attributeOverrides = resourceType.getAnnotations(AttributeOverrideAnnotation.ANNOTATION_NAME).iterator(); assertEquals("id", ((AttributeOverrideAnnotation) attributeOverrides.next()).getName()); assertEquals("name", ((AttributeOverrideAnnotation) attributeOverrides.next()).getName()); @@ -729,15 +723,15 @@ public class EclipseLink2_0JavaEntityTests extends EclipseLink2_0ContextModelTes addXmlClassRef(FULLY_QUALIFIED_SUB_TYPE_NAME); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - AttributeOverrideContainer overrideContainer = getJavaEntity().getAttributeOverrideContainer(); + JavaAttributeOverrideContainer overrideContainer = getJavaEntity().getAttributeOverrideContainer(); - ListIterator<JavaVirtualAttributeOverride> virtualAttributeOverrides = (ListIterator<JavaVirtualAttributeOverride>) overrideContainer.virtualOverrides(); + ListIterator<JavaVirtualAttributeOverride> virtualAttributeOverrides = overrideContainer.getVirtualOverrides().iterator(); virtualAttributeOverrides.next(); virtualAttributeOverrides.next().convertToSpecified(); - overrideContainer.virtualOverrides().next().convertToSpecified(); + overrideContainer.getVirtualOverrides().iterator().next().convertToSpecified(); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_SUB_TYPE_NAME); - Iterator<NestableAnnotation> attributeOverrides = typeResource.annotations(AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverridesAnnotation.ANNOTATION_NAME); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_SUB_TYPE_NAME, Kind.TYPE); + Iterator<NestableAnnotation> attributeOverrides = resourceType.getAnnotations(AttributeOverrideAnnotation.ANNOTATION_NAME).iterator(); assertEquals("name", ((AttributeOverrideAnnotation) attributeOverrides.next()).getName()); assertEquals("id", ((AttributeOverrideAnnotation) attributeOverrides.next()).getName()); @@ -750,45 +744,45 @@ public class EclipseLink2_0JavaEntityTests extends EclipseLink2_0ContextModelTes addXmlClassRef(FULLY_QUALIFIED_SUB_TYPE_NAME); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - AttributeOverrideContainer overrideContainer = getJavaEntity().getAttributeOverrideContainer(); + JavaAttributeOverrideContainer overrideContainer = getJavaEntity().getAttributeOverrideContainer(); - overrideContainer.virtualOverrides().next().convertToSpecified(); - overrideContainer.virtualOverrides().next().convertToSpecified(); - overrideContainer.virtualOverrides().next().convertToSpecified(); + overrideContainer.getVirtualOverrides().iterator().next().convertToSpecified(); + overrideContainer.getVirtualOverrides().iterator().next().convertToSpecified(); + overrideContainer.getVirtualOverrides().iterator().next().convertToSpecified(); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_SUB_TYPE_NAME); - assertEquals(3, CollectionTools.size(typeResource.annotations(AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverridesAnnotation.ANNOTATION_NAME))); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_SUB_TYPE_NAME, Kind.TYPE); + assertEquals(3, resourceType.getAnnotationsSize(AttributeOverrideAnnotation.ANNOTATION_NAME)); - overrideContainer.specifiedOverrides().next().convertToVirtual(); + overrideContainer.getSpecifiedOverrides().iterator().next().convertToVirtual(); - Iterator<NestableAnnotation> attributeOverrideResources = typeResource.annotations(AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverridesAnnotation.ANNOTATION_NAME); + Iterator<NestableAnnotation> attributeOverrideResources = resourceType.getAnnotations(AttributeOverrideAnnotation.ANNOTATION_NAME).iterator(); assertEquals("name", ((AttributeOverrideAnnotation) attributeOverrideResources.next()).getName()); assertEquals("foo", ((AttributeOverrideAnnotation) attributeOverrideResources.next()).getName()); assertFalse(attributeOverrideResources.hasNext()); - Iterator<JavaAttributeOverride> attributeOverrides = (Iterator<JavaAttributeOverride>) overrideContainer.specifiedOverrides(); + Iterator<JavaAttributeOverride> attributeOverrides = overrideContainer.getSpecifiedOverrides().iterator(); assertEquals("name", attributeOverrides.next().getName()); assertEquals("foo", attributeOverrides.next().getName()); assertFalse(attributeOverrides.hasNext()); - overrideContainer.specifiedOverrides().next().convertToVirtual(); - attributeOverrideResources = typeResource.annotations(AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverridesAnnotation.ANNOTATION_NAME); + overrideContainer.getSpecifiedOverrides().iterator().next().convertToVirtual(); + attributeOverrideResources = resourceType.getAnnotations(AttributeOverrideAnnotation.ANNOTATION_NAME).iterator(); assertEquals("foo", ((AttributeOverrideAnnotation) attributeOverrideResources.next()).getName()); assertFalse(attributeOverrideResources.hasNext()); - attributeOverrides = (Iterator<JavaAttributeOverride>) overrideContainer.specifiedOverrides(); + attributeOverrides = overrideContainer.getSpecifiedOverrides().iterator(); assertEquals("foo", attributeOverrides.next().getName()); assertFalse(attributeOverrides.hasNext()); - overrideContainer.specifiedOverrides().next().convertToVirtual(); - attributeOverrideResources = typeResource.annotations(AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverridesAnnotation.ANNOTATION_NAME); + overrideContainer.getSpecifiedOverrides().iterator().next().convertToVirtual(); + attributeOverrideResources = resourceType.getAnnotations(AttributeOverrideAnnotation.ANNOTATION_NAME).iterator(); assertFalse(attributeOverrideResources.hasNext()); - attributeOverrides = (Iterator<JavaAttributeOverride>) overrideContainer.specifiedOverrides(); + attributeOverrides = overrideContainer.getSpecifiedOverrides().iterator(); assertFalse(attributeOverrides.hasNext()); - assertNull(typeResource.getAnnotation(AttributeOverridesAnnotation.ANNOTATION_NAME)); + assertNull(resourceType.getAnnotation(0, AttributeOverrideAnnotation.ANNOTATION_NAME)); } public void testMoveSpecifiedAttributeOverride() throws Exception { @@ -799,36 +793,36 @@ public class EclipseLink2_0JavaEntityTests extends EclipseLink2_0ContextModelTes addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); AttributeOverrideContainer overrideContainer = getJavaEntity().getAttributeOverrideContainer(); - overrideContainer.virtualOverrides().next().convertToSpecified(); - overrideContainer.virtualOverrides().next().convertToSpecified(); - overrideContainer.virtualOverrides().next().convertToSpecified(); + overrideContainer.getVirtualOverrides().iterator().next().convertToSpecified(); + overrideContainer.getVirtualOverrides().iterator().next().convertToSpecified(); + overrideContainer.getVirtualOverrides().iterator().next().convertToSpecified(); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_SUB_TYPE_NAME); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_SUB_TYPE_NAME, Kind.TYPE); - Iterator<NestableAnnotation> javaAttributeOverrides = typeResource.annotations(AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverridesAnnotation.ANNOTATION_NAME); + Iterator<NestableAnnotation> javaAttributeOverrides = resourceType.getAnnotations(AttributeOverrideAnnotation.ANNOTATION_NAME).iterator(); assertEquals(3, CollectionTools.size(javaAttributeOverrides)); overrideContainer.moveSpecifiedOverride(2, 0); - ListIterator<AttributeOverride> attributeOverrides = (ListIterator<AttributeOverride>) overrideContainer.specifiedOverrides(); + ListIterator<? extends AttributeOverride> attributeOverrides = overrideContainer.getSpecifiedOverrides().iterator(); assertEquals("name", attributeOverrides.next().getName()); assertEquals("foo", attributeOverrides.next().getName()); assertEquals("id", attributeOverrides.next().getName()); - javaAttributeOverrides = typeResource.annotations(AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverridesAnnotation.ANNOTATION_NAME); + javaAttributeOverrides = resourceType.getAnnotations(AttributeOverrideAnnotation.ANNOTATION_NAME).iterator(); assertEquals("name", ((AttributeOverrideAnnotation) javaAttributeOverrides.next()).getName()); assertEquals("foo", ((AttributeOverrideAnnotation) javaAttributeOverrides.next()).getName()); assertEquals("id", ((AttributeOverrideAnnotation) javaAttributeOverrides.next()).getName()); overrideContainer.moveSpecifiedOverride(0, 1); - attributeOverrides = (ListIterator<AttributeOverride>) overrideContainer.specifiedOverrides(); + attributeOverrides = overrideContainer.getSpecifiedOverrides().iterator(); assertEquals("foo", attributeOverrides.next().getName()); assertEquals("name", attributeOverrides.next().getName()); assertEquals("id", attributeOverrides.next().getName()); - javaAttributeOverrides = typeResource.annotations(AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverridesAnnotation.ANNOTATION_NAME); + javaAttributeOverrides = resourceType.getAnnotations(AttributeOverrideAnnotation.ANNOTATION_NAME).iterator(); assertEquals("foo", ((AttributeOverrideAnnotation) javaAttributeOverrides.next()).getName()); assertEquals("name", ((AttributeOverrideAnnotation) javaAttributeOverrides.next()).getName()); assertEquals("id", ((AttributeOverrideAnnotation) javaAttributeOverrides.next()).getName()); @@ -839,51 +833,51 @@ public class EclipseLink2_0JavaEntityTests extends EclipseLink2_0ContextModelTes addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); AttributeOverrideContainer overrideContainer = getJavaEntity().getAttributeOverrideContainer(); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); - ((AttributeOverrideAnnotation) typeResource.addAnnotation(0, AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverridesAnnotation.ANNOTATION_NAME)).setName("FOO"); - ((AttributeOverrideAnnotation) typeResource.addAnnotation(1, AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverridesAnnotation.ANNOTATION_NAME)).setName("BAR"); - ((AttributeOverrideAnnotation) typeResource.addAnnotation(2, AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverridesAnnotation.ANNOTATION_NAME)).setName("BAZ"); + ((AttributeOverrideAnnotation) resourceType.addAnnotation(0, AttributeOverrideAnnotation.ANNOTATION_NAME)).setName("FOO"); + ((AttributeOverrideAnnotation) resourceType.addAnnotation(1, AttributeOverrideAnnotation.ANNOTATION_NAME)).setName("BAR"); + ((AttributeOverrideAnnotation) resourceType.addAnnotation(2, AttributeOverrideAnnotation.ANNOTATION_NAME)).setName("BAZ"); getJpaProject().synchronizeContextModel(); - ListIterator<AttributeOverride> attributeOverrides = (ListIterator<AttributeOverride>) overrideContainer.specifiedOverrides(); + ListIterator<? extends AttributeOverride> attributeOverrides = overrideContainer.getSpecifiedOverrides().iterator(); assertEquals("FOO", attributeOverrides.next().getName()); assertEquals("BAR", attributeOverrides.next().getName()); assertEquals("BAZ", attributeOverrides.next().getName()); assertFalse(attributeOverrides.hasNext()); - typeResource.moveAnnotation(2, 0, AttributeOverridesAnnotation.ANNOTATION_NAME); + resourceType.moveAnnotation(2, 0, AttributeOverrideAnnotation.ANNOTATION_NAME); getJpaProject().synchronizeContextModel(); - attributeOverrides = (ListIterator<AttributeOverride>) overrideContainer.specifiedOverrides(); + attributeOverrides = overrideContainer.getSpecifiedOverrides().iterator(); assertEquals("BAR", attributeOverrides.next().getName()); assertEquals("BAZ", attributeOverrides.next().getName()); assertEquals("FOO", attributeOverrides.next().getName()); assertFalse(attributeOverrides.hasNext()); - typeResource.moveAnnotation(0, 1, AttributeOverridesAnnotation.ANNOTATION_NAME); + resourceType.moveAnnotation(0, 1, AttributeOverrideAnnotation.ANNOTATION_NAME); getJpaProject().synchronizeContextModel(); - attributeOverrides = (ListIterator<AttributeOverride>) overrideContainer.specifiedOverrides(); + attributeOverrides = overrideContainer.getSpecifiedOverrides().iterator(); assertEquals("BAZ", attributeOverrides.next().getName()); assertEquals("BAR", attributeOverrides.next().getName()); assertEquals("FOO", attributeOverrides.next().getName()); assertFalse(attributeOverrides.hasNext()); - typeResource.removeAnnotation(1, AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverridesAnnotation.ANNOTATION_NAME); + resourceType.removeAnnotation(1, AttributeOverrideAnnotation.ANNOTATION_NAME); getJpaProject().synchronizeContextModel(); - attributeOverrides = (ListIterator<AttributeOverride>) overrideContainer.specifiedOverrides(); + attributeOverrides = overrideContainer.getSpecifiedOverrides().iterator(); assertEquals("BAZ", attributeOverrides.next().getName()); assertEquals("FOO", attributeOverrides.next().getName()); assertFalse(attributeOverrides.hasNext()); - typeResource.removeAnnotation(1, AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverridesAnnotation.ANNOTATION_NAME); + resourceType.removeAnnotation(1, AttributeOverrideAnnotation.ANNOTATION_NAME); getJpaProject().synchronizeContextModel(); - attributeOverrides = (ListIterator<AttributeOverride>) overrideContainer.specifiedOverrides(); + attributeOverrides = overrideContainer.getSpecifiedOverrides().iterator(); assertEquals("BAZ", attributeOverrides.next().getName()); assertFalse(attributeOverrides.hasNext()); - typeResource.removeAnnotation(0, AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverridesAnnotation.ANNOTATION_NAME); + resourceType.removeAnnotation(0, AttributeOverrideAnnotation.ANNOTATION_NAME); getJpaProject().synchronizeContextModel(); - attributeOverrides = (ListIterator<AttributeOverride>) overrideContainer.specifiedOverrides(); + attributeOverrides = overrideContainer.getSpecifiedOverrides().iterator(); assertFalse(attributeOverrides.hasNext()); } @@ -892,9 +886,9 @@ public class EclipseLink2_0JavaEntityTests extends EclipseLink2_0ContextModelTes createTestSubType(); addXmlClassRef(PACKAGE_NAME + ".AnnotationTestTypeChild"); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - AttributeOverrideContainer overrideContainer = getJavaEntity().getAttributeOverrideContainer(); + JavaAttributeOverrideContainer overrideContainer = getJavaEntity().getAttributeOverrideContainer(); - ListIterator<JavaVirtualAttributeOverride> virtualAttributeOverrides = (ListIterator<JavaVirtualAttributeOverride>) overrideContainer.virtualOverrides(); + ListIterator<JavaVirtualAttributeOverride> virtualAttributeOverrides = overrideContainer.getVirtualOverrides().iterator(); JavaVirtualAttributeOverride virtualAttributeOverride = virtualAttributeOverrides.next(); assertEquals("id", virtualAttributeOverride.getName()); assertTrue(virtualAttributeOverride.isVirtual()); @@ -908,12 +902,12 @@ public class EclipseLink2_0JavaEntityTests extends EclipseLink2_0ContextModelTes assertTrue(virtualAttributeOverride.isVirtual()); assertFalse(virtualAttributeOverrides.hasNext()); - overrideContainer.virtualOverrides().next().convertToSpecified(); - AttributeOverride specifiedAttributeOverride = overrideContainer.specifiedOverrides().next(); + overrideContainer.getVirtualOverrides().iterator().next().convertToSpecified(); + AttributeOverride specifiedAttributeOverride = overrideContainer.getSpecifiedOverrides().iterator().next(); assertFalse(specifiedAttributeOverride.isVirtual()); - virtualAttributeOverrides = (ListIterator<JavaVirtualAttributeOverride>) overrideContainer.virtualOverrides(); + virtualAttributeOverrides = overrideContainer.getVirtualOverrides().iterator(); virtualAttributeOverride = virtualAttributeOverrides.next(); assertEquals("name", virtualAttributeOverride.getName()); assertTrue(virtualAttributeOverride.isVirtual()); @@ -974,65 +968,65 @@ public class EclipseLink2_0JavaEntityTests extends EclipseLink2_0ContextModelTes createTestEntity(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - AssociationOverrideContainer overrideContainer = getJavaEntity().getAssociationOverrideContainer(); - ListIterator<JavaAssociationOverride> specifiedAssociationOverrides = (ListIterator<JavaAssociationOverride>) overrideContainer.specifiedOverrides(); + JavaAssociationOverrideContainer overrideContainer = getJavaEntity().getAssociationOverrideContainer(); + ListIterator<JavaAssociationOverride> specifiedAssociationOverrides = overrideContainer.getSpecifiedOverrides().iterator(); assertFalse(specifiedAssociationOverrides.hasNext()); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); //add an annotation to the resource model and verify the context model is updated - AssociationOverrideAnnotation associationOverride = (AssociationOverrideAnnotation) typeResource.addAnnotation(0, JPA.ASSOCIATION_OVERRIDE, JPA.ASSOCIATION_OVERRIDES); + AssociationOverrideAnnotation associationOverride = (AssociationOverrideAnnotation) resourceType.addAnnotation(0, JPA.ASSOCIATION_OVERRIDE); associationOverride.setName("FOO"); getJpaProject().synchronizeContextModel(); - specifiedAssociationOverrides = (ListIterator<JavaAssociationOverride>) overrideContainer.specifiedOverrides(); + specifiedAssociationOverrides = overrideContainer.getSpecifiedOverrides().iterator(); assertEquals("FOO", specifiedAssociationOverrides.next().getName()); assertFalse(specifiedAssociationOverrides.hasNext()); - associationOverride = (AssociationOverrideAnnotation) typeResource.addAnnotation(1, JPA.ASSOCIATION_OVERRIDE, JPA.ASSOCIATION_OVERRIDES); + associationOverride = (AssociationOverrideAnnotation) resourceType.addAnnotation(1, JPA.ASSOCIATION_OVERRIDE); associationOverride.setName("BAR"); getJpaProject().synchronizeContextModel(); - specifiedAssociationOverrides = (ListIterator<JavaAssociationOverride>) overrideContainer.specifiedOverrides(); + specifiedAssociationOverrides = overrideContainer.getSpecifiedOverrides().iterator(); assertEquals("FOO", specifiedAssociationOverrides.next().getName()); assertEquals("BAR", specifiedAssociationOverrides.next().getName()); assertFalse(specifiedAssociationOverrides.hasNext()); - associationOverride = (AssociationOverrideAnnotation) typeResource.addAnnotation(0, JPA.ASSOCIATION_OVERRIDE, JPA.ASSOCIATION_OVERRIDES); + associationOverride = (AssociationOverrideAnnotation) resourceType.addAnnotation(0, JPA.ASSOCIATION_OVERRIDE); associationOverride.setName("BAZ"); getJpaProject().synchronizeContextModel(); - specifiedAssociationOverrides = (ListIterator<JavaAssociationOverride>) overrideContainer.specifiedOverrides(); + specifiedAssociationOverrides = overrideContainer.getSpecifiedOverrides().iterator(); assertEquals("BAZ", specifiedAssociationOverrides.next().getName()); assertEquals("FOO", specifiedAssociationOverrides.next().getName()); assertEquals("BAR", specifiedAssociationOverrides.next().getName()); assertFalse(specifiedAssociationOverrides.hasNext()); //move an annotation to the resource model and verify the context model is updated - typeResource.moveAnnotation(1, 0, JPA.ASSOCIATION_OVERRIDES); + resourceType.moveAnnotation(1, 0, JPA.ASSOCIATION_OVERRIDE); getJpaProject().synchronizeContextModel(); - specifiedAssociationOverrides = (ListIterator<JavaAssociationOverride>) overrideContainer.specifiedOverrides(); + specifiedAssociationOverrides = overrideContainer.getSpecifiedOverrides().iterator(); assertEquals("FOO", specifiedAssociationOverrides.next().getName()); assertEquals("BAZ", specifiedAssociationOverrides.next().getName()); assertEquals("BAR", specifiedAssociationOverrides.next().getName()); assertFalse(specifiedAssociationOverrides.hasNext()); - typeResource.removeAnnotation(0, JPA.ASSOCIATION_OVERRIDE, JPA.ASSOCIATION_OVERRIDES); + resourceType.removeAnnotation(0, JPA.ASSOCIATION_OVERRIDE); getJpaProject().synchronizeContextModel(); - specifiedAssociationOverrides = (ListIterator<JavaAssociationOverride>) overrideContainer.specifiedOverrides(); + specifiedAssociationOverrides = overrideContainer.getSpecifiedOverrides().iterator(); assertEquals("BAZ", specifiedAssociationOverrides.next().getName()); assertEquals("BAR", specifiedAssociationOverrides.next().getName()); assertFalse(specifiedAssociationOverrides.hasNext()); - typeResource.removeAnnotation(0, JPA.ASSOCIATION_OVERRIDE, JPA.ASSOCIATION_OVERRIDES); + resourceType.removeAnnotation(0, JPA.ASSOCIATION_OVERRIDE); getJpaProject().synchronizeContextModel(); - specifiedAssociationOverrides = (ListIterator<JavaAssociationOverride>) overrideContainer.specifiedOverrides(); + specifiedAssociationOverrides = overrideContainer.getSpecifiedOverrides().iterator(); assertEquals("BAR", specifiedAssociationOverrides.next().getName()); assertFalse(specifiedAssociationOverrides.hasNext()); - typeResource.removeAnnotation(0, JPA.ASSOCIATION_OVERRIDE, JPA.ASSOCIATION_OVERRIDES); + resourceType.removeAnnotation(0, JPA.ASSOCIATION_OVERRIDE); getJpaProject().synchronizeContextModel(); - specifiedAssociationOverrides = (ListIterator<JavaAssociationOverride>) overrideContainer.specifiedOverrides(); + specifiedAssociationOverrides = overrideContainer.getSpecifiedOverrides().iterator(); assertFalse(specifiedAssociationOverrides.hasNext()); } @@ -1043,18 +1037,17 @@ public class EclipseLink2_0JavaEntityTests extends EclipseLink2_0ContextModelTes addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); addXmlClassRef(FULLY_QUALIFIED_SUB_TYPE_NAME); - ListIterator<ClassRef> classRefs = getPersistenceUnit().specifiedClassRefs(); + ListIterator<ClassRef> classRefs = getPersistenceUnit().getSpecifiedClassRefs().iterator(); classRefs.next(); JavaEntity javaEntity = (JavaEntity) classRefs.next().getJavaPersistentType().getMapping(); AssociationOverrideContainer overrideContainer = javaEntity.getAssociationOverrideContainer(); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_SUB_TYPE_NAME); - assertEquals(SUB_TYPE_NAME, typeResource.getName()); - assertNull(typeResource.getAnnotation(AssociationOverrideAnnotation.ANNOTATION_NAME)); - assertNull(typeResource.getAnnotation(AssociationOverridesAnnotation.ANNOTATION_NAME)); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_SUB_TYPE_NAME, Kind.TYPE); + assertEquals(SUB_TYPE_NAME, resourceType.getName()); + assertNull(resourceType.getAnnotation(0, AssociationOverrideAnnotation.ANNOTATION_NAME)); - assertEquals(4, overrideContainer.virtualOverridesSize()); - VirtualAssociationOverride virtualAssociationOverride = overrideContainer.virtualOverrides().next(); + assertEquals(4, overrideContainer.getVirtualOverridesSize()); + VirtualAssociationOverride virtualAssociationOverride = overrideContainer.getVirtualOverrides().iterator().next(); assertEquals("address", virtualAssociationOverride.getName()); @@ -1063,25 +1056,23 @@ public class EclipseLink2_0JavaEntityTests extends EclipseLink2_0ContextModelTes //idMapping.getColumn().setSpecifiedName("FOO"); //idMapping.getColumn().setSpecifiedTable("BAR"); - assertEquals(SUB_TYPE_NAME, typeResource.getName()); - assertNull(typeResource.getAnnotation(AssociationOverrideAnnotation.ANNOTATION_NAME)); - assertNull(typeResource.getAnnotation(AssociationOverridesAnnotation.ANNOTATION_NAME)); + assertEquals(SUB_TYPE_NAME, resourceType.getName()); + assertNull(resourceType.getAnnotation(0, AssociationOverrideAnnotation.ANNOTATION_NAME)); - assertEquals(4, overrideContainer.virtualOverridesSize()); - virtualAssociationOverride = overrideContainer.virtualOverrides().next(); + assertEquals(4, overrideContainer.getVirtualOverridesSize()); + virtualAssociationOverride = overrideContainer.getVirtualOverrides().iterator().next(); assertEquals("address", virtualAssociationOverride.getName()); //idMapping.getColumn().setSpecifiedName(null); //idMapping.getColumn().setSpecifiedTable(null); - assertEquals(SUB_TYPE_NAME, typeResource.getName()); - assertNull(typeResource.getAnnotation(AssociationOverrideAnnotation.ANNOTATION_NAME)); - assertNull(typeResource.getAnnotation(AssociationOverridesAnnotation.ANNOTATION_NAME)); + assertEquals(SUB_TYPE_NAME, resourceType.getName()); + assertNull(resourceType.getAnnotation(0, AssociationOverrideAnnotation.ANNOTATION_NAME)); - virtualAssociationOverride = overrideContainer.virtualOverrides().next(); + virtualAssociationOverride = overrideContainer.getVirtualOverrides().iterator().next(); assertEquals("address", virtualAssociationOverride.getName()); virtualAssociationOverride.convertToSpecified(); - assertEquals(3, overrideContainer.virtualOverridesSize()); + assertEquals(3, overrideContainer.getVirtualOverridesSize()); @@ -1100,9 +1091,9 @@ public class EclipseLink2_0JavaEntityTests extends EclipseLink2_0ContextModelTes //// joinColumn.setSpecifiedReferencedColumnName("BAR"); //// joinColumn.setSpecifiedTable("BAZ"); //// -//// assertEquals(SUB_TYPE_NAME, typeResource.getName()); -//// assertNull(typeResource.annotation(AssociationOverride.ANNOTATION_NAME)); -//// assertNull(typeResource.annotation(AssociationOverrides.ANNOTATION_NAME)); +//// assertEquals(SUB_TYPE_NAME, resourceType.getName()); +//// assertNull(resourceType.annotation(AssociationOverride.ANNOTATION_NAME)); +//// assertNull(resourceType.annotation(AssociationOverrides.ANNOTATION_NAME)); //// //// assertEquals(1, CollectionTools.size(javaEntity.defaultAssociationOverrides())); //// defaultAssociationOverride = javaEntity.defaultAssociationOverrides().next(); @@ -1114,9 +1105,9 @@ public class EclipseLink2_0JavaEntityTests extends EclipseLink2_0ContextModelTes //// joinColumn.setSpecifiedName(null); //// joinColumn.setSpecifiedReferencedColumnName(null); //// joinColumn.setSpecifiedTable(null); -//// assertEquals(SUB_TYPE_NAME, typeResource.getName()); -//// assertNull(typeResource.annotation(AssociationOverride.ANNOTATION_NAME)); -//// assertNull(typeResource.annotation(AssociationOverrides.ANNOTATION_NAME)); +//// assertEquals(SUB_TYPE_NAME, resourceType.getName()); +//// assertNull(resourceType.annotation(AssociationOverride.ANNOTATION_NAME)); +//// assertNull(resourceType.annotation(AssociationOverrides.ANNOTATION_NAME)); //// //// defaultAssociationOverride = javaEntity.defaultAssociationOverrides().next(); //// assertEquals("address", defaultJoinColumn.getName()); @@ -1133,18 +1124,18 @@ public class EclipseLink2_0JavaEntityTests extends EclipseLink2_0ContextModelTes addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); AssociationOverrideContainer overrideContainer = getJavaEntity().getAssociationOverrideContainer(); - assertEquals(0, overrideContainer.specifiedOverridesSize()); + assertEquals(0, overrideContainer.getSpecifiedOverridesSize()); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); //add an annotation to the resource model and verify the context model is updated - AssociationOverrideAnnotation associationOverride = (AssociationOverrideAnnotation) typeResource.addAnnotation(0, JPA.ASSOCIATION_OVERRIDE, JPA.ASSOCIATION_OVERRIDES); + AssociationOverrideAnnotation associationOverride = (AssociationOverrideAnnotation) resourceType.addAnnotation(0, JPA.ASSOCIATION_OVERRIDE); associationOverride.setName("FOO"); - associationOverride = (AssociationOverrideAnnotation) typeResource.addAnnotation(0, JPA.ASSOCIATION_OVERRIDE, JPA.ASSOCIATION_OVERRIDES); + associationOverride = (AssociationOverrideAnnotation) resourceType.addAnnotation(0, JPA.ASSOCIATION_OVERRIDE); associationOverride.setName("BAR"); getJpaProject().synchronizeContextModel(); - assertEquals(2, overrideContainer.specifiedOverridesSize()); + assertEquals(2, overrideContainer.getSpecifiedOverridesSize()); } public void testVirtualAssociationOverridesSize() throws Exception { @@ -1155,19 +1146,19 @@ public class EclipseLink2_0JavaEntityTests extends EclipseLink2_0ContextModelTes addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); AssociationOverrideContainer overrideContainer = getJavaEntity().getAssociationOverrideContainer(); - assertEquals(4, overrideContainer.virtualOverridesSize()); + assertEquals(4, overrideContainer.getVirtualOverridesSize()); - overrideContainer.virtualOverrides().next().convertToSpecified(); - assertEquals(3, overrideContainer.virtualOverridesSize()); + overrideContainer.getVirtualOverrides().iterator().next().convertToSpecified(); + assertEquals(3, overrideContainer.getVirtualOverridesSize()); - overrideContainer.virtualOverrides().next().convertToSpecified(); - assertEquals(2, overrideContainer.virtualOverridesSize()); + overrideContainer.getVirtualOverrides().iterator().next().convertToSpecified(); + assertEquals(2, overrideContainer.getVirtualOverridesSize()); - overrideContainer.virtualOverrides().next().convertToSpecified(); - assertEquals(1, overrideContainer.virtualOverridesSize()); + overrideContainer.getVirtualOverrides().iterator().next().convertToSpecified(); + assertEquals(1, overrideContainer.getVirtualOverridesSize()); - overrideContainer.virtualOverrides().next().convertToSpecified(); - assertEquals(0, overrideContainer.virtualOverridesSize()); + overrideContainer.getVirtualOverrides().iterator().next().convertToSpecified(); + assertEquals(0, overrideContainer.getVirtualOverridesSize()); } public void testAssociationOverridesSize() throws Exception { @@ -1178,20 +1169,20 @@ public class EclipseLink2_0JavaEntityTests extends EclipseLink2_0ContextModelTes addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); AssociationOverrideContainer overrideContainer = getJavaEntity().getAssociationOverrideContainer(); - assertEquals(4, overrideContainer.overridesSize()); + assertEquals(4, overrideContainer.getOverridesSize()); - overrideContainer.virtualOverrides().next().convertToSpecified(); - assertEquals(4, overrideContainer.overridesSize()); + overrideContainer.getVirtualOverrides().iterator().next().convertToSpecified(); + assertEquals(4, overrideContainer.getOverridesSize()); - overrideContainer.virtualOverrides().next().convertToSpecified(); - assertEquals(4, overrideContainer.overridesSize()); + overrideContainer.getVirtualOverrides().iterator().next().convertToSpecified(); + assertEquals(4, overrideContainer.getOverridesSize()); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_SUB_TYPE_NAME); - AssociationOverrideAnnotation annotation = (AssociationOverrideAnnotation) typeResource.addAnnotation(0, JPA.ASSOCIATION_OVERRIDE, JPA.ASSOCIATION_OVERRIDES); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_SUB_TYPE_NAME, Kind.TYPE); + AssociationOverrideAnnotation annotation = (AssociationOverrideAnnotation) resourceType.addAnnotation(0, JPA.ASSOCIATION_OVERRIDE); annotation.setName("bar"); getJpaProject().synchronizeContextModel(); - assertEquals(5, overrideContainer.overridesSize()); + assertEquals(5, overrideContainer.getOverridesSize()); } public void testAssociationOverrideSetVirtual() throws Exception { @@ -1202,11 +1193,11 @@ public class EclipseLink2_0JavaEntityTests extends EclipseLink2_0ContextModelTes addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); AssociationOverrideContainer overrideContainer = getJavaEntity().getAssociationOverrideContainer(); - overrideContainer.virtualOverrides().next().convertToSpecified(); - overrideContainer.virtualOverrides().next().convertToSpecified(); + overrideContainer.getVirtualOverrides().iterator().next().convertToSpecified(); + overrideContainer.getVirtualOverrides().iterator().next().convertToSpecified(); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_SUB_TYPE_NAME); - Iterator<NestableAnnotation> associationOverrides = typeResource.annotations(AssociationOverrideAnnotation.ANNOTATION_NAME, AssociationOverridesAnnotation.ANNOTATION_NAME); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_SUB_TYPE_NAME, Kind.TYPE); + Iterator<NestableAnnotation> associationOverrides = resourceType.getAnnotations(AssociationOverrideAnnotation.ANNOTATION_NAME).iterator(); assertEquals("address", ((AssociationOverrideAnnotation) associationOverrides.next()).getName()); assertEquals("address2", ((AssociationOverrideAnnotation) associationOverrides.next()).getName()); @@ -1219,15 +1210,15 @@ public class EclipseLink2_0JavaEntityTests extends EclipseLink2_0ContextModelTes addXmlClassRef(FULLY_QUALIFIED_SUB_TYPE_NAME); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - AssociationOverrideContainer overrideContainer = getJavaEntity().getAssociationOverrideContainer(); + JavaAssociationOverrideContainer overrideContainer = getJavaEntity().getAssociationOverrideContainer(); - ListIterator<JavaVirtualAssociationOverride> virtualAssociationOverrides = (ListIterator<JavaVirtualAssociationOverride>) overrideContainer.virtualOverrides(); + ListIterator<JavaVirtualAssociationOverride> virtualAssociationOverrides = overrideContainer.getVirtualOverrides().iterator(); virtualAssociationOverrides.next(); virtualAssociationOverrides.next().convertToSpecified(); - overrideContainer.virtualOverrides().next().convertToSpecified(); + overrideContainer.getVirtualOverrides().iterator().next().convertToSpecified(); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_SUB_TYPE_NAME); - Iterator<NestableAnnotation> associationOverrides = typeResource.annotations(AssociationOverrideAnnotation.ANNOTATION_NAME, AssociationOverridesAnnotation.ANNOTATION_NAME); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_SUB_TYPE_NAME, Kind.TYPE); + Iterator<NestableAnnotation> associationOverrides = resourceType.getAnnotations(AssociationOverrideAnnotation.ANNOTATION_NAME).iterator(); assertEquals("address2", ((AssociationOverrideAnnotation) associationOverrides.next()).getName()); assertEquals("address", ((AssociationOverrideAnnotation) associationOverrides.next()).getName()); @@ -1240,32 +1231,32 @@ public class EclipseLink2_0JavaEntityTests extends EclipseLink2_0ContextModelTes addXmlClassRef(FULLY_QUALIFIED_SUB_TYPE_NAME); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - AssociationOverrideContainer overrideContainer = getJavaEntity().getAssociationOverrideContainer(); + JavaAssociationOverrideContainer overrideContainer = getJavaEntity().getAssociationOverrideContainer(); - overrideContainer.virtualOverrides().next().convertToSpecified(); - overrideContainer.virtualOverrides().next().convertToSpecified(); + overrideContainer.getVirtualOverrides().iterator().next().convertToSpecified(); + overrideContainer.getVirtualOverrides().iterator().next().convertToSpecified(); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_SUB_TYPE_NAME); - assertEquals(2, CollectionTools.size(typeResource.annotations(AssociationOverrideAnnotation.ANNOTATION_NAME, AssociationOverridesAnnotation.ANNOTATION_NAME))); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_SUB_TYPE_NAME, Kind.TYPE); + assertEquals(2, resourceType.getAnnotationsSize(AssociationOverrideAnnotation.ANNOTATION_NAME)); - overrideContainer.specifiedOverrides().next().convertToVirtual(); + overrideContainer.getSpecifiedOverrides().iterator().next().convertToVirtual(); - Iterator<NestableAnnotation> associationOverrideResources = typeResource.annotations(AssociationOverrideAnnotation.ANNOTATION_NAME, AssociationOverridesAnnotation.ANNOTATION_NAME); + Iterator<NestableAnnotation> associationOverrideResources = resourceType.getAnnotations(AssociationOverrideAnnotation.ANNOTATION_NAME).iterator(); assertEquals("address2", ((AssociationOverrideAnnotation) associationOverrideResources.next()).getName()); assertFalse(associationOverrideResources.hasNext()); - Iterator<JavaAssociationOverride> associationOverrides = (Iterator<JavaAssociationOverride>) overrideContainer.specifiedOverrides(); + Iterator<JavaAssociationOverride> associationOverrides = overrideContainer.getSpecifiedOverrides().iterator(); assertEquals("address2", associationOverrides.next().getName()); assertFalse(associationOverrides.hasNext()); - overrideContainer.specifiedOverrides().next().convertToVirtual(); - associationOverrideResources = typeResource.annotations(AssociationOverrideAnnotation.ANNOTATION_NAME, AssociationOverridesAnnotation.ANNOTATION_NAME); + overrideContainer.getSpecifiedOverrides().iterator().next().convertToVirtual(); + associationOverrideResources = resourceType.getAnnotations(AssociationOverrideAnnotation.ANNOTATION_NAME).iterator(); assertFalse(associationOverrideResources.hasNext()); - associationOverrides = (Iterator<JavaAssociationOverride>) overrideContainer.specifiedOverrides(); + associationOverrides = overrideContainer.getSpecifiedOverrides().iterator(); assertFalse(associationOverrides.hasNext()); - assertNull(typeResource.getAnnotation(AssociationOverridesAnnotation.ANNOTATION_NAME)); + assertNull(resourceType.getAnnotation(0, AssociationOverrideAnnotation.ANNOTATION_NAME)); } public void testMoveSpecifiedAssociationOverride() throws Exception { @@ -1275,33 +1266,33 @@ public class EclipseLink2_0JavaEntityTests extends EclipseLink2_0ContextModelTes addXmlClassRef(FULLY_QUALIFIED_SUB_TYPE_NAME); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - AssociationOverrideContainer overrideContainer = getJavaEntity().getAssociationOverrideContainer(); - overrideContainer.virtualOverrides().next().convertToSpecified(); - overrideContainer.virtualOverrides().next().convertToSpecified(); + JavaAssociationOverrideContainer overrideContainer = getJavaEntity().getAssociationOverrideContainer(); + overrideContainer.getVirtualOverrides().iterator().next().convertToSpecified(); + overrideContainer.getVirtualOverrides().iterator().next().convertToSpecified(); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_SUB_TYPE_NAME); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_SUB_TYPE_NAME, Kind.TYPE); - Iterator<NestableAnnotation> javaAssociationOverrides = typeResource.annotations(AssociationOverrideAnnotation.ANNOTATION_NAME, AssociationOverridesAnnotation.ANNOTATION_NAME); + Iterator<NestableAnnotation> javaAssociationOverrides = resourceType.getAnnotations(AssociationOverrideAnnotation.ANNOTATION_NAME).iterator(); assertEquals(2, CollectionTools.size(javaAssociationOverrides)); overrideContainer.moveSpecifiedOverride(1, 0); - Iterator<JavaAssociationOverride> associationOverrides = (Iterator<JavaAssociationOverride>) overrideContainer.specifiedOverrides(); + Iterator<JavaAssociationOverride> associationOverrides = overrideContainer.getSpecifiedOverrides().iterator(); assertEquals("address2", associationOverrides.next().getName()); assertEquals("address", associationOverrides.next().getName()); - javaAssociationOverrides = typeResource.annotations(AssociationOverrideAnnotation.ANNOTATION_NAME, AssociationOverridesAnnotation.ANNOTATION_NAME); + javaAssociationOverrides = resourceType.getAnnotations(AssociationOverrideAnnotation.ANNOTATION_NAME).iterator(); assertEquals("address2", ((AssociationOverrideAnnotation) javaAssociationOverrides.next()).getName()); assertEquals("address", ((AssociationOverrideAnnotation) javaAssociationOverrides.next()).getName()); overrideContainer.moveSpecifiedOverride(0, 1); - associationOverrides = (Iterator<JavaAssociationOverride>) overrideContainer.specifiedOverrides(); + associationOverrides = overrideContainer.getSpecifiedOverrides().iterator(); assertEquals("address", associationOverrides.next().getName()); assertEquals("address2", associationOverrides.next().getName()); - javaAssociationOverrides = typeResource.annotations(AssociationOverrideAnnotation.ANNOTATION_NAME, AssociationOverridesAnnotation.ANNOTATION_NAME); + javaAssociationOverrides = resourceType.getAnnotations(AssociationOverrideAnnotation.ANNOTATION_NAME).iterator(); assertEquals("address", ((AssociationOverrideAnnotation) javaAssociationOverrides.next()).getName()); assertEquals("address2", ((AssociationOverrideAnnotation) javaAssociationOverrides.next()).getName()); } @@ -1310,52 +1301,52 @@ public class EclipseLink2_0JavaEntityTests extends EclipseLink2_0ContextModelTes createTestEntity(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - AssociationOverrideContainer overrideContainer = getJavaEntity().getAssociationOverrideContainer(); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); + JavaAssociationOverrideContainer overrideContainer = getJavaEntity().getAssociationOverrideContainer(); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); - ((AssociationOverrideAnnotation) typeResource.addAnnotation(0, AssociationOverrideAnnotation.ANNOTATION_NAME, AssociationOverridesAnnotation.ANNOTATION_NAME)).setName("FOO"); - ((AssociationOverrideAnnotation) typeResource.addAnnotation(1, AssociationOverrideAnnotation.ANNOTATION_NAME, AssociationOverridesAnnotation.ANNOTATION_NAME)).setName("BAR"); - ((AssociationOverrideAnnotation) typeResource.addAnnotation(2, AssociationOverrideAnnotation.ANNOTATION_NAME, AssociationOverridesAnnotation.ANNOTATION_NAME)).setName("BAZ"); + ((AssociationOverrideAnnotation) resourceType.addAnnotation(0, AssociationOverrideAnnotation.ANNOTATION_NAME)).setName("FOO"); + ((AssociationOverrideAnnotation) resourceType.addAnnotation(1, AssociationOverrideAnnotation.ANNOTATION_NAME)).setName("BAR"); + ((AssociationOverrideAnnotation) resourceType.addAnnotation(2, AssociationOverrideAnnotation.ANNOTATION_NAME)).setName("BAZ"); getJpaProject().synchronizeContextModel(); - Iterator<JavaAssociationOverride> associationOverrides = (Iterator<JavaAssociationOverride>) overrideContainer.specifiedOverrides(); + Iterator<JavaAssociationOverride> associationOverrides = overrideContainer.getSpecifiedOverrides().iterator(); assertEquals("FOO", associationOverrides.next().getName()); assertEquals("BAR", associationOverrides.next().getName()); assertEquals("BAZ", associationOverrides.next().getName()); assertFalse(associationOverrides.hasNext()); - typeResource.moveAnnotation(2, 0, AssociationOverridesAnnotation.ANNOTATION_NAME); + resourceType.moveAnnotation(2, 0, AssociationOverrideAnnotation.ANNOTATION_NAME); getJpaProject().synchronizeContextModel(); - associationOverrides = (Iterator<JavaAssociationOverride>) overrideContainer.specifiedOverrides(); + associationOverrides = overrideContainer.getSpecifiedOverrides().iterator(); assertEquals("BAR", associationOverrides.next().getName()); assertEquals("BAZ", associationOverrides.next().getName()); assertEquals("FOO", associationOverrides.next().getName()); assertFalse(associationOverrides.hasNext()); - typeResource.moveAnnotation(0, 1, AssociationOverridesAnnotation.ANNOTATION_NAME); + resourceType.moveAnnotation(0, 1, AssociationOverrideAnnotation.ANNOTATION_NAME); getJpaProject().synchronizeContextModel(); - associationOverrides = (Iterator<JavaAssociationOverride>) overrideContainer.specifiedOverrides(); + associationOverrides = overrideContainer.getSpecifiedOverrides().iterator(); assertEquals("BAZ", associationOverrides.next().getName()); assertEquals("BAR", associationOverrides.next().getName()); assertEquals("FOO", associationOverrides.next().getName()); assertFalse(associationOverrides.hasNext()); - typeResource.removeAnnotation(1, AssociationOverrideAnnotation.ANNOTATION_NAME, AssociationOverridesAnnotation.ANNOTATION_NAME); + resourceType.removeAnnotation(1, AssociationOverrideAnnotation.ANNOTATION_NAME); getJpaProject().synchronizeContextModel(); - associationOverrides = (Iterator<JavaAssociationOverride>) overrideContainer.specifiedOverrides(); + associationOverrides = overrideContainer.getSpecifiedOverrides().iterator(); assertEquals("BAZ", associationOverrides.next().getName()); assertEquals("FOO", associationOverrides.next().getName()); assertFalse(associationOverrides.hasNext()); - typeResource.removeAnnotation(1, AssociationOverrideAnnotation.ANNOTATION_NAME, AssociationOverridesAnnotation.ANNOTATION_NAME); + resourceType.removeAnnotation(1, AssociationOverrideAnnotation.ANNOTATION_NAME); getJpaProject().synchronizeContextModel(); - associationOverrides = (Iterator<JavaAssociationOverride>) overrideContainer.specifiedOverrides(); + associationOverrides = overrideContainer.getSpecifiedOverrides().iterator(); assertEquals("BAZ", associationOverrides.next().getName()); assertFalse(associationOverrides.hasNext()); - typeResource.removeAnnotation(0, AssociationOverrideAnnotation.ANNOTATION_NAME, AssociationOverridesAnnotation.ANNOTATION_NAME); + resourceType.removeAnnotation(0, AssociationOverrideAnnotation.ANNOTATION_NAME); getJpaProject().synchronizeContextModel(); - associationOverrides = (Iterator<JavaAssociationOverride>) overrideContainer.specifiedOverrides(); + associationOverrides = overrideContainer.getSpecifiedOverrides().iterator(); assertFalse(associationOverrides.hasNext()); } @@ -1364,9 +1355,9 @@ public class EclipseLink2_0JavaEntityTests extends EclipseLink2_0ContextModelTes createTestSubType(); addXmlClassRef(PACKAGE_NAME + ".AnnotationTestTypeChild"); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - AssociationOverrideContainer overrideContainer = getJavaEntity().getAssociationOverrideContainer(); + JavaAssociationOverrideContainer overrideContainer = getJavaEntity().getAssociationOverrideContainer(); - ListIterator<JavaVirtualAssociationOverride> virtualAssociationOverrides = (ListIterator<JavaVirtualAssociationOverride>) overrideContainer.virtualOverrides(); + ListIterator<JavaVirtualAssociationOverride> virtualAssociationOverrides = overrideContainer.getVirtualOverrides().iterator(); VirtualAssociationOverride virtualAssociationOverride = virtualAssociationOverrides.next(); assertEquals("address", virtualAssociationOverride.getName()); assertTrue(virtualAssociationOverride.isVirtual()); @@ -1384,12 +1375,12 @@ public class EclipseLink2_0JavaEntityTests extends EclipseLink2_0ContextModelTes assertTrue(virtualAssociationOverride.isVirtual()); assertFalse(virtualAssociationOverrides.hasNext()); - overrideContainer.virtualOverrides().next().convertToSpecified(); - AssociationOverride specifiedAssociationOverride = overrideContainer.specifiedOverrides().next(); + overrideContainer.getVirtualOverrides().iterator().next().convertToSpecified(); + AssociationOverride specifiedAssociationOverride = overrideContainer.getSpecifiedOverrides().iterator().next(); assertFalse(specifiedAssociationOverride.isVirtual()); - virtualAssociationOverrides = (ListIterator<JavaVirtualAssociationOverride>) overrideContainer.virtualOverrides(); + virtualAssociationOverrides = overrideContainer.getVirtualOverrides().iterator(); virtualAssociationOverride = virtualAssociationOverrides.next(); assertEquals("address2", virtualAssociationOverride.getName()); assertTrue(virtualAssociationOverride.isVirtual()); @@ -1414,7 +1405,7 @@ public class EclipseLink2_0JavaEntityTests extends EclipseLink2_0ContextModelTes addXmlClassRef(PACKAGE_NAME + ".LongTimeCustomer"); addXmlClassRef(PACKAGE_NAME + ".Address"); addXmlClassRef(PACKAGE_NAME + ".ZipCode"); - ListIterator<ClassRef> specifiedClassRefs = getPersistenceUnit().specifiedClassRefs(); + ListIterator<ClassRef> specifiedClassRefs = getPersistenceUnit().getSpecifiedClassRefs().iterator(); PersistentType customerPersistentType = specifiedClassRefs.next().getJavaPersistentType(); PersistentType longTimeCustomerPersistentType = specifiedClassRefs.next().getJavaPersistentType(); PersistentType addressPersistentType = specifiedClassRefs.next().getJavaPersistentType(); @@ -1422,8 +1413,8 @@ public class EclipseLink2_0JavaEntityTests extends EclipseLink2_0ContextModelTes AttributeOverrideContainer attributeOverrideContainer = ((Entity) longTimeCustomerPersistentType.getMapping()).getAttributeOverrideContainer(); - assertEquals(6, attributeOverrideContainer.virtualOverridesSize()); - ListIterator<VirtualAttributeOverride> virtualAttributeOverrides = (ListIterator<VirtualAttributeOverride>) attributeOverrideContainer.virtualOverrides(); + assertEquals(6, attributeOverrideContainer.getVirtualOverridesSize()); + ListIterator<? extends VirtualAttributeOverride> virtualAttributeOverrides = attributeOverrideContainer.getVirtualOverrides().iterator(); VirtualAttributeOverride virtualAttributeOverride = virtualAttributeOverrides.next(); assertEquals("id", virtualAttributeOverride.getName()); virtualAttributeOverride = virtualAttributeOverrides.next(); @@ -1526,7 +1517,7 @@ public class EclipseLink2_0JavaEntityTests extends EclipseLink2_0ContextModelTes addXmlClassRef(PACKAGE_NAME + ".LongTimeCustomer"); addXmlClassRef(PACKAGE_NAME + ".Address"); addXmlClassRef(PACKAGE_NAME + ".ZipCode"); - ListIterator<ClassRef> specifiedClassRefs = getPersistenceUnit().specifiedClassRefs(); + ListIterator<ClassRef> specifiedClassRefs = getPersistenceUnit().getSpecifiedClassRefs().iterator(); PersistentType customerPersistentType = specifiedClassRefs.next().getJavaPersistentType(); PersistentType longTimeCustomerPersistentType = specifiedClassRefs.next().getJavaPersistentType(); PersistentType addressPersistentType = specifiedClassRefs.next().getJavaPersistentType(); @@ -1534,8 +1525,8 @@ public class EclipseLink2_0JavaEntityTests extends EclipseLink2_0ContextModelTes AttributeOverrideContainer attributeOverrideContainer = ((Entity) longTimeCustomerPersistentType.getMapping()).getAttributeOverrideContainer(); - assertEquals(6, attributeOverrideContainer.virtualOverridesSize()); - ListIterator<VirtualAttributeOverride> virtualAttributeOverrides = (ListIterator<VirtualAttributeOverride>) attributeOverrideContainer.virtualOverrides(); + assertEquals(6, attributeOverrideContainer.getVirtualOverridesSize()); + ListIterator<? extends VirtualAttributeOverride> virtualAttributeOverrides = attributeOverrideContainer.getVirtualOverrides().iterator(); VirtualAttributeOverride virtualAttributeOverride = virtualAttributeOverrides.next(); assertEquals("id", virtualAttributeOverride.getName()); virtualAttributeOverride = virtualAttributeOverrides.next(); @@ -1638,14 +1629,14 @@ public class EclipseLink2_0JavaEntityTests extends EclipseLink2_0ContextModelTes addXmlClassRef(PACKAGE_NAME + ".LongTimeCustomer"); addXmlClassRef(PACKAGE_NAME + ".Address"); addXmlClassRef(PACKAGE_NAME + ".ZipCode"); - ListIterator<ClassRef> specifiedClassRefs = getPersistenceUnit().specifiedClassRefs(); + ListIterator<ClassRef> specifiedClassRefs = getPersistenceUnit().getSpecifiedClassRefs().iterator(); specifiedClassRefs.next(); PersistentType longTimeCustomerPersistentType = specifiedClassRefs.next().getJavaPersistentType(); AssociationOverrideContainer attributeOverrideContainer = ((Entity) longTimeCustomerPersistentType.getMapping()).getAssociationOverrideContainer(); - assertEquals(1, attributeOverrideContainer.virtualOverridesSize()); - ListIterator<VirtualAssociationOverride> virtualAssociationOverrides = (ListIterator<VirtualAssociationOverride>) attributeOverrideContainer.virtualOverrides(); + assertEquals(1, attributeOverrideContainer.getVirtualOverridesSize()); + ListIterator<? extends VirtualAssociationOverride> virtualAssociationOverrides = attributeOverrideContainer.getVirtualOverrides().iterator(); VirtualAssociationOverride virtualAssociationOverride = virtualAssociationOverrides.next(); assertEquals("address.state", virtualAssociationOverride.getName()); } @@ -1660,14 +1651,14 @@ public class EclipseLink2_0JavaEntityTests extends EclipseLink2_0ContextModelTes addXmlClassRef(PACKAGE_NAME + ".LongTimeCustomer"); addXmlClassRef(PACKAGE_NAME + ".Address"); addXmlClassRef(PACKAGE_NAME + ".ZipCode"); - ListIterator<ClassRef> specifiedClassRefs = getPersistenceUnit().specifiedClassRefs(); + ListIterator<ClassRef> specifiedClassRefs = getPersistenceUnit().getSpecifiedClassRefs().iterator(); specifiedClassRefs.next(); PersistentType longTimeCustomerPersistentType = specifiedClassRefs.next().getJavaPersistentType(); AssociationOverrideContainer attributeOverrideContainer = ((Entity) longTimeCustomerPersistentType.getMapping()).getAssociationOverrideContainer(); - assertEquals(1, attributeOverrideContainer.virtualOverridesSize()); - ListIterator<VirtualAssociationOverride> virtualAssociationOverrides = (ListIterator<VirtualAssociationOverride>) attributeOverrideContainer.virtualOverrides(); + assertEquals(1, attributeOverrideContainer.getVirtualOverridesSize()); + ListIterator<? extends VirtualAssociationOverride> virtualAssociationOverrides = attributeOverrideContainer.getVirtualOverrides().iterator(); VirtualAssociationOverride virtualAssociationOverride = virtualAssociationOverrides.next(); assertEquals("address.state", virtualAssociationOverride.getName()); } @@ -1677,24 +1668,24 @@ public class EclipseLink2_0JavaEntityTests extends EclipseLink2_0ContextModelTes addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); Cacheable2_0 cacheable = ((CacheableHolder2_0) getJavaEntity()).getCacheable(); - Cacheable2_0Annotation cacheableAnnotation = (Cacheable2_0Annotation) getJavaPersistentType().getResourcePersistentType().getAnnotation(JPA2_0.CACHEABLE); + Cacheable2_0Annotation cacheableAnnotation = (Cacheable2_0Annotation) getJavaPersistentType().getJavaResourceType().getAnnotation(JPA2_0.CACHEABLE); assertEquals(null, cacheable.getSpecifiedCacheable()); assertEquals(null, cacheableAnnotation); cacheable.setSpecifiedCacheable(Boolean.FALSE); - cacheableAnnotation = (Cacheable2_0Annotation) getJavaPersistentType().getResourcePersistentType().getAnnotation(JPA2_0.CACHEABLE); + cacheableAnnotation = (Cacheable2_0Annotation) getJavaPersistentType().getJavaResourceType().getAnnotation(JPA2_0.CACHEABLE); assertEquals(Boolean.FALSE, cacheable.getSpecifiedCacheable()); assertEquals(Boolean.FALSE, cacheableAnnotation.getValue()); assertSourceContains("@Cacheable(false)", cu); cacheable.setSpecifiedCacheable(Boolean.TRUE); - cacheableAnnotation = (Cacheable2_0Annotation) getJavaPersistentType().getResourcePersistentType().getAnnotation(JPA2_0.CACHEABLE); + cacheableAnnotation = (Cacheable2_0Annotation) getJavaPersistentType().getJavaResourceType().getAnnotation(JPA2_0.CACHEABLE); assertEquals(Boolean.TRUE, cacheable.getSpecifiedCacheable()); assertEquals(null, cacheableAnnotation.getValue()); assertSourceContains("@Cacheable", cu); cacheable.setSpecifiedCacheable(null); - cacheableAnnotation = (Cacheable2_0Annotation) getJavaPersistentType().getResourcePersistentType().getAnnotation(JPA2_0.CACHEABLE); + cacheableAnnotation = (Cacheable2_0Annotation) getJavaPersistentType().getJavaResourceType().getAnnotation(JPA2_0.CACHEABLE); assertEquals(null, cacheable.getSpecifiedCacheable()); assertEquals(null, cacheableAnnotation); assertSourceDoesNotContain("@Cacheable", cu); @@ -1705,13 +1696,13 @@ public class EclipseLink2_0JavaEntityTests extends EclipseLink2_0ContextModelTes addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); Cacheable2_0 cacheable = ((CacheableHolder2_0) getJavaEntity()).getCacheable(); - Cacheable2_0Annotation cacheableAnnotation = (Cacheable2_0Annotation) getJavaPersistentType().getResourcePersistentType().getAnnotation(JPA2_0.CACHEABLE); + Cacheable2_0Annotation cacheableAnnotation = (Cacheable2_0Annotation) getJavaPersistentType().getJavaResourceType().getAnnotation(JPA2_0.CACHEABLE); assertEquals(null, cacheable.getSpecifiedCacheable()); assertEquals(null, cacheableAnnotation); - getJavaPersistentType().getResourcePersistentType().addAnnotation(JPA2_0.CACHEABLE); + getJavaPersistentType().getJavaResourceType().addAnnotation(JPA2_0.CACHEABLE); getJpaProject().synchronizeContextModel(); - cacheableAnnotation = (Cacheable2_0Annotation) getJavaPersistentType().getResourcePersistentType().getAnnotation(JPA2_0.CACHEABLE); + cacheableAnnotation = (Cacheable2_0Annotation) getJavaPersistentType().getJavaResourceType().getAnnotation(JPA2_0.CACHEABLE); assertEquals(Boolean.TRUE, cacheable.getSpecifiedCacheable()); assertEquals(null, cacheableAnnotation.getValue()); assertSourceContains("@Cacheable", cu); @@ -1734,8 +1725,8 @@ public class EclipseLink2_0JavaEntityTests extends EclipseLink2_0ContextModelTes assertEquals(null, cacheableAnnotation.getValue()); assertSourceContains("@Cacheable", cu); - getJavaPersistentType().getResourcePersistentType().removeAnnotation(JPA2_0.CACHEABLE); - cacheableAnnotation = (Cacheable2_0Annotation) getJavaPersistentType().getResourcePersistentType().getAnnotation(JPA2_0.CACHEABLE); + getJavaPersistentType().getJavaResourceType().removeAnnotation(JPA2_0.CACHEABLE); + cacheableAnnotation = (Cacheable2_0Annotation) getJavaPersistentType().getJavaResourceType().getAnnotation(JPA2_0.CACHEABLE); getJpaProject().synchronizeContextModel(); assertEquals(null, cacheable.getSpecifiedCacheable()); assertEquals(null, cacheableAnnotation); |