From c7a08672e168714087c16ed7123975c92c21d7d9 Mon Sep 17 00:00:00 2001 From: kmoore Date: Mon, 1 Aug 2011 15:10:18 +0000 Subject: consolidation of the java resource model for JAXB and JPA. Changing API to Iterables instead of Iterators --- .../internal/context/ContextModelTestCase.java | 8 +- .../core/tests/internal/context/JpaFileTests.java | 24 +- .../java/GenericJavaPersistentAttributeTests.java | 143 ++- .../java/GenericJavaPersistentTypeTests.java | 197 +++- .../context/java/JavaAssociationOverrideTests.java | 121 +- .../context/java/JavaAttributeOverrideTests.java | 67 +- .../context/java/JavaBasicMappingTests.java | 440 ++++---- .../internal/context/java/JavaCascadeTests.java | 87 +- .../internal/context/java/JavaColumnTests.java | 249 ++--- .../context/java/JavaDiscriminatorColumnTests.java | 55 +- .../internal/context/java/JavaEmbeddableTests.java | 16 +- .../context/java/JavaEmbeddedIdMappingTests.java | 313 +++--- .../context/java/JavaEmbeddedMappingTests.java | 320 +++--- .../internal/context/java/JavaEntityTests.java | 1160 ++++++++++---------- .../context/java/JavaGeneratedValueTests.java | 39 +- .../internal/context/java/JavaIdMappingTests.java | 339 +++--- .../internal/context/java/JavaJoinColumnTests.java | 173 +-- .../internal/context/java/JavaJoinTableTests.java | 430 ++++---- .../context/java/JavaManyToManyMappingTests.java | 359 +++--- .../context/java/JavaManyToOneMappingTests.java | 340 +++--- .../context/java/JavaMappedSuperclassTests.java | 35 +- .../context/java/JavaNamedNativeQueryTests.java | 111 +- .../internal/context/java/JavaNamedQueryTests.java | 75 +- .../context/java/JavaOneToManyMappingTests.java | 347 +++--- .../context/java/JavaOneToOneMappingTests.java | 549 ++++----- .../java/JavaPrimaryKeyJoinColumnTests.java | 77 +- .../internal/context/java/JavaQueryHintTests.java | 45 +- .../context/java/JavaSecondaryTableTests.java | 295 ++--- .../context/java/JavaSequenceGeneratorTests.java | 57 +- .../context/java/JavaTableGeneratorTests.java | 193 ++-- .../internal/context/java/JavaTableTests.java | 149 +-- .../context/java/JavaTransientMappingTests.java | 107 +- .../context/java/JavaVersionMappingTests.java | 175 +-- .../internal/context/orm/EntityMappingsTests.java | 92 +- .../orm/GenericOrmPersistentAttributeTests.java | 117 +- .../context/orm/GenericOrmPersistentTypeTests.java | 28 +- .../context/orm/OrmAssociationOverrideTests.java | 36 +- .../context/orm/OrmAttributeOverrideTests.java | 10 +- .../internal/context/orm/OrmBasicMappingTests.java | 54 +- .../tests/internal/context/orm/OrmColumnTests.java | 4 +- .../context/orm/OrmEmbeddedIdMappingTests.java | 142 +-- .../context/orm/OrmEmbeddedMappingTests.java | 152 +-- .../tests/internal/context/orm/OrmEntityTests.java | 336 +++--- .../context/orm/OrmGeneratedValueTests.java | 8 +- .../internal/context/orm/OrmIdMappingTests.java | 58 +- .../internal/context/orm/OrmJoinColumnTests.java | 16 +- .../internal/context/orm/OrmJoinTableTests.java | 100 +- .../context/orm/OrmManyToManyMappingTests.java | 57 +- .../context/orm/OrmManyToOneMappingTests.java | 33 +- .../context/orm/OrmOneToManyMappingTests.java | 55 +- .../context/orm/OrmOneToOneMappingTests.java | 81 +- .../context/orm/OrmPrimaryKeyJoinColumnTests.java | 8 +- .../context/orm/OrmSecondaryTableTests.java | 100 +- .../context/orm/OrmTableGeneratorTests.java | 4 +- .../tests/internal/context/orm/OrmTableTests.java | 32 +- .../context/orm/OrmTransientMappingTests.java | 52 +- .../context/orm/OrmVersionMappingTests.java | 52 +- .../tests/internal/context/orm/OrmXmlTests.java | 4 +- .../context/persistence/ClassRefTests.java | 12 +- .../context/persistence/MappingFileRefTests.java | 8 +- .../context/persistence/PersistenceTests.java | 24 +- .../context/persistence/PersistenceUnitTests.java | 102 +- .../GenericJavaAssociationOverride2_0Tests.java | 143 +-- .../context/java/GenericJavaCascade2_0Tests.java | 23 +- .../java/GenericJavaCollectionTable2_0Tests.java | 307 +++--- ...enericJavaElementCollectionMapping2_0Tests.java | 672 ++++++------ .../java/GenericJavaEmbeddedMapping2_0Tests.java | 533 +++++---- .../context/java/GenericJavaEntity2_0Tests.java | 608 +++++----- .../java/GenericJavaManyToManyMapping2_0Tests.java | 272 +++-- .../java/GenericJavaManyToOneMapping2_0Tests.java | 180 ++- .../java/GenericJavaOneToManyMapping2_0Tests.java | 368 +++---- .../java/GenericJavaOneToOneMapping2_0Tests.java | 274 +++-- .../GenericJavaPersistentAttribute2_0Tests.java | 18 +- .../java/GenericJavaPersistentType2_0Tests.java | 90 +- .../java/GenericJavaSequenceGenerator2_0Tests.java | 27 +- .../orm/GenericOrmAssociationOverride2_0Tests.java | 70 +- .../orm/GenericOrmCollectionTable2_0Tests.java | 70 +- ...GenericOrmElementCollectionMapping2_0Tests.java | 140 +-- .../orm/GenericOrmEmbeddedMapping2_0Tests.java | 326 +++--- .../jpa2/context/orm/GenericOrmEntity2_0Tests.java | 290 ++--- .../orm/GenericOrmManyToManyMapping2_0Tests.java | 22 +- .../orm/GenericOrmManyToOneMapping2_0Tests.java | 29 +- .../orm/GenericOrmOneToManyMapping2_0Tests.java | 34 +- .../orm/GenericOrmOneToOneMapping2_0Tests.java | 33 +- .../orm/GenericOrmPersistentAttribute2_0Tests.java | 219 ++-- .../orm/GenericOrmPersistentType2_0Tests.java | 40 +- .../resource/java/Access2_0AnnotationTests.java | 52 +- .../resource/java/AssociationOverride2_0Tests.java | 342 +++--- .../java/AssociationOverrides2_0Tests.java | 445 ++++---- .../resource/java/Cacheable2_0AnnotationTests.java | 30 +- .../java/CollectionTable2_0AnnotationTests.java | 211 ++-- .../java/ElementCollection2_0AnnotationTests.java | 55 +- .../java/JavaResourceModel2_0TestCase.java | 10 +- .../java/ManyToMany2_0AnnotationTests.java | 133 +-- .../resource/java/ManyToOne2_0AnnotationTests.java | 127 +-- .../java/MapKeyClass2_0AnnotationTests.java | 31 +- .../java/MapKeyColumn2_0AnnotationTests.java | 139 +-- .../java/MapKeyEnumerated2_0AnnotationTests.java | 26 +- .../java/MapKeyJoinColumn2_0AnnotationTests.java | 120 +- .../java/MapKeyJoinColumns2_0AnnotationTests.java | 190 ++-- .../java/MapKeyTemporal2_0AnnotationTests.java | 25 +- .../resource/java/MapsId2_0AnnotationTests.java | 25 +- .../resource/java/OneToMany2_0AnnotationTests.java | 133 +-- .../resource/java/OneToOne2_0AnnotationTests.java | 153 +-- .../java/OrderColumn2_0AnnotationTests.java | 89 +- .../java/SequenceGenerator2_0AnnotationTests.java | 37 +- .../resource/java/AssociationOverrideTests.java | 106 +- .../resource/java/AssociationOverridesTests.java | 170 +-- .../resource/java/AttributeOverrideTests.java | 62 +- .../resource/java/AttributeOverridesTests.java | 120 +- .../tests/internal/resource/java/BasicTests.java | 49 +- .../tests/internal/resource/java/ColumnTests.java | 139 +-- .../resource/java/DiscriminatorColumnTests.java | 44 +- .../resource/java/DiscriminatorValueTests.java | 16 +- .../internal/resource/java/EmbeddableTests.java | 16 +- .../internal/resource/java/EmbeddedIdTests.java | 15 +- .../internal/resource/java/EmbeddedTests.java | 15 +- .../tests/internal/resource/java/EntityTests.java | 29 +- .../internal/resource/java/EnumeratedTests.java | 25 +- .../resource/java/GeneratedValueTests.java | 37 +- .../tests/internal/resource/java/IdClassTests.java | 20 +- .../core/tests/internal/resource/java/IdTests.java | 15 +- .../internal/resource/java/InheritanceTests.java | 16 +- .../resource/java/JavaResourceAttributeTests.java | 718 ++++++++++++ .../resource/java/JavaResourceModelTestCase.java | 37 +- .../java/JavaResourcePersistentAttributeTests.java | 870 --------------- .../java/JavaResourcePersistentTypeTests.java | 937 ---------------- .../resource/java/JavaResourceTypeTests.java | 679 ++++++++++++ .../internal/resource/java/JoinColumnTests.java | 115 +- .../internal/resource/java/JoinColumnsTests.java | 190 ++-- .../internal/resource/java/JoinTableTests.java | 284 ++--- .../resource/java/JptJavaResourceTests.java | 6 +- .../tests/internal/resource/java/LobTests.java | 13 +- .../internal/resource/java/ManyToManyTests.java | 127 +-- .../internal/resource/java/ManyToOneTests.java | 121 +- .../tests/internal/resource/java/MapKeyTests.java | 25 +- .../resource/java/MappedSuperclassTests.java | 16 +- .../resource/java/NamedNativeQueriesTests.java | 182 +-- .../resource/java/NamedNativeQueryTests.java | 94 +- .../internal/resource/java/NamedQueriesTests.java | 158 +-- .../internal/resource/java/NamedQueryTests.java | 78 +- .../internal/resource/java/OneToManyTests.java | 127 +-- .../internal/resource/java/OneToOneTests.java | 145 +-- .../tests/internal/resource/java/OrderByTests.java | 25 +- .../resource/java/PrimaryKeyJoinColumnTests.java | 55 +- .../resource/java/PrimaryKeyJoinColumnsTests.java | 123 ++- .../internal/resource/java/QueryHintTests.java | 16 +- .../resource/java/SecondaryTableTests.java | 172 +-- .../resource/java/SecondaryTablesTests.java | 234 ++-- .../resource/java/SequenceGeneratorTests.java | 66 +- .../resource/java/TableGeneratorTests.java | 181 +-- .../tests/internal/resource/java/TableTests.java | 100 +- .../internal/resource/java/TemporalTests.java | 25 +- .../internal/resource/java/TransientTests.java | 15 +- .../tests/internal/resource/java/VersionTests.java | 15 +- 155 files changed, 11385 insertions(+), 11491 deletions(-) create mode 100644 jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/JavaResourceAttributeTests.java delete mode 100644 jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/JavaResourcePersistentAttributeTests.java delete mode 100644 jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/JavaResourcePersistentTypeTests.java create mode 100644 jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/JavaResourceTypeTests.java (limited to 'jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt') diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/ContextModelTestCase.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/ContextModelTestCase.java index 1d312fb923..4d321e3119 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/ContextModelTestCase.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/ContextModelTestCase.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2010 Oracle. All rights reserved. + * Copyright (c) 2007, 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. @@ -148,7 +148,7 @@ public abstract class ContextModelTestCase extends AnnotationTestCase } protected MappingFile getMappingFile() { - return this.getPersistenceUnit().mappingFileRefs().next().getMappingFile(); + return this.getPersistenceUnit().getMappingFileRefs().iterator().next().getMappingFile(); } protected EntityMappings getEntityMappings() { @@ -161,11 +161,11 @@ public abstract class ContextModelTestCase extends AnnotationTestCase } protected PersistenceUnit getPersistenceUnit() { - return getRootContextNode().getPersistenceXml().getPersistence().persistenceUnits().next(); + return getRootContextNode().getPersistenceXml().getPersistence().getPersistenceUnits().iterator().next(); } protected ClassRef getSpecifiedClassRef() { - return getPersistenceUnit().specifiedClassRefs().next(); + return getPersistenceUnit().getSpecifiedClassRefs().iterator().next(); } protected JavaPersistentType getJavaPersistentType() { diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/JpaFileTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/JpaFileTests.java index 10cc74ec73..2b03132660 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/JpaFileTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/JpaFileTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008, 2010 Oracle. All rights reserved. + * Copyright (c) 2008, 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. @@ -240,11 +240,11 @@ public class JpaFileTests extends ContextModelTestCase addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); JavaPersistentType javaPersistentType = getJavaPersistentType(); assertEquals(javaPersistentType, javaJpaFile.getRootStructureNodes().iterator().next()); - assertEquals(getEntityMappings().getPersistenceUnit().specifiedClassRefs().next(), javaJpaFile.getRootStructureNodes().iterator().next().getParent()); + assertEquals(getEntityMappings().getPersistenceUnit().getSpecifiedClassRefs().iterator().next(), javaJpaFile.getRootStructureNodes().iterator().next().getParent()); getEntityMappings().getPersistenceUnit().removeSpecifiedClassRef(0); assertNotSame(javaPersistentType, javaJpaFile.getRootStructureNodes().iterator().next()); - assertEquals(getEntityMappings().getPersistenceUnit().impliedClassRefs().next(), javaJpaFile.getRootStructureNodes().iterator().next().getParent()); + assertEquals(getEntityMappings().getPersistenceUnit().getImpliedClassRefs().iterator().next(), javaJpaFile.getRootStructureNodes().iterator().next().getParent()); } public void testJavaPersistentTypeRootStructureNodeRemovedFromResourceModel() throws Exception { @@ -256,12 +256,12 @@ public class JpaFileTests extends ContextModelTestCase Iterator rootStructureNodes = javaJpaFile.getRootStructureNodes().iterator(); JpaStructureNode rootStructureNode = rootStructureNodes.next(); assertEquals(javaPersistentType, rootStructureNode); - assertEquals(getEntityMappings().getPersistenceUnit().specifiedClassRefs().next(), rootStructureNode.getParent()); + assertEquals(getEntityMappings().getPersistenceUnit().getSpecifiedClassRefs().iterator().next(), rootStructureNode.getParent()); assertFalse(rootStructureNodes.hasNext()); removeXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); assertNotSame(javaPersistentType, javaJpaFile.getRootStructureNodes().iterator().next()); - assertEquals(getEntityMappings().getPersistenceUnit().impliedClassRefs().next(), javaJpaFile.getRootStructureNodes().iterator().next().getParent()); + assertEquals(getEntityMappings().getPersistenceUnit().getImpliedClassRefs().iterator().next(), javaJpaFile.getRootStructureNodes().iterator().next().getParent()); } public void testImpliedJavaPersistentTypeRootStructureNodeRemoved() throws Exception { @@ -269,7 +269,7 @@ public class JpaFileTests extends ContextModelTestCase ICompilationUnit cu = createTestEntity(); JpaFile javaJpaFile = JptJpaCorePlugin.getJpaFile((IFile) cu.getResource()); - JavaPersistentType javaPersistentType = getPersistenceUnit().impliedClassRefs().next().getJavaPersistentType(); + JavaPersistentType javaPersistentType = getPersistenceUnit().getImpliedClassRefs().iterator().next().getJavaPersistentType(); assertEquals(javaPersistentType, javaJpaFile.getRootStructureNodes().iterator().next()); javaPersistentType.setMappingKey(MappingKeys.NULL_TYPE_MAPPING_KEY); @@ -289,7 +289,7 @@ public class JpaFileTests extends ContextModelTestCase getOrmXmlResource().getContents().remove(getXmlEntityMappings()); assertNotSame(javaPersistentType, javaJpaFile.getRootStructureNodes().iterator().next()); assertEquals(1, javaJpaFile.getRootStructureNodesSize()); - assertEquals(getPersistenceUnit().impliedClassRefs().next(), javaJpaFile.getRootStructureNodes().iterator().next().getParent()); + assertEquals(getPersistenceUnit().getImpliedClassRefs().iterator().next(), javaJpaFile.getRootStructureNodes().iterator().next().getParent()); } public void testJavaRootStructureNodesPersistenceUnitRemovedFromResourceModel() throws Exception { @@ -334,7 +334,7 @@ public class JpaFileTests extends ContextModelTestCase getEntityMappings().removePersistentType(0); assertNotSame(javaPersistentType, javaJpaFile.getRootStructureNodes().iterator().next()); assertEquals(1, javaJpaFile.getRootStructureNodesSize()); - assertEquals(getEntityMappings().getPersistenceUnit().impliedClassRefs().next(), javaJpaFile.getRootStructureNodes().iterator().next().getParent()); + assertEquals(getEntityMappings().getPersistenceUnit().getImpliedClassRefs().iterator().next(), javaJpaFile.getRootStructureNodes().iterator().next().getParent()); } public void testJavaRootStructureNodesOrmTypeMappingMorphed() throws Exception { @@ -354,7 +354,7 @@ public class JpaFileTests extends ContextModelTestCase getEntityMappings().removePersistentType(0); assertNotSame(javaPersistentType, javaJpaFile.getRootStructureNodes().iterator().next()); assertEquals(1, javaJpaFile.getRootStructureNodesSize()); - assertEquals(getEntityMappings().getPersistenceUnit().impliedClassRefs().next(), javaJpaFile.getRootStructureNodes().iterator().next().getParent()); + assertEquals(getEntityMappings().getPersistenceUnit().getImpliedClassRefs().iterator().next(), javaJpaFile.getRootStructureNodes().iterator().next().getParent()); } public void testUpdateOrmJavaRootStructureNodeMappingFileRefChanged() throws Exception { @@ -365,7 +365,7 @@ public class JpaFileTests extends ContextModelTestCase assertEquals(ormPersistentType.getJavaPersistentType(), javaJpaFile.getRootStructureNodes().iterator().next()); - MappingFileRef mappingFileRef = getPersistenceUnit().mappingFileRefs().next(); + MappingFileRef mappingFileRef = getPersistenceUnit().getMappingFileRefs().iterator().next(); mappingFileRef.setFileName("foo"); ormPersistentType = ((EntityMappings) getPersistenceUnit().getImpliedMappingFileRef().getMappingFile().getRoot()).getPersistentTypes().iterator().next(); @@ -385,7 +385,7 @@ public class JpaFileTests extends ContextModelTestCase assertEquals(getJavaPersistentType(), javaJpaFile.getRootStructureNodes().iterator().next()); - MappingFileRef mappingFileRef = getPersistenceUnit().mappingFileRefs().next(); + MappingFileRef mappingFileRef = getPersistenceUnit().getMappingFileRefs().iterator().next(); mappingFileRef.setFileName("foo"); assertEquals(getJavaPersistentType(), javaJpaFile.getRootStructureNodes().iterator().next()); } @@ -405,7 +405,7 @@ public class JpaFileTests extends ContextModelTestCase assertNotSame(javaPersistentType, javaJpaFile.getRootStructureNodes().iterator().next()); assertEquals(1, javaJpaFile.getRootStructureNodesSize()); - assertEquals(getPersistenceUnit().impliedClassRefs().next(), javaJpaFile.getRootStructureNodes().iterator().next().getParent()); + assertEquals(getPersistenceUnit().getImpliedClassRefs().iterator().next(), javaJpaFile.getRootStructureNodes().iterator().next().getParent()); } //TODO test rootStructureNodes with a static inner class } \ No newline at end of file diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/GenericJavaPersistentAttributeTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/GenericJavaPersistentAttributeTests.java index 1a2395aba8..43bf4247d5 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/GenericJavaPersistentAttributeTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/GenericJavaPersistentAttributeTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2009 Oracle. All rights reserved. + * Copyright (c) 2007, 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. @@ -10,8 +10,12 @@ package org.eclipse.jpt.jpa.core.tests.internal.context.java; import java.util.Iterator; - import org.eclipse.jdt.core.ICompilationUnit; +import org.eclipse.jpt.common.core.resource.java.JavaResourceAttribute; +import org.eclipse.jpt.common.core.resource.java.JavaResourceField; +import org.eclipse.jpt.common.core.resource.java.JavaResourceMethod; +import org.eclipse.jpt.common.core.resource.java.JavaResourceType; +import org.eclipse.jpt.common.core.resource.java.JavaResourceAnnotatedElement.Kind; import org.eclipse.jpt.common.utility.internal.iterables.EmptyIterable; import org.eclipse.jpt.common.utility.internal.iterators.ArrayIterator; import org.eclipse.jpt.jpa.core.MappingKeys; @@ -20,12 +24,11 @@ import org.eclipse.jpt.jpa.core.context.PersistentAttribute; import org.eclipse.jpt.jpa.core.context.java.JavaBasicMapping; import org.eclipse.jpt.jpa.core.context.java.JavaEmbeddedMapping; import org.eclipse.jpt.jpa.core.context.java.JavaIdMapping; +import org.eclipse.jpt.jpa.core.context.java.JavaPersistentAttribute; import org.eclipse.jpt.jpa.core.resource.java.BasicAnnotation; import org.eclipse.jpt.jpa.core.resource.java.EmbeddedAnnotation; 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.tests.internal.context.ContextModelTestCase; @SuppressWarnings("nls") @@ -77,7 +80,7 @@ public class GenericJavaPersistentAttributeTests extends ContextModelTestCase createTestType(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); assertEquals("id", persistentAttribute.getName()); } @@ -86,7 +89,7 @@ public class GenericJavaPersistentAttributeTests extends ContextModelTestCase createTestEntityAnnotatedMethod(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); assertTrue(persistentAttribute.getMapping() instanceof JavaIdMapping); persistentAttribute.setMappingKey(null); @@ -97,7 +100,7 @@ public class GenericJavaPersistentAttributeTests extends ContextModelTestCase createTestEntityAnnotatedMethod(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); assertTrue(persistentAttribute.getMapping() instanceof JavaIdMapping); persistentAttribute.setMappingKey(null); @@ -108,7 +111,7 @@ public class GenericJavaPersistentAttributeTests extends ContextModelTestCase createTestType(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); assertTrue(persistentAttribute.getMapping().isDefault()); assertNotNull(persistentAttribute.getMapping()); @@ -118,7 +121,7 @@ public class GenericJavaPersistentAttributeTests extends ContextModelTestCase createTestEntityAnnotatedMethod(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); assertEquals(MappingKeys.ID_ATTRIBUTE_MAPPING_KEY, persistentAttribute.getMappingKey()); @@ -130,7 +133,7 @@ public class GenericJavaPersistentAttributeTests extends ContextModelTestCase createTestEntityAnnotatedMethod(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); assertEquals(MappingKeys.ID_ATTRIBUTE_MAPPING_KEY, persistentAttribute.getMappingKey()); assertEquals(MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY, persistentAttribute.getDefaultMappingKey()); @@ -140,14 +143,14 @@ public class GenericJavaPersistentAttributeTests extends ContextModelTestCase createTestType(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); assertTrue(persistentAttribute.getMapping().isDefault()); persistentAttribute.setMappingKey(MappingKeys.EMBEDDED_ATTRIBUTE_MAPPING_KEY); - - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - assertNotNull(attributeResource.getAnnotation(EmbeddedAnnotation.ANNOTATION_NAME)); + + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceAttribute resourceAttribute = resourceType.getFields().iterator().next(); + assertNotNull(resourceAttribute.getAnnotation(EmbeddedAnnotation.ANNOTATION_NAME)); assertEquals(MappingKeys.EMBEDDED_ATTRIBUTE_MAPPING_KEY, persistentAttribute.getMappingKey()); assertTrue(persistentAttribute.getMapping() instanceof JavaEmbeddedMapping); @@ -157,14 +160,14 @@ public class GenericJavaPersistentAttributeTests extends ContextModelTestCase createTestEntityAnnotatedField(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); assertEquals(MappingKeys.ID_ATTRIBUTE_MAPPING_KEY, persistentAttribute.getMappingKey()); persistentAttribute.setMappingKey(MappingKeys.EMBEDDED_ATTRIBUTE_MAPPING_KEY); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - assertNotNull(attributeResource.getAnnotation(EmbeddedAnnotation.ANNOTATION_NAME)); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceAttribute resourceAttribute = resourceType.getFields().iterator().next(); + assertNotNull(resourceAttribute.getAnnotation(EmbeddedAnnotation.ANNOTATION_NAME)); assertEquals(MappingKeys.EMBEDDED_ATTRIBUTE_MAPPING_KEY, persistentAttribute.getMappingKey()); assertTrue(persistentAttribute.getMapping() instanceof JavaEmbeddedMapping); @@ -174,14 +177,14 @@ public class GenericJavaPersistentAttributeTests extends ContextModelTestCase createTestEntityAnnotatedMethod(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); assertEquals(MappingKeys.ID_ATTRIBUTE_MAPPING_KEY, persistentAttribute.getMappingKey()); persistentAttribute.setMappingKey(MappingKeys.NULL_ATTRIBUTE_MAPPING_KEY); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - assertNull(attributeResource.getAnnotation(IdAnnotation.ANNOTATION_NAME)); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceAttribute resourceAttribute = resourceType.getFields().iterator().next(); + assertNull(resourceAttribute.getAnnotation(IdAnnotation.ANNOTATION_NAME)); assertTrue(persistentAttribute.getMapping().isDefault()); } @@ -190,12 +193,12 @@ public class GenericJavaPersistentAttributeTests extends ContextModelTestCase createTestEntityAnnotatedField(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); assertEquals(MappingKeys.ID_ATTRIBUTE_MAPPING_KEY, persistentAttribute.getMappingKey()); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - attributeResource.setPrimaryAnnotation(EmbeddedAnnotation.ANNOTATION_NAME, EmptyIterable.instance()); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceAttribute resourceAttribute = resourceType.getFields().iterator().next(); + resourceAttribute.setPrimaryAnnotation(EmbeddedAnnotation.ANNOTATION_NAME, EmptyIterable.instance()); this.getJpaProject().synchronizeContextModel(); assertEquals(MappingKeys.EMBEDDED_ATTRIBUTE_MAPPING_KEY, persistentAttribute.getMappingKey()); } @@ -204,12 +207,12 @@ public class GenericJavaPersistentAttributeTests extends ContextModelTestCase createTestType(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); assertTrue(persistentAttribute.getMapping().isDefault()); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - attributeResource.setPrimaryAnnotation(BasicAnnotation.ANNOTATION_NAME, EmptyIterable.instance()); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceAttribute resourceAttribute = resourceType.getFields().iterator().next(); + resourceAttribute.setPrimaryAnnotation(BasicAnnotation.ANNOTATION_NAME, EmptyIterable.instance()); assertEquals(MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY, persistentAttribute.getMapping().getKey()); } @@ -218,7 +221,7 @@ public class GenericJavaPersistentAttributeTests extends ContextModelTestCase createTestEntityAnnotatedField(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); assertEquals(AccessType.FIELD, persistentAttribute.getAccess()); assertEquals(AccessType.FIELD, persistentAttribute.getDefaultAccess()); assertEquals(null, persistentAttribute.getSpecifiedAccess()); @@ -228,9 +231,83 @@ public class GenericJavaPersistentAttributeTests extends ContextModelTestCase createTestEntityAnnotatedMethod(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); assertEquals(AccessType.PROPERTY, persistentAttribute.getAccess()); assertEquals(AccessType.PROPERTY, persistentAttribute.getDefaultAccess()); assertEquals(null, persistentAttribute.getSpecifiedAccess()); } + + public void testNonResolvingField() throws Exception { + createTestEntityWithNonResolvingField(); + addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); + + JavaResourceField resourceField = getJavaPersistentType().getJavaResourceType().getFields().iterator().next(); + + JavaPersistentAttribute attribute = getJavaPersistentType().getAttributeNamed("foo"); + assertTrue(attribute.isFor(resourceField)); + } + + public void testIsPersistableMethod2() throws Exception { + createTestEntityWithNonResolvingMethod(); + addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); + Iterator methods = getJavaPersistentType().getJavaResourceType().getMethods().iterator(); + + JavaResourceMethod resourceGetter = methods.next(); + JavaResourceMethod resourceSetter = methods.next(); + JavaPersistentAttribute attribute = getJavaPersistentType().getAttributeNamed("foo"); + + assertTrue(attribute.isFor(resourceGetter, resourceSetter)); + } + + private ICompilationUnit createTestEntityWithNonResolvingField() throws Exception { + return this.createTestType(new DefaultAnnotationWriter() { + @Override + public Iterator imports() { + return new ArrayIterator(JPA.ENTITY); + } + @Override + public void appendTypeAnnotationTo(StringBuilder sb) { + sb.append("@Entity"); + } + + @Override + public void appendIdFieldAnnotationTo(StringBuilder sb) { + sb.append("private Foo foo;").append(CR); + sb.append(CR); + } + }); + } + + private ICompilationUnit createTestEntityWithNonResolvingMethod() throws Exception { + return this.createTestType(new DefaultAnnotationWriter() { + @Override + public Iterator imports() { + return new ArrayIterator(JPA.ENTITY, JPA.ID); + } + @Override + public void appendTypeAnnotationTo(StringBuilder sb) { + sb.append("@Entity"); + } + + @Override + public void appendIdFieldAnnotationTo(StringBuilder sb) { + sb.append("private Foo foo;").append(CR); + sb.append(CR); + sb.append(" @Id"); + sb.append(CR); + sb.append(" public Foo getFoo() {").append(CR); + sb.append(" return this.foo;").append(CR); + sb.append(" }").append(CR); + sb.append(CR); + sb.append(" "); + sb.append(CR); + sb.append(" public void setFoo(Foo foo) {").append(CR); + sb.append(" this.foo = foo;").append(CR); + sb.append(" }").append(CR); + sb.append(CR); + sb.append(" "); + } + }); + } + } diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/GenericJavaPersistentTypeTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/GenericJavaPersistentTypeTests.java index 9f0e196434..1223b406b0 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/GenericJavaPersistentTypeTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/GenericJavaPersistentTypeTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2010 Oracle. All rights reserved. + * Copyright (c) 2007, 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. @@ -13,6 +13,8 @@ import java.util.Iterator; import java.util.ListIterator; import org.eclipse.jdt.core.ICompilationUnit; import org.eclipse.jdt.core.IField; +import org.eclipse.jpt.common.core.resource.java.JavaResourceType; +import org.eclipse.jpt.common.core.resource.java.JavaResourceAnnotatedElement.Kind; import org.eclipse.jpt.common.core.tests.internal.projects.TestJavaProject.SourceWriter; import org.eclipse.jpt.common.utility.internal.iterables.EmptyIterable; import org.eclipse.jpt.common.utility.internal.iterators.ArrayIterator; @@ -25,10 +27,11 @@ import org.eclipse.jpt.jpa.core.context.java.JavaPersistentAttribute; import org.eclipse.jpt.jpa.core.context.java.JavaPersistentType; import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentType; import org.eclipse.jpt.jpa.core.context.persistence.ClassRef; +import org.eclipse.jpt.jpa.core.internal.context.java.FieldAccessor; +import org.eclipse.jpt.jpa.core.internal.context.java.PropertyAccessor; import org.eclipse.jpt.jpa.core.resource.java.EmbeddableAnnotation; import org.eclipse.jpt.jpa.core.resource.java.EntityAnnotation; 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.persistence.PersistenceFactory; import org.eclipse.jpt.jpa.core.resource.persistence.XmlMappingFileRef; import org.eclipse.jpt.jpa.core.tests.internal.context.ContextModelTestCase; @@ -256,7 +259,7 @@ public class GenericJavaPersistentTypeTests extends ContextModelTestCase addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); addXmlClassRef(PACKAGE_NAME + ".AnnotationTestTypeChild"); - ListIterator classRefs = getPersistenceUnit().specifiedClassRefs(); + ListIterator classRefs = getPersistenceUnit().getSpecifiedClassRefs().iterator(); classRefs.next(); ClassRef classRef = classRefs.next(); @@ -273,7 +276,7 @@ public class GenericJavaPersistentTypeTests extends ContextModelTestCase addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); addXmlClassRef(PACKAGE_NAME + ".AnnotationTestTypeChild"); - ListIterator classRefs = getPersistenceUnit().specifiedClassRefs(); + ListIterator classRefs = getPersistenceUnit().getSpecifiedClassRefs().iterator(); classRefs.next(); ClassRef classRef = classRefs.next(); @@ -290,7 +293,7 @@ public class GenericJavaPersistentTypeTests extends ContextModelTestCase addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); addXmlClassRef(PACKAGE_NAME + ".AnnotationTestTypeChild"); - ListIterator classRefs = getPersistenceUnit().specifiedClassRefs(); + ListIterator classRefs = getPersistenceUnit().getSpecifiedClassRefs().iterator(); classRefs.next(); ClassRef classRef = classRefs.next(); @@ -307,7 +310,7 @@ public class GenericJavaPersistentTypeTests extends ContextModelTestCase addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); addXmlClassRef(PACKAGE_NAME + ".AnnotationTestTypeChild"); - ListIterator classRefs = getPersistenceUnit().specifiedClassRefs(); + ListIterator classRefs = getPersistenceUnit().getSpecifiedClassRefs().iterator(); classRefs.next(); ClassRef classRef = classRefs.next(); JavaPersistentType javaPersistentType = classRef.getJavaPersistentType(); @@ -326,7 +329,7 @@ public class GenericJavaPersistentTypeTests extends ContextModelTestCase addXmlClassRef(PACKAGE_NAME + ".AnnotationTestTypeChild"); getEntityMappings().getPersistenceUnitMetadata().getPersistenceUnitDefaults().setAccess(AccessType.FIELD); - ListIterator classRefs = getPersistenceUnit().specifiedClassRefs(); + ListIterator classRefs = getPersistenceUnit().getSpecifiedClassRefs().iterator(); classRefs.next(); ClassRef classRef = classRefs.next(); JavaPersistentType javaPersistentType = classRef.getJavaPersistentType(); @@ -441,7 +444,7 @@ public class GenericJavaPersistentTypeTests extends ContextModelTestCase addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); addXmlClassRef(PACKAGE_NAME + ".AnnotationTestTypeChild"); - ListIterator classRefs = getPersistenceUnit().specifiedClassRefs(); + ListIterator classRefs = getPersistenceUnit().getSpecifiedClassRefs().iterator(); ClassRef classRef = classRefs.next(); JavaPersistentType rootJavaPersistentType = classRef.getJavaPersistentType(); @@ -460,7 +463,7 @@ public class GenericJavaPersistentTypeTests extends ContextModelTestCase //as the superPersistentType because of impliedClassRefs and changes for bug 190317 addXmlClassRef(PACKAGE_NAME + ".AnnotationTestTypeChild"); - ListIterator classRefs = getPersistenceUnit().specifiedClassRefs(); + ListIterator classRefs = getPersistenceUnit().getSpecifiedClassRefs().iterator(); JavaPersistentType javaPersistentType = classRefs.next().getJavaPersistentType(); assertNotNull(javaPersistentType.getSuperPersistentType()); @@ -475,7 +478,7 @@ public class GenericJavaPersistentTypeTests extends ContextModelTestCase addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); addXmlClassRef(PACKAGE_NAME + ".AnnotationTestTypeChild2"); - ListIterator classRefs = getPersistenceUnit().specifiedClassRefs(); + ListIterator classRefs = getPersistenceUnit().getSpecifiedClassRefs().iterator(); ClassRef classRef = classRefs.next(); JavaPersistentType rootJavaPersistentType = classRef.getJavaPersistentType(); @@ -494,7 +497,7 @@ public class GenericJavaPersistentTypeTests extends ContextModelTestCase addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); addXmlClassRef(PACKAGE_NAME + ".AnnotationTestTypeChild2"); - ListIterator classRefs = getPersistenceUnit().specifiedClassRefs(); + ListIterator classRefs = getPersistenceUnit().getSpecifiedClassRefs().iterator(); JavaPersistentType rootJavaPersistentType = classRefs.next().getJavaPersistentType(); JavaPersistentType childJavaPersistentType = classRefs.next().getJavaPersistentType(); @@ -512,7 +515,7 @@ public class GenericJavaPersistentTypeTests extends ContextModelTestCase addXmlClassRef(PACKAGE_NAME + ".AnnotationTestTypeChild2"); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ListIterator classRefs = getPersistenceUnit().specifiedClassRefs(); + ListIterator classRefs = getPersistenceUnit().getSpecifiedClassRefs().iterator(); JavaPersistentType childJavaPersistentType = classRefs.next().getJavaPersistentType(); JavaPersistentType rootJavaPersistentType = classRefs.next().getJavaPersistentType(); @@ -558,8 +561,8 @@ public class GenericJavaPersistentTypeTests extends ContextModelTestCase getJavaPersistentType().setMappingKey(MappingKeys.ENTITY_TYPE_MAPPING_KEY); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - assertNotNull(typeResource.getAnnotation(EntityAnnotation.ANNOTATION_NAME)); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + assertNotNull(resourceType.getAnnotation(EntityAnnotation.ANNOTATION_NAME)); assertEquals(MappingKeys.ENTITY_TYPE_MAPPING_KEY, getJavaPersistentType().getMappingKey()); } @@ -572,8 +575,8 @@ public class GenericJavaPersistentTypeTests extends ContextModelTestCase getJavaPersistentType().setMappingKey(MappingKeys.EMBEDDABLE_TYPE_MAPPING_KEY); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - assertNotNull(typeResource.getAnnotation(EmbeddableAnnotation.ANNOTATION_NAME)); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + assertNotNull(resourceType.getAnnotation(EmbeddableAnnotation.ANNOTATION_NAME)); assertEquals(MappingKeys.EMBEDDABLE_TYPE_MAPPING_KEY, getJavaPersistentType().getMappingKey()); } @@ -586,8 +589,8 @@ public class GenericJavaPersistentTypeTests extends ContextModelTestCase getJavaPersistentType().setMappingKey(MappingKeys.NULL_TYPE_MAPPING_KEY); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - assertNull(typeResource.getAnnotation(EntityAnnotation.ANNOTATION_NAME)); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + assertNull(resourceType.getAnnotation(EntityAnnotation.ANNOTATION_NAME)); assertEquals(MappingKeys.NULL_TYPE_MAPPING_KEY, getJavaPersistentType().getMappingKey()); } @@ -598,7 +601,7 @@ public class GenericJavaPersistentTypeTests extends ContextModelTestCase assertEquals(MappingKeys.ENTITY_TYPE_MAPPING_KEY, getJavaPersistentType().getMappingKey()); - JavaResourcePersistentType resourceType = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); resourceType.setPrimaryAnnotation(EmbeddableAnnotation.ANNOTATION_NAME, EmptyIterable.instance()); this.getJpaProject().synchronizeContextModel(); @@ -611,7 +614,7 @@ public class GenericJavaPersistentTypeTests extends ContextModelTestCase assertEquals(MappingKeys.NULL_TYPE_MAPPING_KEY, getJavaPersistentType().getMappingKey()); - JavaResourcePersistentType resourceType = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); resourceType.setPrimaryAnnotation(EntityAnnotation.ANNOTATION_NAME, EmptyIterable.instance()); this.getJpaProject().synchronizeContextModel(); @@ -631,7 +634,7 @@ public class GenericJavaPersistentTypeTests extends ContextModelTestCase public void testAttributes() throws Exception { createTestEntityAnnotatedMethod(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - Iterator attributes = getJavaPersistentType().attributes(); + Iterator attributes = getJavaPersistentType().getAttributes().iterator(); assertEquals("id", attributes.next().getName()); assertFalse(attributes.hasNext()); @@ -641,10 +644,17 @@ public class GenericJavaPersistentTypeTests extends ContextModelTestCase createTestEntityAnnotatedFieldAndMethod(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - Iterator attributes = getJavaPersistentType().attributes(); + Iterator attributes = getJavaPersistentType().getAttributes().iterator(); - assertEquals("id", attributes.next().getName()); - assertEquals("name", attributes.next().getName()); + JavaPersistentAttribute attribute = attributes.next(); + assertEquals("id", attribute.getName()); + assertTrue(attribute.getAccessor() instanceof FieldAccessor); + attribute = attributes.next(); + assertEquals("name", attribute.getName()); + assertTrue(attribute.getAccessor() instanceof FieldAccessor); + attribute = attributes.next(); + assertEquals("id", attribute.getName()); + assertTrue(attribute.getAccessor() instanceof PropertyAccessor); assertFalse(attributes.hasNext()); } @@ -652,14 +662,14 @@ public class GenericJavaPersistentTypeTests extends ContextModelTestCase createTestEntityAnnotatedMethod(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - assertEquals(1, getJavaPersistentType().attributesSize()); + assertEquals(1, getJavaPersistentType().getAttributesSize()); } public void testAttributesSize2() throws Exception { createTestEntityAnnotatedFieldAndMethod(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - assertEquals(2, getJavaPersistentType().attributesSize()); + assertEquals(3, getJavaPersistentType().getAttributesSize()); } public void testAttributeNamed() throws Exception { @@ -688,7 +698,7 @@ public class GenericJavaPersistentTypeTests extends ContextModelTestCase ICompilationUnit testType = createTestEntityAnnotatedField(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - Iterator attributes = getJavaPersistentType().attributes(); + Iterator attributes = getJavaPersistentType().getAttributes().iterator(); JavaPersistentAttribute idAttribute = attributes.next(); JavaPersistentAttribute nameAttribute = attributes.next(); @@ -699,7 +709,7 @@ public class GenericJavaPersistentTypeTests extends ContextModelTestCase IField idField = testType.findPrimaryType().getField("id"); idField.rename("id2", false, null); - attributes = getJavaPersistentType().attributes(); + attributes = getJavaPersistentType().getAttributes().iterator(); JavaPersistentAttribute nameAttribute2 = attributes.next(); JavaPersistentAttribute id2Attribute = attributes.next(); @@ -756,4 +766,135 @@ public class GenericJavaPersistentTypeTests extends ContextModelTestCase }; this.javaProject.createCompilationUnit(PACKAGE_NAME, "Entity2.java", sourceWriter); } + + + public void testGetAccessNoAttributesAnnotated() throws Exception { + createTestEntity(); + addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); + JavaPersistentType javaPersistentType = getJavaPersistentType(); + + assertEquals(AccessType.FIELD, javaPersistentType.getAccess()); + assertEquals(AccessType.FIELD, javaPersistentType.getDefaultAccess()); + assertNull(javaPersistentType.getSpecifiedAccess()); + } + + public void testGetAccessFieldsAnnotated() throws Exception { + createTestEntityAnnotatedField(); + addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); + JavaPersistentType javaPersistentType = getJavaPersistentType(); + + assertEquals(AccessType.FIELD, javaPersistentType.getAccess()); + assertEquals(AccessType.FIELD, javaPersistentType.getDefaultAccess()); + assertNull(javaPersistentType.getSpecifiedAccess()); + } + + public void testGetAccessMethodsAnnotated() throws Exception { + createTestEntityAnnotatedMethod(); + addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); + JavaPersistentType javaPersistentType = getJavaPersistentType(); + + assertEquals(AccessType.PROPERTY, javaPersistentType.getAccess()); + assertEquals(AccessType.PROPERTY, javaPersistentType.getDefaultAccess()); + assertNull(javaPersistentType.getSpecifiedAccess()); + } + + public void testGetAccessFieldsAndMethodsAnnotated() throws Exception { + createTestEntityAnnotatedFieldAndMethod(); + addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); + JavaPersistentType javaPersistentType = getJavaPersistentType(); + + assertEquals(AccessType.FIELD, javaPersistentType.getAccess()); + assertEquals(AccessType.FIELD, javaPersistentType.getDefaultAccess()); + assertNull(javaPersistentType.getSpecifiedAccess()); + } + + public void testGetAccessNonPersistableMethodAnnotated() throws Exception { + createTestEntityAnnotatedNonPersistableMethod(); + addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); + JavaPersistentType javaPersistentType = getJavaPersistentType(); + + assertEquals(AccessType.PROPERTY, javaPersistentType.getAccess()); + assertEquals(AccessType.PROPERTY, javaPersistentType.getDefaultAccess()); + assertNull(javaPersistentType.getSpecifiedAccess()); + } + + public void testGetAccessPersistableMethodAndNonPersistableFieldAnnotated() throws Exception { + createTestEntityAnnotatedPersistableMethodNonPersistableField(); + addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); + JavaPersistentType javaPersistentType = getJavaPersistentType(); + + assertEquals(AccessType.FIELD, javaPersistentType.getAccess()); + assertEquals(AccessType.FIELD, javaPersistentType.getDefaultAccess()); + assertNull(javaPersistentType.getSpecifiedAccess()); + } + + public void testGetAccessNoPersistableFieldsAnnotated() throws Exception { + createTestEntityNoPersistableFields(); + addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); + JavaPersistentType javaPersistentType = getJavaPersistentType(); + + assertEquals(AccessType.FIELD, javaPersistentType.getAccess()); + assertEquals(AccessType.FIELD, javaPersistentType.getDefaultAccess()); + assertNull(javaPersistentType.getSpecifiedAccess()); + } + + private ICompilationUnit createTestEntityAnnotatedNonPersistableMethod() throws Exception { + return this.createTestType(new DefaultAnnotationWriter() { + @Override + public Iterator imports() { + return new ArrayIterator(JPA.ENTITY, JPA.ID); + } + @Override + public void appendTypeAnnotationTo(StringBuilder sb) { + sb.append("@Entity"); + } + @Override + public void appendGetNameMethodAnnotationTo(StringBuilder sb) { + sb.append("@Id"); + } + }); + } + + private ICompilationUnit createTestEntityAnnotatedPersistableMethodNonPersistableField() throws Exception { + return this.createTestType(new DefaultAnnotationWriter() { + @Override + public Iterator imports() { + return new ArrayIterator(JPA.ENTITY, JPA.COLUMN); + } + @Override + public void appendTypeAnnotationTo(StringBuilder sb) { + sb.append("@Entity"); + } + + @Override + public void appendIdFieldAnnotationTo(StringBuilder sb) { + sb.append("@Column"); + sb.append(" private transient int notPersistable;").append(CR); + sb.append(CR); + + } + @Override + public void appendGetIdMethodAnnotationTo(StringBuilder sb) { + sb.append("@Column"); + } + }); + } + + private ICompilationUnit createTestEntityNoPersistableFields() throws Exception { + return this.createTestType(new DefaultAnnotationWriter() { + @Override + public Iterator imports() { + return new ArrayIterator(JPA.ENTITY); + } + @Override + public void appendTypeAnnotationTo(StringBuilder sb) { + sb.append("@Entity"); + } + @Override + public void appendMemberTypeTo(StringBuilder sb) { + sb.delete(sb.indexOf("private int id;"), sb.indexOf("private int id;") + "private int id;".length()); + sb.delete(sb.indexOf("private String name;"), sb.indexOf("private String name;") + "private String name;".length()); + } + }); + } } diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaAssociationOverrideTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaAssociationOverrideTests.java index dcec135aca..b5e0df8915 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaAssociationOverrideTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaAssociationOverrideTests.java @@ -12,6 +12,8 @@ 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.JavaResourceType; import org.eclipse.jpt.common.core.tests.internal.projects.TestJavaProject.SourceWriter; import org.eclipse.jpt.common.utility.internal.iterators.ArrayIterator; import org.eclipse.jpt.jpa.core.context.AssociationOverride; @@ -26,7 +28,6 @@ import org.eclipse.jpt.jpa.core.context.java.JavaJoinColumnRelationshipStrategy; import org.eclipse.jpt.jpa.core.context.java.JavaVirtualAssociationOverride; import org.eclipse.jpt.jpa.core.resource.java.AssociationOverrideAnnotation; import org.eclipse.jpt.jpa.core.resource.java.JPA; -import org.eclipse.jpt.jpa.core.resource.java.JavaResourcePersistentType; import org.eclipse.jpt.jpa.core.tests.internal.context.ContextModelTestCase; @SuppressWarnings("nls") @@ -103,15 +104,15 @@ public class JavaAssociationOverrideTests extends ContextModelTestCase JavaEntity entity = getJavaEntity(); JavaAssociationOverrideContainer overrideContainer = entity.getAssociationOverrideContainer(); - VirtualAssociationOverride virtualOverride = overrideContainer.virtualOverrides().next(); + VirtualAssociationOverride virtualOverride = overrideContainer.getVirtualOverrides().iterator().next(); AssociationOverride javaAssociationOverride = virtualOverride.convertToSpecified(); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(PACKAGE_NAME + ".AnnotationTestTypeChild"); - AssociationOverrideAnnotation associationOverrideResource = (AssociationOverrideAnnotation) typeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDE); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(PACKAGE_NAME + ".AnnotationTestTypeChild", Kind.TYPE); + AssociationOverrideAnnotation associationOverrideResource = (AssociationOverrideAnnotation) resourceType.getAnnotation(0, JPA.ASSOCIATION_OVERRIDE); assertEquals("address", javaAssociationOverride.getName()); assertEquals("address", associationOverrideResource.getName()); - assertTrue(overrideContainer.overrides().hasNext()); + assertTrue(overrideContainer.getOverrides().iterator().hasNext()); //set name in the resource model, verify context model updated associationOverrideResource.setName("FOO"); @@ -122,20 +123,20 @@ public class JavaAssociationOverrideTests extends ContextModelTestCase //set name to null in the resource model associationOverrideResource.setName(null); getJpaProject().synchronizeContextModel(); - assertEquals(0, overrideContainer.specifiedOverridesSize()); + assertEquals(0, overrideContainer.getSpecifiedOverridesSize()); assertNull(associationOverrideResource.getName()); associationOverrideResource.setName("FOO"); getJpaProject().synchronizeContextModel(); - assertEquals(1, overrideContainer.specifiedOverridesSize()); - javaAssociationOverride = overrideContainer.specifiedOverrides().next(); + assertEquals(1, overrideContainer.getSpecifiedOverridesSize()); + javaAssociationOverride = overrideContainer.getSpecifiedOverrides().iterator().next(); assertEquals("FOO", javaAssociationOverride.getName()); assertEquals("FOO", associationOverrideResource.getName()); - typeResource.removeAnnotation(0, JPA.ASSOCIATION_OVERRIDE, JPA.ASSOCIATION_OVERRIDES); + resourceType.removeAnnotation(0, JPA.ASSOCIATION_OVERRIDE); getJpaProject().synchronizeContextModel(); - assertFalse(overrideContainer.specifiedOverrides().hasNext()); - assertFalse(typeResource.annotations(JPA.ASSOCIATION_OVERRIDE, JPA.ASSOCIATION_OVERRIDES).hasNext()); + assertFalse(overrideContainer.getSpecifiedOverrides().iterator().hasNext()); + assertFalse(resourceType.getAnnotations(JPA.ASSOCIATION_OVERRIDE).iterator().hasNext()); } public void testModifyName() throws Exception { @@ -146,15 +147,15 @@ public class JavaAssociationOverrideTests extends ContextModelTestCase JavaEntity entity = getJavaEntity(); JavaAssociationOverrideContainer overrideContainer = entity.getAssociationOverrideContainer(); - VirtualAssociationOverride virtualAssociationOverride = overrideContainer.virtualOverrides().next(); + VirtualAssociationOverride virtualAssociationOverride = overrideContainer.getVirtualOverrides().iterator().next(); AssociationOverride javaAssociationOverride = virtualAssociationOverride.convertToSpecified(); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(PACKAGE_NAME + ".AnnotationTestTypeChild"); - AssociationOverrideAnnotation associationOverrideResource = (AssociationOverrideAnnotation) typeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDE); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(PACKAGE_NAME + ".AnnotationTestTypeChild", Kind.TYPE); + AssociationOverrideAnnotation associationOverrideResource = (AssociationOverrideAnnotation) resourceType.getAnnotation(0, JPA.ASSOCIATION_OVERRIDE); assertEquals("address", javaAssociationOverride.getName()); assertEquals("address", associationOverrideResource.getName()); - assertTrue(overrideContainer.overrides().hasNext()); + assertTrue(overrideContainer.getOverrides().iterator().hasNext()); //set name in the context model, verify resource model modified javaAssociationOverride.setName("foo"); @@ -164,7 +165,7 @@ public class JavaAssociationOverrideTests extends ContextModelTestCase //set name to null in the context model javaAssociationOverride.setName(null); assertNull(javaAssociationOverride.getName()); - associationOverrideResource = (AssociationOverrideAnnotation) typeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDE); + associationOverrideResource = (AssociationOverrideAnnotation) resourceType.getAnnotation(0, JPA.ASSOCIATION_OVERRIDE); assertNull(associationOverrideResource.getName()); } @@ -176,12 +177,12 @@ public class JavaAssociationOverrideTests extends ContextModelTestCase JavaEntity entity = getJavaEntity(); JavaAssociationOverrideContainer overrideContainer = entity.getAssociationOverrideContainer(); - JavaVirtualAssociationOverride virtualOverride = overrideContainer.virtualOverrides().next(); + JavaVirtualAssociationOverride virtualOverride = overrideContainer.getVirtualOverrides().iterator().next(); JavaAssociationOverride specifiedOverride = virtualOverride.convertToSpecified(); JavaJoinColumnRelationshipStrategy joiningStrategy = specifiedOverride.getRelationship().getJoinColumnStrategy(); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(PACKAGE_NAME + ".AnnotationTestTypeChild"); - AssociationOverrideAnnotation associationOverrideAnnotation = (AssociationOverrideAnnotation) typeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDE); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(PACKAGE_NAME + ".AnnotationTestTypeChild", Kind.TYPE); + AssociationOverrideAnnotation associationOverrideAnnotation = (AssociationOverrideAnnotation) resourceType.getAnnotation(0, JPA.ASSOCIATION_OVERRIDE); JavaJoinColumn joinColumn1 = joiningStrategy.addSpecifiedJoinColumn(0); @@ -198,19 +199,19 @@ public class JavaAssociationOverrideTests extends ContextModelTestCase JavaJoinColumn joinColumn3 = joiningStrategy.addSpecifiedJoinColumn(1); joinColumn3.setSpecifiedName("BAZ"); - assertEquals(4, associationOverrideAnnotation.joinColumnsSize()); + assertEquals(4, associationOverrideAnnotation.getJoinColumnsSize()); assertEquals("BAR", associationOverrideAnnotation.joinColumnAt(0).getName()); assertEquals("BAZ", associationOverrideAnnotation.joinColumnAt(1).getName()); assertEquals("FOO", associationOverrideAnnotation.joinColumnAt(2).getName()); assertEquals("address_id", associationOverrideAnnotation.joinColumnAt(3).getName()); // the old default join column - assertEquals(4, joiningStrategy.specifiedJoinColumnsSize()); - ListIterator joinColumns = joiningStrategy.specifiedJoinColumns(); + assertEquals(4, joiningStrategy.getSpecifiedJoinColumnsSize()); + ListIterator joinColumns = joiningStrategy.getSpecifiedJoinColumns().iterator(); assertEquals(joinColumn2, joinColumns.next()); assertEquals(joinColumn3, joinColumns.next()); assertEquals(joinColumn1, joinColumns.next()); - joinColumns = joiningStrategy.specifiedJoinColumns(); + joinColumns = joiningStrategy.getSpecifiedJoinColumns().iterator(); assertEquals("BAR", joinColumns.next().getName()); assertEquals("BAZ", joinColumns.next().getName()); assertEquals("FOO", joinColumns.next().getName()); @@ -225,35 +226,35 @@ public class JavaAssociationOverrideTests extends ContextModelTestCase JavaEntity entity = getJavaEntity(); JavaAssociationOverrideContainer overrideContainer = entity.getAssociationOverrideContainer(); - JavaVirtualAssociationOverride javaAssociationOverride = overrideContainer.virtualOverrides().next(); + JavaVirtualAssociationOverride javaAssociationOverride = overrideContainer.getVirtualOverrides().iterator().next(); JavaAssociationOverride specifiedOverride = javaAssociationOverride.convertToSpecified(); JavaJoinColumnRelationshipStrategy joiningStrategy = specifiedOverride.getRelationship().getJoinColumnStrategy(); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(PACKAGE_NAME + ".AnnotationTestTypeChild"); - AssociationOverrideAnnotation associationOverrideResource = (AssociationOverrideAnnotation) typeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDE); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(PACKAGE_NAME + ".AnnotationTestTypeChild", Kind.TYPE); + AssociationOverrideAnnotation associationOverrideResource = (AssociationOverrideAnnotation) resourceType.getAnnotation(0, JPA.ASSOCIATION_OVERRIDE); - assertEquals(1, associationOverrideResource.joinColumnsSize()); + assertEquals(1, associationOverrideResource.getJoinColumnsSize()); joiningStrategy.addSpecifiedJoinColumn(0).setSpecifiedName("FOO"); joiningStrategy.addSpecifiedJoinColumn(1).setSpecifiedName("BAR"); joiningStrategy.addSpecifiedJoinColumn(2).setSpecifiedName("BAZ"); - assertEquals(4, associationOverrideResource.joinColumnsSize()); + assertEquals(4, associationOverrideResource.getJoinColumnsSize()); joiningStrategy.removeSpecifiedJoinColumn(0); - assertEquals(3, associationOverrideResource.joinColumnsSize()); + assertEquals(3, associationOverrideResource.getJoinColumnsSize()); assertEquals("BAR", associationOverrideResource.joinColumnAt(0).getName()); assertEquals("BAZ", associationOverrideResource.joinColumnAt(1).getName()); joiningStrategy.removeSpecifiedJoinColumn(0); - assertEquals(2, associationOverrideResource.joinColumnsSize()); + assertEquals(2, associationOverrideResource.getJoinColumnsSize()); assertEquals("BAZ", associationOverrideResource.joinColumnAt(0).getName()); joiningStrategy.removeSpecifiedJoinColumn(0); - assertEquals(1, associationOverrideResource.joinColumnsSize()); + assertEquals(1, associationOverrideResource.getJoinColumnsSize()); joiningStrategy.removeSpecifiedJoinColumn(0); - assertEquals(0, associationOverrideResource.joinColumnsSize()); + assertEquals(0, associationOverrideResource.getJoinColumnsSize()); } public void testMoveSpecifiedJoinColumn() throws Exception { @@ -264,22 +265,22 @@ public class JavaAssociationOverrideTests extends ContextModelTestCase JavaEntity entity = getJavaEntity(); JavaAssociationOverrideContainer overrideContainer = entity.getAssociationOverrideContainer(); - JavaVirtualAssociationOverride javaAssociationOverride = overrideContainer.virtualOverrides().next(); + JavaVirtualAssociationOverride javaAssociationOverride = overrideContainer.getVirtualOverrides().iterator().next(); JavaAssociationOverride specifiedOverride = javaAssociationOverride.convertToSpecified(); JavaJoinColumnRelationshipStrategy joiningStrategy = specifiedOverride.getRelationship().getJoinColumnStrategy(); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(PACKAGE_NAME + ".AnnotationTestTypeChild"); - AssociationOverrideAnnotation associationOverrideResource = (AssociationOverrideAnnotation) typeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDE); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(PACKAGE_NAME + ".AnnotationTestTypeChild", Kind.TYPE); + AssociationOverrideAnnotation associationOverrideResource = (AssociationOverrideAnnotation) resourceType.getAnnotation(0, JPA.ASSOCIATION_OVERRIDE); joiningStrategy.addSpecifiedJoinColumn(0).setSpecifiedName("FOO"); joiningStrategy.addSpecifiedJoinColumn(1).setSpecifiedName("BAR"); joiningStrategy.addSpecifiedJoinColumn(2).setSpecifiedName("BAZ"); - assertEquals(4, associationOverrideResource.joinColumnsSize()); + assertEquals(4, associationOverrideResource.getJoinColumnsSize()); joiningStrategy.moveSpecifiedJoinColumn(2, 0); - ListIterator joinColumns = joiningStrategy.specifiedJoinColumns(); + ListIterator joinColumns = joiningStrategy.getSpecifiedJoinColumns().iterator(); assertEquals("BAR", joinColumns.next().getName()); assertEquals("BAZ", joinColumns.next().getName()); assertEquals("FOO", joinColumns.next().getName()); @@ -290,7 +291,7 @@ public class JavaAssociationOverrideTests extends ContextModelTestCase joiningStrategy.moveSpecifiedJoinColumn(0, 1); - joinColumns = joiningStrategy.specifiedJoinColumns(); + joinColumns = joiningStrategy.getSpecifiedJoinColumns().iterator(); assertEquals("BAZ", joinColumns.next().getName()); assertEquals("BAR", joinColumns.next().getName()); assertEquals("FOO", joinColumns.next().getName()); @@ -308,14 +309,14 @@ public class JavaAssociationOverrideTests extends ContextModelTestCase JavaEntity entity = getJavaEntity(); JavaAssociationOverrideContainer overrideContainer = entity.getAssociationOverrideContainer(); - JavaVirtualAssociationOverride javaAssociationOverride = overrideContainer.virtualOverrides().next(); + JavaVirtualAssociationOverride javaAssociationOverride = overrideContainer.getVirtualOverrides().iterator().next(); JavaAssociationOverride specifiedOverride = javaAssociationOverride.convertToSpecified(); JavaJoinColumnRelationshipStrategy joiningStrategy = specifiedOverride.getRelationship().getJoinColumnStrategy(); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(PACKAGE_NAME + ".AnnotationTestTypeChild"); - AssociationOverrideAnnotation associationOverrideResource = (AssociationOverrideAnnotation) typeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDE); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(PACKAGE_NAME + ".AnnotationTestTypeChild", Kind.TYPE); + AssociationOverrideAnnotation associationOverrideResource = (AssociationOverrideAnnotation) resourceType.getAnnotation(0, JPA.ASSOCIATION_OVERRIDE); - ListIterator joinColumns = joiningStrategy.specifiedJoinColumns(); + ListIterator joinColumns = joiningStrategy.getSpecifiedJoinColumns().iterator(); JoinColumn joinColumn = joinColumns.next(); assertEquals("address_id", joinColumn.getSpecifiedName()); assertEquals("id", joinColumn.getSpecifiedReferencedColumnName()); @@ -330,7 +331,7 @@ public class JavaAssociationOverrideTests extends ContextModelTestCase associationOverrideResource.joinColumnAt(2).setName("BAZ"); getJpaProject().synchronizeContextModel(); - joinColumns = joiningStrategy.specifiedJoinColumns(); + joinColumns = joiningStrategy.getSpecifiedJoinColumns().iterator(); assertEquals("FOO", joinColumns.next().getName()); assertEquals("BAR", joinColumns.next().getName()); assertEquals("BAZ", joinColumns.next().getName()); @@ -339,7 +340,7 @@ public class JavaAssociationOverrideTests extends ContextModelTestCase associationOverrideResource.moveJoinColumn(2, 0); getJpaProject().synchronizeContextModel(); - joinColumns = joiningStrategy.specifiedJoinColumns(); + joinColumns = joiningStrategy.getSpecifiedJoinColumns().iterator(); assertEquals("BAR", joinColumns.next().getName()); assertEquals("BAZ", joinColumns.next().getName()); assertEquals("FOO", joinColumns.next().getName()); @@ -348,7 +349,7 @@ public class JavaAssociationOverrideTests extends ContextModelTestCase associationOverrideResource.moveJoinColumn(0, 1); getJpaProject().synchronizeContextModel(); - joinColumns = joiningStrategy.specifiedJoinColumns(); + joinColumns = joiningStrategy.getSpecifiedJoinColumns().iterator(); assertEquals("BAZ", joinColumns.next().getName()); assertEquals("BAR", joinColumns.next().getName()); assertEquals("FOO", joinColumns.next().getName()); @@ -357,7 +358,7 @@ public class JavaAssociationOverrideTests extends ContextModelTestCase associationOverrideResource.removeJoinColumn(1); getJpaProject().synchronizeContextModel(); - joinColumns = joiningStrategy.specifiedJoinColumns(); + joinColumns = joiningStrategy.getSpecifiedJoinColumns().iterator(); assertEquals("BAZ", joinColumns.next().getName()); assertEquals("FOO", joinColumns.next().getName()); assertEquals("address_id", joinColumns.next().getName()); @@ -365,19 +366,19 @@ public class JavaAssociationOverrideTests extends ContextModelTestCase associationOverrideResource.removeJoinColumn(1); getJpaProject().synchronizeContextModel(); - joinColumns = joiningStrategy.specifiedJoinColumns(); + joinColumns = joiningStrategy.getSpecifiedJoinColumns().iterator(); assertEquals("BAZ", joinColumns.next().getName()); assertEquals("address_id", joinColumns.next().getName()); assertFalse(joinColumns.hasNext()); associationOverrideResource.removeJoinColumn(0); getJpaProject().synchronizeContextModel(); - joinColumns = joiningStrategy.specifiedJoinColumns(); + joinColumns = joiningStrategy.getSpecifiedJoinColumns().iterator(); assertEquals("address_id", joinColumns.next().getName()); associationOverrideResource.removeJoinColumn(0); getJpaProject().synchronizeContextModel(); - assertFalse(joiningStrategy.specifiedJoinColumns().hasNext()); + assertFalse(joiningStrategy.getSpecifiedJoinColumns().iterator().hasNext()); } public void testGetName() throws Exception { @@ -385,16 +386,16 @@ public class JavaAssociationOverrideTests extends ContextModelTestCase addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); JavaAssociationOverrideContainer overrideContainer = getJavaEntity().getAssociationOverrideContainer(); - AssociationOverride specifiedAssociationOverride = overrideContainer.specifiedOverrides().next(); + AssociationOverride specifiedAssociationOverride = overrideContainer.getSpecifiedOverrides().iterator().next(); assertEquals(ASSOCIATION_OVERRIDE_NAME, specifiedAssociationOverride.getName()); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - AssociationOverrideAnnotation associationOverrideResource = (AssociationOverrideAnnotation) typeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDE); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + AssociationOverrideAnnotation associationOverrideResource = (AssociationOverrideAnnotation) resourceType.getAnnotation(0, JPA.ASSOCIATION_OVERRIDE); associationOverrideResource.setName("FOO"); getJpaProject().synchronizeContextModel(); - specifiedAssociationOverride = overrideContainer.specifiedOverrides().next(); + specifiedAssociationOverride = overrideContainer.getSpecifiedOverrides().iterator().next(); assertEquals("FOO", specifiedAssociationOverride.getName()); } @@ -403,13 +404,13 @@ public class JavaAssociationOverrideTests extends ContextModelTestCase addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); JavaAssociationOverrideContainer overrideContainer = getJavaEntity().getAssociationOverrideContainer(); - AssociationOverride specifiedAssociationOverride = overrideContainer.specifiedOverrides().next(); + AssociationOverride specifiedAssociationOverride = overrideContainer.getSpecifiedOverrides().iterator().next(); assertEquals(ASSOCIATION_OVERRIDE_NAME, specifiedAssociationOverride.getName()); specifiedAssociationOverride.setName("FOO"); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - AssociationOverrideAnnotation associationOverrideResource = (AssociationOverrideAnnotation) typeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDE); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + AssociationOverrideAnnotation associationOverrideResource = (AssociationOverrideAnnotation) resourceType.getAnnotation(0, JPA.ASSOCIATION_OVERRIDE); assertEquals("FOO", associationOverrideResource.getName()); } @@ -423,9 +424,9 @@ public class JavaAssociationOverrideTests extends ContextModelTestCase JavaEntity entity = getJavaEntity(); JavaAssociationOverrideContainer overrideContainer = entity.getAssociationOverrideContainer(); assertEquals("AnnotationTestTypeChild", entity.getName()); - assertEquals(1, overrideContainer.virtualOverridesSize()); + assertEquals(1, overrideContainer.getVirtualOverridesSize()); - ReadOnlyAssociationOverride associationOverride = overrideContainer.virtualOverrides().next(); + ReadOnlyAssociationOverride associationOverride = overrideContainer.getVirtualOverrides().iterator().next(); assertEquals("address", associationOverride.getName()); } @@ -438,9 +439,9 @@ public class JavaAssociationOverrideTests extends ContextModelTestCase JavaEntity entity = getJavaEntity(); JavaAssociationOverrideContainer overrideContainer = entity.getAssociationOverrideContainer(); assertEquals("AnnotationTestTypeChild", entity.getName()); - assertEquals(1, overrideContainer.virtualOverridesSize()); + assertEquals(1, overrideContainer.getVirtualOverridesSize()); - ReadOnlyAssociationOverride associationOverride = overrideContainer.virtualOverrides().next(); + ReadOnlyAssociationOverride associationOverride = overrideContainer.getVirtualOverrides().iterator().next(); assertTrue(associationOverride.isVirtual()); } } diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaAttributeOverrideTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaAttributeOverrideTests.java index b1fea4810d..35bb9702ae 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaAttributeOverrideTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaAttributeOverrideTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2010 Oracle. All rights reserved. + * Copyright (c) 2007, 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. @@ -11,6 +11,8 @@ package org.eclipse.jpt.jpa.core.tests.internal.context.java; import java.util.Iterator; 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.tests.internal.projects.TestJavaProject.SourceWriter; import org.eclipse.jpt.common.utility.internal.CollectionTools; import org.eclipse.jpt.common.utility.internal.iterators.ArrayIterator; @@ -26,7 +28,6 @@ import org.eclipse.jpt.jpa.core.context.java.JavaVirtualAttributeOverride; import org.eclipse.jpt.jpa.core.resource.java.AttributeOverrideAnnotation; import org.eclipse.jpt.jpa.core.resource.java.ColumnAnnotation; import org.eclipse.jpt.jpa.core.resource.java.JPA; -import org.eclipse.jpt.jpa.core.resource.java.JavaResourcePersistentType; import org.eclipse.jpt.jpa.core.tests.internal.context.ContextModelTestCase; @SuppressWarnings("nls") @@ -91,16 +92,16 @@ public class JavaAttributeOverrideTests extends ContextModelTestCase addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); AttributeOverrideContainer overrideContainer = getJavaEntity().getAttributeOverrideContainer(); - AttributeOverride specifiedAttributeOverride = overrideContainer.specifiedOverrides().next(); + AttributeOverride specifiedAttributeOverride = overrideContainer.getSpecifiedOverrides().iterator().next(); assertEquals(ATTRIBUTE_OVERRIDE_NAME, specifiedAttributeOverride.getName()); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - AttributeOverrideAnnotation attributeOverrideResource = (AttributeOverrideAnnotation) typeResource.getAnnotation(JPA.ATTRIBUTE_OVERRIDE); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + AttributeOverrideAnnotation attributeOverrideResource = (AttributeOverrideAnnotation) resourceType.getAnnotation(0, JPA.ATTRIBUTE_OVERRIDE); attributeOverrideResource.setName("FOO"); getJpaProject().synchronizeContextModel(); - specifiedAttributeOverride = overrideContainer.specifiedOverrides().next(); + specifiedAttributeOverride = overrideContainer.getSpecifiedOverrides().iterator().next(); assertEquals("FOO", specifiedAttributeOverride.getName()); } @@ -109,13 +110,13 @@ public class JavaAttributeOverrideTests extends ContextModelTestCase addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); AttributeOverrideContainer overrideContainer = getJavaEntity().getAttributeOverrideContainer(); - AttributeOverride specifiedAttributeOverride = overrideContainer.specifiedOverrides().next(); + AttributeOverride specifiedAttributeOverride = overrideContainer.getSpecifiedOverrides().iterator().next(); assertEquals(ATTRIBUTE_OVERRIDE_NAME, specifiedAttributeOverride.getName()); specifiedAttributeOverride.setName("FOO"); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - AttributeOverrideAnnotation attributeOverrideResource = (AttributeOverrideAnnotation) typeResource.getAnnotation(JPA.ATTRIBUTE_OVERRIDE); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + AttributeOverrideAnnotation attributeOverrideResource = (AttributeOverrideAnnotation) resourceType.getAnnotation(0, JPA.ATTRIBUTE_OVERRIDE); assertEquals("FOO", attributeOverrideResource.getName()); } @@ -125,19 +126,19 @@ public class JavaAttributeOverrideTests extends ContextModelTestCase addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); AttributeOverrideContainer overrideContainer = getJavaEntity().getAttributeOverrideContainer(); - AttributeOverride specifiedAttributeOverride = overrideContainer.specifiedOverrides().next(); + AttributeOverride specifiedAttributeOverride = overrideContainer.getSpecifiedOverrides().iterator().next(); Column column = specifiedAttributeOverride.getColumn(); assertEquals(ATTRIBUTE_OVERRIDE_COLUMN_NAME, column.getName()); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - AttributeOverrideAnnotation attributeOverrideResource = (AttributeOverrideAnnotation) typeResource.getAnnotation(JPA.ATTRIBUTE_OVERRIDE); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + AttributeOverrideAnnotation attributeOverrideResource = (AttributeOverrideAnnotation) resourceType.getAnnotation(0, JPA.ATTRIBUTE_OVERRIDE); ColumnAnnotation columnResource = attributeOverrideResource.getColumn(); columnResource.setName("FOO"); getJpaProject().synchronizeContextModel(); - column = overrideContainer.specifiedOverrides().next().getColumn(); + column = overrideContainer.getSpecifiedOverrides().iterator().next().getColumn(); assertEquals("FOO", column.getName()); } @@ -146,20 +147,20 @@ public class JavaAttributeOverrideTests extends ContextModelTestCase addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); AttributeOverrideContainer overrideContainer = getJavaEntity().getAttributeOverrideContainer(); - AttributeOverride specifiedAttributeOverride = overrideContainer.specifiedOverrides().next(); + AttributeOverride specifiedAttributeOverride = overrideContainer.getSpecifiedOverrides().iterator().next(); Column column = specifiedAttributeOverride.getColumn(); assertEquals(ATTRIBUTE_OVERRIDE_COLUMN_NAME, column.getName()); column.setSpecifiedName("FOO"); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - AttributeOverrideAnnotation attributeOverrideResource = (AttributeOverrideAnnotation) typeResource.getAnnotation(JPA.ATTRIBUTE_OVERRIDE); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + AttributeOverrideAnnotation attributeOverrideResource = (AttributeOverrideAnnotation) resourceType.getAnnotation(0, JPA.ATTRIBUTE_OVERRIDE); ColumnAnnotation columnResource = attributeOverrideResource.getColumn(); assertEquals("FOO", columnResource.getName()); column.setSpecifiedName(null); - attributeOverrideResource = (AttributeOverrideAnnotation) typeResource.getAnnotation(JPA.ATTRIBUTE_OVERRIDE); + attributeOverrideResource = (AttributeOverrideAnnotation) resourceType.getAnnotation(0, JPA.ATTRIBUTE_OVERRIDE); assertNull(attributeOverrideResource.getColumn()); assertNotNull(specifiedAttributeOverride.getColumn()); } @@ -173,17 +174,17 @@ public class JavaAttributeOverrideTests extends ContextModelTestCase Entity entity = getJavaEntity(); AttributeOverrideContainer overrideContainer = entity.getAttributeOverrideContainer(); assertEquals("AnnotationTestTypeChild", entity.getName()); - assertEquals(2, overrideContainer.virtualOverridesSize()); + assertEquals(2, overrideContainer.getVirtualOverridesSize()); - ReadOnlyAttributeOverride attributeOverride = overrideContainer.virtualOverrides().next(); + ReadOnlyAttributeOverride attributeOverride = overrideContainer.getVirtualOverrides().iterator().next(); assertEquals("id", attributeOverride.getColumn().getDefaultName()); - JavaPersistentType mappedSuperclass = CollectionTools.list(getPersistenceUnit().specifiedClassRefs()).get(1).getJavaPersistentType(); + JavaPersistentType mappedSuperclass = CollectionTools.list(getPersistenceUnit().getSpecifiedClassRefs()).get(1).getJavaPersistentType(); BasicMapping basicMapping = (BasicMapping) mappedSuperclass.getAttributeNamed("id").getMapping(); basicMapping.getColumn().setSpecifiedName("FOO"); - attributeOverride = overrideContainer.virtualOverrides().next(); + attributeOverride = overrideContainer.getVirtualOverrides().iterator().next(); assertEquals("FOO", attributeOverride.getColumn().getDefaultName()); } @@ -196,17 +197,17 @@ public class JavaAttributeOverrideTests extends ContextModelTestCase Entity entity = getJavaEntity(); AttributeOverrideContainer overrideContainer = entity.getAttributeOverrideContainer(); assertEquals("AnnotationTestTypeChild", entity.getName()); - assertEquals(2, overrideContainer.virtualOverridesSize()); + assertEquals(2, overrideContainer.getVirtualOverridesSize()); - ReadOnlyAttributeOverride attributeOverride = overrideContainer.virtualOverrides().next(); + ReadOnlyAttributeOverride attributeOverride = overrideContainer.getVirtualOverrides().iterator().next(); assertEquals("AnnotationTestTypeChild", attributeOverride.getColumn().getDefaultTable()); - JavaPersistentType mappedSuperclass = CollectionTools.list(getPersistenceUnit().specifiedClassRefs()).get(1).getJavaPersistentType(); + JavaPersistentType mappedSuperclass = CollectionTools.list(getPersistenceUnit().getSpecifiedClassRefs()).get(1).getJavaPersistentType(); BasicMapping basicMapping = (BasicMapping) mappedSuperclass.getAttributeNamed("id").getMapping(); basicMapping.getColumn().setSpecifiedTable("BAR"); - attributeOverride = overrideContainer.virtualOverrides().next(); + attributeOverride = overrideContainer.getVirtualOverrides().iterator().next(); assertEquals("BAR", attributeOverride.getColumn().getDefaultTable()); } @@ -219,9 +220,9 @@ public class JavaAttributeOverrideTests extends ContextModelTestCase Entity entity = getJavaEntity(); AttributeOverrideContainer overrideContainer = entity.getAttributeOverrideContainer(); assertEquals("AnnotationTestTypeChild", entity.getName()); - assertEquals(2, overrideContainer.virtualOverridesSize()); + assertEquals(2, overrideContainer.getVirtualOverridesSize()); - ReadOnlyAttributeOverride attributeOverride = overrideContainer.virtualOverrides().next(); + ReadOnlyAttributeOverride attributeOverride = overrideContainer.getVirtualOverrides().iterator().next(); assertEquals("id", attributeOverride.getName()); } @@ -234,9 +235,9 @@ public class JavaAttributeOverrideTests extends ContextModelTestCase Entity entity = getJavaEntity(); AttributeOverrideContainer overrideContainer = entity.getAttributeOverrideContainer(); assertEquals("AnnotationTestTypeChild", entity.getName()); - assertEquals(2, overrideContainer.virtualOverridesSize()); + assertEquals(2, overrideContainer.getVirtualOverridesSize()); - ReadOnlyAttributeOverride attributeOverride = overrideContainer.virtualOverrides().next(); + ReadOnlyAttributeOverride attributeOverride = overrideContainer.getVirtualOverrides().iterator().next(); assertTrue(attributeOverride.isVirtual()); } @@ -247,14 +248,14 @@ public class JavaAttributeOverrideTests extends ContextModelTestCase addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); JavaAttributeOverrideContainer overrideContainer = getJavaEntity().getAttributeOverrideContainer(); - JavaVirtualAttributeOverride attributeOverride = overrideContainer.virtualOverrides().next(); + JavaVirtualAttributeOverride attributeOverride = overrideContainer.getVirtualOverrides().iterator().next(); attributeOverride.convertToSpecified().getColumn().setSpecifiedName("FOO"); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(PACKAGE_NAME + ".AnnotationTestTypeChild"); - AttributeOverrideAnnotation attributeOverrideResource = (AttributeOverrideAnnotation) typeResource.getAnnotation(JPA.ATTRIBUTE_OVERRIDE); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(PACKAGE_NAME + ".AnnotationTestTypeChild", Kind.TYPE); + AttributeOverrideAnnotation attributeOverrideResource = (AttributeOverrideAnnotation) resourceType.getAnnotation(0, JPA.ATTRIBUTE_OVERRIDE); assertEquals("FOO", attributeOverrideResource.getColumn().getName()); - assertEquals("FOO", overrideContainer.specifiedOverrides().next().getColumn().getSpecifiedName()); + assertEquals("FOO", overrideContainer.getSpecifiedOverrides().iterator().next().getColumn().getSpecifiedName()); } } diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaBasicMappingTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaBasicMappingTests.java index b7dd1d28b7..103d128b80 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaBasicMappingTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaBasicMappingTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2010 Oracle. All rights reserved. + * Copyright (c) 2007, 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. @@ -11,6 +11,10 @@ package org.eclipse.jpt.jpa.core.tests.internal.context.java; import java.util.Iterator; import org.eclipse.jdt.core.ICompilationUnit; +import org.eclipse.jpt.common.core.resource.java.JavaResourceField; +import org.eclipse.jpt.common.core.resource.java.JavaResourceMethod; +import org.eclipse.jpt.common.core.resource.java.JavaResourceType; +import org.eclipse.jpt.common.core.resource.java.JavaResourceAnnotatedElement.Kind; import org.eclipse.jpt.common.utility.internal.iterables.EmptyIterable; import org.eclipse.jpt.common.utility.internal.iterators.ArrayIterator; import org.eclipse.jpt.jpa.core.JptJpaCorePlugin; @@ -40,8 +44,6 @@ import org.eclipse.jpt.jpa.core.resource.java.EmbeddedIdAnnotation; import org.eclipse.jpt.jpa.core.resource.java.EnumeratedAnnotation; 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.LobAnnotation; import org.eclipse.jpt.jpa.core.resource.java.ManyToOneAnnotation; import org.eclipse.jpt.jpa.core.resource.java.OneToOneAnnotation; @@ -166,7 +168,7 @@ public class JavaBasicMappingTests extends ContextModelTestCase createTestEntity(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); BasicMapping basicMapping = (BasicMapping) persistentAttribute.getMapping(); assertEquals(FetchType.EAGER, basicMapping.getDefaultFetch()); } @@ -175,7 +177,7 @@ public class JavaBasicMappingTests extends ContextModelTestCase createTestEntityWithBasicMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); BasicMapping basicMapping = (BasicMapping) persistentAttribute.getMapping(); assertEquals(FetchType.EAGER, basicMapping.getDefaultFetch()); } @@ -184,7 +186,7 @@ public class JavaBasicMappingTests extends ContextModelTestCase createTestEntityWithBasicMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); BasicMapping basicMapping = (BasicMapping) persistentAttribute.getMapping(); assertEquals(FetchType.EAGER, basicMapping.getFetch()); @@ -197,15 +199,15 @@ public class JavaBasicMappingTests extends ContextModelTestCase createTestEntityWithBasicMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); BasicMapping basicMapping = (BasicMapping) persistentAttribute.getMapping(); assertNull(basicMapping.getSpecifiedFetch()); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - BasicAnnotation basic = (BasicAnnotation) attributeResource.getAnnotation(JPA.BASIC); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + BasicAnnotation basic = (BasicAnnotation) resourceField.getAnnotation(JPA.BASIC); basic.setFetch(org.eclipse.jpt.jpa.core.resource.java.FetchType.LAZY); getJpaProject().synchronizeContextModel(); @@ -216,7 +218,7 @@ public class JavaBasicMappingTests extends ContextModelTestCase createTestEntityWithBasicMappingFetchOptionalSpecified(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); BasicMapping basicMapping = (BasicMapping) persistentAttribute.getMapping(); assertEquals(FetchType.EAGER, basicMapping.getSpecifiedFetch()); @@ -226,20 +228,20 @@ public class JavaBasicMappingTests extends ContextModelTestCase createTestEntityWithBasicMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); BasicMapping basicMapping = (BasicMapping) persistentAttribute.getMapping(); assertNull(basicMapping.getSpecifiedFetch()); basicMapping.setSpecifiedFetch(FetchType.LAZY); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - BasicAnnotation basic = (BasicAnnotation) attributeResource.getAnnotation(JPA.BASIC); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + BasicAnnotation basic = (BasicAnnotation) resourceField.getAnnotation(JPA.BASIC); assertEquals(org.eclipse.jpt.jpa.core.resource.java.FetchType.LAZY, basic.getFetch()); basicMapping.setSpecifiedFetch(null); - assertNotNull(attributeResource.getAnnotation(JPA.BASIC)); + assertNotNull(resourceField.getAnnotation(JPA.BASIC)); } public void testSetSpecifiedFetch2() throws Exception { @@ -248,16 +250,16 @@ public class JavaBasicMappingTests extends ContextModelTestCase createOrmXmlFile(); getEntityMappings().getPersistenceUnitMetadata().getPersistenceUnitDefaults().setAccess(AccessType.PROPERTY); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); BasicMapping basicMapping = (BasicMapping) persistentAttribute.getMapping(); assertNull(basicMapping.getSpecifiedFetch()); assertTrue(basicMapping.isDefault()); basicMapping.setSpecifiedFetch(FetchType.LAZY); - JavaResourcePersistentType resourceType = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute resourceAttribute = resourceType.persistableProperties().next(); - BasicAnnotation basic = (BasicAnnotation) resourceAttribute.getAnnotation(JPA.BASIC); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceMethod resourceMethod = resourceType.getMethods().iterator().next(); + BasicAnnotation basic = (BasicAnnotation) resourceMethod.getAnnotation(JPA.BASIC); assertEquals(org.eclipse.jpt.jpa.core.resource.java.FetchType.LAZY, basic.getFetch()); @@ -266,7 +268,7 @@ public class JavaBasicMappingTests extends ContextModelTestCase assertFalse(basicMapping.isDefault()); basicMapping.setSpecifiedFetch(null); - assertNotNull(resourceAttribute.getAnnotation(JPA.BASIC)); + assertNotNull(resourceMethod.getAnnotation(JPA.BASIC)); basicMapping = (BasicMapping) persistentAttribute.getMapping(); assertFalse(basicMapping.isDefault()); @@ -283,17 +285,17 @@ public class JavaBasicMappingTests extends ContextModelTestCase createTestEntityWithBasicMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); BasicMapping basicMapping = (BasicMapping) persistentAttribute.getMapping(); - 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(); assertFalse(basicMapping.isDefault()); basicMapping.getColumn().setSpecifiedName("FOO"); - attributeResource.addAnnotation(TemporalAnnotation.ANNOTATION_NAME); - attributeResource.addAnnotation(LobAnnotation.ANNOTATION_NAME); - attributeResource.addAnnotation(EnumeratedAnnotation.ANNOTATION_NAME); + resourceField.addAnnotation(TemporalAnnotation.ANNOTATION_NAME); + resourceField.addAnnotation(LobAnnotation.ANNOTATION_NAME); + resourceField.addAnnotation(EnumeratedAnnotation.ANNOTATION_NAME); assertFalse(basicMapping.isDefault()); @@ -305,26 +307,26 @@ public class JavaBasicMappingTests extends ContextModelTestCase assertTrue(basicMapping.isDefault()); assertEquals("FOO", basicMapping.getColumn().getSpecifiedName()); - assertNotNull(attributeResource.getAnnotation(ColumnAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getAnnotation(TemporalAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getAnnotation(LobAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getAnnotation(EnumeratedAnnotation.ANNOTATION_NAME)); + assertNotNull(resourceField.getAnnotation(ColumnAnnotation.ANNOTATION_NAME)); + assertNotNull(resourceField.getAnnotation(TemporalAnnotation.ANNOTATION_NAME)); + assertNotNull(resourceField.getAnnotation(LobAnnotation.ANNOTATION_NAME)); + assertNotNull(resourceField.getAnnotation(EnumeratedAnnotation.ANNOTATION_NAME)); } public void testBasicMorphToDefaultBasic() throws Exception { createTestEntityWithBasicMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); BasicMapping basicMapping = (BasicMapping) persistentAttribute.getMapping(); - 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(); assertFalse(basicMapping.isDefault()); basicMapping.getColumn().setSpecifiedName("FOO"); basicMapping.setConverter(EnumeratedConverter.class); ((EnumeratedConverter) basicMapping.getConverter()).setSpecifiedEnumType(EnumType.STRING); - attributeResource.addAnnotation(LobAnnotation.ANNOTATION_NAME); - attributeResource.addAnnotation(TemporalAnnotation.ANNOTATION_NAME); + resourceField.addAnnotation(LobAnnotation.ANNOTATION_NAME); + resourceField.addAnnotation(TemporalAnnotation.ANNOTATION_NAME); basicMapping.setSpecifiedFetch(FetchType.EAGER); basicMapping.setSpecifiedOptional(Boolean.FALSE); assertFalse(basicMapping.isDefault()); @@ -335,27 +337,27 @@ public class JavaBasicMappingTests extends ContextModelTestCase assertNull(((BasicMapping) persistentAttribute.getMapping()).getSpecifiedFetch()); assertNull(((BasicMapping) persistentAttribute.getMapping()).getSpecifiedOptional()); - assertNull(attributeResource.getAnnotation(BasicAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getAnnotation(ColumnAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getAnnotation(TemporalAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getAnnotation(LobAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getAnnotation(EnumeratedAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(BasicAnnotation.ANNOTATION_NAME)); + assertNotNull(resourceField.getAnnotation(ColumnAnnotation.ANNOTATION_NAME)); + assertNotNull(resourceField.getAnnotation(TemporalAnnotation.ANNOTATION_NAME)); + assertNotNull(resourceField.getAnnotation(LobAnnotation.ANNOTATION_NAME)); + assertNotNull(resourceField.getAnnotation(EnumeratedAnnotation.ANNOTATION_NAME)); } public void testBasicMorphToId() throws Exception { createTestEntityWithBasicMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); BasicMapping basicMapping = (BasicMapping) persistentAttribute.getMapping(); - 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(); assertFalse(basicMapping.isDefault()); basicMapping.getColumn().setSpecifiedName("FOO"); basicMapping.setConverter(TemporalConverter.class); ((TemporalConverter) basicMapping.getConverter()).setTemporalType(TemporalType.TIME); - attributeResource.addAnnotation(LobAnnotation.ANNOTATION_NAME); - attributeResource.addAnnotation(EnumeratedAnnotation.ANNOTATION_NAME); + resourceField.addAnnotation(LobAnnotation.ANNOTATION_NAME); + resourceField.addAnnotation(EnumeratedAnnotation.ANNOTATION_NAME); basicMapping.setSpecifiedFetch(FetchType.EAGER); basicMapping.setSpecifiedOptional(Boolean.FALSE); assertFalse(basicMapping.isDefault()); @@ -364,133 +366,133 @@ public class JavaBasicMappingTests extends ContextModelTestCase assertEquals("FOO", ((IdMapping) persistentAttribute.getMapping()).getColumn().getSpecifiedName()); assertEquals(TemporalType.TIME, ((TemporalConverter) ((IdMapping) persistentAttribute.getMapping()).getConverter()).getTemporalType()); - assertNull(attributeResource.getAnnotation(BasicAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getAnnotation(IdAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getAnnotation(ColumnAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getAnnotation(TemporalAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(LobAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(EnumeratedAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(BasicAnnotation.ANNOTATION_NAME)); + assertNotNull(resourceField.getAnnotation(IdAnnotation.ANNOTATION_NAME)); + assertNotNull(resourceField.getAnnotation(ColumnAnnotation.ANNOTATION_NAME)); + assertNotNull(resourceField.getAnnotation(TemporalAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(LobAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(EnumeratedAnnotation.ANNOTATION_NAME)); } public void testBasicMorphToVersion() throws Exception { createTestEntityWithBasicMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); BasicMapping basicMapping = (BasicMapping) persistentAttribute.getMapping(); - 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(); assertFalse(basicMapping.isDefault()); basicMapping.getColumn().setSpecifiedName("FOO"); basicMapping.setConverter(TemporalConverter.class); ((TemporalConverter) basicMapping.getConverter()).setTemporalType(TemporalType.TIME); - attributeResource.addAnnotation(LobAnnotation.ANNOTATION_NAME); - attributeResource.addAnnotation(EnumeratedAnnotation.ANNOTATION_NAME); + resourceField.addAnnotation(LobAnnotation.ANNOTATION_NAME); + resourceField.addAnnotation(EnumeratedAnnotation.ANNOTATION_NAME); assertFalse(basicMapping.isDefault()); persistentAttribute.setMappingKey(MappingKeys.VERSION_ATTRIBUTE_MAPPING_KEY); assertEquals("FOO", ((VersionMapping) persistentAttribute.getMapping()).getColumn().getSpecifiedName()); assertEquals(TemporalType.TIME, ((TemporalConverter) ((VersionMapping) persistentAttribute.getMapping()).getConverter()).getTemporalType()); - assertNull(attributeResource.getAnnotation(BasicAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getAnnotation(VersionAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getAnnotation(ColumnAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getAnnotation(TemporalAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(LobAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(EnumeratedAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(BasicAnnotation.ANNOTATION_NAME)); + assertNotNull(resourceField.getAnnotation(VersionAnnotation.ANNOTATION_NAME)); + assertNotNull(resourceField.getAnnotation(ColumnAnnotation.ANNOTATION_NAME)); + assertNotNull(resourceField.getAnnotation(TemporalAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(LobAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(EnumeratedAnnotation.ANNOTATION_NAME)); } public void testBasicMorphToEmbedded() throws Exception { createTestEntityWithBasicMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); BasicMapping basicMapping = (BasicMapping) persistentAttribute.getMapping(); - 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(); assertFalse(basicMapping.isDefault()); basicMapping.getColumn().setSpecifiedName("FOO"); - attributeResource.addAnnotation(TemporalAnnotation.ANNOTATION_NAME); - attributeResource.addAnnotation(LobAnnotation.ANNOTATION_NAME); - attributeResource.addAnnotation(EnumeratedAnnotation.ANNOTATION_NAME); + resourceField.addAnnotation(TemporalAnnotation.ANNOTATION_NAME); + resourceField.addAnnotation(LobAnnotation.ANNOTATION_NAME); + resourceField.addAnnotation(EnumeratedAnnotation.ANNOTATION_NAME); assertFalse(basicMapping.isDefault()); persistentAttribute.setMappingKey(MappingKeys.EMBEDDED_ATTRIBUTE_MAPPING_KEY); assertTrue(persistentAttribute.getMapping() instanceof EmbeddedMapping); - assertNull(attributeResource.getAnnotation(BasicAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getAnnotation(EmbeddedAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(ColumnAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(TemporalAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(LobAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(EnumeratedAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(BasicAnnotation.ANNOTATION_NAME)); + assertNotNull(resourceField.getAnnotation(EmbeddedAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(ColumnAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(TemporalAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(LobAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(EnumeratedAnnotation.ANNOTATION_NAME)); } public void testBasicMorphToEmbeddedId() throws Exception { createTestEntityWithBasicMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); BasicMapping basicMapping = (BasicMapping) persistentAttribute.getMapping(); - 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(); assertFalse(basicMapping.isDefault()); basicMapping.getColumn().setSpecifiedName("FOO"); - attributeResource.addAnnotation(TemporalAnnotation.ANNOTATION_NAME); - attributeResource.addAnnotation(LobAnnotation.ANNOTATION_NAME); - attributeResource.addAnnotation(EnumeratedAnnotation.ANNOTATION_NAME); + resourceField.addAnnotation(TemporalAnnotation.ANNOTATION_NAME); + resourceField.addAnnotation(LobAnnotation.ANNOTATION_NAME); + resourceField.addAnnotation(EnumeratedAnnotation.ANNOTATION_NAME); assertFalse(basicMapping.isDefault()); persistentAttribute.setMappingKey(MappingKeys.EMBEDDED_ID_ATTRIBUTE_MAPPING_KEY); assertTrue(persistentAttribute.getMapping() instanceof EmbeddedIdMapping); - assertNull(attributeResource.getAnnotation(BasicAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getAnnotation(EmbeddedIdAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(ColumnAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(TemporalAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(LobAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(EnumeratedAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(BasicAnnotation.ANNOTATION_NAME)); + assertNotNull(resourceField.getAnnotation(EmbeddedIdAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(ColumnAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(TemporalAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(LobAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(EnumeratedAnnotation.ANNOTATION_NAME)); } public void testBasicMorphToTransient() throws Exception { createTestEntityWithBasicMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); BasicMapping basicMapping = (BasicMapping) persistentAttribute.getMapping(); - 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(); assertFalse(basicMapping.isDefault()); basicMapping.getColumn().setSpecifiedName("FOO"); - attributeResource.addAnnotation(TemporalAnnotation.ANNOTATION_NAME); - attributeResource.addAnnotation(LobAnnotation.ANNOTATION_NAME); - attributeResource.addAnnotation(EnumeratedAnnotation.ANNOTATION_NAME); + resourceField.addAnnotation(TemporalAnnotation.ANNOTATION_NAME); + resourceField.addAnnotation(LobAnnotation.ANNOTATION_NAME); + resourceField.addAnnotation(EnumeratedAnnotation.ANNOTATION_NAME); assertFalse(basicMapping.isDefault()); persistentAttribute.setMappingKey(MappingKeys.TRANSIENT_ATTRIBUTE_MAPPING_KEY); assertTrue(persistentAttribute.getMapping() instanceof TransientMapping); - assertNull(attributeResource.getAnnotation(BasicAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getAnnotation(TransientAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(ColumnAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(TemporalAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(LobAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(EnumeratedAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(BasicAnnotation.ANNOTATION_NAME)); + assertNotNull(resourceField.getAnnotation(TransientAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(ColumnAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(TemporalAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(LobAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(EnumeratedAnnotation.ANNOTATION_NAME)); } public void testBasicMorphToOneToOne() throws Exception { createTestEntityWithBasicMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); BasicMapping basicMapping = (BasicMapping) persistentAttribute.getMapping(); - 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(); assertFalse(basicMapping.isDefault()); basicMapping.getColumn().setSpecifiedName("FOO"); - attributeResource.addAnnotation(TemporalAnnotation.ANNOTATION_NAME); - attributeResource.addAnnotation(LobAnnotation.ANNOTATION_NAME); - attributeResource.addAnnotation(EnumeratedAnnotation.ANNOTATION_NAME); + resourceField.addAnnotation(TemporalAnnotation.ANNOTATION_NAME); + resourceField.addAnnotation(LobAnnotation.ANNOTATION_NAME); + resourceField.addAnnotation(EnumeratedAnnotation.ANNOTATION_NAME); basicMapping.setSpecifiedFetch(FetchType.EAGER); basicMapping.setSpecifiedOptional(Boolean.FALSE); assertFalse(basicMapping.isDefault()); @@ -500,27 +502,27 @@ public class JavaBasicMappingTests extends ContextModelTestCase //TODO assertEquals(FetchType.EAGER, ((IOneToOneMapping) persistentAttribute.getMapping()).getSpecifiedFetch()); // assertEquals(Boolean.FALSE, ((IOneToOneMapping) persistentAttribute.getMapping()).getSpecifiedOptional()); - assertNotNull(attributeResource.getAnnotation(OneToOneAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(BasicAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(ColumnAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(TemporalAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(LobAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(EnumeratedAnnotation.ANNOTATION_NAME)); + assertNotNull(resourceField.getAnnotation(OneToOneAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(BasicAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(ColumnAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(TemporalAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(LobAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(EnumeratedAnnotation.ANNOTATION_NAME)); } public void testBasicMorphToOneToMany() throws Exception { createTestEntityWithBasicMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); BasicMapping basicMapping = (BasicMapping) persistentAttribute.getMapping(); - 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(); assertFalse(basicMapping.isDefault()); basicMapping.getColumn().setSpecifiedName("FOO"); - attributeResource.addAnnotation(TemporalAnnotation.ANNOTATION_NAME); - attributeResource.addAnnotation(LobAnnotation.ANNOTATION_NAME); - attributeResource.addAnnotation(EnumeratedAnnotation.ANNOTATION_NAME); + resourceField.addAnnotation(TemporalAnnotation.ANNOTATION_NAME); + resourceField.addAnnotation(LobAnnotation.ANNOTATION_NAME); + resourceField.addAnnotation(EnumeratedAnnotation.ANNOTATION_NAME); basicMapping.setSpecifiedFetch(FetchType.EAGER); basicMapping.setSpecifiedOptional(Boolean.FALSE); assertFalse(basicMapping.isDefault()); @@ -529,26 +531,26 @@ public class JavaBasicMappingTests extends ContextModelTestCase assertTrue(persistentAttribute.getMapping() instanceof OneToManyMapping); //TODO assertEquals(FetchType.EAGER, ((IOneToManyMapping) persistentAttribute.getMapping()).getSpecifiedFetch()); -// assertNotNull(attributeResource.mappingAnnotation(OneToMany.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(BasicAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(ColumnAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(TemporalAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(LobAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(EnumeratedAnnotation.ANNOTATION_NAME)); +// assertNotNull(resourceField.mappingAnnotation(OneToMany.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(BasicAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(ColumnAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(TemporalAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(LobAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(EnumeratedAnnotation.ANNOTATION_NAME)); } public void testBasicMorphToManyToOne() throws Exception { createTestEntityWithBasicMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); BasicMapping basicMapping = (BasicMapping) persistentAttribute.getMapping(); - 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(); assertFalse(basicMapping.isDefault()); basicMapping.getColumn().setSpecifiedName("FOO"); - attributeResource.addAnnotation(TemporalAnnotation.ANNOTATION_NAME); - attributeResource.addAnnotation(LobAnnotation.ANNOTATION_NAME); - attributeResource.addAnnotation(EnumeratedAnnotation.ANNOTATION_NAME); + resourceField.addAnnotation(TemporalAnnotation.ANNOTATION_NAME); + resourceField.addAnnotation(LobAnnotation.ANNOTATION_NAME); + resourceField.addAnnotation(EnumeratedAnnotation.ANNOTATION_NAME); basicMapping.setSpecifiedFetch(FetchType.EAGER); basicMapping.setSpecifiedOptional(Boolean.FALSE); assertFalse(basicMapping.isDefault()); @@ -558,27 +560,27 @@ public class JavaBasicMappingTests extends ContextModelTestCase //TODO assertEquals(FetchType.EAGER, ((IManyToOneMapping) persistentAttribute.getMapping()).getSpecifiedFetch()); // assertEquals(Boolean.FALSE, ((IManyToOneMapping) persistentAttribute.getMapping()).getSpecifiedOptional()); - assertNotNull(attributeResource.getAnnotation(ManyToOneAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(BasicAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(ColumnAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(TemporalAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(LobAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(EnumeratedAnnotation.ANNOTATION_NAME)); + assertNotNull(resourceField.getAnnotation(ManyToOneAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(BasicAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(ColumnAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(TemporalAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(LobAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(EnumeratedAnnotation.ANNOTATION_NAME)); } public void testBasicMorphToManyToMany() throws Exception { createTestEntityWithBasicMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); BasicMapping basicMapping = (BasicMapping) persistentAttribute.getMapping(); - 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(); assertFalse(basicMapping.isDefault()); basicMapping.getColumn().setSpecifiedName("FOO"); - attributeResource.addAnnotation(TemporalAnnotation.ANNOTATION_NAME); - attributeResource.addAnnotation(LobAnnotation.ANNOTATION_NAME); - attributeResource.addAnnotation(EnumeratedAnnotation.ANNOTATION_NAME); + resourceField.addAnnotation(TemporalAnnotation.ANNOTATION_NAME); + resourceField.addAnnotation(LobAnnotation.ANNOTATION_NAME); + resourceField.addAnnotation(EnumeratedAnnotation.ANNOTATION_NAME); basicMapping.setSpecifiedFetch(FetchType.EAGER); basicMapping.setSpecifiedOptional(Boolean.FALSE); assertFalse(basicMapping.isDefault()); @@ -587,19 +589,19 @@ public class JavaBasicMappingTests extends ContextModelTestCase assertTrue(persistentAttribute.getMapping() instanceof ManyToManyMapping); //TODO assertEquals(FetchType.EAGER, ((IManyToManyMapping) persistentAttribute.getMapping()).getSpecifiedFetch()); -// assertNotNull(attributeResource.mappingAnnotation(ManyToMany.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(BasicAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(ColumnAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(TemporalAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(LobAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(EnumeratedAnnotation.ANNOTATION_NAME)); +// assertNotNull(resourceField.mappingAnnotation(ManyToMany.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(BasicAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(ColumnAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(TemporalAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(LobAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(EnumeratedAnnotation.ANNOTATION_NAME)); } public void testDefaultBasicGetDefaultOptional() throws Exception { createTestEntity(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); BasicMapping basicMapping = (BasicMapping) persistentAttribute.getMapping(); assertEquals(true, basicMapping.isDefaultOptional()); } @@ -608,7 +610,7 @@ public class JavaBasicMappingTests extends ContextModelTestCase createTestEntityWithBasicMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); BasicMapping basicMapping = (BasicMapping) persistentAttribute.getMapping(); assertEquals(true, basicMapping.isDefaultOptional()); } @@ -617,7 +619,7 @@ public class JavaBasicMappingTests extends ContextModelTestCase createTestEntityWithBasicMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); BasicMapping basicMapping = (BasicMapping) persistentAttribute.getMapping(); assertEquals(true, basicMapping.isOptional()); @@ -630,15 +632,15 @@ public class JavaBasicMappingTests extends ContextModelTestCase createTestEntityWithBasicMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); BasicMapping basicMapping = (BasicMapping) persistentAttribute.getMapping(); assertNull(basicMapping.getSpecifiedOptional()); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - BasicAnnotation basic = (BasicAnnotation) attributeResource.getAnnotation(JPA.BASIC); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + BasicAnnotation basic = (BasicAnnotation) resourceField.getAnnotation(JPA.BASIC); basic.setOptional(Boolean.FALSE); getJpaProject().synchronizeContextModel(); @@ -649,7 +651,7 @@ public class JavaBasicMappingTests extends ContextModelTestCase createTestEntityWithBasicMappingFetchOptionalSpecified(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); BasicMapping basicMapping = (BasicMapping) persistentAttribute.getMapping(); assertEquals(Boolean.FALSE, basicMapping.getSpecifiedOptional()); @@ -659,36 +661,36 @@ public class JavaBasicMappingTests extends ContextModelTestCase createTestEntityWithBasicMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); BasicMapping basicMapping = (BasicMapping) persistentAttribute.getMapping(); assertNull(basicMapping.getSpecifiedOptional()); basicMapping.setSpecifiedOptional(Boolean.FALSE); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - BasicAnnotation basic = (BasicAnnotation) attributeResource.getAnnotation(JPA.BASIC); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + BasicAnnotation basic = (BasicAnnotation) resourceField.getAnnotation(JPA.BASIC); assertEquals(Boolean.FALSE, basic.getOptional()); basicMapping.setSpecifiedOptional(null); - assertNotNull(attributeResource.getAnnotation(JPA.BASIC)); + assertNotNull(resourceField.getAnnotation(JPA.BASIC)); } public void testSetSpecifiedOptional2() throws Exception { createTestEntity(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); BasicMapping basicMapping = (BasicMapping) persistentAttribute.getMapping(); assertNull(basicMapping.getSpecifiedOptional()); assertTrue(basicMapping.isDefault()); basicMapping.setSpecifiedOptional(Boolean.TRUE); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - BasicAnnotation basic = (BasicAnnotation) attributeResource.getAnnotation(JPA.BASIC); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + BasicAnnotation basic = (BasicAnnotation) resourceField.getAnnotation(JPA.BASIC); assertEquals(Boolean.TRUE, basic.getOptional()); @@ -697,7 +699,7 @@ public class JavaBasicMappingTests extends ContextModelTestCase assertFalse(basicMapping.isDefault()); basicMapping.setSpecifiedOptional(null); - assertNotNull(attributeResource.getAnnotation(JPA.BASIC)); + assertNotNull(resourceField.getAnnotation(JPA.BASIC)); basicMapping = (BasicMapping) persistentAttribute.getMapping(); assertFalse(basicMapping.isDefault()); @@ -708,15 +710,15 @@ public class JavaBasicMappingTests extends ContextModelTestCase createTestEntityWithBasicMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); BasicMapping basicMapping = (BasicMapping) persistentAttribute.getMapping(); assertNull(basicMapping.getSpecifiedOptional()); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - BasicAnnotation basic = (BasicAnnotation) attributeResource.getAnnotation(JPA.BASIC); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + BasicAnnotation basic = (BasicAnnotation) resourceField.getAnnotation(JPA.BASIC); basic.setOptional(Boolean.FALSE); getJpaProject().synchronizeContextModel(); @@ -729,7 +731,7 @@ public class JavaBasicMappingTests extends ContextModelTestCase assertSame(basicMapping, persistentAttribute.getMapping()); basic.setOptional(Boolean.FALSE); - attributeResource.setPrimaryAnnotation(null, EmptyIterable.instance()); + resourceField.setPrimaryAnnotation(null, EmptyIterable.instance()); getJpaProject().synchronizeContextModel(); assertTrue(persistentAttribute.getMapping().isDefault()); @@ -741,7 +743,7 @@ public class JavaBasicMappingTests extends ContextModelTestCase createTestEntityWithBasicMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); BasicMapping basicMapping = (BasicMapping) persistentAttribute.getMapping(); assertFalse(basicMapping.getConverter().getType() == LobConverter.class); @@ -751,7 +753,7 @@ public class JavaBasicMappingTests extends ContextModelTestCase createTestEntityWithLob(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); BasicMapping basicMapping = (BasicMapping) persistentAttribute.getMapping(); assertTrue(basicMapping.getConverter().getType() == LobConverter.class); @@ -761,36 +763,36 @@ public class JavaBasicMappingTests extends ContextModelTestCase createTestEntityWithBasicMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); BasicMapping basicMapping = (BasicMapping) persistentAttribute.getMapping(); basicMapping.setConverter(LobConverter.class); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - assertNotNull(attributeResource.getAnnotation(LobAnnotation.ANNOTATION_NAME)); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + assertNotNull(resourceField.getAnnotation(LobAnnotation.ANNOTATION_NAME)); basicMapping.setConverter(null); - assertNull(attributeResource.getAnnotation(LobAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(LobAnnotation.ANNOTATION_NAME)); } public void testIsLobUpdatesFromResourceModelChange() throws Exception { createTestEntityWithBasicMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); BasicMapping basicMapping = (BasicMapping) persistentAttribute.getMapping(); assertFalse(basicMapping.getConverter().getType() == LobConverter.class); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - attributeResource.addAnnotation(LobAnnotation.ANNOTATION_NAME); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + resourceField.addAnnotation(LobAnnotation.ANNOTATION_NAME); getJpaProject().synchronizeContextModel(); assertTrue(basicMapping.getConverter().getType() == LobConverter.class); - attributeResource.removeAnnotation(LobAnnotation.ANNOTATION_NAME); + resourceField.removeAnnotation(LobAnnotation.ANNOTATION_NAME); getJpaProject().synchronizeContextModel(); assertFalse(basicMapping.getConverter().getType() == LobConverter.class); @@ -800,7 +802,7 @@ public class JavaBasicMappingTests extends ContextModelTestCase createTestEntity(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); BasicMapping basicMapping = (BasicMapping) persistentAttribute.getMapping(); assertNull(basicMapping.getConverter().getType()); } @@ -809,7 +811,7 @@ public class JavaBasicMappingTests extends ContextModelTestCase createTestEntityWithBasicMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); BasicMapping basicMapping = (BasicMapping) persistentAttribute.getMapping(); assertNull(basicMapping.getConverter().getType()); } @@ -818,14 +820,14 @@ public class JavaBasicMappingTests extends ContextModelTestCase createTestEntityWithBasicMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); BasicMapping basicMapping = (BasicMapping) persistentAttribute.getMapping(); assertNull(basicMapping.getConverter().getType()); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - EnumeratedAnnotation enumeratedAnnotation = (EnumeratedAnnotation) attributeResource.addAnnotation(EnumeratedAnnotation.ANNOTATION_NAME); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + EnumeratedAnnotation enumeratedAnnotation = (EnumeratedAnnotation) resourceField.addAnnotation(EnumeratedAnnotation.ANNOTATION_NAME); getJpaProject().synchronizeContextModel(); assertEquals(EnumType.ORDINAL, ((EnumeratedConverter) basicMapping.getConverter()).getDefaultEnumType()); @@ -838,7 +840,7 @@ public class JavaBasicMappingTests extends ContextModelTestCase createTestEntityWithEnumerated(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); BasicMapping basicMapping = (BasicMapping) persistentAttribute.getMapping(); assertEquals(EnumType.STRING, ((EnumeratedConverter) basicMapping.getConverter()).getSpecifiedEnumType()); @@ -848,15 +850,15 @@ public class JavaBasicMappingTests extends ContextModelTestCase createTestEntityWithBasicMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); BasicMapping basicMapping = (BasicMapping) persistentAttribute.getMapping(); assertNull(basicMapping.getConverter().getType()); basicMapping.setConverter(EnumeratedConverter.class); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - EnumeratedAnnotation enumerated = (EnumeratedAnnotation) attributeResource.getAnnotation(EnumeratedAnnotation.ANNOTATION_NAME); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + EnumeratedAnnotation enumerated = (EnumeratedAnnotation) resourceField.getAnnotation(EnumeratedAnnotation.ANNOTATION_NAME); assertNotNull(enumerated); assertEquals(null, enumerated.getValue()); @@ -865,26 +867,26 @@ public class JavaBasicMappingTests extends ContextModelTestCase assertEquals(org.eclipse.jpt.jpa.core.resource.java.EnumType.STRING, enumerated.getValue()); ((EnumeratedConverter) basicMapping.getConverter()).setSpecifiedEnumType(null); - assertNotNull(attributeResource.getAnnotation(EnumeratedAnnotation.ANNOTATION_NAME)); + assertNotNull(resourceField.getAnnotation(EnumeratedAnnotation.ANNOTATION_NAME)); assertNull(enumerated.getValue()); basicMapping.setConverter(null); - assertNull(attributeResource.getAnnotation(EnumeratedAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(EnumeratedAnnotation.ANNOTATION_NAME)); } public void testGetSpecifiedEnumeratedUpdatesFromResourceModelChange() throws Exception { createTestEntityWithBasicMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); BasicMapping basicMapping = (BasicMapping) persistentAttribute.getMapping(); assertNull(basicMapping.getConverter().getType()); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - EnumeratedAnnotation enumerated = (EnumeratedAnnotation) attributeResource.addAnnotation(EnumeratedAnnotation.ANNOTATION_NAME); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + EnumeratedAnnotation enumerated = (EnumeratedAnnotation) resourceField.addAnnotation(EnumeratedAnnotation.ANNOTATION_NAME); enumerated.setValue(org.eclipse.jpt.jpa.core.resource.java.EnumType.STRING); getJpaProject().synchronizeContextModel(); @@ -892,7 +894,7 @@ public class JavaBasicMappingTests extends ContextModelTestCase enumerated.setValue(null); getJpaProject().synchronizeContextModel(); - assertNotNull(attributeResource.getAnnotation(EnumeratedAnnotation.ANNOTATION_NAME)); + assertNotNull(resourceField.getAnnotation(EnumeratedAnnotation.ANNOTATION_NAME)); assertNull(((EnumeratedConverter) basicMapping.getConverter()).getSpecifiedEnumType()); assertFalse(basicMapping.isDefault()); assertSame(basicMapping, persistentAttribute.getMapping()); @@ -902,12 +904,12 @@ public class JavaBasicMappingTests extends ContextModelTestCase createTestEntityWithBasicMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - attributeResource.addAnnotation(TemporalAnnotation.ANNOTATION_NAME); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + resourceField.addAnnotation(TemporalAnnotation.ANNOTATION_NAME); getJpaProject().synchronizeContextModel(); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); BasicMapping basicMapping = (BasicMapping) persistentAttribute.getMapping(); assertEquals(TemporalConverter.class, basicMapping.getConverter().getType()); @@ -917,7 +919,7 @@ public class JavaBasicMappingTests extends ContextModelTestCase createTestEntityWithTemporal(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); BasicMapping basicMapping = (BasicMapping) persistentAttribute.getMapping(); assertEquals(TemporalConverter.class, basicMapping.getConverter().getType()); @@ -928,43 +930,43 @@ public class JavaBasicMappingTests extends ContextModelTestCase createTestEntityWithBasicMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); BasicMapping basicMapping = (BasicMapping) persistentAttribute.getMapping(); assertNull(basicMapping.getConverter().getType()); basicMapping.setConverter(TemporalConverter.class); ((TemporalConverter) basicMapping.getConverter()).setTemporalType(TemporalType.TIME); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - TemporalAnnotation temporal = (TemporalAnnotation) attributeResource.getAnnotation(TemporalAnnotation.ANNOTATION_NAME); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + TemporalAnnotation temporal = (TemporalAnnotation) resourceField.getAnnotation(TemporalAnnotation.ANNOTATION_NAME); assertEquals(org.eclipse.jpt.jpa.core.resource.java.TemporalType.TIME, temporal.getValue()); basicMapping.setConverter(null); - assertNull(attributeResource.getAnnotation(TemporalAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(TemporalAnnotation.ANNOTATION_NAME)); } public void testGetTemporalUpdatesFromResourceModelChange() throws Exception { createTestEntityWithBasicMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); BasicMapping basicMapping = (BasicMapping) persistentAttribute.getMapping(); assertNull(basicMapping.getConverter().getType()); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - TemporalAnnotation temporal = (TemporalAnnotation) attributeResource.addAnnotation(TemporalAnnotation.ANNOTATION_NAME); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + TemporalAnnotation temporal = (TemporalAnnotation) resourceField.addAnnotation(TemporalAnnotation.ANNOTATION_NAME); temporal.setValue(org.eclipse.jpt.jpa.core.resource.java.TemporalType.DATE); getJpaProject().synchronizeContextModel(); assertEquals(TemporalConverter.class, basicMapping.getConverter().getType()); assertEquals(TemporalType.DATE, ((TemporalConverter) basicMapping.getConverter()).getTemporalType()); - attributeResource.removeAnnotation(TemporalAnnotation.ANNOTATION_NAME); + resourceField.removeAnnotation(TemporalAnnotation.ANNOTATION_NAME); getJpaProject().synchronizeContextModel(); assertNull(basicMapping.getConverter().getType()); @@ -976,15 +978,15 @@ public class JavaBasicMappingTests extends ContextModelTestCase createTestEntityWithBasicMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); BasicMapping basicMapping = (BasicMapping) persistentAttribute.getMapping(); assertNull(basicMapping.getColumn().getSpecifiedName()); assertEquals("id", basicMapping.getColumn().getName()); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - ColumnAnnotation column = (ColumnAnnotation) attributeResource.addAnnotation(JPA.COLUMN); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + ColumnAnnotation column = (ColumnAnnotation) resourceField.addAnnotation(JPA.COLUMN); column.setName("foo"); getJpaProject().synchronizeContextModel(); diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaCascadeTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaCascadeTests.java index 23634e6659..b2fe6086c3 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaCascadeTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaCascadeTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2010 Oracle. All rights reserved. + * Copyright (c) 2010, 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. @@ -11,13 +11,14 @@ package org.eclipse.jpt.jpa.core.tests.internal.context.java; import java.util.Iterator; import org.eclipse.jdt.core.ICompilationUnit; +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.JavaResourceAnnotatedElement.Kind; import org.eclipse.jpt.common.utility.internal.iterators.ArrayIterator; import org.eclipse.jpt.jpa.core.context.PersistentAttribute; import org.eclipse.jpt.jpa.core.context.java.JavaCascade; import org.eclipse.jpt.jpa.core.context.java.JavaOneToOneMapping; 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.OneToOneAnnotation; import org.eclipse.jpt.jpa.core.tests.internal.context.ContextModelTestCase; @@ -53,11 +54,11 @@ public class JavaCascadeTests createTestEntityWithOneToOneMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - OneToOneAnnotation annotation = (OneToOneAnnotation) attributeResource.getAnnotation(OneToOneAnnotation.ANNOTATION_NAME); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + OneToOneAnnotation annotation = (OneToOneAnnotation) resourceField.getAnnotation(OneToOneAnnotation.ANNOTATION_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); JavaOneToOneMapping mapping = (JavaOneToOneMapping) persistentAttribute.getMapping(); JavaCascade cascade = mapping.getCascade(); @@ -81,11 +82,11 @@ public class JavaCascadeTests createTestEntityWithOneToOneMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - OneToOneAnnotation annotation = (OneToOneAnnotation) attributeResource.getAnnotation(OneToOneAnnotation.ANNOTATION_NAME); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + OneToOneAnnotation annotation = (OneToOneAnnotation) resourceField.getAnnotation(OneToOneAnnotation.ANNOTATION_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); JavaOneToOneMapping mapping = (JavaOneToOneMapping) persistentAttribute.getMapping(); JavaCascade cascade = mapping.getCascade(); @@ -107,11 +108,11 @@ public class JavaCascadeTests createTestEntityWithOneToOneMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - OneToOneAnnotation annotation = (OneToOneAnnotation) attributeResource.getAnnotation(OneToOneAnnotation.ANNOTATION_NAME); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + OneToOneAnnotation annotation = (OneToOneAnnotation) resourceField.getAnnotation(OneToOneAnnotation.ANNOTATION_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); JavaOneToOneMapping mapping = (JavaOneToOneMapping) persistentAttribute.getMapping(); JavaCascade cascade = mapping.getCascade(); @@ -135,11 +136,11 @@ public class JavaCascadeTests createTestEntityWithOneToOneMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - OneToOneAnnotation annotation = (OneToOneAnnotation) attributeResource.getAnnotation(OneToOneAnnotation.ANNOTATION_NAME); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + OneToOneAnnotation annotation = (OneToOneAnnotation) resourceField.getAnnotation(OneToOneAnnotation.ANNOTATION_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); JavaOneToOneMapping mapping = (JavaOneToOneMapping) persistentAttribute.getMapping(); JavaCascade cascade = mapping.getCascade(); @@ -161,11 +162,11 @@ public class JavaCascadeTests createTestEntityWithOneToOneMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - OneToOneAnnotation annotation = (OneToOneAnnotation) attributeResource.getAnnotation(OneToOneAnnotation.ANNOTATION_NAME); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + OneToOneAnnotation annotation = (OneToOneAnnotation) resourceField.getAnnotation(OneToOneAnnotation.ANNOTATION_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); JavaOneToOneMapping mapping = (JavaOneToOneMapping) persistentAttribute.getMapping(); JavaCascade cascade = mapping.getCascade(); @@ -189,11 +190,11 @@ public class JavaCascadeTests createTestEntityWithOneToOneMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - OneToOneAnnotation annotation = (OneToOneAnnotation) attributeResource.getAnnotation(OneToOneAnnotation.ANNOTATION_NAME); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + OneToOneAnnotation annotation = (OneToOneAnnotation) resourceField.getAnnotation(OneToOneAnnotation.ANNOTATION_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); JavaOneToOneMapping mapping = (JavaOneToOneMapping) persistentAttribute.getMapping(); JavaCascade cascade = mapping.getCascade(); @@ -215,11 +216,11 @@ public class JavaCascadeTests createTestEntityWithOneToOneMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - OneToOneAnnotation annotation = (OneToOneAnnotation) attributeResource.getAnnotation(OneToOneAnnotation.ANNOTATION_NAME); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + OneToOneAnnotation annotation = (OneToOneAnnotation) resourceField.getAnnotation(OneToOneAnnotation.ANNOTATION_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); JavaOneToOneMapping mapping = (JavaOneToOneMapping) persistentAttribute.getMapping(); JavaCascade cascade = mapping.getCascade(); @@ -243,11 +244,11 @@ public class JavaCascadeTests createTestEntityWithOneToOneMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - OneToOneAnnotation annotation = (OneToOneAnnotation) attributeResource.getAnnotation(OneToOneAnnotation.ANNOTATION_NAME); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + OneToOneAnnotation annotation = (OneToOneAnnotation) resourceField.getAnnotation(OneToOneAnnotation.ANNOTATION_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); JavaOneToOneMapping mapping = (JavaOneToOneMapping) persistentAttribute.getMapping(); JavaCascade cascade = mapping.getCascade(); @@ -269,11 +270,11 @@ public class JavaCascadeTests createTestEntityWithOneToOneMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - OneToOneAnnotation annotation = (OneToOneAnnotation) attributeResource.getAnnotation(OneToOneAnnotation.ANNOTATION_NAME); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + OneToOneAnnotation annotation = (OneToOneAnnotation) resourceField.getAnnotation(OneToOneAnnotation.ANNOTATION_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); JavaOneToOneMapping mapping = (JavaOneToOneMapping) persistentAttribute.getMapping(); JavaCascade cascade = mapping.getCascade(); @@ -297,11 +298,11 @@ public class JavaCascadeTests createTestEntityWithOneToOneMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - OneToOneAnnotation annotation = (OneToOneAnnotation) attributeResource.getAnnotation(OneToOneAnnotation.ANNOTATION_NAME); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + OneToOneAnnotation annotation = (OneToOneAnnotation) resourceField.getAnnotation(OneToOneAnnotation.ANNOTATION_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); JavaOneToOneMapping mapping = (JavaOneToOneMapping) persistentAttribute.getMapping(); JavaCascade cascade = mapping.getCascade(); diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaColumnTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaColumnTests.java index d245552243..5df35938fb 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaColumnTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaColumnTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2010 Oracle. All rights reserved. + * Copyright (c) 2007, 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. @@ -11,6 +11,9 @@ package org.eclipse.jpt.jpa.core.tests.internal.context.java; import java.util.Iterator; import org.eclipse.jdt.core.ICompilationUnit; +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.JavaResourceAnnotatedElement.Kind; import org.eclipse.jpt.common.utility.internal.iterators.ArrayIterator; import org.eclipse.jpt.jpa.core.context.BasicMapping; import org.eclipse.jpt.jpa.core.context.Entity; @@ -18,8 +21,6 @@ import org.eclipse.jpt.jpa.core.context.ReadOnlyBaseColumn; import org.eclipse.jpt.jpa.core.context.ReadOnlyColumn; import org.eclipse.jpt.jpa.core.resource.java.ColumnAnnotation; 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.tests.internal.context.ContextModelTestCase; @SuppressWarnings("nls") @@ -107,7 +108,7 @@ public class JavaColumnTests extends ContextModelTestCase createTestEntity(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - BasicMapping basicMapping = (BasicMapping) getJavaPersistentType().attributes().next().getMapping(); + BasicMapping basicMapping = (BasicMapping) getJavaPersistentType().getAttributes().iterator().next().getMapping(); assertNull(basicMapping.getColumn().getSpecifiedName()); } @@ -116,7 +117,7 @@ public class JavaColumnTests extends ContextModelTestCase createTestEntityWithDefaultBasicColumn(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - BasicMapping basicMapping = (BasicMapping) getJavaPersistentType().attributes().next().getMapping(); + BasicMapping basicMapping = (BasicMapping) getJavaPersistentType().getAttributes().iterator().next().getMapping(); assertEquals(COLUMN_NAME, basicMapping.getColumn().getSpecifiedName()); } @@ -124,7 +125,7 @@ public class JavaColumnTests extends ContextModelTestCase public void testGetDefaultNameSpecifiedNameNull() throws Exception { createTestEntity(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - BasicMapping basicMapping = (BasicMapping) getJavaPersistentType().attributes().next().getMapping(); + BasicMapping basicMapping = (BasicMapping) getJavaPersistentType().getAttributes().iterator().next().getMapping(); assertEquals(basicMapping.getPersistentAttribute().getName(), basicMapping.getColumn().getDefaultName()); assertEquals("id", basicMapping.getColumn().getDefaultName()); @@ -134,7 +135,7 @@ public class JavaColumnTests extends ContextModelTestCase createTestEntityWithDefaultBasicColumn(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - BasicMapping basicMapping = (BasicMapping) getJavaPersistentType().attributes().next().getMapping(); + BasicMapping basicMapping = (BasicMapping) getJavaPersistentType().getAttributes().iterator().next().getMapping(); assertEquals("id", basicMapping.getColumn().getDefaultName()); basicMapping.getColumn().setSpecifiedName("foo"); @@ -144,7 +145,7 @@ public class JavaColumnTests extends ContextModelTestCase public void testGetNameSpecifiedNameNull() throws Exception { createTestEntity(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - BasicMapping basicMapping = (BasicMapping) getJavaPersistentType().attributes().next().getMapping(); + BasicMapping basicMapping = (BasicMapping) getJavaPersistentType().getAttributes().iterator().next().getMapping(); assertEquals("id", basicMapping.getColumn().getName()); } @@ -152,7 +153,7 @@ public class JavaColumnTests extends ContextModelTestCase public void testGetName() throws Exception { createTestEntityWithDefaultBasicColumn(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - BasicMapping basicMapping = (BasicMapping) getJavaPersistentType().attributes().next().getMapping(); + BasicMapping basicMapping = (BasicMapping) getJavaPersistentType().getAttributes().iterator().next().getMapping(); assertEquals(COLUMN_NAME, basicMapping.getColumn().getName()); } @@ -160,15 +161,15 @@ public class JavaColumnTests extends ContextModelTestCase public void testSetSpecifiedName() throws Exception { createTestEntity(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - BasicMapping basicMapping = (BasicMapping) getJavaPersistentType().attributes().next().getMapping(); + BasicMapping basicMapping = (BasicMapping) getJavaPersistentType().getAttributes().iterator().next().getMapping(); basicMapping.getColumn().setSpecifiedName("foo"); assertEquals("foo", basicMapping.getColumn().getSpecifiedName()); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - ColumnAnnotation column = (ColumnAnnotation) attributeResource.getAnnotation(JPA.COLUMN); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + ColumnAnnotation column = (ColumnAnnotation) resourceField.getAnnotation(JPA.COLUMN); assertEquals("foo", column.getName()); } @@ -177,27 +178,27 @@ public class JavaColumnTests extends ContextModelTestCase createTestEntityWithDefaultBasicColumn(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - BasicMapping basicMapping = (BasicMapping) getJavaPersistentType().attributes().next().getMapping(); + BasicMapping basicMapping = (BasicMapping) getJavaPersistentType().getAttributes().iterator().next().getMapping(); basicMapping.getColumn().setSpecifiedName(null); assertNull(basicMapping.getColumn().getSpecifiedName()); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - assertNull(attributeResource.getAnnotation(JPA.COLUMN)); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + assertNull(resourceField.getAnnotation(JPA.COLUMN)); } public void testGetNameUpdatesFromResourceChange() throws Exception { createTestEntity(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - BasicMapping basicMapping = (BasicMapping) getJavaPersistentType().attributes().next().getMapping(); + BasicMapping basicMapping = (BasicMapping) getJavaPersistentType().getAttributes().iterator().next().getMapping(); assertNull(basicMapping.getColumn().getSpecifiedName()); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - ColumnAnnotation columnAnnotation = (ColumnAnnotation) attributeResource.addAnnotation(JPA.COLUMN); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + ColumnAnnotation columnAnnotation = (ColumnAnnotation) resourceField.addAnnotation(JPA.COLUMN); columnAnnotation.setName("foo"); getJpaProject().synchronizeContextModel(); @@ -225,7 +226,7 @@ public class JavaColumnTests extends ContextModelTestCase createTestEntity(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - BasicMapping basicMapping = (BasicMapping) getJavaPersistentType().attributes().next().getMapping(); + BasicMapping basicMapping = (BasicMapping) getJavaPersistentType().getAttributes().iterator().next().getMapping(); assertNull(basicMapping.getColumn().getSpecifiedTable()); } @@ -234,7 +235,7 @@ public class JavaColumnTests extends ContextModelTestCase createTestEntityWithBasicColumnTableSet(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - BasicMapping basicMapping = (BasicMapping) getJavaPersistentType().attributes().next().getMapping(); + BasicMapping basicMapping = (BasicMapping) getJavaPersistentType().getAttributes().iterator().next().getMapping(); assertEquals(TABLE_NAME, basicMapping.getColumn().getSpecifiedTable()); } @@ -242,7 +243,7 @@ public class JavaColumnTests extends ContextModelTestCase public void testGetDefaultTableSpecifiedTableNull() throws Exception { createTestEntity(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - BasicMapping basicMapping = (BasicMapping) getJavaPersistentType().attributes().next().getMapping(); + BasicMapping basicMapping = (BasicMapping) getJavaPersistentType().getAttributes().iterator().next().getMapping(); assertEquals(((Entity) basicMapping.getTypeMapping()).getName(), basicMapping.getColumn().getDefaultTable()); assertEquals(TYPE_NAME, basicMapping.getColumn().getDefaultTable()); @@ -252,7 +253,7 @@ public class JavaColumnTests extends ContextModelTestCase createTestEntityWithDefaultBasicColumn(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - BasicMapping basicMapping = (BasicMapping) getJavaPersistentType().attributes().next().getMapping(); + BasicMapping basicMapping = (BasicMapping) getJavaPersistentType().getAttributes().iterator().next().getMapping(); assertEquals(TYPE_NAME, basicMapping.getColumn().getDefaultTable()); basicMapping.getColumn().setSpecifiedTable("foo"); @@ -262,7 +263,7 @@ public class JavaColumnTests extends ContextModelTestCase public void testGetTable() throws Exception { createTestEntityWithBasicColumnTableSet(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - BasicMapping basicMapping = (BasicMapping) getJavaPersistentType().attributes().next().getMapping(); + BasicMapping basicMapping = (BasicMapping) getJavaPersistentType().getAttributes().iterator().next().getMapping(); assertEquals(TABLE_NAME, basicMapping.getColumn().getTable()); } @@ -270,15 +271,15 @@ public class JavaColumnTests extends ContextModelTestCase public void testSetSpecifiedTable() throws Exception { createTestEntity(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - BasicMapping basicMapping = (BasicMapping) getJavaPersistentType().attributes().next().getMapping(); + BasicMapping basicMapping = (BasicMapping) getJavaPersistentType().getAttributes().iterator().next().getMapping(); basicMapping.getColumn().setSpecifiedTable("foo"); assertEquals("foo", basicMapping.getColumn().getSpecifiedTable()); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - ColumnAnnotation column = (ColumnAnnotation) attributeResource.getAnnotation(JPA.COLUMN); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + ColumnAnnotation column = (ColumnAnnotation) resourceField.getAnnotation(JPA.COLUMN); assertEquals("foo", column.getTable()); } @@ -287,27 +288,27 @@ public class JavaColumnTests extends ContextModelTestCase createTestEntityWithBasicColumnTableSet(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - BasicMapping basicMapping = (BasicMapping) getJavaPersistentType().attributes().next().getMapping(); + BasicMapping basicMapping = (BasicMapping) getJavaPersistentType().getAttributes().iterator().next().getMapping(); basicMapping.getColumn().setSpecifiedTable(null); assertNull(basicMapping.getColumn().getSpecifiedTable()); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - assertNull(attributeResource.getAnnotation(JPA.COLUMN)); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + assertNull(resourceField.getAnnotation(JPA.COLUMN)); } public void testGetTableUpdatesFromResourceChange() throws Exception { createTestEntity(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - BasicMapping basicMapping = (BasicMapping) getJavaPersistentType().attributes().next().getMapping(); + BasicMapping basicMapping = (BasicMapping) getJavaPersistentType().getAttributes().iterator().next().getMapping(); assertNull(basicMapping.getColumn().getSpecifiedTable()); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - ColumnAnnotation column = (ColumnAnnotation) attributeResource.addAnnotation(JPA.COLUMN); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + ColumnAnnotation column = (ColumnAnnotation) resourceField.addAnnotation(JPA.COLUMN); column.setTable("foo"); getJpaProject().synchronizeContextModel(); @@ -322,7 +323,7 @@ public class JavaColumnTests extends ContextModelTestCase public void testGetColumnDefinition() throws Exception { createTestEntityWithBasicColumnColumnDefinitionSet(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - BasicMapping basicMapping = (BasicMapping) getJavaPersistentType().attributes().next().getMapping(); + BasicMapping basicMapping = (BasicMapping) getJavaPersistentType().getAttributes().iterator().next().getMapping(); assertEquals(COLUMN_DEFINITION, basicMapping.getColumn().getColumnDefinition()); } @@ -330,13 +331,13 @@ public class JavaColumnTests extends ContextModelTestCase public void testSetColumnDefinition() throws Exception { createTestEntityWithBasicColumnTableSet(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - BasicMapping basicMapping = (BasicMapping) getJavaPersistentType().attributes().next().getMapping(); + BasicMapping basicMapping = (BasicMapping) getJavaPersistentType().getAttributes().iterator().next().getMapping(); basicMapping.getColumn().setColumnDefinition("foo"); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - ColumnAnnotation column = (ColumnAnnotation) attributeResource.getAnnotation(JPA.COLUMN); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + ColumnAnnotation column = (ColumnAnnotation) resourceField.getAnnotation(JPA.COLUMN); assertEquals("foo", column.getColumnDefinition()); @@ -347,13 +348,13 @@ public class JavaColumnTests extends ContextModelTestCase public void testGetColumnDefinitionUpdatesFromResourceChange() throws Exception { createTestEntity(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - BasicMapping basicMapping = (BasicMapping) getJavaPersistentType().attributes().next().getMapping(); + BasicMapping basicMapping = (BasicMapping) getJavaPersistentType().getAttributes().iterator().next().getMapping(); assertNull(basicMapping.getColumn().getColumnDefinition()); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - ColumnAnnotation column = (ColumnAnnotation) attributeResource.addAnnotation(JPA.COLUMN); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + ColumnAnnotation column = (ColumnAnnotation) resourceField.addAnnotation(JPA.COLUMN); column.setColumnDefinition("foo"); getJpaProject().synchronizeContextModel(); @@ -368,7 +369,7 @@ public class JavaColumnTests extends ContextModelTestCase public void testGetLength() throws Exception { createTestEntity(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - BasicMapping basicMapping = (BasicMapping) getJavaPersistentType().attributes().next().getMapping(); + BasicMapping basicMapping = (BasicMapping) getJavaPersistentType().getAttributes().iterator().next().getMapping(); assertEquals(ReadOnlyColumn.DEFAULT_LENGTH, basicMapping.getColumn().getLength()); basicMapping.getColumn().setSpecifiedLength(Integer.valueOf(55)); @@ -379,7 +380,7 @@ public class JavaColumnTests extends ContextModelTestCase createTestEntityWithBasicColumnColumnDefinitionSet(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - BasicMapping basicMapping = (BasicMapping) getJavaPersistentType().attributes().next().getMapping(); + BasicMapping basicMapping = (BasicMapping) getJavaPersistentType().getAttributes().iterator().next().getMapping(); assertEquals(ReadOnlyColumn.DEFAULT_LENGTH, basicMapping.getColumn().getDefaultLength()); basicMapping.getColumn().setSpecifiedLength(Integer.valueOf(55)); @@ -391,13 +392,13 @@ public class JavaColumnTests extends ContextModelTestCase createTestEntity(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - BasicMapping basicMapping = (BasicMapping) getJavaPersistentType().attributes().next().getMapping(); + BasicMapping basicMapping = (BasicMapping) getJavaPersistentType().getAttributes().iterator().next().getMapping(); assertNull(basicMapping.getColumn().getSpecifiedLength()); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - ColumnAnnotation columnAnnotation = (ColumnAnnotation) attributeResource.addAnnotation(JPA.COLUMN); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + ColumnAnnotation columnAnnotation = (ColumnAnnotation) resourceField.addAnnotation(JPA.COLUMN); columnAnnotation.setLength(Integer.valueOf(66)); getJpaProject().synchronizeContextModel(); @@ -414,15 +415,15 @@ public class JavaColumnTests extends ContextModelTestCase createTestEntityWithBasicColumnColumnDefinitionSet(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - BasicMapping basicMapping = (BasicMapping) getJavaPersistentType().attributes().next().getMapping(); + BasicMapping basicMapping = (BasicMapping) getJavaPersistentType().getAttributes().iterator().next().getMapping(); assertNull(basicMapping.getColumn().getSpecifiedLength()); basicMapping.getColumn().setSpecifiedLength(Integer.valueOf(100)); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - ColumnAnnotation columnAnnotation = (ColumnAnnotation) attributeResource.getAnnotation(JPA.COLUMN); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + ColumnAnnotation columnAnnotation = (ColumnAnnotation) resourceField.getAnnotation(JPA.COLUMN); assertEquals(Integer.valueOf(100), columnAnnotation.getLength()); @@ -430,13 +431,13 @@ public class JavaColumnTests extends ContextModelTestCase basicMapping.getColumn().setSpecifiedLength(null); assertNull(columnAnnotation.getLength()); - assertNull(attributeResource.getAnnotation(JPA.COLUMN)); + assertNull(resourceField.getAnnotation(JPA.COLUMN)); } public void testGetPrecision() throws Exception { createTestEntity(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - BasicMapping basicMapping = (BasicMapping) getJavaPersistentType().attributes().next().getMapping(); + BasicMapping basicMapping = (BasicMapping) getJavaPersistentType().getAttributes().iterator().next().getMapping(); assertEquals(ReadOnlyColumn.DEFAULT_PRECISION, basicMapping.getColumn().getPrecision()); basicMapping.getColumn().setSpecifiedPrecision(Integer.valueOf(55)); @@ -447,7 +448,7 @@ public class JavaColumnTests extends ContextModelTestCase createTestEntityWithBasicColumnColumnDefinitionSet(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - BasicMapping basicMapping = (BasicMapping) getJavaPersistentType().attributes().next().getMapping(); + BasicMapping basicMapping = (BasicMapping) getJavaPersistentType().getAttributes().iterator().next().getMapping(); assertEquals(ReadOnlyColumn.DEFAULT_PRECISION, basicMapping.getColumn().getDefaultPrecision()); basicMapping.getColumn().setSpecifiedPrecision(Integer.valueOf(55)); @@ -459,13 +460,13 @@ public class JavaColumnTests extends ContextModelTestCase createTestEntity(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - BasicMapping basicMapping = (BasicMapping) getJavaPersistentType().attributes().next().getMapping(); + BasicMapping basicMapping = (BasicMapping) getJavaPersistentType().getAttributes().iterator().next().getMapping(); assertNull(basicMapping.getColumn().getSpecifiedPrecision()); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - ColumnAnnotation columnAnnotation = (ColumnAnnotation) attributeResource.addAnnotation(JPA.COLUMN); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + ColumnAnnotation columnAnnotation = (ColumnAnnotation) resourceField.addAnnotation(JPA.COLUMN); columnAnnotation.setPrecision(Integer.valueOf(66)); getJpaProject().synchronizeContextModel(); @@ -482,15 +483,15 @@ public class JavaColumnTests extends ContextModelTestCase createTestEntityWithBasicColumnColumnDefinitionSet(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - BasicMapping basicMapping = (BasicMapping) getJavaPersistentType().attributes().next().getMapping(); + BasicMapping basicMapping = (BasicMapping) getJavaPersistentType().getAttributes().iterator().next().getMapping(); assertNull(basicMapping.getColumn().getSpecifiedPrecision()); basicMapping.getColumn().setSpecifiedPrecision(Integer.valueOf(100)); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - ColumnAnnotation columnAnnotation = (ColumnAnnotation) attributeResource.getAnnotation(JPA.COLUMN); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + ColumnAnnotation columnAnnotation = (ColumnAnnotation) resourceField.getAnnotation(JPA.COLUMN); assertEquals(Integer.valueOf(100), columnAnnotation.getPrecision()); @@ -498,13 +499,13 @@ public class JavaColumnTests extends ContextModelTestCase basicMapping.getColumn().setSpecifiedPrecision(null); assertNull(columnAnnotation.getPrecision()); - assertNull(attributeResource.getAnnotation(JPA.COLUMN)); + assertNull(resourceField.getAnnotation(JPA.COLUMN)); } public void testGetScale() throws Exception { createTestEntity(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - BasicMapping basicMapping = (BasicMapping) getJavaPersistentType().attributes().next().getMapping(); + BasicMapping basicMapping = (BasicMapping) getJavaPersistentType().getAttributes().iterator().next().getMapping(); assertEquals(ReadOnlyColumn.DEFAULT_SCALE, basicMapping.getColumn().getScale()); basicMapping.getColumn().setSpecifiedScale(Integer.valueOf(55)); @@ -515,7 +516,7 @@ public class JavaColumnTests extends ContextModelTestCase createTestEntityWithBasicColumnColumnDefinitionSet(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - BasicMapping basicMapping = (BasicMapping) getJavaPersistentType().attributes().next().getMapping(); + BasicMapping basicMapping = (BasicMapping) getJavaPersistentType().getAttributes().iterator().next().getMapping(); assertEquals(ReadOnlyColumn.DEFAULT_SCALE, basicMapping.getColumn().getDefaultScale()); basicMapping.getColumn().setSpecifiedScale(Integer.valueOf(55)); @@ -527,13 +528,13 @@ public class JavaColumnTests extends ContextModelTestCase createTestEntity(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - BasicMapping basicMapping = (BasicMapping) getJavaPersistentType().attributes().next().getMapping(); + BasicMapping basicMapping = (BasicMapping) getJavaPersistentType().getAttributes().iterator().next().getMapping(); assertNull(basicMapping.getColumn().getSpecifiedScale()); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - ColumnAnnotation columnAnnotation = (ColumnAnnotation) attributeResource.addAnnotation(JPA.COLUMN); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + ColumnAnnotation columnAnnotation = (ColumnAnnotation) resourceField.addAnnotation(JPA.COLUMN); columnAnnotation.setScale(Integer.valueOf(66)); getJpaProject().synchronizeContextModel(); @@ -550,15 +551,15 @@ public class JavaColumnTests extends ContextModelTestCase createTestEntityWithBasicColumnColumnDefinitionSet(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - BasicMapping basicMapping = (BasicMapping) getJavaPersistentType().attributes().next().getMapping(); + BasicMapping basicMapping = (BasicMapping) getJavaPersistentType().getAttributes().iterator().next().getMapping(); assertNull(basicMapping.getColumn().getSpecifiedScale()); basicMapping.getColumn().setSpecifiedScale(Integer.valueOf(100)); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - ColumnAnnotation columnAnnotation = (ColumnAnnotation) attributeResource.getAnnotation(JPA.COLUMN); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + ColumnAnnotation columnAnnotation = (ColumnAnnotation) resourceField.getAnnotation(JPA.COLUMN); assertEquals(Integer.valueOf(100), columnAnnotation.getScale()); @@ -566,13 +567,13 @@ public class JavaColumnTests extends ContextModelTestCase basicMapping.getColumn().setSpecifiedScale(null); assertNull(columnAnnotation.getScale()); - assertNull(attributeResource.getAnnotation(JPA.COLUMN)); + assertNull(resourceField.getAnnotation(JPA.COLUMN)); } public void testGetUnique() throws Exception { createTestEntity(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - BasicMapping basicMapping = (BasicMapping) getJavaPersistentType().attributes().next().getMapping(); + BasicMapping basicMapping = (BasicMapping) getJavaPersistentType().getAttributes().iterator().next().getMapping(); assertEquals(ReadOnlyBaseColumn.DEFAULT_UNIQUE, basicMapping.getColumn().isUnique()); basicMapping.getColumn().setSpecifiedUnique(Boolean.TRUE); @@ -583,7 +584,7 @@ public class JavaColumnTests extends ContextModelTestCase createTestEntityWithBasicColumnColumnDefinitionSet(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - BasicMapping basicMapping = (BasicMapping) getJavaPersistentType().attributes().next().getMapping(); + BasicMapping basicMapping = (BasicMapping) getJavaPersistentType().getAttributes().iterator().next().getMapping(); assertEquals(ReadOnlyBaseColumn.DEFAULT_UNIQUE, basicMapping.getColumn().isDefaultUnique()); basicMapping.getColumn().setSpecifiedUnique(Boolean.TRUE); @@ -595,13 +596,13 @@ public class JavaColumnTests extends ContextModelTestCase createTestEntity(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - BasicMapping basicMapping = (BasicMapping) getJavaPersistentType().attributes().next().getMapping(); + BasicMapping basicMapping = (BasicMapping) getJavaPersistentType().getAttributes().iterator().next().getMapping(); assertNull(basicMapping.getColumn().getSpecifiedUnique()); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - ColumnAnnotation columnAnnotation = (ColumnAnnotation) attributeResource.addAnnotation(JPA.COLUMN); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + ColumnAnnotation columnAnnotation = (ColumnAnnotation) resourceField.addAnnotation(JPA.COLUMN); columnAnnotation.setUnique(Boolean.TRUE); getJpaProject().synchronizeContextModel(); @@ -618,15 +619,15 @@ public class JavaColumnTests extends ContextModelTestCase createTestEntityWithBasicColumnColumnDefinitionSet(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - BasicMapping basicMapping = (BasicMapping) getJavaPersistentType().attributes().next().getMapping(); + BasicMapping basicMapping = (BasicMapping) getJavaPersistentType().getAttributes().iterator().next().getMapping(); assertNull(basicMapping.getColumn().getSpecifiedUnique()); basicMapping.getColumn().setSpecifiedUnique(Boolean.FALSE); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - ColumnAnnotation columnAnnotation = (ColumnAnnotation) attributeResource.getAnnotation(JPA.COLUMN); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + ColumnAnnotation columnAnnotation = (ColumnAnnotation) resourceField.getAnnotation(JPA.COLUMN); assertEquals(Boolean.FALSE, columnAnnotation.getUnique()); @@ -634,13 +635,13 @@ public class JavaColumnTests extends ContextModelTestCase basicMapping.getColumn().setSpecifiedUnique(null); assertNull(columnAnnotation.getUnique()); - assertNull(attributeResource.getAnnotation(JPA.COLUMN)); + assertNull(resourceField.getAnnotation(JPA.COLUMN)); } public void testGetInsertable() throws Exception { createTestEntity(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - BasicMapping basicMapping = (BasicMapping) getJavaPersistentType().attributes().next().getMapping(); + BasicMapping basicMapping = (BasicMapping) getJavaPersistentType().getAttributes().iterator().next().getMapping(); assertEquals(ReadOnlyBaseColumn.DEFAULT_INSERTABLE, basicMapping.getColumn().isInsertable()); basicMapping.getColumn().setSpecifiedInsertable(Boolean.TRUE); @@ -651,7 +652,7 @@ public class JavaColumnTests extends ContextModelTestCase createTestEntityWithBasicColumnColumnDefinitionSet(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - BasicMapping basicMapping = (BasicMapping) getJavaPersistentType().attributes().next().getMapping(); + BasicMapping basicMapping = (BasicMapping) getJavaPersistentType().getAttributes().iterator().next().getMapping(); assertEquals(ReadOnlyBaseColumn.DEFAULT_INSERTABLE, basicMapping.getColumn().isDefaultInsertable()); basicMapping.getColumn().setSpecifiedInsertable(Boolean.TRUE); @@ -663,13 +664,13 @@ public class JavaColumnTests extends ContextModelTestCase createTestEntity(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - BasicMapping basicMapping = (BasicMapping) getJavaPersistentType().attributes().next().getMapping(); + BasicMapping basicMapping = (BasicMapping) getJavaPersistentType().getAttributes().iterator().next().getMapping(); assertNull(basicMapping.getColumn().getSpecifiedInsertable()); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - ColumnAnnotation columnAnnotation = (ColumnAnnotation) attributeResource.addAnnotation(JPA.COLUMN); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + ColumnAnnotation columnAnnotation = (ColumnAnnotation) resourceField.addAnnotation(JPA.COLUMN); columnAnnotation.setInsertable(Boolean.TRUE); getJpaProject().synchronizeContextModel(); @@ -686,15 +687,15 @@ public class JavaColumnTests extends ContextModelTestCase createTestEntityWithBasicColumnColumnDefinitionSet(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - BasicMapping basicMapping = (BasicMapping) getJavaPersistentType().attributes().next().getMapping(); + BasicMapping basicMapping = (BasicMapping) getJavaPersistentType().getAttributes().iterator().next().getMapping(); assertNull(basicMapping.getColumn().getSpecifiedInsertable()); basicMapping.getColumn().setSpecifiedInsertable(Boolean.FALSE); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - ColumnAnnotation columnAnnotation = (ColumnAnnotation) attributeResource.getAnnotation(JPA.COLUMN); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + ColumnAnnotation columnAnnotation = (ColumnAnnotation) resourceField.getAnnotation(JPA.COLUMN); assertEquals(Boolean.FALSE, columnAnnotation.getInsertable()); @@ -702,13 +703,13 @@ public class JavaColumnTests extends ContextModelTestCase basicMapping.getColumn().setSpecifiedInsertable(null); assertNull(columnAnnotation.getInsertable()); - assertNull(attributeResource.getAnnotation(JPA.COLUMN)); + assertNull(resourceField.getAnnotation(JPA.COLUMN)); } public void testGetNullable() throws Exception { createTestEntity(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - BasicMapping basicMapping = (BasicMapping) getJavaPersistentType().attributes().next().getMapping(); + BasicMapping basicMapping = (BasicMapping) getJavaPersistentType().getAttributes().iterator().next().getMapping(); assertEquals(ReadOnlyBaseColumn.DEFAULT_NULLABLE, basicMapping.getColumn().isNullable()); basicMapping.getColumn().setSpecifiedNullable(Boolean.TRUE); @@ -719,7 +720,7 @@ public class JavaColumnTests extends ContextModelTestCase createTestEntityWithBasicColumnColumnDefinitionSet(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - BasicMapping basicMapping = (BasicMapping) getJavaPersistentType().attributes().next().getMapping(); + BasicMapping basicMapping = (BasicMapping) getJavaPersistentType().getAttributes().iterator().next().getMapping(); assertEquals(ReadOnlyBaseColumn.DEFAULT_NULLABLE, basicMapping.getColumn().isDefaultNullable()); basicMapping.getColumn().setSpecifiedNullable(Boolean.TRUE); @@ -731,13 +732,13 @@ public class JavaColumnTests extends ContextModelTestCase createTestEntity(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - BasicMapping basicMapping = (BasicMapping) getJavaPersistentType().attributes().next().getMapping(); + BasicMapping basicMapping = (BasicMapping) getJavaPersistentType().getAttributes().iterator().next().getMapping(); assertNull(basicMapping.getColumn().getSpecifiedNullable()); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - ColumnAnnotation columnAnnotation = (ColumnAnnotation) attributeResource.addAnnotation(JPA.COLUMN); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + ColumnAnnotation columnAnnotation = (ColumnAnnotation) resourceField.addAnnotation(JPA.COLUMN); columnAnnotation.setNullable(Boolean.TRUE); getJpaProject().synchronizeContextModel(); @@ -754,15 +755,15 @@ public class JavaColumnTests extends ContextModelTestCase createTestEntityWithBasicColumnColumnDefinitionSet(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - BasicMapping basicMapping = (BasicMapping) getJavaPersistentType().attributes().next().getMapping(); + BasicMapping basicMapping = (BasicMapping) getJavaPersistentType().getAttributes().iterator().next().getMapping(); assertNull(basicMapping.getColumn().getSpecifiedNullable()); basicMapping.getColumn().setSpecifiedNullable(Boolean.FALSE); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - ColumnAnnotation columnAnnotation = (ColumnAnnotation) attributeResource.getAnnotation(JPA.COLUMN); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + ColumnAnnotation columnAnnotation = (ColumnAnnotation) resourceField.getAnnotation(JPA.COLUMN); assertEquals(Boolean.FALSE, columnAnnotation.getNullable()); @@ -770,13 +771,13 @@ public class JavaColumnTests extends ContextModelTestCase basicMapping.getColumn().setSpecifiedNullable(null); assertNull(columnAnnotation.getNullable()); - assertNull(attributeResource.getAnnotation(JPA.COLUMN)); + assertNull(resourceField.getAnnotation(JPA.COLUMN)); } public void testGetUpdatable() throws Exception { createTestEntity(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - BasicMapping basicMapping = (BasicMapping) getJavaPersistentType().attributes().next().getMapping(); + BasicMapping basicMapping = (BasicMapping) getJavaPersistentType().getAttributes().iterator().next().getMapping(); assertEquals(ReadOnlyBaseColumn.DEFAULT_UPDATABLE, basicMapping.getColumn().isUpdatable()); basicMapping.getColumn().setSpecifiedUpdatable(Boolean.TRUE); @@ -787,7 +788,7 @@ public class JavaColumnTests extends ContextModelTestCase createTestEntityWithBasicColumnColumnDefinitionSet(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - BasicMapping basicMapping = (BasicMapping) getJavaPersistentType().attributes().next().getMapping(); + BasicMapping basicMapping = (BasicMapping) getJavaPersistentType().getAttributes().iterator().next().getMapping(); assertEquals(ReadOnlyBaseColumn.DEFAULT_UPDATABLE, basicMapping.getColumn().isDefaultUpdatable()); basicMapping.getColumn().setSpecifiedUpdatable(Boolean.TRUE); @@ -799,13 +800,13 @@ public class JavaColumnTests extends ContextModelTestCase createTestEntity(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - BasicMapping basicMapping = (BasicMapping) getJavaPersistentType().attributes().next().getMapping(); + BasicMapping basicMapping = (BasicMapping) getJavaPersistentType().getAttributes().iterator().next().getMapping(); assertNull(basicMapping.getColumn().getSpecifiedUpdatable()); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - ColumnAnnotation columnAnnotation = (ColumnAnnotation) attributeResource.addAnnotation(JPA.COLUMN); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + ColumnAnnotation columnAnnotation = (ColumnAnnotation) resourceField.addAnnotation(JPA.COLUMN); columnAnnotation.setUpdatable(Boolean.TRUE); getJpaProject().synchronizeContextModel(); @@ -822,15 +823,15 @@ public class JavaColumnTests extends ContextModelTestCase createTestEntityWithBasicColumnColumnDefinitionSet(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - BasicMapping basicMapping = (BasicMapping) getJavaPersistentType().attributes().next().getMapping(); + BasicMapping basicMapping = (BasicMapping) getJavaPersistentType().getAttributes().iterator().next().getMapping(); assertNull(basicMapping.getColumn().getSpecifiedUpdatable()); basicMapping.getColumn().setSpecifiedUpdatable(Boolean.FALSE); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - ColumnAnnotation columnAnnotation = (ColumnAnnotation) attributeResource.getAnnotation(JPA.COLUMN); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + ColumnAnnotation columnAnnotation = (ColumnAnnotation) resourceField.getAnnotation(JPA.COLUMN); assertEquals(Boolean.FALSE, columnAnnotation.getUpdatable()); @@ -838,6 +839,6 @@ public class JavaColumnTests extends ContextModelTestCase basicMapping.getColumn().setSpecifiedUpdatable(null); assertNull(columnAnnotation.getUpdatable()); - assertNull(attributeResource.getAnnotation(JPA.COLUMN)); + assertNull(resourceField.getAnnotation(JPA.COLUMN)); } } diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaDiscriminatorColumnTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaDiscriminatorColumnTests.java index e37119eb0d..d9dacae611 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaDiscriminatorColumnTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaDiscriminatorColumnTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2010 Oracle. All rights reserved. + * Copyright (c) 2007, 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,6 +12,8 @@ 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.JavaResourceType; +import org.eclipse.jpt.common.core.resource.java.JavaResourceAnnotatedElement.Kind; import org.eclipse.jpt.common.core.tests.internal.projects.TestJavaProject.SourceWriter; import org.eclipse.jpt.common.utility.internal.iterators.ArrayIterator; import org.eclipse.jpt.jpa.core.context.DiscriminatorColumn; @@ -21,7 +23,6 @@ import org.eclipse.jpt.jpa.core.context.java.JavaEntity; import org.eclipse.jpt.jpa.core.context.persistence.ClassRef; import org.eclipse.jpt.jpa.core.resource.java.DiscriminatorColumnAnnotation; import org.eclipse.jpt.jpa.core.resource.java.JPA; -import org.eclipse.jpt.jpa.core.resource.java.JavaResourcePersistentType; import org.eclipse.jpt.jpa.core.tests.internal.context.ContextModelTestCase; @SuppressWarnings("nls") @@ -163,8 +164,8 @@ public class JavaDiscriminatorColumnTests extends ContextModelTestCase assertEquals("foo", getJavaEntity().getDiscriminatorColumn().getSpecifiedName()); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - DiscriminatorColumnAnnotation discriminatorColumn = (DiscriminatorColumnAnnotation) typeResource.getAnnotation(JPA.DISCRIMINATOR_COLUMN); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + DiscriminatorColumnAnnotation discriminatorColumn = (DiscriminatorColumnAnnotation) resourceType.getAnnotation(JPA.DISCRIMINATOR_COLUMN); assertEquals("foo", discriminatorColumn.getName()); } @@ -177,8 +178,8 @@ public class JavaDiscriminatorColumnTests extends ContextModelTestCase assertNull(getJavaEntity().getDiscriminatorColumn().getSpecifiedName()); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - DiscriminatorColumnAnnotation discriminatorColumn = (DiscriminatorColumnAnnotation) typeResource.getAnnotation(JPA.DISCRIMINATOR_COLUMN); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + DiscriminatorColumnAnnotation discriminatorColumn = (DiscriminatorColumnAnnotation) resourceType.getAnnotation(JPA.DISCRIMINATOR_COLUMN); assertNull(discriminatorColumn); } @@ -216,8 +217,8 @@ public class JavaDiscriminatorColumnTests extends ContextModelTestCase assertNull(getJavaEntity().getDiscriminatorColumn().getSpecifiedDiscriminatorType()); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - DiscriminatorColumnAnnotation discriminatorColumn = (DiscriminatorColumnAnnotation) typeResource.getAnnotation(JPA.DISCRIMINATOR_COLUMN); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + DiscriminatorColumnAnnotation discriminatorColumn = (DiscriminatorColumnAnnotation) resourceType.getAnnotation(JPA.DISCRIMINATOR_COLUMN); discriminatorColumn.setDiscriminatorType(org.eclipse.jpt.jpa.core.resource.java.DiscriminatorType.CHAR); getJpaProject().synchronizeContextModel(); @@ -232,14 +233,14 @@ public class JavaDiscriminatorColumnTests extends ContextModelTestCase getJavaEntity().getDiscriminatorColumn().setSpecifiedDiscriminatorType(DiscriminatorType.CHAR); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - DiscriminatorColumnAnnotation discriminatorColumn = (DiscriminatorColumnAnnotation) typeResource.getAnnotation(JPA.DISCRIMINATOR_COLUMN); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + DiscriminatorColumnAnnotation discriminatorColumn = (DiscriminatorColumnAnnotation) resourceType.getAnnotation(JPA.DISCRIMINATOR_COLUMN); assertEquals(org.eclipse.jpt.jpa.core.resource.java.DiscriminatorType.CHAR, discriminatorColumn.getDiscriminatorType()); getJavaEntity().getDiscriminatorColumn().setSpecifiedName(null); getJavaEntity().getDiscriminatorColumn().setSpecifiedDiscriminatorType(null); - assertNull(typeResource.getAnnotation(JPA.DISCRIMINATOR_COLUMN)); + assertNull(resourceType.getAnnotation(JPA.DISCRIMINATOR_COLUMN)); } public void testGetDiscriminatorTypeUpdatesFromResourceChange() throws Exception { @@ -248,8 +249,8 @@ public class JavaDiscriminatorColumnTests extends ContextModelTestCase assertNull(getJavaEntity().getDiscriminatorColumn().getSpecifiedDiscriminatorType()); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - DiscriminatorColumnAnnotation column = (DiscriminatorColumnAnnotation) typeResource.addAnnotation(JPA.DISCRIMINATOR_COLUMN); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + DiscriminatorColumnAnnotation column = (DiscriminatorColumnAnnotation) resourceType.addAnnotation(JPA.DISCRIMINATOR_COLUMN); column.setDiscriminatorType(org.eclipse.jpt.jpa.core.resource.java.DiscriminatorType.INTEGER); getJpaProject().synchronizeContextModel(); @@ -301,8 +302,8 @@ public class JavaDiscriminatorColumnTests extends ContextModelTestCase assertNull(getJavaEntity().getDiscriminatorColumn().getSpecifiedLength()); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - DiscriminatorColumnAnnotation discriminatorColumn = (DiscriminatorColumnAnnotation) typeResource.getAnnotation(JPA.DISCRIMINATOR_COLUMN); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + DiscriminatorColumnAnnotation discriminatorColumn = (DiscriminatorColumnAnnotation) resourceType.getAnnotation(JPA.DISCRIMINATOR_COLUMN); discriminatorColumn.setLength(Integer.valueOf(66)); getJpaProject().synchronizeContextModel(); @@ -323,14 +324,14 @@ public class JavaDiscriminatorColumnTests extends ContextModelTestCase getJavaEntity().getDiscriminatorColumn().setSpecifiedLength(Integer.valueOf(100)); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - DiscriminatorColumnAnnotation discriminatorColumn = (DiscriminatorColumnAnnotation) typeResource.getAnnotation(JPA.DISCRIMINATOR_COLUMN); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + DiscriminatorColumnAnnotation discriminatorColumn = (DiscriminatorColumnAnnotation) resourceType.getAnnotation(JPA.DISCRIMINATOR_COLUMN); assertEquals(Integer.valueOf(100), discriminatorColumn.getLength()); getJavaEntity().getDiscriminatorColumn().setSpecifiedName(null); getJavaEntity().getDiscriminatorColumn().setSpecifiedLength(null); - assertNull(typeResource.getAnnotation(JPA.DISCRIMINATOR_COLUMN)); + assertNull(resourceType.getAnnotation(JPA.DISCRIMINATOR_COLUMN)); } public void testGetLengthUpdatesFromResourceChange() throws Exception { @@ -339,8 +340,8 @@ public class JavaDiscriminatorColumnTests extends ContextModelTestCase assertNull(getJavaEntity().getDiscriminatorColumn().getSpecifiedLength()); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - DiscriminatorColumnAnnotation column = (DiscriminatorColumnAnnotation) typeResource.addAnnotation(JPA.DISCRIMINATOR_COLUMN); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + DiscriminatorColumnAnnotation column = (DiscriminatorColumnAnnotation) resourceType.addAnnotation(JPA.DISCRIMINATOR_COLUMN); column.setLength(Integer.valueOf(78)); getJpaProject().synchronizeContextModel(); @@ -364,8 +365,8 @@ public class JavaDiscriminatorColumnTests extends ContextModelTestCase assertNull(getJavaEntity().getDiscriminatorColumn().getColumnDefinition()); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - DiscriminatorColumnAnnotation column = (DiscriminatorColumnAnnotation) typeResource.getAnnotation(JPA.DISCRIMINATOR_COLUMN); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + DiscriminatorColumnAnnotation column = (DiscriminatorColumnAnnotation) resourceType.getAnnotation(JPA.DISCRIMINATOR_COLUMN); column.setColumnDefinition(COLUMN_DEFINITION); getJpaProject().synchronizeContextModel(); @@ -376,7 +377,7 @@ public class JavaDiscriminatorColumnTests extends ContextModelTestCase assertNull(getJavaEntity().getDiscriminatorColumn().getColumnDefinition()); - typeResource.removeAnnotation(JPA.DISCRIMINATOR_COLUMN); + resourceType.removeAnnotation(JPA.DISCRIMINATOR_COLUMN); } public void testSetColumnDefinition() throws Exception { @@ -385,13 +386,13 @@ public class JavaDiscriminatorColumnTests extends ContextModelTestCase getJavaEntity().getDiscriminatorColumn().setColumnDefinition("foo"); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - DiscriminatorColumnAnnotation column = (DiscriminatorColumnAnnotation) typeResource.getAnnotation(JPA.DISCRIMINATOR_COLUMN); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + DiscriminatorColumnAnnotation column = (DiscriminatorColumnAnnotation) resourceType.getAnnotation(JPA.DISCRIMINATOR_COLUMN); assertEquals("foo", column.getColumnDefinition()); getJavaEntity().getDiscriminatorColumn().setColumnDefinition(null); - column = (DiscriminatorColumnAnnotation) typeResource.getAnnotation(JPA.DISCRIMINATOR_COLUMN); + column = (DiscriminatorColumnAnnotation) resourceType.getAnnotation(JPA.DISCRIMINATOR_COLUMN); assertNull(column.getColumnDefinition()); } @@ -401,7 +402,7 @@ public class JavaDiscriminatorColumnTests extends ContextModelTestCase addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); addXmlClassRef(PACKAGE_NAME + "." + "AnnotationTestTypeChild"); - ListIterator classRefs = getPersistenceUnit().specifiedClassRefs(); + ListIterator classRefs = getPersistenceUnit().getSpecifiedClassRefs().iterator(); JavaEntity abstractEntity = (JavaEntity) classRefs.next().getJavaPersistentType().getMapping(); JavaEntity childEntity = (JavaEntity) classRefs.next().getJavaPersistentType().getMapping(); diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaEmbeddableTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaEmbeddableTests.java index 1d97e61490..766d9f9793 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaEmbeddableTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaEmbeddableTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2010 Oracle. All rights reserved. + * Copyright (c) 2007, 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. @@ -11,6 +11,7 @@ package org.eclipse.jpt.jpa.core.tests.internal.context.java; import java.util.Iterator; import org.eclipse.jdt.core.ICompilationUnit; +import org.eclipse.jpt.common.core.resource.java.JavaResourceAbstractType; import org.eclipse.jpt.common.utility.internal.iterators.ArrayIterator; import org.eclipse.jpt.jpa.core.MappingKeys; import org.eclipse.jpt.jpa.core.context.Embeddable; @@ -19,7 +20,6 @@ import org.eclipse.jpt.jpa.core.context.MappedSuperclass; import org.eclipse.jpt.jpa.core.internal.context.java.JavaNullTypeMapping; import org.eclipse.jpt.jpa.core.resource.java.EmbeddableAnnotation; import org.eclipse.jpt.jpa.core.resource.java.JPA; -import org.eclipse.jpt.jpa.core.resource.java.JavaResourcePersistentType; import org.eclipse.jpt.jpa.core.tests.internal.context.ContextModelTestCase; @SuppressWarnings("nls") @@ -51,8 +51,8 @@ public class JavaEmbeddableTests extends ContextModelTestCase getJavaPersistentType().setMappingKey(MappingKeys.ENTITY_TYPE_MAPPING_KEY); assertTrue(getJavaPersistentType().getMapping() instanceof Entity); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - assertNull(typeResource.getAnnotation(EmbeddableAnnotation.ANNOTATION_NAME)); + JavaResourceAbstractType resourceType = getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME); + assertNull(resourceType.getAnnotation(EmbeddableAnnotation.ANNOTATION_NAME)); } public void testMorphToMappedSuperclass() throws Exception { @@ -62,8 +62,8 @@ public class JavaEmbeddableTests extends ContextModelTestCase getJavaPersistentType().setMappingKey(MappingKeys.MAPPED_SUPERCLASS_TYPE_MAPPING_KEY); assertTrue(getJavaPersistentType().getMapping() instanceof MappedSuperclass); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - assertNull(typeResource.getAnnotation(EmbeddableAnnotation.ANNOTATION_NAME)); + JavaResourceAbstractType resourceType = getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME); + assertNull(resourceType.getAnnotation(EmbeddableAnnotation.ANNOTATION_NAME)); } public void testMorphToNull() throws Exception { @@ -73,8 +73,8 @@ public class JavaEmbeddableTests extends ContextModelTestCase getJavaPersistentType().setMappingKey(MappingKeys.NULL_TYPE_MAPPING_KEY); assertTrue(getJavaPersistentType().getMapping() instanceof JavaNullTypeMapping); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - assertNull(typeResource.getAnnotation(EmbeddableAnnotation.ANNOTATION_NAME)); + JavaResourceAbstractType resourceType = getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME); + assertNull(resourceType.getAnnotation(EmbeddableAnnotation.ANNOTATION_NAME)); } public void testEmbeddable() throws Exception { diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaEmbeddedIdMappingTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaEmbeddedIdMappingTests.java index 07dde40292..7ce0b398e8 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaEmbeddedIdMappingTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaEmbeddedIdMappingTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2010 Oracle. All rights reserved. + * Copyright (c) 2007, 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,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.iterators.ArrayIterator; import org.eclipse.jpt.jpa.core.MappingKeys; @@ -37,17 +41,13 @@ import org.eclipse.jpt.jpa.core.context.java.JavaVirtualAttributeOverride; import org.eclipse.jpt.jpa.core.context.persistence.ClassRef; import org.eclipse.jpt.jpa.core.internal.jpa1.context.java.GenericJavaNullAttributeMapping; 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.BasicAnnotation; 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.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.TransientAnnotation; @@ -115,20 +115,20 @@ public class JavaEmbeddedIdMappingTests extends ContextModelTestCase createEmbeddableType(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); EmbeddedIdMapping embeddedIdMapping = (EmbeddedIdMapping) persistentAttribute.getMapping(); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - attributeResource.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + resourceField.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE); assertFalse(embeddedIdMapping.isDefault()); persistentAttribute.setMappingKey(MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY); assertTrue(persistentAttribute.getMapping() instanceof BasicMapping); assertFalse(persistentAttribute.getMapping().isDefault()); - assertNull(attributeResource.getAnnotation(EmbeddedIdAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getAnnotation(BasicAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(AttributeOverrideAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(EmbeddedIdAnnotation.ANNOTATION_NAME)); + assertNotNull(resourceField.getAnnotation(BasicAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(0, AttributeOverrideAnnotation.ANNOTATION_NAME)); } public void testMorphToDefault() throws Exception { @@ -137,26 +137,26 @@ public class JavaEmbeddedIdMappingTests extends ContextModelTestCase addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); addXmlClassRef(FULLY_QUALIFIED_EMBEDDABLE_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); EmbeddedIdMapping embeddedIdMapping = (EmbeddedIdMapping) persistentAttribute.getMapping(); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - attributeResource.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + resourceField.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE); assertFalse(embeddedIdMapping.isDefault()); persistentAttribute.setMappingKey(MappingKeys.NULL_ATTRIBUTE_MAPPING_KEY); - assertTrue(((JavaEmbeddedMapping) persistentAttribute.getMapping()).getAttributeOverrideContainer().overrides().hasNext()); + assertTrue(((JavaEmbeddedMapping) persistentAttribute.getMapping()).getAttributeOverrideContainer().getOverrides().iterator().hasNext()); assertTrue(persistentAttribute.getMapping().isDefault()); - assertNull(attributeResource.getAnnotation(EmbeddedIdAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getAnnotation(AttributeOverrideAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(EmbeddedIdAnnotation.ANNOTATION_NAME)); + assertNotNull(resourceField.getAnnotation(0, AttributeOverrideAnnotation.ANNOTATION_NAME)); } public void testDefaultEmbeddedIdMapping() throws Exception { createTestEntityWithEmbeddedIdMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); EmbeddedIdMapping embeddedIdMapping = (EmbeddedIdMapping) persistentAttribute.getMapping(); assertFalse(embeddedIdMapping.isDefault()); @@ -175,19 +175,19 @@ public class JavaEmbeddedIdMappingTests extends ContextModelTestCase createEmbeddableType(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); EmbeddedIdMapping embeddedIdMapping = (EmbeddedIdMapping) persistentAttribute.getMapping(); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - attributeResource.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + resourceField.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE); assertFalse(embeddedIdMapping.isDefault()); persistentAttribute.setMappingKey(MappingKeys.VERSION_ATTRIBUTE_MAPPING_KEY); assertTrue(persistentAttribute.getMapping() instanceof VersionMapping); - assertNull(attributeResource.getAnnotation(EmbeddedIdAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getAnnotation(VersionAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(AttributeOverrideAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(EmbeddedIdAnnotation.ANNOTATION_NAME)); + assertNotNull(resourceField.getAnnotation(VersionAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(0, AttributeOverrideAnnotation.ANNOTATION_NAME)); } public void testMorphToTransientMapping() throws Exception { @@ -195,19 +195,19 @@ public class JavaEmbeddedIdMappingTests extends ContextModelTestCase createEmbeddableType(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); EmbeddedIdMapping embeddedIdMapping = (EmbeddedIdMapping) persistentAttribute.getMapping(); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - attributeResource.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + resourceField.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE); assertFalse(embeddedIdMapping.isDefault()); persistentAttribute.setMappingKey(MappingKeys.TRANSIENT_ATTRIBUTE_MAPPING_KEY); assertTrue(persistentAttribute.getMapping() instanceof TransientMapping); - assertNull(attributeResource.getAnnotation(EmbeddedIdAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getAnnotation(TransientAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(AttributeOverrideAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(EmbeddedIdAnnotation.ANNOTATION_NAME)); + assertNotNull(resourceField.getAnnotation(TransientAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(0, AttributeOverrideAnnotation.ANNOTATION_NAME)); } public void testMorphToIdMapping() throws Exception { @@ -215,19 +215,19 @@ public class JavaEmbeddedIdMappingTests extends ContextModelTestCase createEmbeddableType(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); EmbeddedIdMapping embeddedIdMapping = (EmbeddedIdMapping) persistentAttribute.getMapping(); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - attributeResource.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + resourceField.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE); assertFalse(embeddedIdMapping.isDefault()); persistentAttribute.setMappingKey(MappingKeys.ID_ATTRIBUTE_MAPPING_KEY); assertTrue(persistentAttribute.getMapping() instanceof IdMapping); - assertNull(attributeResource.getAnnotation(EmbeddedIdAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getAnnotation(IdAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(AttributeOverrideAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(EmbeddedIdAnnotation.ANNOTATION_NAME)); + assertNotNull(resourceField.getAnnotation(IdAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(0, AttributeOverrideAnnotation.ANNOTATION_NAME)); } public void testMorphToEmbeddedMapping() throws Exception { @@ -235,19 +235,19 @@ public class JavaEmbeddedIdMappingTests extends ContextModelTestCase createEmbeddableType(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); EmbeddedIdMapping embeddedIdMapping = (EmbeddedIdMapping) persistentAttribute.getMapping(); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - attributeResource.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + resourceField.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE); assertFalse(embeddedIdMapping.isDefault()); persistentAttribute.setMappingKey(MappingKeys.EMBEDDED_ATTRIBUTE_MAPPING_KEY); assertTrue(persistentAttribute.getMapping() instanceof EmbeddedMapping); - assertNull(attributeResource.getAnnotation(EmbeddedIdAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getAnnotation(EmbeddedAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getAnnotation(AttributeOverrideAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(EmbeddedIdAnnotation.ANNOTATION_NAME)); + assertNotNull(resourceField.getAnnotation(EmbeddedAnnotation.ANNOTATION_NAME)); + assertNotNull(resourceField.getAnnotation(0, AttributeOverrideAnnotation.ANNOTATION_NAME)); } public void testMorphToOneToOneMapping() throws Exception { @@ -255,19 +255,19 @@ public class JavaEmbeddedIdMappingTests extends ContextModelTestCase createEmbeddableType(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); EmbeddedIdMapping embeddedIdMapping = (EmbeddedIdMapping) persistentAttribute.getMapping(); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - attributeResource.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + resourceField.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE); assertFalse(embeddedIdMapping.isDefault()); persistentAttribute.setMappingKey(MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY); assertTrue(persistentAttribute.getMapping() instanceof OneToOneMapping); - assertNull(attributeResource.getAnnotation(EmbeddedIdAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getAnnotation(OneToOneAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(AttributeOverrideAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(EmbeddedIdAnnotation.ANNOTATION_NAME)); + assertNotNull(resourceField.getAnnotation(OneToOneAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(0, AttributeOverrideAnnotation.ANNOTATION_NAME)); } public void testMorphToOneToManyMapping() throws Exception { @@ -275,19 +275,19 @@ public class JavaEmbeddedIdMappingTests extends ContextModelTestCase createEmbeddableType(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); EmbeddedIdMapping embeddedIdMapping = (EmbeddedIdMapping) persistentAttribute.getMapping(); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - attributeResource.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + resourceField.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE); assertFalse(embeddedIdMapping.isDefault()); persistentAttribute.setMappingKey(MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY); assertTrue(persistentAttribute.getMapping() instanceof OneToManyMapping); - assertNull(attributeResource.getAnnotation(EmbeddedIdAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getAnnotation(OneToManyAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(AttributeOverrideAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(EmbeddedIdAnnotation.ANNOTATION_NAME)); + assertNotNull(resourceField.getAnnotation(OneToManyAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(0, AttributeOverrideAnnotation.ANNOTATION_NAME)); } public void testMorphToManyToOneMapping() throws Exception { @@ -295,19 +295,19 @@ public class JavaEmbeddedIdMappingTests extends ContextModelTestCase createEmbeddableType(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); EmbeddedIdMapping embeddedIdMapping = (EmbeddedIdMapping) persistentAttribute.getMapping(); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - attributeResource.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + resourceField.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE); assertFalse(embeddedIdMapping.isDefault()); persistentAttribute.setMappingKey(MappingKeys.MANY_TO_ONE_ATTRIBUTE_MAPPING_KEY); assertTrue(persistentAttribute.getMapping() instanceof ManyToOneMapping); - assertNull(attributeResource.getAnnotation(EmbeddedIdAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getAnnotation(ManyToOneAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(AttributeOverrideAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(EmbeddedIdAnnotation.ANNOTATION_NAME)); + assertNotNull(resourceField.getAnnotation(ManyToOneAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(0, AttributeOverrideAnnotation.ANNOTATION_NAME)); } public void testMorphToManyToManyMapping() throws Exception { @@ -315,19 +315,19 @@ public class JavaEmbeddedIdMappingTests extends ContextModelTestCase createEmbeddableType(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); EmbeddedIdMapping embeddedIdMapping = (EmbeddedIdMapping) persistentAttribute.getMapping(); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - attributeResource.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + resourceField.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE); assertFalse(embeddedIdMapping.isDefault()); persistentAttribute.setMappingKey(MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); assertTrue(persistentAttribute.getMapping() instanceof ManyToManyMapping); - assertNull(attributeResource.getAnnotation(EmbeddedIdAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getAnnotation(ManyToManyAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(AttributeOverrideAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(EmbeddedIdAnnotation.ANNOTATION_NAME)); + assertNotNull(resourceField.getAnnotation(ManyToManyAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(0, AttributeOverrideAnnotation.ANNOTATION_NAME)); } public void testSpecifiedAttributeOverrides() throws Exception { @@ -338,65 +338,65 @@ public class JavaEmbeddedIdMappingTests extends ContextModelTestCase JavaEmbeddedIdMapping embeddedIdMapping = (JavaEmbeddedIdMapping) getJavaPersistentType().getAttributeNamed("myEmbeddedId").getMapping(); JavaAttributeOverrideContainer attributeOverrideContainer = embeddedIdMapping.getAttributeOverrideContainer(); - ListIterator specifiedAttributeOverrides = attributeOverrideContainer.specifiedOverrides(); + ListIterator specifiedAttributeOverrides = attributeOverrideContainer.getSpecifiedOverrides().iterator(); assertFalse(specifiedAttributeOverrides.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 - AttributeOverrideAnnotation attributeOverride = (AttributeOverrideAnnotation) attributeResource.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + AttributeOverrideAnnotation attributeOverride = (AttributeOverrideAnnotation) resourceField.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE); attributeOverride.setName("FOO"); getJpaProject().synchronizeContextModel(); - specifiedAttributeOverrides = attributeOverrideContainer.specifiedOverrides(); + specifiedAttributeOverrides = attributeOverrideContainer.getSpecifiedOverrides().iterator(); assertEquals("FOO", specifiedAttributeOverrides.next().getName()); assertFalse(specifiedAttributeOverrides.hasNext()); - attributeOverride = (AttributeOverrideAnnotation) attributeResource.addAnnotation(1, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + attributeOverride = (AttributeOverrideAnnotation) resourceField.addAnnotation(1, JPA.ATTRIBUTE_OVERRIDE); attributeOverride.setName("BAR"); getJpaProject().synchronizeContextModel(); - specifiedAttributeOverrides = attributeOverrideContainer.specifiedOverrides(); + specifiedAttributeOverrides = attributeOverrideContainer.getSpecifiedOverrides().iterator(); assertEquals("FOO", specifiedAttributeOverrides.next().getName()); assertEquals("BAR", specifiedAttributeOverrides.next().getName()); assertFalse(specifiedAttributeOverrides.hasNext()); - attributeOverride = (AttributeOverrideAnnotation) attributeResource.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + attributeOverride = (AttributeOverrideAnnotation) resourceField.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE); attributeOverride.setName("BAZ"); getJpaProject().synchronizeContextModel(); - specifiedAttributeOverrides = attributeOverrideContainer.specifiedOverrides(); + specifiedAttributeOverrides = attributeOverrideContainer.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 - attributeResource.moveAnnotation(1, 0, JPA.ATTRIBUTE_OVERRIDES); + resourceField.moveAnnotation(1, 0, JPA.ATTRIBUTE_OVERRIDE); getJpaProject().synchronizeContextModel(); - specifiedAttributeOverrides = attributeOverrideContainer.specifiedOverrides(); + specifiedAttributeOverrides = attributeOverrideContainer.getSpecifiedOverrides().iterator(); assertEquals("FOO", specifiedAttributeOverrides.next().getName()); assertEquals("BAZ", specifiedAttributeOverrides.next().getName()); assertEquals("BAR", specifiedAttributeOverrides.next().getName()); assertFalse(specifiedAttributeOverrides.hasNext()); - attributeResource.removeAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + resourceField.removeAnnotation(0, JPA.ATTRIBUTE_OVERRIDE); getJpaProject().synchronizeContextModel(); - specifiedAttributeOverrides = attributeOverrideContainer.specifiedOverrides(); + specifiedAttributeOverrides = attributeOverrideContainer.getSpecifiedOverrides().iterator(); assertEquals("BAZ", specifiedAttributeOverrides.next().getName()); assertEquals("BAR", specifiedAttributeOverrides.next().getName()); assertFalse(specifiedAttributeOverrides.hasNext()); - attributeResource.removeAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + resourceField.removeAnnotation(0, JPA.ATTRIBUTE_OVERRIDE); getJpaProject().synchronizeContextModel(); - specifiedAttributeOverrides = attributeOverrideContainer.specifiedOverrides(); + specifiedAttributeOverrides = attributeOverrideContainer.getSpecifiedOverrides().iterator(); assertEquals("BAR", specifiedAttributeOverrides.next().getName()); assertFalse(specifiedAttributeOverrides.hasNext()); - attributeResource.removeAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + resourceField.removeAnnotation(0, JPA.ATTRIBUTE_OVERRIDE); getJpaProject().synchronizeContextModel(); - specifiedAttributeOverrides = attributeOverrideContainer.specifiedOverrides(); + specifiedAttributeOverrides = attributeOverrideContainer.getSpecifiedOverrides().iterator(); assertFalse(specifiedAttributeOverrides.hasNext()); } @@ -409,14 +409,13 @@ public class JavaEmbeddedIdMappingTests extends ContextModelTestCase JavaEmbeddedIdMapping embeddedMapping = (JavaEmbeddedIdMapping) getJavaPersistentType().getAttributeNamed("myEmbeddedId").getMapping(); JavaAttributeOverrideContainer attributeOverrideContainer = embeddedMapping.getAttributeOverrideContainer(); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - assertEquals("myEmbeddedId", attributeResource.getName()); - assertNull(attributeResource.getAnnotation(AttributeOverrideAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(AttributeOverridesAnnotation.ANNOTATION_NAME)); - - assertEquals(2, attributeOverrideContainer.virtualOverridesSize()); - ReadOnlyAttributeOverride defaultAttributeOverride = attributeOverrideContainer.virtualOverrides().next(); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + assertEquals("myEmbeddedId", resourceField.getName()); + assertNull(resourceField.getAnnotation(0, AttributeOverrideAnnotation.ANNOTATION_NAME)); + + assertEquals(2, attributeOverrideContainer.getVirtualOverridesSize()); + ReadOnlyAttributeOverride defaultAttributeOverride = attributeOverrideContainer.getVirtualOverrides().iterator().next(); assertEquals("city", defaultAttributeOverride.getName()); assertEquals("city", defaultAttributeOverride.getColumn().getName()); assertEquals(TYPE_NAME, defaultAttributeOverride.getColumn().getTable()); @@ -430,7 +429,7 @@ public class JavaEmbeddedIdMappingTests extends ContextModelTestCase assertEquals(0, defaultAttributeOverride.getColumn().getScale()); - ListIterator classRefs = getPersistenceUnit().specifiedClassRefs(); + ListIterator classRefs = getPersistenceUnit().getSpecifiedClassRefs().iterator(); classRefs.next(); Embeddable embeddable = (Embeddable) classRefs.next().getJavaPersistentType().getMapping(); @@ -446,12 +445,11 @@ public class JavaEmbeddedIdMappingTests extends ContextModelTestCase cityMapping.getColumn().setSpecifiedPrecision(Integer.valueOf(6)); cityMapping.getColumn().setSpecifiedScale(Integer.valueOf(7)); - assertEquals("myEmbeddedId", attributeResource.getName()); - assertNull(attributeResource.getAnnotation(AttributeOverrideAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(AttributeOverridesAnnotation.ANNOTATION_NAME)); + assertEquals("myEmbeddedId", resourceField.getName()); + assertNull(resourceField.getAnnotation(0, AttributeOverrideAnnotation.ANNOTATION_NAME)); - assertEquals(2, attributeOverrideContainer.virtualOverridesSize()); - defaultAttributeOverride = attributeOverrideContainer.virtualOverrides().next(); + assertEquals(2, attributeOverrideContainer.getVirtualOverridesSize()); + defaultAttributeOverride = attributeOverrideContainer.getVirtualOverrides().iterator().next(); assertEquals("city", defaultAttributeOverride.getName()); assertEquals("FOO", defaultAttributeOverride.getColumn().getName()); assertEquals("BAR", defaultAttributeOverride.getColumn().getTable()); @@ -474,7 +472,7 @@ public class JavaEmbeddedIdMappingTests extends ContextModelTestCase cityMapping.getColumn().setSpecifiedLength(null); cityMapping.getColumn().setSpecifiedPrecision(null); cityMapping.getColumn().setSpecifiedScale(null); - defaultAttributeOverride = attributeOverrideContainer.virtualOverrides().next(); + defaultAttributeOverride = attributeOverrideContainer.getVirtualOverrides().iterator().next(); assertEquals("city", defaultAttributeOverride.getName()); assertEquals("city", defaultAttributeOverride.getColumn().getName()); assertEquals(TYPE_NAME, defaultAttributeOverride.getColumn().getTable()); @@ -487,10 +485,10 @@ public class JavaEmbeddedIdMappingTests extends ContextModelTestCase assertEquals(0, defaultAttributeOverride.getColumn().getPrecision()); assertEquals(0, defaultAttributeOverride.getColumn().getScale()); - AttributeOverrideAnnotation annotation = (AttributeOverrideAnnotation) attributeResource.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + AttributeOverrideAnnotation annotation = (AttributeOverrideAnnotation) resourceField.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE); annotation.setName("city"); getJpaProject().synchronizeContextModel(); - assertEquals(1, attributeOverrideContainer.virtualOverridesSize()); + assertEquals(1, attributeOverrideContainer.getVirtualOverridesSize()); } public void testSpecifiedAttributeOverridesSize() throws Exception { @@ -501,19 +499,19 @@ public class JavaEmbeddedIdMappingTests extends ContextModelTestCase EmbeddedIdMapping embeddedIdMapping = (EmbeddedIdMapping) getJavaPersistentType().getAttributeNamed("myEmbeddedId").getMapping(); AttributeOverrideContainer attributeOverrideContainer = embeddedIdMapping.getAttributeOverrideContainer(); - assertEquals(0, attributeOverrideContainer.specifiedOverridesSize()); + assertEquals(0, attributeOverrideContainer.getSpecifiedOverridesSize()); - 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 - AttributeOverrideAnnotation attributeOverride = (AttributeOverrideAnnotation) attributeResource.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + AttributeOverrideAnnotation attributeOverride = (AttributeOverrideAnnotation) resourceField.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE); attributeOverride.setName("FOO"); - attributeOverride = (AttributeOverrideAnnotation) attributeResource.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + attributeOverride = (AttributeOverrideAnnotation) resourceField.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE); attributeOverride.setName("BAR"); getJpaProject().synchronizeContextModel(); - assertEquals(2, attributeOverrideContainer.specifiedOverridesSize()); + assertEquals(2, attributeOverrideContainer.getSpecifiedOverridesSize()); } public void testAttributeOverridesSize() throws Exception { @@ -524,24 +522,24 @@ public class JavaEmbeddedIdMappingTests extends ContextModelTestCase EmbeddedIdMapping embeddedIdMapping = (EmbeddedIdMapping) getJavaPersistentType().getAttributeNamed("myEmbeddedId").getMapping(); AttributeOverrideContainer attributeOverrideContainer = embeddedIdMapping.getAttributeOverrideContainer(); - assertEquals(2, attributeOverrideContainer.overridesSize()); + assertEquals(2, attributeOverrideContainer.getOverridesSize()); - 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 - AttributeOverrideAnnotation attributeOverride = (AttributeOverrideAnnotation) attributeResource.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + AttributeOverrideAnnotation attributeOverride = (AttributeOverrideAnnotation) resourceField.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE); attributeOverride.setName("FOO"); - attributeOverride = (AttributeOverrideAnnotation) attributeResource.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + attributeOverride = (AttributeOverrideAnnotation) resourceField.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE); attributeOverride.setName("BAR"); getJpaProject().synchronizeContextModel(); - assertEquals(4, attributeOverrideContainer.overridesSize()); + assertEquals(4, attributeOverrideContainer.getOverridesSize()); - attributeOverride = (AttributeOverrideAnnotation) attributeResource.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + attributeOverride = (AttributeOverrideAnnotation) resourceField.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE); attributeOverride.setName("city"); getJpaProject().synchronizeContextModel(); - assertEquals(4, attributeOverrideContainer.overridesSize()); + assertEquals(4, attributeOverrideContainer.getOverridesSize()); } public void testVirtualAttributeOverridesSize() throws Exception { @@ -552,26 +550,26 @@ public class JavaEmbeddedIdMappingTests extends ContextModelTestCase JavaEmbeddedIdMapping embeddedIdMapping = (JavaEmbeddedIdMapping) getJavaPersistentType().getAttributeNamed("myEmbeddedId").getMapping(); JavaAttributeOverrideContainer attributeOverrideContainer = embeddedIdMapping.getAttributeOverrideContainer(); - assertEquals(2, attributeOverrideContainer.virtualOverridesSize()); + assertEquals(2, attributeOverrideContainer.getVirtualOverridesSize()); - 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 - AttributeOverrideAnnotation attributeOverride = (AttributeOverrideAnnotation) attributeResource.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + AttributeOverrideAnnotation attributeOverride = (AttributeOverrideAnnotation) resourceField.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE); attributeOverride.setName("FOO"); - assertEquals(2, attributeOverrideContainer.virtualOverridesSize()); + assertEquals(2, attributeOverrideContainer.getVirtualOverridesSize()); - attributeOverride = (AttributeOverrideAnnotation) attributeResource.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + attributeOverride = (AttributeOverrideAnnotation) resourceField.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE); attributeOverride.setName("city"); getJpaProject().synchronizeContextModel(); - assertEquals(1, attributeOverrideContainer.virtualOverridesSize()); + assertEquals(1, attributeOverrideContainer.getVirtualOverridesSize()); - attributeOverride = (AttributeOverrideAnnotation) attributeResource.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + attributeOverride = (AttributeOverrideAnnotation) resourceField.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE); attributeOverride.setName("state"); getJpaProject().synchronizeContextModel(); - assertEquals(0, attributeOverrideContainer.virtualOverridesSize()); + assertEquals(0, attributeOverrideContainer.getVirtualOverridesSize()); } public void testAttributeOverrideSetVirtual() throws Exception { @@ -582,33 +580,33 @@ public class JavaEmbeddedIdMappingTests extends ContextModelTestCase JavaEmbeddedIdMapping embeddedIdMapping = (JavaEmbeddedIdMapping) getJavaPersistentType().getAttributeNamed("myEmbeddedId").getMapping(); JavaAttributeOverrideContainer attributeOverrideContainer = embeddedIdMapping.getAttributeOverrideContainer(); - attributeOverrideContainer.virtualOverrides().next().convertToSpecified(); - attributeOverrideContainer.virtualOverrides().next().convertToSpecified(); + attributeOverrideContainer.getVirtualOverrides().iterator().next().convertToSpecified(); + attributeOverrideContainer.getVirtualOverrides().iterator().next().convertToSpecified(); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - Iterator attributeOverrides = attributeResource.annotations(AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverridesAnnotation.ANNOTATION_NAME); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + Iterator attributeOverrides = resourceField.getAnnotations(AttributeOverrideAnnotation.ANNOTATION_NAME).iterator(); assertEquals("city", ((AttributeOverrideAnnotation) attributeOverrides.next()).getName()); assertEquals("state", ((AttributeOverrideAnnotation) attributeOverrides.next()).getName()); assertFalse(attributeOverrides.hasNext()); - attributeOverrideContainer.specifiedOverrides().next().convertToVirtual(); - attributeOverrides = attributeResource.annotations(AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverridesAnnotation.ANNOTATION_NAME); + attributeOverrideContainer.getSpecifiedOverrides().iterator().next().convertToVirtual(); + attributeOverrides = resourceField.getAnnotations(AttributeOverrideAnnotation.ANNOTATION_NAME).iterator(); assertEquals("state", ((AttributeOverrideAnnotation) attributeOverrides.next()).getName()); assertFalse(attributeOverrides.hasNext()); - assertEquals("city", attributeOverrideContainer.virtualOverrides().next().getName()); - assertEquals(1, attributeOverrideContainer.virtualOverridesSize()); + assertEquals("city", attributeOverrideContainer.getVirtualOverrides().iterator().next().getName()); + assertEquals(1, attributeOverrideContainer.getVirtualOverridesSize()); - attributeOverrideContainer.specifiedOverrides().next().convertToVirtual(); - attributeOverrides = attributeResource.annotations(AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverridesAnnotation.ANNOTATION_NAME); + attributeOverrideContainer.getSpecifiedOverrides().iterator().next().convertToVirtual(); + attributeOverrides = resourceField.getAnnotations(AttributeOverrideAnnotation.ANNOTATION_NAME).iterator(); assertFalse(attributeOverrides.hasNext()); - ListIterator virtualAttributeOverrides = attributeOverrideContainer.virtualOverrides(); + ListIterator virtualAttributeOverrides = attributeOverrideContainer.getVirtualOverrides().iterator(); assertEquals("city", virtualAttributeOverrides.next().getName()); assertEquals("state", virtualAttributeOverrides.next().getName()); - assertEquals(2, attributeOverrideContainer.virtualOverridesSize()); + assertEquals(2, attributeOverrideContainer.getVirtualOverridesSize()); } public void testAttributeOverrideSetVirtual2() throws Exception { @@ -619,14 +617,14 @@ public class JavaEmbeddedIdMappingTests extends ContextModelTestCase JavaEmbeddedIdMapping embeddedIdMapping = (JavaEmbeddedIdMapping) getJavaPersistentType().getAttributeNamed("myEmbeddedId").getMapping(); JavaAttributeOverrideContainer attributeOverrideContainer = embeddedIdMapping.getAttributeOverrideContainer(); - ListIterator virtualAttributeOverrides = attributeOverrideContainer.virtualOverrides(); + ListIterator virtualAttributeOverrides = attributeOverrideContainer.getVirtualOverrides().iterator(); virtualAttributeOverrides.next(); virtualAttributeOverrides.next().convertToSpecified(); - attributeOverrideContainer.virtualOverrides().next().convertToSpecified(); + attributeOverrideContainer.getVirtualOverrides().iterator().next().convertToSpecified(); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - Iterator attributeOverrides = attributeResource.annotations(AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverridesAnnotation.ANNOTATION_NAME); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + Iterator attributeOverrides = resourceField.getAnnotations(AttributeOverrideAnnotation.ANNOTATION_NAME).iterator(); assertEquals("state", ((AttributeOverrideAnnotation) attributeOverrides.next()).getName()); assertEquals("city", ((AttributeOverrideAnnotation) attributeOverrides.next()).getName()); @@ -642,16 +640,15 @@ public class JavaEmbeddedIdMappingTests extends ContextModelTestCase JavaEmbeddedIdMapping embeddedIdMapping = (JavaEmbeddedIdMapping) getJavaPersistentType().getAttributeNamed("myEmbeddedId").getMapping(); JavaAttributeOverrideContainer attributeOverrideContainer = embeddedIdMapping.getAttributeOverrideContainer(); - attributeOverrideContainer.virtualOverrides().next().convertToSpecified(); - attributeOverrideContainer.virtualOverrides().next().convertToSpecified(); + attributeOverrideContainer.getVirtualOverrides().iterator().next().convertToSpecified(); + attributeOverrideContainer.getVirtualOverrides().iterator().next().convertToSpecified(); - 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(); - attributeResource.moveAnnotation(1, 0, AttributeOverridesAnnotation.ANNOTATION_NAME); + resourceField.moveAnnotation(1, 0, AttributeOverrideAnnotation.ANNOTATION_NAME); - Iterator attributeOverrides = attributeResource.annotations(AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverridesAnnotation.ANNOTATION_NAME); - + Iterator attributeOverrides = resourceField.getAnnotations(AttributeOverrideAnnotation.ANNOTATION_NAME).iterator(); assertEquals("state", ((AttributeOverrideAnnotation) attributeOverrides.next()).getName()); assertEquals("city", ((AttributeOverrideAnnotation) attributeOverrides.next()).getName()); assertFalse(attributeOverrides.hasNext()); diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaEmbeddedMappingTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaEmbeddedMappingTests.java index aed44ba7cf..c7ce2cafd5 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaEmbeddedMappingTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaEmbeddedMappingTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2010 Oracle. All rights reserved. + * Copyright (c) 2007, 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,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.iterators.ArrayIterator; import org.eclipse.jpt.jpa.core.MappingKeys; @@ -37,17 +41,13 @@ import org.eclipse.jpt.jpa.core.context.java.JavaEmbeddedMapping; import org.eclipse.jpt.jpa.core.context.persistence.ClassRef; import org.eclipse.jpt.jpa.core.internal.jpa1.context.java.GenericJavaNullAttributeMapping; 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.BasicAnnotation; 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.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.TransientAnnotation; @@ -205,7 +205,7 @@ public class JavaEmbeddedMappingTests extends ContextModelTestCase createEmbeddableType(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); EmbeddedMapping embeddedMapping = (EmbeddedMapping) persistentAttribute.getMapping(); assertFalse(embeddedMapping.isDefault()); @@ -213,11 +213,11 @@ public class JavaEmbeddedMappingTests 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(EmbeddedAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getAnnotation(BasicAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(AttributeOverrideAnnotation.ANNOTATION_NAME)); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + assertNull(resourceField.getAnnotation(EmbeddedAnnotation.ANNOTATION_NAME)); + assertNotNull(resourceField.getAnnotation(BasicAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(0, AttributeOverrideAnnotation.ANNOTATION_NAME)); } public void testMorphToDefault() throws Exception { @@ -226,26 +226,26 @@ public class JavaEmbeddedMappingTests extends ContextModelTestCase addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); addXmlClassRef(FULLY_QUALIFIED_EMBEDDABLE_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); EmbeddedMapping embeddedMapping = (EmbeddedMapping) persistentAttribute.getMapping(); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - attributeResource.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + resourceField.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE); assertFalse(embeddedMapping.isDefault()); persistentAttribute.setMappingKey(MappingKeys.NULL_ATTRIBUTE_MAPPING_KEY); - assertTrue(((EmbeddedMapping) persistentAttribute.getMapping()).getAttributeOverrideContainer().overrides().hasNext()); + assertTrue(((EmbeddedMapping) persistentAttribute.getMapping()).getAttributeOverrideContainer().getOverrides().iterator().hasNext()); assertTrue(persistentAttribute.getMapping().isDefault()); - assertNull(attributeResource.getAnnotation(EmbeddedAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getAnnotation(AttributeOverrideAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(EmbeddedAnnotation.ANNOTATION_NAME)); + assertNotNull(resourceField.getAnnotation(0, AttributeOverrideAnnotation.ANNOTATION_NAME)); } public void testDefaultEmbeddedMapping() throws Exception { createTestEntityWithEmbeddedMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); EmbeddedMapping embeddedMapping = (EmbeddedMapping) persistentAttribute.getMapping(); assertFalse(embeddedMapping.isDefault()); @@ -265,7 +265,7 @@ public class JavaEmbeddedMappingTests extends ContextModelTestCase addXmlClassRef(PACKAGE_NAME + ".Entity1"); addXmlClassRef(PACKAGE_NAME + ".Embeddable1"); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); assertTrue(persistentAttribute.getMapping().isDefault()); assertNotNull(persistentAttribute.getMapping()); assertEquals(MappingKeys.EMBEDDED_ATTRIBUTE_MAPPING_KEY, persistentAttribute.getDefaultMappingKey()); @@ -311,19 +311,19 @@ public class JavaEmbeddedMappingTests extends ContextModelTestCase createEmbeddableType(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); EmbeddedMapping embeddedMapping = (EmbeddedMapping) persistentAttribute.getMapping(); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - attributeResource.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + resourceField.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE); assertFalse(embeddedMapping.isDefault()); persistentAttribute.setMappingKey(MappingKeys.VERSION_ATTRIBUTE_MAPPING_KEY); assertTrue(persistentAttribute.getMapping() instanceof VersionMapping); - assertNull(attributeResource.getAnnotation(EmbeddedAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getAnnotation(VersionAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(AttributeOverrideAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(EmbeddedAnnotation.ANNOTATION_NAME)); + assertNotNull(resourceField.getAnnotation(VersionAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(0, AttributeOverrideAnnotation.ANNOTATION_NAME)); } public void testMorphToTransientMapping() throws Exception { @@ -331,19 +331,19 @@ public class JavaEmbeddedMappingTests extends ContextModelTestCase createEmbeddableType(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); EmbeddedMapping embeddedMapping = (EmbeddedMapping) persistentAttribute.getMapping(); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - attributeResource.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + resourceField.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE); assertFalse(embeddedMapping.isDefault()); persistentAttribute.setMappingKey(MappingKeys.TRANSIENT_ATTRIBUTE_MAPPING_KEY); assertTrue(persistentAttribute.getMapping() instanceof TransientMapping); - assertNull(attributeResource.getAnnotation(EmbeddedAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getAnnotation(TransientAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(AttributeOverrideAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(EmbeddedAnnotation.ANNOTATION_NAME)); + assertNotNull(resourceField.getAnnotation(TransientAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(0, AttributeOverrideAnnotation.ANNOTATION_NAME)); } public void testMorphToIdMapping() throws Exception { @@ -351,19 +351,19 @@ public class JavaEmbeddedMappingTests extends ContextModelTestCase createEmbeddableType(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); EmbeddedMapping embeddedMapping = (EmbeddedMapping) persistentAttribute.getMapping(); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - attributeResource.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + resourceField.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE); assertFalse(embeddedMapping.isDefault()); persistentAttribute.setMappingKey(MappingKeys.ID_ATTRIBUTE_MAPPING_KEY); assertTrue(persistentAttribute.getMapping() instanceof IdMapping); - assertNull(attributeResource.getAnnotation(EmbeddedAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getAnnotation(IdAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(AttributeOverrideAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(EmbeddedAnnotation.ANNOTATION_NAME)); + assertNotNull(resourceField.getAnnotation(IdAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(0, AttributeOverrideAnnotation.ANNOTATION_NAME)); } public void testMorphToEmbeddedIdMapping() throws Exception { @@ -371,19 +371,19 @@ public class JavaEmbeddedMappingTests extends ContextModelTestCase createEmbeddableType(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); EmbeddedMapping embeddedMapping = (EmbeddedMapping) persistentAttribute.getMapping(); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - attributeResource.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + resourceField.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE); assertFalse(embeddedMapping.isDefault()); persistentAttribute.setMappingKey(MappingKeys.EMBEDDED_ID_ATTRIBUTE_MAPPING_KEY); assertTrue(persistentAttribute.getMapping() instanceof EmbeddedIdMapping); - assertNull(attributeResource.getAnnotation(EmbeddedAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getAnnotation(EmbeddedIdAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getAnnotation(AttributeOverrideAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(EmbeddedAnnotation.ANNOTATION_NAME)); + assertNotNull(resourceField.getAnnotation(EmbeddedIdAnnotation.ANNOTATION_NAME)); + assertNotNull(resourceField.getAnnotation(0, AttributeOverrideAnnotation.ANNOTATION_NAME)); } public void testMorphToOneToOneMapping() throws Exception { @@ -391,19 +391,19 @@ public class JavaEmbeddedMappingTests extends ContextModelTestCase createEmbeddableType(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); EmbeddedMapping embeddedMapping = (EmbeddedMapping) persistentAttribute.getMapping(); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - attributeResource.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + resourceField.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE); assertFalse(embeddedMapping.isDefault()); persistentAttribute.setMappingKey(MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY); assertTrue(persistentAttribute.getMapping() instanceof OneToOneMapping); - assertNull(attributeResource.getAnnotation(EmbeddedAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getAnnotation(OneToOneAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(AttributeOverrideAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(EmbeddedAnnotation.ANNOTATION_NAME)); + assertNotNull(resourceField.getAnnotation(OneToOneAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(0, AttributeOverrideAnnotation.ANNOTATION_NAME)); } public void testMorphToOneToManyMapping() throws Exception { @@ -411,19 +411,19 @@ public class JavaEmbeddedMappingTests extends ContextModelTestCase createEmbeddableType(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); EmbeddedMapping embeddedMapping = (EmbeddedMapping) persistentAttribute.getMapping(); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - attributeResource.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + resourceField.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE); assertFalse(embeddedMapping.isDefault()); persistentAttribute.setMappingKey(MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY); assertTrue(persistentAttribute.getMapping() instanceof OneToManyMapping); - assertNull(attributeResource.getAnnotation(EmbeddedAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getAnnotation(OneToManyAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(AttributeOverrideAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(EmbeddedAnnotation.ANNOTATION_NAME)); + assertNotNull(resourceField.getAnnotation(OneToManyAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(0, AttributeOverrideAnnotation.ANNOTATION_NAME)); } public void testMorphToManyToOneMapping() throws Exception { @@ -431,19 +431,19 @@ public class JavaEmbeddedMappingTests extends ContextModelTestCase createEmbeddableType(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); EmbeddedMapping embeddedMapping = (EmbeddedMapping) persistentAttribute.getMapping(); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - attributeResource.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + resourceField.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE); assertFalse(embeddedMapping.isDefault()); persistentAttribute.setMappingKey(MappingKeys.MANY_TO_ONE_ATTRIBUTE_MAPPING_KEY); assertTrue(persistentAttribute.getMapping() instanceof ManyToOneMapping); - assertNull(attributeResource.getAnnotation(EmbeddedAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getAnnotation(ManyToOneAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(AttributeOverrideAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(EmbeddedAnnotation.ANNOTATION_NAME)); + assertNotNull(resourceField.getAnnotation(ManyToOneAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(0, AttributeOverrideAnnotation.ANNOTATION_NAME)); } public void testMorphToManyToManyMapping() throws Exception { @@ -451,19 +451,19 @@ public class JavaEmbeddedMappingTests extends ContextModelTestCase createEmbeddableType(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); EmbeddedMapping embeddedMapping = (EmbeddedMapping) persistentAttribute.getMapping(); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - attributeResource.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + resourceField.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE); assertFalse(embeddedMapping.isDefault()); persistentAttribute.setMappingKey(MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); assertTrue(persistentAttribute.getMapping() instanceof ManyToManyMapping); - assertNull(attributeResource.getAnnotation(EmbeddedAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getAnnotation(ManyToManyAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(AttributeOverrideAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(EmbeddedAnnotation.ANNOTATION_NAME)); + assertNotNull(resourceField.getAnnotation(ManyToManyAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(0, AttributeOverrideAnnotation.ANNOTATION_NAME)); } public void testSpecifiedAttributeOverrides() throws Exception { @@ -475,65 +475,65 @@ public class JavaEmbeddedMappingTests extends ContextModelTestCase JavaEmbeddedMapping embeddedMapping = (JavaEmbeddedMapping) getJavaPersistentType().getAttributeNamed("myEmbedded").getMapping(); JavaAttributeOverrideContainer attributeOverrideContainer = embeddedMapping.getAttributeOverrideContainer(); - ListIterator specifiedAttributeOverrides = attributeOverrideContainer.specifiedOverrides(); + ListIterator specifiedAttributeOverrides = attributeOverrideContainer.getSpecifiedOverrides().iterator(); assertFalse(specifiedAttributeOverrides.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 - AttributeOverrideAnnotation attributeOverride = (AttributeOverrideAnnotation) attributeResource.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + AttributeOverrideAnnotation attributeOverride = (AttributeOverrideAnnotation) resourceField.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE); attributeOverride.setName("FOO"); getJpaProject().synchronizeContextModel(); - specifiedAttributeOverrides = attributeOverrideContainer.specifiedOverrides(); + specifiedAttributeOverrides = attributeOverrideContainer.getSpecifiedOverrides().iterator(); assertEquals("FOO", specifiedAttributeOverrides.next().getName()); assertFalse(specifiedAttributeOverrides.hasNext()); - attributeOverride = (AttributeOverrideAnnotation) attributeResource.addAnnotation(1, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + attributeOverride = (AttributeOverrideAnnotation) resourceField.addAnnotation(1, JPA.ATTRIBUTE_OVERRIDE); attributeOverride.setName("BAR"); getJpaProject().synchronizeContextModel(); - specifiedAttributeOverrides = attributeOverrideContainer.specifiedOverrides(); + specifiedAttributeOverrides = attributeOverrideContainer.getSpecifiedOverrides().iterator(); assertEquals("FOO", specifiedAttributeOverrides.next().getName()); assertEquals("BAR", specifiedAttributeOverrides.next().getName()); assertFalse(specifiedAttributeOverrides.hasNext()); - attributeOverride = (AttributeOverrideAnnotation) attributeResource.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + attributeOverride = (AttributeOverrideAnnotation) resourceField.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE); attributeOverride.setName("BAZ"); getJpaProject().synchronizeContextModel(); - specifiedAttributeOverrides = attributeOverrideContainer.specifiedOverrides(); + specifiedAttributeOverrides = attributeOverrideContainer.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 - attributeResource.moveAnnotation(1, 0, JPA.ATTRIBUTE_OVERRIDES); + resourceField.moveAnnotation(1, 0, JPA.ATTRIBUTE_OVERRIDE); getJpaProject().synchronizeContextModel(); - specifiedAttributeOverrides = attributeOverrideContainer.specifiedOverrides(); + specifiedAttributeOverrides = attributeOverrideContainer.getSpecifiedOverrides().iterator(); assertEquals("FOO", specifiedAttributeOverrides.next().getName()); assertEquals("BAZ", specifiedAttributeOverrides.next().getName()); assertEquals("BAR", specifiedAttributeOverrides.next().getName()); assertFalse(specifiedAttributeOverrides.hasNext()); - attributeResource.removeAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + resourceField.removeAnnotation(0, JPA.ATTRIBUTE_OVERRIDE); getJpaProject().synchronizeContextModel(); - specifiedAttributeOverrides = attributeOverrideContainer.specifiedOverrides(); + specifiedAttributeOverrides = attributeOverrideContainer.getSpecifiedOverrides().iterator(); assertEquals("BAZ", specifiedAttributeOverrides.next().getName()); assertEquals("BAR", specifiedAttributeOverrides.next().getName()); assertFalse(specifiedAttributeOverrides.hasNext()); - attributeResource.removeAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + resourceField.removeAnnotation(0, JPA.ATTRIBUTE_OVERRIDE); getJpaProject().synchronizeContextModel(); - specifiedAttributeOverrides = attributeOverrideContainer.specifiedOverrides(); + specifiedAttributeOverrides = attributeOverrideContainer.getSpecifiedOverrides().iterator(); assertEquals("BAR", specifiedAttributeOverrides.next().getName()); assertFalse(specifiedAttributeOverrides.hasNext()); - attributeResource.removeAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + resourceField.removeAnnotation(0, JPA.ATTRIBUTE_OVERRIDE); getJpaProject().synchronizeContextModel(); - specifiedAttributeOverrides = attributeOverrideContainer.specifiedOverrides(); + specifiedAttributeOverrides = attributeOverrideContainer.getSpecifiedOverrides().iterator(); assertFalse(specifiedAttributeOverrides.hasNext()); } @@ -546,14 +546,13 @@ public class JavaEmbeddedMappingTests extends ContextModelTestCase EmbeddedMapping embeddedMapping = (EmbeddedMapping) getJavaPersistentType().getAttributeNamed("myEmbedded").getMapping(); AttributeOverrideContainer attributeOverrideContainer = embeddedMapping.getAttributeOverrideContainer(); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - assertEquals("myEmbedded", attributeResource.getName()); - assertNull(attributeResource.getAnnotation(AttributeOverrideAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(AttributeOverridesAnnotation.ANNOTATION_NAME)); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + assertEquals("myEmbedded", resourceField.getName()); + assertNull(resourceField.getAnnotation(0, AttributeOverrideAnnotation.ANNOTATION_NAME)); - assertEquals(2, attributeOverrideContainer.virtualOverridesSize()); - ReadOnlyAttributeOverride defaultAttributeOverride = attributeOverrideContainer.virtualOverrides().next(); + assertEquals(2, attributeOverrideContainer.getVirtualOverridesSize()); + ReadOnlyAttributeOverride defaultAttributeOverride = attributeOverrideContainer.getVirtualOverrides().iterator().next(); assertEquals("city", defaultAttributeOverride.getName()); assertEquals("city", defaultAttributeOverride.getColumn().getName()); assertEquals(TYPE_NAME, defaultAttributeOverride.getColumn().getTable()); @@ -567,7 +566,7 @@ public class JavaEmbeddedMappingTests extends ContextModelTestCase assertEquals(0, defaultAttributeOverride.getColumn().getScale()); - ListIterator classRefs = getPersistenceUnit().specifiedClassRefs(); + ListIterator classRefs = getPersistenceUnit().getSpecifiedClassRefs().iterator(); classRefs.next(); Embeddable embeddable = (Embeddable) classRefs.next().getJavaPersistentType().getMapping(); @@ -583,12 +582,11 @@ public class JavaEmbeddedMappingTests extends ContextModelTestCase cityMapping.getColumn().setSpecifiedPrecision(Integer.valueOf(6)); cityMapping.getColumn().setSpecifiedScale(Integer.valueOf(7)); - assertEquals("myEmbedded", attributeResource.getName()); - assertNull(attributeResource.getAnnotation(AttributeOverrideAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(AttributeOverridesAnnotation.ANNOTATION_NAME)); + assertEquals("myEmbedded", resourceField.getName()); + assertNull(resourceField.getAnnotation(0, AttributeOverrideAnnotation.ANNOTATION_NAME)); - assertEquals(2, attributeOverrideContainer.virtualOverridesSize()); - defaultAttributeOverride = attributeOverrideContainer.virtualOverrides().next(); + assertEquals(2, attributeOverrideContainer.getVirtualOverridesSize()); + defaultAttributeOverride = attributeOverrideContainer.getVirtualOverrides().iterator().next(); assertEquals("city", defaultAttributeOverride.getName()); assertEquals("FOO", defaultAttributeOverride.getColumn().getName()); assertEquals("BAR", defaultAttributeOverride.getColumn().getTable()); @@ -611,7 +609,7 @@ public class JavaEmbeddedMappingTests extends ContextModelTestCase cityMapping.getColumn().setSpecifiedLength(null); cityMapping.getColumn().setSpecifiedPrecision(null); cityMapping.getColumn().setSpecifiedScale(null); - defaultAttributeOverride = attributeOverrideContainer.virtualOverrides().next(); + defaultAttributeOverride = attributeOverrideContainer.getVirtualOverrides().iterator().next(); assertEquals("city", defaultAttributeOverride.getName()); assertEquals("city", defaultAttributeOverride.getColumn().getName()); assertEquals(TYPE_NAME, defaultAttributeOverride.getColumn().getTable()); @@ -624,10 +622,10 @@ public class JavaEmbeddedMappingTests extends ContextModelTestCase assertEquals(0, defaultAttributeOverride.getColumn().getPrecision()); assertEquals(0, defaultAttributeOverride.getColumn().getScale()); - AttributeOverrideAnnotation annotation = (AttributeOverrideAnnotation) attributeResource.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + AttributeOverrideAnnotation annotation = (AttributeOverrideAnnotation) resourceField.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE); annotation.setName("city"); getJpaProject().synchronizeContextModel(); - assertEquals(1, attributeOverrideContainer.virtualOverridesSize()); + assertEquals(1, attributeOverrideContainer.getVirtualOverridesSize()); } public void testSpecifiedAttributeOverridesSize() throws Exception { @@ -638,19 +636,19 @@ public class JavaEmbeddedMappingTests extends ContextModelTestCase EmbeddedMapping embeddedMapping = (EmbeddedMapping) getJavaPersistentType().getAttributeNamed("myEmbedded").getMapping(); AttributeOverrideContainer attributeOverrideContainer = embeddedMapping.getAttributeOverrideContainer(); - assertEquals(0, attributeOverrideContainer.specifiedOverridesSize()); + assertEquals(0, attributeOverrideContainer.getSpecifiedOverridesSize()); - 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 - AttributeOverrideAnnotation attributeOverride = (AttributeOverrideAnnotation) attributeResource.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + AttributeOverrideAnnotation attributeOverride = (AttributeOverrideAnnotation) resourceField.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE); attributeOverride.setName("FOO"); - attributeOverride = (AttributeOverrideAnnotation) attributeResource.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + attributeOverride = (AttributeOverrideAnnotation) resourceField.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE); attributeOverride.setName("BAR"); getJpaProject().synchronizeContextModel(); - assertEquals(2, attributeOverrideContainer.specifiedOverridesSize()); + assertEquals(2, attributeOverrideContainer.getSpecifiedOverridesSize()); } public void testAttributeOverridesSize() throws Exception { @@ -661,24 +659,24 @@ public class JavaEmbeddedMappingTests extends ContextModelTestCase EmbeddedMapping embeddedMapping = (EmbeddedMapping) getJavaPersistentType().getAttributeNamed("myEmbedded").getMapping(); AttributeOverrideContainer attributeOverrideContainer = embeddedMapping.getAttributeOverrideContainer(); - assertEquals(2, attributeOverrideContainer.overridesSize()); + assertEquals(2, attributeOverrideContainer.getOverridesSize()); - 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 - AttributeOverrideAnnotation attributeOverride = (AttributeOverrideAnnotation) attributeResource.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + AttributeOverrideAnnotation attributeOverride = (AttributeOverrideAnnotation) resourceField.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE); attributeOverride.setName("FOO"); - attributeOverride = (AttributeOverrideAnnotation) attributeResource.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + attributeOverride = (AttributeOverrideAnnotation) resourceField.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE); attributeOverride.setName("BAR"); getJpaProject().synchronizeContextModel(); - assertEquals(4, attributeOverrideContainer.overridesSize()); + assertEquals(4, attributeOverrideContainer.getOverridesSize()); - attributeOverride = (AttributeOverrideAnnotation) attributeResource.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + attributeOverride = (AttributeOverrideAnnotation) resourceField.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE); attributeOverride.setName("city"); getJpaProject().synchronizeContextModel(); - assertEquals(4, attributeOverrideContainer.overridesSize()); + assertEquals(4, attributeOverrideContainer.getOverridesSize()); } public void testVirtualAttributeOverridesSize() throws Exception { @@ -689,27 +687,27 @@ public class JavaEmbeddedMappingTests extends ContextModelTestCase EmbeddedMapping embeddedMapping = (EmbeddedMapping) getJavaPersistentType().getAttributeNamed("myEmbedded").getMapping(); AttributeOverrideContainer attributeOverrideContainer = embeddedMapping.getAttributeOverrideContainer(); - assertEquals(2, attributeOverrideContainer.virtualOverridesSize()); + assertEquals(2, attributeOverrideContainer.getVirtualOverridesSize()); - 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 - AttributeOverrideAnnotation attributeOverride = (AttributeOverrideAnnotation) attributeResource.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + AttributeOverrideAnnotation attributeOverride = (AttributeOverrideAnnotation) resourceField.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE); attributeOverride.setName("FOO"); getJpaProject().synchronizeContextModel(); - assertEquals(2, attributeOverrideContainer.virtualOverridesSize()); + assertEquals(2, attributeOverrideContainer.getVirtualOverridesSize()); - attributeOverride = (AttributeOverrideAnnotation) attributeResource.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + attributeOverride = (AttributeOverrideAnnotation) resourceField.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE); attributeOverride.setName("city"); getJpaProject().synchronizeContextModel(); - assertEquals(1, attributeOverrideContainer.virtualOverridesSize()); + assertEquals(1, attributeOverrideContainer.getVirtualOverridesSize()); - attributeOverride = (AttributeOverrideAnnotation) attributeResource.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + attributeOverride = (AttributeOverrideAnnotation) resourceField.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE); attributeOverride.setName("state"); getJpaProject().synchronizeContextModel(); - assertEquals(0, attributeOverrideContainer.virtualOverridesSize()); + assertEquals(0, attributeOverrideContainer.getVirtualOverridesSize()); } public void testAttributeOverrideSetVirtual() throws Exception { @@ -720,33 +718,33 @@ public class JavaEmbeddedMappingTests extends ContextModelTestCase EmbeddedMapping embeddedMapping = (EmbeddedMapping) getJavaPersistentType().getAttributeNamed("myEmbedded").getMapping(); AttributeOverrideContainer attributeOverrideContainer = embeddedMapping.getAttributeOverrideContainer(); - attributeOverrideContainer.virtualOverrides().next().convertToSpecified(); - attributeOverrideContainer.virtualOverrides().next().convertToSpecified(); + attributeOverrideContainer.getVirtualOverrides().iterator().next().convertToSpecified(); + attributeOverrideContainer.getVirtualOverrides().iterator().next().convertToSpecified(); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - Iterator attributeOverrides = attributeResource.annotations(AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverridesAnnotation.ANNOTATION_NAME); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + Iterator attributeOverrides = resourceField.getAnnotations(AttributeOverrideAnnotation.ANNOTATION_NAME).iterator(); assertEquals("city", ((AttributeOverrideAnnotation) attributeOverrides.next()).getName()); assertEquals("state", ((AttributeOverrideAnnotation) attributeOverrides.next()).getName()); assertFalse(attributeOverrides.hasNext()); - attributeOverrideContainer.specifiedOverrides().next().convertToVirtual(); - attributeOverrides = attributeResource.annotations(AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverridesAnnotation.ANNOTATION_NAME); + attributeOverrideContainer.getSpecifiedOverrides().iterator().next().convertToVirtual(); + attributeOverrides = resourceField.getAnnotations(AttributeOverrideAnnotation.ANNOTATION_NAME).iterator(); assertEquals("state", ((AttributeOverrideAnnotation) attributeOverrides.next()).getName()); assertFalse(attributeOverrides.hasNext()); - assertEquals("city", attributeOverrideContainer.virtualOverrides().next().getName()); - assertEquals(1, attributeOverrideContainer.virtualOverridesSize()); + assertEquals("city", attributeOverrideContainer.getVirtualOverrides().iterator().next().getName()); + assertEquals(1, attributeOverrideContainer.getVirtualOverridesSize()); - attributeOverrideContainer.specifiedOverrides().next().convertToVirtual(); - attributeOverrides = attributeResource.annotations(AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverridesAnnotation.ANNOTATION_NAME); + attributeOverrideContainer.getSpecifiedOverrides().iterator().next().convertToVirtual(); + attributeOverrides = resourceField.getAnnotations(AttributeOverrideAnnotation.ANNOTATION_NAME).iterator(); assertFalse(attributeOverrides.hasNext()); - Iterator virtualAttributeOverrides = (Iterator) attributeOverrideContainer.virtualOverrides(); + Iterator virtualAttributeOverrides = attributeOverrideContainer.getVirtualOverrides().iterator(); assertEquals("city", virtualAttributeOverrides.next().getName()); assertEquals("state", virtualAttributeOverrides.next().getName()); - assertEquals(2, attributeOverrideContainer.virtualOverridesSize()); + assertEquals(2, attributeOverrideContainer.getVirtualOverridesSize()); } public void testAttributeOverrideSetVirtual2() throws Exception { @@ -757,14 +755,14 @@ public class JavaEmbeddedMappingTests extends ContextModelTestCase EmbeddedMapping embeddedMapping = (EmbeddedMapping) getJavaPersistentType().getAttributeNamed("myEmbedded").getMapping(); AttributeOverrideContainer attributeOverrideContainer = embeddedMapping.getAttributeOverrideContainer(); - ListIterator virtualAttributeOverrides = (ListIterator) attributeOverrideContainer.virtualOverrides(); + ListIterator virtualAttributeOverrides = attributeOverrideContainer.getVirtualOverrides().iterator(); virtualAttributeOverrides.next(); virtualAttributeOverrides.next().convertToSpecified(); - attributeOverrideContainer.virtualOverrides().next().convertToSpecified(); + attributeOverrideContainer.getVirtualOverrides().iterator().next().convertToSpecified(); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - Iterator attributeOverrides = attributeResource.annotations(AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverridesAnnotation.ANNOTATION_NAME); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + Iterator attributeOverrides = resourceField.getAnnotations(AttributeOverrideAnnotation.ANNOTATION_NAME).iterator(); assertEquals("state", ((AttributeOverrideAnnotation) attributeOverrides.next()).getName()); assertEquals("city", ((AttributeOverrideAnnotation) attributeOverrides.next()).getName()); @@ -779,15 +777,15 @@ public class JavaEmbeddedMappingTests extends ContextModelTestCase EmbeddedMapping embeddedMapping = (EmbeddedMapping) getJavaPersistentType().getAttributeNamed("myEmbedded").getMapping(); AttributeOverrideContainer attributeOverrideContainer = embeddedMapping.getAttributeOverrideContainer(); - attributeOverrideContainer.virtualOverrides().next().convertToSpecified(); - attributeOverrideContainer.virtualOverrides().next().convertToSpecified(); + attributeOverrideContainer.getVirtualOverrides().iterator().next().convertToSpecified(); + attributeOverrideContainer.getVirtualOverrides().iterator().next().convertToSpecified(); - 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(); - attributeResource.moveAnnotation(1, 0, AttributeOverridesAnnotation.ANNOTATION_NAME); + resourceField.moveAnnotation(1, 0, AttributeOverrideAnnotation.ANNOTATION_NAME); - Iterator attributeOverrides = attributeResource.annotations(AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverridesAnnotation.ANNOTATION_NAME); + Iterator attributeOverrides = resourceField.getAnnotations(AttributeOverrideAnnotation.ANNOTATION_NAME).iterator(); assertEquals("state", ((AttributeOverrideAnnotation) attributeOverrides.next()).getName()); assertEquals("city", ((AttributeOverrideAnnotation) attributeOverrides.next()).getName()); @@ -803,13 +801,13 @@ public class JavaEmbeddedMappingTests extends ContextModelTestCase addXmlClassRef(PACKAGE_NAME + ".Customer"); addXmlClassRef(PACKAGE_NAME + ".Address"); addXmlClassRef(PACKAGE_NAME + ".ZipCode"); - ListIterator specifiedClassRefs = getPersistenceUnit().specifiedClassRefs(); + ListIterator specifiedClassRefs = getPersistenceUnit().getSpecifiedClassRefs().iterator(); PersistentType customerPersistentType = specifiedClassRefs.next().getJavaPersistentType(); EmbeddedMapping embeddedMapping = (EmbeddedMapping) customerPersistentType.getAttributeNamed("address").getMapping(); AttributeOverrideContainer attributeOverrideContainer = embeddedMapping.getAttributeOverrideContainer(); - assertEquals(3, attributeOverrideContainer.virtualOverridesSize()); - ListIterator virtualAttributeOverrides = (ListIterator) attributeOverrideContainer.virtualOverrides(); + assertEquals(3, attributeOverrideContainer.getVirtualOverridesSize()); + ListIterator virtualAttributeOverrides = attributeOverrideContainer.getVirtualOverrides().iterator(); ReadOnlyAttributeOverride virtualAttributeOverride = virtualAttributeOverrides.next(); assertEquals("street", virtualAttributeOverride.getName()); virtualAttributeOverride = virtualAttributeOverrides.next(); @@ -822,8 +820,8 @@ public class JavaEmbeddedMappingTests extends ContextModelTestCase PersistentType addressPersistentType = specifiedClassRefs.next().getJavaPersistentType(); EmbeddedMapping nestedEmbeddedMapping = (EmbeddedMapping) addressPersistentType.getAttributeNamed("zipCode").getMapping(); AttributeOverrideContainer nestedAttributeOverrideContainer = nestedEmbeddedMapping.getAttributeOverrideContainer(); - assertEquals(2, nestedAttributeOverrideContainer.virtualOverridesSize()); - virtualAttributeOverrides = (ListIterator) nestedAttributeOverrideContainer.virtualOverrides(); + assertEquals(2, nestedAttributeOverrideContainer.getVirtualOverridesSize()); + virtualAttributeOverrides = nestedAttributeOverrideContainer.getVirtualOverrides().iterator(); virtualAttributeOverride = virtualAttributeOverrides.next(); assertEquals("zip", virtualAttributeOverride.getName()); virtualAttributeOverride = virtualAttributeOverrides.next(); diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaEntityTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaEntityTests.java index 0b34da79c5..242279e950 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaEntityTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaEntityTests.java @@ -12,6 +12,9 @@ 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.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; @@ -60,25 +63,17 @@ import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentType; import org.eclipse.jpt.jpa.core.context.persistence.ClassRef; import org.eclipse.jpt.jpa.core.internal.context.java.JavaNullTypeMapping; 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.DiscriminatorColumnAnnotation; import org.eclipse.jpt.jpa.core.resource.java.DiscriminatorValueAnnotation; import org.eclipse.jpt.jpa.core.resource.java.EntityAnnotation; import org.eclipse.jpt.jpa.core.resource.java.IdClassAnnotation; import org.eclipse.jpt.jpa.core.resource.java.InheritanceAnnotation; 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.NamedNativeQueriesAnnotation; import org.eclipse.jpt.jpa.core.resource.java.NamedNativeQueryAnnotation; -import org.eclipse.jpt.jpa.core.resource.java.NamedQueriesAnnotation; import org.eclipse.jpt.jpa.core.resource.java.NamedQueryAnnotation; -import org.eclipse.jpt.jpa.core.resource.java.NestableAnnotation; 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.SecondaryTableAnnotation; -import org.eclipse.jpt.jpa.core.resource.java.SecondaryTablesAnnotation; import org.eclipse.jpt.jpa.core.resource.java.SequenceGeneratorAnnotation; import org.eclipse.jpt.jpa.core.resource.java.TableAnnotation; import org.eclipse.jpt.jpa.core.resource.java.TableGeneratorAnnotation; @@ -395,9 +390,9 @@ public class JavaEntityTests extends ContextModelTestCase entity.getTable().setSpecifiedName("FOO"); entity.addSpecifiedSecondaryTable(0); entity.addSpecifiedPrimaryKeyJoinColumn(0); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - typeResource.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); - typeResource.addAnnotation(0, JPA.ASSOCIATION_OVERRIDE, JPA.ASSOCIATION_OVERRIDES); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + resourceType.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE); + resourceType.addAnnotation(0, JPA.ASSOCIATION_OVERRIDE); entity.setSpecifiedInheritanceStrategy(InheritanceType.JOINED); entity.setSpecifiedDiscriminatorValue("asdf"); entity.getDiscriminatorColumn().setSpecifiedName("BAR"); @@ -410,20 +405,20 @@ public class JavaEntityTests extends ContextModelTestCase getJavaPersistentType().setMappingKey(MappingKeys.MAPPED_SUPERCLASS_TYPE_MAPPING_KEY); assertTrue(getJavaPersistentType().getMapping() instanceof MappedSuperclass); - assertNull(typeResource.getAnnotation(EntityAnnotation.ANNOTATION_NAME)); - assertNull(typeResource.getAnnotation(TableAnnotation.ANNOTATION_NAME)); - assertNull(typeResource.getAnnotation(SecondaryTableAnnotation.ANNOTATION_NAME)); - assertNull(typeResource.getAnnotation(PrimaryKeyJoinColumnAnnotation.ANNOTATION_NAME)); - assertNull(typeResource.getAnnotation(AttributeOverrideAnnotation.ANNOTATION_NAME)); - assertNull(typeResource.getAnnotation(AssociationOverrideAnnotation.ANNOTATION_NAME)); - assertNull(typeResource.getAnnotation(InheritanceAnnotation.ANNOTATION_NAME)); - assertNull(typeResource.getAnnotation(DiscriminatorValueAnnotation.ANNOTATION_NAME)); - assertNull(typeResource.getAnnotation(DiscriminatorColumnAnnotation.ANNOTATION_NAME)); - assertNull(typeResource.getAnnotation(TableGeneratorAnnotation.ANNOTATION_NAME)); - assertNull(typeResource.getAnnotation(SequenceGeneratorAnnotation.ANNOTATION_NAME)); - assertNotNull(typeResource.getAnnotation(IdClassAnnotation.ANNOTATION_NAME)); - assertNull(typeResource.getAnnotation(NamedQueryAnnotation.ANNOTATION_NAME)); - assertNull(typeResource.getAnnotation(NamedNativeQueryAnnotation.ANNOTATION_NAME)); + assertNull(resourceType.getAnnotation(EntityAnnotation.ANNOTATION_NAME)); + assertNull(resourceType.getAnnotation(TableAnnotation.ANNOTATION_NAME)); + assertNull(resourceType.getAnnotation(0, SecondaryTableAnnotation.ANNOTATION_NAME)); + assertNull(resourceType.getAnnotation(0, PrimaryKeyJoinColumnAnnotation.ANNOTATION_NAME)); + assertNull(resourceType.getAnnotation(0, AttributeOverrideAnnotation.ANNOTATION_NAME)); + assertNull(resourceType.getAnnotation(0, AssociationOverrideAnnotation.ANNOTATION_NAME)); + assertNull(resourceType.getAnnotation(InheritanceAnnotation.ANNOTATION_NAME)); + assertNull(resourceType.getAnnotation(DiscriminatorValueAnnotation.ANNOTATION_NAME)); + assertNull(resourceType.getAnnotation(DiscriminatorColumnAnnotation.ANNOTATION_NAME)); + assertNull(resourceType.getAnnotation(TableGeneratorAnnotation.ANNOTATION_NAME)); + assertNull(resourceType.getAnnotation(SequenceGeneratorAnnotation.ANNOTATION_NAME)); + assertNotNull(resourceType.getAnnotation(IdClassAnnotation.ANNOTATION_NAME)); + assertNull(resourceType.getAnnotation(0, NamedQueryAnnotation.ANNOTATION_NAME)); + assertNull(resourceType.getAnnotation(0, NamedNativeQueryAnnotation.ANNOTATION_NAME)); } public void testMorphToEmbeddable() throws Exception { @@ -434,9 +429,9 @@ public class JavaEntityTests extends ContextModelTestCase entity.getTable().setSpecifiedName("FOO"); entity.addSpecifiedSecondaryTable(0); entity.addSpecifiedPrimaryKeyJoinColumn(0); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - typeResource.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); - typeResource.addAnnotation(0, JPA.ASSOCIATION_OVERRIDE, JPA.ASSOCIATION_OVERRIDES); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + resourceType.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE); + resourceType.addAnnotation(0, JPA.ASSOCIATION_OVERRIDE); entity.setSpecifiedInheritanceStrategy(InheritanceType.JOINED); entity.setSpecifiedDiscriminatorValue("asdf"); entity.getDiscriminatorColumn().setSpecifiedName("BAR"); @@ -449,20 +444,20 @@ public class JavaEntityTests extends ContextModelTestCase getJavaPersistentType().setMappingKey(MappingKeys.EMBEDDABLE_TYPE_MAPPING_KEY); assertTrue(getJavaPersistentType().getMapping() instanceof Embeddable); - assertNull(typeResource.getAnnotation(EntityAnnotation.ANNOTATION_NAME)); - assertNull(typeResource.getAnnotation(TableAnnotation.ANNOTATION_NAME)); - assertNull(typeResource.getAnnotation(SecondaryTableAnnotation.ANNOTATION_NAME)); - assertNull(typeResource.getAnnotation(PrimaryKeyJoinColumnAnnotation.ANNOTATION_NAME)); - assertNull(typeResource.getAnnotation(AttributeOverrideAnnotation.ANNOTATION_NAME)); - assertNull(typeResource.getAnnotation(AssociationOverrideAnnotation.ANNOTATION_NAME)); - assertNull(typeResource.getAnnotation(InheritanceAnnotation.ANNOTATION_NAME)); - assertNull(typeResource.getAnnotation(DiscriminatorValueAnnotation.ANNOTATION_NAME)); - assertNull(typeResource.getAnnotation(DiscriminatorColumnAnnotation.ANNOTATION_NAME)); - assertNull(typeResource.getAnnotation(TableGeneratorAnnotation.ANNOTATION_NAME)); - assertNull(typeResource.getAnnotation(SequenceGeneratorAnnotation.ANNOTATION_NAME)); - assertNull(typeResource.getAnnotation(IdClassAnnotation.ANNOTATION_NAME)); - assertNull(typeResource.getAnnotation(NamedQueryAnnotation.ANNOTATION_NAME)); - assertNull(typeResource.getAnnotation(NamedNativeQueryAnnotation.ANNOTATION_NAME)); + assertNull(resourceType.getAnnotation(EntityAnnotation.ANNOTATION_NAME)); + assertNull(resourceType.getAnnotation(TableAnnotation.ANNOTATION_NAME)); + assertNull(resourceType.getAnnotation(0, SecondaryTableAnnotation.ANNOTATION_NAME)); + assertNull(resourceType.getAnnotation(0, PrimaryKeyJoinColumnAnnotation.ANNOTATION_NAME)); + assertNull(resourceType.getAnnotation(0, AttributeOverrideAnnotation.ANNOTATION_NAME)); + assertNull(resourceType.getAnnotation(0, AssociationOverrideAnnotation.ANNOTATION_NAME)); + assertNull(resourceType.getAnnotation(InheritanceAnnotation.ANNOTATION_NAME)); + assertNull(resourceType.getAnnotation(DiscriminatorValueAnnotation.ANNOTATION_NAME)); + assertNull(resourceType.getAnnotation(DiscriminatorColumnAnnotation.ANNOTATION_NAME)); + assertNull(resourceType.getAnnotation(TableGeneratorAnnotation.ANNOTATION_NAME)); + assertNull(resourceType.getAnnotation(SequenceGeneratorAnnotation.ANNOTATION_NAME)); + assertNull(resourceType.getAnnotation(IdClassAnnotation.ANNOTATION_NAME)); + assertNull(resourceType.getAnnotation(0, NamedQueryAnnotation.ANNOTATION_NAME)); + assertNull(resourceType.getAnnotation(0, NamedNativeQueryAnnotation.ANNOTATION_NAME)); } public void testMorphToNull() throws Exception { @@ -473,9 +468,9 @@ public class JavaEntityTests extends ContextModelTestCase entity.getTable().setSpecifiedName("FOO"); entity.addSpecifiedSecondaryTable(0); entity.addSpecifiedPrimaryKeyJoinColumn(0); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - typeResource.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); - typeResource.addAnnotation(0, JPA.ASSOCIATION_OVERRIDE, JPA.ASSOCIATION_OVERRIDES); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + resourceType.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE); + resourceType.addAnnotation(0, JPA.ASSOCIATION_OVERRIDE); entity.setSpecifiedInheritanceStrategy(InheritanceType.JOINED); entity.setSpecifiedDiscriminatorValue("asdf"); entity.getDiscriminatorColumn().setSpecifiedName("BAR"); @@ -488,20 +483,20 @@ public class JavaEntityTests extends ContextModelTestCase getJavaPersistentType().setMappingKey(MappingKeys.NULL_TYPE_MAPPING_KEY); assertTrue(getJavaPersistentType().getMapping() instanceof JavaNullTypeMapping); - assertNull(typeResource.getAnnotation(EntityAnnotation.ANNOTATION_NAME)); - assertNull(typeResource.getAnnotation(TableAnnotation.ANNOTATION_NAME)); - assertNull(typeResource.getAnnotation(SecondaryTableAnnotation.ANNOTATION_NAME)); - assertNull(typeResource.getAnnotation(PrimaryKeyJoinColumnAnnotation.ANNOTATION_NAME)); - assertNull(typeResource.getAnnotation(AttributeOverrideAnnotation.ANNOTATION_NAME)); - assertNull(typeResource.getAnnotation(AssociationOverrideAnnotation.ANNOTATION_NAME)); - assertNull(typeResource.getAnnotation(InheritanceAnnotation.ANNOTATION_NAME)); - assertNull(typeResource.getAnnotation(DiscriminatorValueAnnotation.ANNOTATION_NAME)); - assertNull(typeResource.getAnnotation(DiscriminatorColumnAnnotation.ANNOTATION_NAME)); - assertNull(typeResource.getAnnotation(TableGeneratorAnnotation.ANNOTATION_NAME)); - assertNull(typeResource.getAnnotation(SequenceGeneratorAnnotation.ANNOTATION_NAME)); - assertNull(typeResource.getAnnotation(IdClassAnnotation.ANNOTATION_NAME)); - assertNull(typeResource.getAnnotation(NamedQueryAnnotation.ANNOTATION_NAME)); - assertNull(typeResource.getAnnotation(NamedNativeQueryAnnotation.ANNOTATION_NAME)); + assertNull(resourceType.getAnnotation(EntityAnnotation.ANNOTATION_NAME)); + assertNull(resourceType.getAnnotation(TableAnnotation.ANNOTATION_NAME)); + assertNull(resourceType.getAnnotation(0, SecondaryTableAnnotation.ANNOTATION_NAME)); + assertNull(resourceType.getAnnotation(0, PrimaryKeyJoinColumnAnnotation.ANNOTATION_NAME)); + assertNull(resourceType.getAnnotation(0, AttributeOverrideAnnotation.ANNOTATION_NAME)); + assertNull(resourceType.getAnnotation(0, AssociationOverrideAnnotation.ANNOTATION_NAME)); + assertNull(resourceType.getAnnotation(InheritanceAnnotation.ANNOTATION_NAME)); + assertNull(resourceType.getAnnotation(DiscriminatorValueAnnotation.ANNOTATION_NAME)); + assertNull(resourceType.getAnnotation(DiscriminatorColumnAnnotation.ANNOTATION_NAME)); + assertNull(resourceType.getAnnotation(TableGeneratorAnnotation.ANNOTATION_NAME)); + assertNull(resourceType.getAnnotation(SequenceGeneratorAnnotation.ANNOTATION_NAME)); + assertNull(resourceType.getAnnotation(IdClassAnnotation.ANNOTATION_NAME)); + assertNull(resourceType.getAnnotation(0, NamedQueryAnnotation.ANNOTATION_NAME)); + assertNull(resourceType.getAnnotation(0, NamedNativeQueryAnnotation.ANNOTATION_NAME)); } public void testAccessNoAnnotations() throws Exception { @@ -526,9 +521,9 @@ public class JavaEntityTests extends ContextModelTestCase assertEquals(AccessType.PROPERTY, childPersistentType.getAccess()); ((IdMapping) superPersistentType.getAttributeNamed("id").getMapping()).getColumn().setSpecifiedName("FOO"); - JavaResourcePersistentType resourceType = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); - resourceType.persistableProperties().next().removeAnnotation(JPA.ID); + resourceType.getMethods().iterator().next().removeAnnotation(JPA.ID); getJpaProject().synchronizeContextModel(); //no mapping(Id) annotation, but still a Column annotation, so access should still be property assertEquals(AccessType.PROPERTY, superPersistentType.getAccess()); @@ -570,9 +565,9 @@ public class JavaEntityTests extends ContextModelTestCase assertEquals(AccessType.PROPERTY, getJavaPersistentType().getAccess()); ((IdMapping) getJavaPersistentType().getAttributeNamed("id").getMapping()).getColumn().setSpecifiedName("FOO"); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); - typeResource.persistableProperties().next().removeAnnotation(JPA.ID); + resourceType.getMethods().iterator().next().removeAnnotation(JPA.ID); getJpaProject().synchronizeContextModel(); //no mapping(Id) annotation, but still a Column annotation, so access should still be property assertEquals(AccessType.PROPERTY, getJavaPersistentType().getAccess()); @@ -649,9 +644,9 @@ public class JavaEntityTests extends ContextModelTestCase assertEquals("foo", getJavaEntity().getSpecifiedName()); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); - assertEquals("foo", ((EntityAnnotation) typeResource.getAnnotation(EntityAnnotation.ANNOTATION_NAME)).getName()); + assertEquals("foo", ((EntityAnnotation) resourceType.getAnnotation(EntityAnnotation.ANNOTATION_NAME)).getName()); } public void testSetSpecifiedNameNull() throws Exception { @@ -662,17 +657,17 @@ public class JavaEntityTests extends ContextModelTestCase assertNull(getJavaEntity().getSpecifiedName()); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); - assertNull(((EntityAnnotation) typeResource.getAnnotation(EntityAnnotation.ANNOTATION_NAME)).getName()); + assertNull(((EntityAnnotation) resourceType.getAnnotation(EntityAnnotation.ANNOTATION_NAME)).getName()); } public void testUpdateFromSpecifiedNameChangeInResourceModel() throws Exception { createTestEntityWithName(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - EntityAnnotation entity = (EntityAnnotation) typeResource.getAnnotation(EntityAnnotation.ANNOTATION_NAME); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + EntityAnnotation entity = (EntityAnnotation) resourceType.getAnnotation(EntityAnnotation.ANNOTATION_NAME); entity.setName("foo"); getJpaProject().synchronizeContextModel(); @@ -731,7 +726,7 @@ public class JavaEntityTests extends ContextModelTestCase addXmlClassRef(PACKAGE_NAME + ".AnnotationTestTypeChild"); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ListIterator specifiedClassRefs = getPersistenceUnit().specifiedClassRefs(); + ListIterator specifiedClassRefs = getPersistenceUnit().getSpecifiedClassRefs().iterator(); Entity childEntity = (Entity) specifiedClassRefs.next().getJavaPersistentType().getMapping(); Entity rootEntity = (Entity) specifiedClassRefs.next().getJavaPersistentType().getMapping(); @@ -753,8 +748,8 @@ public class JavaEntityTests extends ContextModelTestCase assertEquals(InheritanceType.TABLE_PER_CLASS, getJavaEntity().getSpecifiedInheritanceStrategy()); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - InheritanceAnnotation inheritance = (InheritanceAnnotation) typeResource.getAnnotation(InheritanceAnnotation.ANNOTATION_NAME); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + InheritanceAnnotation inheritance = (InheritanceAnnotation) resourceType.getAnnotation(InheritanceAnnotation.ANNOTATION_NAME); inheritance.setStrategy(org.eclipse.jpt.jpa.core.resource.java.InheritanceType.JOINED); getJpaProject().synchronizeContextModel(); @@ -776,8 +771,8 @@ public class JavaEntityTests extends ContextModelTestCase assertEquals(InheritanceType.JOINED, getJavaEntity().getSpecifiedInheritanceStrategy()); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - InheritanceAnnotation inheritance = (InheritanceAnnotation) typeResource.getAnnotation(InheritanceAnnotation.ANNOTATION_NAME); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + InheritanceAnnotation inheritance = (InheritanceAnnotation) resourceType.getAnnotation(InheritanceAnnotation.ANNOTATION_NAME); assertEquals(org.eclipse.jpt.jpa.core.resource.java.InheritanceType.JOINED, inheritance.getStrategy()); } @@ -810,8 +805,8 @@ public class JavaEntityTests extends ContextModelTestCase assertEquals(DISCRIMINATOR_VALUE, getJavaEntity().getSpecifiedDiscriminatorValue()); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - DiscriminatorValueAnnotation discriminatorValue = (DiscriminatorValueAnnotation) typeResource.getAnnotation(DiscriminatorValueAnnotation.ANNOTATION_NAME); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + DiscriminatorValueAnnotation discriminatorValue = (DiscriminatorValueAnnotation) resourceType.getAnnotation(DiscriminatorValueAnnotation.ANNOTATION_NAME); discriminatorValue.setValue("foo"); getJpaProject().synchronizeContextModel(); @@ -833,8 +828,8 @@ public class JavaEntityTests extends ContextModelTestCase assertEquals("foo", getJavaEntity().getSpecifiedDiscriminatorValue()); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - DiscriminatorValueAnnotation discriminatorValue = (DiscriminatorValueAnnotation) typeResource.getAnnotation(DiscriminatorValueAnnotation.ANNOTATION_NAME); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + DiscriminatorValueAnnotation discriminatorValue = (DiscriminatorValueAnnotation) resourceType.getAnnotation(DiscriminatorValueAnnotation.ANNOTATION_NAME); assertEquals("foo", discriminatorValue.getValue()); } @@ -842,7 +837,7 @@ public class JavaEntityTests extends ContextModelTestCase createTestEntityWithSecondaryTable(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ListIterator secondaryTables = getJavaEntity().secondaryTables(); + ListIterator secondaryTables = getJavaEntity().getSecondaryTables().iterator(); assertTrue(secondaryTables.hasNext()); assertEquals("foo", secondaryTables.next().getName()); @@ -854,23 +849,23 @@ public class JavaEntityTests extends ContextModelTestCase addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); Entity entity = getJavaEntity(); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); - assertEquals(0, entity.secondaryTablesSize()); + assertEquals(0, entity.getSecondaryTablesSize()); - ((SecondaryTableAnnotation) typeResource.addAnnotation(0, SecondaryTableAnnotation.ANNOTATION_NAME, SecondaryTablesAnnotation.ANNOTATION_NAME)).setName("FOO"); - ((SecondaryTableAnnotation) typeResource.addAnnotation(1, SecondaryTableAnnotation.ANNOTATION_NAME, SecondaryTablesAnnotation.ANNOTATION_NAME)).setName("BAR"); - ((SecondaryTableAnnotation) typeResource.addAnnotation(2, SecondaryTableAnnotation.ANNOTATION_NAME, SecondaryTablesAnnotation.ANNOTATION_NAME)).setName("BAZ"); + ((SecondaryTableAnnotation) resourceType.addAnnotation(0, SecondaryTableAnnotation.ANNOTATION_NAME)).setName("FOO"); + ((SecondaryTableAnnotation) resourceType.addAnnotation(1, SecondaryTableAnnotation.ANNOTATION_NAME)).setName("BAR"); + ((SecondaryTableAnnotation) resourceType.addAnnotation(2, SecondaryTableAnnotation.ANNOTATION_NAME)).setName("BAZ"); getJpaProject().synchronizeContextModel(); - assertEquals(3, entity.secondaryTablesSize()); + assertEquals(3, entity.getSecondaryTablesSize()); } public void testSpecifiedSecondaryTables() throws Exception { createTestEntityWithSecondaryTables(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ListIterator specifiedSecondaryTables = getJavaEntity().specifiedSecondaryTables(); + ListIterator specifiedSecondaryTables = getJavaEntity().getSpecifiedSecondaryTables().iterator(); assertTrue(specifiedSecondaryTables.hasNext()); assertEquals("foo", specifiedSecondaryTables.next().getName()); @@ -883,16 +878,16 @@ public class JavaEntityTests extends ContextModelTestCase addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); Entity entity = getJavaEntity(); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); - assertEquals(0, entity.specifiedSecondaryTablesSize()); + assertEquals(0, entity.getSpecifiedSecondaryTablesSize()); - ((SecondaryTableAnnotation) typeResource.addAnnotation(0, SecondaryTableAnnotation.ANNOTATION_NAME, SecondaryTablesAnnotation.ANNOTATION_NAME)).setName("FOO"); - ((SecondaryTableAnnotation) typeResource.addAnnotation(1, SecondaryTableAnnotation.ANNOTATION_NAME, SecondaryTablesAnnotation.ANNOTATION_NAME)).setName("BAR"); - ((SecondaryTableAnnotation) typeResource.addAnnotation(2, SecondaryTableAnnotation.ANNOTATION_NAME, SecondaryTablesAnnotation.ANNOTATION_NAME)).setName("BAZ"); + ((SecondaryTableAnnotation) resourceType.addAnnotation(0, SecondaryTableAnnotation.ANNOTATION_NAME)).setName("FOO"); + ((SecondaryTableAnnotation) resourceType.addAnnotation(1, SecondaryTableAnnotation.ANNOTATION_NAME)).setName("BAR"); + ((SecondaryTableAnnotation) resourceType.addAnnotation(2, SecondaryTableAnnotation.ANNOTATION_NAME)).setName("BAZ"); getJpaProject().synchronizeContextModel(); - assertEquals(3, entity.specifiedSecondaryTablesSize()); + assertEquals(3, entity.getSpecifiedSecondaryTablesSize()); } public void testAddSpecifiedSecondaryTable() throws Exception { @@ -903,8 +898,8 @@ public class JavaEntityTests extends ContextModelTestCase getJavaEntity().addSpecifiedSecondaryTable(0).setSpecifiedName("BAR"); getJavaEntity().addSpecifiedSecondaryTable(0).setSpecifiedName("BAZ"); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - Iterator secondaryTables = typeResource.annotations(SecondaryTableAnnotation.ANNOTATION_NAME, SecondaryTablesAnnotation.ANNOTATION_NAME); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + Iterator secondaryTables = resourceType.getAnnotations(SecondaryTableAnnotation.ANNOTATION_NAME).iterator(); assertEquals("BAZ", ((SecondaryTableAnnotation) secondaryTables.next()).getName()); assertEquals("BAR", ((SecondaryTableAnnotation) secondaryTables.next()).getName()); @@ -920,8 +915,8 @@ public class JavaEntityTests extends ContextModelTestCase getJavaEntity().addSpecifiedSecondaryTable(1).setSpecifiedName("BAR"); getJavaEntity().addSpecifiedSecondaryTable(0).setSpecifiedName("BAZ"); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - Iterator secondaryTables = typeResource.annotations(SecondaryTableAnnotation.ANNOTATION_NAME, SecondaryTablesAnnotation.ANNOTATION_NAME); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + Iterator secondaryTables = resourceType.getAnnotations(SecondaryTableAnnotation.ANNOTATION_NAME).iterator(); assertEquals("BAZ", ((SecondaryTableAnnotation) secondaryTables.next()).getName()); assertEquals("FOO", ((SecondaryTableAnnotation) secondaryTables.next()).getName()); @@ -944,20 +939,20 @@ public class JavaEntityTests extends ContextModelTestCase specifiedSecondaryTable2.setSpecifiedName("BAR"); - Iterator secondaryTables = getJavaEntity().secondaryTables(); + Iterator secondaryTables = getJavaEntity().getSecondaryTables().iterator(); SecondaryTable secondaryTable = secondaryTables.next(); assertEquals(secondaryTable, specifiedSecondaryTable); assertEquals("FOO", secondaryTable.getName()); assertEquals("CATALOG", secondaryTable.getCatalog()); assertEquals("SCHEMA", secondaryTable.getSchema()); - assertEquals(1, secondaryTable.specifiedPrimaryKeyJoinColumnsSize()); - PrimaryKeyJoinColumn pkJoinColumn = secondaryTable.specifiedPrimaryKeyJoinColumns().next(); + assertEquals(1, secondaryTable.getSpecifiedPrimaryKeyJoinColumnsSize()); + PrimaryKeyJoinColumn pkJoinColumn = secondaryTable.getSpecifiedPrimaryKeyJoinColumns().iterator().next(); assertEquals("PK_NAME", pkJoinColumn.getName()); secondaryTable = secondaryTables.next(); assertEquals(secondaryTable, specifiedSecondaryTable2); assertEquals("BAR", secondaryTable.getName()); - assertEquals(0, secondaryTable.specifiedPrimaryKeyJoinColumnsSize()); + assertEquals(0, secondaryTable.getSpecifiedPrimaryKeyJoinColumnsSize()); } @@ -969,40 +964,40 @@ public class JavaEntityTests extends ContextModelTestCase getJavaEntity().addSpecifiedSecondaryTable(1).setSpecifiedName("BAR"); getJavaEntity().addSpecifiedSecondaryTable(2).setSpecifiedName("BAZ"); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); - assertEquals(3, CollectionTools.size(typeResource.annotations(SecondaryTableAnnotation.ANNOTATION_NAME, SecondaryTablesAnnotation.ANNOTATION_NAME))); + assertEquals(3, resourceType.getAnnotationsSize(SecondaryTableAnnotation.ANNOTATION_NAME)); getJavaEntity().removeSpecifiedSecondaryTable(1); - Iterator secondaryTableResources = typeResource.annotations(SecondaryTableAnnotation.ANNOTATION_NAME, SecondaryTablesAnnotation.ANNOTATION_NAME); + Iterator secondaryTableResources = resourceType.getAnnotations(SecondaryTableAnnotation.ANNOTATION_NAME).iterator(); assertEquals("FOO", ((SecondaryTableAnnotation) secondaryTableResources.next()).getName()); assertEquals("BAZ", ((SecondaryTableAnnotation) secondaryTableResources.next()).getName()); assertFalse(secondaryTableResources.hasNext()); - Iterator secondaryTables = getJavaEntity().secondaryTables(); + Iterator secondaryTables = getJavaEntity().getSecondaryTables().iterator(); assertEquals("FOO", secondaryTables.next().getName()); assertEquals("BAZ", secondaryTables.next().getName()); assertFalse(secondaryTables.hasNext()); getJavaEntity().removeSpecifiedSecondaryTable(1); - secondaryTableResources = typeResource.annotations(SecondaryTableAnnotation.ANNOTATION_NAME, SecondaryTablesAnnotation.ANNOTATION_NAME); + secondaryTableResources = resourceType.getAnnotations(SecondaryTableAnnotation.ANNOTATION_NAME).iterator(); assertEquals("FOO", ((SecondaryTableAnnotation) secondaryTableResources.next()).getName()); assertFalse(secondaryTableResources.hasNext()); - secondaryTables = getJavaEntity().secondaryTables(); + secondaryTables = getJavaEntity().getSecondaryTables().iterator(); assertEquals("FOO", secondaryTables.next().getName()); assertFalse(secondaryTables.hasNext()); getJavaEntity().removeSpecifiedSecondaryTable(0); - secondaryTableResources = typeResource.annotations(SecondaryTableAnnotation.ANNOTATION_NAME, SecondaryTablesAnnotation.ANNOTATION_NAME); + secondaryTableResources = resourceType.getAnnotations(SecondaryTableAnnotation.ANNOTATION_NAME).iterator(); assertFalse(secondaryTableResources.hasNext()); - secondaryTables = getJavaEntity().secondaryTables(); + secondaryTables = getJavaEntity().getSecondaryTables().iterator(); assertFalse(secondaryTables.hasNext()); - assertNull(typeResource.getAnnotation(SecondaryTablesAnnotation.ANNOTATION_NAME)); + assertNull(resourceType.getAnnotation(SecondaryTableAnnotation.ANNOTATION_NAME)); } public void testMoveSpecifiedSecondaryTable() throws Exception { @@ -1010,35 +1005,35 @@ public class JavaEntityTests extends ContextModelTestCase addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); JavaEntity entity = getJavaEntity(); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); entity.addSpecifiedSecondaryTable(0).setSpecifiedName("FOO"); entity.addSpecifiedSecondaryTable(1).setSpecifiedName("BAR"); entity.addSpecifiedSecondaryTable(2).setSpecifiedName("BAZ"); - Iterator javaSecondaryTables = typeResource.annotations(SecondaryTableAnnotation.ANNOTATION_NAME, SecondaryTablesAnnotation.ANNOTATION_NAME); + Iterator javaSecondaryTables = resourceType.getAnnotations(SecondaryTableAnnotation.ANNOTATION_NAME).iterator(); assertEquals(3, CollectionTools.size(javaSecondaryTables)); entity.moveSpecifiedSecondaryTable(2, 0); - ListIterator secondaryTables = entity.specifiedSecondaryTables(); + ListIterator secondaryTables = entity.getSpecifiedSecondaryTables().iterator(); assertEquals("BAR", secondaryTables.next().getSpecifiedName()); assertEquals("BAZ", secondaryTables.next().getSpecifiedName()); assertEquals("FOO", secondaryTables.next().getSpecifiedName()); - javaSecondaryTables = typeResource.annotations(SecondaryTableAnnotation.ANNOTATION_NAME, SecondaryTablesAnnotation.ANNOTATION_NAME); + javaSecondaryTables = resourceType.getAnnotations(SecondaryTableAnnotation.ANNOTATION_NAME).iterator(); assertEquals("BAR", ((SecondaryTableAnnotation) javaSecondaryTables.next()).getName()); assertEquals("BAZ", ((SecondaryTableAnnotation) javaSecondaryTables.next()).getName()); assertEquals("FOO", ((SecondaryTableAnnotation) javaSecondaryTables.next()).getName()); entity.moveSpecifiedSecondaryTable(0, 1); - secondaryTables = entity.specifiedSecondaryTables(); + secondaryTables = entity.getSpecifiedSecondaryTables().iterator(); assertEquals("BAZ", secondaryTables.next().getSpecifiedName()); assertEquals("BAR", secondaryTables.next().getSpecifiedName()); assertEquals("FOO", secondaryTables.next().getSpecifiedName()); - javaSecondaryTables = typeResource.annotations(SecondaryTableAnnotation.ANNOTATION_NAME, SecondaryTablesAnnotation.ANNOTATION_NAME); + javaSecondaryTables = resourceType.getAnnotations(SecondaryTableAnnotation.ANNOTATION_NAME).iterator(); assertEquals("BAZ", ((SecondaryTableAnnotation) javaSecondaryTables.next()).getName()); assertEquals("BAR", ((SecondaryTableAnnotation) javaSecondaryTables.next()).getName()); assertEquals("FOO", ((SecondaryTableAnnotation) javaSecondaryTables.next()).getName()); @@ -1049,51 +1044,51 @@ public class JavaEntityTests extends ContextModelTestCase addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); JavaEntity entity = getJavaEntity(); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); - ((SecondaryTableAnnotation) typeResource.addAnnotation(0, SecondaryTableAnnotation.ANNOTATION_NAME, SecondaryTablesAnnotation.ANNOTATION_NAME)).setName("FOO"); - ((SecondaryTableAnnotation) typeResource.addAnnotation(1, SecondaryTableAnnotation.ANNOTATION_NAME, SecondaryTablesAnnotation.ANNOTATION_NAME)).setName("BAR"); - ((SecondaryTableAnnotation) typeResource.addAnnotation(2, SecondaryTableAnnotation.ANNOTATION_NAME, SecondaryTablesAnnotation.ANNOTATION_NAME)).setName("BAZ"); + ((SecondaryTableAnnotation) resourceType.addAnnotation(0, SecondaryTableAnnotation.ANNOTATION_NAME)).setName("FOO"); + ((SecondaryTableAnnotation) resourceType.addAnnotation(1, SecondaryTableAnnotation.ANNOTATION_NAME)).setName("BAR"); + ((SecondaryTableAnnotation) resourceType.addAnnotation(2, SecondaryTableAnnotation.ANNOTATION_NAME)).setName("BAZ"); getJpaProject().synchronizeContextModel(); - ListIterator secondaryTables = entity.specifiedSecondaryTables(); + ListIterator secondaryTables = entity.getSpecifiedSecondaryTables().iterator(); assertEquals("FOO", secondaryTables.next().getName()); assertEquals("BAR", secondaryTables.next().getName()); assertEquals("BAZ", secondaryTables.next().getName()); assertFalse(secondaryTables.hasNext()); - typeResource.moveAnnotation(2, 0, SecondaryTablesAnnotation.ANNOTATION_NAME); + resourceType.moveAnnotation(2, 0, SecondaryTableAnnotation.ANNOTATION_NAME); getJpaProject().synchronizeContextModel(); - secondaryTables = entity.specifiedSecondaryTables(); + secondaryTables = entity.getSpecifiedSecondaryTables().iterator(); assertEquals("BAR", secondaryTables.next().getName()); assertEquals("BAZ", secondaryTables.next().getName()); assertEquals("FOO", secondaryTables.next().getName()); assertFalse(secondaryTables.hasNext()); - typeResource.moveAnnotation(0, 1, SecondaryTablesAnnotation.ANNOTATION_NAME); + resourceType.moveAnnotation(0, 1, SecondaryTableAnnotation.ANNOTATION_NAME); getJpaProject().synchronizeContextModel(); - secondaryTables = entity.specifiedSecondaryTables(); + secondaryTables = entity.getSpecifiedSecondaryTables().iterator(); assertEquals("BAZ", secondaryTables.next().getName()); assertEquals("BAR", secondaryTables.next().getName()); assertEquals("FOO", secondaryTables.next().getName()); assertFalse(secondaryTables.hasNext()); - typeResource.removeAnnotation(1, SecondaryTableAnnotation.ANNOTATION_NAME, SecondaryTablesAnnotation.ANNOTATION_NAME); + resourceType.removeAnnotation(1, SecondaryTableAnnotation.ANNOTATION_NAME); getJpaProject().synchronizeContextModel(); - secondaryTables = entity.specifiedSecondaryTables(); + secondaryTables = entity.getSpecifiedSecondaryTables().iterator(); assertEquals("BAZ", secondaryTables.next().getName()); assertEquals("FOO", secondaryTables.next().getName()); assertFalse(secondaryTables.hasNext()); - typeResource.removeAnnotation(1, SecondaryTableAnnotation.ANNOTATION_NAME, SecondaryTablesAnnotation.ANNOTATION_NAME); + resourceType.removeAnnotation(1, SecondaryTableAnnotation.ANNOTATION_NAME); getJpaProject().synchronizeContextModel(); - secondaryTables = entity.specifiedSecondaryTables(); + secondaryTables = entity.getSpecifiedSecondaryTables().iterator(); assertEquals("BAZ", secondaryTables.next().getName()); assertFalse(secondaryTables.hasNext()); - typeResource.removeAnnotation(0, SecondaryTableAnnotation.ANNOTATION_NAME, SecondaryTablesAnnotation.ANNOTATION_NAME); + resourceType.removeAnnotation(0, SecondaryTableAnnotation.ANNOTATION_NAME); getJpaProject().synchronizeContextModel(); - secondaryTables = entity.specifiedSecondaryTables(); + secondaryTables = entity.getSpecifiedSecondaryTables().iterator(); assertFalse(secondaryTables.hasNext()); } @@ -1117,7 +1112,7 @@ public class JavaEntityTests extends ContextModelTestCase addXmlClassRef(PACKAGE_NAME + ".AnnotationTestTypeChild"); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ListIterator specifiedClassRefs = getPersistenceUnit().specifiedClassRefs(); + ListIterator specifiedClassRefs = getPersistenceUnit().getSpecifiedClassRefs().iterator(); Entity childEntity = (Entity) specifiedClassRefs.next().getJavaPersistentType().getMapping(); Entity rootEntity = (Entity) specifiedClassRefs.next().getJavaPersistentType().getMapping(); @@ -1141,7 +1136,7 @@ public class JavaEntityTests extends ContextModelTestCase addXmlClassRef(PACKAGE_NAME + ".AnnotationTestTypeChild"); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ListIterator specifiedClassRefs = getPersistenceUnit().specifiedClassRefs(); + ListIterator specifiedClassRefs = getPersistenceUnit().getSpecifiedClassRefs().iterator(); Entity childEntity = (Entity) specifiedClassRefs.next().getJavaPersistentType().getMapping(); Entity rootEntity = (Entity) specifiedClassRefs.next().getJavaPersistentType().getMapping(); @@ -1163,30 +1158,30 @@ public class JavaEntityTests extends ContextModelTestCase createTestEntityWithName(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - SecondaryTableAnnotation secondaryTable = (SecondaryTableAnnotation) typeResource.addAnnotation(0, JPA.SECONDARY_TABLE, JPA.SECONDARY_TABLES); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + SecondaryTableAnnotation secondaryTable = (SecondaryTableAnnotation) resourceType.addAnnotation(0, JPA.SECONDARY_TABLE); secondaryTable.setName("FOO"); getJpaProject().synchronizeContextModel(); - assertEquals(1, getJavaEntity().secondaryTablesSize()); - assertEquals("FOO", getJavaEntity().secondaryTables().next().getSpecifiedName()); - assertEquals("FOO", getJavaEntity().secondaryTables().next().getName()); + assertEquals(1, getJavaEntity().getSecondaryTablesSize()); + assertEquals("FOO", getJavaEntity().getSecondaryTables().iterator().next().getSpecifiedName()); + assertEquals("FOO", getJavaEntity().getSecondaryTables().iterator().next().getName()); - SecondaryTableAnnotation secondaryTable2 = (SecondaryTableAnnotation) typeResource.addAnnotation(1, JPA.SECONDARY_TABLE, JPA.SECONDARY_TABLES); + SecondaryTableAnnotation secondaryTable2 = (SecondaryTableAnnotation) resourceType.addAnnotation(1, JPA.SECONDARY_TABLE); secondaryTable2.setName("BAR"); getJpaProject().synchronizeContextModel(); - assertEquals(2, getJavaEntity().secondaryTablesSize()); - ListIterator secondaryTables = getJavaEntity().secondaryTables(); + assertEquals(2, getJavaEntity().getSecondaryTablesSize()); + ListIterator secondaryTables = getJavaEntity().getSecondaryTables().iterator(); assertEquals("FOO", secondaryTables.next().getSpecifiedName()); assertEquals("BAR", secondaryTables.next().getSpecifiedName()); - SecondaryTableAnnotation secondaryTable3 = (SecondaryTableAnnotation) typeResource.addAnnotation(0, JPA.SECONDARY_TABLE, JPA.SECONDARY_TABLES); + SecondaryTableAnnotation secondaryTable3 = (SecondaryTableAnnotation) resourceType.addAnnotation(0, JPA.SECONDARY_TABLE); secondaryTable3.setName("BAZ"); getJpaProject().synchronizeContextModel(); - assertEquals(3, getJavaEntity().secondaryTablesSize()); - secondaryTables = getJavaEntity().secondaryTables(); + assertEquals(3, getJavaEntity().getSecondaryTablesSize()); + secondaryTables = getJavaEntity().getSecondaryTables().iterator(); assertEquals("BAZ", secondaryTables.next().getSpecifiedName()); assertEquals("FOO", secondaryTables.next().getSpecifiedName()); assertEquals("BAR", secondaryTables.next().getSpecifiedName()); @@ -1197,35 +1192,35 @@ public class JavaEntityTests extends ContextModelTestCase addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); getJavaEntity().addSpecifiedSecondaryTable(2).setSpecifiedName("baz"); - ListIterator secondaryTables = getJavaEntity().secondaryTables(); + ListIterator secondaryTables = getJavaEntity().getSecondaryTables().iterator(); - assertEquals(3, getJavaEntity().secondaryTablesSize()); + assertEquals(3, getJavaEntity().getSecondaryTablesSize()); assertEquals("foo", secondaryTables.next().getSpecifiedName()); assertEquals("bar", secondaryTables.next().getSpecifiedName()); assertEquals("baz", secondaryTables.next().getSpecifiedName()); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - typeResource.removeAnnotation(0, JPA.SECONDARY_TABLE, JPA.SECONDARY_TABLES); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + resourceType.removeAnnotation(0, JPA.SECONDARY_TABLE); getJpaProject().synchronizeContextModel(); - assertEquals(2, getJavaEntity().secondaryTablesSize()); - secondaryTables = getJavaEntity().secondaryTables(); + assertEquals(2, getJavaEntity().getSecondaryTablesSize()); + secondaryTables = getJavaEntity().getSecondaryTables().iterator(); assertEquals("bar", secondaryTables.next().getSpecifiedName()); assertEquals("baz", secondaryTables.next().getSpecifiedName()); - typeResource.removeAnnotation(0, JPA.SECONDARY_TABLE, JPA.SECONDARY_TABLES); + resourceType.removeAnnotation(0, JPA.SECONDARY_TABLE); getJpaProject().synchronizeContextModel(); - secondaryTables = getJavaEntity().secondaryTables(); - assertEquals(1, getJavaEntity().secondaryTablesSize()); + secondaryTables = getJavaEntity().getSecondaryTables().iterator(); + assertEquals(1, getJavaEntity().getSecondaryTablesSize()); assertEquals("baz", secondaryTables.next().getSpecifiedName()); - typeResource.removeAnnotation(0, JPA.SECONDARY_TABLE, JPA.SECONDARY_TABLES); + resourceType.removeAnnotation(0, JPA.SECONDARY_TABLE); getJpaProject().synchronizeContextModel(); - secondaryTables = getJavaEntity().secondaryTables(); - assertEquals(0, getJavaEntity().secondaryTablesSize()); + secondaryTables = getJavaEntity().getSecondaryTables().iterator(); + assertEquals(0, getJavaEntity().getSecondaryTablesSize()); assertFalse(secondaryTables.hasNext()); } @@ -1234,18 +1229,18 @@ public class JavaEntityTests extends ContextModelTestCase addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); assertNull(getJavaEntity().getGeneratorContainer().getSequenceGenerator()); - assertEquals(0, getJavaEntity().getPersistenceUnit().generatorsSize()); + assertEquals(0, getJavaEntity().getPersistenceUnit().getGeneratorsSize()); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - typeResource.addAnnotation(JPA.SEQUENCE_GENERATOR); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + resourceType.addAnnotation(JPA.SEQUENCE_GENERATOR); getJpaProject().synchronizeContextModel(); assertNotNull(getJavaEntity().getGeneratorContainer().getSequenceGenerator()); - assertEquals(2, typeResource.annotationsSize()); - assertEquals(1, getJavaEntity().getPersistenceUnit().generatorsSize()); + assertEquals(2, resourceType.getAnnotationsSize()); + assertEquals(1, getJavaEntity().getPersistenceUnit().getGeneratorsSize()); getJavaEntity().getGeneratorContainer().getSequenceGenerator().setName("foo"); - assertEquals(1, getJavaEntity().getPersistenceUnit().generatorsSize()); + assertEquals(1, getJavaEntity().getPersistenceUnit().getGeneratorsSize()); } public void testAddSequenceGenerator() throws Exception { @@ -1256,9 +1251,9 @@ public class JavaEntityTests extends ContextModelTestCase getJavaEntity().getGeneratorContainer().addSequenceGenerator(); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); - assertNotNull(typeResource.getAnnotation(JPA.SEQUENCE_GENERATOR)); + assertNotNull(resourceType.getAnnotation(JPA.SEQUENCE_GENERATOR)); assertNotNull(getJavaEntity().getGeneratorContainer().getSequenceGenerator()); //try adding another sequence generator, should get an IllegalStateException @@ -1274,14 +1269,14 @@ public class JavaEntityTests extends ContextModelTestCase createTestEntity(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - typeResource.addAnnotation(JPA.SEQUENCE_GENERATOR); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + resourceType.addAnnotation(JPA.SEQUENCE_GENERATOR); getJpaProject().synchronizeContextModel(); getJavaEntity().getGeneratorContainer().removeSequenceGenerator(); assertNull(getJavaEntity().getGeneratorContainer().getSequenceGenerator()); - assertNull(typeResource.getAnnotation(JPA.SEQUENCE_GENERATOR)); + assertNull(resourceType.getAnnotation(JPA.SEQUENCE_GENERATOR)); //try removing the sequence generator again, should get an IllegalStateException try { @@ -1297,18 +1292,18 @@ public class JavaEntityTests extends ContextModelTestCase addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); assertNull(getJavaEntity().getGeneratorContainer().getTableGenerator()); - assertEquals(0, getJavaEntity().getPersistenceUnit().generatorsSize()); + assertEquals(0, getJavaEntity().getPersistenceUnit().getGeneratorsSize()); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - typeResource.addAnnotation(JPA.TABLE_GENERATOR); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + resourceType.addAnnotation(JPA.TABLE_GENERATOR); getJpaProject().synchronizeContextModel(); assertNotNull(getJavaEntity().getGeneratorContainer().getTableGenerator()); - assertEquals(2, typeResource.annotationsSize()); - assertEquals(1, getJavaEntity().getPersistenceUnit().generatorsSize()); + assertEquals(2, resourceType.getAnnotationsSize()); + assertEquals(1, getJavaEntity().getPersistenceUnit().getGeneratorsSize()); getJavaEntity().getGeneratorContainer().getTableGenerator().setName("foo"); - assertEquals(1, getJavaEntity().getPersistenceUnit().generatorsSize()); + assertEquals(1, getJavaEntity().getPersistenceUnit().getGeneratorsSize()); } public void testAddTableGenerator() throws Exception { @@ -1319,9 +1314,9 @@ public class JavaEntityTests extends ContextModelTestCase getJavaEntity().getGeneratorContainer().addTableGenerator(); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); - assertNotNull(typeResource.getAnnotation(JPA.TABLE_GENERATOR)); + assertNotNull(resourceType.getAnnotation(JPA.TABLE_GENERATOR)); assertNotNull(getJavaEntity().getGeneratorContainer().getTableGenerator()); //try adding another table generator, should get an IllegalStateException @@ -1337,14 +1332,14 @@ public class JavaEntityTests extends ContextModelTestCase createTestEntity(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - typeResource.addAnnotation(JPA.TABLE_GENERATOR); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + resourceType.addAnnotation(JPA.TABLE_GENERATOR); getJpaProject().synchronizeContextModel(); getJavaEntity().getGeneratorContainer().removeTableGenerator(); assertNull(getJavaEntity().getGeneratorContainer().getTableGenerator()); - assertNull(typeResource.getAnnotation(JPA.TABLE_GENERATOR)); + assertNull(resourceType.getAnnotation(JPA.TABLE_GENERATOR)); //try removing the table generator again, should get an IllegalStateException try { @@ -1361,8 +1356,8 @@ public class JavaEntityTests extends ContextModelTestCase assertNotNull(getJavaEntity().getDiscriminatorColumn()); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - DiscriminatorColumnAnnotation column = (DiscriminatorColumnAnnotation) typeResource.addAnnotation(JPA.DISCRIMINATOR_COLUMN); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + DiscriminatorColumnAnnotation column = (DiscriminatorColumnAnnotation) resourceType.addAnnotation(JPA.DISCRIMINATOR_COLUMN); column.setName("foo"); getJpaProject().synchronizeContextModel(); @@ -1373,7 +1368,7 @@ public class JavaEntityTests extends ContextModelTestCase assertNull(getJavaEntity().getDiscriminatorColumn().getSpecifiedName()); - typeResource.removeAnnotation(JPA.DISCRIMINATOR_COLUMN); + resourceType.removeAnnotation(JPA.DISCRIMINATOR_COLUMN); getJpaProject().synchronizeContextModel(); assertNotNull(getJavaEntity().getDiscriminatorColumn()); @@ -1383,64 +1378,64 @@ public class JavaEntityTests extends ContextModelTestCase createTestEntity(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ListIterator specifiedPkJoinColumns = getJavaEntity().specifiedPrimaryKeyJoinColumns(); + ListIterator specifiedPkJoinColumns = getJavaEntity().getSpecifiedPrimaryKeyJoinColumns().iterator(); assertFalse(specifiedPkJoinColumns.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 - PrimaryKeyJoinColumnAnnotation pkJoinColumn = (PrimaryKeyJoinColumnAnnotation) typeResource.addAnnotation(0, JPA.PRIMARY_KEY_JOIN_COLUMN, JPA.PRIMARY_KEY_JOIN_COLUMNS); + PrimaryKeyJoinColumnAnnotation pkJoinColumn = (PrimaryKeyJoinColumnAnnotation) resourceType.addAnnotation(0, JPA.PRIMARY_KEY_JOIN_COLUMN); pkJoinColumn.setName("FOO"); getJpaProject().synchronizeContextModel(); - specifiedPkJoinColumns = getJavaEntity().specifiedPrimaryKeyJoinColumns(); + specifiedPkJoinColumns = getJavaEntity().getSpecifiedPrimaryKeyJoinColumns().iterator(); assertEquals("FOO", specifiedPkJoinColumns.next().getName()); assertFalse(specifiedPkJoinColumns.hasNext()); - pkJoinColumn = (PrimaryKeyJoinColumnAnnotation) typeResource.addAnnotation(0, JPA.PRIMARY_KEY_JOIN_COLUMN, JPA.PRIMARY_KEY_JOIN_COLUMNS); + pkJoinColumn = (PrimaryKeyJoinColumnAnnotation) resourceType.addAnnotation(0, JPA.PRIMARY_KEY_JOIN_COLUMN); pkJoinColumn.setName("BAR"); getJpaProject().synchronizeContextModel(); - specifiedPkJoinColumns = getJavaEntity().specifiedPrimaryKeyJoinColumns(); + specifiedPkJoinColumns = getJavaEntity().getSpecifiedPrimaryKeyJoinColumns().iterator(); assertEquals("BAR", specifiedPkJoinColumns.next().getName()); assertEquals("FOO", specifiedPkJoinColumns.next().getName()); assertFalse(specifiedPkJoinColumns.hasNext()); - pkJoinColumn = (PrimaryKeyJoinColumnAnnotation) typeResource.addAnnotation(0, JPA.PRIMARY_KEY_JOIN_COLUMN, JPA.PRIMARY_KEY_JOIN_COLUMNS); + pkJoinColumn = (PrimaryKeyJoinColumnAnnotation) resourceType.addAnnotation(0, JPA.PRIMARY_KEY_JOIN_COLUMN); pkJoinColumn.setName("BAZ"); getJpaProject().synchronizeContextModel(); - specifiedPkJoinColumns = getJavaEntity().specifiedPrimaryKeyJoinColumns(); + specifiedPkJoinColumns = getJavaEntity().getSpecifiedPrimaryKeyJoinColumns().iterator(); assertEquals("BAZ", specifiedPkJoinColumns.next().getName()); assertEquals("BAR", specifiedPkJoinColumns.next().getName()); assertEquals("FOO", specifiedPkJoinColumns.next().getName()); assertFalse(specifiedPkJoinColumns.hasNext()); //move an annotation to the resource model and verify the context model is updated - typeResource.moveAnnotation(1, 0, JPA.PRIMARY_KEY_JOIN_COLUMNS); + resourceType.moveAnnotation(1, 0, JPA.PRIMARY_KEY_JOIN_COLUMN); getJpaProject().synchronizeContextModel(); - specifiedPkJoinColumns = getJavaEntity().specifiedPrimaryKeyJoinColumns(); + specifiedPkJoinColumns = getJavaEntity().getSpecifiedPrimaryKeyJoinColumns().iterator(); assertEquals("BAR", specifiedPkJoinColumns.next().getName()); assertEquals("BAZ", specifiedPkJoinColumns.next().getName()); assertEquals("FOO", specifiedPkJoinColumns.next().getName()); assertFalse(specifiedPkJoinColumns.hasNext()); - typeResource.removeAnnotation(0, JPA.PRIMARY_KEY_JOIN_COLUMN, JPA.PRIMARY_KEY_JOIN_COLUMNS); + resourceType.removeAnnotation(0, JPA.PRIMARY_KEY_JOIN_COLUMN); getJpaProject().synchronizeContextModel(); - specifiedPkJoinColumns = getJavaEntity().specifiedPrimaryKeyJoinColumns(); + specifiedPkJoinColumns = getJavaEntity().getSpecifiedPrimaryKeyJoinColumns().iterator(); assertEquals("BAZ", specifiedPkJoinColumns.next().getName()); assertEquals("FOO", specifiedPkJoinColumns.next().getName()); assertFalse(specifiedPkJoinColumns.hasNext()); - typeResource.removeAnnotation(0, JPA.PRIMARY_KEY_JOIN_COLUMN, JPA.PRIMARY_KEY_JOIN_COLUMNS); + resourceType.removeAnnotation(0, JPA.PRIMARY_KEY_JOIN_COLUMN); getJpaProject().synchronizeContextModel(); - specifiedPkJoinColumns = getJavaEntity().specifiedPrimaryKeyJoinColumns(); + specifiedPkJoinColumns = getJavaEntity().getSpecifiedPrimaryKeyJoinColumns().iterator(); assertEquals("FOO", specifiedPkJoinColumns.next().getName()); assertFalse(specifiedPkJoinColumns.hasNext()); - typeResource.removeAnnotation(0, JPA.PRIMARY_KEY_JOIN_COLUMN, JPA.PRIMARY_KEY_JOIN_COLUMNS); + resourceType.removeAnnotation(0, JPA.PRIMARY_KEY_JOIN_COLUMN); getJpaProject().synchronizeContextModel(); - specifiedPkJoinColumns = getJavaEntity().specifiedPrimaryKeyJoinColumns(); + specifiedPkJoinColumns = getJavaEntity().getSpecifiedPrimaryKeyJoinColumns().iterator(); assertFalse(specifiedPkJoinColumns.hasNext()); } @@ -1448,13 +1443,13 @@ public class JavaEntityTests extends ContextModelTestCase createTestEntity(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - assertEquals(0, getJavaEntity().specifiedPrimaryKeyJoinColumnsSize()); + assertEquals(0, getJavaEntity().getSpecifiedPrimaryKeyJoinColumnsSize()); getJavaEntity().addSpecifiedPrimaryKeyJoinColumn(0).setSpecifiedName("FOO"); getJavaEntity().addSpecifiedPrimaryKeyJoinColumn(0).setSpecifiedName("BAR"); getJavaEntity().addSpecifiedPrimaryKeyJoinColumn(0).setSpecifiedName("BAZ"); - assertEquals(3, getJavaEntity().specifiedPrimaryKeyJoinColumnsSize()); + assertEquals(3, getJavaEntity().getSpecifiedPrimaryKeyJoinColumnsSize()); } public void testPrimaryKeyJoinColumnsSize() throws Exception { @@ -1462,14 +1457,14 @@ public class JavaEntityTests extends ContextModelTestCase addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); //just the default pkJoinColumn, so 1 - assertEquals(1, getJavaEntity().primaryKeyJoinColumnsSize()); + assertEquals(1, getJavaEntity().getPrimaryKeyJoinColumnsSize()); getJavaEntity().addSpecifiedPrimaryKeyJoinColumn(0).setSpecifiedName("FOO"); getJavaEntity().addSpecifiedPrimaryKeyJoinColumn(0).setSpecifiedName("BAR"); getJavaEntity().addSpecifiedPrimaryKeyJoinColumn(0).setSpecifiedName("BAZ"); //only the specified pkJoinColumns, 3 - assertEquals(3, getJavaEntity().primaryKeyJoinColumnsSize()); + assertEquals(3, getJavaEntity().getPrimaryKeyJoinColumnsSize()); } public void testGetDefaultPrimaryKeyJoinColumn() throws Exception { @@ -1493,8 +1488,8 @@ public class JavaEntityTests extends ContextModelTestCase getJavaEntity().addSpecifiedPrimaryKeyJoinColumn(0).setSpecifiedName("BAR"); getJavaEntity().addSpecifiedPrimaryKeyJoinColumn(0).setSpecifiedName("BAZ"); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - Iterator pkJoinColumns = typeResource.annotations(PrimaryKeyJoinColumnAnnotation.ANNOTATION_NAME, PrimaryKeyJoinColumnsAnnotation.ANNOTATION_NAME); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + Iterator pkJoinColumns = resourceType.getAnnotations(PrimaryKeyJoinColumnAnnotation.ANNOTATION_NAME).iterator(); assertEquals("BAZ", ((PrimaryKeyJoinColumnAnnotation) pkJoinColumns.next()).getName()); assertEquals("BAR", ((PrimaryKeyJoinColumnAnnotation) pkJoinColumns.next()).getName()); @@ -1510,8 +1505,8 @@ public class JavaEntityTests extends ContextModelTestCase getJavaEntity().addSpecifiedPrimaryKeyJoinColumn(1).setSpecifiedName("BAR"); getJavaEntity().addSpecifiedPrimaryKeyJoinColumn(2).setSpecifiedName("BAZ"); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - Iterator pkJoinColumns = typeResource.annotations(PrimaryKeyJoinColumnAnnotation.ANNOTATION_NAME, PrimaryKeyJoinColumnsAnnotation.ANNOTATION_NAME); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + Iterator pkJoinColumns = resourceType.getAnnotations(PrimaryKeyJoinColumnAnnotation.ANNOTATION_NAME).iterator(); assertEquals("FOO", ((PrimaryKeyJoinColumnAnnotation) pkJoinColumns.next()).getName()); assertEquals("BAR", ((PrimaryKeyJoinColumnAnnotation) pkJoinColumns.next()).getName()); @@ -1526,40 +1521,40 @@ public class JavaEntityTests extends ContextModelTestCase getJavaEntity().addSpecifiedPrimaryKeyJoinColumn(1).setSpecifiedName("BAR"); getJavaEntity().addSpecifiedPrimaryKeyJoinColumn(2).setSpecifiedName("BAZ"); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); - assertEquals(3, CollectionTools.size(typeResource.annotations(PrimaryKeyJoinColumnAnnotation.ANNOTATION_NAME, PrimaryKeyJoinColumnsAnnotation.ANNOTATION_NAME))); + assertEquals(3, resourceType.getAnnotationsSize(PrimaryKeyJoinColumnAnnotation.ANNOTATION_NAME)); getJavaEntity().removeSpecifiedPrimaryKeyJoinColumn(1); - Iterator pkJoinColumnResources = typeResource.annotations(PrimaryKeyJoinColumnAnnotation.ANNOTATION_NAME, PrimaryKeyJoinColumnsAnnotation.ANNOTATION_NAME); + Iterator pkJoinColumnResources = resourceType.getAnnotations(PrimaryKeyJoinColumnAnnotation.ANNOTATION_NAME).iterator(); assertEquals("FOO", ((PrimaryKeyJoinColumnAnnotation) pkJoinColumnResources.next()).getName()); assertEquals("BAZ", ((PrimaryKeyJoinColumnAnnotation) pkJoinColumnResources.next()).getName()); assertFalse(pkJoinColumnResources.hasNext()); - Iterator pkJoinColumns = getJavaEntity().specifiedPrimaryKeyJoinColumns(); + Iterator pkJoinColumns = getJavaEntity().getSpecifiedPrimaryKeyJoinColumns().iterator(); assertEquals("FOO", pkJoinColumns.next().getName()); assertEquals("BAZ", pkJoinColumns.next().getName()); assertFalse(pkJoinColumns.hasNext()); getJavaEntity().removeSpecifiedPrimaryKeyJoinColumn(1); - pkJoinColumnResources = typeResource.annotations(PrimaryKeyJoinColumnAnnotation.ANNOTATION_NAME, PrimaryKeyJoinColumnsAnnotation.ANNOTATION_NAME); + pkJoinColumnResources = resourceType.getAnnotations(PrimaryKeyJoinColumnAnnotation.ANNOTATION_NAME).iterator(); assertEquals("FOO", ((PrimaryKeyJoinColumnAnnotation) pkJoinColumnResources.next()).getName()); assertFalse(pkJoinColumnResources.hasNext()); - pkJoinColumns = getJavaEntity().specifiedPrimaryKeyJoinColumns(); + pkJoinColumns = getJavaEntity().getSpecifiedPrimaryKeyJoinColumns().iterator(); assertEquals("FOO", pkJoinColumns.next().getName()); assertFalse(pkJoinColumns.hasNext()); getJavaEntity().removeSpecifiedPrimaryKeyJoinColumn(0); - pkJoinColumnResources = typeResource.annotations(PrimaryKeyJoinColumnAnnotation.ANNOTATION_NAME, PrimaryKeyJoinColumnsAnnotation.ANNOTATION_NAME); + pkJoinColumnResources = resourceType.getAnnotations(PrimaryKeyJoinColumnAnnotation.ANNOTATION_NAME).iterator(); assertFalse(pkJoinColumnResources.hasNext()); - pkJoinColumns = getJavaEntity().specifiedPrimaryKeyJoinColumns(); + pkJoinColumns = getJavaEntity().getSpecifiedPrimaryKeyJoinColumns().iterator(); assertFalse(pkJoinColumns.hasNext()); - assertNull(typeResource.getAnnotation(PrimaryKeyJoinColumnsAnnotation.ANNOTATION_NAME)); + assertNull(resourceType.getAnnotation(0, PrimaryKeyJoinColumnAnnotation.ANNOTATION_NAME)); } public void testMoveSpecifiedPrimaryKeyJoinColumn() throws Exception { @@ -1567,35 +1562,35 @@ public class JavaEntityTests extends ContextModelTestCase addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); JavaEntity entity = getJavaEntity(); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); entity.addSpecifiedPrimaryKeyJoinColumn(0).setSpecifiedName("FOO"); entity.addSpecifiedPrimaryKeyJoinColumn(1).setSpecifiedName("BAR"); entity.addSpecifiedPrimaryKeyJoinColumn(2).setSpecifiedName("BAZ"); - Iterator javaPrimaryKeyJoinColumns = typeResource.annotations(PrimaryKeyJoinColumnAnnotation.ANNOTATION_NAME, PrimaryKeyJoinColumnsAnnotation.ANNOTATION_NAME); + Iterator javaPrimaryKeyJoinColumns = resourceType.getAnnotations(PrimaryKeyJoinColumnAnnotation.ANNOTATION_NAME).iterator(); assertEquals(3, CollectionTools.size(javaPrimaryKeyJoinColumns)); entity.moveSpecifiedPrimaryKeyJoinColumn(2, 0); - ListIterator primaryKeyJoinColumns = entity.specifiedPrimaryKeyJoinColumns(); + ListIterator primaryKeyJoinColumns = entity.getSpecifiedPrimaryKeyJoinColumns().iterator(); assertEquals("BAR", primaryKeyJoinColumns.next().getSpecifiedName()); assertEquals("BAZ", primaryKeyJoinColumns.next().getSpecifiedName()); assertEquals("FOO", primaryKeyJoinColumns.next().getSpecifiedName()); - javaPrimaryKeyJoinColumns = typeResource.annotations(PrimaryKeyJoinColumnAnnotation.ANNOTATION_NAME, PrimaryKeyJoinColumnsAnnotation.ANNOTATION_NAME); + javaPrimaryKeyJoinColumns = resourceType.getAnnotations(PrimaryKeyJoinColumnAnnotation.ANNOTATION_NAME).iterator(); assertEquals("BAR", ((PrimaryKeyJoinColumnAnnotation) javaPrimaryKeyJoinColumns.next()).getName()); assertEquals("BAZ", ((PrimaryKeyJoinColumnAnnotation) javaPrimaryKeyJoinColumns.next()).getName()); assertEquals("FOO", ((PrimaryKeyJoinColumnAnnotation) javaPrimaryKeyJoinColumns.next()).getName()); entity.moveSpecifiedPrimaryKeyJoinColumn(0, 1); - primaryKeyJoinColumns = entity.specifiedPrimaryKeyJoinColumns(); + primaryKeyJoinColumns = entity.getSpecifiedPrimaryKeyJoinColumns().iterator(); assertEquals("BAZ", primaryKeyJoinColumns.next().getSpecifiedName()); assertEquals("BAR", primaryKeyJoinColumns.next().getSpecifiedName()); assertEquals("FOO", primaryKeyJoinColumns.next().getSpecifiedName()); - javaPrimaryKeyJoinColumns = typeResource.annotations(PrimaryKeyJoinColumnAnnotation.ANNOTATION_NAME, PrimaryKeyJoinColumnsAnnotation.ANNOTATION_NAME); + javaPrimaryKeyJoinColumns = resourceType.getAnnotations(PrimaryKeyJoinColumnAnnotation.ANNOTATION_NAME).iterator(); assertEquals("BAZ", ((PrimaryKeyJoinColumnAnnotation) javaPrimaryKeyJoinColumns.next()).getName()); assertEquals("BAR", ((PrimaryKeyJoinColumnAnnotation) javaPrimaryKeyJoinColumns.next()).getName()); assertEquals("FOO", ((PrimaryKeyJoinColumnAnnotation) javaPrimaryKeyJoinColumns.next()).getName()); @@ -1606,51 +1601,51 @@ public class JavaEntityTests extends ContextModelTestCase addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); JavaEntity entity = getJavaEntity(); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); - ((PrimaryKeyJoinColumnAnnotation) typeResource.addAnnotation(0, PrimaryKeyJoinColumnAnnotation.ANNOTATION_NAME, PrimaryKeyJoinColumnsAnnotation.ANNOTATION_NAME)).setName("FOO"); - ((PrimaryKeyJoinColumnAnnotation) typeResource.addAnnotation(1, PrimaryKeyJoinColumnAnnotation.ANNOTATION_NAME, PrimaryKeyJoinColumnsAnnotation.ANNOTATION_NAME)).setName("BAR"); - ((PrimaryKeyJoinColumnAnnotation) typeResource.addAnnotation(2, PrimaryKeyJoinColumnAnnotation.ANNOTATION_NAME, PrimaryKeyJoinColumnsAnnotation.ANNOTATION_NAME)).setName("BAZ"); + ((PrimaryKeyJoinColumnAnnotation) resourceType.addAnnotation(0, PrimaryKeyJoinColumnAnnotation.ANNOTATION_NAME)).setName("FOO"); + ((PrimaryKeyJoinColumnAnnotation) resourceType.addAnnotation(1, PrimaryKeyJoinColumnAnnotation.ANNOTATION_NAME)).setName("BAR"); + ((PrimaryKeyJoinColumnAnnotation) resourceType.addAnnotation(2, PrimaryKeyJoinColumnAnnotation.ANNOTATION_NAME)).setName("BAZ"); getJpaProject().synchronizeContextModel(); - ListIterator primaryKeyJoinColumns = entity.specifiedPrimaryKeyJoinColumns(); + ListIterator primaryKeyJoinColumns = entity.getSpecifiedPrimaryKeyJoinColumns().iterator(); assertEquals("FOO", primaryKeyJoinColumns.next().getName()); assertEquals("BAR", primaryKeyJoinColumns.next().getName()); assertEquals("BAZ", primaryKeyJoinColumns.next().getName()); assertFalse(primaryKeyJoinColumns.hasNext()); - typeResource.moveAnnotation(2, 0, PrimaryKeyJoinColumnsAnnotation.ANNOTATION_NAME); + resourceType.moveAnnotation(2, 0, PrimaryKeyJoinColumnAnnotation.ANNOTATION_NAME); getJpaProject().synchronizeContextModel(); - primaryKeyJoinColumns = entity.specifiedPrimaryKeyJoinColumns(); + primaryKeyJoinColumns = entity.getSpecifiedPrimaryKeyJoinColumns().iterator(); assertEquals("BAR", primaryKeyJoinColumns.next().getName()); assertEquals("BAZ", primaryKeyJoinColumns.next().getName()); assertEquals("FOO", primaryKeyJoinColumns.next().getName()); assertFalse(primaryKeyJoinColumns.hasNext()); - typeResource.moveAnnotation(0, 1, PrimaryKeyJoinColumnsAnnotation.ANNOTATION_NAME); + resourceType.moveAnnotation(0, 1, PrimaryKeyJoinColumnAnnotation.ANNOTATION_NAME); getJpaProject().synchronizeContextModel(); - primaryKeyJoinColumns = entity.specifiedPrimaryKeyJoinColumns(); + primaryKeyJoinColumns = entity.getSpecifiedPrimaryKeyJoinColumns().iterator(); assertEquals("BAZ", primaryKeyJoinColumns.next().getName()); assertEquals("BAR", primaryKeyJoinColumns.next().getName()); assertEquals("FOO", primaryKeyJoinColumns.next().getName()); assertFalse(primaryKeyJoinColumns.hasNext()); - typeResource.removeAnnotation(1, PrimaryKeyJoinColumnAnnotation.ANNOTATION_NAME, PrimaryKeyJoinColumnsAnnotation.ANNOTATION_NAME); + resourceType.removeAnnotation(1, PrimaryKeyJoinColumnAnnotation.ANNOTATION_NAME); getJpaProject().synchronizeContextModel(); - primaryKeyJoinColumns = entity.specifiedPrimaryKeyJoinColumns(); + primaryKeyJoinColumns = entity.getSpecifiedPrimaryKeyJoinColumns().iterator(); assertEquals("BAZ", primaryKeyJoinColumns.next().getName()); assertEquals("FOO", primaryKeyJoinColumns.next().getName()); assertFalse(primaryKeyJoinColumns.hasNext()); - typeResource.removeAnnotation(1, PrimaryKeyJoinColumnAnnotation.ANNOTATION_NAME, PrimaryKeyJoinColumnsAnnotation.ANNOTATION_NAME); + resourceType.removeAnnotation(1, PrimaryKeyJoinColumnAnnotation.ANNOTATION_NAME); getJpaProject().synchronizeContextModel(); - primaryKeyJoinColumns = entity.specifiedPrimaryKeyJoinColumns(); + primaryKeyJoinColumns = entity.getSpecifiedPrimaryKeyJoinColumns().iterator(); assertEquals("BAZ", primaryKeyJoinColumns.next().getName()); assertFalse(primaryKeyJoinColumns.hasNext()); - typeResource.removeAnnotation(0, PrimaryKeyJoinColumnAnnotation.ANNOTATION_NAME, PrimaryKeyJoinColumnsAnnotation.ANNOTATION_NAME); + resourceType.removeAnnotation(0, PrimaryKeyJoinColumnAnnotation.ANNOTATION_NAME); getJpaProject().synchronizeContextModel(); - primaryKeyJoinColumns = entity.specifiedPrimaryKeyJoinColumns(); + primaryKeyJoinColumns = entity.getSpecifiedPrimaryKeyJoinColumns().iterator(); assertFalse(primaryKeyJoinColumns.hasNext()); } @@ -1661,7 +1656,7 @@ public class JavaEntityTests extends ContextModelTestCase assertTrue(getJavaEntity().getDefaultPrimaryKeyJoinColumn().isDefault()); getJavaEntity().addSpecifiedPrimaryKeyJoinColumn(0); - PrimaryKeyJoinColumn specifiedPkJoinColumn = getJavaEntity().specifiedPrimaryKeyJoinColumns().next(); + PrimaryKeyJoinColumn specifiedPkJoinColumn = getJavaEntity().getSpecifiedPrimaryKeyJoinColumns().iterator().next(); assertFalse(specifiedPkJoinColumn.isDefault()); assertNull(getJavaEntity().getDefaultPrimaryKeyJoinColumn()); @@ -1755,7 +1750,7 @@ public class JavaEntityTests extends ContextModelTestCase assertFalse(overridableAttributes.hasNext()); - ListIterator classRefs = getPersistenceUnit().specifiedClassRefs(); + ListIterator classRefs = getPersistenceUnit().getSpecifiedClassRefs().iterator(); classRefs.next(); JavaEntity abstractEntity = (JavaEntity) classRefs.next().getJavaPersistentType().getMapping(); overridableAttributes = abstractEntity.allOverridableAttributeNames(); @@ -1777,7 +1772,7 @@ public class JavaEntityTests extends ContextModelTestCase assertFalse(overridableAssociations.hasNext()); - ListIterator classRefs = getPersistenceUnit().specifiedClassRefs(); + ListIterator classRefs = getPersistenceUnit().getSpecifiedClassRefs().iterator(); classRefs.next(); JavaEntity abstractEntity = (JavaEntity) classRefs.next().getJavaPersistentType().getMapping(); overridableAssociations = abstractEntity.allOverridableAssociationNames(); @@ -1819,64 +1814,64 @@ public class JavaEntityTests extends ContextModelTestCase addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); JavaAttributeOverrideContainer overrideContainer = getJavaEntity().getAttributeOverrideContainer(); - ListIterator specifiedAttributeOverrides = overrideContainer.specifiedOverrides(); + ListIterator 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 = 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 = 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 = 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 = 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 = 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 = 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 = overrideContainer.specifiedOverrides(); + specifiedAttributeOverrides = overrideContainer.getSpecifiedOverrides().iterator(); assertFalse(specifiedAttributeOverrides.hasNext()); } @@ -1887,18 +1882,17 @@ public class JavaEntityTests extends ContextModelTestCase addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); addXmlClassRef(FULLY_QUALIFIED_SUB_TYPE_NAME); - ListIterator classRefs = getPersistenceUnit().specifiedClassRefs(); + ListIterator 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(4, overrideContainer.virtualOverridesSize()); - VirtualAttributeOverride virtualAttributeOverride = overrideContainer.virtualOverrides().next(); + assertEquals(4, overrideContainer.getVirtualOverridesSize()); + VirtualAttributeOverride virtualAttributeOverride = overrideContainer.getVirtualOverrides().iterator().next(); assertEquals("foo", virtualAttributeOverride.getName()); assertEquals("foo", virtualAttributeOverride.getColumn().getName()); assertEquals(SUB_TYPE_NAME, virtualAttributeOverride.getColumn().getTable()); @@ -1926,12 +1920,11 @@ public class JavaEntityTests extends ContextModelTestCase fooMapping.getColumn().setSpecifiedPrecision(Integer.valueOf(6)); fooMapping.getColumn().setSpecifiedScale(Integer.valueOf(7)); - 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(4, overrideContainer.virtualOverridesSize()); - virtualAttributeOverride = overrideContainer.virtualOverrides().next(); + assertEquals(4, overrideContainer.getVirtualOverridesSize()); + virtualAttributeOverride = overrideContainer.getVirtualOverrides().iterator().next(); assertEquals("foo", virtualAttributeOverride.getName()); assertEquals("FOO", virtualAttributeOverride.getColumn().getName()); assertEquals("BAR", virtualAttributeOverride.getColumn().getTable()); @@ -1954,11 +1947,10 @@ public class JavaEntityTests extends ContextModelTestCase fooMapping.getColumn().setSpecifiedLength(null); fooMapping.getColumn().setSpecifiedPrecision(null); fooMapping.getColumn().setSpecifiedScale(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("foo", virtualAttributeOverride.getName()); assertEquals("foo", virtualAttributeOverride.getColumn().getName()); assertEquals(SUB_TYPE_NAME, virtualAttributeOverride.getColumn().getTable()); @@ -1972,7 +1964,7 @@ public class JavaEntityTests extends ContextModelTestCase assertEquals(0, virtualAttributeOverride.getColumn().getScale()); virtualAttributeOverride.convertToSpecified(); - assertEquals(3, overrideContainer.virtualOverridesSize()); + assertEquals(3, overrideContainer.getVirtualOverridesSize()); } public void testVirtualAttributeOverridesEntityHierachy() throws Exception { @@ -1982,18 +1974,17 @@ public class JavaEntityTests extends ContextModelTestCase addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); addXmlClassRef(FULLY_QUALIFIED_SUB_TYPE_NAME); - ListIterator classRefs = getPersistenceUnit().specifiedClassRefs(); + ListIterator 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()); @@ -2005,29 +1996,27 @@ public class JavaEntityTests extends ContextModelTestCase 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 { @@ -2035,18 +2024,18 @@ public class JavaEntityTests extends ContextModelTestCase 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 testVirtualAttributeOverridesSize() throws Exception { @@ -2057,19 +2046,19 @@ public class JavaEntityTests extends ContextModelTestCase addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); AttributeOverrideContainer overrideContainer = getJavaEntity().getAttributeOverrideContainer(); - 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 testAttributeOverridesSize() throws Exception { @@ -2080,20 +2069,20 @@ public class JavaEntityTests extends ContextModelTestCase addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); AttributeOverrideContainer overrideContainer = getJavaEntity().getAttributeOverrideContainer(); - 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); - 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(5, overrideContainer.overridesSize()); + assertEquals(5, overrideContainer.getOverridesSize()); } public void testAttributeOverrideSetVirtual() throws Exception { @@ -2105,11 +2094,11 @@ public class JavaEntityTests extends ContextModelTestCase 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 attributeOverrides = typeResource.annotations(AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverridesAnnotation.ANNOTATION_NAME); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_SUB_TYPE_NAME, Kind.TYPE); + Iterator attributeOverrides = resourceType.getAnnotations(AttributeOverrideAnnotation.ANNOTATION_NAME).iterator(); assertEquals("foo", ((AttributeOverrideAnnotation) attributeOverrides.next()).getName()); assertEquals("basic", ((AttributeOverrideAnnotation) attributeOverrides.next()).getName()); @@ -2125,13 +2114,13 @@ public class JavaEntityTests extends ContextModelTestCase JavaAttributeOverrideContainer overrideContainer = getJavaEntity().getAttributeOverrideContainer(); - ListIterator virtualAttributeOverrides = overrideContainer.virtualOverrides(); + ListIterator 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 attributeOverrides = typeResource.annotations(AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverridesAnnotation.ANNOTATION_NAME); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_SUB_TYPE_NAME, Kind.TYPE); + Iterator attributeOverrides = resourceType.getAnnotations(AttributeOverrideAnnotation.ANNOTATION_NAME).iterator(); assertEquals("basic", ((AttributeOverrideAnnotation) attributeOverrides.next()).getName()); assertEquals("foo", ((AttributeOverrideAnnotation) attributeOverrides.next()).getName()); @@ -2147,43 +2136,43 @@ public class JavaEntityTests extends ContextModelTestCase 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, CollectionTools.size(resourceType.getAnnotations(AttributeOverrideAnnotation.ANNOTATION_NAME))); - overrideContainer.specifiedOverrides().next().convertToVirtual(); + overrideContainer.getSpecifiedOverrides().iterator().next().convertToVirtual(); - Iterator attributeOverrideResources = typeResource.annotations(AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverridesAnnotation.ANNOTATION_NAME); + Iterator attributeOverrideResources = resourceType.getAnnotations(AttributeOverrideAnnotation.ANNOTATION_NAME).iterator(); assertEquals("basic", ((AttributeOverrideAnnotation) attributeOverrideResources.next()).getName()); assertEquals("id", ((AttributeOverrideAnnotation) attributeOverrideResources.next()).getName()); assertFalse(attributeOverrideResources.hasNext()); - Iterator attributeOverrides = overrideContainer.specifiedOverrides(); + Iterator attributeOverrides = overrideContainer.getSpecifiedOverrides().iterator(); assertEquals("basic", attributeOverrides.next().getName()); assertEquals("id", 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("id", ((AttributeOverrideAnnotation) attributeOverrideResources.next()).getName()); assertFalse(attributeOverrideResources.hasNext()); - attributeOverrides = overrideContainer.specifiedOverrides(); + attributeOverrides = overrideContainer.getSpecifiedOverrides().iterator(); assertEquals("id", 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 = 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 { @@ -2194,35 +2183,35 @@ public class JavaEntityTests extends ContextModelTestCase addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); 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); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_SUB_TYPE_NAME, Kind.TYPE); - Iterator javaAttributeOverrides = typeResource.annotations(AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverridesAnnotation.ANNOTATION_NAME); + Iterator javaAttributeOverrides = resourceType.getAnnotations(AttributeOverrideAnnotation.ANNOTATION_NAME).iterator(); assertEquals(3, CollectionTools.size(javaAttributeOverrides)); overrideContainer.moveSpecifiedOverride(2, 0); - ListIterator attributeOverrides = overrideContainer.specifiedOverrides(); + ListIterator attributeOverrides = overrideContainer.getSpecifiedOverrides().iterator(); assertEquals("basic", attributeOverrides.next().getName()); assertEquals("id", attributeOverrides.next().getName()); assertEquals("foo", attributeOverrides.next().getName()); - javaAttributeOverrides = typeResource.annotations(AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverridesAnnotation.ANNOTATION_NAME); + javaAttributeOverrides = resourceType.getAnnotations(AttributeOverrideAnnotation.ANNOTATION_NAME).iterator(); assertEquals("basic", ((AttributeOverrideAnnotation) javaAttributeOverrides.next()).getName()); assertEquals("id", ((AttributeOverrideAnnotation) javaAttributeOverrides.next()).getName()); assertEquals("foo", ((AttributeOverrideAnnotation) javaAttributeOverrides.next()).getName()); overrideContainer.moveSpecifiedOverride(0, 1); - attributeOverrides = overrideContainer.specifiedOverrides(); + attributeOverrides = overrideContainer.getSpecifiedOverrides().iterator(); assertEquals("id", attributeOverrides.next().getName()); assertEquals("basic", attributeOverrides.next().getName()); assertEquals("foo", attributeOverrides.next().getName()); - javaAttributeOverrides = typeResource.annotations(AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverridesAnnotation.ANNOTATION_NAME); + javaAttributeOverrides = resourceType.getAnnotations(AttributeOverrideAnnotation.ANNOTATION_NAME).iterator(); assertEquals("id", ((AttributeOverrideAnnotation) javaAttributeOverrides.next()).getName()); assertEquals("basic", ((AttributeOverrideAnnotation) javaAttributeOverrides.next()).getName()); assertEquals("foo", ((AttributeOverrideAnnotation) javaAttributeOverrides.next()).getName()); @@ -2233,51 +2222,51 @@ public class JavaEntityTests extends ContextModelTestCase addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); JavaAttributeOverrideContainer 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 attributeOverrides = overrideContainer.specifiedOverrides(); + ListIterator 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 = 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 = 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 = 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 = 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 = overrideContainer.specifiedOverrides(); + attributeOverrides = overrideContainer.getSpecifiedOverrides().iterator(); assertFalse(attributeOverrides.hasNext()); } @@ -2289,7 +2278,7 @@ public class JavaEntityTests extends ContextModelTestCase JavaAttributeOverrideContainer overrideContainer = getJavaEntity().getAttributeOverrideContainer(); - ListIterator virtualAttributeOverrides = overrideContainer.virtualOverrides(); + ListIterator virtualAttributeOverrides = overrideContainer.getVirtualOverrides().iterator(); JavaVirtualAttributeOverride virtualAttributeOverride = virtualAttributeOverrides.next(); assertEquals("foo", virtualAttributeOverride.getName()); assertTrue(virtualAttributeOverride.isVirtual()); @@ -2307,12 +2296,12 @@ public class JavaEntityTests extends ContextModelTestCase 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 = overrideContainer.virtualOverrides(); + virtualAttributeOverrides = overrideContainer.getVirtualOverrides().iterator(); virtualAttributeOverride = virtualAttributeOverrides.next(); assertEquals("basic", virtualAttributeOverride.getName()); assertTrue(virtualAttributeOverride.isVirtual()); @@ -2376,64 +2365,64 @@ public class JavaEntityTests extends ContextModelTestCase addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); JavaAssociationOverrideContainer overrideContainer = getJavaEntity().getAssociationOverrideContainer(); - ListIterator specifiedAssociationOverrides = overrideContainer.specifiedOverrides(); + ListIterator 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 = 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 = 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 = 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 = 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 = 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 = 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 = overrideContainer.specifiedOverrides(); + specifiedAssociationOverrides = overrideContainer.getSpecifiedOverrides().iterator(); assertFalse(specifiedAssociationOverrides.hasNext()); } @@ -2444,22 +2433,21 @@ public class JavaEntityTests extends ContextModelTestCase addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); addXmlClassRef(FULLY_QUALIFIED_SUB_TYPE_NAME); - ListIterator classRefs = getPersistenceUnit().specifiedClassRefs(); + ListIterator 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(2, overrideContainer.virtualOverridesSize()); - VirtualAssociationOverride virtualAssociationOverride = overrideContainer.virtualOverrides().next(); + assertEquals(2, overrideContainer.getVirtualOverridesSize()); + VirtualAssociationOverride virtualAssociationOverride = overrideContainer.getVirtualOverrides().iterator().next(); ReadOnlyJoinColumnRelationshipStrategy joiningStrategy = ((ReadOnlyJoinColumnRelationship) virtualAssociationOverride.getRelationship()).getJoinColumnStrategy(); assertEquals("oneToOne", virtualAssociationOverride.getName()); - assertEquals(1, joiningStrategy.joinColumnsSize()); - ReadOnlyJoinColumn virtualJoinColumn = joiningStrategy.joinColumns().next(); + assertEquals(1, joiningStrategy.getJoinColumnsSize()); + ReadOnlyJoinColumn virtualJoinColumn = joiningStrategy.getJoinColumns().iterator().next(); assertEquals("oneToOne_id", virtualJoinColumn.getName()); assertEquals("id", virtualJoinColumn.getReferencedColumnName()); assertEquals(SUB_TYPE_NAME, virtualJoinColumn.getTable()); @@ -2481,17 +2469,16 @@ public class JavaEntityTests extends ContextModelTestCase joinColumn.setSpecifiedUnique(Boolean.TRUE); joinColumn.setSpecifiedNullable(Boolean.FALSE); - 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(2, overrideContainer.virtualOverridesSize()); - virtualAssociationOverride = overrideContainer.virtualOverrides().next(); + assertEquals(2, overrideContainer.getVirtualOverridesSize()); + virtualAssociationOverride = overrideContainer.getVirtualOverrides().iterator().next(); joiningStrategy = ((ReadOnlyJoinColumnRelationship) virtualAssociationOverride.getRelationship()).getJoinColumnStrategy(); assertEquals("oneToOne", virtualAssociationOverride.getName()); - assertEquals(1, joiningStrategy.joinColumnsSize()); - virtualAssociationOverride = overrideContainer.virtualOverrides().next(); - virtualJoinColumn = joiningStrategy.joinColumns().next(); + assertEquals(1, joiningStrategy.getJoinColumnsSize()); + virtualAssociationOverride = overrideContainer.getVirtualOverrides().iterator().next(); + virtualJoinColumn = joiningStrategy.getJoinColumns().iterator().next(); assertEquals("MY_JOIN_COLUMN", virtualJoinColumn.getName()); assertEquals("MY_REFERENCE_COLUMN", virtualJoinColumn.getReferencedColumnName()); assertEquals("BAR", virtualJoinColumn.getTable()); @@ -2501,7 +2488,7 @@ public class JavaEntityTests extends ContextModelTestCase assertEquals(true, virtualJoinColumn.isUnique()); assertEquals(false, virtualJoinColumn.isNullable()); - assertEquals("MY_JOIN_COLUMN", joiningStrategy.joinColumns().next().getName()); + assertEquals("MY_JOIN_COLUMN", joiningStrategy.getJoinColumns().iterator().next().getName()); @@ -2510,15 +2497,14 @@ public class JavaEntityTests extends ContextModelTestCase //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("oneToOne", virtualAssociationOverride.getName()); virtualAssociationOverride.convertToSpecified(); - assertEquals(1, overrideContainer.virtualOverridesSize()); + assertEquals(1, overrideContainer.getVirtualOverridesSize()); @@ -2537,9 +2523,9 @@ public class JavaEntityTests extends ContextModelTestCase //// 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(); @@ -2551,9 +2537,9 @@ public class JavaEntityTests extends ContextModelTestCase //// 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()); @@ -2570,18 +2556,18 @@ public class JavaEntityTests extends ContextModelTestCase 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 { @@ -2592,13 +2578,13 @@ public class JavaEntityTests extends ContextModelTestCase addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); AssociationOverrideContainer overrideContainer = getJavaEntity().getAssociationOverrideContainer(); - assertEquals(2, overrideContainer.virtualOverridesSize()); + 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 { @@ -2610,20 +2596,20 @@ public class JavaEntityTests extends ContextModelTestCase AssociationOverrideContainer overrideContainer = getJavaEntity().getAssociationOverrideContainer(); - assertEquals(2, overrideContainer.overridesSize()); + assertEquals(2, overrideContainer.getOverridesSize()); - overrideContainer.virtualOverrides().next().convertToSpecified(); - assertEquals(2, overrideContainer.overridesSize()); + overrideContainer.getVirtualOverrides().iterator().next().convertToSpecified(); + assertEquals(2, overrideContainer.getOverridesSize()); - overrideContainer.virtualOverrides().next().convertToSpecified(); - assertEquals(2, overrideContainer.overridesSize()); + overrideContainer.getVirtualOverrides().iterator().next().convertToSpecified(); + assertEquals(2, 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(3, overrideContainer.overridesSize()); + assertEquals(3, overrideContainer.getOverridesSize()); } public void testAssociationOverrideSetVirtual() throws Exception { @@ -2634,11 +2620,11 @@ public class JavaEntityTests extends ContextModelTestCase 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 associationOverrides = typeResource.annotations(AssociationOverrideAnnotation.ANNOTATION_NAME, AssociationOverridesAnnotation.ANNOTATION_NAME); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_SUB_TYPE_NAME, Kind.TYPE); + Iterator associationOverrides = resourceType.getAnnotations(AssociationOverrideAnnotation.ANNOTATION_NAME).iterator(); assertEquals("oneToOne", ((AssociationOverrideAnnotation) associationOverrides.next()).getName()); assertEquals("manyToOne", ((AssociationOverrideAnnotation) associationOverrides.next()).getName()); @@ -2653,13 +2639,13 @@ public class JavaEntityTests extends ContextModelTestCase addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); JavaAssociationOverrideContainer overrideContainer = getJavaEntity().getAssociationOverrideContainer(); - ListIterator virtualAssociationOverrides = overrideContainer.virtualOverrides(); + ListIterator 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 associationOverrides = typeResource.annotations(AssociationOverrideAnnotation.ANNOTATION_NAME, AssociationOverridesAnnotation.ANNOTATION_NAME); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_SUB_TYPE_NAME, Kind.TYPE); + Iterator associationOverrides = resourceType.getAnnotations(AssociationOverrideAnnotation.ANNOTATION_NAME).iterator(); assertEquals("manyToOne", ((AssociationOverrideAnnotation) associationOverrides.next()).getName()); assertEquals("oneToOne", ((AssociationOverrideAnnotation) associationOverrides.next()).getName()); @@ -2674,30 +2660,30 @@ public class JavaEntityTests extends ContextModelTestCase addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); 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 associationOverrideResources = typeResource.annotations(AssociationOverrideAnnotation.ANNOTATION_NAME, AssociationOverridesAnnotation.ANNOTATION_NAME); + Iterator associationOverrideResources = resourceType.getAnnotations(AssociationOverrideAnnotation.ANNOTATION_NAME).iterator(); assertEquals("manyToOne", ((AssociationOverrideAnnotation) associationOverrideResources.next()).getName()); assertFalse(associationOverrideResources.hasNext()); - Iterator associationOverrides = overrideContainer.specifiedOverrides(); + Iterator associationOverrides = overrideContainer.getSpecifiedOverrides().iterator(); assertEquals("manyToOne", 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 = 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 { @@ -2708,32 +2694,32 @@ public class JavaEntityTests extends ContextModelTestCase addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); 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); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_SUB_TYPE_NAME, Kind.TYPE); - Iterator javaAssociationOverrides = typeResource.annotations(AssociationOverrideAnnotation.ANNOTATION_NAME, AssociationOverridesAnnotation.ANNOTATION_NAME); + Iterator javaAssociationOverrides = resourceType.getAnnotations(AssociationOverrideAnnotation.ANNOTATION_NAME).iterator(); assertEquals(2, CollectionTools.size(javaAssociationOverrides)); overrideContainer.moveSpecifiedOverride(1, 0); - ListIterator associationOverrides = overrideContainer.specifiedOverrides(); + ListIterator associationOverrides = overrideContainer.getSpecifiedOverrides().iterator(); assertEquals("manyToOne", associationOverrides.next().getName()); assertEquals("oneToOne", associationOverrides.next().getName()); - javaAssociationOverrides = typeResource.annotations(AssociationOverrideAnnotation.ANNOTATION_NAME, AssociationOverridesAnnotation.ANNOTATION_NAME); + javaAssociationOverrides = resourceType.getAnnotations(AssociationOverrideAnnotation.ANNOTATION_NAME).iterator(); assertEquals("manyToOne", ((AssociationOverrideAnnotation) javaAssociationOverrides.next()).getName()); assertEquals("oneToOne", ((AssociationOverrideAnnotation) javaAssociationOverrides.next()).getName()); overrideContainer.moveSpecifiedOverride(0, 1); - associationOverrides = overrideContainer.specifiedOverrides(); + associationOverrides = overrideContainer.getSpecifiedOverrides().iterator(); assertEquals("oneToOne", associationOverrides.next().getName()); assertEquals("manyToOne", associationOverrides.next().getName()); - javaAssociationOverrides = typeResource.annotations(AssociationOverrideAnnotation.ANNOTATION_NAME, AssociationOverridesAnnotation.ANNOTATION_NAME); + javaAssociationOverrides = resourceType.getAnnotations(AssociationOverrideAnnotation.ANNOTATION_NAME).iterator(); assertEquals("oneToOne", ((AssociationOverrideAnnotation) javaAssociationOverrides.next()).getName()); assertEquals("manyToOne", ((AssociationOverrideAnnotation) javaAssociationOverrides.next()).getName()); } @@ -2743,51 +2729,51 @@ public class JavaEntityTests extends ContextModelTestCase addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); JavaAssociationOverrideContainer overrideContainer = getJavaEntity().getAssociationOverrideContainer(); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); + 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(); - ListIterator associationOverrides = overrideContainer.specifiedOverrides(); + ListIterator 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 = 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 = 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 = 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 = 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 = overrideContainer.specifiedOverrides(); + associationOverrides = overrideContainer.getSpecifiedOverrides().iterator(); assertFalse(associationOverrides.hasNext()); } @@ -2798,7 +2784,7 @@ public class JavaEntityTests extends ContextModelTestCase addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); JavaAssociationOverrideContainer overrideContainer = getJavaEntity().getAssociationOverrideContainer(); - ListIterator virtualAssociationOverrides = overrideContainer.virtualOverrides(); + ListIterator virtualAssociationOverrides = overrideContainer.getVirtualOverrides().iterator(); JavaVirtualAssociationOverride virtualAssociationOverride = virtualAssociationOverrides.next(); assertEquals("oneToOne", virtualAssociationOverride.getName()); assertTrue(virtualAssociationOverride.isVirtual()); @@ -2808,12 +2794,12 @@ public class JavaEntityTests extends ContextModelTestCase 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 = overrideContainer.virtualOverrides(); + virtualAssociationOverrides = overrideContainer.getVirtualOverrides().iterator(); virtualAssociationOverride = virtualAssociationOverrides.next(); assertEquals("manyToOne", virtualAssociationOverride.getName()); assertTrue(virtualAssociationOverride.isVirtual()); @@ -2825,35 +2811,35 @@ public class JavaEntityTests extends ContextModelTestCase addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); JavaEntity entity = getJavaEntity(); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); NamedQuery namedQuery1 = entity.getQueryContainer().addNamedQuery(0); namedQuery1.setName("FOO"); - Iterator javaNamedQueries = typeResource.annotations(NamedQueryAnnotation.ANNOTATION_NAME, NamedQueriesAnnotation.ANNOTATION_NAME); + Iterator javaNamedQueries = resourceType.getAnnotations(NamedQueryAnnotation.ANNOTATION_NAME).iterator(); assertEquals("FOO", ((NamedQueryAnnotation) javaNamedQueries.next()).getName()); NamedQuery namedQuery2 = entity.getQueryContainer().addNamedQuery(0); namedQuery2.setName("BAR"); - javaNamedQueries = typeResource.annotations(NamedQueryAnnotation.ANNOTATION_NAME, NamedQueriesAnnotation.ANNOTATION_NAME); + javaNamedQueries = resourceType.getAnnotations(NamedQueryAnnotation.ANNOTATION_NAME).iterator(); assertEquals("BAR", ((NamedQueryAnnotation) javaNamedQueries.next()).getName()); assertEquals("FOO", ((NamedQueryAnnotation) javaNamedQueries.next()).getName()); NamedQuery namedQuery3 = entity.getQueryContainer().addNamedQuery(1); namedQuery3.setName("BAZ"); - javaNamedQueries = typeResource.annotations(NamedQueryAnnotation.ANNOTATION_NAME, NamedQueriesAnnotation.ANNOTATION_NAME); + javaNamedQueries = resourceType.getAnnotations(NamedQueryAnnotation.ANNOTATION_NAME).iterator(); assertEquals("BAR", ((NamedQueryAnnotation) javaNamedQueries.next()).getName()); assertEquals("BAZ", ((NamedQueryAnnotation) javaNamedQueries.next()).getName()); assertEquals("FOO", ((NamedQueryAnnotation) javaNamedQueries.next()).getName()); - ListIterator namedQueries = entity.getQueryContainer().namedQueries(); + ListIterator namedQueries = entity.getQueryContainer().getNamedQueries().iterator(); assertEquals(namedQuery2, namedQueries.next()); assertEquals(namedQuery3, namedQueries.next()); assertEquals(namedQuery1, namedQueries.next()); - namedQueries = entity.getQueryContainer().namedQueries(); + namedQueries = entity.getQueryContainer().getNamedQueries().iterator(); assertEquals("BAR", namedQueries.next().getName()); assertEquals("BAZ", namedQueries.next().getName()); assertEquals("FOO", namedQueries.next().getName()); @@ -2866,7 +2852,7 @@ public class JavaEntityTests extends ContextModelTestCase addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); JavaEntity entity = getJavaEntity(); - assertEquals(1, entity.getQueryContainer().namedQueriesSize()); + assertEquals(1, entity.getQueryContainer().getNamedQueriesSize()); } public void testRemoveNamedQuery() throws Exception { @@ -2874,30 +2860,30 @@ public class JavaEntityTests extends ContextModelTestCase addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); JavaEntity entity = getJavaEntity(); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); entity.getQueryContainer().addNamedQuery(0).setName("FOO"); entity.getQueryContainer().addNamedQuery(1).setName("BAR"); entity.getQueryContainer().addNamedQuery(2).setName("BAZ"); - Iterator javaNamedQueries = typeResource.annotations(NamedQueryAnnotation.ANNOTATION_NAME, NamedQueriesAnnotation.ANNOTATION_NAME); + Iterator javaNamedQueries = resourceType.getAnnotations(NamedQueryAnnotation.ANNOTATION_NAME).iterator(); assertEquals(3, CollectionTools.size(javaNamedQueries)); entity.getQueryContainer().removeNamedQuery(0); - javaNamedQueries = typeResource.annotations(NamedQueryAnnotation.ANNOTATION_NAME, NamedQueriesAnnotation.ANNOTATION_NAME); + javaNamedQueries = resourceType.getAnnotations(NamedQueryAnnotation.ANNOTATION_NAME).iterator(); assertEquals(2, CollectionTools.size(javaNamedQueries)); - javaNamedQueries = typeResource.annotations(NamedQueryAnnotation.ANNOTATION_NAME, NamedQueriesAnnotation.ANNOTATION_NAME); + javaNamedQueries = resourceType.getAnnotations(NamedQueryAnnotation.ANNOTATION_NAME).iterator(); assertEquals("BAR", ((NamedQueryAnnotation) javaNamedQueries.next()).getName()); assertEquals("BAZ", ((NamedQueryAnnotation) javaNamedQueries.next()).getName()); entity.getQueryContainer().removeNamedQuery(0); - javaNamedQueries = typeResource.annotations(NamedQueryAnnotation.ANNOTATION_NAME, NamedQueriesAnnotation.ANNOTATION_NAME); + javaNamedQueries = resourceType.getAnnotations(NamedQueryAnnotation.ANNOTATION_NAME).iterator(); assertEquals(1, CollectionTools.size(javaNamedQueries)); - javaNamedQueries = typeResource.annotations(NamedQueryAnnotation.ANNOTATION_NAME, NamedQueriesAnnotation.ANNOTATION_NAME); + javaNamedQueries = resourceType.getAnnotations(NamedQueryAnnotation.ANNOTATION_NAME).iterator(); assertEquals("BAZ", ((NamedQueryAnnotation) javaNamedQueries.next()).getName()); entity.getQueryContainer().removeNamedQuery(0); - javaNamedQueries = typeResource.annotations(NamedQueryAnnotation.ANNOTATION_NAME, NamedQueriesAnnotation.ANNOTATION_NAME); + javaNamedQueries = resourceType.getAnnotations(NamedQueryAnnotation.ANNOTATION_NAME).iterator(); assertEquals(0, CollectionTools.size(javaNamedQueries)); } @@ -2906,17 +2892,17 @@ public class JavaEntityTests extends ContextModelTestCase addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); JavaEntity entity = getJavaEntity(); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); entity.getQueryContainer().addNamedQuery(0).setName("FOO"); - NamedNativeQueryAnnotation nativeQuery = (NamedNativeQueryAnnotation) typeResource.addAnnotation(0, JPA.NAMED_NATIVE_QUERY, JPA.NAMED_NATIVE_QUERIES); + NamedNativeQueryAnnotation nativeQuery = (NamedNativeQueryAnnotation) resourceType.addAnnotation(0, JPA.NAMED_NATIVE_QUERY); nativeQuery.setName("BAR"); getJpaProject().synchronizeContextModel(); - assertEquals(1, entity.getQueryContainer().namedNativeQueriesSize()); - ListIterator namedQueries = entity.getQueryContainer().namedNativeQueries(); + assertEquals(1, entity.getQueryContainer().getNamedNativeQueriesSize()); + ListIterator namedQueries = entity.getQueryContainer().getNamedNativeQueries().iterator(); assertEquals("BAR", namedQueries.next().getName()); } @@ -2925,17 +2911,17 @@ public class JavaEntityTests extends ContextModelTestCase addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); JavaEntity entity = getJavaEntity(); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); entity.getQueryContainer().addNamedNativeQuery(0).setName("FOO"); - NamedQueryAnnotation namedQuery = (NamedQueryAnnotation) typeResource.addAnnotation(0, JPA.NAMED_QUERY, JPA.NAMED_QUERIES); + NamedQueryAnnotation namedQuery = (NamedQueryAnnotation) resourceType.addAnnotation(0, JPA.NAMED_QUERY); namedQuery.setName("BAR"); getJpaProject().synchronizeContextModel(); - assertEquals(1, entity.getQueryContainer().namedQueriesSize()); - ListIterator namedQueries = entity.getQueryContainer().namedQueries(); + assertEquals(1, entity.getQueryContainer().getNamedQueriesSize()); + ListIterator namedQueries = entity.getQueryContainer().getNamedQueries().iterator(); assertEquals("BAR", namedQueries.next().getName()); } @@ -2944,35 +2930,35 @@ public class JavaEntityTests extends ContextModelTestCase addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); JavaEntity entity = getJavaEntity(); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); entity.getQueryContainer().addNamedQuery(0).setName("FOO"); entity.getQueryContainer().addNamedQuery(1).setName("BAR"); entity.getQueryContainer().addNamedQuery(2).setName("BAZ"); - Iterator javaNamedQueries = typeResource.annotations(NamedQueryAnnotation.ANNOTATION_NAME, NamedQueriesAnnotation.ANNOTATION_NAME); + Iterator javaNamedQueries = resourceType.getAnnotations(NamedQueryAnnotation.ANNOTATION_NAME).iterator(); assertEquals(3, CollectionTools.size(javaNamedQueries)); entity.getQueryContainer().moveNamedQuery(2, 0); - ListIterator namedQueries = entity.getQueryContainer().namedQueries(); + ListIterator namedQueries = entity.getQueryContainer().getNamedQueries().iterator(); assertEquals("BAR", namedQueries.next().getName()); assertEquals("BAZ", namedQueries.next().getName()); assertEquals("FOO", namedQueries.next().getName()); - javaNamedQueries = typeResource.annotations(NamedQueryAnnotation.ANNOTATION_NAME, NamedQueriesAnnotation.ANNOTATION_NAME); + javaNamedQueries = resourceType.getAnnotations(NamedQueryAnnotation.ANNOTATION_NAME).iterator(); assertEquals("BAR", ((NamedQueryAnnotation) javaNamedQueries.next()).getName()); assertEquals("BAZ", ((NamedQueryAnnotation) javaNamedQueries.next()).getName()); assertEquals("FOO", ((NamedQueryAnnotation) javaNamedQueries.next()).getName()); entity.getQueryContainer().moveNamedQuery(0, 1); - namedQueries = entity.getQueryContainer().namedQueries(); + namedQueries = entity.getQueryContainer().getNamedQueries().iterator(); assertEquals("BAZ", namedQueries.next().getName()); assertEquals("BAR", namedQueries.next().getName()); assertEquals("FOO", namedQueries.next().getName()); - javaNamedQueries = typeResource.annotations(NamedQueryAnnotation.ANNOTATION_NAME, NamedQueriesAnnotation.ANNOTATION_NAME); + javaNamedQueries = resourceType.getAnnotations(NamedQueryAnnotation.ANNOTATION_NAME).iterator(); assertEquals("BAZ", ((NamedQueryAnnotation) javaNamedQueries.next()).getName()); assertEquals("BAR", ((NamedQueryAnnotation) javaNamedQueries.next()).getName()); assertEquals("FOO", ((NamedQueryAnnotation) javaNamedQueries.next()).getName()); @@ -2983,57 +2969,57 @@ public class JavaEntityTests extends ContextModelTestCase addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); JavaEntity entity = getJavaEntity(); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); - assertEquals(0, entity.getPersistenceUnit().queriesSize()); + assertEquals(0, entity.getPersistenceUnit().getQueriesSize()); - ((NamedQueryAnnotation) typeResource.addAnnotation(0, NamedQueryAnnotation.ANNOTATION_NAME, NamedQueriesAnnotation.ANNOTATION_NAME)).setName("FOO"); - ((NamedQueryAnnotation) typeResource.addAnnotation(1, NamedQueryAnnotation.ANNOTATION_NAME, NamedQueriesAnnotation.ANNOTATION_NAME)).setName("BAR"); - ((NamedQueryAnnotation) typeResource.addAnnotation(2, NamedQueryAnnotation.ANNOTATION_NAME, NamedQueriesAnnotation.ANNOTATION_NAME)).setName("BAZ"); + ((NamedQueryAnnotation) resourceType.addAnnotation(0, NamedQueryAnnotation.ANNOTATION_NAME)).setName("FOO"); + ((NamedQueryAnnotation) resourceType.addAnnotation(1, NamedQueryAnnotation.ANNOTATION_NAME)).setName("BAR"); + ((NamedQueryAnnotation) resourceType.addAnnotation(2, NamedQueryAnnotation.ANNOTATION_NAME)).setName("BAZ"); getJpaProject().synchronizeContextModel(); - ListIterator namedQueries = entity.getQueryContainer().namedQueries(); + ListIterator namedQueries = entity.getQueryContainer().getNamedQueries().iterator(); assertEquals("FOO", namedQueries.next().getName()); assertEquals("BAR", namedQueries.next().getName()); assertEquals("BAZ", namedQueries.next().getName()); assertFalse(namedQueries.hasNext()); - assertEquals(3, entity.getPersistenceUnit().queriesSize()); + assertEquals(3, entity.getPersistenceUnit().getQueriesSize()); - typeResource.moveAnnotation(2, 0, NamedQueriesAnnotation.ANNOTATION_NAME); + resourceType.moveAnnotation(2, 0, NamedQueryAnnotation.ANNOTATION_NAME); getJpaProject().synchronizeContextModel(); - namedQueries = entity.getQueryContainer().namedQueries(); + namedQueries = entity.getQueryContainer().getNamedQueries().iterator(); assertEquals("BAR", namedQueries.next().getName()); assertEquals("BAZ", namedQueries.next().getName()); assertEquals("FOO", namedQueries.next().getName()); assertFalse(namedQueries.hasNext()); - typeResource.moveAnnotation(0, 1, NamedQueriesAnnotation.ANNOTATION_NAME); + resourceType.moveAnnotation(0, 1, NamedQueryAnnotation.ANNOTATION_NAME); getJpaProject().synchronizeContextModel(); - namedQueries = entity.getQueryContainer().namedQueries(); + namedQueries = entity.getQueryContainer().getNamedQueries().iterator(); assertEquals("BAZ", namedQueries.next().getName()); assertEquals("BAR", namedQueries.next().getName()); assertEquals("FOO", namedQueries.next().getName()); assertFalse(namedQueries.hasNext()); - typeResource.removeAnnotation(1, NamedQueryAnnotation.ANNOTATION_NAME, NamedQueriesAnnotation.ANNOTATION_NAME); + resourceType.removeAnnotation(1, NamedQueryAnnotation.ANNOTATION_NAME); getJpaProject().synchronizeContextModel(); - namedQueries = entity.getQueryContainer().namedQueries(); + namedQueries = entity.getQueryContainer().getNamedQueries().iterator(); assertEquals("BAZ", namedQueries.next().getName()); assertEquals("FOO", namedQueries.next().getName()); assertFalse(namedQueries.hasNext()); - assertEquals(2, entity.getPersistenceUnit().queriesSize()); + assertEquals(2, entity.getPersistenceUnit().getQueriesSize()); - typeResource.removeAnnotation(1, NamedQueryAnnotation.ANNOTATION_NAME, NamedQueriesAnnotation.ANNOTATION_NAME); + resourceType.removeAnnotation(1, NamedQueryAnnotation.ANNOTATION_NAME); getJpaProject().synchronizeContextModel(); - namedQueries = entity.getQueryContainer().namedQueries(); + namedQueries = entity.getQueryContainer().getNamedQueries().iterator(); assertEquals("BAZ", namedQueries.next().getName()); assertFalse(namedQueries.hasNext()); - assertEquals(1, entity.getPersistenceUnit().queriesSize()); + assertEquals(1, entity.getPersistenceUnit().getQueriesSize()); - typeResource.removeAnnotation(0, NamedQueryAnnotation.ANNOTATION_NAME, NamedQueriesAnnotation.ANNOTATION_NAME); + resourceType.removeAnnotation(0, NamedQueryAnnotation.ANNOTATION_NAME); getJpaProject().synchronizeContextModel(); - namedQueries = entity.getQueryContainer().namedQueries(); + namedQueries = entity.getQueryContainer().getNamedQueries().iterator(); assertFalse(namedQueries.hasNext()); - assertEquals(0, entity.getPersistenceUnit().queriesSize()); + assertEquals(0, entity.getPersistenceUnit().getQueriesSize()); } public void testNamedQueriesSize() throws Exception { @@ -3041,16 +3027,16 @@ public class JavaEntityTests extends ContextModelTestCase addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); JavaEntity entity = getJavaEntity(); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); - assertEquals(0, entity.getQueryContainer().namedQueriesSize()); + assertEquals(0, entity.getQueryContainer().getNamedQueriesSize()); - ((NamedQueryAnnotation) typeResource.addAnnotation(0, NamedQueryAnnotation.ANNOTATION_NAME, NamedQueriesAnnotation.ANNOTATION_NAME)).setName("FOO"); - ((NamedQueryAnnotation) typeResource.addAnnotation(1, NamedQueryAnnotation.ANNOTATION_NAME, NamedQueriesAnnotation.ANNOTATION_NAME)).setName("BAR"); - ((NamedQueryAnnotation) typeResource.addAnnotation(2, NamedQueryAnnotation.ANNOTATION_NAME, NamedQueriesAnnotation.ANNOTATION_NAME)).setName("BAZ"); + ((NamedQueryAnnotation) resourceType.addAnnotation(0, NamedQueryAnnotation.ANNOTATION_NAME)).setName("FOO"); + ((NamedQueryAnnotation) resourceType.addAnnotation(1, NamedQueryAnnotation.ANNOTATION_NAME)).setName("BAR"); + ((NamedQueryAnnotation) resourceType.addAnnotation(2, NamedQueryAnnotation.ANNOTATION_NAME)).setName("BAZ"); getJpaProject().synchronizeContextModel(); - assertEquals(3, entity.getQueryContainer().namedQueriesSize()); + assertEquals(3, entity.getQueryContainer().getNamedQueriesSize()); } public void testAddNamedNativeQuery() throws Exception { @@ -3058,35 +3044,35 @@ public class JavaEntityTests extends ContextModelTestCase addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); JavaEntity entity = getJavaEntity(); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); NamedNativeQuery namedNativeQuery = entity.getQueryContainer().addNamedNativeQuery(0); namedNativeQuery.setName("FOO"); - Iterator javaNamedQueries = typeResource.annotations(NamedNativeQueryAnnotation.ANNOTATION_NAME, NamedNativeQueriesAnnotation.ANNOTATION_NAME); + Iterator javaNamedQueries = resourceType.getAnnotations(NamedNativeQueryAnnotation.ANNOTATION_NAME).iterator(); assertEquals("FOO", ((NamedNativeQueryAnnotation) javaNamedQueries.next()).getName()); NamedNativeQuery namedNativeQuery2 = entity.getQueryContainer().addNamedNativeQuery(0); namedNativeQuery2.setName("BAR"); - javaNamedQueries = typeResource.annotations(NamedNativeQueryAnnotation.ANNOTATION_NAME, NamedNativeQueriesAnnotation.ANNOTATION_NAME); + javaNamedQueries = resourceType.getAnnotations(NamedNativeQueryAnnotation.ANNOTATION_NAME).iterator(); assertEquals("BAR", ((NamedNativeQueryAnnotation) javaNamedQueries.next()).getName()); assertEquals("FOO", ((NamedNativeQueryAnnotation) javaNamedQueries.next()).getName()); NamedNativeQuery namedNativeQuery3 = entity.getQueryContainer().addNamedNativeQuery(1); namedNativeQuery3.setName("BAZ"); - javaNamedQueries = typeResource.annotations(NamedNativeQueryAnnotation.ANNOTATION_NAME, NamedNativeQueriesAnnotation.ANNOTATION_NAME); + javaNamedQueries = resourceType.getAnnotations(NamedNativeQueryAnnotation.ANNOTATION_NAME).iterator(); assertEquals("BAR", ((NamedNativeQueryAnnotation) javaNamedQueries.next()).getName()); assertEquals("BAZ", ((NamedNativeQueryAnnotation) javaNamedQueries.next()).getName()); assertEquals("FOO", ((NamedNativeQueryAnnotation) javaNamedQueries.next()).getName()); - ListIterator namedQueries = entity.getQueryContainer().namedNativeQueries(); + ListIterator namedQueries = entity.getQueryContainer().getNamedNativeQueries().iterator(); assertEquals(namedNativeQuery2, namedQueries.next()); assertEquals(namedNativeQuery3, namedQueries.next()); assertEquals(namedNativeQuery, namedQueries.next()); - namedQueries = entity.getQueryContainer().namedNativeQueries(); + namedQueries = entity.getQueryContainer().getNamedNativeQueries().iterator(); assertEquals("BAR", namedQueries.next().getName()); assertEquals("BAZ", namedQueries.next().getName()); assertEquals("FOO", namedQueries.next().getName()); @@ -3097,30 +3083,30 @@ public class JavaEntityTests extends ContextModelTestCase addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); JavaEntity entity = getJavaEntity(); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); entity.getQueryContainer().addNamedNativeQuery(0).setName("FOO"); entity.getQueryContainer().addNamedNativeQuery(1).setName("BAR"); entity.getQueryContainer().addNamedNativeQuery(2).setName("BAZ"); - Iterator javaNamedQueries = typeResource.annotations(NamedNativeQueryAnnotation.ANNOTATION_NAME, NamedNativeQueriesAnnotation.ANNOTATION_NAME); + Iterator javaNamedQueries = resourceType.getAnnotations(NamedNativeQueryAnnotation.ANNOTATION_NAME).iterator(); assertEquals(3, CollectionTools.size(javaNamedQueries)); entity.getQueryContainer().removeNamedNativeQuery(0); - javaNamedQueries = typeResource.annotations(NamedNativeQueryAnnotation.ANNOTATION_NAME, NamedNativeQueriesAnnotation.ANNOTATION_NAME); + javaNamedQueries = resourceType.getAnnotations(NamedNativeQueryAnnotation.ANNOTATION_NAME).iterator(); assertEquals(2, CollectionTools.size(javaNamedQueries)); - javaNamedQueries = typeResource.annotations(NamedNativeQueryAnnotation.ANNOTATION_NAME, NamedNativeQueriesAnnotation.ANNOTATION_NAME); + javaNamedQueries = resourceType.getAnnotations(NamedNativeQueryAnnotation.ANNOTATION_NAME).iterator(); assertEquals("BAR", ((NamedNativeQueryAnnotation) javaNamedQueries.next()).getName()); assertEquals("BAZ", ((NamedNativeQueryAnnotation) javaNamedQueries.next()).getName()); entity.getQueryContainer().removeNamedNativeQuery(0); - javaNamedQueries = typeResource.annotations(NamedNativeQueryAnnotation.ANNOTATION_NAME, NamedNativeQueriesAnnotation.ANNOTATION_NAME); + javaNamedQueries = resourceType.getAnnotations(NamedNativeQueryAnnotation.ANNOTATION_NAME).iterator(); assertEquals(1, CollectionTools.size(javaNamedQueries)); - javaNamedQueries = typeResource.annotations(NamedNativeQueryAnnotation.ANNOTATION_NAME, NamedNativeQueriesAnnotation.ANNOTATION_NAME); + javaNamedQueries = resourceType.getAnnotations(NamedNativeQueryAnnotation.ANNOTATION_NAME).iterator(); assertEquals("BAZ", ((NamedNativeQueryAnnotation) javaNamedQueries.next()).getName()); entity.getQueryContainer().removeNamedNativeQuery(0); - javaNamedQueries = typeResource.annotations(NamedNativeQueryAnnotation.ANNOTATION_NAME, NamedNativeQueriesAnnotation.ANNOTATION_NAME); + javaNamedQueries = resourceType.getAnnotations(NamedNativeQueryAnnotation.ANNOTATION_NAME).iterator(); assertEquals(0, CollectionTools.size(javaNamedQueries)); } @@ -3129,34 +3115,34 @@ public class JavaEntityTests extends ContextModelTestCase addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); JavaEntity entity = getJavaEntity(); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); entity.getQueryContainer().addNamedNativeQuery(0).setName("FOO"); entity.getQueryContainer().addNamedNativeQuery(1).setName("BAR"); entity.getQueryContainer().addNamedNativeQuery(2).setName("BAZ"); - Iterator javaNamedQueries = typeResource.annotations(NamedNativeQueryAnnotation.ANNOTATION_NAME, NamedNativeQueriesAnnotation.ANNOTATION_NAME); + Iterator javaNamedQueries = resourceType.getAnnotations(NamedNativeQueryAnnotation.ANNOTATION_NAME).iterator(); assertEquals(3, CollectionTools.size(javaNamedQueries)); entity.getQueryContainer().moveNamedNativeQuery(2, 0); - ListIterator namedQueries = entity.getQueryContainer().namedNativeQueries(); + ListIterator namedQueries = entity.getQueryContainer().getNamedNativeQueries().iterator(); assertEquals("BAR", namedQueries.next().getName()); assertEquals("BAZ", namedQueries.next().getName()); assertEquals("FOO", namedQueries.next().getName()); - javaNamedQueries = typeResource.annotations(NamedNativeQueryAnnotation.ANNOTATION_NAME, NamedNativeQueriesAnnotation.ANNOTATION_NAME); + javaNamedQueries = resourceType.getAnnotations(NamedNativeQueryAnnotation.ANNOTATION_NAME).iterator(); assertEquals("BAR", ((NamedNativeQueryAnnotation) javaNamedQueries.next()).getName()); assertEquals("BAZ", ((NamedNativeQueryAnnotation) javaNamedQueries.next()).getName()); assertEquals("FOO", ((NamedNativeQueryAnnotation) javaNamedQueries.next()).getName()); entity.getQueryContainer().moveNamedNativeQuery(0, 1); - namedQueries = entity.getQueryContainer().namedNativeQueries(); + namedQueries = entity.getQueryContainer().getNamedNativeQueries().iterator(); assertEquals("BAZ", namedQueries.next().getName()); assertEquals("BAR", namedQueries.next().getName()); assertEquals("FOO", namedQueries.next().getName()); - javaNamedQueries = typeResource.annotations(NamedNativeQueryAnnotation.ANNOTATION_NAME, NamedNativeQueriesAnnotation.ANNOTATION_NAME); + javaNamedQueries = resourceType.getAnnotations(NamedNativeQueryAnnotation.ANNOTATION_NAME).iterator(); assertEquals("BAZ", ((NamedNativeQueryAnnotation) javaNamedQueries.next()).getName()); assertEquals("BAR", ((NamedNativeQueryAnnotation) javaNamedQueries.next()).getName()); assertEquals("FOO", ((NamedNativeQueryAnnotation) javaNamedQueries.next()).getName()); @@ -3167,57 +3153,57 @@ public class JavaEntityTests extends ContextModelTestCase addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); JavaEntity entity = getJavaEntity(); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); - assertEquals(0, entity.getPersistenceUnit().queriesSize()); + assertEquals(0, entity.getPersistenceUnit().getQueriesSize()); - ((NamedNativeQueryAnnotation) typeResource.addAnnotation(0, NamedNativeQueryAnnotation.ANNOTATION_NAME, NamedNativeQueriesAnnotation.ANNOTATION_NAME)).setName("FOO"); - ((NamedNativeQueryAnnotation) typeResource.addAnnotation(1, NamedNativeQueryAnnotation.ANNOTATION_NAME, NamedNativeQueriesAnnotation.ANNOTATION_NAME)).setName("BAR"); - ((NamedNativeQueryAnnotation) typeResource.addAnnotation(2, NamedNativeQueryAnnotation.ANNOTATION_NAME, NamedNativeQueriesAnnotation.ANNOTATION_NAME)).setName("BAZ"); + ((NamedNativeQueryAnnotation) resourceType.addAnnotation(0, NamedNativeQueryAnnotation.ANNOTATION_NAME)).setName("FOO"); + ((NamedNativeQueryAnnotation) resourceType.addAnnotation(1, NamedNativeQueryAnnotation.ANNOTATION_NAME)).setName("BAR"); + ((NamedNativeQueryAnnotation) resourceType.addAnnotation(2, NamedNativeQueryAnnotation.ANNOTATION_NAME)).setName("BAZ"); getJpaProject().synchronizeContextModel(); - ListIterator namedQueries = entity.getQueryContainer().namedNativeQueries(); + ListIterator namedQueries = entity.getQueryContainer().getNamedNativeQueries().iterator(); assertEquals("FOO", namedQueries.next().getName()); assertEquals("BAR", namedQueries.next().getName()); assertEquals("BAZ", namedQueries.next().getName()); assertFalse(namedQueries.hasNext()); - assertEquals(3, entity.getPersistenceUnit().queriesSize()); + assertEquals(3, entity.getPersistenceUnit().getQueriesSize()); - typeResource.moveAnnotation(2, 0, NamedNativeQueriesAnnotation.ANNOTATION_NAME); + resourceType.moveAnnotation(2, 0, NamedNativeQueryAnnotation.ANNOTATION_NAME); getJpaProject().synchronizeContextModel(); - namedQueries = entity.getQueryContainer().namedNativeQueries(); + namedQueries = entity.getQueryContainer().getNamedNativeQueries().iterator(); assertEquals("BAR", namedQueries.next().getName()); assertEquals("BAZ", namedQueries.next().getName()); assertEquals("FOO", namedQueries.next().getName()); assertFalse(namedQueries.hasNext()); - typeResource.moveAnnotation(0, 1, NamedNativeQueriesAnnotation.ANNOTATION_NAME); + resourceType.moveAnnotation(0, 1, NamedNativeQueryAnnotation.ANNOTATION_NAME); getJpaProject().synchronizeContextModel(); - namedQueries = entity.getQueryContainer().namedNativeQueries(); + namedQueries = entity.getQueryContainer().getNamedNativeQueries().iterator(); assertEquals("BAZ", namedQueries.next().getName()); assertEquals("BAR", namedQueries.next().getName()); assertEquals("FOO", namedQueries.next().getName()); assertFalse(namedQueries.hasNext()); - typeResource.removeAnnotation(1, NamedNativeQueryAnnotation.ANNOTATION_NAME, NamedNativeQueriesAnnotation.ANNOTATION_NAME); + resourceType.removeAnnotation(1, NamedNativeQueryAnnotation.ANNOTATION_NAME); getJpaProject().synchronizeContextModel(); - namedQueries = entity.getQueryContainer().namedNativeQueries(); + namedQueries = entity.getQueryContainer().getNamedNativeQueries().iterator(); assertEquals("BAZ", namedQueries.next().getName()); assertEquals("FOO", namedQueries.next().getName()); assertFalse(namedQueries.hasNext()); - assertEquals(2, entity.getPersistenceUnit().queriesSize()); + assertEquals(2, entity.getPersistenceUnit().getQueriesSize()); - typeResource.removeAnnotation(1, NamedNativeQueryAnnotation.ANNOTATION_NAME, NamedNativeQueriesAnnotation.ANNOTATION_NAME); + resourceType.removeAnnotation(1, NamedNativeQueryAnnotation.ANNOTATION_NAME); getJpaProject().synchronizeContextModel(); - namedQueries = entity.getQueryContainer().namedNativeQueries(); + namedQueries = entity.getQueryContainer().getNamedNativeQueries().iterator(); assertEquals("BAZ", namedQueries.next().getName()); assertFalse(namedQueries.hasNext()); - assertEquals(1, entity.getPersistenceUnit().queriesSize()); + assertEquals(1, entity.getPersistenceUnit().getQueriesSize()); - typeResource.removeAnnotation(0, NamedNativeQueryAnnotation.ANNOTATION_NAME, NamedNativeQueriesAnnotation.ANNOTATION_NAME); + resourceType.removeAnnotation(0, NamedNativeQueryAnnotation.ANNOTATION_NAME); getJpaProject().synchronizeContextModel(); - namedQueries = entity.getQueryContainer().namedNativeQueries(); + namedQueries = entity.getQueryContainer().getNamedNativeQueries().iterator(); assertFalse(namedQueries.hasNext()); - assertEquals(0, entity.getPersistenceUnit().queriesSize()); + assertEquals(0, entity.getPersistenceUnit().getQueriesSize()); } public void testNamedNativeQueriesSize() throws Exception { @@ -3225,16 +3211,16 @@ public class JavaEntityTests extends ContextModelTestCase addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); JavaEntity entity = getJavaEntity(); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); - assertEquals(0, entity.getQueryContainer().namedNativeQueriesSize()); + assertEquals(0, entity.getQueryContainer().getNamedNativeQueriesSize()); - ((NamedNativeQueryAnnotation) typeResource.addAnnotation(0, NamedNativeQueryAnnotation.ANNOTATION_NAME, NamedNativeQueriesAnnotation.ANNOTATION_NAME)).setName("FOO"); - ((NamedNativeQueryAnnotation) typeResource.addAnnotation(1, NamedNativeQueryAnnotation.ANNOTATION_NAME, NamedNativeQueriesAnnotation.ANNOTATION_NAME)).setName("BAR"); - ((NamedNativeQueryAnnotation) typeResource.addAnnotation(2, NamedNativeQueryAnnotation.ANNOTATION_NAME, NamedNativeQueriesAnnotation.ANNOTATION_NAME)).setName("BAZ"); + ((NamedNativeQueryAnnotation) resourceType.addAnnotation(0, NamedNativeQueryAnnotation.ANNOTATION_NAME)).setName("FOO"); + ((NamedNativeQueryAnnotation) resourceType.addAnnotation(1, NamedNativeQueryAnnotation.ANNOTATION_NAME)).setName("BAR"); + ((NamedNativeQueryAnnotation) resourceType.addAnnotation(2, NamedNativeQueryAnnotation.ANNOTATION_NAME)).setName("BAZ"); getJpaProject().synchronizeContextModel(); - assertEquals(3, entity.getQueryContainer().namedNativeQueriesSize()); + assertEquals(3, entity.getQueryContainer().getNamedNativeQueriesSize()); } public void testUpdateIdClass() throws Exception { @@ -3242,23 +3228,23 @@ public class JavaEntityTests extends ContextModelTestCase createTestIdClass(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); assertNull(getJavaEntity().getIdClassReference().getSpecifiedIdClassName()); assertNull(getJavaEntity().getIdClassReference().getIdClass()); - assertNull(typeResource.getAnnotation(IdClassAnnotation.ANNOTATION_NAME)); + assertNull(resourceType.getAnnotation(IdClassAnnotation.ANNOTATION_NAME)); - IdClassAnnotation idClassAnnotation = (IdClassAnnotation) typeResource.addAnnotation(IdClassAnnotation.ANNOTATION_NAME); + IdClassAnnotation idClassAnnotation = (IdClassAnnotation) resourceType.addAnnotation(IdClassAnnotation.ANNOTATION_NAME); getJpaProject().synchronizeContextModel(); assertNull(getJavaEntity().getIdClassReference().getSpecifiedIdClassName()); - assertNotNull(typeResource.getAnnotation(IdClassAnnotation.ANNOTATION_NAME)); + assertNotNull(resourceType.getAnnotation(IdClassAnnotation.ANNOTATION_NAME)); // test setting id class name to nonexistent class. test class name is set, but class is null String nonExistentIdClassName = PACKAGE_NAME + ".Foo"; idClassAnnotation.setValue(nonExistentIdClassName); getJpaProject().synchronizeContextModel(); assertEquals(nonExistentIdClassName, getJavaEntity().getIdClassReference().getSpecifiedIdClassName()); - assertEquals(nonExistentIdClassName, ((IdClassAnnotation) typeResource.getAnnotation(IdClassAnnotation.ANNOTATION_NAME)).getValue()); + assertEquals(nonExistentIdClassName, ((IdClassAnnotation) resourceType.getAnnotation(IdClassAnnotation.ANNOTATION_NAME)).getValue()); assertNull(getJavaEntity().getIdClassReference().getIdClass()); // test setting id class name to existent class. test class name is set and class is not null @@ -3266,7 +3252,7 @@ public class JavaEntityTests extends ContextModelTestCase idClassAnnotation.setValue(existentIdClassName); getJpaProject().synchronizeContextModel(); assertEquals(existentIdClassName, getJavaEntity().getIdClassReference().getSpecifiedIdClassName()); - assertEquals(existentIdClassName, ((IdClassAnnotation) typeResource.getAnnotation(IdClassAnnotation.ANNOTATION_NAME)).getValue()); + assertEquals(existentIdClassName, ((IdClassAnnotation) resourceType.getAnnotation(IdClassAnnotation.ANNOTATION_NAME)).getValue()); assertNotNull(getJavaEntity().getIdClassReference().getIdClass()); //test setting @IdClass value to null @@ -3276,12 +3262,12 @@ public class JavaEntityTests extends ContextModelTestCase assertNull(getJavaEntity().getIdClassReference().getIdClass()); //reset @IdClass value and then remove @IdClass - idClassAnnotation = (IdClassAnnotation) typeResource.addAnnotation(IdClassAnnotation.ANNOTATION_NAME); + idClassAnnotation = (IdClassAnnotation) resourceType.addAnnotation(IdClassAnnotation.ANNOTATION_NAME); idClassAnnotation.setValue(existentIdClassName); - typeResource.removeAnnotation(IdClassAnnotation.ANNOTATION_NAME); + resourceType.removeAnnotation(IdClassAnnotation.ANNOTATION_NAME); getJpaProject().synchronizeContextModel(); assertNull(getJavaEntity().getIdClassReference().getSpecifiedIdClassName()); - assertNull(typeResource.getAnnotation(IdClassAnnotation.ANNOTATION_NAME)); + assertNull(resourceType.getAnnotation(IdClassAnnotation.ANNOTATION_NAME)); assertNull(getJavaEntity().getIdClassReference().getIdClass()); } @@ -3290,27 +3276,27 @@ public class JavaEntityTests extends ContextModelTestCase createTestIdClass(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + assertNull(getJavaEntity().getIdClassReference().getSpecifiedIdClassName()); - assertNull(typeResource.getAnnotation(IdClassAnnotation.ANNOTATION_NAME)); + assertNull(resourceType.getAnnotation(IdClassAnnotation.ANNOTATION_NAME)); assertNull(getJavaEntity().getIdClassReference().getIdClass()); String nonExistentIdClassName = PACKAGE_NAME_ + "Foo"; getJavaEntity().getIdClassReference().setSpecifiedIdClassName(nonExistentIdClassName); - assertEquals(nonExistentIdClassName, ((IdClassAnnotation) typeResource.getAnnotation(IdClassAnnotation.ANNOTATION_NAME)).getValue()); + assertEquals(nonExistentIdClassName, ((IdClassAnnotation) resourceType.getAnnotation(IdClassAnnotation.ANNOTATION_NAME)).getValue()); assertEquals(nonExistentIdClassName, getJavaEntity().getIdClassReference().getSpecifiedIdClassName()); assertNull(getJavaEntity().getIdClassReference().getIdClass()); String existentIdClassName = PACKAGE_NAME_ + "TestTypeId"; getJavaEntity().getIdClassReference().setSpecifiedIdClassName(existentIdClassName); - assertEquals(existentIdClassName, ((IdClassAnnotation) typeResource.getAnnotation(IdClassAnnotation.ANNOTATION_NAME)).getValue()); + assertEquals(existentIdClassName, ((IdClassAnnotation) resourceType.getAnnotation(IdClassAnnotation.ANNOTATION_NAME)).getValue()); assertEquals(existentIdClassName, getJavaEntity().getIdClassReference().getSpecifiedIdClassName()); assertNotNull(getJavaEntity().getIdClassReference().getIdClass()); getJavaEntity().getIdClassReference().setSpecifiedIdClassName(null); assertNull(getJavaEntity().getIdClassReference().getSpecifiedIdClassName()); - assertNull(typeResource.getAnnotation(IdClassAnnotation.ANNOTATION_NAME)); + assertNull(resourceType.getAnnotation(IdClassAnnotation.ANNOTATION_NAME)); assertNull(getJavaEntity().getIdClassReference().getIdClass()); } @@ -3320,7 +3306,7 @@ public class JavaEntityTests extends ContextModelTestCase addXmlClassRef(PACKAGE_NAME + ".AnnotationTestTypeChild"); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - Iterator classRefs = getPersistenceUnit().specifiedClassRefs(); + Iterator classRefs = getPersistenceUnit().getSpecifiedClassRefs().iterator(); JavaPersistentType entityPersistentType = classRefs.next().getJavaPersistentType(); JavaEntity javaEntity = (JavaEntity) entityPersistentType.getMapping(); JavaPersistentType mappedSuperclassPersistentType = classRefs.next().getJavaPersistentType(); @@ -3330,7 +3316,7 @@ public class JavaEntityTests extends ContextModelTestCase ((JavaIdMapping) mappedSuperclassPersistentType.getAttributeNamed("id").getMapping()).getColumn().setSpecifiedName("MY_ID"); assertEquals("MY_ID", javaEntity.getPrimaryKeyColumnName()); - ListIterator virtualAttributeOverrides = javaEntity.getAttributeOverrideContainer().virtualOverrides(); + ListIterator virtualAttributeOverrides = javaEntity.getAttributeOverrideContainer().getVirtualOverrides().iterator(); virtualAttributeOverrides.next(); virtualAttributeOverrides.next(); JavaVirtualAttributeOverride virtualOverride = virtualAttributeOverrides.next(); @@ -3366,7 +3352,7 @@ public class JavaEntityTests extends ContextModelTestCase addXmlClassRef(PACKAGE_NAME + ".AnnotationTestTypeChild"); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ListIterator specifiedClassRefs = getPersistenceUnit().specifiedClassRefs(); + ListIterator specifiedClassRefs = getPersistenceUnit().getSpecifiedClassRefs().iterator(); Entity concreteEntity = (Entity) specifiedClassRefs.next().getJavaPersistentType().getMapping(); assertEquals("AnnotationTestTypeChild", concreteEntity.getName()); @@ -3391,7 +3377,7 @@ public class JavaEntityTests extends ContextModelTestCase addXmlClassRef(PACKAGE_NAME + ".AnnotationTestTypeChild"); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ListIterator specifiedClassRefs = getPersistenceUnit().specifiedClassRefs(); + ListIterator specifiedClassRefs = getPersistenceUnit().getSpecifiedClassRefs().iterator(); Entity concreteEntity = (Entity) specifiedClassRefs.next().getJavaPersistentType().getMapping(); assertEquals("AnnotationTestTypeChild", concreteEntity.getName()); diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaGeneratedValueTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaGeneratedValueTests.java index f904a0353d..3df675ec4b 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaGeneratedValueTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaGeneratedValueTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2010 Oracle. All rights reserved. + * Copyright (c) 2007, 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,14 +12,15 @@ package org.eclipse.jpt.jpa.core.tests.internal.context.java; import java.util.Iterator; import org.eclipse.jdt.core.ICompilationUnit; +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.JavaResourceAnnotatedElement.Kind; import org.eclipse.jpt.common.utility.internal.iterators.ArrayIterator; import org.eclipse.jpt.jpa.core.context.GeneratedValue; import org.eclipse.jpt.jpa.core.context.GenerationType; import org.eclipse.jpt.jpa.core.context.IdMapping; import org.eclipse.jpt.jpa.core.resource.java.GeneratedValueAnnotation; 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.tests.internal.context.ContextModelTestCase; @SuppressWarnings("nls") @@ -58,9 +59,9 @@ public class JavaGeneratedValueTests extends ContextModelTestCase assertEquals(GENERATOR, idMapping.getGeneratedValue().getGenerator()); //change resource model sequenceGenerator name, verify the context model is updated - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - GeneratedValueAnnotation generatedValue = (GeneratedValueAnnotation) attributeResource.getAnnotation(JPA.GENERATED_VALUE); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + GeneratedValueAnnotation generatedValue = (GeneratedValueAnnotation) resourceField.getAnnotation(JPA.GENERATED_VALUE); generatedValue.setGenerator("foo"); getJpaProject().synchronizeContextModel(); @@ -79,9 +80,9 @@ public class JavaGeneratedValueTests extends ContextModelTestCase assertEquals("foo", idMapping.getGeneratedValue().getGenerator()); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - GeneratedValueAnnotation generatedValue = (GeneratedValueAnnotation) attributeResource.getAnnotation(JPA.GENERATED_VALUE); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + GeneratedValueAnnotation generatedValue = (GeneratedValueAnnotation) resourceField.getAnnotation(JPA.GENERATED_VALUE); assertEquals("foo", generatedValue.getGenerator()); } @@ -97,9 +98,9 @@ public class JavaGeneratedValueTests extends ContextModelTestCase assertNotNull(idMapping.getGeneratedValue()); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - GeneratedValueAnnotation generatedValue = (GeneratedValueAnnotation) attributeResource.getAnnotation(JPA.GENERATED_VALUE); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + GeneratedValueAnnotation generatedValue = (GeneratedValueAnnotation) resourceField.getAnnotation(JPA.GENERATED_VALUE); assertNotNull(generatedValue); } @@ -112,9 +113,9 @@ public class JavaGeneratedValueTests extends ContextModelTestCase assertEquals(GeneratedValue.DEFAULT_STRATEGY, idMapping.getGeneratedValue().getStrategy()); //change resource model sequenceGenerator name, verify the context model is updated - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - GeneratedValueAnnotation generatedValue = (GeneratedValueAnnotation) attributeResource.getAnnotation(JPA.GENERATED_VALUE); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + GeneratedValueAnnotation generatedValue = (GeneratedValueAnnotation) resourceField.getAnnotation(JPA.GENERATED_VALUE); generatedValue.setStrategy(org.eclipse.jpt.jpa.core.resource.java.GenerationType.IDENTITY); getJpaProject().synchronizeContextModel(); @@ -134,16 +135,16 @@ public class JavaGeneratedValueTests extends ContextModelTestCase assertEquals(GenerationType.IDENTITY, idMapping.getGeneratedValue().getStrategy()); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - GeneratedValueAnnotation generatedValue = (GeneratedValueAnnotation) attributeResource.getAnnotation(JPA.GENERATED_VALUE); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + GeneratedValueAnnotation generatedValue = (GeneratedValueAnnotation) resourceField.getAnnotation(JPA.GENERATED_VALUE); assertEquals(org.eclipse.jpt.jpa.core.resource.java.GenerationType.IDENTITY, generatedValue.getStrategy()); idMapping.getGeneratedValue().setSpecifiedStrategy(null); assertEquals(GeneratedValue.DEFAULT_STRATEGY, idMapping.getGeneratedValue().getStrategy()); - generatedValue = (GeneratedValueAnnotation) attributeResource.getAnnotation(JPA.GENERATED_VALUE); + generatedValue = (GeneratedValueAnnotation) resourceField.getAnnotation(JPA.GENERATED_VALUE); assertNotNull(generatedValue); assertNull(generatedValue.getStrategy()); } diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaIdMappingTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaIdMappingTests.java index d756109f2d..38c7d85056 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaIdMappingTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaIdMappingTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2010 Oracle. All rights reserved. + * Copyright (c) 2007, 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. @@ -11,6 +11,9 @@ package org.eclipse.jpt.jpa.core.tests.internal.context.java; import java.util.Iterator; import org.eclipse.jdt.core.ICompilationUnit; +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.JavaResourceAnnotatedElement.Kind; import org.eclipse.jpt.common.utility.internal.iterators.ArrayIterator; import org.eclipse.jpt.jpa.core.MappingKeys; import org.eclipse.jpt.jpa.core.context.BasicMapping; @@ -33,8 +36,6 @@ import org.eclipse.jpt.jpa.core.resource.java.EmbeddedIdAnnotation; import org.eclipse.jpt.jpa.core.resource.java.GeneratedValueAnnotation; 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.ManyToManyAnnotation; import org.eclipse.jpt.jpa.core.resource.java.ManyToOneAnnotation; import org.eclipse.jpt.jpa.core.resource.java.OneToManyAnnotation; @@ -114,7 +115,7 @@ public class JavaIdMappingTests extends ContextModelTestCase createTestEntityWithIdMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); IdMapping idMapping = (IdMapping) persistentAttribute.getMapping(); assertFalse(idMapping.isDefault()); idMapping.getColumn().setSpecifiedName("FOO"); @@ -129,22 +130,22 @@ public class JavaIdMappingTests extends ContextModelTestCase assertEquals("FOO", ((BasicMapping) persistentAttribute.getMapping()).getColumn().getSpecifiedName()); assertEquals(TemporalType.TIME, ((TemporalConverter) ((BasicMapping) persistentAttribute.getMapping()).getConverter()).getTemporalType()); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - assertNull(attributeResource.getAnnotation(IdAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getAnnotation(BasicAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getAnnotation(ColumnAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getAnnotation(TemporalAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(TableGeneratorAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(SequenceGeneratorAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(GeneratedValueAnnotation.ANNOTATION_NAME)); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + assertNull(resourceField.getAnnotation(IdAnnotation.ANNOTATION_NAME)); + assertNotNull(resourceField.getAnnotation(BasicAnnotation.ANNOTATION_NAME)); + assertNotNull(resourceField.getAnnotation(ColumnAnnotation.ANNOTATION_NAME)); + assertNotNull(resourceField.getAnnotation(TemporalAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(TableGeneratorAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(SequenceGeneratorAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(GeneratedValueAnnotation.ANNOTATION_NAME)); } public void testMorphToDefault() throws Exception { createTestEntityWithIdMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); IdMapping idMapping = (IdMapping) persistentAttribute.getMapping(); assertFalse(idMapping.isDefault()); idMapping.getColumn().setSpecifiedName("FOO"); @@ -159,21 +160,21 @@ public class JavaIdMappingTests extends ContextModelTestCase assertEquals("FOO", ((BasicMapping) persistentAttribute.getMapping()).getColumn().getSpecifiedName()); assertEquals(TemporalType.TIME, ((TemporalConverter) ((BasicMapping) persistentAttribute.getMapping()).getConverter()).getTemporalType()); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - assertNull(attributeResource.getAnnotation(IdAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getAnnotation(ColumnAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getAnnotation(TemporalAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(TableGeneratorAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(SequenceGeneratorAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(GeneratedValueAnnotation.ANNOTATION_NAME)); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + assertNull(resourceField.getAnnotation(IdAnnotation.ANNOTATION_NAME)); + assertNotNull(resourceField.getAnnotation(ColumnAnnotation.ANNOTATION_NAME)); + assertNotNull(resourceField.getAnnotation(TemporalAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(TableGeneratorAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(SequenceGeneratorAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(GeneratedValueAnnotation.ANNOTATION_NAME)); } public void testMorphToVersionMapping() throws Exception { createTestEntityWithIdMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); IdMapping idMapping = (IdMapping) persistentAttribute.getMapping(); assertFalse(idMapping.isDefault()); idMapping.getColumn().setSpecifiedName("FOO"); @@ -188,22 +189,22 @@ public class JavaIdMappingTests extends ContextModelTestCase assertEquals("FOO", ((VersionMapping) persistentAttribute.getMapping()).getColumn().getSpecifiedName()); assertEquals(TemporalType.TIME, ((TemporalConverter) ((VersionMapping) persistentAttribute.getMapping()).getConverter()).getTemporalType()); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - assertNull(attributeResource.getAnnotation(IdAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getAnnotation(VersionAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getAnnotation(ColumnAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getAnnotation(TemporalAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(TableGeneratorAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(SequenceGeneratorAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(GeneratedValueAnnotation.ANNOTATION_NAME)); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + assertNull(resourceField.getAnnotation(IdAnnotation.ANNOTATION_NAME)); + assertNotNull(resourceField.getAnnotation(VersionAnnotation.ANNOTATION_NAME)); + assertNotNull(resourceField.getAnnotation(ColumnAnnotation.ANNOTATION_NAME)); + assertNotNull(resourceField.getAnnotation(TemporalAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(TableGeneratorAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(SequenceGeneratorAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(GeneratedValueAnnotation.ANNOTATION_NAME)); } public void testMorphToEmbeddedMapping() throws Exception { createTestEntityWithIdMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); IdMapping idMapping = (IdMapping) persistentAttribute.getMapping(); assertFalse(idMapping.isDefault()); idMapping.getColumn().setSpecifiedName("FOO"); @@ -217,22 +218,22 @@ public class JavaIdMappingTests extends ContextModelTestCase persistentAttribute.setMappingKey(MappingKeys.EMBEDDED_ATTRIBUTE_MAPPING_KEY); assertTrue(persistentAttribute.getMapping() instanceof EmbeddedMapping); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - assertNull(attributeResource.getAnnotation(IdAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getAnnotation(EmbeddedAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(ColumnAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(TemporalAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(TableGeneratorAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(SequenceGeneratorAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(GeneratedValueAnnotation.ANNOTATION_NAME)); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + assertNull(resourceField.getAnnotation(IdAnnotation.ANNOTATION_NAME)); + assertNotNull(resourceField.getAnnotation(EmbeddedAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(ColumnAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(TemporalAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(TableGeneratorAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(SequenceGeneratorAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(GeneratedValueAnnotation.ANNOTATION_NAME)); } public void testMorphToTransientMapping() throws Exception { createTestEntityWithIdMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); IdMapping idMapping = (IdMapping) persistentAttribute.getMapping(); assertFalse(idMapping.isDefault()); idMapping.getColumn().setSpecifiedName("FOO"); @@ -246,22 +247,22 @@ public class JavaIdMappingTests extends ContextModelTestCase persistentAttribute.setMappingKey(MappingKeys.TRANSIENT_ATTRIBUTE_MAPPING_KEY); assertTrue(persistentAttribute.getMapping() instanceof TransientMapping); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - assertNull(attributeResource.getAnnotation(IdAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getAnnotation(TransientAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(ColumnAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(TemporalAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(TableGeneratorAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(SequenceGeneratorAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(GeneratedValueAnnotation.ANNOTATION_NAME)); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + assertNull(resourceField.getAnnotation(IdAnnotation.ANNOTATION_NAME)); + assertNotNull(resourceField.getAnnotation(TransientAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(ColumnAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(TemporalAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(TableGeneratorAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(SequenceGeneratorAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(GeneratedValueAnnotation.ANNOTATION_NAME)); } public void testMorphToEmbeddedIdMapping() throws Exception { createTestEntityWithIdMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); IdMapping idMapping = (IdMapping) persistentAttribute.getMapping(); assertFalse(idMapping.isDefault()); idMapping.getColumn().setSpecifiedName("FOO"); @@ -275,22 +276,22 @@ public class JavaIdMappingTests extends ContextModelTestCase persistentAttribute.setMappingKey(MappingKeys.EMBEDDED_ID_ATTRIBUTE_MAPPING_KEY); assertTrue(persistentAttribute.getMapping() instanceof EmbeddedIdMapping); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - assertNull(attributeResource.getAnnotation(IdAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getAnnotation(EmbeddedIdAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(ColumnAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(TemporalAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(TableGeneratorAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(SequenceGeneratorAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(GeneratedValueAnnotation.ANNOTATION_NAME)); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + assertNull(resourceField.getAnnotation(IdAnnotation.ANNOTATION_NAME)); + assertNotNull(resourceField.getAnnotation(EmbeddedIdAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(ColumnAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(TemporalAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(TableGeneratorAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(SequenceGeneratorAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(GeneratedValueAnnotation.ANNOTATION_NAME)); } public void testMorphToOneToOneMapping() throws Exception { createTestEntityWithIdMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); IdMapping idMapping = (IdMapping) persistentAttribute.getMapping(); assertFalse(idMapping.isDefault()); idMapping.getColumn().setSpecifiedName("FOO"); @@ -304,22 +305,22 @@ public class JavaIdMappingTests extends ContextModelTestCase persistentAttribute.setMappingKey(MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY); assertTrue(persistentAttribute.getMapping() instanceof OneToOneMapping); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - assertNull(attributeResource.getAnnotation(IdAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getAnnotation(OneToOneAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(ColumnAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(TemporalAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(TableGeneratorAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(SequenceGeneratorAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(GeneratedValueAnnotation.ANNOTATION_NAME)); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + assertNull(resourceField.getAnnotation(IdAnnotation.ANNOTATION_NAME)); + assertNotNull(resourceField.getAnnotation(OneToOneAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(ColumnAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(TemporalAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(TableGeneratorAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(SequenceGeneratorAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(GeneratedValueAnnotation.ANNOTATION_NAME)); } public void testMorphToOneToManyMapping() throws Exception { createTestEntityWithIdMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); IdMapping idMapping = (IdMapping) persistentAttribute.getMapping(); assertFalse(idMapping.isDefault()); idMapping.getColumn().setSpecifiedName("FOO"); @@ -333,22 +334,22 @@ public class JavaIdMappingTests extends ContextModelTestCase persistentAttribute.setMappingKey(MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY); assertTrue(persistentAttribute.getMapping() instanceof OneToManyMapping); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - assertNull(attributeResource.getAnnotation(IdAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getAnnotation(OneToManyAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(ColumnAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(TemporalAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(TableGeneratorAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(SequenceGeneratorAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(GeneratedValueAnnotation.ANNOTATION_NAME)); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + assertNull(resourceField.getAnnotation(IdAnnotation.ANNOTATION_NAME)); + assertNotNull(resourceField.getAnnotation(OneToManyAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(ColumnAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(TemporalAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(TableGeneratorAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(SequenceGeneratorAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(GeneratedValueAnnotation.ANNOTATION_NAME)); } public void testMorphToManyToOneMapping() throws Exception { createTestEntityWithIdMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); IdMapping idMapping = (IdMapping) persistentAttribute.getMapping(); assertFalse(idMapping.isDefault()); idMapping.getColumn().setSpecifiedName("FOO"); @@ -362,22 +363,22 @@ public class JavaIdMappingTests extends ContextModelTestCase persistentAttribute.setMappingKey(MappingKeys.MANY_TO_ONE_ATTRIBUTE_MAPPING_KEY); assertTrue(persistentAttribute.getMapping() instanceof ManyToOneMapping); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - assertNull(attributeResource.getAnnotation(IdAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getAnnotation(ManyToOneAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(ColumnAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(TemporalAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(TableGeneratorAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(SequenceGeneratorAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(GeneratedValueAnnotation.ANNOTATION_NAME)); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + assertNull(resourceField.getAnnotation(IdAnnotation.ANNOTATION_NAME)); + assertNotNull(resourceField.getAnnotation(ManyToOneAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(ColumnAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(TemporalAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(TableGeneratorAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(SequenceGeneratorAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(GeneratedValueAnnotation.ANNOTATION_NAME)); } public void testMorphToManyToManyMapping() throws Exception { createTestEntityWithIdMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); IdMapping idMapping = (IdMapping) persistentAttribute.getMapping(); assertFalse(idMapping.isDefault()); idMapping.getColumn().setSpecifiedName("FOO"); @@ -391,22 +392,22 @@ public class JavaIdMappingTests extends ContextModelTestCase persistentAttribute.setMappingKey(MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); assertTrue(persistentAttribute.getMapping() instanceof ManyToManyMapping); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - assertNull(attributeResource.getAnnotation(IdAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getAnnotation(ManyToManyAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(ColumnAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(TemporalAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(TableGeneratorAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(SequenceGeneratorAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(GeneratedValueAnnotation.ANNOTATION_NAME)); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + assertNull(resourceField.getAnnotation(IdAnnotation.ANNOTATION_NAME)); + assertNotNull(resourceField.getAnnotation(ManyToManyAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(ColumnAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(TemporalAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(TableGeneratorAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(SequenceGeneratorAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(GeneratedValueAnnotation.ANNOTATION_NAME)); } public void testGetTemporal() throws Exception { createTestEntityWithTemporal(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); IdMapping idMapping = (IdMapping) persistentAttribute.getMapping(); assertEquals(TemporalType.TIMESTAMP, ((TemporalConverter) idMapping.getConverter()).getTemporalType()); @@ -416,42 +417,42 @@ public class JavaIdMappingTests extends ContextModelTestCase createTestEntityWithIdMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); IdMapping idMapping = (IdMapping) persistentAttribute.getMapping(); assertNull(idMapping.getConverter().getType()); idMapping.setConverter(TemporalConverter.class); ((TemporalConverter) idMapping.getConverter()).setTemporalType(TemporalType.TIME); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - TemporalAnnotation temporal = (TemporalAnnotation) attributeResource.getAnnotation(TemporalAnnotation.ANNOTATION_NAME); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + TemporalAnnotation temporal = (TemporalAnnotation) resourceField.getAnnotation(TemporalAnnotation.ANNOTATION_NAME); assertEquals(org.eclipse.jpt.jpa.core.resource.java.TemporalType.TIME, temporal.getValue()); idMapping.setConverter(null); - assertNull(attributeResource.getAnnotation(TemporalAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(TemporalAnnotation.ANNOTATION_NAME)); } public void testGetTemporalUpdatesFromResourceModelChange() throws Exception { createTestEntityWithIdMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); IdMapping idMapping = (IdMapping) persistentAttribute.getMapping(); assertNull(idMapping.getConverter().getType()); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - TemporalAnnotation temporal = (TemporalAnnotation) attributeResource.addAnnotation(TemporalAnnotation.ANNOTATION_NAME); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + TemporalAnnotation temporal = (TemporalAnnotation) resourceField.addAnnotation(TemporalAnnotation.ANNOTATION_NAME); temporal.setValue(org.eclipse.jpt.jpa.core.resource.java.TemporalType.DATE); getJpaProject().synchronizeContextModel(); assertEquals(TemporalType.DATE, ((TemporalConverter) idMapping.getConverter()).getTemporalType()); - attributeResource.removeAnnotation(TemporalAnnotation.ANNOTATION_NAME); + resourceField.removeAnnotation(TemporalAnnotation.ANNOTATION_NAME); getJpaProject().synchronizeContextModel(); assertNull(idMapping.getConverter().getType()); @@ -463,15 +464,15 @@ public class JavaIdMappingTests extends ContextModelTestCase createTestEntityWithIdMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); IdMapping idMapping = (IdMapping) persistentAttribute.getMapping(); assertNull(idMapping.getColumn().getSpecifiedName()); assertEquals("id", idMapping.getColumn().getName()); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - ColumnAnnotation column = (ColumnAnnotation) attributeResource.addAnnotation(JPA.COLUMN); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + ColumnAnnotation column = (ColumnAnnotation) resourceField.addAnnotation(JPA.COLUMN); column.setName("foo"); getJpaProject().synchronizeContextModel(); @@ -484,39 +485,39 @@ public class JavaIdMappingTests extends ContextModelTestCase createTestEntityWithIdMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); IdMapping idMapping = (IdMapping) persistentAttribute.getMapping(); assertNull(idMapping.getGeneratorContainer().getSequenceGenerator()); - assertEquals(0, idMapping.getPersistenceUnit().generatorsSize()); + assertEquals(0, idMapping.getPersistenceUnit().getGeneratorsSize()); - JavaResourcePersistentType resourceType = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute resourceAttribute = resourceType.persistableAttributes().next(); - resourceAttribute.addAnnotation(JPA.SEQUENCE_GENERATOR); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + resourceField.addAnnotation(JPA.SEQUENCE_GENERATOR); getJpaProject().synchronizeContextModel(); assertNotNull(idMapping.getGeneratorContainer().getSequenceGenerator()); - assertEquals(2, resourceAttribute.annotationsSize()); - assertEquals(1, idMapping.getPersistenceUnit().generatorsSize()); + assertEquals(2, resourceField.getAnnotationsSize()); + assertEquals(1, idMapping.getPersistenceUnit().getGeneratorsSize()); idMapping.getGeneratorContainer().getSequenceGenerator().setName("foo"); getJpaProject().synchronizeContextModel(); - assertEquals(1, idMapping.getPersistenceUnit().generatorsSize()); + assertEquals(1, idMapping.getPersistenceUnit().getGeneratorsSize()); } public void testAddSequenceGenerator() throws Exception { createTestEntityWithIdMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); IdMapping idMapping = (IdMapping) persistentAttribute.getMapping(); assertNull(idMapping.getGeneratorContainer().getSequenceGenerator()); idMapping.getGeneratorContainer().addSequenceGenerator(); - 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(); - assertNotNull(attributeResource.getAnnotation(JPA.SEQUENCE_GENERATOR)); + assertNotNull(resourceField.getAnnotation(JPA.SEQUENCE_GENERATOR)); assertNotNull(idMapping.getGeneratorContainer().getSequenceGenerator()); //try adding another sequence generator, should get an IllegalStateException @@ -532,19 +533,19 @@ public class JavaIdMappingTests extends ContextModelTestCase createTestEntityWithIdMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); IdMapping idMapping = (IdMapping) persistentAttribute.getMapping(); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - attributeResource.addAnnotation(JPA.SEQUENCE_GENERATOR); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + resourceField.addAnnotation(JPA.SEQUENCE_GENERATOR); getJpaProject().synchronizeContextModel(); idMapping.getGeneratorContainer().removeSequenceGenerator(); assertNull(idMapping.getGeneratorContainer().getSequenceGenerator()); - assertNull(attributeResource.getAnnotation(JPA.SEQUENCE_GENERATOR)); + assertNull(resourceField.getAnnotation(JPA.SEQUENCE_GENERATOR)); //try removing the sequence generator again, should get an IllegalStateException try { @@ -559,38 +560,38 @@ public class JavaIdMappingTests extends ContextModelTestCase createTestEntityWithIdMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); IdMapping idMapping = (IdMapping) persistentAttribute.getMapping(); assertNull(idMapping.getGeneratorContainer().getTableGenerator()); - assertEquals(0, idMapping.getPersistenceUnit().generatorsSize()); + assertEquals(0, idMapping.getPersistenceUnit().getGeneratorsSize()); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - attributeResource.addAnnotation(JPA.TABLE_GENERATOR); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + resourceField.addAnnotation(JPA.TABLE_GENERATOR); getJpaProject().synchronizeContextModel(); assertNotNull(idMapping.getGeneratorContainer().getTableGenerator()); - assertEquals(2, attributeResource.annotationsSize()); - assertEquals(1, idMapping.getPersistenceUnit().generatorsSize()); + assertEquals(2, resourceField.getAnnotationsSize()); + assertEquals(1, idMapping.getPersistenceUnit().getGeneratorsSize()); idMapping.getGeneratorContainer().getTableGenerator().setName("foo"); - assertEquals(1, idMapping.getPersistenceUnit().generatorsSize()); + assertEquals(1, idMapping.getPersistenceUnit().getGeneratorsSize()); } public void testAddTableGenerator() throws Exception { createTestEntityWithIdMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); IdMapping idMapping = (IdMapping) persistentAttribute.getMapping(); assertNull(idMapping.getGeneratorContainer().getTableGenerator()); idMapping.getGeneratorContainer().addTableGenerator(); - 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(); - assertNotNull(attributeResource.getAnnotation(JPA.TABLE_GENERATOR)); + assertNotNull(resourceField.getAnnotation(JPA.TABLE_GENERATOR)); assertNotNull(idMapping.getGeneratorContainer().getTableGenerator()); //try adding another table generator, should get an IllegalStateException @@ -606,19 +607,19 @@ public class JavaIdMappingTests extends ContextModelTestCase createTestEntityWithIdMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); IdMapping idMapping = (IdMapping) persistentAttribute.getMapping(); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - attributeResource.addAnnotation(JPA.TABLE_GENERATOR); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + resourceField.addAnnotation(JPA.TABLE_GENERATOR); getJpaProject().synchronizeContextModel(); idMapping.getGeneratorContainer().removeTableGenerator(); assertNull(idMapping.getGeneratorContainer().getTableGenerator()); - assertNull(attributeResource.getAnnotation(JPA.TABLE_GENERATOR)); + assertNull(resourceField.getAnnotation(JPA.TABLE_GENERATOR)); //try removing the table generator again, should get an IllegalStateException try { @@ -633,49 +634,49 @@ public class JavaIdMappingTests extends ContextModelTestCase createTestEntityWithIdMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); IdMapping idMapping = (IdMapping) persistentAttribute.getMapping(); assertNull(idMapping.getGeneratedValue()); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - attributeResource.addAnnotation(JPA.GENERATED_VALUE); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + resourceField.addAnnotation(JPA.GENERATED_VALUE); getJpaProject().synchronizeContextModel(); assertNotNull(idMapping.getGeneratedValue()); - assertEquals(2, attributeResource.annotationsSize()); + assertEquals(2, resourceField.getAnnotationsSize()); } public void testGetGeneratedValue2() throws Exception { addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); createTestEntityWithIdMappingGeneratedValue(); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); IdMapping idMapping = (IdMapping) persistentAttribute.getMapping(); - 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(); assertNotNull(idMapping.getGeneratedValue()); - assertEquals(2, attributeResource.annotationsSize()); + assertEquals(2, resourceField.getAnnotationsSize()); } public void testAddGeneratedValue() throws Exception { createTestEntityWithIdMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); IdMapping idMapping = (IdMapping) persistentAttribute.getMapping(); assertNull(idMapping.getGeneratedValue()); idMapping.addGeneratedValue(); - 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(); - assertNotNull(attributeResource.getAnnotation(JPA.GENERATED_VALUE)); + assertNotNull(resourceField.getAnnotation(JPA.GENERATED_VALUE)); assertNotNull(idMapping.getGeneratedValue()); //try adding another generated value, should get an IllegalStateException @@ -691,18 +692,18 @@ public class JavaIdMappingTests extends ContextModelTestCase createTestEntityWithIdMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); IdMapping idMapping = (IdMapping) persistentAttribute.getMapping(); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - attributeResource.addAnnotation(JPA.GENERATED_VALUE); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + resourceField.addAnnotation(JPA.GENERATED_VALUE); getJpaProject().synchronizeContextModel(); idMapping.removeGeneratedValue(); assertNull(idMapping.getGeneratedValue()); - assertNull(attributeResource.getAnnotation(JPA.GENERATED_VALUE)); + assertNull(resourceField.getAnnotation(JPA.GENERATED_VALUE)); //try removing the generatedValue again, should get an IllegalStateException try { diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaJoinColumnTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaJoinColumnTests.java index 71dd7f285f..e9bdd2a798 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaJoinColumnTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaJoinColumnTests.java @@ -11,14 +11,15 @@ package org.eclipse.jpt.jpa.core.tests.internal.context.java; import java.util.Iterator; import org.eclipse.jdt.core.ICompilationUnit; +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.JavaResourceAnnotatedElement.Kind; import org.eclipse.jpt.common.core.tests.internal.projects.TestJavaProject.SourceWriter; import org.eclipse.jpt.common.utility.internal.iterators.ArrayIterator; import org.eclipse.jpt.jpa.core.context.java.JavaJoinColumn; import org.eclipse.jpt.jpa.core.context.java.JavaJoinColumnRelationshipStrategy; import org.eclipse.jpt.jpa.core.context.java.JavaOneToOneMapping; 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.tests.internal.context.ContextModelTestCase; @@ -93,30 +94,30 @@ public class JavaJoinColumnTests extends ContextModelTestCase createTestEntityWithOneToOne(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - JavaOneToOneMapping oneToOneMapping = (JavaOneToOneMapping) getJavaPersistentType().attributes().next().getMapping(); + JavaOneToOneMapping oneToOneMapping = (JavaOneToOneMapping) getJavaPersistentType().getAttributes().iterator().next().getMapping(); JavaJoinColumnRelationshipStrategy joinColumns = oneToOneMapping.getRelationship().getJoinColumnStrategy(); - JavaResourcePersistentType resourceType = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute resourceAttribute = resourceType.persistableAttributes().next(); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); - JoinColumnAnnotation joinColumnAnnotation = (JoinColumnAnnotation) resourceAttribute.getAnnotation(JoinColumnAnnotation.ANNOTATION_NAME); + JoinColumnAnnotation joinColumnAnnotation = (JoinColumnAnnotation) resourceField.getAnnotation(JoinColumnAnnotation.ANNOTATION_NAME); - assertEquals(0, joinColumns.specifiedJoinColumnsSize()); + assertEquals(0, joinColumns.getSpecifiedJoinColumnsSize()); assertNull(joinColumnAnnotation); //set name in the resource model, verify context model updated - joinColumnAnnotation = (JoinColumnAnnotation) resourceAttribute.addAnnotation(JoinColumnAnnotation.ANNOTATION_NAME); + joinColumnAnnotation = (JoinColumnAnnotation) resourceField.addAnnotation(0, JoinColumnAnnotation.ANNOTATION_NAME); joinColumnAnnotation.setName("FOO"); getJpaProject().synchronizeContextModel(); - JavaJoinColumn joinColumn = joinColumns.specifiedJoinColumns().next(); + JavaJoinColumn joinColumn = joinColumns.getSpecifiedJoinColumns().iterator().next(); assertEquals("FOO", joinColumn.getSpecifiedName()); assertEquals("FOO", joinColumnAnnotation.getName()); //set name to null, annotation is NOT removed joinColumn.setSpecifiedName(null); - assertEquals(1, joinColumns.specifiedJoinColumnsSize()); - joinColumnAnnotation = (JoinColumnAnnotation) resourceAttribute.getAnnotation(JoinColumnAnnotation.ANNOTATION_NAME); + assertEquals(1, joinColumns.getSpecifiedJoinColumnsSize()); + joinColumnAnnotation = (JoinColumnAnnotation) resourceField.getAnnotation(0, JoinColumnAnnotation.ANNOTATION_NAME); assertNull(joinColumnAnnotation.getName()); } @@ -124,24 +125,24 @@ public class JavaJoinColumnTests extends ContextModelTestCase createTestEntityWithOneToOne(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - JavaOneToOneMapping oneToOneMapping = (JavaOneToOneMapping) getJavaPersistentType().attributes().next().getMapping(); + JavaOneToOneMapping oneToOneMapping = (JavaOneToOneMapping) getJavaPersistentType().getAttributes().iterator().next().getMapping(); JavaJoinColumnRelationshipStrategy joinColumns = oneToOneMapping.getRelationship().getJoinColumnStrategy(); - JavaResourcePersistentType resourceType = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute resourceAttribute = resourceType.persistableAttributes().next(); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); JavaJoinColumn joinColumn = joinColumns.addSpecifiedJoinColumn(0); //set name in the context model, verify resource model modified joinColumn.setSpecifiedName("foo"); - JoinColumnAnnotation joinColumnAnnotation = (JoinColumnAnnotation) resourceAttribute.getAnnotation(JoinColumnAnnotation.ANNOTATION_NAME); + JoinColumnAnnotation joinColumnAnnotation = (JoinColumnAnnotation) resourceField.getAnnotation(0, JoinColumnAnnotation.ANNOTATION_NAME); assertEquals("foo", joinColumn.getSpecifiedName()); assertEquals("foo", joinColumnAnnotation.getName()); //set name to null in the context model joinColumn.setSpecifiedName(null); assertNull(joinColumn.getSpecifiedName()); - joinColumnAnnotation = (JoinColumnAnnotation) resourceAttribute.getAnnotation(JoinColumnAnnotation.ANNOTATION_NAME); + joinColumnAnnotation = (JoinColumnAnnotation) resourceField.getAnnotation(0, JoinColumnAnnotation.ANNOTATION_NAME); assertNull(joinColumnAnnotation.getName()); } @@ -165,8 +166,8 @@ public class JavaJoinColumnTests extends ContextModelTestCase // assertEquals(TYPE_NAME + "_Project", joinTable.getDefaultName()); // // JavaPersistentTypeResource typeResource = jpaProject().javaPersistentTypeResource(FULLY_QUALIFIED_TYPE_NAME); -// JavaPersistentAttributeResource attributeResource = typeResource.attributes().next(); -// assertNull(attributeResource.annotation(JoinTable.ANNOTATION_NAME)); +// JavaPersistentresourceField resourceField = typeResource.attributes().next(); +// assertNull(resourceField.annotation(JoinTable.ANNOTATION_NAME)); // // //target entity does not resolve, default name is null // manyToManyMapping.setSpecifiedTargetEntity("Foo"); @@ -177,9 +178,9 @@ public class JavaJoinColumnTests extends ContextModelTestCase // assertEquals(TYPE_NAME + "_Project", joinTable.getDefaultName()); // // //add the join table annotation, verify default join table name is the same -// attributeResource.addAnnotation(JoinTable.ANNOTATION_NAME); +// resourceField.addAnnotation(JoinTable.ANNOTATION_NAME); // assertEquals(TYPE_NAME + "_Project", joinTable.getDefaultName()); -// assertNotNull(attributeResource.annotation(JoinTable.ANNOTATION_NAME)); +// assertNotNull(resourceField.annotation(JoinTable.ANNOTATION_NAME)); // // //set a table on the target entity, very default join table name updates // manyToManyMapping.getResolvedTargetEntity().getTable().setSpecifiedName("FOO"); @@ -194,24 +195,24 @@ public class JavaJoinColumnTests extends ContextModelTestCase createTestEntityWithOneToOne(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - JavaOneToOneMapping oneToOneMapping = (JavaOneToOneMapping) getJavaPersistentType().attributes().next().getMapping(); + JavaOneToOneMapping oneToOneMapping = (JavaOneToOneMapping) getJavaPersistentType().getAttributes().iterator().next().getMapping(); JavaJoinColumnRelationshipStrategy joinColumns = oneToOneMapping.getRelationship().getJoinColumnStrategy(); - 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(); - JoinColumnAnnotation javaJoinColumn = (JoinColumnAnnotation) attributeResource.getAnnotation(JoinColumnAnnotation.ANNOTATION_NAME); + JoinColumnAnnotation javaJoinColumn = (JoinColumnAnnotation) resourceField.getAnnotation(0, JoinColumnAnnotation.ANNOTATION_NAME); - assertEquals(0, joinColumns.specifiedJoinColumnsSize()); + assertEquals(0, joinColumns.getSpecifiedJoinColumnsSize()); assertNull(javaJoinColumn); //set referenced column name in the resource model, verify context model updated - javaJoinColumn = (JoinColumnAnnotation) attributeResource.addAnnotation(JoinColumnAnnotation.ANNOTATION_NAME); + javaJoinColumn = (JoinColumnAnnotation) resourceField.addAnnotation(0, JoinColumnAnnotation.ANNOTATION_NAME); javaJoinColumn.setName("FOO"); javaJoinColumn.setReferencedColumnName("BAR"); getJpaProject().synchronizeContextModel(); - JavaJoinColumn joinColumn = joinColumns.specifiedJoinColumns().next(); + JavaJoinColumn joinColumn = joinColumns.getSpecifiedJoinColumns().iterator().next(); assertEquals("BAR", joinColumn.getSpecifiedReferencedColumnName()); assertEquals("BAR", javaJoinColumn.getReferencedColumnName()); @@ -226,18 +227,18 @@ public class JavaJoinColumnTests extends ContextModelTestCase createTestEntityWithOneToOne(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - JavaOneToOneMapping oneToOneMapping = (JavaOneToOneMapping) getJavaPersistentType().attributes().next().getMapping(); + JavaOneToOneMapping oneToOneMapping = (JavaOneToOneMapping) getJavaPersistentType().getAttributes().iterator().next().getMapping(); JavaJoinColumnRelationshipStrategy joinColumns = oneToOneMapping.getRelationship().getJoinColumnStrategy(); - 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(); JavaJoinColumn joinColumn = joinColumns.addSpecifiedJoinColumn(0); //set referenced column name in the context model, verify resource model modified joinColumn.setSpecifiedName("foo"); joinColumn.setSpecifiedReferencedColumnName("BAR"); - JoinColumnAnnotation javaJoinColumn = (JoinColumnAnnotation) attributeResource.getAnnotation(JoinColumnAnnotation.ANNOTATION_NAME); + JoinColumnAnnotation javaJoinColumn = (JoinColumnAnnotation) resourceField.getAnnotation(0, JoinColumnAnnotation.ANNOTATION_NAME); assertEquals("BAR", joinColumn.getSpecifiedReferencedColumnName()); assertEquals("BAR", javaJoinColumn.getReferencedColumnName()); @@ -256,24 +257,24 @@ public class JavaJoinColumnTests extends ContextModelTestCase createTestEntityWithOneToOne(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - JavaOneToOneMapping oneToOneMapping = (JavaOneToOneMapping) getJavaPersistentType().attributes().next().getMapping(); + JavaOneToOneMapping oneToOneMapping = (JavaOneToOneMapping) getJavaPersistentType().getAttributes().iterator().next().getMapping(); JavaJoinColumnRelationshipStrategy joinColumns = oneToOneMapping.getRelationship().getJoinColumnStrategy(); - 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(); - JoinColumnAnnotation javaJoinColumn = (JoinColumnAnnotation) attributeResource.getAnnotation(JoinColumnAnnotation.ANNOTATION_NAME); + JoinColumnAnnotation javaJoinColumn = (JoinColumnAnnotation) resourceField.getAnnotation(0, JoinColumnAnnotation.ANNOTATION_NAME); - assertEquals(0, joinColumns.specifiedJoinColumnsSize()); + assertEquals(0, joinColumns.getSpecifiedJoinColumnsSize()); assertNull(javaJoinColumn); //set table in the resource model, verify context model updated - javaJoinColumn = (JoinColumnAnnotation) attributeResource.addAnnotation(JoinColumnAnnotation.ANNOTATION_NAME); + javaJoinColumn = (JoinColumnAnnotation) resourceField.addAnnotation(0, JoinColumnAnnotation.ANNOTATION_NAME); javaJoinColumn.setName("FOO"); javaJoinColumn.setTable("BAR"); getJpaProject().synchronizeContextModel(); - JavaJoinColumn joinColumn = joinColumns.specifiedJoinColumns().next(); + JavaJoinColumn joinColumn = joinColumns.getSpecifiedJoinColumns().iterator().next(); assertEquals("BAR", joinColumn.getSpecifiedTable()); assertEquals("BAR", javaJoinColumn.getTable()); @@ -288,11 +289,11 @@ public class JavaJoinColumnTests extends ContextModelTestCase createTestEntityWithOneToOne(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - JavaOneToOneMapping oneToOneMapping = (JavaOneToOneMapping) getJavaPersistentType().attributes().next().getMapping(); + JavaOneToOneMapping oneToOneMapping = (JavaOneToOneMapping) getJavaPersistentType().getAttributes().iterator().next().getMapping(); JavaJoinColumnRelationshipStrategy joinColumns = oneToOneMapping.getRelationship().getJoinColumnStrategy(); - 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(); JavaJoinColumn joinColumn = joinColumns.addSpecifiedJoinColumn(0); @@ -300,7 +301,7 @@ public class JavaJoinColumnTests extends ContextModelTestCase joinColumn.setSpecifiedName("foo"); joinColumn.setSpecifiedTable("BAR"); - JoinColumnAnnotation javaJoinColumn = (JoinColumnAnnotation) attributeResource.getAnnotation(JoinColumnAnnotation.ANNOTATION_NAME); + JoinColumnAnnotation javaJoinColumn = (JoinColumnAnnotation) resourceField.getAnnotation(0, JoinColumnAnnotation.ANNOTATION_NAME); assertEquals("BAR", joinColumn.getSpecifiedTable()); assertEquals("BAR", javaJoinColumn.getTable()); @@ -319,24 +320,24 @@ public class JavaJoinColumnTests extends ContextModelTestCase createTestEntityWithOneToOne(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - JavaOneToOneMapping oneToOneMapping = (JavaOneToOneMapping) getJavaPersistentType().attributes().next().getMapping(); + JavaOneToOneMapping oneToOneMapping = (JavaOneToOneMapping) getJavaPersistentType().getAttributes().iterator().next().getMapping(); JavaJoinColumnRelationshipStrategy joinColumns = oneToOneMapping.getRelationship().getJoinColumnStrategy(); - 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(); - JoinColumnAnnotation javaJoinColumn = (JoinColumnAnnotation) attributeResource.getAnnotation(JoinColumnAnnotation.ANNOTATION_NAME); + JoinColumnAnnotation javaJoinColumn = (JoinColumnAnnotation) resourceField.getAnnotation(0, JoinColumnAnnotation.ANNOTATION_NAME); - assertEquals(0, joinColumns.specifiedJoinColumnsSize()); + assertEquals(0, joinColumns.getSpecifiedJoinColumnsSize()); assertNull(javaJoinColumn); //set unique in the resource model, verify context model updated - javaJoinColumn = (JoinColumnAnnotation) attributeResource.addAnnotation(JoinColumnAnnotation.ANNOTATION_NAME); + javaJoinColumn = (JoinColumnAnnotation) resourceField.addAnnotation(0, JoinColumnAnnotation.ANNOTATION_NAME); javaJoinColumn.setName("FOO"); javaJoinColumn.setUnique(Boolean.TRUE); getJpaProject().synchronizeContextModel(); - JavaJoinColumn joinColumn = joinColumns.specifiedJoinColumns().next(); + JavaJoinColumn joinColumn = joinColumns.getSpecifiedJoinColumns().iterator().next(); assertEquals(Boolean.TRUE, joinColumn.getSpecifiedUnique()); assertEquals(Boolean.TRUE, javaJoinColumn.getUnique()); @@ -351,11 +352,11 @@ public class JavaJoinColumnTests extends ContextModelTestCase createTestEntityWithOneToOne(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - JavaOneToOneMapping oneToOneMapping = (JavaOneToOneMapping) getJavaPersistentType().attributes().next().getMapping(); + JavaOneToOneMapping oneToOneMapping = (JavaOneToOneMapping) getJavaPersistentType().getAttributes().iterator().next().getMapping(); JavaJoinColumnRelationshipStrategy joinColumns = oneToOneMapping.getRelationship().getJoinColumnStrategy(); - 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(); JavaJoinColumn joinColumn = joinColumns.addSpecifiedJoinColumn(0); @@ -363,7 +364,7 @@ public class JavaJoinColumnTests extends ContextModelTestCase joinColumn.setSpecifiedName("foo"); joinColumn.setSpecifiedUnique(Boolean.TRUE); - JoinColumnAnnotation javaJoinColumn = (JoinColumnAnnotation) attributeResource.getAnnotation(JoinColumnAnnotation.ANNOTATION_NAME); + JoinColumnAnnotation javaJoinColumn = (JoinColumnAnnotation) resourceField.getAnnotation(0, JoinColumnAnnotation.ANNOTATION_NAME); assertEquals(Boolean.TRUE, joinColumn.getSpecifiedUnique()); assertEquals(Boolean.TRUE, javaJoinColumn.getUnique()); @@ -377,24 +378,24 @@ public class JavaJoinColumnTests extends ContextModelTestCase createTestEntityWithOneToOne(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - JavaOneToOneMapping oneToOneMapping = (JavaOneToOneMapping) getJavaPersistentType().attributes().next().getMapping(); + JavaOneToOneMapping oneToOneMapping = (JavaOneToOneMapping) getJavaPersistentType().getAttributes().iterator().next().getMapping(); JavaJoinColumnRelationshipStrategy joinColumns = oneToOneMapping.getRelationship().getJoinColumnStrategy(); - 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(); - JoinColumnAnnotation javaJoinColumn = (JoinColumnAnnotation) attributeResource.getAnnotation(JoinColumnAnnotation.ANNOTATION_NAME); + JoinColumnAnnotation javaJoinColumn = (JoinColumnAnnotation) resourceField.getAnnotation(JoinColumnAnnotation.ANNOTATION_NAME); - assertEquals(0, joinColumns.specifiedJoinColumnsSize()); + assertEquals(0, joinColumns.getSpecifiedJoinColumnsSize()); assertNull(javaJoinColumn); //set nullable in the resource model, verify context model updated - javaJoinColumn = (JoinColumnAnnotation) attributeResource.addAnnotation(JoinColumnAnnotation.ANNOTATION_NAME); + javaJoinColumn = (JoinColumnAnnotation) resourceField.addAnnotation(0, JoinColumnAnnotation.ANNOTATION_NAME); javaJoinColumn.setName("FOO"); javaJoinColumn.setNullable(Boolean.FALSE); getJpaProject().synchronizeContextModel(); - JavaJoinColumn joinColumn = joinColumns.specifiedJoinColumns().next(); + JavaJoinColumn joinColumn = joinColumns.getSpecifiedJoinColumns().iterator().next(); assertEquals(Boolean.FALSE, joinColumn.getSpecifiedNullable()); assertEquals(Boolean.FALSE, javaJoinColumn.getNullable()); @@ -409,11 +410,11 @@ public class JavaJoinColumnTests extends ContextModelTestCase createTestEntityWithOneToOne(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - JavaOneToOneMapping oneToOneMapping = (JavaOneToOneMapping) getJavaPersistentType().attributes().next().getMapping(); + JavaOneToOneMapping oneToOneMapping = (JavaOneToOneMapping) getJavaPersistentType().getAttributes().iterator().next().getMapping(); JavaJoinColumnRelationshipStrategy joinColumns = oneToOneMapping.getRelationship().getJoinColumnStrategy(); - 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(); JavaJoinColumn joinColumn = joinColumns.addSpecifiedJoinColumn(0); @@ -421,7 +422,7 @@ public class JavaJoinColumnTests extends ContextModelTestCase joinColumn.setSpecifiedName("foo"); joinColumn.setSpecifiedNullable(Boolean.FALSE); - JoinColumnAnnotation javaJoinColumn = (JoinColumnAnnotation) attributeResource.getAnnotation(JoinColumnAnnotation.ANNOTATION_NAME); + JoinColumnAnnotation javaJoinColumn = (JoinColumnAnnotation) resourceField.getAnnotation(0, JoinColumnAnnotation.ANNOTATION_NAME); assertEquals(Boolean.FALSE, joinColumn.getSpecifiedNullable()); assertEquals(Boolean.FALSE, javaJoinColumn.getNullable()); @@ -435,24 +436,24 @@ public class JavaJoinColumnTests extends ContextModelTestCase createTestEntityWithOneToOne(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - JavaOneToOneMapping oneToOneMapping = (JavaOneToOneMapping) getJavaPersistentType().attributes().next().getMapping(); + JavaOneToOneMapping oneToOneMapping = (JavaOneToOneMapping) getJavaPersistentType().getAttributes().iterator().next().getMapping(); JavaJoinColumnRelationshipStrategy joinColumns = oneToOneMapping.getRelationship().getJoinColumnStrategy(); - 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(); - JoinColumnAnnotation javaJoinColumn = (JoinColumnAnnotation) attributeResource.getAnnotation(JoinColumnAnnotation.ANNOTATION_NAME); + JoinColumnAnnotation javaJoinColumn = (JoinColumnAnnotation) resourceField.getAnnotation(JoinColumnAnnotation.ANNOTATION_NAME); - assertEquals(0, joinColumns.specifiedJoinColumnsSize()); + assertEquals(0, joinColumns.getSpecifiedJoinColumnsSize()); assertNull(javaJoinColumn); //set insertable in the resource model, verify context model updated - javaJoinColumn = (JoinColumnAnnotation) attributeResource.addAnnotation(JoinColumnAnnotation.ANNOTATION_NAME); + javaJoinColumn = (JoinColumnAnnotation) resourceField.addAnnotation(0, JoinColumnAnnotation.ANNOTATION_NAME); javaJoinColumn.setName("FOO"); javaJoinColumn.setInsertable(Boolean.FALSE); getJpaProject().synchronizeContextModel(); - JavaJoinColumn joinColumn = joinColumns.specifiedJoinColumns().next(); + JavaJoinColumn joinColumn = joinColumns.getSpecifiedJoinColumns().iterator().next(); assertEquals(Boolean.FALSE, joinColumn.getSpecifiedInsertable()); assertEquals(Boolean.FALSE, javaJoinColumn.getInsertable()); @@ -467,11 +468,11 @@ public class JavaJoinColumnTests extends ContextModelTestCase createTestEntityWithOneToOne(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - JavaOneToOneMapping oneToOneMapping = (JavaOneToOneMapping) getJavaPersistentType().attributes().next().getMapping(); + JavaOneToOneMapping oneToOneMapping = (JavaOneToOneMapping) getJavaPersistentType().getAttributes().iterator().next().getMapping(); JavaJoinColumnRelationshipStrategy joinColumns = oneToOneMapping.getRelationship().getJoinColumnStrategy(); - 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(); JavaJoinColumn joinColumn = joinColumns.addSpecifiedJoinColumn(0); @@ -479,7 +480,7 @@ public class JavaJoinColumnTests extends ContextModelTestCase joinColumn.setSpecifiedName("foo"); joinColumn.setSpecifiedInsertable(Boolean.FALSE); - JoinColumnAnnotation javaJoinColumn = (JoinColumnAnnotation) attributeResource.getAnnotation(JoinColumnAnnotation.ANNOTATION_NAME); + JoinColumnAnnotation javaJoinColumn = (JoinColumnAnnotation) resourceField.getAnnotation(0, JoinColumnAnnotation.ANNOTATION_NAME); assertEquals(Boolean.FALSE, joinColumn.getSpecifiedInsertable()); assertEquals(Boolean.FALSE, javaJoinColumn.getInsertable()); @@ -493,24 +494,24 @@ public class JavaJoinColumnTests extends ContextModelTestCase createTestEntityWithOneToOne(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - JavaOneToOneMapping oneToOneMapping = (JavaOneToOneMapping) getJavaPersistentType().attributes().next().getMapping(); + JavaOneToOneMapping oneToOneMapping = (JavaOneToOneMapping) getJavaPersistentType().getAttributes().iterator().next().getMapping(); JavaJoinColumnRelationshipStrategy joinColumns = oneToOneMapping.getRelationship().getJoinColumnStrategy(); - 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(); - JoinColumnAnnotation javaJoinColumn = (JoinColumnAnnotation) attributeResource.getAnnotation(JoinColumnAnnotation.ANNOTATION_NAME); + JoinColumnAnnotation javaJoinColumn = (JoinColumnAnnotation) resourceField.getAnnotation(0, JoinColumnAnnotation.ANNOTATION_NAME); - assertEquals(0, joinColumns.specifiedJoinColumnsSize()); + assertEquals(0, joinColumns.getSpecifiedJoinColumnsSize()); assertNull(javaJoinColumn); //set updatable in the resource model, verify context model updated - javaJoinColumn = (JoinColumnAnnotation) attributeResource.addAnnotation(JoinColumnAnnotation.ANNOTATION_NAME); + javaJoinColumn = (JoinColumnAnnotation) resourceField.addAnnotation(0, JoinColumnAnnotation.ANNOTATION_NAME); javaJoinColumn.setName("FOO"); javaJoinColumn.setUpdatable(Boolean.FALSE); getJpaProject().synchronizeContextModel(); - JavaJoinColumn joinColumn = joinColumns.specifiedJoinColumns().next(); + JavaJoinColumn joinColumn = joinColumns.getSpecifiedJoinColumns().iterator().next(); assertEquals(Boolean.FALSE, joinColumn.getSpecifiedUpdatable()); assertEquals(Boolean.FALSE, javaJoinColumn.getUpdatable()); @@ -525,11 +526,11 @@ public class JavaJoinColumnTests extends ContextModelTestCase createTestEntityWithOneToOne(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - JavaOneToOneMapping oneToOneMapping = (JavaOneToOneMapping) getJavaPersistentType().attributes().next().getMapping(); + JavaOneToOneMapping oneToOneMapping = (JavaOneToOneMapping) getJavaPersistentType().getAttributes().iterator().next().getMapping(); JavaJoinColumnRelationshipStrategy joinColumns = oneToOneMapping.getRelationship().getJoinColumnStrategy(); - 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(); JavaJoinColumn joinColumn = joinColumns.addSpecifiedJoinColumn(0); @@ -537,7 +538,7 @@ public class JavaJoinColumnTests extends ContextModelTestCase joinColumn.setSpecifiedName("foo"); joinColumn.setSpecifiedUpdatable(Boolean.FALSE); - JoinColumnAnnotation javaJoinColumn = (JoinColumnAnnotation) attributeResource.getAnnotation(JoinColumnAnnotation.ANNOTATION_NAME); + JoinColumnAnnotation javaJoinColumn = (JoinColumnAnnotation) resourceField.getAnnotation(0, JoinColumnAnnotation.ANNOTATION_NAME); assertEquals(Boolean.FALSE, joinColumn.getSpecifiedUpdatable()); assertEquals(Boolean.FALSE, javaJoinColumn.getUpdatable()); diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaJoinTableTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaJoinTableTests.java index 1192ab6221..f680861ebf 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaJoinTableTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaJoinTableTests.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.JavaResourceAttribute; +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.JavaResourceAnnotatedElement.Kind; import org.eclipse.jpt.common.core.tests.internal.projects.TestJavaProject.SourceWriter; import org.eclipse.jpt.common.utility.internal.iterators.ArrayIterator; import org.eclipse.jpt.jpa.core.MappingKeys; @@ -24,8 +28,6 @@ import org.eclipse.jpt.jpa.core.context.java.JavaJoinTable; import org.eclipse.jpt.jpa.core.context.java.JavaManyToManyMapping; import org.eclipse.jpt.jpa.core.context.java.JavaUniqueConstraint; 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.JoinTableAnnotation; import org.eclipse.jpt.jpa.core.resource.java.UniqueConstraintAnnotation; import org.eclipse.jpt.jpa.core.tests.internal.context.ContextModelTestCase; @@ -134,21 +136,21 @@ public class JavaJoinTableTests extends ContextModelTestCase createTestEntityWithManyToMany(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - JavaManyToManyMapping manyToManyMapping = (JavaManyToManyMapping) getJavaPersistentType().attributes().next().getMapping(); + JavaManyToManyMapping manyToManyMapping = (JavaManyToManyMapping) getJavaPersistentType().getAttributes().iterator().next().getMapping(); JoinTable joinTable = manyToManyMapping.getRelationship().getJoinTableStrategy().getJoinTable(); - 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(); - JoinTableAnnotation javaJoinTable = (JoinTableAnnotation) attributeResource.getAnnotation(JoinTableAnnotation.ANNOTATION_NAME); + JoinTableAnnotation javaJoinTable = (JoinTableAnnotation) resourceField.getAnnotation(JoinTableAnnotation.ANNOTATION_NAME); assertNull(joinTable.getSpecifiedName()); assertNull(javaJoinTable); //set name in the resource model, verify context model updated - attributeResource.addAnnotation(JoinTableAnnotation.ANNOTATION_NAME); - javaJoinTable = (JoinTableAnnotation) attributeResource.getAnnotation(JoinTableAnnotation.ANNOTATION_NAME); + resourceField.addAnnotation(JoinTableAnnotation.ANNOTATION_NAME); + javaJoinTable = (JoinTableAnnotation) resourceField.getAnnotation(JoinTableAnnotation.ANNOTATION_NAME); javaJoinTable.setName("FOO"); getJpaProject().synchronizeContextModel(); assertEquals("FOO", joinTable.getSpecifiedName()); @@ -165,37 +167,37 @@ public class JavaJoinTableTests extends ContextModelTestCase assertEquals("FOO", joinTable.getSpecifiedName()); assertEquals("FOO", javaJoinTable.getName()); - attributeResource.removeAnnotation(JoinTableAnnotation.ANNOTATION_NAME); + resourceField.removeAnnotation(JoinTableAnnotation.ANNOTATION_NAME); getJpaProject().synchronizeContextModel(); assertNull(joinTable.getSpecifiedName()); - assertNull(attributeResource.getAnnotation(JoinTableAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(JoinTableAnnotation.ANNOTATION_NAME)); } public void testModifySpecifiedName() throws Exception { createTestEntityWithManyToMany(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - JavaManyToManyMapping manyToManyMapping = (JavaManyToManyMapping) getJavaPersistentType().attributes().next().getMapping(); + JavaManyToManyMapping manyToManyMapping = (JavaManyToManyMapping) getJavaPersistentType().getAttributes().iterator().next().getMapping(); JoinTable joinTable = manyToManyMapping.getRelationship().getJoinTableStrategy().getJoinTable(); - 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(); - JoinTableAnnotation joinTableAnnotation = (JoinTableAnnotation) attributeResource.getAnnotation(JoinTableAnnotation.ANNOTATION_NAME); + JoinTableAnnotation joinTableAnnotation = (JoinTableAnnotation) resourceField.getAnnotation(JoinTableAnnotation.ANNOTATION_NAME); assertNull(joinTable.getSpecifiedName()); assertNull(joinTableAnnotation); //set name in the context model, verify resource model modified joinTable.setSpecifiedName("foo"); - joinTableAnnotation = (JoinTableAnnotation) attributeResource.getAnnotation(JoinTableAnnotation.ANNOTATION_NAME); + joinTableAnnotation = (JoinTableAnnotation) resourceField.getAnnotation(JoinTableAnnotation.ANNOTATION_NAME); assertEquals("foo", joinTable.getSpecifiedName()); assertEquals("foo", joinTableAnnotation.getName()); //set name to null in the context model joinTable.setSpecifiedName(null); assertNull(joinTable.getSpecifiedName()); - joinTableAnnotation = (JoinTableAnnotation) attributeResource.getAnnotation(JoinTableAnnotation.ANNOTATION_NAME); + joinTableAnnotation = (JoinTableAnnotation) resourceField.getAnnotation(JoinTableAnnotation.ANNOTATION_NAME); assertNull(joinTableAnnotation.getName()); } @@ -204,7 +206,7 @@ public class JavaJoinTableTests extends ContextModelTestCase addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - JavaManyToManyMapping manyToManyMapping = (JavaManyToManyMapping) getJavaPersistentType().attributes().next().getMapping(); + JavaManyToManyMapping manyToManyMapping = (JavaManyToManyMapping) getJavaPersistentType().getAttributes().iterator().next().getMapping(); JoinTable joinTable = manyToManyMapping.getRelationship().getJoinTableStrategy().getJoinTable(); //joinTable default name is null because targetEntity is not in the persistence unit @@ -215,9 +217,9 @@ public class JavaJoinTableTests extends ContextModelTestCase addXmlClassRef(PACKAGE_NAME + ".Project"); assertEquals(TYPE_NAME + "_Project", joinTable.getDefaultName()); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - assertNull(attributeResource.getAnnotation(JoinTableAnnotation.ANNOTATION_NAME)); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + assertNull(resourceField.getAnnotation(JoinTableAnnotation.ANNOTATION_NAME)); //target entity does not resolve, default name is null manyToManyMapping.setSpecifiedTargetEntity("Foo"); @@ -228,9 +230,9 @@ public class JavaJoinTableTests extends ContextModelTestCase assertEquals(TYPE_NAME + "_Project", joinTable.getDefaultName()); //add the join table annotation, verify default join table name is the same - attributeResource.addAnnotation(JoinTableAnnotation.ANNOTATION_NAME); + resourceField.addAnnotation(JoinTableAnnotation.ANNOTATION_NAME); assertEquals(TYPE_NAME + "_Project", joinTable.getDefaultName()); - assertNotNull(attributeResource.getAnnotation(JoinTableAnnotation.ANNOTATION_NAME)); + assertNotNull(resourceField.getAnnotation(JoinTableAnnotation.ANNOTATION_NAME)); //set a table on the target entity, very default join table name updates manyToManyMapping.getResolvedTargetEntity().getTable().setSpecifiedName("FOO"); @@ -245,10 +247,10 @@ public class JavaJoinTableTests extends ContextModelTestCase createTestEntityWithValidManyToMany(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - JavaManyToManyMapping manyToManyMapping = (JavaManyToManyMapping) getJavaPersistentType().attributes().next().getMapping(); + JavaManyToManyMapping manyToManyMapping = (JavaManyToManyMapping) getJavaPersistentType().getAttributes().iterator().next().getMapping(); JoinTable joinTable = manyToManyMapping.getRelationship().getJoinTableStrategy().getJoinTable(); - JoinColumn joinColumn = joinTable.joinColumns().next(); - JoinColumn inverseJoinColumn = joinTable.inverseJoinColumns().next(); + JoinColumn joinColumn = joinTable.getJoinColumns().iterator().next(); + JoinColumn inverseJoinColumn = joinTable.getInverseJoinColumns().iterator().next(); //joinTable default name is null because targetEntity is not in the persistence unit assertNull(joinColumn.getDefaultName()); @@ -278,9 +280,9 @@ public class JavaJoinTableTests extends ContextModelTestCase assertEquals("projects_proj_id", inverseJoinColumn.getDefaultName()); assertEquals("proj_id", inverseJoinColumn.getDefaultReferencedColumnName()); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - assertNull(attributeResource.getAnnotation(JoinTableAnnotation.ANNOTATION_NAME)); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + assertNull(resourceField.getAnnotation(JoinTableAnnotation.ANNOTATION_NAME)); //target entity does not resolve, inverse join column name and referenced column name is null manyToManyMapping.setSpecifiedTargetEntity("Foo"); @@ -297,12 +299,12 @@ public class JavaJoinTableTests extends ContextModelTestCase assertEquals("proj_id", inverseJoinColumn.getDefaultReferencedColumnName()); //add the join table annotation, verify default join table name is the same - attributeResource.addAnnotation(JoinTableAnnotation.ANNOTATION_NAME); + resourceField.addAnnotation(JoinTableAnnotation.ANNOTATION_NAME); assertEquals(TYPE_NAME + "_MY_ID", joinColumn.getDefaultName()); assertEquals("MY_ID", joinColumn.getDefaultReferencedColumnName()); assertEquals("projects_proj_id", inverseJoinColumn.getDefaultName()); assertEquals("proj_id", inverseJoinColumn.getDefaultReferencedColumnName()); - assertNotNull(attributeResource.getAnnotation(JoinTableAnnotation.ANNOTATION_NAME)); + assertNotNull(resourceField.getAnnotation(JoinTableAnnotation.ANNOTATION_NAME)); } public void testDefaultJoinColumnsBidirectionalRelationship() throws Exception { @@ -310,10 +312,10 @@ public class JavaJoinTableTests extends ContextModelTestCase addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - JavaManyToManyMapping manyToManyMapping = (JavaManyToManyMapping) getJavaPersistentType().attributes().next().getMapping(); + JavaManyToManyMapping manyToManyMapping = (JavaManyToManyMapping) getJavaPersistentType().getAttributes().iterator().next().getMapping(); JoinTable joinTable = manyToManyMapping.getRelationship().getJoinTableStrategy().getJoinTable(); - JoinColumn joinColumn = joinTable.joinColumns().next(); - JoinColumn inverseJoinColumn = joinTable.inverseJoinColumns().next(); + JoinColumn joinColumn = joinTable.getJoinColumns().iterator().next(); + JoinColumn inverseJoinColumn = joinTable.getInverseJoinColumns().iterator().next(); //joinTable default name is null because targetEntity is not in the persistence unit assertNull(joinColumn.getDefaultName()); @@ -343,9 +345,9 @@ public class JavaJoinTableTests extends ContextModelTestCase assertEquals("projects_proj_id", inverseJoinColumn.getDefaultName()); assertEquals("proj_id", inverseJoinColumn.getDefaultReferencedColumnName()); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - assertNull(attributeResource.getAnnotation(JoinTableAnnotation.ANNOTATION_NAME)); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + assertNull(resourceField.getAnnotation(JoinTableAnnotation.ANNOTATION_NAME)); //target entity does not resolve, inverse join column name and referenced column name is null manyToManyMapping.setSpecifiedTargetEntity("Foo"); @@ -362,33 +364,33 @@ public class JavaJoinTableTests extends ContextModelTestCase assertEquals("proj_id", inverseJoinColumn.getDefaultReferencedColumnName()); //add the join table annotation, verify default join table name is the same - attributeResource.addAnnotation(JoinTableAnnotation.ANNOTATION_NAME); + resourceField.addAnnotation(JoinTableAnnotation.ANNOTATION_NAME); assertEquals("employees_MY_ID", joinColumn.getDefaultName()); assertEquals("MY_ID", joinColumn.getDefaultReferencedColumnName()); assertEquals("projects_proj_id", inverseJoinColumn.getDefaultName()); assertEquals("proj_id", inverseJoinColumn.getDefaultReferencedColumnName()); - assertNotNull(attributeResource.getAnnotation(JoinTableAnnotation.ANNOTATION_NAME)); + assertNotNull(resourceField.getAnnotation(JoinTableAnnotation.ANNOTATION_NAME)); } public void testUpdateSpecifiedSchema() throws Exception { createTestEntityWithManyToMany(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - JavaManyToManyMapping manyToManyMapping = (JavaManyToManyMapping) getJavaPersistentType().attributes().next().getMapping(); + JavaManyToManyMapping manyToManyMapping = (JavaManyToManyMapping) getJavaPersistentType().getAttributes().iterator().next().getMapping(); JoinTable joinTable = manyToManyMapping.getRelationship().getJoinTableStrategy().getJoinTable(); - 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(); - JoinTableAnnotation javaJoinTable = (JoinTableAnnotation) attributeResource.getAnnotation(JoinTableAnnotation.ANNOTATION_NAME); + JoinTableAnnotation javaJoinTable = (JoinTableAnnotation) resourceField.getAnnotation(JoinTableAnnotation.ANNOTATION_NAME); assertNull(joinTable.getSpecifiedSchema()); assertNull(javaJoinTable); //set schema in the resource model, verify context model updated - attributeResource.addAnnotation(JoinTableAnnotation.ANNOTATION_NAME); - javaJoinTable = (JoinTableAnnotation) attributeResource.getAnnotation(JoinTableAnnotation.ANNOTATION_NAME); + resourceField.addAnnotation(JoinTableAnnotation.ANNOTATION_NAME); + javaJoinTable = (JoinTableAnnotation) resourceField.getAnnotation(JoinTableAnnotation.ANNOTATION_NAME); javaJoinTable.setSchema("FOO"); getJpaProject().synchronizeContextModel(); assertEquals("FOO", joinTable.getSpecifiedSchema()); @@ -405,37 +407,37 @@ public class JavaJoinTableTests extends ContextModelTestCase assertEquals("FOO", joinTable.getSpecifiedSchema()); assertEquals("FOO", javaJoinTable.getSchema()); - attributeResource.removeAnnotation(JoinTableAnnotation.ANNOTATION_NAME); + resourceField.removeAnnotation(JoinTableAnnotation.ANNOTATION_NAME); getJpaProject().synchronizeContextModel(); assertNull(joinTable.getSpecifiedSchema()); - assertNull(attributeResource.getAnnotation(JoinTableAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(JoinTableAnnotation.ANNOTATION_NAME)); } public void testModifySpecifiedSchema() throws Exception { createTestEntityWithManyToMany(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - JavaManyToManyMapping manyToManyMapping = (JavaManyToManyMapping) getJavaPersistentType().attributes().next().getMapping(); + JavaManyToManyMapping manyToManyMapping = (JavaManyToManyMapping) getJavaPersistentType().getAttributes().iterator().next().getMapping(); JoinTable joinTable = manyToManyMapping.getRelationship().getJoinTableStrategy().getJoinTable(); - JavaResourcePersistentType resourceType = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute resourceAttribute = resourceType.persistableAttributes().next(); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); - JoinTableAnnotation joinTableAnnotation = (JoinTableAnnotation) resourceAttribute.getAnnotation(JoinTableAnnotation.ANNOTATION_NAME); + JoinTableAnnotation joinTableAnnotation = (JoinTableAnnotation) resourceField.getAnnotation(JoinTableAnnotation.ANNOTATION_NAME); assertNull(joinTable.getSpecifiedSchema()); assertNull(joinTableAnnotation); //set schema in the context model, verify resource model modified joinTable.setSpecifiedSchema("foo"); - joinTableAnnotation = (JoinTableAnnotation) resourceAttribute.getAnnotation(JoinTableAnnotation.ANNOTATION_NAME); + joinTableAnnotation = (JoinTableAnnotation) resourceField.getAnnotation(JoinTableAnnotation.ANNOTATION_NAME); assertEquals("foo", joinTable.getSpecifiedSchema()); assertEquals("foo", joinTableAnnotation.getSchema()); //set schema to null in the context model joinTable.setSpecifiedSchema(null); assertNull(joinTable.getSpecifiedSchema()); - joinTableAnnotation = (JoinTableAnnotation) resourceAttribute.getAnnotation(JoinTableAnnotation.ANNOTATION_NAME); + joinTableAnnotation = (JoinTableAnnotation) resourceField.getAnnotation(JoinTableAnnotation.ANNOTATION_NAME); assertNull(joinTableAnnotation.getSchema()); } @@ -443,21 +445,21 @@ public class JavaJoinTableTests extends ContextModelTestCase createTestEntityWithManyToMany(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - JavaManyToManyMapping manyToManyMapping = (JavaManyToManyMapping) getJavaPersistentType().attributes().next().getMapping(); + JavaManyToManyMapping manyToManyMapping = (JavaManyToManyMapping) getJavaPersistentType().getAttributes().iterator().next().getMapping(); JoinTable joinTable = manyToManyMapping.getRelationship().getJoinTableStrategy().getJoinTable(); - 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(); - JoinTableAnnotation javaJoinTable = (JoinTableAnnotation) attributeResource.getAnnotation(JoinTableAnnotation.ANNOTATION_NAME); + JoinTableAnnotation javaJoinTable = (JoinTableAnnotation) resourceField.getAnnotation(JoinTableAnnotation.ANNOTATION_NAME); assertNull(joinTable.getSpecifiedCatalog()); assertNull(javaJoinTable); //set catalog in the resource model, verify context model updated - attributeResource.addAnnotation(JoinTableAnnotation.ANNOTATION_NAME); - javaJoinTable = (JoinTableAnnotation) attributeResource.getAnnotation(JoinTableAnnotation.ANNOTATION_NAME); + resourceField.addAnnotation(JoinTableAnnotation.ANNOTATION_NAME); + javaJoinTable = (JoinTableAnnotation) resourceField.getAnnotation(JoinTableAnnotation.ANNOTATION_NAME); javaJoinTable.setCatalog("FOO"); getJpaProject().synchronizeContextModel(); assertEquals("FOO", joinTable.getSpecifiedCatalog()); @@ -474,37 +476,37 @@ public class JavaJoinTableTests extends ContextModelTestCase assertEquals("FOO", joinTable.getSpecifiedCatalog()); assertEquals("FOO", javaJoinTable.getCatalog()); - attributeResource.removeAnnotation(JoinTableAnnotation.ANNOTATION_NAME); + resourceField.removeAnnotation(JoinTableAnnotation.ANNOTATION_NAME); getJpaProject().synchronizeContextModel(); assertNull(joinTable.getSpecifiedCatalog()); - assertNull(attributeResource.getAnnotation(JoinTableAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(JoinTableAnnotation.ANNOTATION_NAME)); } public void testModifySpecifiedCatalog() throws Exception { createTestEntityWithManyToMany(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - JavaManyToManyMapping manyToManyMapping = (JavaManyToManyMapping) getJavaPersistentType().attributes().next().getMapping(); + JavaManyToManyMapping manyToManyMapping = (JavaManyToManyMapping) getJavaPersistentType().getAttributes().iterator().next().getMapping(); JoinTable joinTable = manyToManyMapping.getRelationship().getJoinTableStrategy().getJoinTable(); - JavaResourcePersistentType resourceType = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute resourceAttribute = resourceType.persistableAttributes().next(); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); - JoinTableAnnotation joinTableAnnotation = (JoinTableAnnotation) resourceAttribute.getAnnotation(JoinTableAnnotation.ANNOTATION_NAME); + JoinTableAnnotation joinTableAnnotation = (JoinTableAnnotation) resourceField.getAnnotation(JoinTableAnnotation.ANNOTATION_NAME); assertNull(joinTable.getSpecifiedCatalog()); assertNull(joinTableAnnotation); //set catalog in the context model, verify resource model modified joinTable.setSpecifiedCatalog("foo"); - joinTableAnnotation = (JoinTableAnnotation) resourceAttribute.getAnnotation(JoinTableAnnotation.ANNOTATION_NAME); + joinTableAnnotation = (JoinTableAnnotation) resourceField.getAnnotation(JoinTableAnnotation.ANNOTATION_NAME); assertEquals("foo", joinTable.getSpecifiedCatalog()); assertEquals("foo", joinTableAnnotation.getCatalog()); //set catalog to null in the context model joinTable.setSpecifiedCatalog(null); assertNull(joinTable.getSpecifiedCatalog()); - joinTableAnnotation = (JoinTableAnnotation) resourceAttribute.getAnnotation(JoinTableAnnotation.ANNOTATION_NAME); + joinTableAnnotation = (JoinTableAnnotation) resourceField.getAnnotation(JoinTableAnnotation.ANNOTATION_NAME); assertNull(joinTableAnnotation.getCatalog()); } @@ -512,17 +514,17 @@ public class JavaJoinTableTests extends ContextModelTestCase createTestEntityWithManyToMany(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - JavaManyToManyMapping manyToManyMapping = (JavaManyToManyMapping) getJavaPersistentType().attributes().next().getMapping(); + JavaManyToManyMapping manyToManyMapping = (JavaManyToManyMapping) getJavaPersistentType().getAttributes().iterator().next().getMapping(); JavaJoinTable joinTable = manyToManyMapping.getRelationship().getJoinTableStrategy().getJoinTable(); - 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(); JoinColumn joinColumn = joinTable.addSpecifiedJoinColumn(0); joinColumn.setSpecifiedName("FOO"); - JoinTableAnnotation joinTableResource = (JoinTableAnnotation) attributeResource.getAnnotation(JoinTableAnnotation.ANNOTATION_NAME); + JoinTableAnnotation joinTableResource = (JoinTableAnnotation) resourceField.getAnnotation(JoinTableAnnotation.ANNOTATION_NAME); assertEquals("FOO", joinTableResource.joinColumnAt(0).getName()); @@ -539,12 +541,12 @@ public class JavaJoinTableTests extends ContextModelTestCase assertEquals("BAZ", joinTableResource.joinColumnAt(1).getName()); assertEquals("FOO", joinTableResource.joinColumnAt(2).getName()); - ListIterator joinColumns = joinTable.specifiedJoinColumns(); + ListIterator joinColumns = joinTable.getSpecifiedJoinColumns().iterator(); assertEquals(joinColumn2, joinColumns.next()); assertEquals(joinColumn3, joinColumns.next()); assertEquals(joinColumn, joinColumns.next()); - joinColumns = joinTable.specifiedJoinColumns(); + joinColumns = joinTable.getSpecifiedJoinColumns().iterator(); assertEquals("BAR", joinColumns.next().getName()); assertEquals("BAZ", joinColumns.next().getName()); assertEquals("FOO", joinColumns.next().getName()); @@ -554,52 +556,52 @@ public class JavaJoinTableTests extends ContextModelTestCase createTestEntityWithManyToMany(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - JavaManyToManyMapping manyToManyMapping = (JavaManyToManyMapping) getJavaPersistentType().attributes().next().getMapping(); + JavaManyToManyMapping manyToManyMapping = (JavaManyToManyMapping) getJavaPersistentType().getAttributes().iterator().next().getMapping(); JoinTable joinTable = manyToManyMapping.getRelationship().getJoinTableStrategy().getJoinTable(); - JavaResourcePersistentType resourceType = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute resourceAttribute = resourceType.persistableAttributes().next(); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); joinTable.addSpecifiedJoinColumn(0).setSpecifiedName("FOO"); joinTable.addSpecifiedJoinColumn(1).setSpecifiedName("BAR"); joinTable.addSpecifiedJoinColumn(2).setSpecifiedName("BAZ"); - JoinTableAnnotation joinTableAnnotation = (JoinTableAnnotation) resourceAttribute.getAnnotation(JoinTableAnnotation.ANNOTATION_NAME); - assertEquals(3, joinTableAnnotation.joinColumnsSize()); + JoinTableAnnotation joinTableAnnotation = (JoinTableAnnotation) resourceField.getAnnotation(JoinTableAnnotation.ANNOTATION_NAME); + assertEquals(3, joinTableAnnotation.getJoinColumnsSize()); joinTable.removeSpecifiedJoinColumn(0); - assertEquals(2, joinTableAnnotation.joinColumnsSize()); + assertEquals(2, joinTableAnnotation.getJoinColumnsSize()); assertEquals("BAR", joinTableAnnotation.joinColumnAt(0).getName()); assertEquals("BAZ", joinTableAnnotation.joinColumnAt(1).getName()); joinTable.removeSpecifiedJoinColumn(0); - assertEquals(1, joinTableAnnotation.joinColumnsSize()); + assertEquals(1, joinTableAnnotation.getJoinColumnsSize()); assertEquals("BAZ", joinTableAnnotation.joinColumnAt(0).getName()); joinTable.removeSpecifiedJoinColumn(0); - assertEquals(0, joinTableAnnotation.joinColumnsSize()); + assertEquals(0, joinTableAnnotation.getJoinColumnsSize()); } public void testMoveSpecifiedJoinColumn() throws Exception { createTestEntityWithManyToMany(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - JavaManyToManyMapping manyToManyMapping = (JavaManyToManyMapping) getJavaPersistentType().attributes().next().getMapping(); + JavaManyToManyMapping manyToManyMapping = (JavaManyToManyMapping) getJavaPersistentType().getAttributes().iterator().next().getMapping(); JavaJoinTable joinTable = manyToManyMapping.getRelationship().getJoinTableStrategy().getJoinTable(); - 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(); joinTable.addSpecifiedJoinColumn(0).setSpecifiedName("FOO"); joinTable.addSpecifiedJoinColumn(1).setSpecifiedName("BAR"); joinTable.addSpecifiedJoinColumn(2).setSpecifiedName("BAZ"); - JoinTableAnnotation joinTableResource = (JoinTableAnnotation) attributeResource.getAnnotation(JoinTableAnnotation.ANNOTATION_NAME); - assertEquals(3, joinTableResource.joinColumnsSize()); + JoinTableAnnotation joinTableResource = (JoinTableAnnotation) resourceField.getAnnotation(JoinTableAnnotation.ANNOTATION_NAME); + assertEquals(3, joinTableResource.getJoinColumnsSize()); joinTable.moveSpecifiedJoinColumn(2, 0); - ListIterator joinColumns = joinTable.specifiedJoinColumns(); + ListIterator joinColumns = joinTable.getSpecifiedJoinColumns().iterator(); assertEquals("BAR", joinColumns.next().getName()); assertEquals("BAZ", joinColumns.next().getName()); assertEquals("FOO", joinColumns.next().getName()); @@ -610,7 +612,7 @@ public class JavaJoinTableTests extends ContextModelTestCase joinTable.moveSpecifiedJoinColumn(0, 1); - joinColumns = joinTable.specifiedJoinColumns(); + joinColumns = joinTable.getSpecifiedJoinColumns().iterator(); assertEquals("BAZ", joinColumns.next().getName()); assertEquals("BAR", joinColumns.next().getName()); assertEquals("FOO", joinColumns.next().getName()); @@ -624,13 +626,13 @@ public class JavaJoinTableTests extends ContextModelTestCase createTestEntityWithManyToMany(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - JavaManyToManyMapping manyToManyMapping = (JavaManyToManyMapping) getJavaPersistentType().attributes().next().getMapping(); + JavaManyToManyMapping manyToManyMapping = (JavaManyToManyMapping) getJavaPersistentType().getAttributes().iterator().next().getMapping(); JavaJoinTable joinTable = manyToManyMapping.getRelationship().getJoinTableStrategy().getJoinTable(); - 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(); - JoinTableAnnotation joinTableResource = (JoinTableAnnotation) attributeResource.addAnnotation(JoinTableAnnotation.ANNOTATION_NAME); + JoinTableAnnotation joinTableResource = (JoinTableAnnotation) resourceField.addAnnotation(JoinTableAnnotation.ANNOTATION_NAME); joinTableResource.addJoinColumn(0); joinTableResource.addJoinColumn(1); @@ -641,7 +643,7 @@ public class JavaJoinTableTests extends ContextModelTestCase joinTableResource.joinColumnAt(2).setName("BAZ"); getJpaProject().synchronizeContextModel(); - ListIterator joinColumns = joinTable.specifiedJoinColumns(); + ListIterator joinColumns = joinTable.getSpecifiedJoinColumns().iterator(); assertEquals("FOO", joinColumns.next().getName()); assertEquals("BAR", joinColumns.next().getName()); assertEquals("BAZ", joinColumns.next().getName()); @@ -649,7 +651,7 @@ public class JavaJoinTableTests extends ContextModelTestCase joinTableResource.moveJoinColumn(2, 0); getJpaProject().synchronizeContextModel(); - joinColumns = joinTable.specifiedJoinColumns(); + joinColumns = joinTable.getSpecifiedJoinColumns().iterator(); assertEquals("BAR", joinColumns.next().getName()); assertEquals("BAZ", joinColumns.next().getName()); assertEquals("FOO", joinColumns.next().getName()); @@ -657,7 +659,7 @@ public class JavaJoinTableTests extends ContextModelTestCase joinTableResource.moveJoinColumn(0, 1); getJpaProject().synchronizeContextModel(); - joinColumns = joinTable.specifiedJoinColumns(); + joinColumns = joinTable.getSpecifiedJoinColumns().iterator(); assertEquals("BAZ", joinColumns.next().getName()); assertEquals("BAR", joinColumns.next().getName()); assertEquals("FOO", joinColumns.next().getName()); @@ -665,60 +667,60 @@ public class JavaJoinTableTests extends ContextModelTestCase joinTableResource.removeJoinColumn(1); getJpaProject().synchronizeContextModel(); - joinColumns = joinTable.specifiedJoinColumns(); + joinColumns = joinTable.getSpecifiedJoinColumns().iterator(); assertEquals("BAZ", joinColumns.next().getName()); assertEquals("FOO", joinColumns.next().getName()); assertFalse(joinColumns.hasNext()); joinTableResource.removeJoinColumn(1); getJpaProject().synchronizeContextModel(); - joinColumns = joinTable.specifiedJoinColumns(); + joinColumns = joinTable.getSpecifiedJoinColumns().iterator(); assertEquals("BAZ", joinColumns.next().getName()); assertFalse(joinColumns.hasNext()); joinTableResource.removeJoinColumn(0); getJpaProject().synchronizeContextModel(); - assertFalse(joinTable.specifiedJoinColumns().hasNext()); + assertFalse(joinTable.getSpecifiedJoinColumns().iterator().hasNext()); } public void testSpecifiedJoinColumnsSize() throws Exception { createTestEntityWithManyToMany(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - JavaManyToManyMapping manyToManyMapping = (JavaManyToManyMapping) getJavaPersistentType().attributes().next().getMapping(); + JavaManyToManyMapping manyToManyMapping = (JavaManyToManyMapping) getJavaPersistentType().getAttributes().iterator().next().getMapping(); JoinTable joinTable = manyToManyMapping.getRelationship().getJoinTableStrategy().getJoinTable(); - assertEquals(0, joinTable.specifiedJoinColumnsSize()); + assertEquals(0, joinTable.getSpecifiedJoinColumnsSize()); joinTable.addSpecifiedJoinColumn(0); - assertEquals(1, joinTable.specifiedJoinColumnsSize()); + assertEquals(1, joinTable.getSpecifiedJoinColumnsSize()); joinTable.removeSpecifiedJoinColumn(0); - assertEquals(0, joinTable.specifiedJoinColumnsSize()); + assertEquals(0, joinTable.getSpecifiedJoinColumnsSize()); } public void testJoinColumnsSize() throws Exception { createTestEntityWithManyToMany(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - JavaManyToManyMapping manyToManyMapping = (JavaManyToManyMapping) getJavaPersistentType().attributes().next().getMapping(); + JavaManyToManyMapping manyToManyMapping = (JavaManyToManyMapping) getJavaPersistentType().getAttributes().iterator().next().getMapping(); JoinTable joinTable = manyToManyMapping.getRelationship().getJoinTableStrategy().getJoinTable(); - assertEquals(1, joinTable.joinColumnsSize()); + assertEquals(1, joinTable.getJoinColumnsSize()); joinTable.addSpecifiedJoinColumn(0); - assertEquals(1, joinTable.joinColumnsSize()); + assertEquals(1, joinTable.getJoinColumnsSize()); joinTable.addSpecifiedJoinColumn(0); - assertEquals(2, joinTable.joinColumnsSize()); + assertEquals(2, joinTable.getJoinColumnsSize()); joinTable.removeSpecifiedJoinColumn(0); joinTable.removeSpecifiedJoinColumn(0); - assertEquals(1, joinTable.joinColumnsSize()); + assertEquals(1, joinTable.getJoinColumnsSize()); // default columns assertNotNull(manyToManyMapping.getRelationship().getJoinTableStrategy().getJoinTable()); - JavaResourcePersistentAttribute resAttribute = this.getJavaPersistentType().attributes().next().getResourcePersistentAttribute(); + JavaResourceAttribute resAttribute = this.getJavaPersistentType().getAttributes().iterator().next().getResourceAttribute(); assertNotNull(resAttribute.getAnnotation(JoinTableAnnotation.ANNOTATION_NAME)); manyToManyMapping.getRelationship().getJoinTableStrategy().removeStrategy(); // default join table @@ -734,17 +736,17 @@ public class JavaJoinTableTests extends ContextModelTestCase createTestEntityWithManyToMany(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - JavaManyToManyMapping manyToManyMapping = (JavaManyToManyMapping) getJavaPersistentType().attributes().next().getMapping(); + JavaManyToManyMapping manyToManyMapping = (JavaManyToManyMapping) getJavaPersistentType().getAttributes().iterator().next().getMapping(); JavaJoinTable joinTable = manyToManyMapping.getRelationship().getJoinTableStrategy().getJoinTable(); - 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(); JoinColumn inverseJoinColumn = joinTable.addSpecifiedInverseJoinColumn(0); inverseJoinColumn.setSpecifiedName("FOO"); - JoinTableAnnotation joinTableResource = (JoinTableAnnotation) attributeResource.getAnnotation(JoinTableAnnotation.ANNOTATION_NAME); + JoinTableAnnotation joinTableResource = (JoinTableAnnotation) resourceField.getAnnotation(JoinTableAnnotation.ANNOTATION_NAME); assertEquals("FOO", joinTableResource.inverseJoinColumnAt(0).getName()); @@ -761,12 +763,12 @@ public class JavaJoinTableTests extends ContextModelTestCase assertEquals("BAZ", joinTableResource.inverseJoinColumnAt(1).getName()); assertEquals("FOO", joinTableResource.inverseJoinColumnAt(2).getName()); - ListIterator inverseJoinColumns = joinTable.specifiedInverseJoinColumns(); + ListIterator inverseJoinColumns = joinTable.getSpecifiedInverseJoinColumns().iterator(); assertEquals(inverseJoinColumn2, inverseJoinColumns.next()); assertEquals(inverseJoinColumn3, inverseJoinColumns.next()); assertEquals(inverseJoinColumn, inverseJoinColumns.next()); - inverseJoinColumns = joinTable.specifiedInverseJoinColumns(); + inverseJoinColumns = joinTable.getSpecifiedInverseJoinColumns().iterator(); assertEquals("BAR", inverseJoinColumns.next().getName()); assertEquals("BAZ", inverseJoinColumns.next().getName()); assertEquals("FOO", inverseJoinColumns.next().getName()); @@ -776,52 +778,52 @@ public class JavaJoinTableTests extends ContextModelTestCase createTestEntityWithManyToMany(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - JavaManyToManyMapping manyToManyMapping = (JavaManyToManyMapping) getJavaPersistentType().attributes().next().getMapping(); + JavaManyToManyMapping manyToManyMapping = (JavaManyToManyMapping) getJavaPersistentType().getAttributes().iterator().next().getMapping(); JoinTable joinTable = manyToManyMapping.getRelationship().getJoinTableStrategy().getJoinTable(); - 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(); joinTable.addSpecifiedInverseJoinColumn(0).setSpecifiedName("FOO"); joinTable.addSpecifiedInverseJoinColumn(1).setSpecifiedName("BAR"); joinTable.addSpecifiedInverseJoinColumn(2).setSpecifiedName("BAZ"); - JoinTableAnnotation joinTableResource = (JoinTableAnnotation) attributeResource.getAnnotation(JoinTableAnnotation.ANNOTATION_NAME); - assertEquals(3, joinTableResource.inverseJoinColumnsSize()); + JoinTableAnnotation joinTableResource = (JoinTableAnnotation) resourceField.getAnnotation(JoinTableAnnotation.ANNOTATION_NAME); + assertEquals(3, joinTableResource.getInverseJoinColumnsSize()); joinTable.removeSpecifiedInverseJoinColumn(0); - assertEquals(2, joinTableResource.inverseJoinColumnsSize()); + assertEquals(2, joinTableResource.getInverseJoinColumnsSize()); assertEquals("BAR", joinTableResource.inverseJoinColumnAt(0).getName()); assertEquals("BAZ", joinTableResource.inverseJoinColumnAt(1).getName()); joinTable.removeSpecifiedInverseJoinColumn(0); - assertEquals(1, joinTableResource.inverseJoinColumnsSize()); + assertEquals(1, joinTableResource.getInverseJoinColumnsSize()); assertEquals("BAZ", joinTableResource.inverseJoinColumnAt(0).getName()); joinTable.removeSpecifiedInverseJoinColumn(0); - assertEquals(0, joinTableResource.inverseJoinColumnsSize()); + assertEquals(0, joinTableResource.getInverseJoinColumnsSize()); } public void testMoveSpecifiedInverseJoinColumn() throws Exception { createTestEntityWithManyToMany(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - JavaManyToManyMapping manyToManyMapping = (JavaManyToManyMapping) getJavaPersistentType().attributes().next().getMapping(); + JavaManyToManyMapping manyToManyMapping = (JavaManyToManyMapping) getJavaPersistentType().getAttributes().iterator().next().getMapping(); JavaJoinTable joinTable = manyToManyMapping.getRelationship().getJoinTableStrategy().getJoinTable(); - 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(); joinTable.addSpecifiedInverseJoinColumn(0).setSpecifiedName("FOO"); joinTable.addSpecifiedInverseJoinColumn(1).setSpecifiedName("BAR"); joinTable.addSpecifiedInverseJoinColumn(2).setSpecifiedName("BAZ"); - JoinTableAnnotation joinTableResource = (JoinTableAnnotation) attributeResource.getAnnotation(JoinTableAnnotation.ANNOTATION_NAME); - assertEquals(3, joinTableResource.inverseJoinColumnsSize()); + JoinTableAnnotation joinTableResource = (JoinTableAnnotation) resourceField.getAnnotation(JoinTableAnnotation.ANNOTATION_NAME); + assertEquals(3, joinTableResource.getInverseJoinColumnsSize()); joinTable.moveSpecifiedInverseJoinColumn(2, 0); - ListIterator inverseJoinColumns = joinTable.specifiedInverseJoinColumns(); + ListIterator inverseJoinColumns = joinTable.getSpecifiedInverseJoinColumns().iterator(); assertEquals("BAR", inverseJoinColumns.next().getName()); assertEquals("BAZ", inverseJoinColumns.next().getName()); assertEquals("FOO", inverseJoinColumns.next().getName()); @@ -832,7 +834,7 @@ public class JavaJoinTableTests extends ContextModelTestCase joinTable.moveSpecifiedInverseJoinColumn(0, 1); - inverseJoinColumns = joinTable.specifiedInverseJoinColumns(); + inverseJoinColumns = joinTable.getSpecifiedInverseJoinColumns().iterator(); assertEquals("BAZ", inverseJoinColumns.next().getName()); assertEquals("BAR", inverseJoinColumns.next().getName()); assertEquals("FOO", inverseJoinColumns.next().getName()); @@ -846,13 +848,13 @@ public class JavaJoinTableTests extends ContextModelTestCase createTestEntityWithManyToMany(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - JavaManyToManyMapping manyToManyMapping = (JavaManyToManyMapping) getJavaPersistentType().attributes().next().getMapping(); + JavaManyToManyMapping manyToManyMapping = (JavaManyToManyMapping) getJavaPersistentType().getAttributes().iterator().next().getMapping(); JavaJoinTable joinTable = manyToManyMapping.getRelationship().getJoinTableStrategy().getJoinTable(); - 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(); - JoinTableAnnotation joinTableResource = (JoinTableAnnotation) attributeResource.addAnnotation(JoinTableAnnotation.ANNOTATION_NAME); + JoinTableAnnotation joinTableResource = (JoinTableAnnotation) resourceField.addAnnotation(JoinTableAnnotation.ANNOTATION_NAME); joinTableResource.addInverseJoinColumn(0); joinTableResource.addInverseJoinColumn(1); @@ -863,7 +865,7 @@ public class JavaJoinTableTests extends ContextModelTestCase joinTableResource.inverseJoinColumnAt(2).setName("BAZ"); getJpaProject().synchronizeContextModel(); - ListIterator inverseJoinColumns = joinTable.specifiedInverseJoinColumns(); + ListIterator inverseJoinColumns = joinTable.getSpecifiedInverseJoinColumns().iterator(); assertEquals("FOO", inverseJoinColumns.next().getName()); assertEquals("BAR", inverseJoinColumns.next().getName()); assertEquals("BAZ", inverseJoinColumns.next().getName()); @@ -871,7 +873,7 @@ public class JavaJoinTableTests extends ContextModelTestCase joinTableResource.moveInverseJoinColumn(2, 0); getJpaProject().synchronizeContextModel(); - inverseJoinColumns = joinTable.specifiedInverseJoinColumns(); + inverseJoinColumns = joinTable.getSpecifiedInverseJoinColumns().iterator(); assertEquals("BAR", inverseJoinColumns.next().getName()); assertEquals("BAZ", inverseJoinColumns.next().getName()); assertEquals("FOO", inverseJoinColumns.next().getName()); @@ -879,7 +881,7 @@ public class JavaJoinTableTests extends ContextModelTestCase joinTableResource.moveInverseJoinColumn(0, 1); getJpaProject().synchronizeContextModel(); - inverseJoinColumns = joinTable.specifiedInverseJoinColumns(); + inverseJoinColumns = joinTable.getSpecifiedInverseJoinColumns().iterator(); assertEquals("BAZ", inverseJoinColumns.next().getName()); assertEquals("BAR", inverseJoinColumns.next().getName()); assertEquals("FOO", inverseJoinColumns.next().getName()); @@ -887,20 +889,20 @@ public class JavaJoinTableTests extends ContextModelTestCase joinTableResource.removeInverseJoinColumn(1); getJpaProject().synchronizeContextModel(); - inverseJoinColumns = joinTable.specifiedInverseJoinColumns(); + inverseJoinColumns = joinTable.getSpecifiedInverseJoinColumns().iterator(); assertEquals("BAZ", inverseJoinColumns.next().getName()); assertEquals("FOO", inverseJoinColumns.next().getName()); assertFalse(inverseJoinColumns.hasNext()); joinTableResource.removeInverseJoinColumn(1); getJpaProject().synchronizeContextModel(); - inverseJoinColumns = joinTable.specifiedInverseJoinColumns(); + inverseJoinColumns = joinTable.getSpecifiedInverseJoinColumns().iterator(); assertEquals("BAZ", inverseJoinColumns.next().getName()); assertFalse(inverseJoinColumns.hasNext()); joinTableResource.removeInverseJoinColumn(0); getJpaProject().synchronizeContextModel(); - assertFalse(joinTable.specifiedInverseJoinColumns().hasNext()); + assertFalse(joinTable.getSpecifiedInverseJoinColumns().iterator().hasNext()); } public void testGetDefaultInverseJoinColumn() { @@ -911,36 +913,36 @@ public class JavaJoinTableTests extends ContextModelTestCase createTestEntityWithManyToMany(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - JavaManyToManyMapping manyToManyMapping = (JavaManyToManyMapping) getJavaPersistentType().attributes().next().getMapping(); + JavaManyToManyMapping manyToManyMapping = (JavaManyToManyMapping) getJavaPersistentType().getAttributes().iterator().next().getMapping(); JoinTable joinTable = manyToManyMapping.getRelationship().getJoinTableStrategy().getJoinTable(); - assertEquals(0, joinTable.specifiedInverseJoinColumnsSize()); + assertEquals(0, joinTable.getSpecifiedInverseJoinColumnsSize()); joinTable.addSpecifiedInverseJoinColumn(0); - assertEquals(1, joinTable.specifiedInverseJoinColumnsSize()); + assertEquals(1, joinTable.getSpecifiedInverseJoinColumnsSize()); joinTable.removeSpecifiedInverseJoinColumn(0); - assertEquals(0, joinTable.specifiedInverseJoinColumnsSize()); + assertEquals(0, joinTable.getSpecifiedInverseJoinColumnsSize()); } public void testInverseJoinColumnsSize() throws Exception { createTestEntityWithManyToMany(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - JavaManyToManyMapping manyToManyMapping = (JavaManyToManyMapping) getJavaPersistentType().attributes().next().getMapping(); + JavaManyToManyMapping manyToManyMapping = (JavaManyToManyMapping) getJavaPersistentType().getAttributes().iterator().next().getMapping(); JoinTable joinTable = manyToManyMapping.getRelationship().getJoinTableStrategy().getJoinTable(); - assertEquals(1, joinTable.inverseJoinColumnsSize()); + assertEquals(1, joinTable.getInverseJoinColumnsSize()); joinTable.addSpecifiedInverseJoinColumn(0); - assertEquals(1, joinTable.inverseJoinColumnsSize()); + assertEquals(1, joinTable.getInverseJoinColumnsSize()); joinTable.addSpecifiedInverseJoinColumn(0); - assertEquals(2, joinTable.inverseJoinColumnsSize()); + assertEquals(2, joinTable.getInverseJoinColumnsSize()); joinTable.removeSpecifiedInverseJoinColumn(0); joinTable.removeSpecifiedInverseJoinColumn(0); - assertEquals(1, joinTable.inverseJoinColumnsSize()); + assertEquals(1, joinTable.getInverseJoinColumnsSize()); //if non-owning side of the relationship then no default join table manyToManyMapping.getRelationship().setStrategyToMappedBy(); @@ -951,20 +953,20 @@ public class JavaJoinTableTests extends ContextModelTestCase createTestEntityWithManyToMany(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - JavaManyToManyMapping manyToManyMapping = (JavaManyToManyMapping) getJavaPersistentType().attributes().next().getMapping(); + JavaManyToManyMapping manyToManyMapping = (JavaManyToManyMapping) getJavaPersistentType().getAttributes().iterator().next().getMapping(); JavaJoinTable joinTable = manyToManyMapping.getRelationship().getJoinTableStrategy().getJoinTable(); - ListIterator uniqueConstraints = joinTable.uniqueConstraints(); + ListIterator uniqueConstraints = joinTable.getUniqueConstraints().iterator(); assertFalse(uniqueConstraints.hasNext()); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - JoinTableAnnotation joinTableAnnotation = (JoinTableAnnotation) attributeResource.addAnnotation(JoinTableAnnotation.ANNOTATION_NAME); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + JoinTableAnnotation joinTableAnnotation = (JoinTableAnnotation) resourceField.addAnnotation(JoinTableAnnotation.ANNOTATION_NAME); joinTableAnnotation.addUniqueConstraint(0).addColumnName(0, "foo"); joinTableAnnotation.addUniqueConstraint(0).addColumnName(0, "bar"); getJpaProject().synchronizeContextModel(); - uniqueConstraints = joinTable.uniqueConstraints(); + uniqueConstraints = joinTable.getUniqueConstraints().iterator(); assertTrue(uniqueConstraints.hasNext()); assertEquals("bar", uniqueConstraints.next().getColumnNames().iterator().next()); assertEquals("foo", uniqueConstraints.next().getColumnNames().iterator().next()); @@ -975,39 +977,39 @@ public class JavaJoinTableTests extends ContextModelTestCase createTestEntityWithManyToMany(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - JavaManyToManyMapping manyToManyMapping = (JavaManyToManyMapping) getJavaPersistentType().attributes().next().getMapping(); + JavaManyToManyMapping manyToManyMapping = (JavaManyToManyMapping) getJavaPersistentType().getAttributes().iterator().next().getMapping(); JoinTable joinTable = manyToManyMapping.getRelationship().getJoinTableStrategy().getJoinTable(); - assertEquals(0, joinTable.uniqueConstraintsSize()); + assertEquals(0, joinTable.getUniqueConstraintsSize()); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - JoinTableAnnotation joinTableAnnotation = (JoinTableAnnotation) attributeResource.addAnnotation(JoinTableAnnotation.ANNOTATION_NAME); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + JoinTableAnnotation joinTableAnnotation = (JoinTableAnnotation) resourceField.addAnnotation(JoinTableAnnotation.ANNOTATION_NAME); joinTableAnnotation.addUniqueConstraint(0).addColumnName(0, "foo"); joinTableAnnotation.addUniqueConstraint(1).addColumnName(0, "bar"); getJpaProject().synchronizeContextModel(); - assertEquals(2, joinTable.uniqueConstraintsSize()); + assertEquals(2, joinTable.getUniqueConstraintsSize()); } public void testAddUniqueConstraint() throws Exception { createTestEntityWithManyToMany(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - JavaManyToManyMapping manyToManyMapping = (JavaManyToManyMapping) getJavaPersistentType().attributes().next().getMapping(); + JavaManyToManyMapping manyToManyMapping = (JavaManyToManyMapping) getJavaPersistentType().getAttributes().iterator().next().getMapping(); JoinTable joinTable = manyToManyMapping.getRelationship().getJoinTableStrategy().getJoinTable(); joinTable.addUniqueConstraint(0).addColumnName(0, "FOO"); joinTable.addUniqueConstraint(0).addColumnName(0, "BAR"); joinTable.addUniqueConstraint(0).addColumnName(0, "BAZ"); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - JoinTableAnnotation joinTableAnnotation = (JoinTableAnnotation) attributeResource.getAnnotation(JoinTableAnnotation.ANNOTATION_NAME); - ListIterator uniqueConstraints = joinTableAnnotation.uniqueConstraints(); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + JoinTableAnnotation joinTableAnnotation = (JoinTableAnnotation) resourceField.getAnnotation(JoinTableAnnotation.ANNOTATION_NAME); + ListIterator uniqueConstraints = joinTableAnnotation.getUniqueConstraints().iterator(); - assertEquals("BAZ", uniqueConstraints.next().columnNames().next()); - assertEquals("BAR", uniqueConstraints.next().columnNames().next()); - assertEquals("FOO", uniqueConstraints.next().columnNames().next()); + assertEquals("BAZ", uniqueConstraints.next().columnNameAt(0)); + assertEquals("BAR", uniqueConstraints.next().columnNameAt(0)); + assertEquals("FOO", uniqueConstraints.next().columnNameAt(0)); assertFalse(uniqueConstraints.hasNext()); } @@ -1015,20 +1017,20 @@ public class JavaJoinTableTests extends ContextModelTestCase createTestEntityWithManyToMany(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - JavaManyToManyMapping manyToManyMapping = (JavaManyToManyMapping) getJavaPersistentType().attributes().next().getMapping(); + JavaManyToManyMapping manyToManyMapping = (JavaManyToManyMapping) getJavaPersistentType().getAttributes().iterator().next().getMapping(); JoinTable joinTable = manyToManyMapping.getRelationship().getJoinTableStrategy().getJoinTable(); joinTable.addUniqueConstraint(0).addColumnName(0, "FOO"); joinTable.addUniqueConstraint(1).addColumnName(0, "BAR"); joinTable.addUniqueConstraint(0).addColumnName(0, "BAZ"); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - JoinTableAnnotation joinTableAnnotation = (JoinTableAnnotation) attributeResource.getAnnotation(JoinTableAnnotation.ANNOTATION_NAME); - ListIterator uniqueConstraints = joinTableAnnotation.uniqueConstraints(); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + JoinTableAnnotation joinTableAnnotation = (JoinTableAnnotation) resourceField.getAnnotation(JoinTableAnnotation.ANNOTATION_NAME); + ListIterator uniqueConstraints = joinTableAnnotation.getUniqueConstraints().iterator(); - assertEquals("BAZ", uniqueConstraints.next().columnNames().next()); - assertEquals("FOO", uniqueConstraints.next().columnNames().next()); - assertEquals("BAR", uniqueConstraints.next().columnNames().next()); + assertEquals("BAZ", uniqueConstraints.next().columnNameAt(0)); + assertEquals("FOO", uniqueConstraints.next().columnNameAt(0)); + assertEquals("BAR", uniqueConstraints.next().columnNameAt(0)); assertFalse(uniqueConstraints.hasNext()); } @@ -1036,45 +1038,45 @@ public class JavaJoinTableTests extends ContextModelTestCase createTestEntityWithManyToMany(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - JavaManyToManyMapping manyToManyMapping = (JavaManyToManyMapping) getJavaPersistentType().attributes().next().getMapping(); + JavaManyToManyMapping manyToManyMapping = (JavaManyToManyMapping) getJavaPersistentType().getAttributes().iterator().next().getMapping(); JavaJoinTable joinTable = manyToManyMapping.getRelationship().getJoinTableStrategy().getJoinTable(); joinTable.addUniqueConstraint(0).addColumnName(0, "FOO"); joinTable.addUniqueConstraint(1).addColumnName(0, "BAR"); joinTable.addUniqueConstraint(2).addColumnName(0, "BAZ"); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - JoinTableAnnotation joinTableAnnotation = (JoinTableAnnotation) attributeResource.getAnnotation(JoinTableAnnotation.ANNOTATION_NAME); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + JoinTableAnnotation joinTableAnnotation = (JoinTableAnnotation) resourceField.getAnnotation(JoinTableAnnotation.ANNOTATION_NAME); - assertEquals(3, joinTableAnnotation.uniqueConstraintsSize()); + assertEquals(3, joinTableAnnotation.getUniqueConstraintsSize()); joinTable.removeUniqueConstraint(1); - ListIterator uniqueConstraintAnnotations = joinTableAnnotation.uniqueConstraints(); - assertEquals("FOO", uniqueConstraintAnnotations.next().columnNames().next()); - assertEquals("BAZ", uniqueConstraintAnnotations.next().columnNames().next()); + ListIterator uniqueConstraintAnnotations = joinTableAnnotation.getUniqueConstraints().iterator(); + assertEquals("FOO", uniqueConstraintAnnotations.next().columnNameAt(0)); + assertEquals("BAZ", uniqueConstraintAnnotations.next().columnNameAt(0)); assertFalse(uniqueConstraintAnnotations.hasNext()); - Iterator uniqueConstraints = joinTable.uniqueConstraints(); + Iterator uniqueConstraints = joinTable.getUniqueConstraints().iterator(); assertEquals("FOO", uniqueConstraints.next().getColumnNames().iterator().next()); assertEquals("BAZ", uniqueConstraints.next().getColumnNames().iterator().next()); assertFalse(uniqueConstraints.hasNext()); joinTable.removeUniqueConstraint(1); - uniqueConstraintAnnotations = joinTableAnnotation.uniqueConstraints(); - assertEquals("FOO", uniqueConstraintAnnotations.next().columnNames().next()); + uniqueConstraintAnnotations = joinTableAnnotation.getUniqueConstraints().iterator(); + assertEquals("FOO", uniqueConstraintAnnotations.next().columnNameAt(0)); assertFalse(uniqueConstraintAnnotations.hasNext()); - uniqueConstraints = joinTable.uniqueConstraints(); + uniqueConstraints = joinTable.getUniqueConstraints().iterator(); assertEquals("FOO", uniqueConstraints.next().getColumnNames().iterator().next()); assertFalse(uniqueConstraints.hasNext()); joinTable.removeUniqueConstraint(0); - uniqueConstraintAnnotations = joinTableAnnotation.uniqueConstraints(); + uniqueConstraintAnnotations = joinTableAnnotation.getUniqueConstraints().iterator(); assertFalse(uniqueConstraintAnnotations.hasNext()); - uniqueConstraints = joinTable.uniqueConstraints(); + uniqueConstraints = joinTable.getUniqueConstraints().iterator(); assertFalse(uniqueConstraints.hasNext()); } @@ -1082,59 +1084,59 @@ public class JavaJoinTableTests extends ContextModelTestCase createTestEntityWithManyToMany(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - JavaManyToManyMapping manyToManyMapping = (JavaManyToManyMapping) getJavaPersistentType().attributes().next().getMapping(); + JavaManyToManyMapping manyToManyMapping = (JavaManyToManyMapping) getJavaPersistentType().getAttributes().iterator().next().getMapping(); JoinTable joinTable = manyToManyMapping.getRelationship().getJoinTableStrategy().getJoinTable(); joinTable.addUniqueConstraint(0).addColumnName(0, "FOO"); joinTable.addUniqueConstraint(1).addColumnName(0, "BAR"); joinTable.addUniqueConstraint(2).addColumnName(0, "BAZ"); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - JoinTableAnnotation joinTableAnnotation = (JoinTableAnnotation) attributeResource.getAnnotation(JoinTableAnnotation.ANNOTATION_NAME); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + JoinTableAnnotation joinTableAnnotation = (JoinTableAnnotation) resourceField.getAnnotation(JoinTableAnnotation.ANNOTATION_NAME); - assertEquals(3, joinTableAnnotation.uniqueConstraintsSize()); + assertEquals(3, joinTableAnnotation.getUniqueConstraintsSize()); joinTable.moveUniqueConstraint(2, 0); - ListIterator uniqueConstraints = joinTable.uniqueConstraints(); + ListIterator uniqueConstraints = joinTable.getUniqueConstraints().iterator(); assertEquals("BAR", uniqueConstraints.next().getColumnNames().iterator().next()); assertEquals("BAZ", uniqueConstraints.next().getColumnNames().iterator().next()); assertEquals("FOO", uniqueConstraints.next().getColumnNames().iterator().next()); - ListIterator uniqueConstraintAnnotations = joinTableAnnotation.uniqueConstraints(); - assertEquals("BAR", uniqueConstraintAnnotations.next().columnNames().next()); - assertEquals("BAZ", uniqueConstraintAnnotations.next().columnNames().next()); - assertEquals("FOO", uniqueConstraintAnnotations.next().columnNames().next()); + ListIterator uniqueConstraintAnnotations = joinTableAnnotation.getUniqueConstraints().iterator(); + assertEquals("BAR", uniqueConstraintAnnotations.next().columnNameAt(0)); + assertEquals("BAZ", uniqueConstraintAnnotations.next().columnNameAt(0)); + assertEquals("FOO", uniqueConstraintAnnotations.next().columnNameAt(0)); joinTable.moveUniqueConstraint(0, 1); - uniqueConstraints = joinTable.uniqueConstraints(); + uniqueConstraints = joinTable.getUniqueConstraints().iterator(); assertEquals("BAZ", uniqueConstraints.next().getColumnNames().iterator().next()); assertEquals("BAR", uniqueConstraints.next().getColumnNames().iterator().next()); assertEquals("FOO", uniqueConstraints.next().getColumnNames().iterator().next()); - uniqueConstraintAnnotations = joinTableAnnotation.uniqueConstraints(); - assertEquals("BAZ", uniqueConstraintAnnotations.next().columnNames().next()); - assertEquals("BAR", uniqueConstraintAnnotations.next().columnNames().next()); - assertEquals("FOO", uniqueConstraintAnnotations.next().columnNames().next()); + uniqueConstraintAnnotations = joinTableAnnotation.getUniqueConstraints().iterator(); + assertEquals("BAZ", uniqueConstraintAnnotations.next().columnNameAt(0)); + assertEquals("BAR", uniqueConstraintAnnotations.next().columnNameAt(0)); + assertEquals("FOO", uniqueConstraintAnnotations.next().columnNameAt(0)); } public void testUpdateUniqueConstraints() throws Exception { createTestEntityWithManyToMany(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - JavaManyToManyMapping manyToManyMapping = (JavaManyToManyMapping) getJavaPersistentType().attributes().next().getMapping(); + JavaManyToManyMapping manyToManyMapping = (JavaManyToManyMapping) getJavaPersistentType().getAttributes().iterator().next().getMapping(); JavaJoinTable joinTable = manyToManyMapping.getRelationship().getJoinTableStrategy().getJoinTable(); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - JoinTableAnnotation joinTableAnnotation = (JoinTableAnnotation) attributeResource.addAnnotation(JoinTableAnnotation.ANNOTATION_NAME); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + JoinTableAnnotation joinTableAnnotation = (JoinTableAnnotation) resourceField.addAnnotation(JoinTableAnnotation.ANNOTATION_NAME); joinTableAnnotation.addUniqueConstraint(0).addColumnName("FOO"); joinTableAnnotation.addUniqueConstraint(1).addColumnName("BAR"); joinTableAnnotation.addUniqueConstraint(2).addColumnName("BAZ"); getJpaProject().synchronizeContextModel(); - ListIterator uniqueConstraints = joinTable.uniqueConstraints(); + ListIterator uniqueConstraints = joinTable.getUniqueConstraints().iterator(); assertEquals("FOO", uniqueConstraints.next().getColumnNames().iterator().next()); assertEquals("BAR", uniqueConstraints.next().getColumnNames().iterator().next()); assertEquals("BAZ", uniqueConstraints.next().getColumnNames().iterator().next()); @@ -1142,7 +1144,7 @@ public class JavaJoinTableTests extends ContextModelTestCase joinTableAnnotation.moveUniqueConstraint(2, 0); getJpaProject().synchronizeContextModel(); - uniqueConstraints = joinTable.uniqueConstraints(); + uniqueConstraints = joinTable.getUniqueConstraints().iterator(); assertEquals("BAR", uniqueConstraints.next().getColumnNames().iterator().next()); assertEquals("BAZ", uniqueConstraints.next().getColumnNames().iterator().next()); assertEquals("FOO", uniqueConstraints.next().getColumnNames().iterator().next()); @@ -1150,7 +1152,7 @@ public class JavaJoinTableTests extends ContextModelTestCase joinTableAnnotation.moveUniqueConstraint(0, 1); getJpaProject().synchronizeContextModel(); - uniqueConstraints = joinTable.uniqueConstraints(); + uniqueConstraints = joinTable.getUniqueConstraints().iterator(); assertEquals("BAZ", uniqueConstraints.next().getColumnNames().iterator().next()); assertEquals("BAR", uniqueConstraints.next().getColumnNames().iterator().next()); assertEquals("FOO", uniqueConstraints.next().getColumnNames().iterator().next()); @@ -1158,20 +1160,20 @@ public class JavaJoinTableTests extends ContextModelTestCase joinTableAnnotation.removeUniqueConstraint(1); getJpaProject().synchronizeContextModel(); - uniqueConstraints = joinTable.uniqueConstraints(); + uniqueConstraints = joinTable.getUniqueConstraints().iterator(); assertEquals("BAZ", uniqueConstraints.next().getColumnNames().iterator().next()); assertEquals("FOO", uniqueConstraints.next().getColumnNames().iterator().next()); assertFalse(uniqueConstraints.hasNext()); joinTableAnnotation.removeUniqueConstraint(1); getJpaProject().synchronizeContextModel(); - uniqueConstraints = joinTable.uniqueConstraints(); + uniqueConstraints = joinTable.getUniqueConstraints().iterator(); assertEquals("BAZ", uniqueConstraints.next().getColumnNames().iterator().next()); assertFalse(uniqueConstraints.hasNext()); joinTableAnnotation.removeUniqueConstraint(0); getJpaProject().synchronizeContextModel(); - uniqueConstraints = joinTable.uniqueConstraints(); + uniqueConstraints = joinTable.getUniqueConstraints().iterator(); assertFalse(uniqueConstraints.hasNext()); } } \ No newline at end of file diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaManyToManyMappingTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaManyToManyMappingTests.java index b1e73a63a6..6f5246237d 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaManyToManyMappingTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaManyToManyMappingTests.java @@ -12,6 +12,9 @@ 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.JavaResourceField; +import org.eclipse.jpt.common.core.resource.java.JavaResourceType; +import org.eclipse.jpt.common.core.resource.java.JavaResourceAnnotatedElement.Kind; import org.eclipse.jpt.common.core.tests.internal.projects.TestJavaProject.SourceWriter; import org.eclipse.jpt.common.utility.internal.iterators.ArrayIterator; import org.eclipse.jpt.jpa.core.MappingKeys; @@ -38,8 +41,6 @@ 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.JoinTableAnnotation; import org.eclipse.jpt.jpa.core.resource.java.ManyToManyAnnotation; import org.eclipse.jpt.jpa.core.resource.java.ManyToOneAnnotation; @@ -299,7 +300,7 @@ public class JavaManyToManyMappingTests extends ContextModelTestCase createTestEntityWithManyToManyMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToManyMapping manyToManyMapping = (ManyToManyMapping) persistentAttribute.getMapping(); manyToManyMapping.getOrderable().setSpecifiedOrderBy("asdf"); manyToManyMapping.getRelationship().getJoinTableStrategy().getJoinTable().setSpecifiedName("FOO"); @@ -309,19 +310,19 @@ public class JavaManyToManyMappingTests 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(ManyToManyAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getAnnotation(BasicAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(JoinTableAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(OrderByAnnotation.ANNOTATION_NAME)); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + assertNull(resourceField.getAnnotation(ManyToManyAnnotation.ANNOTATION_NAME)); + assertNotNull(resourceField.getAnnotation(BasicAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(JoinTableAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(OrderByAnnotation.ANNOTATION_NAME)); } public void testMorphToDefault() throws Exception { createTestEntityWithManyToManyMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToManyMapping manyToManyMapping = (ManyToManyMapping) persistentAttribute.getMapping(); manyToManyMapping.getOrderable().setSpecifiedOrderBy("asdf"); manyToManyMapping.getRelationship().getJoinTableStrategy().getJoinTable().setSpecifiedName("FOO"); @@ -330,18 +331,18 @@ public class JavaManyToManyMappingTests 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(ManyToManyAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(JoinTableAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(OrderByAnnotation.ANNOTATION_NAME)); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + assertNull(resourceField.getAnnotation(ManyToManyAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(JoinTableAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(OrderByAnnotation.ANNOTATION_NAME)); } public void testMorphToVersionMapping() throws Exception { createTestEntityWithManyToManyMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToManyMapping manyToManyMapping = (ManyToManyMapping) persistentAttribute.getMapping(); manyToManyMapping.getOrderable().setSpecifiedOrderBy("asdf"); manyToManyMapping.getRelationship().getJoinTableStrategy().getJoinTable().setSpecifiedName("FOO"); @@ -351,19 +352,19 @@ public class JavaManyToManyMappingTests 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(ManyToManyAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getAnnotation(VersionAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(JoinTableAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(OrderByAnnotation.ANNOTATION_NAME)); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + assertNull(resourceField.getAnnotation(ManyToManyAnnotation.ANNOTATION_NAME)); + assertNotNull(resourceField.getAnnotation(VersionAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(JoinTableAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(OrderByAnnotation.ANNOTATION_NAME)); } public void testMorphToIdMapping() throws Exception { createTestEntityWithManyToManyMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToManyMapping manyToManyMapping = (ManyToManyMapping) persistentAttribute.getMapping(); manyToManyMapping.getOrderable().setSpecifiedOrderBy("asdf"); manyToManyMapping.getRelationship().getJoinTableStrategy().getJoinTable().setSpecifiedName("FOO"); @@ -373,19 +374,19 @@ public class JavaManyToManyMappingTests 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(ManyToManyAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getAnnotation(IdAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(JoinTableAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(OrderByAnnotation.ANNOTATION_NAME)); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + assertNull(resourceField.getAnnotation(ManyToManyAnnotation.ANNOTATION_NAME)); + assertNotNull(resourceField.getAnnotation(IdAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(JoinTableAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(OrderByAnnotation.ANNOTATION_NAME)); } public void testMorphToEmbeddedMapping() throws Exception { createTestEntityWithManyToManyMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToManyMapping manyToManyMapping = (ManyToManyMapping) persistentAttribute.getMapping(); manyToManyMapping.getOrderable().setSpecifiedOrderBy("asdf"); manyToManyMapping.getRelationship().getJoinTableStrategy().getJoinTable().setSpecifiedName("FOO"); @@ -395,19 +396,19 @@ public class JavaManyToManyMappingTests 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(ManyToManyAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getAnnotation(EmbeddedAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(JoinTableAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(OrderByAnnotation.ANNOTATION_NAME)); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + assertNull(resourceField.getAnnotation(ManyToManyAnnotation.ANNOTATION_NAME)); + assertNotNull(resourceField.getAnnotation(EmbeddedAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(JoinTableAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(OrderByAnnotation.ANNOTATION_NAME)); } public void testMorphToEmbeddedIdMapping() throws Exception { createTestEntityWithManyToManyMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToManyMapping manyToManyMapping = (ManyToManyMapping) persistentAttribute.getMapping(); manyToManyMapping.getOrderable().setSpecifiedOrderBy("asdf"); manyToManyMapping.getRelationship().getJoinTableStrategy().getJoinTable().setSpecifiedName("FOO"); @@ -417,19 +418,19 @@ public class JavaManyToManyMappingTests 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(ManyToManyAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getAnnotation(EmbeddedIdAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(JoinTableAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(OrderByAnnotation.ANNOTATION_NAME)); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + assertNull(resourceField.getAnnotation(ManyToManyAnnotation.ANNOTATION_NAME)); + assertNotNull(resourceField.getAnnotation(EmbeddedIdAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(JoinTableAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(OrderByAnnotation.ANNOTATION_NAME)); } public void testMorphToTransientMapping() throws Exception { createTestEntityWithManyToManyMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToManyMapping manyToManyMapping = (ManyToManyMapping) persistentAttribute.getMapping(); manyToManyMapping.getOrderable().setSpecifiedOrderBy("asdf"); manyToManyMapping.getRelationship().getJoinTableStrategy().getJoinTable().setSpecifiedName("FOO"); @@ -439,19 +440,19 @@ public class JavaManyToManyMappingTests 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(ManyToManyAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getAnnotation(TransientAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(JoinTableAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(OrderByAnnotation.ANNOTATION_NAME)); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + assertNull(resourceField.getAnnotation(ManyToManyAnnotation.ANNOTATION_NAME)); + assertNotNull(resourceField.getAnnotation(TransientAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(JoinTableAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(OrderByAnnotation.ANNOTATION_NAME)); } public void testMorphToOneToOneMapping() throws Exception { createTestEntityWithManyToManyMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToManyMapping manyToManyMapping = (ManyToManyMapping) persistentAttribute.getMapping(); manyToManyMapping.getOrderable().setSpecifiedOrderBy("asdf"); manyToManyMapping.getRelationship().getJoinTableStrategy().getJoinTable().setSpecifiedName("FOO"); @@ -461,19 +462,19 @@ public class JavaManyToManyMappingTests extends ContextModelTestCase assertTrue(persistentAttribute.getMapping() instanceof OneToOneMapping); assertFalse(persistentAttribute.getMapping().isDefault()); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - assertNull(attributeResource.getAnnotation(ManyToManyAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getAnnotation(OneToOneAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getAnnotation(JoinTableAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(OrderByAnnotation.ANNOTATION_NAME)); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + assertNull(resourceField.getAnnotation(ManyToManyAnnotation.ANNOTATION_NAME)); + assertNotNull(resourceField.getAnnotation(OneToOneAnnotation.ANNOTATION_NAME)); + assertNotNull(resourceField.getAnnotation(JoinTableAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(OrderByAnnotation.ANNOTATION_NAME)); } public void testMorphToOneToManyMapping() throws Exception { createTestEntityWithManyToManyMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToManyMapping manyToManyMapping = (ManyToManyMapping) persistentAttribute.getMapping(); manyToManyMapping.getOrderable().setSpecifiedOrderBy("asdf"); manyToManyMapping.getRelationship().getJoinTableStrategy().getJoinTable().setSpecifiedName("FOO"); @@ -483,19 +484,19 @@ public class JavaManyToManyMappingTests 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(ManyToManyAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getAnnotation(OneToManyAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getAnnotation(JoinTableAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getAnnotation(OrderByAnnotation.ANNOTATION_NAME)); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + assertNull(resourceField.getAnnotation(ManyToManyAnnotation.ANNOTATION_NAME)); + assertNotNull(resourceField.getAnnotation(OneToManyAnnotation.ANNOTATION_NAME)); + assertNotNull(resourceField.getAnnotation(JoinTableAnnotation.ANNOTATION_NAME)); + assertNotNull(resourceField.getAnnotation(OrderByAnnotation.ANNOTATION_NAME)); } public void testMorphToManyToOneMapping() throws Exception { createTestEntityWithManyToManyMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToManyMapping manyToManyMapping = (ManyToManyMapping) persistentAttribute.getMapping(); manyToManyMapping.getOrderable().setSpecifiedOrderBy("asdf"); manyToManyMapping.getRelationship().getJoinTableStrategy().getJoinTable().setSpecifiedName("FOO"); @@ -505,24 +506,24 @@ public class JavaManyToManyMappingTests 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(ManyToManyAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getAnnotation(ManyToOneAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getAnnotation(JoinTableAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(OrderByAnnotation.ANNOTATION_NAME)); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + assertNull(resourceField.getAnnotation(ManyToManyAnnotation.ANNOTATION_NAME)); + assertNotNull(resourceField.getAnnotation(ManyToOneAnnotation.ANNOTATION_NAME)); + assertNotNull(resourceField.getAnnotation(JoinTableAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(OrderByAnnotation.ANNOTATION_NAME)); } public void testUpdateSpecifiedTargetEntity() throws Exception { createTestEntityWithManyToManyMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToManyMapping manyToManyMapping = (ManyToManyMapping) persistentAttribute.getMapping(); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - ManyToManyAnnotation manyToManyAnnotation = (ManyToManyAnnotation) attributeResource.getAnnotation(ManyToManyAnnotation.ANNOTATION_NAME); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + ManyToManyAnnotation manyToManyAnnotation = (ManyToManyAnnotation) resourceField.getAnnotation(ManyToManyAnnotation.ANNOTATION_NAME); assertNull(manyToManyMapping.getSpecifiedTargetEntity()); assertNull(manyToManyAnnotation.getTargetEntity()); @@ -544,12 +545,12 @@ public class JavaManyToManyMappingTests extends ContextModelTestCase createTestEntityWithManyToManyMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToManyMapping manyToManyMapping = (ManyToManyMapping) persistentAttribute.getMapping(); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - ManyToManyAnnotation manyToMany = (ManyToManyAnnotation) attributeResource.getAnnotation(ManyToManyAnnotation.ANNOTATION_NAME); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + ManyToManyAnnotation manyToMany = (ManyToManyAnnotation) resourceField.getAnnotation(ManyToManyAnnotation.ANNOTATION_NAME); assertNull(manyToManyMapping.getSpecifiedTargetEntity()); assertNull(manyToMany.getTargetEntity()); @@ -569,12 +570,12 @@ public class JavaManyToManyMappingTests extends ContextModelTestCase createTestEntityWithManyToManyMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToManyMapping manyToManyMapping = (ManyToManyMapping) persistentAttribute.getMapping(); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - ManyToManyAnnotation manyToMany = (ManyToManyAnnotation) attributeResource.getAnnotation(ManyToManyAnnotation.ANNOTATION_NAME); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + ManyToManyAnnotation manyToMany = (ManyToManyAnnotation) resourceField.getAnnotation(ManyToManyAnnotation.ANNOTATION_NAME); assertNull(manyToManyMapping.getSpecifiedFetch()); assertNull(manyToMany.getFetch()); @@ -602,12 +603,12 @@ public class JavaManyToManyMappingTests extends ContextModelTestCase createTestEntityWithManyToManyMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToManyMapping manyToManyMapping = (ManyToManyMapping) persistentAttribute.getMapping(); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - ManyToManyAnnotation manyToMany = (ManyToManyAnnotation) attributeResource.getAnnotation(ManyToManyAnnotation.ANNOTATION_NAME); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + ManyToManyAnnotation manyToMany = (ManyToManyAnnotation) resourceField.getAnnotation(ManyToManyAnnotation.ANNOTATION_NAME); assertNull(manyToManyMapping.getSpecifiedFetch()); assertNull(manyToMany.getFetch()); @@ -631,12 +632,12 @@ public class JavaManyToManyMappingTests extends ContextModelTestCase createTestEntityWithManyToManyMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToManyMapping manyToManyMapping = (ManyToManyMapping) persistentAttribute.getMapping(); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - ManyToManyAnnotation manyToMany = (ManyToManyAnnotation) attributeResource.getAnnotation(ManyToManyAnnotation.ANNOTATION_NAME); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + ManyToManyAnnotation manyToMany = (ManyToManyAnnotation) resourceField.getAnnotation(ManyToManyAnnotation.ANNOTATION_NAME); assertNull(manyToManyMapping.getRelationship().getMappedByStrategy().getMappedByAttribute()); assertNull(manyToMany.getMappedBy()); @@ -658,12 +659,12 @@ public class JavaManyToManyMappingTests extends ContextModelTestCase createTestEntityWithManyToManyMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToManyMapping manyToManyMapping = (ManyToManyMapping) persistentAttribute.getMapping(); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - ManyToManyAnnotation manyToMany = (ManyToManyAnnotation) attributeResource.getAnnotation(ManyToManyAnnotation.ANNOTATION_NAME); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + ManyToManyAnnotation manyToMany = (ManyToManyAnnotation) resourceField.getAnnotation(ManyToManyAnnotation.ANNOTATION_NAME); assertNull(manyToManyMapping.getRelationship().getMappedByStrategy().getMappedByAttribute()); assertNull(manyToMany.getMappedBy()); @@ -683,25 +684,26 @@ public class JavaManyToManyMappingTests extends ContextModelTestCase createTestEntityWithManyToManyMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute resourceAttribute = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME).persistableAttributes().next(); - ManyToManyAnnotation annotation = (ManyToManyAnnotation) resourceAttribute.getAnnotation(JPA.MANY_TO_MANY); - PersistentAttribute contextAttribute = getJavaPersistentType().attributes().next(); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + ManyToManyAnnotation annotation = (ManyToManyAnnotation) resourceField.getAnnotation(JPA.MANY_TO_MANY); + PersistentAttribute contextAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToManyMapping mapping = (ManyToManyMapping) contextAttribute.getMapping(); ManyToManyRelationship rel = mapping.getRelationship(); - assertNull(resourceAttribute.getAnnotation(JPA.JOIN_TABLE)); + assertNull(resourceField.getAnnotation(JPA.JOIN_TABLE)); assertNull(annotation.getMappedBy()); assertTrue(rel.strategyIsJoinTable()); assertFalse(rel.strategyIsMappedBy()); rel.setStrategyToMappedBy(); - assertNull(resourceAttribute.getAnnotation(JPA.JOIN_TABLE)); + assertNull(resourceField.getAnnotation(JPA.JOIN_TABLE)); assertNotNull(annotation.getMappedBy()); assertFalse(rel.strategyIsJoinTable()); assertTrue(rel.strategyIsMappedBy()); rel.setStrategyToJoinTable(); - assertNull(resourceAttribute.getAnnotation(JPA.JOIN_TABLE)); + assertNull(resourceField.getAnnotation(JPA.JOIN_TABLE)); assertNull(annotation.getMappedBy()); assertTrue(rel.strategyIsJoinTable()); assertFalse(rel.strategyIsMappedBy()); @@ -711,41 +713,42 @@ public class JavaManyToManyMappingTests extends ContextModelTestCase createTestEntityWithManyToManyMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute resourceAttribute = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME).persistableAttributes().next(); - ManyToManyAnnotation annotation = (ManyToManyAnnotation) resourceAttribute.getAnnotation(JPA.MANY_TO_MANY); - PersistentAttribute contextAttribute = getJavaPersistentType().attributes().next(); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + ManyToManyAnnotation annotation = (ManyToManyAnnotation) resourceField.getAnnotation(JPA.MANY_TO_MANY); + PersistentAttribute contextAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToManyMapping mapping = (ManyToManyMapping) contextAttribute.getMapping(); ManyToManyRelationship rel = mapping.getRelationship(); - assertNull(resourceAttribute.getAnnotation(JPA.JOIN_TABLE)); + assertNull(resourceField.getAnnotation(JPA.JOIN_TABLE)); assertNull(annotation.getMappedBy()); assertTrue(rel.strategyIsJoinTable()); assertFalse(rel.strategyIsMappedBy()); annotation.setMappedBy("foo"); getJpaProject().synchronizeContextModel(); - assertNull(resourceAttribute.getAnnotation(JPA.JOIN_TABLE)); + assertNull(resourceField.getAnnotation(JPA.JOIN_TABLE)); assertNotNull(annotation.getMappedBy()); assertFalse(rel.strategyIsJoinTable()); assertTrue(rel.strategyIsMappedBy()); - resourceAttribute.addAnnotation(JPA.JOIN_TABLE); + resourceField.addAnnotation(JPA.JOIN_TABLE); getJpaProject().synchronizeContextModel(); - assertNotNull(resourceAttribute.getAnnotation(JPA.JOIN_TABLE)); + assertNotNull(resourceField.getAnnotation(JPA.JOIN_TABLE)); assertNotNull(annotation.getMappedBy()); assertFalse(rel.strategyIsJoinTable()); assertTrue(rel.strategyIsMappedBy()); annotation.setMappedBy(null); getJpaProject().synchronizeContextModel(); - assertNotNull(resourceAttribute.getAnnotation(JPA.JOIN_TABLE)); + assertNotNull(resourceField.getAnnotation(JPA.JOIN_TABLE)); assertNull(annotation.getMappedBy()); assertTrue(rel.strategyIsJoinTable()); assertFalse(rel.strategyIsMappedBy()); - resourceAttribute.removeAnnotation(JPA.JOIN_TABLE); + resourceField.removeAnnotation(JPA.JOIN_TABLE); getJpaProject().synchronizeContextModel(); - assertNull(resourceAttribute.getAnnotation(JPA.JOIN_TABLE)); + assertNull(resourceField.getAnnotation(JPA.JOIN_TABLE)); assertNull(annotation.getMappedBy()); assertTrue(rel.strategyIsJoinTable()); assertFalse(rel.strategyIsMappedBy()); @@ -759,7 +762,7 @@ public class JavaManyToManyMappingTests extends ContextModelTestCase addXmlClassRef(PACKAGE_NAME + ".Address"); addXmlClassRef(PACKAGE_NAME + ".State"); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToManyMapping manyToManyMapping = (ManyToManyMapping) persistentAttribute.getMapping(); Iterator attributeNames = @@ -793,7 +796,7 @@ public class JavaManyToManyMappingTests extends ContextModelTestCase createTestTargetEntityAddress(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToManyMapping manyToManyMapping = (ManyToManyMapping) persistentAttribute.getMapping(); //targetEntity not in the persistence unit, default still set, handled by validation @@ -807,7 +810,7 @@ public class JavaManyToManyMappingTests extends ContextModelTestCase manyToManyMapping.setSpecifiedTargetEntity("foo"); assertEquals(PACKAGE_NAME + ".Address", manyToManyMapping.getDefaultTargetEntity()); - ListIterator classRefs = getPersistenceUnit().specifiedClassRefs(); + ListIterator classRefs = getPersistenceUnit().getSpecifiedClassRefs().iterator(); classRefs.next(); ClassRef addressClassRef = classRefs.next(); JavaPersistentType addressPersistentType = addressClassRef.getJavaPersistentType(); @@ -823,7 +826,7 @@ public class JavaManyToManyMappingTests extends ContextModelTestCase addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); addXmlClassRef(PACKAGE_NAME + ".Address"); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToManyMapping manyToManyMapping = (ManyToManyMapping) persistentAttribute.getMapping(); assertNull(manyToManyMapping.getDefaultTargetEntity()); @@ -835,7 +838,7 @@ public class JavaManyToManyMappingTests extends ContextModelTestCase addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); addXmlClassRef(PACKAGE_NAME + ".Address"); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToManyMapping manyToManyMapping = (ManyToManyMapping) persistentAttribute.getMapping(); assertNull(manyToManyMapping.getDefaultTargetEntity()); @@ -846,7 +849,7 @@ public class JavaManyToManyMappingTests extends ContextModelTestCase createTestTargetEntityAddress(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToManyMapping manyToManyMapping = (ManyToManyMapping) persistentAttribute.getMapping(); assertEquals(PACKAGE_NAME + ".Address", manyToManyMapping.getTargetEntity()); @@ -862,7 +865,7 @@ public class JavaManyToManyMappingTests extends ContextModelTestCase createTestEntityWithValidManyToManyMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToManyMapping manyToManyMapping = (ManyToManyMapping) persistentAttribute.getMapping(); //targetEntity not in the persistence unit @@ -871,7 +874,7 @@ public class JavaManyToManyMappingTests extends ContextModelTestCase //add targetEntity to the persistence unit, now target entity should resolve createTestTargetEntityAddress(); addXmlClassRef(PACKAGE_NAME + ".Address"); - ListIterator classRefs = getPersistenceUnit().specifiedClassRefs(); + ListIterator classRefs = getPersistenceUnit().getSpecifiedClassRefs().iterator(); classRefs.next(); ClassRef addressClassRef = classRefs.next(); TypeMapping addressTypeMapping = addressClassRef.getJavaPersistentType().getMapping(); @@ -895,19 +898,19 @@ public class JavaManyToManyMappingTests extends ContextModelTestCase createTestEntityWithManyToManyMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToManyMapping manyToManyMapping = (ManyToManyMapping) persistentAttribute.getMapping(); - 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(); assertNull(manyToManyMapping.getSpecifiedMapKey()); - assertNull(attributeResource.getAnnotation(MapKeyAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(MapKeyAnnotation.ANNOTATION_NAME)); //set mapKey in the resource model, verify context model does not change - attributeResource.addAnnotation(MapKeyAnnotation.ANNOTATION_NAME); + resourceField.addAnnotation(MapKeyAnnotation.ANNOTATION_NAME); assertNull(manyToManyMapping.getSpecifiedMapKey()); - MapKeyAnnotation mapKey = (MapKeyAnnotation) attributeResource.getAnnotation(MapKeyAnnotation.ANNOTATION_NAME); + MapKeyAnnotation mapKey = (MapKeyAnnotation) resourceField.getAnnotation(MapKeyAnnotation.ANNOTATION_NAME); assertNotNull(mapKey); //set mapKey name in the resource model, verify context model updated @@ -923,38 +926,38 @@ public class JavaManyToManyMappingTests extends ContextModelTestCase assertNull(mapKey.getName()); mapKey.setName("myMapKey"); - attributeResource.removeAnnotation(MapKeyAnnotation.ANNOTATION_NAME); + resourceField.removeAnnotation(MapKeyAnnotation.ANNOTATION_NAME); getJpaProject().synchronizeContextModel(); assertNull(manyToManyMapping.getSpecifiedMapKey()); - assertNull(attributeResource.getAnnotation(MapKeyAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(MapKeyAnnotation.ANNOTATION_NAME)); } public void testModifyMapKey() throws Exception { createTestEntityWithManyToManyMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToManyMapping manyToManyMapping = (ManyToManyMapping) persistentAttribute.getMapping(); - 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(); assertNull(manyToManyMapping.getSpecifiedMapKey()); - assertNull(attributeResource.getAnnotation(MapKeyAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(MapKeyAnnotation.ANNOTATION_NAME)); //set mapKey in the context model, verify resource model updated manyToManyMapping.setSpecifiedMapKey("myMapKey"); - MapKeyAnnotation mapKeyAnnotation = (MapKeyAnnotation) attributeResource.getAnnotation(MapKeyAnnotation.ANNOTATION_NAME); + MapKeyAnnotation mapKeyAnnotation = (MapKeyAnnotation) resourceField.getAnnotation(MapKeyAnnotation.ANNOTATION_NAME); assertEquals("myMapKey", manyToManyMapping.getSpecifiedMapKey()); assertEquals("myMapKey", mapKeyAnnotation.getName()); //set mapKey to null in the context model manyToManyMapping.setSpecifiedMapKey(null); assertNull(manyToManyMapping.getSpecifiedMapKey()); - mapKeyAnnotation = (MapKeyAnnotation) attributeResource.getAnnotation(MapKeyAnnotation.ANNOTATION_NAME); + mapKeyAnnotation = (MapKeyAnnotation) resourceField.getAnnotation(MapKeyAnnotation.ANNOTATION_NAME); assertNull(mapKeyAnnotation.getName()); manyToManyMapping.setNoMapKey(true); - assertNull(attributeResource.getAnnotation(MapKeyAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(MapKeyAnnotation.ANNOTATION_NAME)); } public void testCandidateMapKeyNames() throws Exception { @@ -1003,168 +1006,168 @@ public class JavaManyToManyMappingTests extends ContextModelTestCase createTestEntityWithManyToManyMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToManyMapping manyToManyMapping = (ManyToManyMapping) persistentAttribute.getMapping(); - 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(); assertNull(manyToManyMapping.getOrderable().getSpecifiedOrderBy()); - assertNull(attributeResource.getAnnotation(OrderByAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(OrderByAnnotation.ANNOTATION_NAME)); //set orderBy in the resource model, verify context model updated - attributeResource.addAnnotation(OrderByAnnotation.ANNOTATION_NAME); - OrderByAnnotation orderBy = (OrderByAnnotation) attributeResource.getAnnotation(OrderByAnnotation.ANNOTATION_NAME); + resourceField.addAnnotation(OrderByAnnotation.ANNOTATION_NAME); + OrderByAnnotation orderBy = (OrderByAnnotation) resourceField.getAnnotation(OrderByAnnotation.ANNOTATION_NAME); orderBy.setValue("newOrderBy"); getJpaProject().synchronizeContextModel(); assertEquals("newOrderBy", manyToManyMapping.getOrderable().getSpecifiedOrderBy()); assertEquals("newOrderBy", orderBy.getValue()); //set orderBy to null in the resource model - attributeResource.removeAnnotation(OrderByAnnotation.ANNOTATION_NAME); + resourceField.removeAnnotation(OrderByAnnotation.ANNOTATION_NAME); getJpaProject().synchronizeContextModel(); assertNull(manyToManyMapping.getOrderable().getSpecifiedOrderBy()); - assertNull(attributeResource.getAnnotation(OrderByAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(OrderByAnnotation.ANNOTATION_NAME)); } public void testModifyOrderBy() throws Exception { createTestEntityWithManyToManyMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToManyMapping manyToManyMapping = (ManyToManyMapping) persistentAttribute.getMapping(); - 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(); assertNull(manyToManyMapping.getOrderable().getSpecifiedOrderBy()); - assertNull(attributeResource.getAnnotation(OrderByAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(OrderByAnnotation.ANNOTATION_NAME)); //set mappedBy in the context model, verify resource model updated manyToManyMapping.getOrderable().setSpecifiedOrderBy("newOrderBy"); assertEquals("newOrderBy", manyToManyMapping.getOrderable().getSpecifiedOrderBy()); - OrderByAnnotation orderBy = (OrderByAnnotation) attributeResource.getAnnotation(OrderByAnnotation.ANNOTATION_NAME); + OrderByAnnotation orderBy = (OrderByAnnotation) resourceField.getAnnotation(OrderByAnnotation.ANNOTATION_NAME); assertEquals("newOrderBy", orderBy.getValue()); //set mappedBy to null in the context model manyToManyMapping.getOrderable().setSpecifiedOrderBy(null); assertNull(manyToManyMapping.getOrderable().getSpecifiedOrderBy()); - assertNull(attributeResource.getAnnotation(OrderByAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(OrderByAnnotation.ANNOTATION_NAME)); } public void testUpdateNoOrdering() throws Exception { createTestEntityWithManyToManyMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToManyMapping manyToManyMapping = (ManyToManyMapping) persistentAttribute.getMapping(); - 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(); assertTrue(manyToManyMapping.getOrderable().isNoOrdering()); - assertNull(attributeResource.getAnnotation(OrderByAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(OrderByAnnotation.ANNOTATION_NAME)); //set orderBy in the resource model, verify context model updated - attributeResource.addAnnotation(OrderByAnnotation.ANNOTATION_NAME); + resourceField.addAnnotation(OrderByAnnotation.ANNOTATION_NAME); getJpaProject().synchronizeContextModel(); assertFalse(manyToManyMapping.getOrderable().isNoOrdering()); - OrderByAnnotation orderBy = (OrderByAnnotation) attributeResource.getAnnotation(OrderByAnnotation.ANNOTATION_NAME); + OrderByAnnotation orderBy = (OrderByAnnotation) resourceField.getAnnotation(OrderByAnnotation.ANNOTATION_NAME); orderBy.setValue("newOrderBy"); getJpaProject().synchronizeContextModel(); assertFalse(manyToManyMapping.getOrderable().isNoOrdering()); //set orderBy to null in the resource model - attributeResource.removeAnnotation(OrderByAnnotation.ANNOTATION_NAME); + resourceField.removeAnnotation(OrderByAnnotation.ANNOTATION_NAME); getJpaProject().synchronizeContextModel(); assertTrue(manyToManyMapping.getOrderable().isNoOrdering()); - assertNull(attributeResource.getAnnotation(OrderByAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(OrderByAnnotation.ANNOTATION_NAME)); } public void testModifyNoOrdering() throws Exception { createTestEntityWithManyToManyMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToManyMapping manyToManyMapping = (ManyToManyMapping) persistentAttribute.getMapping(); - 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(); assertTrue(manyToManyMapping.getOrderable().isNoOrdering()); - assertNull(attributeResource.getAnnotation(OrderByAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(OrderByAnnotation.ANNOTATION_NAME)); // manyToManyMapping.setNoOrdering(false); //this does nothing // //set mappedBy in the context model, verify resource model updated // manyToManyMapping.setOrderBy("newOrderBy"); // assertEquals("newOrderBy", manyToManyMapping.getOrderBy()); -// OrderBy orderBy = (OrderBy) attributeResource.annotation(OrderBy.ANNOTATION_NAME); +// OrderBy orderBy = (OrderBy) resourceField.annotation(OrderBy.ANNOTATION_NAME); // assertEquals("newOrderBy", orderBy.getValue()); // // //set mappedBy to null in the context model // manyToManyMapping.setOrderBy(null); // assertNull(manyToManyMapping.getOrderBy()); -// assertNull(attributeResource.annotation(OrderBy.ANNOTATION_NAME)); +// assertNull(resourceField.annotation(OrderBy.ANNOTATION_NAME)); } public void testUpdatePkOrdering() throws Exception { createTestEntityWithManyToManyMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToManyMapping manyToManyMapping = (ManyToManyMapping) persistentAttribute.getMapping(); - 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(); assertFalse(manyToManyMapping.getOrderable().isPkOrdering()); - assertNull(attributeResource.getAnnotation(OrderByAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(OrderByAnnotation.ANNOTATION_NAME)); //set orderBy in the resource model, verify context model updated - attributeResource.addAnnotation(OrderByAnnotation.ANNOTATION_NAME); + resourceField.addAnnotation(OrderByAnnotation.ANNOTATION_NAME); getJpaProject().synchronizeContextModel(); assertTrue(manyToManyMapping.getOrderable().isPkOrdering()); - OrderByAnnotation orderBy = (OrderByAnnotation) attributeResource.getAnnotation(OrderByAnnotation.ANNOTATION_NAME); + OrderByAnnotation orderBy = (OrderByAnnotation) resourceField.getAnnotation(OrderByAnnotation.ANNOTATION_NAME); orderBy.setValue("newOrderBy"); getJpaProject().synchronizeContextModel(); assertFalse(manyToManyMapping.getOrderable().isPkOrdering()); //set orderBy to null in the resource model - attributeResource.removeAnnotation(OrderByAnnotation.ANNOTATION_NAME); + resourceField.removeAnnotation(OrderByAnnotation.ANNOTATION_NAME); getJpaProject().synchronizeContextModel(); assertFalse(manyToManyMapping.getOrderable().isPkOrdering()); - assertNull(attributeResource.getAnnotation(OrderByAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(OrderByAnnotation.ANNOTATION_NAME)); } public void testUpdateCustomOrdering() throws Exception { createTestEntityWithManyToManyMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToManyMapping manyToManyMapping = (ManyToManyMapping) persistentAttribute.getMapping(); - 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(); assertFalse(manyToManyMapping.getOrderable().isCustomOrdering()); - assertNull(attributeResource.getAnnotation(OrderByAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(OrderByAnnotation.ANNOTATION_NAME)); //set orderBy in the resource model, verify context model updated - attributeResource.addAnnotation(OrderByAnnotation.ANNOTATION_NAME); + resourceField.addAnnotation(OrderByAnnotation.ANNOTATION_NAME); assertFalse(manyToManyMapping.getOrderable().isCustomOrdering()); - OrderByAnnotation orderBy = (OrderByAnnotation) attributeResource.getAnnotation(OrderByAnnotation.ANNOTATION_NAME); + OrderByAnnotation orderBy = (OrderByAnnotation) resourceField.getAnnotation(OrderByAnnotation.ANNOTATION_NAME); orderBy.setValue("newOrderBy"); getJpaProject().synchronizeContextModel(); assertTrue(manyToManyMapping.getOrderable().isCustomOrdering()); //set orderBy to null in the resource model - attributeResource.removeAnnotation(OrderByAnnotation.ANNOTATION_NAME); + resourceField.removeAnnotation(OrderByAnnotation.ANNOTATION_NAME); getJpaProject().synchronizeContextModel(); assertFalse(manyToManyMapping.getOrderable().isCustomOrdering()); - assertNull(attributeResource.getAnnotation(OrderByAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(OrderByAnnotation.ANNOTATION_NAME)); } public void testDefaultTargetEntityForMap() throws Exception { diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaManyToOneMappingTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaManyToOneMappingTests.java index 4f80e2e3d5..efacd87b99 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaManyToOneMappingTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaManyToOneMappingTests.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; @@ -38,13 +42,9 @@ 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.TransientAnnotation; @@ -179,7 +179,7 @@ public class JavaManyToOneMappingTests extends ContextModelTestCase createTestEntityWithManyToOneMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToOneMapping manyToOneMapping = (ManyToOneMapping) persistentAttribute.getMapping(); JoinColumnRelationshipStrategy joinColumns = manyToOneMapping.getRelationship().getJoinColumnStrategy(); joinColumns.addSpecifiedJoinColumn(0); @@ -189,18 +189,18 @@ public class JavaManyToOneMappingTests 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(ManyToOneAnnotation.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(ManyToOneAnnotation.ANNOTATION_NAME)); + assertNotNull(resourceField.getAnnotation(BasicAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(0, JoinColumnAnnotation.ANNOTATION_NAME)); } public void testMorphToDefault() throws Exception { createTestEntityWithManyToOneMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToOneMapping manyToOneMapping = (ManyToOneMapping) persistentAttribute.getMapping(); JoinColumnRelationshipStrategy joinColumns = manyToOneMapping.getRelationship().getJoinColumnStrategy(); joinColumns.addSpecifiedJoinColumn(0); @@ -209,17 +209,17 @@ public class JavaManyToOneMappingTests 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(ManyToOneAnnotation.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(ManyToOneAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(0, JoinColumnAnnotation.ANNOTATION_NAME)); } public void testMorphToVersionMapping() throws Exception { createTestEntityWithManyToOneMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToOneMapping manyToOneMapping = (ManyToOneMapping) persistentAttribute.getMapping(); JoinColumnRelationshipStrategy joinColumns = manyToOneMapping.getRelationship().getJoinColumnStrategy(); joinColumns.addSpecifiedJoinColumn(0); @@ -229,18 +229,18 @@ public class JavaManyToOneMappingTests 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(ManyToOneAnnotation.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(ManyToOneAnnotation.ANNOTATION_NAME)); + assertNotNull(resourceField.getAnnotation(VersionAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(0, JoinColumnAnnotation.ANNOTATION_NAME)); } public void testMorphToIdMapping() throws Exception { createTestEntityWithManyToOneMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToOneMapping manyToOneMapping = (ManyToOneMapping) persistentAttribute.getMapping(); JoinColumnRelationshipStrategy joinColumns = manyToOneMapping.getRelationship().getJoinColumnStrategy(); joinColumns.addSpecifiedJoinColumn(0); @@ -250,18 +250,18 @@ public class JavaManyToOneMappingTests 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(ManyToOneAnnotation.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(ManyToOneAnnotation.ANNOTATION_NAME)); + assertNotNull(resourceField.getAnnotation(IdAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(0, JoinColumnAnnotation.ANNOTATION_NAME)); } public void testMorphToEmbeddedMapping() throws Exception { createTestEntityWithManyToOneMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToOneMapping manyToOneMapping = (ManyToOneMapping) persistentAttribute.getMapping(); JoinColumnRelationshipStrategy joinColumns = manyToOneMapping.getRelationship().getJoinColumnStrategy(); joinColumns.addSpecifiedJoinColumn(0); @@ -271,18 +271,18 @@ public class JavaManyToOneMappingTests 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(ManyToOneAnnotation.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(ManyToOneAnnotation.ANNOTATION_NAME)); + assertNotNull(resourceField.getAnnotation(EmbeddedAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(0, JoinColumnAnnotation.ANNOTATION_NAME)); } public void testMorphToEmbeddedIdMapping() throws Exception { createTestEntityWithManyToOneMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToOneMapping manyToOneMapping = (ManyToOneMapping) persistentAttribute.getMapping(); JoinColumnRelationshipStrategy joinColumns = manyToOneMapping.getRelationship().getJoinColumnStrategy(); joinColumns.addSpecifiedJoinColumn(0); @@ -292,18 +292,18 @@ public class JavaManyToOneMappingTests 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(ManyToOneAnnotation.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(ManyToOneAnnotation.ANNOTATION_NAME)); + assertNotNull(resourceField.getAnnotation(EmbeddedIdAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(0, JoinColumnAnnotation.ANNOTATION_NAME)); } public void testMorphToTransientMapping() throws Exception { createTestEntityWithManyToOneMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToOneMapping manyToOneMapping = (ManyToOneMapping) persistentAttribute.getMapping(); JoinColumnRelationshipStrategy joinColumns = manyToOneMapping.getRelationship().getJoinColumnStrategy(); joinColumns.addSpecifiedJoinColumn(0); @@ -313,18 +313,18 @@ public class JavaManyToOneMappingTests 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(ManyToOneAnnotation.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(ManyToOneAnnotation.ANNOTATION_NAME)); + assertNotNull(resourceField.getAnnotation(TransientAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(0, JoinColumnAnnotation.ANNOTATION_NAME)); } public void testMorphToOneToOneMapping() throws Exception { createTestEntityWithManyToOneMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToOneMapping manyToOneMapping = (ManyToOneMapping) persistentAttribute.getMapping(); JoinColumnRelationshipStrategy joinColumns = manyToOneMapping.getRelationship().getJoinColumnStrategy(); joinColumns.addSpecifiedJoinColumn(0); @@ -334,18 +334,18 @@ public class JavaManyToOneMappingTests extends ContextModelTestCase assertTrue(persistentAttribute.getMapping() instanceof OneToOneMapping); assertFalse(persistentAttribute.getMapping().isDefault()); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - assertNull(attributeResource.getAnnotation(ManyToOneAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getAnnotation(OneToOneAnnotation.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(ManyToOneAnnotation.ANNOTATION_NAME)); + assertNotNull(resourceField.getAnnotation(OneToOneAnnotation.ANNOTATION_NAME)); + assertNotNull(resourceField.getAnnotation(0, JoinColumnAnnotation.ANNOTATION_NAME)); } public void testMorphToOneToManyMapping() throws Exception { createTestEntityWithManyToOneMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToOneMapping manyToOneMapping = (ManyToOneMapping) persistentAttribute.getMapping(); JoinColumnRelationshipStrategy joinColumns = manyToOneMapping.getRelationship().getJoinColumnStrategy(); joinColumns.addSpecifiedJoinColumn(0); @@ -355,18 +355,18 @@ public class JavaManyToOneMappingTests 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(ManyToOneAnnotation.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(ManyToOneAnnotation.ANNOTATION_NAME)); + assertNotNull(resourceField.getAnnotation(OneToManyAnnotation.ANNOTATION_NAME)); + assertNotNull(resourceField.getAnnotation(0, JoinColumnAnnotation.ANNOTATION_NAME)); } public void testMorphToManyToManyMapping() throws Exception { createTestEntityWithManyToOneMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToOneMapping manyToOneMapping = (ManyToOneMapping) persistentAttribute.getMapping(); JoinColumnRelationshipStrategy joinColumns = manyToOneMapping.getRelationship().getJoinColumnStrategy(); joinColumns.addSpecifiedJoinColumn(0); @@ -376,23 +376,23 @@ public class JavaManyToOneMappingTests 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(ManyToOneAnnotation.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(ManyToOneAnnotation.ANNOTATION_NAME)); + assertNotNull(resourceField.getAnnotation(ManyToManyAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(0, JoinColumnAnnotation.ANNOTATION_NAME)); } public void testUpdateSpecifiedTargetEntity() throws Exception { createTestEntityWithManyToOneMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToOneMapping manyToOneMapping = (ManyToOneMapping) persistentAttribute.getMapping(); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - ManyToOneAnnotation manyToOne = (ManyToOneAnnotation) attributeResource.getAnnotation(ManyToOneAnnotation.ANNOTATION_NAME); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + ManyToOneAnnotation manyToOne = (ManyToOneAnnotation) resourceField.getAnnotation(ManyToOneAnnotation.ANNOTATION_NAME); assertNull(manyToOneMapping.getSpecifiedTargetEntity()); assertNull(manyToOne.getTargetEntity()); @@ -414,12 +414,12 @@ public class JavaManyToOneMappingTests extends ContextModelTestCase createTestEntityWithManyToOneMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToOneMapping manyToOneMapping = (ManyToOneMapping) persistentAttribute.getMapping(); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - ManyToOneAnnotation manyToOne = (ManyToOneAnnotation) attributeResource.getAnnotation(ManyToOneAnnotation.ANNOTATION_NAME); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + ManyToOneAnnotation manyToOne = (ManyToOneAnnotation) resourceField.getAnnotation(ManyToOneAnnotation.ANNOTATION_NAME); assertNull(manyToOneMapping.getSpecifiedTargetEntity()); assertNull(manyToOne.getTargetEntity()); @@ -439,12 +439,12 @@ public class JavaManyToOneMappingTests extends ContextModelTestCase createTestEntityWithManyToOneMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToOneMapping manyToOneMapping = (ManyToOneMapping) persistentAttribute.getMapping(); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - ManyToOneAnnotation manyToOne = (ManyToOneAnnotation) attributeResource.getAnnotation(ManyToOneAnnotation.ANNOTATION_NAME); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + ManyToOneAnnotation manyToOne = (ManyToOneAnnotation) resourceField.getAnnotation(ManyToOneAnnotation.ANNOTATION_NAME); assertNull(manyToOneMapping.getSpecifiedOptional()); assertNull(manyToOne.getOptional()); @@ -471,12 +471,12 @@ public class JavaManyToOneMappingTests extends ContextModelTestCase createTestEntityWithManyToOneMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToOneMapping manyToOneMapping = (ManyToOneMapping) persistentAttribute.getMapping(); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - ManyToOneAnnotation manyToOne = (ManyToOneAnnotation) attributeResource.getAnnotation(ManyToOneAnnotation.ANNOTATION_NAME); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + ManyToOneAnnotation manyToOne = (ManyToOneAnnotation) resourceField.getAnnotation(ManyToOneAnnotation.ANNOTATION_NAME); assertNull(manyToOneMapping.getSpecifiedOptional()); assertNull(manyToOne.getOptional()); @@ -502,69 +502,69 @@ public class JavaManyToOneMappingTests extends ContextModelTestCase createTestEntityWithManyToOneMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToOneMapping manyToOneMapping = (ManyToOneMapping) persistentAttribute.getMapping(); JoinColumnRelationshipStrategy joinColumns = manyToOneMapping.getRelationship().getJoinColumnStrategy(); - ListIterator specifiedJoinColumns = joinColumns.specifiedJoinColumns(); + ListIterator 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()); } @@ -576,45 +576,45 @@ public class JavaManyToOneMappingTests extends ContextModelTestCase createTestEntityWithManyToOneMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToOneMapping manyToOneMapping = (ManyToOneMapping) persistentAttribute.getMapping(); JoinColumnRelationshipStrategy joinColumns = manyToOneMapping.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 { createTestEntityWithManyToOneMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToOneMapping manyToOneMapping = (ManyToOneMapping) persistentAttribute.getMapping(); JoinColumnRelationshipStrategy joinColumns = manyToOneMapping.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()); } public void testAddSpecifiedJoinColumn() throws Exception { createTestEntityWithManyToOneMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToOneMapping manyToOneMapping = (ManyToOneMapping) persistentAttribute.getMapping(); JoinColumnRelationshipStrategy joinColumns = manyToOneMapping.getRelationship().getJoinColumnStrategy(); @@ -622,9 +622,9 @@ public class JavaManyToOneMappingTests 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(); - Iterator joinColumnsIterator = attributeResource.annotations(JoinColumnAnnotation.ANNOTATION_NAME, JoinColumnsAnnotation.ANNOTATION_NAME); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + Iterator joinColumnsIterator = resourceField.getAnnotations(JPA.JOIN_COLUMN).iterator(); assertEquals("BAZ", ((JoinColumnAnnotation) joinColumnsIterator.next()).getName()); assertEquals("BAR", ((JoinColumnAnnotation) joinColumnsIterator.next()).getName()); @@ -636,7 +636,7 @@ public class JavaManyToOneMappingTests extends ContextModelTestCase createTestEntityWithManyToOneMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToOneMapping manyToOneMapping = (ManyToOneMapping) persistentAttribute.getMapping(); JoinColumnRelationshipStrategy joinColumns = manyToOneMapping.getRelationship().getJoinColumnStrategy(); @@ -644,9 +644,9 @@ public class JavaManyToOneMappingTests 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(); - Iterator joinColumnsIterator = attributeResource.annotations(JoinColumnAnnotation.ANNOTATION_NAME, JoinColumnsAnnotation.ANNOTATION_NAME); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + Iterator joinColumnsIterator = resourceField.getAnnotations(JPA.JOIN_COLUMN).iterator(); assertEquals("FOO", ((JoinColumnAnnotation) joinColumnsIterator.next()).getName()); assertEquals("BAR", ((JoinColumnAnnotation) joinColumnsIterator.next()).getName()); @@ -657,7 +657,7 @@ public class JavaManyToOneMappingTests extends ContextModelTestCase createTestEntityWithManyToOneMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToOneMapping manyToOneMapping = (ManyToOneMapping) persistentAttribute.getMapping(); JoinColumnRelationshipStrategy joinColumns = manyToOneMapping.getRelationship().getJoinColumnStrategy(); @@ -665,48 +665,48 @@ public class JavaManyToOneMappingTests 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 joinColumnResources = attributeResource.annotations(JoinColumnAnnotation.ANNOTATION_NAME, JoinColumnsAnnotation.ANNOTATION_NAME); + Iterator joinColumnResources = resourceField.getAnnotations(JPA.JOIN_COLUMN).iterator(); assertEquals("FOO", ((JoinColumnAnnotation) joinColumnResources.next()).getName()); assertEquals("BAZ", ((JoinColumnAnnotation) joinColumnResources.next()).getName()); assertFalse(joinColumnResources.hasNext()); - Iterator joinColumnsIterator = joinColumns.specifiedJoinColumns(); + Iterator 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 { createTestEntityWithManyToOneMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToOneMapping manyToOneMapping = (ManyToOneMapping) persistentAttribute.getMapping(); JoinColumnRelationshipStrategy joinColumns = manyToOneMapping.getRelationship().getJoinColumnStrategy(); @@ -714,30 +714,31 @@ public class JavaManyToOneMappingTests 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 javaJoinColumns = attributeResource.annotations(JoinColumnAnnotation.ANNOTATION_NAME, JoinColumnsAnnotation.ANNOTATION_NAME); + Iterator javaJoinColumns = resourceField.getAnnotations(JPA.JOIN_COLUMN).iterator(); assertEquals(3, CollectionTools.size(javaJoinColumns)); joinColumns.moveSpecifiedJoinColumn(2, 0); - ListIterator primaryKeyJoinColumns = joinColumns.specifiedJoinColumns(); + ListIterator 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()); @@ -747,68 +748,69 @@ public class JavaManyToOneMappingTests extends ContextModelTestCase createTestEntityWithManyToOneMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToOneMapping manyToOneMapping = (ManyToOneMapping) persistentAttribute.getMapping(); JoinColumnRelationshipStrategy joinColumns = manyToOneMapping.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 joinColumnsIterator = joinColumns.specifiedJoinColumns(); + ListIterator 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()); } public void testJoinColumnIsVirtual() throws Exception { createTestEntityWithManyToOneMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToOneMapping manyToOneMapping = (ManyToOneMapping) persistentAttribute.getMapping(); JoinColumnRelationshipStrategy joinColumns = manyToOneMapping.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()); @@ -818,16 +820,17 @@ public class JavaManyToOneMappingTests extends ContextModelTestCase createTestEntityWithManyToOneMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute resourceAttribute = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME).persistableAttributes().next(); - PersistentAttribute contextAttribute = getJavaPersistentType().attributes().next(); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + PersistentAttribute contextAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToOneMapping mapping = (ManyToOneMapping) contextAttribute.getMapping(); ManyToOneRelationship rel = mapping.getRelationship(); - assertNull(resourceAttribute.getAnnotation(JPA.JOIN_COLUMN)); + assertNull(resourceField.getAnnotation(0, JPA.JOIN_COLUMN)); assertTrue(rel.strategyIsJoinColumn()); rel.setStrategyToJoinColumn(); - assertNull(resourceAttribute.getAnnotation(JPA.JOIN_COLUMN)); + assertNull(resourceField.getAnnotation(0, JPA.JOIN_COLUMN)); assertTrue(rel.strategyIsJoinColumn()); } @@ -835,22 +838,23 @@ public class JavaManyToOneMappingTests extends ContextModelTestCase createTestEntityWithManyToOneMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute resourceAttribute = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME).persistableAttributes().next(); - PersistentAttribute contextAttribute = getJavaPersistentType().attributes().next(); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + PersistentAttribute contextAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToOneMapping mapping = (ManyToOneMapping) contextAttribute.getMapping(); ManyToOneRelationship rel = mapping.getRelationship(); - assertNull(resourceAttribute.getAnnotation(JPA.JOIN_COLUMN)); + assertNull(resourceField.getAnnotation(0, JPA.JOIN_COLUMN)); assertTrue(rel.strategyIsJoinColumn()); - resourceAttribute.addAnnotation(JPA.JOIN_COLUMN); + resourceField.addAnnotation(0, JPA.JOIN_COLUMN); getJpaProject().synchronizeContextModel(); - assertNotNull(resourceAttribute.getAnnotation(JPA.JOIN_COLUMN)); + assertNotNull(resourceField.getAnnotation(0, JPA.JOIN_COLUMN)); assertTrue(rel.strategyIsJoinColumn()); - resourceAttribute.removeAnnotation(JPA.JOIN_COLUMN); + resourceField.removeAnnotation(0, JPA.JOIN_COLUMN); getJpaProject().synchronizeContextModel(); - assertNull(resourceAttribute.getAnnotation(JPA.JOIN_COLUMN)); + assertNull(resourceField.getAnnotation(0, JPA.JOIN_COLUMN)); assertTrue(rel.strategyIsJoinColumn()); } @@ -859,7 +863,7 @@ public class JavaManyToOneMappingTests extends ContextModelTestCase createTestTargetEntityAddress(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToOneMapping manyToOneMapping = (ManyToOneMapping) persistentAttribute.getMapping(); //targetEntity not in the persistence unit, default still set, handled by validation @@ -873,7 +877,7 @@ public class JavaManyToOneMappingTests extends ContextModelTestCase manyToOneMapping.setSpecifiedTargetEntity("foo"); assertEquals(PACKAGE_NAME + ".Address", manyToOneMapping.getDefaultTargetEntity()); - ListIterator classRefs = getPersistenceUnit().specifiedClassRefs(); + ListIterator classRefs = getPersistenceUnit().getSpecifiedClassRefs().iterator(); classRefs.next(); ClassRef addressClassRef = classRefs.next(); JavaPersistentType addressPersistentType = addressClassRef.getJavaPersistentType(); @@ -889,7 +893,7 @@ public class JavaManyToOneMappingTests extends ContextModelTestCase addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); addXmlClassRef(PACKAGE_NAME + ".Address"); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToOneMapping manyToOneMapping = (ManyToOneMapping) persistentAttribute.getMapping(); assertNull(manyToOneMapping.getDefaultTargetEntity()); @@ -901,7 +905,7 @@ public class JavaManyToOneMappingTests extends ContextModelTestCase addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); addXmlClassRef(PACKAGE_NAME + ".Address"); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToOneMapping manyToOneMapping = (ManyToOneMapping) persistentAttribute.getMapping(); assertNull(manyToOneMapping.getDefaultTargetEntity()); @@ -913,7 +917,7 @@ public class JavaManyToOneMappingTests extends ContextModelTestCase addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); addXmlClassRef(PACKAGE_NAME + ".Address"); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToOneMapping manyToOneMapping = (ManyToOneMapping) persistentAttribute.getMapping(); assertEquals(PACKAGE_NAME + ".Address", manyToOneMapping.getTargetEntity()); @@ -929,7 +933,7 @@ public class JavaManyToOneMappingTests extends ContextModelTestCase createTestEntityWithValidManyToOneMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToOneMapping manyToOneMapping = (ManyToOneMapping) persistentAttribute.getMapping(); //targetEntity not in the persistence unit @@ -938,7 +942,7 @@ public class JavaManyToOneMappingTests extends ContextModelTestCase //add targetEntity to the persistence unit, now target entity should resolve createTestTargetEntityAddress(); addXmlClassRef(PACKAGE_NAME + ".Address"); - ListIterator classRefs = getPersistenceUnit().specifiedClassRefs(); + ListIterator classRefs = getPersistenceUnit().getSpecifiedClassRefs().iterator(); classRefs.next(); ClassRef addressClassRef = classRefs.next(); TypeMapping addressTypeMapping = addressClassRef.getJavaPersistentType().getMapping(); diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaMappedSuperclassTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaMappedSuperclassTests.java index eafb1f413a..8623519544 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaMappedSuperclassTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaMappedSuperclassTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2010 Oracle. All rights reserved. + * Copyright (c) 2007, 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. @@ -11,6 +11,8 @@ package org.eclipse.jpt.jpa.core.tests.internal.context.java; import java.util.Iterator; import org.eclipse.jdt.core.ICompilationUnit; +import org.eclipse.jpt.common.core.resource.java.JavaResourceType; +import org.eclipse.jpt.common.core.resource.java.JavaResourceAnnotatedElement.Kind; import org.eclipse.jpt.common.core.tests.internal.projects.TestJavaProject.SourceWriter; import org.eclipse.jpt.common.utility.internal.iterators.ArrayIterator; import org.eclipse.jpt.jpa.core.MappingKeys; @@ -21,7 +23,6 @@ import org.eclipse.jpt.jpa.core.context.MappedSuperclass; import org.eclipse.jpt.jpa.core.internal.context.java.JavaNullTypeMapping; import org.eclipse.jpt.jpa.core.resource.java.IdClassAnnotation; 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.MappedSuperclassAnnotation; import org.eclipse.jpt.jpa.core.tests.internal.context.ContextModelTestCase; @@ -67,9 +68,9 @@ public class JavaMappedSuperclassTests extends ContextModelTestCase getJavaPersistentType().setMappingKey(MappingKeys.ENTITY_TYPE_MAPPING_KEY); assertTrue(getJavaPersistentType().getMapping() instanceof Entity); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - assertNull(typeResource.getAnnotation(MappedSuperclassAnnotation.ANNOTATION_NAME)); - assertNotNull(typeResource.getAnnotation(IdClassAnnotation.ANNOTATION_NAME)); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + assertNull(resourceType.getAnnotation(MappedSuperclassAnnotation.ANNOTATION_NAME)); + assertNotNull(resourceType.getAnnotation(IdClassAnnotation.ANNOTATION_NAME)); } public void testMorphToEmbeddable() throws Exception { @@ -82,9 +83,9 @@ public class JavaMappedSuperclassTests extends ContextModelTestCase getJavaPersistentType().setMappingKey(MappingKeys.EMBEDDABLE_TYPE_MAPPING_KEY); assertTrue(getJavaPersistentType().getMapping() instanceof Embeddable); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - assertNull(typeResource.getAnnotation(MappedSuperclassAnnotation.ANNOTATION_NAME)); - assertNull(typeResource.getAnnotation(IdClassAnnotation.ANNOTATION_NAME)); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + assertNull(resourceType.getAnnotation(MappedSuperclassAnnotation.ANNOTATION_NAME)); + assertNull(resourceType.getAnnotation(IdClassAnnotation.ANNOTATION_NAME)); } public void testMorphToNull() throws Exception { @@ -97,9 +98,9 @@ public class JavaMappedSuperclassTests extends ContextModelTestCase getJavaPersistentType().setMappingKey(MappingKeys.NULL_TYPE_MAPPING_KEY); assertTrue(getJavaPersistentType().getMapping() instanceof JavaNullTypeMapping); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - assertNull(typeResource.getAnnotation(MappedSuperclassAnnotation.ANNOTATION_NAME)); - assertNull(typeResource.getAnnotation(IdClassAnnotation.ANNOTATION_NAME)); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + assertNull(resourceType.getAnnotation(MappedSuperclassAnnotation.ANNOTATION_NAME)); + assertNull(resourceType.getAnnotation(IdClassAnnotation.ANNOTATION_NAME)); } public void testMappedSuperclass() throws Exception { @@ -208,7 +209,7 @@ public class JavaMappedSuperclassTests extends ContextModelTestCase createTestIdClass(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentType resourceType = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); MappedSuperclass mappedSuperclass = (MappedSuperclass) getJavaPersistentType().getMapping(); IdClassReference idClassRef = mappedSuperclass.getIdClassReference(); @@ -260,28 +261,28 @@ public class JavaMappedSuperclassTests extends ContextModelTestCase createTestIdClass(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); MappedSuperclass mappedSuperclass = (MappedSuperclass) getJavaPersistentType().getMapping(); IdClassReference idClassRef = mappedSuperclass.getIdClassReference(); - assertNull(typeResource.getAnnotation(IdClassAnnotation.ANNOTATION_NAME)); + assertNull(resourceType.getAnnotation(IdClassAnnotation.ANNOTATION_NAME)); assertNull(idClassRef.getSpecifiedIdClassName()); assertNull(idClassRef.getIdClass()); String nonExistentIdClassName = PACKAGE_NAME + ".Foo"; idClassRef.setSpecifiedIdClassName(nonExistentIdClassName); - assertEquals(nonExistentIdClassName, ((IdClassAnnotation) typeResource.getAnnotation(IdClassAnnotation.ANNOTATION_NAME)).getValue()); + assertEquals(nonExistentIdClassName, ((IdClassAnnotation) resourceType.getAnnotation(IdClassAnnotation.ANNOTATION_NAME)).getValue()); assertEquals(nonExistentIdClassName, idClassRef.getSpecifiedIdClassName()); assertNull(idClassRef.getIdClass()); String existentIdClassName = PACKAGE_NAME + ".TestTypeId"; idClassRef.setSpecifiedIdClassName(existentIdClassName); - assertEquals(existentIdClassName, ((IdClassAnnotation) typeResource.getAnnotation(IdClassAnnotation.ANNOTATION_NAME)).getValue()); + assertEquals(existentIdClassName, ((IdClassAnnotation) resourceType.getAnnotation(IdClassAnnotation.ANNOTATION_NAME)).getValue()); assertEquals(existentIdClassName, idClassRef.getSpecifiedIdClassName()); assertNotNull(idClassRef.getIdClass()); idClassRef.setSpecifiedIdClassName(null); - assertNull(typeResource.getAnnotation(IdClassAnnotation.ANNOTATION_NAME)); + assertNull(resourceType.getAnnotation(IdClassAnnotation.ANNOTATION_NAME)); assertNull(idClassRef.getSpecifiedIdClassName()); assertNull(idClassRef.getIdClass()); } diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaNamedNativeQueryTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaNamedNativeQueryTests.java index f9dfdeb52c..ff43788f3f 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaNamedNativeQueryTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaNamedNativeQueryTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2010 Oracle. All rights reserved. + * Copyright (c) 2007, 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,12 +12,13 @@ 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.JavaResourceType; +import org.eclipse.jpt.common.core.resource.java.JavaResourceAnnotatedElement.Kind; import org.eclipse.jpt.common.utility.internal.iterators.ArrayIterator; import org.eclipse.jpt.jpa.core.context.Entity; import org.eclipse.jpt.jpa.core.context.NamedNativeQuery; import org.eclipse.jpt.jpa.core.context.QueryHint; 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.NamedNativeQueryAnnotation; import org.eclipse.jpt.jpa.core.tests.internal.context.ContextModelTestCase; @@ -52,14 +53,14 @@ public class JavaNamedNativeQueryTests extends ContextModelTestCase addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); Entity entity = getJavaEntity(); - NamedNativeQuery namedNativeQuery = entity.getQueryContainer().namedNativeQueries().next(); - - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - NamedNativeQueryAnnotation javaNamedNativeQuery = (NamedNativeQueryAnnotation) typeResource.getAnnotation(NamedNativeQueryAnnotation.ANNOTATION_NAME); - + NamedNativeQuery namedNativeQuery = entity.getQueryContainer().getNamedNativeQueries().iterator().next(); + + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + NamedNativeQueryAnnotation javaNamedNativeQuery = (NamedNativeQueryAnnotation) resourceType.getAnnotation(0, NamedNativeQueryAnnotation.ANNOTATION_NAME); + assertEquals(QUERY_NAME, javaNamedNativeQuery.getName()); assertEquals(QUERY_NAME, namedNativeQuery.getName()); - + //set name to null in the resource model javaNamedNativeQuery.setName(null); getJpaProject().synchronizeContextModel(); @@ -77,11 +78,11 @@ public class JavaNamedNativeQueryTests extends ContextModelTestCase createTestEntityWithNamedNativeQuery(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); Entity entity = getJavaEntity(); - NamedNativeQuery namedNativeQuery = entity.getQueryContainer().namedNativeQueries().next(); + NamedNativeQuery namedNativeQuery = entity.getQueryContainer().getNamedNativeQueries().iterator().next(); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - NamedNativeQueryAnnotation javaNamedNativeQuery = (NamedNativeQueryAnnotation) typeResource.getAnnotation(NamedNativeQueryAnnotation.ANNOTATION_NAME); - + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + NamedNativeQueryAnnotation javaNamedNativeQuery = (NamedNativeQueryAnnotation) resourceType.getAnnotation(0, NamedNativeQueryAnnotation.ANNOTATION_NAME); + assertEquals(QUERY_NAME, javaNamedNativeQuery.getName()); assertEquals(QUERY_NAME, namedNativeQuery.getName()); @@ -101,11 +102,11 @@ public class JavaNamedNativeQueryTests extends ContextModelTestCase addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); Entity entity = getJavaEntity(); - NamedNativeQuery namedNativeQuery = entity.getQueryContainer().namedNativeQueries().next(); + NamedNativeQuery namedNativeQuery = entity.getQueryContainer().getNamedNativeQueries().iterator().next(); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - NamedNativeQueryAnnotation javaNamedNativeQuery = (NamedNativeQueryAnnotation) typeResource.getAnnotation(NamedNativeQueryAnnotation.ANNOTATION_NAME); - + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + NamedNativeQueryAnnotation javaNamedNativeQuery = (NamedNativeQueryAnnotation) resourceType.getAnnotation(0, NamedNativeQueryAnnotation.ANNOTATION_NAME); + assertEquals(QUERY_QUERY, javaNamedNativeQuery.getQuery()); assertEquals(QUERY_QUERY, namedNativeQuery.getQuery()); @@ -126,11 +127,11 @@ public class JavaNamedNativeQueryTests extends ContextModelTestCase createTestEntityWithNamedNativeQuery(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); Entity entity = getJavaEntity(); - NamedNativeQuery namedNativeQuery = entity.getQueryContainer().namedNativeQueries().next(); + NamedNativeQuery namedNativeQuery = entity.getQueryContainer().getNamedNativeQueries().iterator().next(); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - NamedNativeQueryAnnotation javaNamedNativeQuery = (NamedNativeQueryAnnotation) typeResource.getAnnotation(NamedNativeQueryAnnotation.ANNOTATION_NAME); - + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + NamedNativeQueryAnnotation javaNamedNativeQuery = (NamedNativeQueryAnnotation) resourceType.getAnnotation(0, NamedNativeQueryAnnotation.ANNOTATION_NAME); + assertEquals(QUERY_QUERY, javaNamedNativeQuery.getQuery()); assertEquals(QUERY_QUERY, namedNativeQuery.getQuery()); @@ -150,10 +151,10 @@ public class JavaNamedNativeQueryTests extends ContextModelTestCase createTestEntityWithNamedNativeQuery(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); Entity entity = getJavaEntity(); - NamedNativeQuery namedNativeQuery = entity.getQueryContainer().namedNativeQueries().next(); + NamedNativeQuery namedNativeQuery = entity.getQueryContainer().getNamedNativeQueries().iterator().next(); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - NamedNativeQueryAnnotation javaNamedNativeQuery = (NamedNativeQueryAnnotation) typeResource.getAnnotation(NamedNativeQueryAnnotation.ANNOTATION_NAME); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + NamedNativeQueryAnnotation javaNamedNativeQuery = (NamedNativeQueryAnnotation) resourceType.getAnnotation(0, NamedNativeQueryAnnotation.ANNOTATION_NAME); QueryHint queryHint = namedNativeQuery.addHint(0); @@ -174,7 +175,7 @@ public class JavaNamedNativeQueryTests extends ContextModelTestCase assertEquals("BAZ", javaNamedNativeQuery.hintAt(1).getName()); assertEquals("FOO", javaNamedNativeQuery.hintAt(2).getName()); - ListIterator hints = namedNativeQuery.getHints().iterator(); + ListIterator hints = namedNativeQuery.getHints().iterator(); assertEquals(queryHint2, hints.next()); assertEquals(queryHint3, hints.next()); assertEquals(queryHint, hints.next()); @@ -189,48 +190,48 @@ public class JavaNamedNativeQueryTests extends ContextModelTestCase createTestEntityWithNamedNativeQuery(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); Entity entity = getJavaEntity(); - NamedNativeQuery namedNativeQuery = entity.getQueryContainer().namedNativeQueries().next(); + NamedNativeQuery namedNativeQuery = entity.getQueryContainer().getNamedNativeQueries().iterator().next(); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - NamedNativeQueryAnnotation javaNamedNativeQuery = (NamedNativeQueryAnnotation) typeResource.getAnnotation(NamedNativeQueryAnnotation.ANNOTATION_NAME); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + NamedNativeQueryAnnotation javaNamedNativeQuery = (NamedNativeQueryAnnotation) resourceType.getAnnotation(0, NamedNativeQueryAnnotation.ANNOTATION_NAME); namedNativeQuery.addHint(0).setName("FOO"); namedNativeQuery.addHint(1).setName("BAR"); namedNativeQuery.addHint(2).setName("BAZ"); - assertEquals(3, javaNamedNativeQuery.hintsSize()); + assertEquals(3, javaNamedNativeQuery.getHintsSize()); namedNativeQuery.removeHint(0); - assertEquals(2, javaNamedNativeQuery.hintsSize()); + assertEquals(2, javaNamedNativeQuery.getHintsSize()); assertEquals("BAR", javaNamedNativeQuery.hintAt(0).getName()); assertEquals("BAZ", javaNamedNativeQuery.hintAt(1).getName()); namedNativeQuery.removeHint(0); - assertEquals(1, javaNamedNativeQuery.hintsSize()); + assertEquals(1, javaNamedNativeQuery.getHintsSize()); assertEquals("BAZ", javaNamedNativeQuery.hintAt(0).getName()); namedNativeQuery.removeHint(0); - assertEquals(0, javaNamedNativeQuery.hintsSize()); + assertEquals(0, javaNamedNativeQuery.getHintsSize()); } public void testMoveHint() throws Exception { createTestEntityWithNamedNativeQuery(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); Entity entity = getJavaEntity(); - NamedNativeQuery namedNativeQuery = entity.getQueryContainer().namedNativeQueries().next(); + NamedNativeQuery namedNativeQuery = entity.getQueryContainer().getNamedNativeQueries().iterator().next(); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - NamedNativeQueryAnnotation javaNamedNativeQuery = (NamedNativeQueryAnnotation) typeResource.getAnnotation(NamedNativeQueryAnnotation.ANNOTATION_NAME); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + NamedNativeQueryAnnotation javaNamedNativeQuery = (NamedNativeQueryAnnotation) resourceType.getAnnotation(0, NamedNativeQueryAnnotation.ANNOTATION_NAME); namedNativeQuery.addHint(0).setName("FOO"); namedNativeQuery.addHint(1).setName("BAR"); namedNativeQuery.addHint(2).setName("BAZ"); - assertEquals(3, javaNamedNativeQuery.hintsSize()); + assertEquals(3, javaNamedNativeQuery.getHintsSize()); namedNativeQuery.moveHint(2, 0); - ListIterator hints = namedNativeQuery.getHints().iterator(); + ListIterator hints = namedNativeQuery.getHints().iterator(); assertEquals("BAR", hints.next().getName()); assertEquals("BAZ", hints.next().getName()); assertEquals("FOO", hints.next().getName()); @@ -255,17 +256,17 @@ public class JavaNamedNativeQueryTests extends ContextModelTestCase createTestEntityWithNamedNativeQuery(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); Entity entity = getJavaEntity(); - NamedNativeQuery namedNativeQuery = entity.getQueryContainer().namedNativeQueries().next(); + NamedNativeQuery namedNativeQuery = entity.getQueryContainer().getNamedNativeQueries().iterator().next(); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - NamedNativeQueryAnnotation queryAnnotation = (NamedNativeQueryAnnotation) typeResource.getAnnotation(NamedNativeQueryAnnotation.ANNOTATION_NAME); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + NamedNativeQueryAnnotation queryAnnotation = (NamedNativeQueryAnnotation) resourceType.getAnnotation(0, NamedNativeQueryAnnotation.ANNOTATION_NAME); queryAnnotation.addHint(0).setName("FOO"); queryAnnotation.addHint(1).setName("BAR"); queryAnnotation.addHint(2).setName("BAZ"); getJpaProject().synchronizeContextModel(); - ListIterator hints = namedNativeQuery.getHints().iterator(); + ListIterator hints = namedNativeQuery.getHints().iterator(); assertEquals("FOO", hints.next().getName()); assertEquals("BAR", hints.next().getName()); assertEquals("BAZ", hints.next().getName()); @@ -310,11 +311,11 @@ public class JavaNamedNativeQueryTests extends ContextModelTestCase addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); Entity entity = getJavaEntity(); - NamedNativeQuery namedNativeQuery = entity.getQueryContainer().namedNativeQueries().next(); + NamedNativeQuery namedNativeQuery = entity.getQueryContainer().getNamedNativeQueries().iterator().next(); assertEquals(0, namedNativeQuery.getHintsSize()); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - NamedNativeQueryAnnotation javaNamedNativeQuery = (NamedNativeQueryAnnotation) typeResource.getAnnotation(NamedNativeQueryAnnotation.ANNOTATION_NAME); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + NamedNativeQueryAnnotation javaNamedNativeQuery = (NamedNativeQueryAnnotation) resourceType.getAnnotation(0, NamedNativeQueryAnnotation.ANNOTATION_NAME); javaNamedNativeQuery.addHint(0); @@ -336,10 +337,10 @@ public class JavaNamedNativeQueryTests extends ContextModelTestCase addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); Entity entity = getJavaEntity(); - NamedNativeQuery namedNativeQuery = entity.getQueryContainer().namedNativeQueries().next(); + NamedNativeQuery namedNativeQuery = entity.getQueryContainer().getNamedNativeQueries().iterator().next(); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - NamedNativeQueryAnnotation queryAnnotation = (NamedNativeQueryAnnotation) typeResource.getAnnotation(NamedNativeQueryAnnotation.ANNOTATION_NAME); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + NamedNativeQueryAnnotation queryAnnotation = (NamedNativeQueryAnnotation) resourceType.getAnnotation(0, NamedNativeQueryAnnotation.ANNOTATION_NAME); assertEquals(null, queryAnnotation.getResultClass()); assertEquals(null, namedNativeQuery.getResultClass()); @@ -361,10 +362,10 @@ public class JavaNamedNativeQueryTests extends ContextModelTestCase createTestEntityWithNamedNativeQuery(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); Entity entity = getJavaEntity(); - NamedNativeQuery namedNativeQuery = entity.getQueryContainer().namedNativeQueries().next(); + NamedNativeQuery namedNativeQuery = entity.getQueryContainer().getNamedNativeQueries().iterator().next(); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - NamedNativeQueryAnnotation javaNamedNativeQuery = (NamedNativeQueryAnnotation) typeResource.getAnnotation(NamedNativeQueryAnnotation.ANNOTATION_NAME); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + NamedNativeQueryAnnotation javaNamedNativeQuery = (NamedNativeQueryAnnotation) resourceType.getAnnotation(0, NamedNativeQueryAnnotation.ANNOTATION_NAME); assertEquals(null, javaNamedNativeQuery.getResultClass()); assertEquals(null, namedNativeQuery.getResultClass()); @@ -385,10 +386,10 @@ public class JavaNamedNativeQueryTests extends ContextModelTestCase addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); Entity entity = getJavaEntity(); - NamedNativeQuery namedNativeQuery = entity.getQueryContainer().namedNativeQueries().next(); + NamedNativeQuery namedNativeQuery = entity.getQueryContainer().getNamedNativeQueries().iterator().next(); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - NamedNativeQueryAnnotation javaNamedNativeQuery = (NamedNativeQueryAnnotation) typeResource.getAnnotation(NamedNativeQueryAnnotation.ANNOTATION_NAME); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + NamedNativeQueryAnnotation javaNamedNativeQuery = (NamedNativeQueryAnnotation) resourceType.getAnnotation(0, NamedNativeQueryAnnotation.ANNOTATION_NAME); assertEquals(null, javaNamedNativeQuery.getResultSetMapping()); assertEquals(null, namedNativeQuery.getResultSetMapping()); @@ -410,10 +411,10 @@ public class JavaNamedNativeQueryTests extends ContextModelTestCase createTestEntityWithNamedNativeQuery(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); Entity entity = getJavaEntity(); - NamedNativeQuery namedNativeQuery = entity.getQueryContainer().namedNativeQueries().next(); + NamedNativeQuery namedNativeQuery = entity.getQueryContainer().getNamedNativeQueries().iterator().next(); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - NamedNativeQueryAnnotation javaNamedNativeQuery = (NamedNativeQueryAnnotation) typeResource.getAnnotation(NamedNativeQueryAnnotation.ANNOTATION_NAME); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + NamedNativeQueryAnnotation javaNamedNativeQuery = (NamedNativeQueryAnnotation) resourceType.getAnnotation(0, NamedNativeQueryAnnotation.ANNOTATION_NAME); assertEquals(null, javaNamedNativeQuery.getResultSetMapping()); assertEquals(null, namedNativeQuery.getResultSetMapping()); diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaNamedQueryTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaNamedQueryTests.java index 6acded1c98..6d95c28765 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaNamedQueryTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaNamedQueryTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2010 Oracle. All rights reserved. + * Copyright (c) 2007, 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,12 +12,13 @@ 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.JavaResourceType; +import org.eclipse.jpt.common.core.resource.java.JavaResourceAnnotatedElement.Kind; import org.eclipse.jpt.common.utility.internal.iterators.ArrayIterator; import org.eclipse.jpt.jpa.core.context.Entity; import org.eclipse.jpt.jpa.core.context.NamedQuery; import org.eclipse.jpt.jpa.core.context.QueryHint; 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.NamedQueryAnnotation; import org.eclipse.jpt.jpa.core.tests.internal.context.ContextModelTestCase; @@ -52,10 +53,10 @@ public class JavaNamedQueryTests extends ContextModelTestCase addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); Entity entity = getJavaEntity(); - NamedQuery namedQuery = entity.getQueryContainer().namedQueries().next(); + NamedQuery namedQuery = entity.getQueryContainer().getNamedQueries().iterator().next(); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - NamedQueryAnnotation javaNamedQuery = (NamedQueryAnnotation) typeResource.getAnnotation(NamedQueryAnnotation.ANNOTATION_NAME); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + NamedQueryAnnotation javaNamedQuery = (NamedQueryAnnotation) resourceType.getAnnotation(0, NamedQueryAnnotation.ANNOTATION_NAME); assertEquals(QUERY_NAME, javaNamedQuery.getName()); assertEquals(QUERY_NAME, namedQuery.getName()); @@ -77,10 +78,10 @@ public class JavaNamedQueryTests extends ContextModelTestCase createTestEntityWithNamedQuery(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); Entity entity = getJavaEntity(); - NamedQuery namedQuery = entity.getQueryContainer().namedQueries().next(); + NamedQuery namedQuery = entity.getQueryContainer().getNamedQueries().iterator().next(); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - NamedQueryAnnotation javaNamedQuery = (NamedQueryAnnotation) typeResource.getAnnotation(NamedQueryAnnotation.ANNOTATION_NAME); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + NamedQueryAnnotation javaNamedQuery = (NamedQueryAnnotation) resourceType.getAnnotation(0, NamedQueryAnnotation.ANNOTATION_NAME); assertEquals(QUERY_NAME, javaNamedQuery.getName()); assertEquals(QUERY_NAME, namedQuery.getName()); @@ -101,10 +102,10 @@ public class JavaNamedQueryTests extends ContextModelTestCase addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); Entity entity = getJavaEntity(); - NamedQuery namedQuery = entity.getQueryContainer().namedQueries().next(); + NamedQuery namedQuery = entity.getQueryContainer().getNamedQueries().iterator().next(); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - NamedQueryAnnotation javaNamedQuery = (NamedQueryAnnotation) typeResource.getAnnotation(NamedQueryAnnotation.ANNOTATION_NAME); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + NamedQueryAnnotation javaNamedQuery = (NamedQueryAnnotation) resourceType.getAnnotation(0, NamedQueryAnnotation.ANNOTATION_NAME); assertEquals(QUERY_QUERY, javaNamedQuery.getQuery()); assertEquals(QUERY_QUERY, namedQuery.getQuery()); @@ -126,10 +127,10 @@ public class JavaNamedQueryTests extends ContextModelTestCase createTestEntityWithNamedQuery(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); Entity entity = getJavaEntity(); - NamedQuery namedQuery = entity.getQueryContainer().namedQueries().next(); + NamedQuery namedQuery = entity.getQueryContainer().getNamedQueries().iterator().next(); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - NamedQueryAnnotation javaNamedQuery = (NamedQueryAnnotation) typeResource.getAnnotation(NamedQueryAnnotation.ANNOTATION_NAME); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + NamedQueryAnnotation javaNamedQuery = (NamedQueryAnnotation) resourceType.getAnnotation(0, NamedQueryAnnotation.ANNOTATION_NAME); assertEquals(QUERY_QUERY, javaNamedQuery.getQuery()); assertEquals(QUERY_QUERY, namedQuery.getQuery()); @@ -150,10 +151,10 @@ public class JavaNamedQueryTests extends ContextModelTestCase createTestEntityWithNamedQuery(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); Entity entity = getJavaEntity(); - NamedQuery namedQuery = entity.getQueryContainer().namedQueries().next(); + NamedQuery namedQuery = entity.getQueryContainer().getNamedQueries().iterator().next(); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - NamedQueryAnnotation javaNamedQuery = (NamedQueryAnnotation) typeResource.getAnnotation(NamedQueryAnnotation.ANNOTATION_NAME); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + NamedQueryAnnotation javaNamedQuery = (NamedQueryAnnotation) resourceType.getAnnotation(0, NamedQueryAnnotation.ANNOTATION_NAME); QueryHint queryHint = namedQuery.addHint(0); @@ -174,7 +175,7 @@ public class JavaNamedQueryTests extends ContextModelTestCase assertEquals("BAZ", javaNamedQuery.hintAt(1).getName()); assertEquals("FOO", javaNamedQuery.hintAt(2).getName()); - ListIterator hints = namedQuery.getHints().iterator(); + ListIterator hints = namedQuery.getHints().iterator(); assertEquals(queryHint2, hints.next()); assertEquals(queryHint3, hints.next()); assertEquals(queryHint, hints.next()); @@ -189,48 +190,48 @@ public class JavaNamedQueryTests extends ContextModelTestCase createTestEntityWithNamedQuery(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); Entity entity = getJavaEntity(); - NamedQuery namedQuery = entity.getQueryContainer().namedQueries().next(); + NamedQuery namedQuery = entity.getQueryContainer().getNamedQueries().iterator().next(); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - NamedQueryAnnotation javaNamedQuery = (NamedQueryAnnotation) typeResource.getAnnotation(NamedQueryAnnotation.ANNOTATION_NAME); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + NamedQueryAnnotation javaNamedQuery = (NamedQueryAnnotation) resourceType.getAnnotation(0, NamedQueryAnnotation.ANNOTATION_NAME); namedQuery.addHint(0).setName("FOO"); namedQuery.addHint(1).setName("BAR"); namedQuery.addHint(2).setName("BAZ"); - assertEquals(3, javaNamedQuery.hintsSize()); + assertEquals(3, javaNamedQuery.getHintsSize()); namedQuery.removeHint(0); - assertEquals(2, javaNamedQuery.hintsSize()); + assertEquals(2, javaNamedQuery.getHintsSize()); assertEquals("BAR", javaNamedQuery.hintAt(0).getName()); assertEquals("BAZ", javaNamedQuery.hintAt(1).getName()); namedQuery.removeHint(0); - assertEquals(1, javaNamedQuery.hintsSize()); + assertEquals(1, javaNamedQuery.getHintsSize()); assertEquals("BAZ", javaNamedQuery.hintAt(0).getName()); namedQuery.removeHint(0); - assertEquals(0, javaNamedQuery.hintsSize()); + assertEquals(0, javaNamedQuery.getHintsSize()); } public void testMoveHint() throws Exception { createTestEntityWithNamedQuery(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); Entity entity = getJavaEntity(); - NamedQuery namedQuery = entity.getQueryContainer().namedQueries().next(); + NamedQuery namedQuery = entity.getQueryContainer().getNamedQueries().iterator().next(); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - NamedQueryAnnotation javaNamedQuery = (NamedQueryAnnotation) typeResource.getAnnotation(NamedQueryAnnotation.ANNOTATION_NAME); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + NamedQueryAnnotation javaNamedQuery = (NamedQueryAnnotation) resourceType.getAnnotation(0, NamedQueryAnnotation.ANNOTATION_NAME); namedQuery.addHint(0).setName("FOO"); namedQuery.addHint(1).setName("BAR"); namedQuery.addHint(2).setName("BAZ"); - assertEquals(3, javaNamedQuery.hintsSize()); + assertEquals(3, javaNamedQuery.getHintsSize()); namedQuery.moveHint(2, 0); - ListIterator hints = namedQuery.getHints().iterator(); + ListIterator hints = namedQuery.getHints().iterator(); assertEquals("BAR", hints.next().getName()); assertEquals("BAZ", hints.next().getName()); assertEquals("FOO", hints.next().getName()); @@ -255,17 +256,17 @@ public class JavaNamedQueryTests extends ContextModelTestCase createTestEntityWithNamedQuery(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); Entity entity = getJavaEntity(); - NamedQuery namedQuery = entity.getQueryContainer().namedQueries().next(); + NamedQuery namedQuery = entity.getQueryContainer().getNamedQueries().iterator().next(); - JavaResourcePersistentType resourceType = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - NamedQueryAnnotation namedQueryAnnotation = (NamedQueryAnnotation) resourceType.getAnnotation(NamedQueryAnnotation.ANNOTATION_NAME); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + NamedQueryAnnotation namedQueryAnnotation = (NamedQueryAnnotation) resourceType.getAnnotation(0, NamedQueryAnnotation.ANNOTATION_NAME); namedQueryAnnotation.addHint(0).setName("FOO"); namedQueryAnnotation.addHint(1).setName("BAR"); namedQueryAnnotation.addHint(2).setName("BAZ"); getJpaProject().synchronizeContextModel(); - ListIterator hints = namedQuery.getHints().iterator(); + ListIterator hints = namedQuery.getHints().iterator(); assertEquals("FOO", hints.next().getName()); assertEquals("BAR", hints.next().getName()); assertEquals("BAZ", hints.next().getName()); @@ -310,11 +311,11 @@ public class JavaNamedQueryTests extends ContextModelTestCase addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); Entity entity = getJavaEntity(); - NamedQuery namedQuery = entity.getQueryContainer().namedQueries().next(); + NamedQuery namedQuery = entity.getQueryContainer().getNamedQueries().iterator().next(); assertEquals(0, namedQuery.getHintsSize()); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - NamedQueryAnnotation javaNamedQuery = (NamedQueryAnnotation) typeResource.getAnnotation(NamedQueryAnnotation.ANNOTATION_NAME); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + NamedQueryAnnotation javaNamedQuery = (NamedQueryAnnotation) resourceType.getAnnotation(0, NamedQueryAnnotation.ANNOTATION_NAME); javaNamedQuery.addHint(0); diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaOneToManyMappingTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaOneToManyMappingTests.java index 2326e3eb58..3c9058db33 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaOneToManyMappingTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaOneToManyMappingTests.java @@ -12,6 +12,9 @@ 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.JavaResourceField; +import org.eclipse.jpt.common.core.resource.java.JavaResourceType; +import org.eclipse.jpt.common.core.resource.java.JavaResourceAnnotatedElement.Kind; import org.eclipse.jpt.common.core.tests.internal.projects.TestJavaProject.SourceWriter; import org.eclipse.jpt.common.utility.internal.iterators.ArrayIterator; import org.eclipse.jpt.jpa.core.MappingKeys; @@ -38,8 +41,6 @@ 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.JoinTableAnnotation; import org.eclipse.jpt.jpa.core.resource.java.ManyToManyAnnotation; import org.eclipse.jpt.jpa.core.resource.java.ManyToOneAnnotation; @@ -300,7 +301,7 @@ public class JavaOneToManyMappingTests extends ContextModelTestCase createTestEntityWithOneToManyMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToManyMapping oneToManyMapping = (OneToManyMapping) persistentAttribute.getMapping(); oneToManyMapping.getOrderable().setSpecifiedOrderBy("asdf"); oneToManyMapping.getRelationship().getJoinTableStrategy().getJoinTable().setSpecifiedName("FOO"); @@ -310,19 +311,19 @@ public class JavaOneToManyMappingTests 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(OneToManyAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getAnnotation(BasicAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(JoinTableAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(OrderByAnnotation.ANNOTATION_NAME)); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + assertNull(resourceField.getAnnotation(OneToManyAnnotation.ANNOTATION_NAME)); + assertNotNull(resourceField.getAnnotation(BasicAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(JoinTableAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(OrderByAnnotation.ANNOTATION_NAME)); } public void testMorphToDefault() throws Exception { createTestEntityWithOneToManyMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToManyMapping oneToManyMapping = (OneToManyMapping) persistentAttribute.getMapping(); oneToManyMapping.getOrderable().setSpecifiedOrderBy("asdf"); oneToManyMapping.getRelationship().getJoinTableStrategy().getJoinTable().setSpecifiedName("FOO"); @@ -331,18 +332,18 @@ public class JavaOneToManyMappingTests 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(OneToManyAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(JoinTableAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(OrderByAnnotation.ANNOTATION_NAME)); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + assertNull(resourceField.getAnnotation(OneToManyAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(JoinTableAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(OrderByAnnotation.ANNOTATION_NAME)); } public void testMorphToVersionMapping() throws Exception { createTestEntityWithOneToManyMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToManyMapping oneToManyMapping = (OneToManyMapping) persistentAttribute.getMapping(); oneToManyMapping.getOrderable().setSpecifiedOrderBy("asdf"); oneToManyMapping.getRelationship().getJoinTableStrategy().getJoinTable().setSpecifiedName("FOO"); @@ -352,19 +353,19 @@ public class JavaOneToManyMappingTests 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(OneToManyAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getAnnotation(VersionAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(JoinTableAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(OrderByAnnotation.ANNOTATION_NAME)); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + assertNull(resourceField.getAnnotation(OneToManyAnnotation.ANNOTATION_NAME)); + assertNotNull(resourceField.getAnnotation(VersionAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(JoinTableAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(OrderByAnnotation.ANNOTATION_NAME)); } public void testMorphToIdMapping() throws Exception { createTestEntityWithOneToManyMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToManyMapping oneToManyMapping = (OneToManyMapping) persistentAttribute.getMapping(); oneToManyMapping.getOrderable().setSpecifiedOrderBy("asdf"); oneToManyMapping.getRelationship().getJoinTableStrategy().getJoinTable().setSpecifiedName("FOO"); @@ -374,19 +375,19 @@ public class JavaOneToManyMappingTests 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(OneToManyAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getAnnotation(IdAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(JoinTableAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(OrderByAnnotation.ANNOTATION_NAME)); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + assertNull(resourceField.getAnnotation(OneToManyAnnotation.ANNOTATION_NAME)); + assertNotNull(resourceField.getAnnotation(IdAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(JoinTableAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(OrderByAnnotation.ANNOTATION_NAME)); } public void testMorphToEmbeddedMapping() throws Exception { createTestEntityWithOneToManyMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToManyMapping oneToManyMapping = (OneToManyMapping) persistentAttribute.getMapping(); oneToManyMapping.getOrderable().setSpecifiedOrderBy("asdf"); oneToManyMapping.getRelationship().getJoinTableStrategy().getJoinTable().setSpecifiedName("FOO"); @@ -396,19 +397,19 @@ public class JavaOneToManyMappingTests 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(OneToManyAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getAnnotation(EmbeddedAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(JoinTableAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(OrderByAnnotation.ANNOTATION_NAME)); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + assertNull(resourceField.getAnnotation(OneToManyAnnotation.ANNOTATION_NAME)); + assertNotNull(resourceField.getAnnotation(EmbeddedAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(JoinTableAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(OrderByAnnotation.ANNOTATION_NAME)); } public void testMorphToEmbeddedIdMapping() throws Exception { createTestEntityWithOneToManyMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToManyMapping oneToManyMapping = (OneToManyMapping) persistentAttribute.getMapping(); oneToManyMapping.getOrderable().setSpecifiedOrderBy("asdf"); oneToManyMapping.getRelationship().getJoinTableStrategy().getJoinTable().setSpecifiedName("FOO"); @@ -418,19 +419,19 @@ public class JavaOneToManyMappingTests 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(OneToManyAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getAnnotation(EmbeddedIdAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(JoinTableAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(OrderByAnnotation.ANNOTATION_NAME)); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + assertNull(resourceField.getAnnotation(OneToManyAnnotation.ANNOTATION_NAME)); + assertNotNull(resourceField.getAnnotation(EmbeddedIdAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(JoinTableAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(OrderByAnnotation.ANNOTATION_NAME)); } public void testMorphToTransientMapping() throws Exception { createTestEntityWithOneToManyMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToManyMapping oneToManyMapping = (OneToManyMapping) persistentAttribute.getMapping(); oneToManyMapping.getOrderable().setSpecifiedOrderBy("asdf"); oneToManyMapping.getRelationship().getJoinTableStrategy().getJoinTable().setSpecifiedName("FOO"); @@ -440,19 +441,19 @@ public class JavaOneToManyMappingTests 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(OneToManyAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getAnnotation(TransientAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(JoinTableAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(OrderByAnnotation.ANNOTATION_NAME)); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + assertNull(resourceField.getAnnotation(OneToManyAnnotation.ANNOTATION_NAME)); + assertNotNull(resourceField.getAnnotation(TransientAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(JoinTableAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(OrderByAnnotation.ANNOTATION_NAME)); } public void testMorphToOneToOneMapping() throws Exception { createTestEntityWithOneToManyMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToManyMapping oneToManyMapping = (OneToManyMapping) persistentAttribute.getMapping(); oneToManyMapping.getOrderable().setSpecifiedOrderBy("asdf"); oneToManyMapping.getRelationship().getJoinTableStrategy().getJoinTable().setSpecifiedName("FOO"); @@ -462,19 +463,19 @@ public class JavaOneToManyMappingTests extends ContextModelTestCase assertTrue(persistentAttribute.getMapping() instanceof OneToOneMapping); assertFalse(persistentAttribute.getMapping().isDefault()); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - assertNull(attributeResource.getAnnotation(OneToManyAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getAnnotation(OneToOneAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getAnnotation(JoinTableAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(OrderByAnnotation.ANNOTATION_NAME)); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + assertNull(resourceField.getAnnotation(OneToManyAnnotation.ANNOTATION_NAME)); + assertNotNull(resourceField.getAnnotation(OneToOneAnnotation.ANNOTATION_NAME)); + assertNotNull(resourceField.getAnnotation(JoinTableAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(OrderByAnnotation.ANNOTATION_NAME)); } public void testMorphToManyToManyMapping() throws Exception { createTestEntityWithOneToManyMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToManyMapping oneToManyMapping = (OneToManyMapping) persistentAttribute.getMapping(); oneToManyMapping.getOrderable().setSpecifiedOrderBy("asdf"); oneToManyMapping.getRelationship().getJoinTableStrategy().getJoinTable().setSpecifiedName("FOO"); @@ -484,19 +485,19 @@ public class JavaOneToManyMappingTests 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(OneToManyAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getAnnotation(ManyToManyAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getAnnotation(JoinTableAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getAnnotation(OrderByAnnotation.ANNOTATION_NAME)); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + assertNull(resourceField.getAnnotation(OneToManyAnnotation.ANNOTATION_NAME)); + assertNotNull(resourceField.getAnnotation(ManyToManyAnnotation.ANNOTATION_NAME)); + assertNotNull(resourceField.getAnnotation(JoinTableAnnotation.ANNOTATION_NAME)); + assertNotNull(resourceField.getAnnotation(OrderByAnnotation.ANNOTATION_NAME)); } public void testMorphToManyToOneMapping() throws Exception { createTestEntityWithOneToManyMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToManyMapping oneToManyMapping = (OneToManyMapping) persistentAttribute.getMapping(); oneToManyMapping.getOrderable().setSpecifiedOrderBy("asdf"); oneToManyMapping.getRelationship().getJoinTableStrategy().getJoinTable().setSpecifiedName("FOO"); @@ -506,12 +507,12 @@ public class JavaOneToManyMappingTests 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(OneToManyAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getAnnotation(ManyToOneAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getAnnotation(JoinTableAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(OrderByAnnotation.ANNOTATION_NAME)); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + assertNull(resourceField.getAnnotation(OneToManyAnnotation.ANNOTATION_NAME)); + assertNotNull(resourceField.getAnnotation(ManyToOneAnnotation.ANNOTATION_NAME)); + assertNotNull(resourceField.getAnnotation(JoinTableAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(OrderByAnnotation.ANNOTATION_NAME)); } @@ -519,12 +520,12 @@ public class JavaOneToManyMappingTests extends ContextModelTestCase createTestEntityWithOneToManyMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToManyMapping oneToManyMapping = (OneToManyMapping) persistentAttribute.getMapping(); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - OneToManyAnnotation oneToManyAnnotation = (OneToManyAnnotation) attributeResource.getAnnotation(OneToManyAnnotation.ANNOTATION_NAME); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + OneToManyAnnotation oneToManyAnnotation = (OneToManyAnnotation) resourceField.getAnnotation(OneToManyAnnotation.ANNOTATION_NAME); assertNull(oneToManyMapping.getSpecifiedTargetEntity()); assertNull(oneToManyAnnotation.getTargetEntity()); @@ -546,12 +547,12 @@ public class JavaOneToManyMappingTests extends ContextModelTestCase createTestEntityWithOneToManyMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToManyMapping oneToManyMapping = (OneToManyMapping) persistentAttribute.getMapping(); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - OneToManyAnnotation oneToMany = (OneToManyAnnotation) attributeResource.getAnnotation(OneToManyAnnotation.ANNOTATION_NAME); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + OneToManyAnnotation oneToMany = (OneToManyAnnotation) resourceField.getAnnotation(OneToManyAnnotation.ANNOTATION_NAME); assertNull(oneToManyMapping.getSpecifiedTargetEntity()); assertNull(oneToMany.getTargetEntity()); @@ -571,12 +572,12 @@ public class JavaOneToManyMappingTests extends ContextModelTestCase createTestEntityWithOneToManyMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToManyMapping oneToManyMapping = (OneToManyMapping) persistentAttribute.getMapping(); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - OneToManyAnnotation oneToMany = (OneToManyAnnotation) attributeResource.getAnnotation(OneToManyAnnotation.ANNOTATION_NAME); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + OneToManyAnnotation oneToMany = (OneToManyAnnotation) resourceField.getAnnotation(OneToManyAnnotation.ANNOTATION_NAME); assertNull(oneToManyMapping.getSpecifiedFetch()); assertNull(oneToMany.getFetch()); @@ -604,12 +605,12 @@ public class JavaOneToManyMappingTests extends ContextModelTestCase createTestEntityWithOneToManyMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToManyMapping oneToManyMapping = (OneToManyMapping) persistentAttribute.getMapping(); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - OneToManyAnnotation oneToMany = (OneToManyAnnotation) attributeResource.getAnnotation(OneToManyAnnotation.ANNOTATION_NAME); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + OneToManyAnnotation oneToMany = (OneToManyAnnotation) resourceField.getAnnotation(OneToManyAnnotation.ANNOTATION_NAME); assertNull(oneToManyMapping.getSpecifiedFetch()); assertNull(oneToMany.getFetch()); @@ -633,12 +634,12 @@ public class JavaOneToManyMappingTests extends ContextModelTestCase createTestEntityWithOneToManyMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToManyMapping oneToManyMapping = (OneToManyMapping) persistentAttribute.getMapping(); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - OneToManyAnnotation oneToMany = (OneToManyAnnotation) attributeResource.getAnnotation(OneToManyAnnotation.ANNOTATION_NAME); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + OneToManyAnnotation oneToMany = (OneToManyAnnotation) resourceField.getAnnotation(OneToManyAnnotation.ANNOTATION_NAME); assertNull(oneToManyMapping.getRelationship().getMappedByStrategy().getMappedByAttribute()); assertNull(oneToMany.getMappedBy()); @@ -660,12 +661,12 @@ public class JavaOneToManyMappingTests extends ContextModelTestCase createTestEntityWithOneToManyMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToManyMapping oneToManyMapping = (OneToManyMapping) persistentAttribute.getMapping(); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - OneToManyAnnotation oneToMany = (OneToManyAnnotation) attributeResource.getAnnotation(OneToManyAnnotation.ANNOTATION_NAME); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + OneToManyAnnotation oneToMany = (OneToManyAnnotation) resourceField.getAnnotation(OneToManyAnnotation.ANNOTATION_NAME); assertNull(oneToManyMapping.getRelationship().getMappedByStrategy().getMappedByAttribute()); assertNull(oneToMany.getMappedBy()); @@ -690,7 +691,7 @@ public class JavaOneToManyMappingTests extends ContextModelTestCase addXmlClassRef(PACKAGE_NAME + ".Address"); addXmlClassRef(PACKAGE_NAME + ".State"); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToManyMapping oneToManyMapping = (OneToManyMapping) persistentAttribute.getMapping(); Iterator attributeNames = @@ -725,25 +726,26 @@ public class JavaOneToManyMappingTests extends ContextModelTestCase createTestEntityWithOneToManyMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute resourceAttribute = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME).persistableAttributes().next(); - OneToManyAnnotation annotation = (OneToManyAnnotation) resourceAttribute.getAnnotation(JPA.ONE_TO_MANY); - PersistentAttribute contextAttribute = getJavaPersistentType().attributes().next(); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + OneToManyAnnotation annotation = (OneToManyAnnotation) resourceField.getAnnotation(JPA.ONE_TO_MANY); + PersistentAttribute contextAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToManyMapping mapping = (OneToManyMapping) contextAttribute.getMapping(); OneToManyRelationship rel = mapping.getRelationship(); - assertNull(resourceAttribute.getAnnotation(JPA.JOIN_TABLE)); + assertNull(resourceField.getAnnotation(JPA.JOIN_TABLE)); assertNull(annotation.getMappedBy()); assertTrue(rel.strategyIsJoinTable()); assertFalse(rel.strategyIsMappedBy()); rel.setStrategyToMappedBy(); - assertNull(resourceAttribute.getAnnotation(JPA.JOIN_TABLE)); + assertNull(resourceField.getAnnotation(JPA.JOIN_TABLE)); assertNotNull(annotation.getMappedBy()); assertFalse(rel.strategyIsJoinTable()); assertTrue(rel.strategyIsMappedBy()); rel.setStrategyToJoinTable(); - assertNull(resourceAttribute.getAnnotation(JPA.JOIN_TABLE)); + assertNull(resourceField.getAnnotation(JPA.JOIN_TABLE)); assertNull(annotation.getMappedBy()); assertTrue(rel.strategyIsJoinTable()); assertFalse(rel.strategyIsMappedBy()); @@ -753,41 +755,42 @@ public class JavaOneToManyMappingTests extends ContextModelTestCase createTestEntityWithOneToManyMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute resourceAttribute = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME).persistableAttributes().next(); - OneToManyAnnotation annotation = (OneToManyAnnotation) resourceAttribute.getAnnotation(JPA.ONE_TO_MANY); - PersistentAttribute contextAttribute = getJavaPersistentType().attributes().next(); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + OneToManyAnnotation annotation = (OneToManyAnnotation) resourceField.getAnnotation(JPA.ONE_TO_MANY); + PersistentAttribute contextAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToManyMapping mapping = (OneToManyMapping) contextAttribute.getMapping(); OneToManyRelationship rel = mapping.getRelationship(); - assertNull(resourceAttribute.getAnnotation(JPA.JOIN_TABLE)); + assertNull(resourceField.getAnnotation(JPA.JOIN_TABLE)); assertNull(annotation.getMappedBy()); assertTrue(rel.strategyIsJoinTable()); assertFalse(rel.strategyIsMappedBy()); annotation.setMappedBy("foo"); getJpaProject().synchronizeContextModel(); - assertNull(resourceAttribute.getAnnotation(JPA.JOIN_TABLE)); + assertNull(resourceField.getAnnotation(JPA.JOIN_TABLE)); assertNotNull(annotation.getMappedBy()); assertFalse(rel.strategyIsJoinTable()); assertTrue(rel.strategyIsMappedBy()); - resourceAttribute.addAnnotation(JPA.JOIN_TABLE); + resourceField.addAnnotation(JPA.JOIN_TABLE); getJpaProject().synchronizeContextModel(); - assertNotNull(resourceAttribute.getAnnotation(JPA.JOIN_TABLE)); + assertNotNull(resourceField.getAnnotation(JPA.JOIN_TABLE)); assertNotNull(annotation.getMappedBy()); assertFalse(rel.strategyIsJoinTable()); assertTrue(rel.strategyIsMappedBy()); annotation.setMappedBy(null); getJpaProject().synchronizeContextModel(); - assertNotNull(resourceAttribute.getAnnotation(JPA.JOIN_TABLE)); + assertNotNull(resourceField.getAnnotation(JPA.JOIN_TABLE)); assertNull(annotation.getMappedBy()); assertTrue(rel.strategyIsJoinTable()); assertFalse(rel.strategyIsMappedBy()); - resourceAttribute.removeAnnotation(JPA.JOIN_TABLE); + resourceField.removeAnnotation(JPA.JOIN_TABLE); getJpaProject().synchronizeContextModel(); - assertNull(resourceAttribute.getAnnotation(JPA.JOIN_TABLE)); + assertNull(resourceField.getAnnotation(JPA.JOIN_TABLE)); assertNull(annotation.getMappedBy()); assertTrue(rel.strategyIsJoinTable()); assertFalse(rel.strategyIsMappedBy()); @@ -798,7 +801,7 @@ public class JavaOneToManyMappingTests extends ContextModelTestCase createTestTargetEntityAddress(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToManyMapping oneToManyMapping = (OneToManyMapping) persistentAttribute.getMapping(); //targetEntity not in the persistence unit, default still set, handled by validation @@ -812,7 +815,7 @@ public class JavaOneToManyMappingTests extends ContextModelTestCase oneToManyMapping.setSpecifiedTargetEntity("foo"); assertEquals(PACKAGE_NAME + ".Address", oneToManyMapping.getDefaultTargetEntity()); - ListIterator classRefs = getPersistenceUnit().specifiedClassRefs(); + ListIterator classRefs = getPersistenceUnit().getSpecifiedClassRefs().iterator(); classRefs.next(); ClassRef addressClassRef = classRefs.next(); JavaPersistentType addressPersistentType = addressClassRef.getJavaPersistentType(); @@ -828,7 +831,7 @@ public class JavaOneToManyMappingTests extends ContextModelTestCase addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); addXmlClassRef(PACKAGE_NAME + ".Address"); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToManyMapping oneToManyMapping = (OneToManyMapping) persistentAttribute.getMapping(); assertNull(oneToManyMapping.getDefaultTargetEntity()); @@ -840,7 +843,7 @@ public class JavaOneToManyMappingTests extends ContextModelTestCase addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); addXmlClassRef(PACKAGE_NAME + ".Address"); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToManyMapping oneToManyMapping = (OneToManyMapping) persistentAttribute.getMapping(); assertNull(oneToManyMapping.getDefaultTargetEntity()); @@ -851,7 +854,7 @@ public class JavaOneToManyMappingTests extends ContextModelTestCase createTestTargetEntityAddress(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToManyMapping oneToManyMapping = (OneToManyMapping) persistentAttribute.getMapping(); assertEquals(PACKAGE_NAME + ".Address", oneToManyMapping.getTargetEntity()); @@ -867,7 +870,7 @@ public class JavaOneToManyMappingTests extends ContextModelTestCase createTestEntityWithValidOneToManyMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToManyMapping oneToManyMapping = (OneToManyMapping) persistentAttribute.getMapping(); //targetEntity not in the persistence unit @@ -876,7 +879,7 @@ public class JavaOneToManyMappingTests extends ContextModelTestCase //add targetEntity to the persistence unit, now target entity should resolve createTestTargetEntityAddress(); addXmlClassRef(PACKAGE_NAME + ".Address"); - ListIterator classRefs = getPersistenceUnit().specifiedClassRefs(); + ListIterator classRefs = getPersistenceUnit().getSpecifiedClassRefs().iterator(); classRefs.next(); ClassRef addressClassRef = classRefs.next(); TypeMapping addressTypeMapping = addressClassRef.getJavaPersistentType().getMapping(); @@ -900,19 +903,19 @@ public class JavaOneToManyMappingTests extends ContextModelTestCase createTestEntityWithOneToManyMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToManyMapping oneToManyMapping = (OneToManyMapping) persistentAttribute.getMapping(); - 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(); assertNull(oneToManyMapping.getSpecifiedMapKey()); - assertNull(attributeResource.getAnnotation(MapKeyAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(MapKeyAnnotation.ANNOTATION_NAME)); //set mapKey in the resource model, verify context model does not change - attributeResource.addAnnotation(MapKeyAnnotation.ANNOTATION_NAME); + resourceField.addAnnotation(MapKeyAnnotation.ANNOTATION_NAME); assertNull(oneToManyMapping.getSpecifiedMapKey()); - MapKeyAnnotation mapKey = (MapKeyAnnotation) attributeResource.getAnnotation(MapKeyAnnotation.ANNOTATION_NAME); + MapKeyAnnotation mapKey = (MapKeyAnnotation) resourceField.getAnnotation(MapKeyAnnotation.ANNOTATION_NAME); assertNotNull(mapKey); //set mapKey name in the resource model, verify context model updated @@ -928,38 +931,38 @@ public class JavaOneToManyMappingTests extends ContextModelTestCase assertNull(mapKey.getName()); mapKey.setName("myMapKey"); - attributeResource.removeAnnotation(MapKeyAnnotation.ANNOTATION_NAME); + resourceField.removeAnnotation(MapKeyAnnotation.ANNOTATION_NAME); getJpaProject().synchronizeContextModel(); assertNull(oneToManyMapping.getSpecifiedMapKey()); - assertNull(attributeResource.getAnnotation(MapKeyAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(MapKeyAnnotation.ANNOTATION_NAME)); } public void testModifyMapKey() throws Exception { createTestEntityWithOneToManyMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToManyMapping oneToManyMapping = (OneToManyMapping) persistentAttribute.getMapping(); - 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(); assertNull(oneToManyMapping.getSpecifiedMapKey()); - assertNull(attributeResource.getAnnotation(MapKeyAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(MapKeyAnnotation.ANNOTATION_NAME)); //set mapKey in the context model, verify resource model updated oneToManyMapping.setSpecifiedMapKey("myMapKey"); - MapKeyAnnotation mapKeyAnnotation = (MapKeyAnnotation) attributeResource.getAnnotation(MapKeyAnnotation.ANNOTATION_NAME); + MapKeyAnnotation mapKeyAnnotation = (MapKeyAnnotation) resourceField.getAnnotation(MapKeyAnnotation.ANNOTATION_NAME); assertEquals("myMapKey", oneToManyMapping.getSpecifiedMapKey()); assertEquals("myMapKey", mapKeyAnnotation.getName()); //set mapKey to null in the context model oneToManyMapping.setSpecifiedMapKey(null); assertNull(oneToManyMapping.getSpecifiedMapKey()); - mapKeyAnnotation = (MapKeyAnnotation) attributeResource.getAnnotation(MapKeyAnnotation.ANNOTATION_NAME); + mapKeyAnnotation = (MapKeyAnnotation) resourceField.getAnnotation(MapKeyAnnotation.ANNOTATION_NAME); assertNull(mapKeyAnnotation.getName()); oneToManyMapping.setNoMapKey(true); - assertNull(attributeResource.getAnnotation(MapKeyAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(MapKeyAnnotation.ANNOTATION_NAME)); } public void testCandidateMapKeyNames() throws Exception { @@ -1009,142 +1012,142 @@ public class JavaOneToManyMappingTests extends ContextModelTestCase createTestEntityWithOneToManyMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToManyMapping oneToManyMapping = (OneToManyMapping) persistentAttribute.getMapping(); - 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(); assertNull(oneToManyMapping.getOrderable().getSpecifiedOrderBy()); - assertNull(attributeResource.getAnnotation(OrderByAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(OrderByAnnotation.ANNOTATION_NAME)); //set orderBy in the resource model, verify context model updated - attributeResource.addAnnotation(OrderByAnnotation.ANNOTATION_NAME); - OrderByAnnotation orderBy = (OrderByAnnotation) attributeResource.getAnnotation(OrderByAnnotation.ANNOTATION_NAME); + resourceField.addAnnotation(OrderByAnnotation.ANNOTATION_NAME); + OrderByAnnotation orderBy = (OrderByAnnotation) resourceField.getAnnotation(OrderByAnnotation.ANNOTATION_NAME); orderBy.setValue("newOrderBy"); getJpaProject().synchronizeContextModel(); assertEquals("newOrderBy", oneToManyMapping.getOrderable().getSpecifiedOrderBy()); assertEquals("newOrderBy", orderBy.getValue()); //set orderBy to null in the resource model - attributeResource.removeAnnotation(OrderByAnnotation.ANNOTATION_NAME); + resourceField.removeAnnotation(OrderByAnnotation.ANNOTATION_NAME); getJpaProject().synchronizeContextModel(); assertNull(oneToManyMapping.getOrderable().getSpecifiedOrderBy()); - assertNull(attributeResource.getAnnotation(OrderByAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(OrderByAnnotation.ANNOTATION_NAME)); } public void testModifyOrderBy() throws Exception { createTestEntityWithOneToManyMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToManyMapping oneToManyMapping = (OneToManyMapping) persistentAttribute.getMapping(); - 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(); assertNull(oneToManyMapping.getOrderable().getSpecifiedOrderBy()); - assertNull(attributeResource.getAnnotation(OrderByAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(OrderByAnnotation.ANNOTATION_NAME)); //set mappedBy in the context model, verify resource model updated oneToManyMapping.getOrderable().setSpecifiedOrderBy("newOrderBy"); assertEquals("newOrderBy", oneToManyMapping.getOrderable().getSpecifiedOrderBy()); - OrderByAnnotation orderBy = (OrderByAnnotation) attributeResource.getAnnotation(OrderByAnnotation.ANNOTATION_NAME); + OrderByAnnotation orderBy = (OrderByAnnotation) resourceField.getAnnotation(OrderByAnnotation.ANNOTATION_NAME); assertEquals("newOrderBy", orderBy.getValue()); //set mappedBy to null in the context model oneToManyMapping.getOrderable().setSpecifiedOrderBy(null); assertNull(oneToManyMapping.getOrderable().getSpecifiedOrderBy()); - assertNull(attributeResource.getAnnotation(OrderByAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(OrderByAnnotation.ANNOTATION_NAME)); } public void testUpdateNoOrdering() throws Exception { createTestEntityWithOneToManyMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToManyMapping oneToManyMapping = (OneToManyMapping) persistentAttribute.getMapping(); - 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(); assertTrue(oneToManyMapping.getOrderable().isNoOrdering()); - assertNull(attributeResource.getAnnotation(OrderByAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(OrderByAnnotation.ANNOTATION_NAME)); //set orderBy in the resource model, verify context model updated - attributeResource.addAnnotation(OrderByAnnotation.ANNOTATION_NAME); + resourceField.addAnnotation(OrderByAnnotation.ANNOTATION_NAME); getJpaProject().synchronizeContextModel(); assertFalse(oneToManyMapping.getOrderable().isNoOrdering()); - OrderByAnnotation orderBy = (OrderByAnnotation) attributeResource.getAnnotation(OrderByAnnotation.ANNOTATION_NAME); + OrderByAnnotation orderBy = (OrderByAnnotation) resourceField.getAnnotation(OrderByAnnotation.ANNOTATION_NAME); orderBy.setValue("newOrderBy"); getJpaProject().synchronizeContextModel(); assertFalse(oneToManyMapping.getOrderable().isNoOrdering()); //set orderBy to null in the resource model - attributeResource.removeAnnotation(OrderByAnnotation.ANNOTATION_NAME); + resourceField.removeAnnotation(OrderByAnnotation.ANNOTATION_NAME); getJpaProject().synchronizeContextModel(); assertTrue(oneToManyMapping.getOrderable().isNoOrdering()); - assertNull(attributeResource.getAnnotation(OrderByAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(OrderByAnnotation.ANNOTATION_NAME)); } public void testUpdatePkOrdering() throws Exception { createTestEntityWithOneToManyMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToManyMapping oneToManyMapping = (OneToManyMapping) persistentAttribute.getMapping(); - 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(); assertFalse(oneToManyMapping.getOrderable().isPkOrdering()); - assertNull(attributeResource.getAnnotation(OrderByAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(OrderByAnnotation.ANNOTATION_NAME)); //set orderBy in the resource model, verify context model updated - attributeResource.addAnnotation(OrderByAnnotation.ANNOTATION_NAME); + resourceField.addAnnotation(OrderByAnnotation.ANNOTATION_NAME); getJpaProject().synchronizeContextModel(); assertTrue(oneToManyMapping.getOrderable().isPkOrdering()); - OrderByAnnotation orderBy = (OrderByAnnotation) attributeResource.getAnnotation(OrderByAnnotation.ANNOTATION_NAME); + OrderByAnnotation orderBy = (OrderByAnnotation) resourceField.getAnnotation(OrderByAnnotation.ANNOTATION_NAME); orderBy.setValue("newOrderBy"); getJpaProject().synchronizeContextModel(); assertFalse(oneToManyMapping.getOrderable().isPkOrdering()); //set orderBy to null in the resource model - attributeResource.removeAnnotation(OrderByAnnotation.ANNOTATION_NAME); + resourceField.removeAnnotation(OrderByAnnotation.ANNOTATION_NAME); getJpaProject().synchronizeContextModel(); assertFalse(oneToManyMapping.getOrderable().isPkOrdering()); - assertNull(attributeResource.getAnnotation(OrderByAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(OrderByAnnotation.ANNOTATION_NAME)); } public void testUpdateCustomOrdering() throws Exception { createTestEntityWithOneToManyMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToManyMapping oneToManyMapping = (OneToManyMapping) persistentAttribute.getMapping(); - 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(); assertFalse(oneToManyMapping.getOrderable().isCustomOrdering()); - assertNull(attributeResource.getAnnotation(OrderByAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(OrderByAnnotation.ANNOTATION_NAME)); //set orderBy in the resource model, verify context model updated - attributeResource.addAnnotation(OrderByAnnotation.ANNOTATION_NAME); + resourceField.addAnnotation(OrderByAnnotation.ANNOTATION_NAME); assertFalse(oneToManyMapping.getOrderable().isCustomOrdering()); - OrderByAnnotation orderBy = (OrderByAnnotation) attributeResource.getAnnotation(OrderByAnnotation.ANNOTATION_NAME); + OrderByAnnotation orderBy = (OrderByAnnotation) resourceField.getAnnotation(OrderByAnnotation.ANNOTATION_NAME); orderBy.setValue("newOrderBy"); getJpaProject().synchronizeContextModel(); assertTrue(oneToManyMapping.getOrderable().isCustomOrdering()); //set orderBy to null in the resource model - attributeResource.removeAnnotation(OrderByAnnotation.ANNOTATION_NAME); + resourceField.removeAnnotation(OrderByAnnotation.ANNOTATION_NAME); getJpaProject().synchronizeContextModel(); assertFalse(oneToManyMapping.getOrderable().isCustomOrdering()); - assertNull(attributeResource.getAnnotation(OrderByAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(OrderByAnnotation.ANNOTATION_NAME)); } public void testDefaultTargetEntityForMap() throws Exception { 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 specifiedJoinColumns = joinColumns.specifiedJoinColumns(); + ListIterator 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 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 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 joinColumnResources = attributeResource.annotations(JoinColumnAnnotation.ANNOTATION_NAME, JoinColumnsAnnotation.ANNOTATION_NAME); + Iterator joinColumnResources = resourceField.getAnnotations(JPA.JOIN_COLUMN).iterator(); assertEquals("FOO", ((JoinColumnAnnotation) joinColumnResources.next()).getName()); assertEquals("BAZ", ((JoinColumnAnnotation) joinColumnResources.next()).getName()); assertFalse(joinColumnResources.hasNext()); - Iterator joinColumnsIterator = joinColumns.specifiedJoinColumns(); + Iterator 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 javaJoinColumns = attributeResource.annotations(JoinColumnAnnotation.ANNOTATION_NAME, JoinColumnsAnnotation.ANNOTATION_NAME); + Iterator javaJoinColumns = resourceField.getAnnotations(JPA.JOIN_COLUMN).iterator(); assertEquals(3, CollectionTools.size(javaJoinColumns)); joinColumns.moveSpecifiedJoinColumn(2, 0); - ListIterator primaryKeyJoinColumns = joinColumns.specifiedJoinColumns(); + ListIterator 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 joinColumnsIterator = joinColumns.specifiedJoinColumns(); + ListIterator 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 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 classRefs = getPersistenceUnit().specifiedClassRefs(); + ListIterator 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 classRefs = getPersistenceUnit().specifiedClassRefs(); + ListIterator 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 primaryKeyJoinColumns = CollectionTools.iterable(strategy.primaryKeyJoinColumns()).iterator(); + Iterator 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) 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) 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) 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) 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) 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) 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) 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 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 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 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 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 joinColumnResources = attributeResource.annotations(PrimaryKeyJoinColumnAnnotation.ANNOTATION_NAME, PrimaryKeyJoinColumnsAnnotation.ANNOTATION_NAME); + Iterator 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 joinColumns = (Iterator) strategy.primaryKeyJoinColumns(); + Iterator 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) 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) 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 javaJoinColumns = attributeResource.annotations(PrimaryKeyJoinColumnAnnotation.ANNOTATION_NAME, PrimaryKeyJoinColumnsAnnotation.ANNOTATION_NAME); + Iterator javaJoinColumns = resourceField.getAnnotations(JPA.PRIMARY_KEY_JOIN_COLUMN).iterator(); assertEquals(3, CollectionTools.size(javaJoinColumns)); strategy.movePrimaryKeyJoinColumn(2, 0); - ListIterator primaryKeyJoinColumns = (ListIterator) strategy.primaryKeyJoinColumns(); + ListIterator 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) 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 joinColumns = (ListIterator) strategy.primaryKeyJoinColumns(); + ListIterator 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) 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) 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) 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) 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) 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()); diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaPrimaryKeyJoinColumnTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaPrimaryKeyJoinColumnTests.java index 5e5c92c786..ff0501b14d 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaPrimaryKeyJoinColumnTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaPrimaryKeyJoinColumnTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2010 Oracle. All rights reserved. + * Copyright (c) 2007, 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. @@ -11,13 +11,14 @@ package org.eclipse.jpt.jpa.core.tests.internal.context.java; import java.util.Iterator; import org.eclipse.jdt.core.ICompilationUnit; +import org.eclipse.jpt.common.core.resource.java.JavaResourceType; +import org.eclipse.jpt.common.core.resource.java.JavaResourceAnnotatedElement.Kind; import org.eclipse.jpt.common.utility.internal.ReflectionTools; import org.eclipse.jpt.common.utility.internal.iterators.ArrayIterator; import org.eclipse.jpt.jpa.core.MappingKeys; import org.eclipse.jpt.jpa.core.context.PersistentAttribute; import org.eclipse.jpt.jpa.core.context.PrimaryKeyJoinColumn; 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.PrimaryKeyJoinColumnAnnotation; import org.eclipse.jpt.jpa.core.tests.internal.context.ContextModelTestCase; @@ -73,16 +74,16 @@ public class JavaPrimaryKeyJoinColumnTests extends ContextModelTestCase createTestEntityWithPrimaryKeyJoinColumn(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PrimaryKeyJoinColumn specifiedPkJoinColumn = getJavaEntity().specifiedPrimaryKeyJoinColumns().next(); + PrimaryKeyJoinColumn specifiedPkJoinColumn = getJavaEntity().getSpecifiedPrimaryKeyJoinColumns().iterator().next(); assertEquals(PRIMARY_KEY_JOIN_COLUMN_NAME, specifiedPkJoinColumn.getSpecifiedName()); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - PrimaryKeyJoinColumnAnnotation pkJoinColumnResource = (PrimaryKeyJoinColumnAnnotation) typeResource.getAnnotation(JPA.PRIMARY_KEY_JOIN_COLUMN); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + PrimaryKeyJoinColumnAnnotation pkJoinColumnResource = (PrimaryKeyJoinColumnAnnotation) resourceType.getAnnotation(0, JPA.PRIMARY_KEY_JOIN_COLUMN); pkJoinColumnResource.setName("FOO"); getJpaProject().synchronizeContextModel(); - specifiedPkJoinColumn = getJavaEntity().specifiedPrimaryKeyJoinColumns().next(); + specifiedPkJoinColumn = getJavaEntity().getSpecifiedPrimaryKeyJoinColumns().iterator().next(); assertEquals("FOO", specifiedPkJoinColumn.getName()); } @@ -100,7 +101,7 @@ public class JavaPrimaryKeyJoinColumnTests extends ContextModelTestCase assertNull(getJavaEntity().getDefaultPrimaryKeyJoinColumn()); - PrimaryKeyJoinColumn specifiedPkJoinColumn = getJavaEntity().specifiedPrimaryKeyJoinColumns().next(); + PrimaryKeyJoinColumn specifiedPkJoinColumn = getJavaEntity().getSpecifiedPrimaryKeyJoinColumns().iterator().next(); assertEquals("id", specifiedPkJoinColumn.getDefaultName()); //remove @Id annotation @@ -114,7 +115,7 @@ public class JavaPrimaryKeyJoinColumnTests extends ContextModelTestCase createTestEntityWithPrimaryKeyJoinColumn(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PrimaryKeyJoinColumn specifiedPkJoinColumn = getJavaEntity().specifiedPrimaryKeyJoinColumns().next(); + PrimaryKeyJoinColumn specifiedPkJoinColumn = getJavaEntity().getSpecifiedPrimaryKeyJoinColumns().iterator().next(); assertEquals(PRIMARY_KEY_JOIN_COLUMN_NAME, specifiedPkJoinColumn.getName()); } @@ -122,19 +123,19 @@ public class JavaPrimaryKeyJoinColumnTests extends ContextModelTestCase createTestEntityWithPrimaryKeyJoinColumn(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PrimaryKeyJoinColumn specifiedPkJoinColumn = getJavaEntity().specifiedPrimaryKeyJoinColumns().next(); + PrimaryKeyJoinColumn specifiedPkJoinColumn = getJavaEntity().getSpecifiedPrimaryKeyJoinColumns().iterator().next(); specifiedPkJoinColumn.setSpecifiedName("foo"); assertEquals("foo", specifiedPkJoinColumn.getSpecifiedName()); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - PrimaryKeyJoinColumnAnnotation columnAnnotation = (PrimaryKeyJoinColumnAnnotation) typeResource.getAnnotation(JPA.PRIMARY_KEY_JOIN_COLUMN); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + PrimaryKeyJoinColumnAnnotation columnAnnotation = (PrimaryKeyJoinColumnAnnotation) resourceType.getAnnotation(0, JPA.PRIMARY_KEY_JOIN_COLUMN); assertEquals("foo", columnAnnotation.getName()); specifiedPkJoinColumn.setSpecifiedName(null); assertNull(specifiedPkJoinColumn.getSpecifiedName()); - columnAnnotation = (PrimaryKeyJoinColumnAnnotation) typeResource.getAnnotation(JPA.PRIMARY_KEY_JOIN_COLUMN); + columnAnnotation = (PrimaryKeyJoinColumnAnnotation) resourceType.getAnnotation(0, JPA.PRIMARY_KEY_JOIN_COLUMN); assertNull(columnAnnotation.getName()); } @@ -142,11 +143,11 @@ public class JavaPrimaryKeyJoinColumnTests extends ContextModelTestCase createTestEntityWithPrimaryKeyJoinColumn(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PrimaryKeyJoinColumn specifiedPkJoinColumn = getJavaEntity().specifiedPrimaryKeyJoinColumns().next(); + PrimaryKeyJoinColumn specifiedPkJoinColumn = getJavaEntity().getSpecifiedPrimaryKeyJoinColumns().iterator().next(); assertNull(specifiedPkJoinColumn.getColumnDefinition()); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - PrimaryKeyJoinColumnAnnotation column = (PrimaryKeyJoinColumnAnnotation) typeResource.getAnnotation(JPA.PRIMARY_KEY_JOIN_COLUMN); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + PrimaryKeyJoinColumnAnnotation column = (PrimaryKeyJoinColumnAnnotation) resourceType.getAnnotation(0, JPA.PRIMARY_KEY_JOIN_COLUMN); column.setColumnDefinition(COLUMN_DEFINITION); getJpaProject().synchronizeContextModel(); @@ -157,26 +158,26 @@ public class JavaPrimaryKeyJoinColumnTests extends ContextModelTestCase assertNull(specifiedPkJoinColumn.getColumnDefinition()); - typeResource.removeAnnotation(JPA.PRIMARY_KEY_JOIN_COLUMN); + resourceType.removeAnnotation(0, JPA.PRIMARY_KEY_JOIN_COLUMN); getJpaProject().synchronizeContextModel(); - assertEquals(0, getJavaEntity().specifiedPrimaryKeyJoinColumnsSize()); + assertEquals(0, getJavaEntity().getSpecifiedPrimaryKeyJoinColumnsSize()); } public void testSetColumnDefinition() throws Exception { createTestEntityWithPrimaryKeyJoinColumn(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PrimaryKeyJoinColumn specifiedPkJoinColumn = getJavaEntity().specifiedPrimaryKeyJoinColumns().next(); + PrimaryKeyJoinColumn specifiedPkJoinColumn = getJavaEntity().getSpecifiedPrimaryKeyJoinColumns().iterator().next(); specifiedPkJoinColumn.setColumnDefinition("foo"); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - PrimaryKeyJoinColumnAnnotation column = (PrimaryKeyJoinColumnAnnotation) typeResource.getAnnotation(JPA.PRIMARY_KEY_JOIN_COLUMN); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + PrimaryKeyJoinColumnAnnotation column = (PrimaryKeyJoinColumnAnnotation) resourceType.getAnnotation(0, JPA.PRIMARY_KEY_JOIN_COLUMN); assertEquals("foo", column.getColumnDefinition()); specifiedPkJoinColumn.setColumnDefinition(null); - column = (PrimaryKeyJoinColumnAnnotation) typeResource.getAnnotation(JPA.PRIMARY_KEY_JOIN_COLUMN); + column = (PrimaryKeyJoinColumnAnnotation) resourceType.getAnnotation(0, JPA.PRIMARY_KEY_JOIN_COLUMN); assertNull(column.getColumnDefinition()); } @@ -184,15 +185,15 @@ public class JavaPrimaryKeyJoinColumnTests extends ContextModelTestCase createTestEntityWithPrimaryKeyJoinColumn(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PrimaryKeyJoinColumn specifiedPkJoinColumn = getJavaEntity().specifiedPrimaryKeyJoinColumns().next(); + PrimaryKeyJoinColumn specifiedPkJoinColumn = getJavaEntity().getSpecifiedPrimaryKeyJoinColumns().iterator().next(); assertNull(specifiedPkJoinColumn.getSpecifiedReferencedColumnName()); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - PrimaryKeyJoinColumnAnnotation pkJoinColumnResource = (PrimaryKeyJoinColumnAnnotation) typeResource.getAnnotation(JPA.PRIMARY_KEY_JOIN_COLUMN); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + PrimaryKeyJoinColumnAnnotation pkJoinColumnResource = (PrimaryKeyJoinColumnAnnotation) resourceType.getAnnotation(0, JPA.PRIMARY_KEY_JOIN_COLUMN); pkJoinColumnResource.setReferencedColumnName("FOO"); getJpaProject().synchronizeContextModel(); - specifiedPkJoinColumn = getJavaEntity().specifiedPrimaryKeyJoinColumns().next(); + specifiedPkJoinColumn = getJavaEntity().getSpecifiedPrimaryKeyJoinColumns().iterator().next(); assertEquals("FOO", specifiedPkJoinColumn.getSpecifiedReferencedColumnName()); } @@ -210,7 +211,7 @@ public class JavaPrimaryKeyJoinColumnTests extends ContextModelTestCase assertNull(getJavaEntity().getDefaultPrimaryKeyJoinColumn()); - PrimaryKeyJoinColumn specifiedPkJoinColumn = getJavaEntity().specifiedPrimaryKeyJoinColumns().next(); + PrimaryKeyJoinColumn specifiedPkJoinColumn = getJavaEntity().getSpecifiedPrimaryKeyJoinColumns().iterator().next(); assertEquals("id", specifiedPkJoinColumn.getDefaultReferencedColumnName()); @@ -225,13 +226,13 @@ public class JavaPrimaryKeyJoinColumnTests extends ContextModelTestCase createTestEntityWithPrimaryKeyJoinColumn(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - PrimaryKeyJoinColumnAnnotation pkJoinColumnResource = (PrimaryKeyJoinColumnAnnotation) typeResource.getAnnotation(JPA.PRIMARY_KEY_JOIN_COLUMN); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + PrimaryKeyJoinColumnAnnotation pkJoinColumnResource = (PrimaryKeyJoinColumnAnnotation) resourceType.getAnnotation(0, JPA.PRIMARY_KEY_JOIN_COLUMN); pkJoinColumnResource.setReferencedColumnName("FOO"); getJpaProject().synchronizeContextModel(); - PrimaryKeyJoinColumn specifiedPkJoinColumn = getJavaEntity().specifiedPrimaryKeyJoinColumns().next(); + PrimaryKeyJoinColumn specifiedPkJoinColumn = getJavaEntity().getSpecifiedPrimaryKeyJoinColumns().iterator().next(); assertEquals("FOO", specifiedPkJoinColumn.getReferencedColumnName()); } @@ -239,20 +240,20 @@ public class JavaPrimaryKeyJoinColumnTests extends ContextModelTestCase createTestEntityWithPrimaryKeyJoinColumn(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PrimaryKeyJoinColumn specifiedPkJoinColumn = getJavaEntity().specifiedPrimaryKeyJoinColumns().next(); + PrimaryKeyJoinColumn specifiedPkJoinColumn = getJavaEntity().getSpecifiedPrimaryKeyJoinColumns().iterator().next(); specifiedPkJoinColumn.setSpecifiedReferencedColumnName("foo"); assertEquals("foo", specifiedPkJoinColumn.getSpecifiedReferencedColumnName()); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - PrimaryKeyJoinColumnAnnotation columnAnnotation = (PrimaryKeyJoinColumnAnnotation) typeResource.getAnnotation(JPA.PRIMARY_KEY_JOIN_COLUMN); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + PrimaryKeyJoinColumnAnnotation columnAnnotation = (PrimaryKeyJoinColumnAnnotation) resourceType.getAnnotation(0, JPA.PRIMARY_KEY_JOIN_COLUMN); assertEquals("foo", columnAnnotation.getReferencedColumnName()); specifiedPkJoinColumn.setSpecifiedName(null); specifiedPkJoinColumn.setSpecifiedReferencedColumnName(null); assertNull(specifiedPkJoinColumn.getSpecifiedReferencedColumnName()); - columnAnnotation = (PrimaryKeyJoinColumnAnnotation) typeResource.getAnnotation(JPA.PRIMARY_KEY_JOIN_COLUMN); + columnAnnotation = (PrimaryKeyJoinColumnAnnotation) resourceType.getAnnotation(0, JPA.PRIMARY_KEY_JOIN_COLUMN); assertNull(columnAnnotation.getReferencedColumnName()); } @@ -260,7 +261,7 @@ public class JavaPrimaryKeyJoinColumnTests extends ContextModelTestCase createTestEntityWithPrimaryKeyJoinColumn(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PrimaryKeyJoinColumn specifiedPkJoinColumn = getJavaEntity().specifiedPrimaryKeyJoinColumns().next(); + PrimaryKeyJoinColumn specifiedPkJoinColumn = getJavaEntity().getSpecifiedPrimaryKeyJoinColumns().iterator().next(); assertFalse(specifiedPkJoinColumn.isDefault()); assertNull(getJavaEntity().getDefaultPrimaryKeyJoinColumn()); @@ -272,7 +273,7 @@ public class JavaPrimaryKeyJoinColumnTests extends ContextModelTestCase createTestEntityWithPrimaryKeyJoinColumn(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PrimaryKeyJoinColumn specifiedPkJoinColumn = getJavaEntity().specifiedPrimaryKeyJoinColumns().next(); + PrimaryKeyJoinColumn specifiedPkJoinColumn = getJavaEntity().getSpecifiedPrimaryKeyJoinColumns().iterator().next(); assertFalse(((Boolean) ReflectionTools.executeMethod(specifiedPkJoinColumn, "referencedColumnIsResolved")).booleanValue()); } @@ -280,7 +281,7 @@ public class JavaPrimaryKeyJoinColumnTests extends ContextModelTestCase createTestEntityWithPrimaryKeyJoinColumn(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PrimaryKeyJoinColumn specifiedPkJoinColumn = getJavaEntity().specifiedPrimaryKeyJoinColumns().next(); + PrimaryKeyJoinColumn specifiedPkJoinColumn = getJavaEntity().getSpecifiedPrimaryKeyJoinColumns().iterator().next(); assertFalse(specifiedPkJoinColumn.isResolved()); } @@ -288,7 +289,7 @@ public class JavaPrimaryKeyJoinColumnTests extends ContextModelTestCase createTestEntityWithPrimaryKeyJoinColumn(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PrimaryKeyJoinColumn specifiedPkJoinColumn = getJavaEntity().specifiedPrimaryKeyJoinColumns().next(); + PrimaryKeyJoinColumn specifiedPkJoinColumn = getJavaEntity().getSpecifiedPrimaryKeyJoinColumns().iterator().next(); assertFalse(((Boolean) ReflectionTools.executeMethod(specifiedPkJoinColumn, "referencedColumnIsResolved")).booleanValue()); } @@ -296,7 +297,7 @@ public class JavaPrimaryKeyJoinColumnTests extends ContextModelTestCase createTestEntityWithPrimaryKeyJoinColumn(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PrimaryKeyJoinColumn specifiedPkJoinColumn = getJavaEntity().specifiedPrimaryKeyJoinColumns().next(); + PrimaryKeyJoinColumn specifiedPkJoinColumn = getJavaEntity().getSpecifiedPrimaryKeyJoinColumns().iterator().next(); assertNull(specifiedPkJoinColumn.getDbTable()); } diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaQueryHintTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaQueryHintTests.java index 5ceb93e903..541ba70e81 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaQueryHintTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaQueryHintTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2010 Oracle. All rights reserved. + * Copyright (c) 2007, 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. @@ -11,11 +11,12 @@ package org.eclipse.jpt.jpa.core.tests.internal.context.java; import java.util.Iterator; import org.eclipse.jdt.core.ICompilationUnit; +import org.eclipse.jpt.common.core.resource.java.JavaResourceType; +import org.eclipse.jpt.common.core.resource.java.JavaResourceAnnotatedElement.Kind; import org.eclipse.jpt.common.utility.internal.iterators.ArrayIterator; import org.eclipse.jpt.jpa.core.context.Entity; import org.eclipse.jpt.jpa.core.context.QueryHint; 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.NamedQueryAnnotation; import org.eclipse.jpt.jpa.core.resource.java.QueryHintAnnotation; import org.eclipse.jpt.jpa.core.tests.internal.context.ContextModelTestCase; @@ -50,10 +51,11 @@ public class JavaQueryHintTests extends ContextModelTestCase addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); Entity entity = getJavaEntity(); - QueryHint queryHint = entity.getQueryContainer().namedQueries().next().getHints().iterator().next(); + QueryHint queryHint = entity.getQueryContainer().getNamedQueries().iterator().next().getHints().iterator().next(); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - QueryHintAnnotation queryHintAnnotation = ((NamedQueryAnnotation) typeResource.getAnnotation(NamedQueryAnnotation.ANNOTATION_NAME)).hints().next(); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + NamedQueryAnnotation queryAnnotation = ((NamedQueryAnnotation) resourceType.getAnnotation(0, NamedQueryAnnotation.ANNOTATION_NAME)); + QueryHintAnnotation queryHintAnnotation = queryAnnotation.getHints().iterator().next(); assertNull(queryHintAnnotation.getName()); assertNull(queryHint.getName()); @@ -75,22 +77,23 @@ public class JavaQueryHintTests extends ContextModelTestCase addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); Entity entity = getJavaEntity(); - QueryHint queryHint = entity.getQueryContainer().namedQueries().next().getHints().iterator().next(); + QueryHint queryHint = entity.getQueryContainer().getNamedQueries().iterator().next().getHints().iterator().next(); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - QueryHintAnnotation javaQueryhint = ((NamedQueryAnnotation) typeResource.getAnnotation(NamedQueryAnnotation.ANNOTATION_NAME)).hints().next(); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + NamedQueryAnnotation queryAnnotation = ((NamedQueryAnnotation) resourceType.getAnnotation(0, NamedQueryAnnotation.ANNOTATION_NAME)); + QueryHintAnnotation queryHintAnnotation = queryAnnotation.getHints().iterator().next(); - assertNull(javaQueryhint.getName()); + assertNull(queryHintAnnotation.getName()); assertNull(queryHint.getName()); //set name in the context model, verify resource model updated queryHint.setName("foo"); - assertEquals("foo", javaQueryhint.getName()); + assertEquals("foo", queryHintAnnotation.getName()); assertEquals("foo", queryHint.getName()); //set name to null in the context model queryHint.setName(null); - assertNull(javaQueryhint.getName()); + assertNull(queryHintAnnotation.getName()); assertNull(queryHint.getName()); } @@ -99,10 +102,11 @@ public class JavaQueryHintTests extends ContextModelTestCase addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); Entity entity = getJavaEntity(); - QueryHint queryHint = entity.getQueryContainer().namedQueries().next().getHints().iterator().next(); + QueryHint queryHint = entity.getQueryContainer().getNamedQueries().iterator().next().getHints().iterator().next(); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - QueryHintAnnotation queryHintAnnotation = ((NamedQueryAnnotation) typeResource.getAnnotation(NamedQueryAnnotation.ANNOTATION_NAME)).hints().next(); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + NamedQueryAnnotation queryAnnotation = ((NamedQueryAnnotation) resourceType.getAnnotation(0, NamedQueryAnnotation.ANNOTATION_NAME)); + QueryHintAnnotation queryHintAnnotation = queryAnnotation.getHints().iterator().next(); assertNull(queryHintAnnotation.getValue()); assertNull(queryHint.getValue()); @@ -124,22 +128,23 @@ public class JavaQueryHintTests extends ContextModelTestCase addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); Entity entity = getJavaEntity(); - QueryHint queryHint = entity.getQueryContainer().namedQueries().next().getHints().iterator().next(); + QueryHint queryHint = entity.getQueryContainer().getNamedQueries().iterator().next().getHints().iterator().next(); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - QueryHintAnnotation javaQueryhint = ((NamedQueryAnnotation) typeResource.getAnnotation(NamedQueryAnnotation.ANNOTATION_NAME)).hints().next(); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + NamedQueryAnnotation queryAnnotation = ((NamedQueryAnnotation) resourceType.getAnnotation(0, NamedQueryAnnotation.ANNOTATION_NAME)); + QueryHintAnnotation queryHintAnnotation = queryAnnotation.getHints().iterator().next(); - assertNull(javaQueryhint.getValue()); + assertNull(queryHintAnnotation.getValue()); assertNull(queryHint.getValue()); //set name in the context model, verify resource model updated queryHint.setValue("foo"); - assertEquals("foo", javaQueryhint.getValue()); + assertEquals("foo", queryHintAnnotation.getValue()); assertEquals("foo", queryHint.getValue()); //set name to null in the context model queryHint.setValue(null); - assertNull(javaQueryhint.getValue()); + assertNull(queryHintAnnotation.getValue()); assertNull(queryHint.getValue()); } } diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaSecondaryTableTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaSecondaryTableTests.java index 530c3c99a7..93238c717c 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaSecondaryTableTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaSecondaryTableTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2010 Oracle. All rights reserved. + * Copyright (c) 2007, 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,6 +12,9 @@ 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.JavaResourceType; +import org.eclipse.jpt.common.core.resource.java.NestableAnnotation; import org.eclipse.jpt.common.utility.internal.iterators.ArrayIterator; import org.eclipse.jpt.jpa.core.MappingKeys; import org.eclipse.jpt.jpa.core.context.IdMapping; @@ -22,8 +25,6 @@ import org.eclipse.jpt.jpa.core.context.java.JavaPrimaryKeyJoinColumn; import org.eclipse.jpt.jpa.core.context.java.JavaSecondaryTable; import org.eclipse.jpt.jpa.core.context.java.JavaUniqueConstraint; 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.core.resource.java.PrimaryKeyJoinColumnAnnotation; import org.eclipse.jpt.jpa.core.resource.java.SecondaryTableAnnotation; import org.eclipse.jpt.jpa.core.resource.java.UniqueConstraintAnnotation; @@ -77,7 +78,7 @@ public class JavaSecondaryTableTests extends ContextModelTestCase createTestEntityWithSecondaryTable(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - SecondaryTable secondaryTable = getJavaEntity().secondaryTables().next(); + SecondaryTable secondaryTable = getJavaEntity().getSecondaryTables().iterator().next(); assertEquals(TABLE_NAME, secondaryTable.getSpecifiedName()); } @@ -85,7 +86,7 @@ public class JavaSecondaryTableTests extends ContextModelTestCase createTestEntityWithSecondaryTable(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - SecondaryTable secondaryTable = getJavaEntity().secondaryTables().next(); + SecondaryTable secondaryTable = getJavaEntity().getSecondaryTables().iterator().next(); assertNull(secondaryTable.getDefaultName()); } @@ -93,7 +94,7 @@ public class JavaSecondaryTableTests extends ContextModelTestCase createTestEntityWithSecondaryTable(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - SecondaryTable secondaryTable = getJavaEntity().secondaryTables().next(); + SecondaryTable secondaryTable = getJavaEntity().getSecondaryTables().iterator().next(); assertEquals(TABLE_NAME, secondaryTable.getName()); } @@ -101,13 +102,13 @@ public class JavaSecondaryTableTests extends ContextModelTestCase createTestEntityWithSecondaryTable(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - SecondaryTable secondaryTable = getJavaEntity().secondaryTables().next(); + SecondaryTable secondaryTable = getJavaEntity().getSecondaryTables().iterator().next(); secondaryTable.setSpecifiedName("foo"); - assertEquals("foo", getJavaEntity().secondaryTables().next().getSpecifiedName()); + assertEquals("foo", getJavaEntity().getSecondaryTables().iterator().next().getSpecifiedName()); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - SecondaryTableAnnotation table = (SecondaryTableAnnotation) typeResource.getAnnotation(JPA.SECONDARY_TABLE); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + SecondaryTableAnnotation table = (SecondaryTableAnnotation) resourceType.getAnnotation(0, JPA.SECONDARY_TABLE); assertEquals("foo", table.getName()); } @@ -116,25 +117,25 @@ public class JavaSecondaryTableTests extends ContextModelTestCase createTestEntityWithSecondaryTable(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - SecondaryTableAnnotation table = (SecondaryTableAnnotation) typeResource.getAnnotation(JPA.SECONDARY_TABLE); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + SecondaryTableAnnotation table = (SecondaryTableAnnotation) resourceType.getAnnotation(0, JPA.SECONDARY_TABLE); table.setName("foo"); getJpaProject().synchronizeContextModel(); - assertEquals("foo", getJavaEntity().secondaryTables().next().getSpecifiedName()); + assertEquals("foo", getJavaEntity().getSecondaryTables().iterator().next().getSpecifiedName()); } public void testUpdateFromSpecifiedCatalogChangeInResourceModel() throws Exception { createTestEntityWithSecondaryTables(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - Iterator secondaryTableResources = typeResource.annotations(JPA.SECONDARY_TABLE, JPA.SECONDARY_TABLES); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + Iterator secondaryTableResources = resourceType.getAnnotations(JPA.SECONDARY_TABLE).iterator(); ((SecondaryTableAnnotation) secondaryTableResources.next()).setCatalog("foo"); ((SecondaryTableAnnotation) secondaryTableResources.next()).setCatalog("bar"); getJpaProject().synchronizeContextModel(); - ListIterator secondaryTsbles = getJavaEntity().secondaryTables(); + ListIterator secondaryTsbles = getJavaEntity().getSecondaryTables().iterator(); assertEquals("foo", secondaryTsbles.next().getSpecifiedCatalog()); assertEquals("bar", secondaryTsbles.next().getSpecifiedCatalog()); } @@ -143,13 +144,13 @@ public class JavaSecondaryTableTests extends ContextModelTestCase createTestEntityWithSecondaryTables(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - Iterator secondaryTableResources = typeResource.annotations(JPA.SECONDARY_TABLE, JPA.SECONDARY_TABLES); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + Iterator secondaryTableResources = resourceType.getAnnotations(JPA.SECONDARY_TABLE).iterator(); ((SecondaryTableAnnotation) secondaryTableResources.next()).setSchema("foo"); ((SecondaryTableAnnotation) secondaryTableResources.next()).setSchema("bar"); getJpaProject().synchronizeContextModel(); - ListIterator secondaryTsbles = getJavaEntity().secondaryTables(); + ListIterator secondaryTsbles = getJavaEntity().getSecondaryTables().iterator(); assertEquals("foo", secondaryTsbles.next().getSpecifiedSchema()); assertEquals("bar", secondaryTsbles.next().getSpecifiedSchema()); } @@ -158,36 +159,36 @@ public class JavaSecondaryTableTests extends ContextModelTestCase createTestEntityWithSecondaryTable(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - SecondaryTableAnnotation table = (SecondaryTableAnnotation) typeResource.getAnnotation(JPA.SECONDARY_TABLE); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + SecondaryTableAnnotation table = (SecondaryTableAnnotation) resourceType.getAnnotation(0, JPA.SECONDARY_TABLE); table.setCatalog("myCatalog"); getJpaProject().synchronizeContextModel(); - assertEquals("myCatalog", getJavaEntity().secondaryTables().next().getSpecifiedCatalog()); - assertEquals("myCatalog", getJavaEntity().secondaryTables().next().getCatalog()); + assertEquals("myCatalog", getJavaEntity().getSecondaryTables().iterator().next().getSpecifiedCatalog()); + assertEquals("myCatalog", getJavaEntity().getSecondaryTables().iterator().next().getCatalog()); } public void testGetDefaultCatalog() throws Exception { createTestEntityWithSecondaryTable(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - assertNull(getJavaEntity().secondaryTables().next().getDefaultCatalog()); + assertNull(getJavaEntity().getSecondaryTables().iterator().next().getDefaultCatalog()); - getJavaEntity().secondaryTables().next().setSpecifiedCatalog("myCatalog"); + getJavaEntity().getSecondaryTables().iterator().next().setSpecifiedCatalog("myCatalog"); - assertNull(getJavaEntity().secondaryTables().next().getDefaultCatalog()); + assertNull(getJavaEntity().getSecondaryTables().iterator().next().getDefaultCatalog()); } public void testSetSpecifiedCatalog() throws Exception { createTestEntityWithSecondaryTable(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - SecondaryTable table = getJavaEntity().secondaryTables().next(); + SecondaryTable table = getJavaEntity().getSecondaryTables().iterator().next(); table.setSpecifiedCatalog("myCatalog"); table.setSpecifiedName(null); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - SecondaryTableAnnotation tableAnnotation = (SecondaryTableAnnotation) typeResource.getAnnotation(JPA.SECONDARY_TABLE); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + SecondaryTableAnnotation tableAnnotation = (SecondaryTableAnnotation) resourceType.getAnnotation(0, JPA.SECONDARY_TABLE); assertEquals("myCatalog", tableAnnotation.getCatalog()); } @@ -195,36 +196,36 @@ public class JavaSecondaryTableTests extends ContextModelTestCase createTestEntityWithSecondaryTable(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - SecondaryTableAnnotation tableResource = (SecondaryTableAnnotation) typeResource.getAnnotation(JPA.SECONDARY_TABLE); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + SecondaryTableAnnotation tableResource = (SecondaryTableAnnotation) resourceType.getAnnotation(0, JPA.SECONDARY_TABLE); tableResource.setSchema("mySchema"); getJpaProject().synchronizeContextModel(); - assertEquals("mySchema", getJavaEntity().secondaryTables().next().getSpecifiedSchema()); - assertEquals("mySchema", getJavaEntity().secondaryTables().next().getSchema()); + assertEquals("mySchema", getJavaEntity().getSecondaryTables().iterator().next().getSpecifiedSchema()); + assertEquals("mySchema", getJavaEntity().getSecondaryTables().iterator().next().getSchema()); } public void testGetDefaultSchema() throws Exception { createTestEntityWithSecondaryTable(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - assertNull(getJavaEntity().secondaryTables().next().getDefaultSchema()); + assertNull(getJavaEntity().getSecondaryTables().iterator().next().getDefaultSchema()); - getJavaEntity().secondaryTables().next().setSpecifiedSchema("mySchema"); + getJavaEntity().getSecondaryTables().iterator().next().setSpecifiedSchema("mySchema"); - assertNull(getJavaEntity().secondaryTables().next().getDefaultSchema()); + assertNull(getJavaEntity().getSecondaryTables().iterator().next().getDefaultSchema()); } public void testSetSpecifiedSchema() throws Exception { createTestEntityWithSecondaryTable(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - SecondaryTable table = getJavaEntity().secondaryTables().next(); + SecondaryTable table = getJavaEntity().getSecondaryTables().iterator().next(); table.setSpecifiedSchema("mySchema"); table.setSpecifiedName(null); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - SecondaryTableAnnotation tableAnnotation = (SecondaryTableAnnotation) typeResource.getAnnotation(JPA.SECONDARY_TABLE); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + SecondaryTableAnnotation tableAnnotation = (SecondaryTableAnnotation) resourceType.getAnnotation(0, JPA.SECONDARY_TABLE); assertEquals("mySchema", tableAnnotation.getSchema()); } @@ -232,26 +233,26 @@ public class JavaSecondaryTableTests extends ContextModelTestCase createTestEntityWithSecondaryTable(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - JavaSecondaryTable secondaryTable = getJavaEntity().specifiedSecondaryTables().next(); - ListIterator specifiedPkJoinColumns = secondaryTable.specifiedPrimaryKeyJoinColumns(); + JavaSecondaryTable secondaryTable = getJavaEntity().getSpecifiedSecondaryTables().iterator().next(); + ListIterator specifiedPkJoinColumns = secondaryTable.getSpecifiedPrimaryKeyJoinColumns().iterator(); assertFalse(specifiedPkJoinColumns.hasNext()); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - SecondaryTableAnnotation tableResource = (SecondaryTableAnnotation) typeResource.getAnnotation(JPA.SECONDARY_TABLE); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + SecondaryTableAnnotation tableResource = (SecondaryTableAnnotation) resourceType.getAnnotation(0, JPA.SECONDARY_TABLE); //add an annotation to the resource model and verify the context model is updated PrimaryKeyJoinColumnAnnotation pkJoinColumn = tableResource.addPkJoinColumn(0); pkJoinColumn.setName("FOO"); getJpaProject().synchronizeContextModel(); - specifiedPkJoinColumns = secondaryTable.specifiedPrimaryKeyJoinColumns(); + specifiedPkJoinColumns = secondaryTable.getSpecifiedPrimaryKeyJoinColumns().iterator(); assertEquals("FOO", specifiedPkJoinColumns.next().getName()); assertFalse(specifiedPkJoinColumns.hasNext()); pkJoinColumn = tableResource.addPkJoinColumn(0); pkJoinColumn.setName("BAR"); getJpaProject().synchronizeContextModel(); - specifiedPkJoinColumns = secondaryTable.specifiedPrimaryKeyJoinColumns(); + specifiedPkJoinColumns = secondaryTable.getSpecifiedPrimaryKeyJoinColumns().iterator(); assertEquals("BAR", specifiedPkJoinColumns.next().getName()); assertEquals("FOO", specifiedPkJoinColumns.next().getName()); assertFalse(specifiedPkJoinColumns.hasNext()); @@ -260,20 +261,20 @@ public class JavaSecondaryTableTests extends ContextModelTestCase //move an annotation to the resource model and verify the context model is updated tableResource.movePkJoinColumn(1, 0); getJpaProject().synchronizeContextModel(); - specifiedPkJoinColumns = secondaryTable.specifiedPrimaryKeyJoinColumns(); + specifiedPkJoinColumns = secondaryTable.getSpecifiedPrimaryKeyJoinColumns().iterator(); assertEquals("FOO", specifiedPkJoinColumns.next().getName()); assertEquals("BAR", specifiedPkJoinColumns.next().getName()); assertFalse(specifiedPkJoinColumns.hasNext()); tableResource.removePkJoinColumn(0); getJpaProject().synchronizeContextModel(); - specifiedPkJoinColumns = secondaryTable.specifiedPrimaryKeyJoinColumns(); + specifiedPkJoinColumns = secondaryTable.getSpecifiedPrimaryKeyJoinColumns().iterator(); assertEquals("BAR", specifiedPkJoinColumns.next().getName()); assertFalse(specifiedPkJoinColumns.hasNext()); tableResource.removePkJoinColumn(0); getJpaProject().synchronizeContextModel(); - specifiedPkJoinColumns = secondaryTable.specifiedPrimaryKeyJoinColumns(); + specifiedPkJoinColumns = secondaryTable.getSpecifiedPrimaryKeyJoinColumns().iterator(); assertFalse(specifiedPkJoinColumns.hasNext()); } @@ -281,37 +282,37 @@ public class JavaSecondaryTableTests extends ContextModelTestCase createTestEntityWithSecondaryTable(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - SecondaryTable secondaryTable = getJavaEntity().specifiedSecondaryTables().next(); - assertEquals(0, secondaryTable.specifiedPrimaryKeyJoinColumnsSize()); + SecondaryTable secondaryTable = getJavaEntity().getSpecifiedSecondaryTables().iterator().next(); + assertEquals(0, secondaryTable.getSpecifiedPrimaryKeyJoinColumnsSize()); secondaryTable.addSpecifiedPrimaryKeyJoinColumn(0).setSpecifiedName("FOO"); secondaryTable.addSpecifiedPrimaryKeyJoinColumn(0).setSpecifiedName("BAR"); secondaryTable.addSpecifiedPrimaryKeyJoinColumn(0).setSpecifiedName("BAZ"); - assertEquals(3, secondaryTable.specifiedPrimaryKeyJoinColumnsSize()); + assertEquals(3, secondaryTable.getSpecifiedPrimaryKeyJoinColumnsSize()); } public void testPrimaryKeyJoinColumnsSize() throws Exception { createTestEntityWithSecondaryTable(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - SecondaryTable secondaryTable = getJavaEntity().specifiedSecondaryTables().next(); + SecondaryTable secondaryTable = getJavaEntity().getSpecifiedSecondaryTables().iterator().next(); //just the default pkJoinColumn, so 1 - assertEquals(1, secondaryTable.primaryKeyJoinColumnsSize()); + assertEquals(1, secondaryTable.getPrimaryKeyJoinColumnsSize()); secondaryTable.addSpecifiedPrimaryKeyJoinColumn(0).setSpecifiedName("FOO"); secondaryTable.addSpecifiedPrimaryKeyJoinColumn(0).setSpecifiedName("BAR"); secondaryTable.addSpecifiedPrimaryKeyJoinColumn(0).setSpecifiedName("BAZ"); //only the specified pkJoinColumns, 3 - assertEquals(3, secondaryTable.primaryKeyJoinColumnsSize()); + assertEquals(3, secondaryTable.getPrimaryKeyJoinColumnsSize()); } public void testGetDefaultPrimaryKeyJoinColumn() throws Exception { createTestEntityWithSecondaryTable(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - SecondaryTable secondaryTable = getJavaEntity().specifiedSecondaryTables().next(); + SecondaryTable secondaryTable = getJavaEntity().getSpecifiedSecondaryTables().iterator().next(); assertNotNull(secondaryTable.getDefaultPrimaryKeyJoinColumn()); secondaryTable.addSpecifiedPrimaryKeyJoinColumn(0).setSpecifiedName("FOO"); @@ -325,7 +326,7 @@ public class JavaSecondaryTableTests extends ContextModelTestCase createTestEntityWithSecondaryTable(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - SecondaryTable secondaryTable = getJavaEntity().specifiedSecondaryTables().next(); + SecondaryTable secondaryTable = getJavaEntity().getSpecifiedSecondaryTables().iterator().next(); PrimaryKeyJoinColumn defaultPkJoinColumn = secondaryTable.getDefaultPrimaryKeyJoinColumn(); assertNotNull(defaultPkJoinColumn); assertEquals("id", defaultPkJoinColumn.getDefaultName()); @@ -346,19 +347,19 @@ public class JavaSecondaryTableTests extends ContextModelTestCase createTestEntityWithSecondaryTable(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - JavaSecondaryTable secondaryTable = getJavaEntity().specifiedSecondaryTables().next(); + JavaSecondaryTable secondaryTable = getJavaEntity().getSpecifiedSecondaryTables().iterator().next(); secondaryTable.addSpecifiedPrimaryKeyJoinColumn(0).setSpecifiedName("FOO"); secondaryTable.addSpecifiedPrimaryKeyJoinColumn(0).setSpecifiedName("BAR"); secondaryTable.addSpecifiedPrimaryKeyJoinColumn(0).setSpecifiedName("BAZ"); - Iterator specifiedPkJoinColumns = secondaryTable.specifiedPrimaryKeyJoinColumns(); + Iterator specifiedPkJoinColumns = secondaryTable.getSpecifiedPrimaryKeyJoinColumns().iterator(); assertEquals("BAZ", specifiedPkJoinColumns.next().getName()); assertEquals("BAR", specifiedPkJoinColumns.next().getName()); assertEquals("FOO", specifiedPkJoinColumns.next().getName()); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - SecondaryTableAnnotation tableResource = (SecondaryTableAnnotation) typeResource.getAnnotation(JPA.SECONDARY_TABLE); - Iterator pkJoinColumns = tableResource.pkJoinColumns(); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + SecondaryTableAnnotation tableResource = (SecondaryTableAnnotation) resourceType.getAnnotation(0, JPA.SECONDARY_TABLE); + Iterator pkJoinColumns = tableResource.getPkJoinColumns().iterator(); assertEquals("BAZ", pkJoinColumns.next().getName()); assertEquals("BAR", pkJoinColumns.next().getName()); @@ -370,20 +371,20 @@ public class JavaSecondaryTableTests extends ContextModelTestCase createTestEntityWithSecondaryTable(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - JavaSecondaryTable secondaryTable = getJavaEntity().specifiedSecondaryTables().next(); + JavaSecondaryTable secondaryTable = getJavaEntity().getSpecifiedSecondaryTables().iterator().next(); secondaryTable.addSpecifiedPrimaryKeyJoinColumn(0).setSpecifiedName("FOO"); secondaryTable.addSpecifiedPrimaryKeyJoinColumn(1).setSpecifiedName("BAR"); secondaryTable.addSpecifiedPrimaryKeyJoinColumn(2).setSpecifiedName("BAZ"); - Iterator specifiedPkJoinColumns = secondaryTable.specifiedPrimaryKeyJoinColumns(); + Iterator specifiedPkJoinColumns = secondaryTable.getSpecifiedPrimaryKeyJoinColumns().iterator(); assertEquals("FOO", specifiedPkJoinColumns.next().getName()); assertEquals("BAR", specifiedPkJoinColumns.next().getName()); assertEquals("BAZ", specifiedPkJoinColumns.next().getName()); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - SecondaryTableAnnotation tableResource = (SecondaryTableAnnotation) typeResource.getAnnotation(JPA.SECONDARY_TABLE); - Iterator pkJoinColumns = tableResource.pkJoinColumns(); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + SecondaryTableAnnotation tableResource = (SecondaryTableAnnotation) resourceType.getAnnotation(0, JPA.SECONDARY_TABLE); + Iterator pkJoinColumns = tableResource.getPkJoinColumns().iterator(); assertEquals("FOO", pkJoinColumns.next().getName()); assertEquals("BAR", pkJoinColumns.next().getName()); @@ -394,66 +395,66 @@ public class JavaSecondaryTableTests extends ContextModelTestCase createTestEntityWithSecondaryTable(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - JavaSecondaryTable secondaryTable = getJavaEntity().specifiedSecondaryTables().next(); + JavaSecondaryTable secondaryTable = getJavaEntity().getSpecifiedSecondaryTables().iterator().next(); secondaryTable.addSpecifiedPrimaryKeyJoinColumn(0).setSpecifiedName("FOO"); secondaryTable.addSpecifiedPrimaryKeyJoinColumn(1).setSpecifiedName("BAR"); secondaryTable.addSpecifiedPrimaryKeyJoinColumn(2).setSpecifiedName("BAZ"); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - SecondaryTableAnnotation tableResource = (SecondaryTableAnnotation) typeResource.getAnnotation(JPA.SECONDARY_TABLE); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + SecondaryTableAnnotation tableResource = (SecondaryTableAnnotation) resourceType.getAnnotation(0, JPA.SECONDARY_TABLE); - assertEquals(3, tableResource.pkJoinColumnsSize()); + assertEquals(3, tableResource.getPkJoinColumnsSize()); secondaryTable.removeSpecifiedPrimaryKeyJoinColumn(1); - Iterator pkJoinColumnResources = tableResource.pkJoinColumns(); + Iterator pkJoinColumnResources = tableResource.getPkJoinColumns().iterator(); assertEquals("FOO", pkJoinColumnResources.next().getName()); assertEquals("BAZ", pkJoinColumnResources.next().getName()); assertFalse(pkJoinColumnResources.hasNext()); - Iterator pkJoinColumns = secondaryTable.specifiedPrimaryKeyJoinColumns(); + Iterator pkJoinColumns = secondaryTable.getSpecifiedPrimaryKeyJoinColumns().iterator(); assertEquals("FOO", pkJoinColumns.next().getName()); assertEquals("BAZ", pkJoinColumns.next().getName()); assertFalse(pkJoinColumns.hasNext()); secondaryTable.removeSpecifiedPrimaryKeyJoinColumn(1); - pkJoinColumnResources = tableResource.pkJoinColumns(); + pkJoinColumnResources = tableResource.getPkJoinColumns().iterator(); assertEquals("FOO", pkJoinColumnResources.next().getName()); assertFalse(pkJoinColumnResources.hasNext()); - pkJoinColumns = secondaryTable.specifiedPrimaryKeyJoinColumns(); + pkJoinColumns = secondaryTable.getSpecifiedPrimaryKeyJoinColumns().iterator(); assertEquals("FOO", pkJoinColumns.next().getName()); assertFalse(pkJoinColumns.hasNext()); secondaryTable.removeSpecifiedPrimaryKeyJoinColumn(0); - pkJoinColumnResources = tableResource.pkJoinColumns(); + pkJoinColumnResources = tableResource.getPkJoinColumns().iterator(); assertFalse(pkJoinColumnResources.hasNext()); - pkJoinColumns = secondaryTable.specifiedPrimaryKeyJoinColumns(); + pkJoinColumns = secondaryTable.getSpecifiedPrimaryKeyJoinColumns().iterator(); assertFalse(pkJoinColumns.hasNext()); - assertEquals(0, tableResource.pkJoinColumnsSize()); + assertEquals(0, tableResource.getPkJoinColumnsSize()); } public void testMoveSpecifiedPrimaryKeyJoinColumn() throws Exception { createTestEntityWithSecondaryTable(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - JavaSecondaryTable secondaryTable = getJavaEntity().specifiedSecondaryTables().next(); + JavaSecondaryTable secondaryTable = getJavaEntity().getSpecifiedSecondaryTables().iterator().next(); secondaryTable.addSpecifiedPrimaryKeyJoinColumn(0).setSpecifiedName("FOO"); secondaryTable.addSpecifiedPrimaryKeyJoinColumn(1).setSpecifiedName("BAR"); secondaryTable.addSpecifiedPrimaryKeyJoinColumn(2).setSpecifiedName("BAZ"); - Iterator specifiedPkJoinColumns = secondaryTable.specifiedPrimaryKeyJoinColumns(); + Iterator specifiedPkJoinColumns = secondaryTable.getSpecifiedPrimaryKeyJoinColumns().iterator(); assertEquals("FOO", specifiedPkJoinColumns.next().getName()); assertEquals("BAR", specifiedPkJoinColumns.next().getName()); assertEquals("BAZ", specifiedPkJoinColumns.next().getName()); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - SecondaryTableAnnotation tableResource = (SecondaryTableAnnotation) typeResource.getAnnotation(JPA.SECONDARY_TABLE); - Iterator pkJoinColumns = tableResource.pkJoinColumns(); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + SecondaryTableAnnotation tableResource = (SecondaryTableAnnotation) resourceType.getAnnotation(0, JPA.SECONDARY_TABLE); + Iterator pkJoinColumns = tableResource.getPkJoinColumns().iterator(); assertEquals("FOO", pkJoinColumns.next().getName()); assertEquals("BAR", pkJoinColumns.next().getName()); @@ -461,7 +462,7 @@ public class JavaSecondaryTableTests extends ContextModelTestCase secondaryTable.moveSpecifiedPrimaryKeyJoinColumn(2, 0); - pkJoinColumns = tableResource.pkJoinColumns(); + pkJoinColumns = tableResource.getPkJoinColumns().iterator(); assertEquals("BAR", pkJoinColumns.next().getName()); assertEquals("BAZ", pkJoinColumns.next().getName()); @@ -472,7 +473,7 @@ public class JavaSecondaryTableTests extends ContextModelTestCase createTestEntityWithSecondaryTable(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - SecondaryTable secondaryTable = getJavaEntity().specifiedSecondaryTables().next(); + SecondaryTable secondaryTable = getJavaEntity().getSpecifiedSecondaryTables().iterator().next(); PrimaryKeyJoinColumn defaultPkJoinColumn = secondaryTable.getDefaultPrimaryKeyJoinColumn(); assertEquals("id", defaultPkJoinColumn.getDefaultName()); @@ -487,7 +488,7 @@ public class JavaSecondaryTableTests extends ContextModelTestCase createTestEntityWithSecondaryTable(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - SecondaryTable secondaryTable = getJavaEntity().specifiedSecondaryTables().next(); + SecondaryTable secondaryTable = getJavaEntity().getSpecifiedSecondaryTables().iterator().next(); PrimaryKeyJoinColumn defaultPkJoinColumn = secondaryTable.getDefaultPrimaryKeyJoinColumn(); assertEquals("id", defaultPkJoinColumn.getDefaultReferencedColumnName()); @@ -501,12 +502,12 @@ public class JavaSecondaryTableTests extends ContextModelTestCase public void testPrimaryKeyJoinColumnIsVirtual() throws Exception { createTestEntityWithSecondaryTable(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - SecondaryTable secondaryTable = getJavaEntity().specifiedSecondaryTables().next(); + SecondaryTable secondaryTable = getJavaEntity().getSpecifiedSecondaryTables().iterator().next(); assertTrue(secondaryTable.getDefaultPrimaryKeyJoinColumn().isDefault()); secondaryTable.addSpecifiedPrimaryKeyJoinColumn(0); - PrimaryKeyJoinColumn specifiedPkJoinColumn = secondaryTable.specifiedPrimaryKeyJoinColumns().next(); + PrimaryKeyJoinColumn specifiedPkJoinColumn = secondaryTable.getSpecifiedPrimaryKeyJoinColumns().iterator().next(); assertFalse(specifiedPkJoinColumn.isDefault()); assertNull(secondaryTable.getDefaultPrimaryKeyJoinColumn()); @@ -517,18 +518,18 @@ public class JavaSecondaryTableTests extends ContextModelTestCase createTestEntityWithSecondaryTable(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - JavaSecondaryTable secondaryTable = getJavaEntity().specifiedSecondaryTables().next(); + JavaSecondaryTable secondaryTable = getJavaEntity().getSpecifiedSecondaryTables().iterator().next(); - ListIterator uniqueConstraints = secondaryTable.uniqueConstraints(); + ListIterator uniqueConstraints = secondaryTable.getUniqueConstraints().iterator(); assertFalse(uniqueConstraints.hasNext()); - JavaResourcePersistentType resourcePersistentType = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - SecondaryTableAnnotation secondaryTableAnnotation = (SecondaryTableAnnotation) resourcePersistentType.getAnnotation(JPA.SECONDARY_TABLE); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + SecondaryTableAnnotation secondaryTableAnnotation = (SecondaryTableAnnotation) resourceType.getAnnotation(0, JPA.SECONDARY_TABLE); secondaryTableAnnotation.addUniqueConstraint(0).addColumnName(0, "foo"); secondaryTableAnnotation.addUniqueConstraint(0).addColumnName(0, "bar"); getJpaProject().synchronizeContextModel(); - uniqueConstraints = secondaryTable.uniqueConstraints(); + uniqueConstraints = secondaryTable.getUniqueConstraints().iterator(); assertTrue(uniqueConstraints.hasNext()); assertEquals("bar", uniqueConstraints.next().getColumnNames().iterator().next()); assertEquals("foo", uniqueConstraints.next().getColumnNames().iterator().next()); @@ -539,35 +540,35 @@ public class JavaSecondaryTableTests extends ContextModelTestCase createTestEntityWithSecondaryTable(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - SecondaryTable secondaryTable = getJavaEntity().specifiedSecondaryTables().next(); + SecondaryTable secondaryTable = getJavaEntity().getSpecifiedSecondaryTables().iterator().next(); - assertEquals(0, secondaryTable.uniqueConstraintsSize()); + assertEquals(0, secondaryTable.getUniqueConstraintsSize()); - JavaResourcePersistentType resourcePersistentType = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - SecondaryTableAnnotation secondaryTableAnnotation = (SecondaryTableAnnotation) resourcePersistentType.getAnnotation(JPA.SECONDARY_TABLE); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + SecondaryTableAnnotation secondaryTableAnnotation = (SecondaryTableAnnotation) resourceType.getAnnotation(0, JPA.SECONDARY_TABLE); secondaryTableAnnotation.addUniqueConstraint(0).addColumnName(0, "foo"); secondaryTableAnnotation.addUniqueConstraint(1).addColumnName(0, "bar"); getJpaProject().synchronizeContextModel(); - assertEquals(2, secondaryTable.uniqueConstraintsSize()); + assertEquals(2, secondaryTable.getUniqueConstraintsSize()); } public void testAddUniqueConstraint() throws Exception { createTestEntityWithSecondaryTable(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - SecondaryTable secondaryTable = getJavaEntity().specifiedSecondaryTables().next(); + SecondaryTable secondaryTable = getJavaEntity().getSpecifiedSecondaryTables().iterator().next(); secondaryTable.addUniqueConstraint(0).addColumnName(0, "FOO"); secondaryTable.addUniqueConstraint(0).addColumnName(0, "BAR"); secondaryTable.addUniqueConstraint(0).addColumnName(0, "BAZ"); - JavaResourcePersistentType resourcePersistentType = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - SecondaryTableAnnotation secondaryTableAnnotation = (SecondaryTableAnnotation) resourcePersistentType.getAnnotation(JPA.SECONDARY_TABLE); - ListIterator uniqueConstraints = secondaryTableAnnotation.uniqueConstraints(); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + SecondaryTableAnnotation secondaryTableAnnotation = (SecondaryTableAnnotation) resourceType.getAnnotation(0, JPA.SECONDARY_TABLE); + ListIterator uniqueConstraints = secondaryTableAnnotation.getUniqueConstraints().iterator(); - assertEquals("BAZ", uniqueConstraints.next().columnNames().next()); - assertEquals("BAR", uniqueConstraints.next().columnNames().next()); - assertEquals("FOO", uniqueConstraints.next().columnNames().next()); + assertEquals("BAZ", uniqueConstraints.next().columnNameAt(0)); + assertEquals("BAR", uniqueConstraints.next().columnNameAt(0)); + assertEquals("FOO", uniqueConstraints.next().columnNameAt(0)); assertFalse(uniqueConstraints.hasNext()); } @@ -575,18 +576,18 @@ public class JavaSecondaryTableTests extends ContextModelTestCase createTestEntityWithSecondaryTable(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - SecondaryTable secondaryTable = getJavaEntity().specifiedSecondaryTables().next(); + SecondaryTable secondaryTable = getJavaEntity().getSpecifiedSecondaryTables().iterator().next(); secondaryTable.addUniqueConstraint(0).addColumnName(0, "FOO"); secondaryTable.addUniqueConstraint(1).addColumnName(0, "BAR"); secondaryTable.addUniqueConstraint(0).addColumnName(0, "BAZ"); - JavaResourcePersistentType resourcePersistentType = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - SecondaryTableAnnotation secondaryTableAnnotation = (SecondaryTableAnnotation) resourcePersistentType.getAnnotation(JPA.SECONDARY_TABLE); - ListIterator uniqueConstraints = secondaryTableAnnotation.uniqueConstraints(); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + SecondaryTableAnnotation secondaryTableAnnotation = (SecondaryTableAnnotation) resourceType.getAnnotation(0, JPA.SECONDARY_TABLE); + ListIterator uniqueConstraints = secondaryTableAnnotation.getUniqueConstraints().iterator(); - assertEquals("BAZ", uniqueConstraints.next().columnNames().next()); - assertEquals("FOO", uniqueConstraints.next().columnNames().next()); - assertEquals("BAR", uniqueConstraints.next().columnNames().next()); + assertEquals("BAZ", uniqueConstraints.next().columnNameAt(0)); + assertEquals("FOO", uniqueConstraints.next().columnNameAt(0)); + assertEquals("BAR", uniqueConstraints.next().columnNameAt(0)); assertFalse(uniqueConstraints.hasNext()); } @@ -594,43 +595,43 @@ public class JavaSecondaryTableTests extends ContextModelTestCase createTestEntityWithSecondaryTable(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - JavaSecondaryTable secondaryTable = getJavaEntity().specifiedSecondaryTables().next(); + JavaSecondaryTable secondaryTable = getJavaEntity().getSpecifiedSecondaryTables().iterator().next(); secondaryTable.addUniqueConstraint(0).addColumnName(0, "FOO"); secondaryTable.addUniqueConstraint(1).addColumnName(0, "BAR"); secondaryTable.addUniqueConstraint(2).addColumnName(0, "BAZ"); - JavaResourcePersistentType resourcePersistentType = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - SecondaryTableAnnotation secondaryTableAnnotation = (SecondaryTableAnnotation) resourcePersistentType.getAnnotation(JPA.SECONDARY_TABLE); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + SecondaryTableAnnotation secondaryTableAnnotation = (SecondaryTableAnnotation) resourceType.getAnnotation(0, JPA.SECONDARY_TABLE); - assertEquals(3, secondaryTableAnnotation.uniqueConstraintsSize()); + assertEquals(3, secondaryTableAnnotation.getUniqueConstraintsSize()); secondaryTable.removeUniqueConstraint(1); - ListIterator uniqueConstraintAnnotations = secondaryTableAnnotation.uniqueConstraints(); - assertEquals("FOO", uniqueConstraintAnnotations.next().columnNames().next()); - assertEquals("BAZ", uniqueConstraintAnnotations.next().columnNames().next()); + ListIterator uniqueConstraintAnnotations = secondaryTableAnnotation.getUniqueConstraints().iterator(); + assertEquals("FOO", uniqueConstraintAnnotations.next().columnNameAt(0)); + assertEquals("BAZ", uniqueConstraintAnnotations.next().columnNameAt(0)); assertFalse(uniqueConstraintAnnotations.hasNext()); - Iterator uniqueConstraints = secondaryTable.uniqueConstraints(); + Iterator uniqueConstraints = secondaryTable.getUniqueConstraints().iterator(); assertEquals("FOO", uniqueConstraints.next().getColumnNames().iterator().next()); assertEquals("BAZ", uniqueConstraints.next().getColumnNames().iterator().next()); assertFalse(uniqueConstraints.hasNext()); secondaryTable.removeUniqueConstraint(1); - uniqueConstraintAnnotations = secondaryTableAnnotation.uniqueConstraints(); - assertEquals("FOO", uniqueConstraintAnnotations.next().columnNames().next()); + uniqueConstraintAnnotations = secondaryTableAnnotation.getUniqueConstraints().iterator(); + assertEquals("FOO", uniqueConstraintAnnotations.next().columnNameAt(0)); assertFalse(uniqueConstraintAnnotations.hasNext()); - uniqueConstraints = secondaryTable.uniqueConstraints(); + uniqueConstraints = secondaryTable.getUniqueConstraints().iterator(); assertEquals("FOO", uniqueConstraints.next().getColumnNames().iterator().next()); assertFalse(uniqueConstraints.hasNext()); secondaryTable.removeUniqueConstraint(0); - uniqueConstraintAnnotations = secondaryTableAnnotation.uniqueConstraints(); + uniqueConstraintAnnotations = secondaryTableAnnotation.getUniqueConstraints().iterator(); assertFalse(uniqueConstraintAnnotations.hasNext()); - uniqueConstraints = secondaryTable.uniqueConstraints(); + uniqueConstraints = secondaryTable.getUniqueConstraints().iterator(); assertFalse(uniqueConstraints.hasNext()); } @@ -638,48 +639,48 @@ public class JavaSecondaryTableTests extends ContextModelTestCase createTestEntityWithSecondaryTable(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - JavaSecondaryTable secondaryTable = getJavaEntity().specifiedSecondaryTables().next(); + JavaSecondaryTable secondaryTable = getJavaEntity().getSpecifiedSecondaryTables().iterator().next(); secondaryTable.addUniqueConstraint(0).addColumnName(0, "FOO"); secondaryTable.addUniqueConstraint(1).addColumnName(0, "BAR"); secondaryTable.addUniqueConstraint(2).addColumnName(0, "BAZ"); - JavaResourcePersistentType resourcePersistentType = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - SecondaryTableAnnotation secondaryTableAnnotation = (SecondaryTableAnnotation) resourcePersistentType.getAnnotation(JPA.SECONDARY_TABLE); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + SecondaryTableAnnotation secondaryTableAnnotation = (SecondaryTableAnnotation) resourceType.getAnnotation(0, JPA.SECONDARY_TABLE); - assertEquals(3, secondaryTableAnnotation.uniqueConstraintsSize()); + assertEquals(3, secondaryTableAnnotation.getUniqueConstraintsSize()); secondaryTable.moveUniqueConstraint(2, 0); - ListIterator uniqueConstraints = secondaryTable.uniqueConstraints(); + ListIterator uniqueConstraints = secondaryTable.getUniqueConstraints().iterator(); assertEquals("BAR", uniqueConstraints.next().getColumnNames().iterator().next()); assertEquals("BAZ", uniqueConstraints.next().getColumnNames().iterator().next()); assertEquals("FOO", uniqueConstraints.next().getColumnNames().iterator().next()); - ListIterator uniqueConstraintAnnotations = secondaryTableAnnotation.uniqueConstraints(); - assertEquals("BAR", uniqueConstraintAnnotations.next().columnNames().next()); - assertEquals("BAZ", uniqueConstraintAnnotations.next().columnNames().next()); - assertEquals("FOO", uniqueConstraintAnnotations.next().columnNames().next()); + ListIterator uniqueConstraintAnnotations = secondaryTableAnnotation.getUniqueConstraints().iterator(); + assertEquals("BAR", uniqueConstraintAnnotations.next().columnNameAt(0)); + assertEquals("BAZ", uniqueConstraintAnnotations.next().columnNameAt(0)); + assertEquals("FOO", uniqueConstraintAnnotations.next().columnNameAt(0)); secondaryTable.moveUniqueConstraint(0, 1); - uniqueConstraints = secondaryTable.uniqueConstraints(); + uniqueConstraints = secondaryTable.getUniqueConstraints().iterator(); assertEquals("BAZ", uniqueConstraints.next().getColumnNames().iterator().next()); assertEquals("BAR", uniqueConstraints.next().getColumnNames().iterator().next()); assertEquals("FOO", uniqueConstraints.next().getColumnNames().iterator().next()); - uniqueConstraintAnnotations = secondaryTableAnnotation.uniqueConstraints(); - assertEquals("BAZ", uniqueConstraintAnnotations.next().columnNames().next()); - assertEquals("BAR", uniqueConstraintAnnotations.next().columnNames().next()); - assertEquals("FOO", uniqueConstraintAnnotations.next().columnNames().next()); + uniqueConstraintAnnotations = secondaryTableAnnotation.getUniqueConstraints().iterator(); + assertEquals("BAZ", uniqueConstraintAnnotations.next().columnNameAt(0)); + assertEquals("BAR", uniqueConstraintAnnotations.next().columnNameAt(0)); + assertEquals("FOO", uniqueConstraintAnnotations.next().columnNameAt(0)); } public void testUpdateUniqueConstraints() throws Exception { createTestEntityWithSecondaryTable(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - JavaSecondaryTable secondaryTable = getJavaEntity().specifiedSecondaryTables().next(); - JavaResourcePersistentType resourcePersistentType = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - SecondaryTableAnnotation secondaryTableAnnotation = (SecondaryTableAnnotation) resourcePersistentType.getAnnotation(JPA.SECONDARY_TABLE); + JavaSecondaryTable secondaryTable = getJavaEntity().getSpecifiedSecondaryTables().iterator().next(); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + SecondaryTableAnnotation secondaryTableAnnotation = (SecondaryTableAnnotation) resourceType.getAnnotation(0, JPA.SECONDARY_TABLE); secondaryTableAnnotation.addUniqueConstraint(0).addColumnName("FOO"); secondaryTableAnnotation.addUniqueConstraint(1).addColumnName("BAR"); @@ -687,7 +688,7 @@ public class JavaSecondaryTableTests extends ContextModelTestCase getJpaProject().synchronizeContextModel(); - ListIterator uniqueConstraints = secondaryTable.uniqueConstraints(); + ListIterator uniqueConstraints = secondaryTable.getUniqueConstraints().iterator(); assertEquals("FOO", uniqueConstraints.next().getColumnNames().iterator().next()); assertEquals("BAR", uniqueConstraints.next().getColumnNames().iterator().next()); assertEquals("BAZ", uniqueConstraints.next().getColumnNames().iterator().next()); @@ -695,7 +696,7 @@ public class JavaSecondaryTableTests extends ContextModelTestCase secondaryTableAnnotation.moveUniqueConstraint(2, 0); getJpaProject().synchronizeContextModel(); - uniqueConstraints = secondaryTable.uniqueConstraints(); + uniqueConstraints = secondaryTable.getUniqueConstraints().iterator(); assertEquals("BAR", uniqueConstraints.next().getColumnNames().iterator().next()); assertEquals("BAZ", uniqueConstraints.next().getColumnNames().iterator().next()); assertEquals("FOO", uniqueConstraints.next().getColumnNames().iterator().next()); @@ -703,7 +704,7 @@ public class JavaSecondaryTableTests extends ContextModelTestCase secondaryTableAnnotation.moveUniqueConstraint(0, 1); getJpaProject().synchronizeContextModel(); - uniqueConstraints = secondaryTable.uniqueConstraints(); + uniqueConstraints = secondaryTable.getUniqueConstraints().iterator(); assertEquals("BAZ", uniqueConstraints.next().getColumnNames().iterator().next()); assertEquals("BAR", uniqueConstraints.next().getColumnNames().iterator().next()); assertEquals("FOO", uniqueConstraints.next().getColumnNames().iterator().next()); @@ -711,20 +712,20 @@ public class JavaSecondaryTableTests extends ContextModelTestCase secondaryTableAnnotation.removeUniqueConstraint(1); getJpaProject().synchronizeContextModel(); - uniqueConstraints = secondaryTable.uniqueConstraints(); + uniqueConstraints = secondaryTable.getUniqueConstraints().iterator(); assertEquals("BAZ", uniqueConstraints.next().getColumnNames().iterator().next()); assertEquals("FOO", uniqueConstraints.next().getColumnNames().iterator().next()); assertFalse(uniqueConstraints.hasNext()); secondaryTableAnnotation.removeUniqueConstraint(1); getJpaProject().synchronizeContextModel(); - uniqueConstraints = secondaryTable.uniqueConstraints(); + uniqueConstraints = secondaryTable.getUniqueConstraints().iterator(); assertEquals("BAZ", uniqueConstraints.next().getColumnNames().iterator().next()); assertFalse(uniqueConstraints.hasNext()); secondaryTableAnnotation.removeUniqueConstraint(0); getJpaProject().synchronizeContextModel(); - uniqueConstraints = secondaryTable.uniqueConstraints(); + uniqueConstraints = secondaryTable.getUniqueConstraints().iterator(); assertFalse(uniqueConstraints.hasNext()); } } diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaSequenceGeneratorTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaSequenceGeneratorTests.java index 3daf944e0a..06495d7bd0 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaSequenceGeneratorTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaSequenceGeneratorTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2010 Oracle. All rights reserved. + * Copyright (c) 2007, 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. @@ -11,13 +11,14 @@ package org.eclipse.jpt.jpa.core.tests.internal.context.java; import java.util.Iterator; import org.eclipse.jdt.core.ICompilationUnit; +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.JavaResourceAnnotatedElement.Kind; import org.eclipse.jpt.common.utility.internal.iterators.ArrayIterator; import org.eclipse.jpt.jpa.core.context.Generator; import org.eclipse.jpt.jpa.core.context.IdMapping; import org.eclipse.jpt.jpa.core.context.SequenceGenerator; 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.SequenceGeneratorAnnotation; import org.eclipse.jpt.jpa.core.tests.internal.context.ContextModelTestCase; @@ -58,9 +59,9 @@ public class JavaSequenceGeneratorTests extends ContextModelTestCase assertEquals(SEQUENCE_GENERATOR_NAME, idMapping.getGeneratorContainer().getSequenceGenerator().getName()); //change resource model sequenceGenerator name, verify the context model is updated - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - SequenceGeneratorAnnotation sequenceGenerator = (SequenceGeneratorAnnotation) attributeResource.getAnnotation(JPA.SEQUENCE_GENERATOR); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + SequenceGeneratorAnnotation sequenceGenerator = (SequenceGeneratorAnnotation) resourceField.getAnnotation(JPA.SEQUENCE_GENERATOR); sequenceGenerator.setName("foo"); getJpaProject().synchronizeContextModel(); @@ -79,9 +80,9 @@ public class JavaSequenceGeneratorTests extends ContextModelTestCase assertEquals("foo", idMapping.getGeneratorContainer().getSequenceGenerator().getName()); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - SequenceGeneratorAnnotation sequenceGenerator = (SequenceGeneratorAnnotation) attributeResource.getAnnotation(JPA.SEQUENCE_GENERATOR); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + SequenceGeneratorAnnotation sequenceGenerator = (SequenceGeneratorAnnotation) resourceField.getAnnotation(JPA.SEQUENCE_GENERATOR); assertEquals("foo", sequenceGenerator.getName()); } @@ -93,9 +94,9 @@ public class JavaSequenceGeneratorTests extends ContextModelTestCase IdMapping idMapping = (IdMapping) getJavaPersistentType().getAttributeNamed("id").getMapping(); assertEquals(SequenceGenerator.DEFAULT_INITIAL_VALUE, idMapping.getGeneratorContainer().getSequenceGenerator().getInitialValue()); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - SequenceGeneratorAnnotation sequenceGenerator = (SequenceGeneratorAnnotation) attributeResource.getAnnotation(JPA.SEQUENCE_GENERATOR); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + SequenceGeneratorAnnotation sequenceGenerator = (SequenceGeneratorAnnotation) resourceField.getAnnotation(JPA.SEQUENCE_GENERATOR); sequenceGenerator.setInitialValue(Integer.valueOf(82)); getJpaProject().synchronizeContextModel(); @@ -125,9 +126,9 @@ public class JavaSequenceGeneratorTests extends ContextModelTestCase IdMapping idMapping = (IdMapping) getJavaPersistentType().getAttributeNamed("id").getMapping(); idMapping.getGeneratorContainer().getSequenceGenerator().setSpecifiedInitialValue(Integer.valueOf(20)); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - SequenceGeneratorAnnotation generatorAnnotation = (SequenceGeneratorAnnotation) attributeResource.getAnnotation(JPA.SEQUENCE_GENERATOR); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + SequenceGeneratorAnnotation generatorAnnotation = (SequenceGeneratorAnnotation) resourceField.getAnnotation(JPA.SEQUENCE_GENERATOR); assertEquals(Integer.valueOf(20), generatorAnnotation.getInitialValue()); } @@ -140,9 +141,9 @@ public class JavaSequenceGeneratorTests extends ContextModelTestCase assertEquals(Generator.DEFAULT_ALLOCATION_SIZE, idMapping.getGeneratorContainer().getSequenceGenerator().getAllocationSize()); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - SequenceGeneratorAnnotation sequenceGenerator = (SequenceGeneratorAnnotation) attributeResource.getAnnotation(JPA.SEQUENCE_GENERATOR); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + SequenceGeneratorAnnotation sequenceGenerator = (SequenceGeneratorAnnotation) resourceField.getAnnotation(JPA.SEQUENCE_GENERATOR); sequenceGenerator.setAllocationSize(Integer.valueOf(20)); getJpaProject().synchronizeContextModel(); @@ -172,9 +173,9 @@ public class JavaSequenceGeneratorTests extends ContextModelTestCase IdMapping idMapping = (IdMapping) getJavaPersistentType().getAttributeNamed("id").getMapping(); idMapping.getGeneratorContainer().getSequenceGenerator().setSpecifiedAllocationSize(Integer.valueOf(25)); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - SequenceGeneratorAnnotation generatorAnnotation = (SequenceGeneratorAnnotation) attributeResource.getAnnotation(JPA.SEQUENCE_GENERATOR); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + SequenceGeneratorAnnotation generatorAnnotation = (SequenceGeneratorAnnotation) resourceField.getAnnotation(JPA.SEQUENCE_GENERATOR); assertEquals(Integer.valueOf(25), generatorAnnotation.getAllocationSize()); } @@ -188,9 +189,9 @@ public class JavaSequenceGeneratorTests extends ContextModelTestCase IdMapping idMapping = (IdMapping) getJavaPersistentType().getAttributeNamed("id").getMapping(); assertNull(idMapping.getGeneratorContainer().getSequenceGenerator().getSequenceName()); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - SequenceGeneratorAnnotation sequenceGenerator = (SequenceGeneratorAnnotation) attributeResource.getAnnotation(JPA.SEQUENCE_GENERATOR); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + SequenceGeneratorAnnotation sequenceGenerator = (SequenceGeneratorAnnotation) resourceField.getAnnotation(JPA.SEQUENCE_GENERATOR); sequenceGenerator.setSequenceName("mySequenceName"); getJpaProject().synchronizeContextModel(); @@ -220,15 +221,15 @@ public class JavaSequenceGeneratorTests extends ContextModelTestCase IdMapping idMapping = (IdMapping) getJavaPersistentType().getAttributeNamed("id").getMapping(); idMapping.getGeneratorContainer().getSequenceGenerator().setSpecifiedSequenceName("mySequenceName"); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - SequenceGeneratorAnnotation generatorAnnotation = (SequenceGeneratorAnnotation) attributeResource.getAnnotation(JPA.SEQUENCE_GENERATOR); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + SequenceGeneratorAnnotation generatorAnnotation = (SequenceGeneratorAnnotation) resourceField.getAnnotation(JPA.SEQUENCE_GENERATOR); assertEquals("mySequenceName", generatorAnnotation.getSequenceName()); idMapping.getGeneratorContainer().getSequenceGenerator().setName(null); idMapping.getGeneratorContainer().getSequenceGenerator().setSpecifiedSequenceName(null); - generatorAnnotation = (SequenceGeneratorAnnotation) attributeResource.getAnnotation(JPA.SEQUENCE_GENERATOR); + generatorAnnotation = (SequenceGeneratorAnnotation) resourceField.getAnnotation(JPA.SEQUENCE_GENERATOR); assertNull(generatorAnnotation.getName()); } diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaTableGeneratorTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaTableGeneratorTests.java index e2bcaefa29..f76929a311 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaTableGeneratorTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaTableGeneratorTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2010 Oracle. All rights reserved. + * Copyright (c) 2007, 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,6 +12,9 @@ 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.JavaResourceField; +import org.eclipse.jpt.common.core.resource.java.JavaResourceType; +import org.eclipse.jpt.common.core.resource.java.JavaResourceAnnotatedElement.Kind; import org.eclipse.jpt.common.utility.internal.iterators.ArrayIterator; import org.eclipse.jpt.jpa.core.JptJpaCorePlugin; import org.eclipse.jpt.jpa.core.MappingKeys; @@ -24,8 +27,6 @@ import org.eclipse.jpt.jpa.core.context.java.JavaUniqueConstraint; import org.eclipse.jpt.jpa.core.context.orm.OrmEntity; import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentType; 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.TableGeneratorAnnotation; import org.eclipse.jpt.jpa.core.resource.java.UniqueConstraintAnnotation; import org.eclipse.jpt.jpa.core.resource.persistence.PersistenceFactory; @@ -68,9 +69,9 @@ public class JavaTableGeneratorTests extends ContextModelTestCase assertEquals(TABLE_GENERATOR_NAME, idMapping.getGeneratorContainer().getTableGenerator().getName()); //change resource model tableGenerator name, verify the context model is updated - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - TableGeneratorAnnotation tableGenerator = (TableGeneratorAnnotation) attributeResource.getAnnotation(JPA.TABLE_GENERATOR); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + TableGeneratorAnnotation tableGenerator = (TableGeneratorAnnotation) resourceField.getAnnotation(JPA.TABLE_GENERATOR); tableGenerator.setName("foo"); getJpaProject().synchronizeContextModel(); @@ -89,9 +90,9 @@ public class JavaTableGeneratorTests extends ContextModelTestCase assertEquals("foo", idMapping.getGeneratorContainer().getTableGenerator().getName()); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - TableGeneratorAnnotation tableGenerator = (TableGeneratorAnnotation) attributeResource.getAnnotation(JPA.TABLE_GENERATOR); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + TableGeneratorAnnotation tableGenerator = (TableGeneratorAnnotation) resourceField.getAnnotation(JPA.TABLE_GENERATOR); assertEquals("foo", tableGenerator.getName()); } @@ -103,9 +104,9 @@ public class JavaTableGeneratorTests extends ContextModelTestCase IdMapping idMapping = (IdMapping) getJavaPersistentType().getAttributeNamed("id").getMapping(); assertNull(idMapping.getGeneratorContainer().getTableGenerator().getCatalog()); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - TableGeneratorAnnotation tableGenerator = (TableGeneratorAnnotation) attributeResource.getAnnotation(JPA.TABLE_GENERATOR); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + TableGeneratorAnnotation tableGenerator = (TableGeneratorAnnotation) resourceField.getAnnotation(JPA.TABLE_GENERATOR); tableGenerator.setCatalog("myCatalog"); getJpaProject().synchronizeContextModel(); @@ -135,9 +136,9 @@ public class JavaTableGeneratorTests extends ContextModelTestCase IdMapping idMapping = (IdMapping) getJavaPersistentType().getAttributeNamed("id").getMapping(); idMapping.getGeneratorContainer().getTableGenerator().setSpecifiedCatalog("myCatalog"); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - TableGeneratorAnnotation generatorAnnotation = (TableGeneratorAnnotation) attributeResource.getAnnotation(JPA.TABLE_GENERATOR); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + TableGeneratorAnnotation generatorAnnotation = (TableGeneratorAnnotation) resourceField.getAnnotation(JPA.TABLE_GENERATOR); assertEquals("myCatalog", generatorAnnotation.getCatalog()); } @@ -149,9 +150,9 @@ public class JavaTableGeneratorTests extends ContextModelTestCase IdMapping idMapping = (IdMapping) getJavaPersistentType().getAttributeNamed("id").getMapping(); assertNull(idMapping.getGeneratorContainer().getTableGenerator().getSchema()); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - TableGeneratorAnnotation tableGenerator = (TableGeneratorAnnotation) attributeResource.getAnnotation(JPA.TABLE_GENERATOR); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + TableGeneratorAnnotation tableGenerator = (TableGeneratorAnnotation) resourceField.getAnnotation(JPA.TABLE_GENERATOR); tableGenerator.setSchema("mySchema"); getJpaProject().synchronizeContextModel(); @@ -209,9 +210,9 @@ public class JavaTableGeneratorTests extends ContextModelTestCase IdMapping idMapping = (IdMapping) getJavaPersistentType().getAttributeNamed("id").getMapping(); idMapping.getGeneratorContainer().getTableGenerator().setSpecifiedSchema("mySchema"); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - TableGeneratorAnnotation generatorAnnotation = (TableGeneratorAnnotation) attributeResource.getAnnotation(JPA.TABLE_GENERATOR); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + TableGeneratorAnnotation generatorAnnotation = (TableGeneratorAnnotation) resourceField.getAnnotation(JPA.TABLE_GENERATOR); assertEquals("mySchema", generatorAnnotation.getSchema()); } @@ -223,9 +224,9 @@ public class JavaTableGeneratorTests extends ContextModelTestCase IdMapping idMapping = (IdMapping) getJavaPersistentType().getAttributeNamed("id").getMapping(); assertNull(idMapping.getGeneratorContainer().getTableGenerator().getPkColumnName()); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - TableGeneratorAnnotation tableGenerator = (TableGeneratorAnnotation) attributeResource.getAnnotation(JPA.TABLE_GENERATOR); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + TableGeneratorAnnotation tableGenerator = (TableGeneratorAnnotation) resourceField.getAnnotation(JPA.TABLE_GENERATOR); tableGenerator.setPkColumnName("myPkColumnName"); getJpaProject().synchronizeContextModel(); @@ -255,9 +256,9 @@ public class JavaTableGeneratorTests extends ContextModelTestCase IdMapping idMapping = (IdMapping) getJavaPersistentType().getAttributeNamed("id").getMapping(); idMapping.getGeneratorContainer().getTableGenerator().setSpecifiedPkColumnName("myPkColumnName"); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - TableGeneratorAnnotation generatorAnnotation = (TableGeneratorAnnotation) attributeResource.getAnnotation(JPA.TABLE_GENERATOR); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + TableGeneratorAnnotation generatorAnnotation = (TableGeneratorAnnotation) resourceField.getAnnotation(JPA.TABLE_GENERATOR); assertEquals("myPkColumnName", generatorAnnotation.getPkColumnName()); } @@ -269,9 +270,9 @@ public class JavaTableGeneratorTests extends ContextModelTestCase IdMapping idMapping = (IdMapping) getJavaPersistentType().getAttributeNamed("id").getMapping(); assertNull(idMapping.getGeneratorContainer().getTableGenerator().getValueColumnName()); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - TableGeneratorAnnotation tableGenerator = (TableGeneratorAnnotation) attributeResource.getAnnotation(JPA.TABLE_GENERATOR); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + TableGeneratorAnnotation tableGenerator = (TableGeneratorAnnotation) resourceField.getAnnotation(JPA.TABLE_GENERATOR); tableGenerator.setValueColumnName("myValueColumnName"); getJpaProject().synchronizeContextModel(); @@ -301,9 +302,9 @@ public class JavaTableGeneratorTests extends ContextModelTestCase IdMapping idMapping = (IdMapping) getJavaPersistentType().getAttributeNamed("id").getMapping(); idMapping.getGeneratorContainer().getTableGenerator().setSpecifiedValueColumnName("myValueColumnName"); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - TableGeneratorAnnotation generatorAnnotation = (TableGeneratorAnnotation) attributeResource.getAnnotation(JPA.TABLE_GENERATOR); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + TableGeneratorAnnotation generatorAnnotation = (TableGeneratorAnnotation) resourceField.getAnnotation(JPA.TABLE_GENERATOR); assertEquals("myValueColumnName", generatorAnnotation.getValueColumnName()); } @@ -315,9 +316,9 @@ public class JavaTableGeneratorTests extends ContextModelTestCase IdMapping idMapping = (IdMapping) getJavaPersistentType().getAttributeNamed("id").getMapping(); assertNull(idMapping.getGeneratorContainer().getTableGenerator().getPkColumnValue()); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - TableGeneratorAnnotation tableGenerator = (TableGeneratorAnnotation) attributeResource.getAnnotation(JPA.TABLE_GENERATOR); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + TableGeneratorAnnotation tableGenerator = (TableGeneratorAnnotation) resourceField.getAnnotation(JPA.TABLE_GENERATOR); tableGenerator.setPkColumnValue("myPkColumnValue"); getJpaProject().synchronizeContextModel(); @@ -347,9 +348,9 @@ public class JavaTableGeneratorTests extends ContextModelTestCase IdMapping idMapping = (IdMapping) getJavaPersistentType().getAttributeNamed("id").getMapping(); idMapping.getGeneratorContainer().getTableGenerator().setSpecifiedPkColumnValue("myPkColumnValue"); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - TableGeneratorAnnotation generatorAnnotation = (TableGeneratorAnnotation) attributeResource.getAnnotation(JPA.TABLE_GENERATOR); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + TableGeneratorAnnotation generatorAnnotation = (TableGeneratorAnnotation) resourceField.getAnnotation(JPA.TABLE_GENERATOR); assertEquals("myPkColumnValue", generatorAnnotation.getPkColumnValue()); } @@ -361,9 +362,9 @@ public class JavaTableGeneratorTests extends ContextModelTestCase IdMapping idMapping = (IdMapping) getJavaPersistentType().getAttributeNamed("id").getMapping(); assertEquals(TableGenerator.DEFAULT_INITIAL_VALUE, idMapping.getGeneratorContainer().getTableGenerator().getInitialValue()); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - TableGeneratorAnnotation tableGenerator = (TableGeneratorAnnotation) attributeResource.getAnnotation(JPA.TABLE_GENERATOR); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + TableGeneratorAnnotation tableGenerator = (TableGeneratorAnnotation) resourceField.getAnnotation(JPA.TABLE_GENERATOR); tableGenerator.setInitialValue(Integer.valueOf(82)); getJpaProject().synchronizeContextModel(); @@ -393,9 +394,9 @@ public class JavaTableGeneratorTests extends ContextModelTestCase IdMapping idMapping = (IdMapping) getJavaPersistentType().getAttributeNamed("id").getMapping(); idMapping.getGeneratorContainer().getTableGenerator().setSpecifiedInitialValue(Integer.valueOf(20)); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - TableGeneratorAnnotation generatorAnnotation = (TableGeneratorAnnotation) attributeResource.getAnnotation(JPA.TABLE_GENERATOR); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + TableGeneratorAnnotation generatorAnnotation = (TableGeneratorAnnotation) resourceField.getAnnotation(JPA.TABLE_GENERATOR); assertEquals(Integer.valueOf(20), generatorAnnotation.getInitialValue()); } @@ -408,9 +409,9 @@ public class JavaTableGeneratorTests extends ContextModelTestCase assertEquals(Generator.DEFAULT_ALLOCATION_SIZE, idMapping.getGeneratorContainer().getTableGenerator().getAllocationSize()); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - TableGeneratorAnnotation tableGenerator = (TableGeneratorAnnotation) attributeResource.getAnnotation(JPA.TABLE_GENERATOR); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + TableGeneratorAnnotation tableGenerator = (TableGeneratorAnnotation) resourceField.getAnnotation(JPA.TABLE_GENERATOR); tableGenerator.setAllocationSize(Integer.valueOf(20)); getJpaProject().synchronizeContextModel(); @@ -440,9 +441,9 @@ public class JavaTableGeneratorTests extends ContextModelTestCase IdMapping idMapping = (IdMapping) getJavaPersistentType().getAttributeNamed("id").getMapping(); idMapping.getGeneratorContainer().getTableGenerator().setSpecifiedAllocationSize(Integer.valueOf(25)); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - TableGeneratorAnnotation generatorAnnotation = (TableGeneratorAnnotation) attributeResource.getAnnotation(JPA.TABLE_GENERATOR); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + TableGeneratorAnnotation generatorAnnotation = (TableGeneratorAnnotation) resourceField.getAnnotation(JPA.TABLE_GENERATOR); assertEquals(Integer.valueOf(25), generatorAnnotation.getAllocationSize()); } @@ -457,9 +458,9 @@ public class JavaTableGeneratorTests extends ContextModelTestCase Iterator uniqueConstraints = tableGenerator.getUniqueConstraints().iterator(); assertFalse(uniqueConstraints.hasNext()); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - TableGeneratorAnnotation tableGeneratorAnnotation = (TableGeneratorAnnotation) attributeResource.getAnnotation(JPA.TABLE_GENERATOR); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + TableGeneratorAnnotation tableGeneratorAnnotation = (TableGeneratorAnnotation) resourceField.getAnnotation(JPA.TABLE_GENERATOR); tableGeneratorAnnotation.addUniqueConstraint(0).addColumnName(0, "foo"); tableGeneratorAnnotation.addUniqueConstraint(0).addColumnName(0, "bar"); getJpaProject().synchronizeContextModel(); @@ -479,9 +480,9 @@ public class JavaTableGeneratorTests extends ContextModelTestCase assertEquals(0, tableGenerator.getUniqueConstraintsSize()); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - TableGeneratorAnnotation tableGeneratorAnnotation = (TableGeneratorAnnotation) attributeResource.getAnnotation(JPA.TABLE_GENERATOR); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + TableGeneratorAnnotation tableGeneratorAnnotation = (TableGeneratorAnnotation) resourceField.getAnnotation(JPA.TABLE_GENERATOR); tableGeneratorAnnotation.addUniqueConstraint(0).addColumnName(0, "foo"); tableGeneratorAnnotation.addUniqueConstraint(1).addColumnName(0, "bar"); @@ -498,14 +499,14 @@ public class JavaTableGeneratorTests extends ContextModelTestCase tableGenerator.addUniqueConstraint(0).addColumnName(0, "BAR"); tableGenerator.addUniqueConstraint(0).addColumnName(0, "BAZ"); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - TableGeneratorAnnotation tableGeneratorAnnotation = (TableGeneratorAnnotation) attributeResource.getAnnotation(JPA.TABLE_GENERATOR); - ListIterator uniqueConstraints = tableGeneratorAnnotation.uniqueConstraints(); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + TableGeneratorAnnotation tableGeneratorAnnotation = (TableGeneratorAnnotation) resourceField.getAnnotation(JPA.TABLE_GENERATOR); + ListIterator uniqueConstraints = tableGeneratorAnnotation.getUniqueConstraints().iterator(); - assertEquals("BAZ", uniqueConstraints.next().columnNames().next()); - assertEquals("BAR", uniqueConstraints.next().columnNames().next()); - assertEquals("FOO", uniqueConstraints.next().columnNames().next()); + assertEquals("BAZ", uniqueConstraints.next().columnNameAt(0)); + assertEquals("BAR", uniqueConstraints.next().columnNameAt(0)); + assertEquals("FOO", uniqueConstraints.next().columnNameAt(0)); assertFalse(uniqueConstraints.hasNext()); } @@ -518,14 +519,14 @@ public class JavaTableGeneratorTests extends ContextModelTestCase tableGenerator.addUniqueConstraint(1).addColumnName(0, "BAR"); tableGenerator.addUniqueConstraint(0).addColumnName(0, "BAZ"); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - TableGeneratorAnnotation tableGeneratorAnnotation = (TableGeneratorAnnotation) attributeResource.getAnnotation(JPA.TABLE_GENERATOR); - ListIterator uniqueConstraints = tableGeneratorAnnotation.uniqueConstraints(); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + TableGeneratorAnnotation tableGeneratorAnnotation = (TableGeneratorAnnotation) resourceField.getAnnotation(JPA.TABLE_GENERATOR); + ListIterator uniqueConstraints = tableGeneratorAnnotation.getUniqueConstraints().iterator(); - assertEquals("BAZ", uniqueConstraints.next().columnNames().next()); - assertEquals("FOO", uniqueConstraints.next().columnNames().next()); - assertEquals("BAR", uniqueConstraints.next().columnNames().next()); + assertEquals("BAZ", uniqueConstraints.next().columnNameAt(0)); + assertEquals("FOO", uniqueConstraints.next().columnNameAt(0)); + assertEquals("BAR", uniqueConstraints.next().columnNameAt(0)); assertFalse(uniqueConstraints.hasNext()); } @@ -538,17 +539,17 @@ public class JavaTableGeneratorTests extends ContextModelTestCase tableGenerator.addUniqueConstraint(1).addColumnName(0, "BAR"); tableGenerator.addUniqueConstraint(2).addColumnName(0, "BAZ"); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - TableGeneratorAnnotation tableGeneratorAnnotation = (TableGeneratorAnnotation) attributeResource.getAnnotation(JPA.TABLE_GENERATOR); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + TableGeneratorAnnotation tableGeneratorAnnotation = (TableGeneratorAnnotation) resourceField.getAnnotation(JPA.TABLE_GENERATOR); - assertEquals(3, tableGeneratorAnnotation.uniqueConstraintsSize()); + assertEquals(3, tableGeneratorAnnotation.getUniqueConstraintsSize()); tableGenerator.removeUniqueConstraint(1); - ListIterator uniqueConstraintAnnotations = tableGeneratorAnnotation.uniqueConstraints(); - assertEquals("FOO", uniqueConstraintAnnotations.next().columnNames().next()); - assertEquals("BAZ", uniqueConstraintAnnotations.next().columnNames().next()); + ListIterator uniqueConstraintAnnotations = tableGeneratorAnnotation.getUniqueConstraints().iterator(); + assertEquals("FOO", uniqueConstraintAnnotations.next().columnNameAt(0)); + assertEquals("BAZ", uniqueConstraintAnnotations.next().columnNameAt(0)); assertFalse(uniqueConstraintAnnotations.hasNext()); Iterator uniqueConstraints = tableGenerator.getUniqueConstraints().iterator(); @@ -558,8 +559,8 @@ public class JavaTableGeneratorTests extends ContextModelTestCase tableGenerator.removeUniqueConstraint(1); - uniqueConstraintAnnotations = tableGeneratorAnnotation.uniqueConstraints(); - assertEquals("FOO", uniqueConstraintAnnotations.next().columnNames().next()); + uniqueConstraintAnnotations = tableGeneratorAnnotation.getUniqueConstraints().iterator(); + assertEquals("FOO", uniqueConstraintAnnotations.next().columnNameAt(0)); assertFalse(uniqueConstraintAnnotations.hasNext()); uniqueConstraints = tableGenerator.getUniqueConstraints().iterator(); @@ -568,7 +569,7 @@ public class JavaTableGeneratorTests extends ContextModelTestCase tableGenerator.removeUniqueConstraint(0); - uniqueConstraintAnnotations = tableGeneratorAnnotation.uniqueConstraints(); + uniqueConstraintAnnotations = tableGeneratorAnnotation.getUniqueConstraints().iterator(); assertFalse(uniqueConstraintAnnotations.hasNext()); uniqueConstraints = tableGenerator.getUniqueConstraints().iterator(); assertFalse(uniqueConstraints.hasNext()); @@ -583,11 +584,11 @@ public class JavaTableGeneratorTests extends ContextModelTestCase tableGenerator.addUniqueConstraint(1).addColumnName(0, "BAR"); tableGenerator.addUniqueConstraint(2).addColumnName(0, "BAZ"); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - TableGeneratorAnnotation tableGeneratorAnnotation = (TableGeneratorAnnotation) attributeResource.getAnnotation(JPA.TABLE_GENERATOR); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + TableGeneratorAnnotation tableGeneratorAnnotation = (TableGeneratorAnnotation) resourceField.getAnnotation(JPA.TABLE_GENERATOR); - assertEquals(3, tableGeneratorAnnotation.uniqueConstraintsSize()); + assertEquals(3, tableGeneratorAnnotation.getUniqueConstraintsSize()); tableGenerator.moveUniqueConstraint(2, 0); @@ -596,10 +597,10 @@ public class JavaTableGeneratorTests extends ContextModelTestCase assertEquals("BAZ", uniqueConstraints.next().getColumnNames().iterator().next()); assertEquals("FOO", uniqueConstraints.next().getColumnNames().iterator().next()); - ListIterator uniqueConstraintAnnotations = tableGeneratorAnnotation.uniqueConstraints(); - assertEquals("BAR", uniqueConstraintAnnotations.next().columnNames().next()); - assertEquals("BAZ", uniqueConstraintAnnotations.next().columnNames().next()); - assertEquals("FOO", uniqueConstraintAnnotations.next().columnNames().next()); + ListIterator uniqueConstraintAnnotations = tableGeneratorAnnotation.getUniqueConstraints().iterator(); + assertEquals("BAR", uniqueConstraintAnnotations.next().columnNameAt(0)); + assertEquals("BAZ", uniqueConstraintAnnotations.next().columnNameAt(0)); + assertEquals("FOO", uniqueConstraintAnnotations.next().columnNameAt(0)); tableGenerator.moveUniqueConstraint(0, 1); @@ -608,10 +609,10 @@ public class JavaTableGeneratorTests extends ContextModelTestCase assertEquals("BAR", uniqueConstraints.next().getColumnNames().iterator().next()); assertEquals("FOO", uniqueConstraints.next().getColumnNames().iterator().next()); - uniqueConstraintAnnotations = tableGeneratorAnnotation.uniqueConstraints(); - assertEquals("BAZ", uniqueConstraintAnnotations.next().columnNames().next()); - assertEquals("BAR", uniqueConstraintAnnotations.next().columnNames().next()); - assertEquals("FOO", uniqueConstraintAnnotations.next().columnNames().next()); + uniqueConstraintAnnotations = tableGeneratorAnnotation.getUniqueConstraints().iterator(); + assertEquals("BAZ", uniqueConstraintAnnotations.next().columnNameAt(0)); + assertEquals("BAR", uniqueConstraintAnnotations.next().columnNameAt(0)); + assertEquals("FOO", uniqueConstraintAnnotations.next().columnNameAt(0)); } public void testUpdateUniqueConstraints() throws Exception { @@ -619,9 +620,9 @@ public class JavaTableGeneratorTests extends ContextModelTestCase addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); TableGenerator tableGenerator = ((IdMapping) getJavaPersistentType().getAttributeNamed("id").getMapping()).getGeneratorContainer().getTableGenerator(); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - TableGeneratorAnnotation tableGeneratorAnnotation = (TableGeneratorAnnotation) attributeResource.getAnnotation(JPA.TABLE_GENERATOR); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + TableGeneratorAnnotation tableGeneratorAnnotation = (TableGeneratorAnnotation) resourceField.getAnnotation(JPA.TABLE_GENERATOR); tableGeneratorAnnotation.addUniqueConstraint(0).addColumnName("FOO"); tableGeneratorAnnotation.addUniqueConstraint(1).addColumnName("BAR"); diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaTableTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaTableTests.java index 100e146e2d..bf56915960 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaTableTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaTableTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2010 Oracle. All rights reserved. + * Copyright (c) 2007, 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. @@ -13,6 +13,8 @@ import java.util.Iterator; import java.util.ListIterator; import org.eclipse.core.resources.IFile; import org.eclipse.jdt.core.ICompilationUnit; +import org.eclipse.jpt.common.core.resource.java.JavaResourceType; +import org.eclipse.jpt.common.core.resource.java.JavaResourceAnnotatedElement.Kind; import org.eclipse.jpt.common.utility.internal.iterators.ArrayIterator; import org.eclipse.jpt.jpa.core.JptJpaCorePlugin; import org.eclipse.jpt.jpa.core.MappingKeys; @@ -26,7 +28,6 @@ import org.eclipse.jpt.jpa.core.context.orm.OrmEntity; import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentType; import org.eclipse.jpt.jpa.core.context.persistence.ClassRef; 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.TableAnnotation; import org.eclipse.jpt.jpa.core.resource.java.UniqueConstraintAnnotation; import org.eclipse.jpt.jpa.core.resource.persistence.PersistenceFactory; @@ -142,7 +143,7 @@ public class JavaTableTests extends ContextModelTestCase addXmlClassRef(PACKAGE_NAME + ".AnnotationTestTypeChild"); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ListIterator specifiedClassRefs = getPersistenceUnit().specifiedClassRefs(); + ListIterator specifiedClassRefs = getPersistenceUnit().getSpecifiedClassRefs().iterator(); Entity childEntity = (Entity) specifiedClassRefs.next().getJavaPersistentType().getMapping(); Entity rootEntity = (Entity) specifiedClassRefs.next().getJavaPersistentType().getMapping(); @@ -214,8 +215,8 @@ public class JavaTableTests extends ContextModelTestCase assertEquals("foo", getJavaEntity().getTable().getSpecifiedName()); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - TableAnnotation table = (TableAnnotation) typeResource.getAnnotation(JPA.TABLE); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + TableAnnotation table = (TableAnnotation) resourceType.getAnnotation(JPA.TABLE); assertEquals("foo", table.getName()); } @@ -228,8 +229,8 @@ public class JavaTableTests extends ContextModelTestCase assertNull(getJavaEntity().getTable().getSpecifiedName()); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - TableAnnotation table = (TableAnnotation) typeResource.getAnnotation(JPA.TABLE); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + TableAnnotation table = (TableAnnotation) resourceType.getAnnotation(JPA.TABLE); assertNull(table); } @@ -238,14 +239,14 @@ public class JavaTableTests extends ContextModelTestCase createTestEntityWithTable(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - TableAnnotation table = (TableAnnotation) typeResource.getAnnotation(JPA.TABLE); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + TableAnnotation table = (TableAnnotation) resourceType.getAnnotation(JPA.TABLE); table.setName("foo"); getJpaProject().synchronizeContextModel(); assertEquals("foo", getJavaEntity().getTable().getSpecifiedName()); - typeResource.removeAnnotation(JPA.TABLE); + resourceType.removeAnnotation(JPA.TABLE); getJpaProject().synchronizeContextModel(); assertNull(getJavaEntity().getTable().getSpecifiedName()); } @@ -254,8 +255,8 @@ public class JavaTableTests extends ContextModelTestCase createTestEntityWithTable(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - TableAnnotation table = (TableAnnotation) typeResource.getAnnotation(JPA.TABLE); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + TableAnnotation table = (TableAnnotation) resourceType.getAnnotation(JPA.TABLE); table.setCatalog("myCatalog"); getJpaProject().synchronizeContextModel(); @@ -318,21 +319,21 @@ public class JavaTableTests extends ContextModelTestCase Table table = getJavaEntity().getTable(); table.setSpecifiedCatalog("myCatalog"); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - TableAnnotation tableResource = (TableAnnotation) typeResource.getAnnotation(JPA.TABLE); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + TableAnnotation tableResource = (TableAnnotation) resourceType.getAnnotation(JPA.TABLE); assertEquals("myCatalog", tableResource.getCatalog()); table.setSpecifiedCatalog(null); - assertNull(typeResource.getAnnotation(JPA.TABLE)); + assertNull(resourceType.getAnnotation(JPA.TABLE)); } public void testGetSchema() throws Exception { createTestEntityWithTable(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - TableAnnotation table = (TableAnnotation) typeResource.getAnnotation(JPA.TABLE); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + TableAnnotation table = (TableAnnotation) resourceType.getAnnotation(JPA.TABLE); table.setSchema("mySchema"); getJpaProject().synchronizeContextModel(); @@ -358,29 +359,29 @@ public class JavaTableTests extends ContextModelTestCase Table table = getJavaEntity().getTable(); table.setSpecifiedSchema("mySchema"); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - TableAnnotation tableResource = (TableAnnotation) typeResource.getAnnotation(JPA.TABLE); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + TableAnnotation tableResource = (TableAnnotation) resourceType.getAnnotation(JPA.TABLE); assertEquals("mySchema", tableResource.getSchema()); table.setSpecifiedSchema(null); - assertNull(typeResource.getAnnotation(JPA.TABLE)); + assertNull(resourceType.getAnnotation(JPA.TABLE)); } public void testUniqueConstraints() throws Exception { createTestEntityWithTable(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ListIterator uniqueConstraints = getJavaEntity().getTable().uniqueConstraints(); + ListIterator uniqueConstraints = getJavaEntity().getTable().getUniqueConstraints().iterator(); assertFalse(uniqueConstraints.hasNext()); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - TableAnnotation tableAnnotation = (TableAnnotation) typeResource.getAnnotation(JPA.TABLE); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + TableAnnotation tableAnnotation = (TableAnnotation) resourceType.getAnnotation(JPA.TABLE); tableAnnotation.addUniqueConstraint(0).addColumnName(0, "foo"); tableAnnotation.addUniqueConstraint(0).addColumnName(0, "bar"); getJpaProject().synchronizeContextModel(); - uniqueConstraints = getJavaEntity().getTable().uniqueConstraints(); + uniqueConstraints = getJavaEntity().getTable().getUniqueConstraints().iterator(); assertTrue(uniqueConstraints.hasNext()); assertEquals("bar", uniqueConstraints.next().getColumnNames().iterator().next()); assertEquals("foo", uniqueConstraints.next().getColumnNames().iterator().next()); @@ -391,15 +392,15 @@ public class JavaTableTests extends ContextModelTestCase createTestEntityWithTable(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - assertEquals(0, getJavaEntity().getTable().uniqueConstraintsSize()); + assertEquals(0, getJavaEntity().getTable().getUniqueConstraintsSize()); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - TableAnnotation tableAnnotation = (TableAnnotation) typeResource.getAnnotation(JPA.TABLE); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + TableAnnotation tableAnnotation = (TableAnnotation) resourceType.getAnnotation(JPA.TABLE); tableAnnotation.addUniqueConstraint(0).addColumnName(0, "foo"); tableAnnotation.addUniqueConstraint(1).addColumnName(0, "bar"); getJpaProject().synchronizeContextModel(); - assertEquals(2, getJavaEntity().getTable().uniqueConstraintsSize()); + assertEquals(2, getJavaEntity().getTable().getUniqueConstraintsSize()); } public void testAddUniqueConstraint() throws Exception { @@ -411,13 +412,13 @@ public class JavaTableTests extends ContextModelTestCase table.addUniqueConstraint(0).addColumnName(0, "BAR"); table.addUniqueConstraint(0).addColumnName(0, "BAZ"); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - TableAnnotation tableAnnotation = (TableAnnotation) typeResource.getAnnotation(JPA.TABLE); - ListIterator uniqueConstraints = tableAnnotation.uniqueConstraints(); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + TableAnnotation tableAnnotation = (TableAnnotation) resourceType.getAnnotation(JPA.TABLE); + ListIterator uniqueConstraints = tableAnnotation.getUniqueConstraints().iterator(); - assertEquals("BAZ", uniqueConstraints.next().columnNames().next()); - assertEquals("BAR", uniqueConstraints.next().columnNames().next()); - assertEquals("FOO", uniqueConstraints.next().columnNames().next()); + assertEquals("BAZ", uniqueConstraints.next().columnNameAt(0)); + assertEquals("BAR", uniqueConstraints.next().columnNameAt(0)); + assertEquals("FOO", uniqueConstraints.next().columnNameAt(0)); assertFalse(uniqueConstraints.hasNext()); } @@ -430,13 +431,13 @@ public class JavaTableTests extends ContextModelTestCase table.addUniqueConstraint(1).addColumnName(0, "BAR"); table.addUniqueConstraint(0).addColumnName(0, "BAZ"); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - TableAnnotation tableAnnotation = (TableAnnotation) typeResource.getAnnotation(JPA.TABLE); - ListIterator uniqueConstraints = tableAnnotation.uniqueConstraints(); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + TableAnnotation tableAnnotation = (TableAnnotation) resourceType.getAnnotation(JPA.TABLE); + ListIterator uniqueConstraints = tableAnnotation.getUniqueConstraints().iterator(); - assertEquals("BAZ", uniqueConstraints.next().columnNames().next()); - assertEquals("FOO", uniqueConstraints.next().columnNames().next()); - assertEquals("BAR", uniqueConstraints.next().columnNames().next()); + assertEquals("BAZ", uniqueConstraints.next().columnNameAt(0)); + assertEquals("FOO", uniqueConstraints.next().columnNameAt(0)); + assertEquals("BAR", uniqueConstraints.next().columnNameAt(0)); assertFalse(uniqueConstraints.hasNext()); } @@ -449,38 +450,38 @@ public class JavaTableTests extends ContextModelTestCase table.addUniqueConstraint(1).addColumnName(0, "BAR"); table.addUniqueConstraint(2).addColumnName(0, "BAZ"); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - TableAnnotation tableAnnotation = (TableAnnotation) typeResource.getAnnotation(JPA.TABLE); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + TableAnnotation tableAnnotation = (TableAnnotation) resourceType.getAnnotation(JPA.TABLE); - assertEquals(3, tableAnnotation.uniqueConstraintsSize()); + assertEquals(3, tableAnnotation.getUniqueConstraintsSize()); table.removeUniqueConstraint(1); - ListIterator uniqueConstraintAnnotations = tableAnnotation.uniqueConstraints(); - assertEquals("FOO", uniqueConstraintAnnotations.next().columnNames().next()); - assertEquals("BAZ", uniqueConstraintAnnotations.next().columnNames().next()); + ListIterator uniqueConstraintAnnotations = tableAnnotation.getUniqueConstraints().iterator(); + assertEquals("FOO", uniqueConstraintAnnotations.next().columnNameAt(0)); + assertEquals("BAZ", uniqueConstraintAnnotations.next().columnNameAt(0)); assertFalse(uniqueConstraintAnnotations.hasNext()); - Iterator uniqueConstraints = table.uniqueConstraints(); + Iterator uniqueConstraints = table.getUniqueConstraints().iterator(); assertEquals("FOO", uniqueConstraints.next().getColumnNames().iterator().next()); assertEquals("BAZ", uniqueConstraints.next().getColumnNames().iterator().next()); assertFalse(uniqueConstraints.hasNext()); table.removeUniqueConstraint(1); - uniqueConstraintAnnotations = tableAnnotation.uniqueConstraints(); - assertEquals("FOO", uniqueConstraintAnnotations.next().columnNames().next()); + uniqueConstraintAnnotations = tableAnnotation.getUniqueConstraints().iterator(); + assertEquals("FOO", uniqueConstraintAnnotations.next().columnNameAt(0)); assertFalse(uniqueConstraintAnnotations.hasNext()); - uniqueConstraints = table.uniqueConstraints(); + uniqueConstraints = table.getUniqueConstraints().iterator(); assertEquals("FOO", uniqueConstraints.next().getColumnNames().iterator().next()); assertFalse(uniqueConstraints.hasNext()); table.removeUniqueConstraint(0); - uniqueConstraintAnnotations = tableAnnotation.uniqueConstraints(); + uniqueConstraintAnnotations = tableAnnotation.getUniqueConstraints().iterator(); assertFalse(uniqueConstraintAnnotations.hasNext()); - uniqueConstraints = table.uniqueConstraints(); + uniqueConstraints = table.getUniqueConstraints().iterator(); assertFalse(uniqueConstraints.hasNext()); } @@ -493,34 +494,34 @@ public class JavaTableTests extends ContextModelTestCase table.addUniqueConstraint(1).addColumnName(0, "BAR"); table.addUniqueConstraint(2).addColumnName(0, "BAZ"); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - TableAnnotation tableAnnotation = (TableAnnotation) typeResource.getAnnotation(JPA.TABLE); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + TableAnnotation tableAnnotation = (TableAnnotation) resourceType.getAnnotation(JPA.TABLE); - assertEquals(3, tableAnnotation.uniqueConstraintsSize()); + assertEquals(3, tableAnnotation.getUniqueConstraintsSize()); table.moveUniqueConstraint(2, 0); - ListIterator uniqueConstraints = table.uniqueConstraints(); + ListIterator uniqueConstraints = table.getUniqueConstraints().iterator(); assertEquals("BAR", uniqueConstraints.next().getColumnNames().iterator().next()); assertEquals("BAZ", uniqueConstraints.next().getColumnNames().iterator().next()); assertEquals("FOO", uniqueConstraints.next().getColumnNames().iterator().next()); - ListIterator uniqueConstraintAnnotations = tableAnnotation.uniqueConstraints(); - assertEquals("BAR", uniqueConstraintAnnotations.next().columnNames().next()); - assertEquals("BAZ", uniqueConstraintAnnotations.next().columnNames().next()); - assertEquals("FOO", uniqueConstraintAnnotations.next().columnNames().next()); + ListIterator uniqueConstraintAnnotations = tableAnnotation.getUniqueConstraints().iterator(); + assertEquals("BAR", uniqueConstraintAnnotations.next().columnNameAt(0)); + assertEquals("BAZ", uniqueConstraintAnnotations.next().columnNameAt(0)); + assertEquals("FOO", uniqueConstraintAnnotations.next().columnNameAt(0)); table.moveUniqueConstraint(0, 1); - uniqueConstraints = table.uniqueConstraints(); + uniqueConstraints = table.getUniqueConstraints().iterator(); assertEquals("BAZ", uniqueConstraints.next().getColumnNames().iterator().next()); assertEquals("BAR", uniqueConstraints.next().getColumnNames().iterator().next()); assertEquals("FOO", uniqueConstraints.next().getColumnNames().iterator().next()); - uniqueConstraintAnnotations = tableAnnotation.uniqueConstraints(); - assertEquals("BAZ", uniqueConstraintAnnotations.next().columnNames().next()); - assertEquals("BAR", uniqueConstraintAnnotations.next().columnNames().next()); - assertEquals("FOO", uniqueConstraintAnnotations.next().columnNames().next()); + uniqueConstraintAnnotations = tableAnnotation.getUniqueConstraints().iterator(); + assertEquals("BAZ", uniqueConstraintAnnotations.next().columnNameAt(0)); + assertEquals("BAR", uniqueConstraintAnnotations.next().columnNameAt(0)); + assertEquals("FOO", uniqueConstraintAnnotations.next().columnNameAt(0)); } public void testUpdateUniqueConstraints() throws Exception { @@ -528,15 +529,15 @@ public class JavaTableTests extends ContextModelTestCase addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); JavaTable table = getJavaEntity().getTable(); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - TableAnnotation tableAnnotation = (TableAnnotation) typeResource.getAnnotation(JPA.TABLE); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + TableAnnotation tableAnnotation = (TableAnnotation) resourceType.getAnnotation(JPA.TABLE); tableAnnotation.addUniqueConstraint(0).addColumnName("FOO"); tableAnnotation.addUniqueConstraint(1).addColumnName("BAR"); tableAnnotation.addUniqueConstraint(2).addColumnName("BAZ"); getJpaProject().synchronizeContextModel(); - ListIterator uniqueConstraints = table.uniqueConstraints(); + ListIterator uniqueConstraints = table.getUniqueConstraints().iterator(); assertEquals("FOO", uniqueConstraints.next().getColumnNames().iterator().next()); assertEquals("BAR", uniqueConstraints.next().getColumnNames().iterator().next()); assertEquals("BAZ", uniqueConstraints.next().getColumnNames().iterator().next()); @@ -544,7 +545,7 @@ public class JavaTableTests extends ContextModelTestCase tableAnnotation.moveUniqueConstraint(2, 0); getJpaProject().synchronizeContextModel(); - uniqueConstraints = table.uniqueConstraints(); + uniqueConstraints = table.getUniqueConstraints().iterator(); assertEquals("BAR", uniqueConstraints.next().getColumnNames().iterator().next()); assertEquals("BAZ", uniqueConstraints.next().getColumnNames().iterator().next()); assertEquals("FOO", uniqueConstraints.next().getColumnNames().iterator().next()); @@ -552,7 +553,7 @@ public class JavaTableTests extends ContextModelTestCase tableAnnotation.moveUniqueConstraint(0, 1); getJpaProject().synchronizeContextModel(); - uniqueConstraints = table.uniqueConstraints(); + uniqueConstraints = table.getUniqueConstraints().iterator(); assertEquals("BAZ", uniqueConstraints.next().getColumnNames().iterator().next()); assertEquals("BAR", uniqueConstraints.next().getColumnNames().iterator().next()); assertEquals("FOO", uniqueConstraints.next().getColumnNames().iterator().next()); @@ -560,20 +561,20 @@ public class JavaTableTests extends ContextModelTestCase tableAnnotation.removeUniqueConstraint(1); getJpaProject().synchronizeContextModel(); - uniqueConstraints = table.uniqueConstraints(); + uniqueConstraints = table.getUniqueConstraints().iterator(); assertEquals("BAZ", uniqueConstraints.next().getColumnNames().iterator().next()); assertEquals("FOO", uniqueConstraints.next().getColumnNames().iterator().next()); assertFalse(uniqueConstraints.hasNext()); tableAnnotation.removeUniqueConstraint(1); getJpaProject().synchronizeContextModel(); - uniqueConstraints = table.uniqueConstraints(); + uniqueConstraints = table.getUniqueConstraints().iterator(); assertEquals("BAZ", uniqueConstraints.next().getColumnNames().iterator().next()); assertFalse(uniqueConstraints.hasNext()); tableAnnotation.removeUniqueConstraint(0); getJpaProject().synchronizeContextModel(); - uniqueConstraints = table.uniqueConstraints(); + uniqueConstraints = table.getUniqueConstraints().iterator(); assertFalse(uniqueConstraints.hasNext()); } @@ -584,7 +585,7 @@ public class JavaTableTests extends ContextModelTestCase addXmlClassRef(PACKAGE_NAME + ".AnnotationTestTypeChild"); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ListIterator specifiedClassRefs = getPersistenceUnit().specifiedClassRefs(); + ListIterator specifiedClassRefs = getPersistenceUnit().getSpecifiedClassRefs().iterator(); Entity concreteEntity = (Entity) specifiedClassRefs.next().getJavaPersistentType().getMapping(); assertEquals("AnnotationTestTypeChild", concreteEntity.getName()); diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaTransientMappingTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaTransientMappingTests.java index ade5cf3103..1cd48c8b30 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaTransientMappingTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaTransientMappingTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2009 Oracle. All rights reserved. + * Copyright (c) 2007, 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. @@ -11,6 +11,9 @@ package org.eclipse.jpt.jpa.core.tests.internal.context.java; import java.util.Iterator; import org.eclipse.jdt.core.ICompilationUnit; +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.JavaResourceAnnotatedElement.Kind; import org.eclipse.jpt.common.utility.internal.iterators.ArrayIterator; import org.eclipse.jpt.jpa.core.MappingKeys; import org.eclipse.jpt.jpa.core.context.BasicMapping; @@ -29,8 +32,6 @@ 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.ManyToManyAnnotation; import org.eclipse.jpt.jpa.core.resource.java.ManyToOneAnnotation; import org.eclipse.jpt.jpa.core.resource.java.OneToManyAnnotation; @@ -69,7 +70,7 @@ public class JavaTransientMappingTests extends ContextModelTestCase createTestEntityWithTransientMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); TransientMapping transientMapping = (TransientMapping) persistentAttribute.getMapping(); assertFalse(transientMapping.isDefault()); @@ -77,17 +78,17 @@ public class JavaTransientMappingTests 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(TransientAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getAnnotation(BasicAnnotation.ANNOTATION_NAME)); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + assertNull(resourceField.getAnnotation(TransientAnnotation.ANNOTATION_NAME)); + assertNotNull(resourceField.getAnnotation(BasicAnnotation.ANNOTATION_NAME)); } public void testMorphToDefault() throws Exception { createTestEntityWithTransientMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); TransientMapping transientMapping = (TransientMapping) persistentAttribute.getMapping(); assertFalse(transientMapping.isDefault()); @@ -95,152 +96,152 @@ public class JavaTransientMappingTests extends ContextModelTestCase assertTrue(persistentAttribute.getMapping() instanceof BasicMapping); assertTrue(persistentAttribute.getMapping().isDefault()); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - assertNull(attributeResource.getAnnotation(TransientAnnotation.ANNOTATION_NAME)); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + assertNull(resourceField.getAnnotation(TransientAnnotation.ANNOTATION_NAME)); } public void testMorphToVersionMapping() throws Exception { createTestEntityWithTransientMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); TransientMapping transientMapping = (TransientMapping) persistentAttribute.getMapping(); assertFalse(transientMapping.isDefault()); persistentAttribute.setMappingKey(MappingKeys.VERSION_ATTRIBUTE_MAPPING_KEY); assertTrue(persistentAttribute.getMapping() instanceof VersionMapping); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - assertNull(attributeResource.getAnnotation(TransientAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getAnnotation(VersionAnnotation.ANNOTATION_NAME)); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + assertNull(resourceField.getAnnotation(TransientAnnotation.ANNOTATION_NAME)); + assertNotNull(resourceField.getAnnotation(VersionAnnotation.ANNOTATION_NAME)); } public void testMorphToEmbeddedMapping() throws Exception { createTestEntityWithTransientMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); TransientMapping transientMapping = (TransientMapping) persistentAttribute.getMapping(); assertFalse(transientMapping.isDefault()); persistentAttribute.setMappingKey(MappingKeys.EMBEDDED_ATTRIBUTE_MAPPING_KEY); assertTrue(persistentAttribute.getMapping() instanceof EmbeddedMapping); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - assertNull(attributeResource.getAnnotation(TransientAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getAnnotation(EmbeddedAnnotation.ANNOTATION_NAME)); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + assertNull(resourceField.getAnnotation(TransientAnnotation.ANNOTATION_NAME)); + assertNotNull(resourceField.getAnnotation(EmbeddedAnnotation.ANNOTATION_NAME)); } public void testMorphToIdMapping() throws Exception { createTestEntityWithTransientMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); TransientMapping transientMapping = (TransientMapping) persistentAttribute.getMapping(); assertFalse(transientMapping.isDefault()); persistentAttribute.setMappingKey(MappingKeys.ID_ATTRIBUTE_MAPPING_KEY); assertTrue(persistentAttribute.getMapping() instanceof IdMapping); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - assertNull(attributeResource.getAnnotation(TransientAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getAnnotation(IdAnnotation.ANNOTATION_NAME)); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + assertNull(resourceField.getAnnotation(TransientAnnotation.ANNOTATION_NAME)); + assertNotNull(resourceField.getAnnotation(IdAnnotation.ANNOTATION_NAME)); } public void testMorphToEmbeddedIdMapping() throws Exception { createTestEntityWithTransientMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); TransientMapping transientMapping = (TransientMapping) persistentAttribute.getMapping(); assertFalse(transientMapping.isDefault()); persistentAttribute.setMappingKey(MappingKeys.EMBEDDED_ID_ATTRIBUTE_MAPPING_KEY); assertTrue(persistentAttribute.getMapping() instanceof EmbeddedIdMapping); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - assertNull(attributeResource.getAnnotation(TransientAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getAnnotation(EmbeddedIdAnnotation.ANNOTATION_NAME)); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + assertNull(resourceField.getAnnotation(TransientAnnotation.ANNOTATION_NAME)); + assertNotNull(resourceField.getAnnotation(EmbeddedIdAnnotation.ANNOTATION_NAME)); } public void testMorphToOneToOneMapping() throws Exception { createTestEntityWithTransientMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); TransientMapping transientMapping = (TransientMapping) persistentAttribute.getMapping(); assertFalse(transientMapping.isDefault()); persistentAttribute.setMappingKey(MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY); assertTrue(persistentAttribute.getMapping() instanceof OneToOneMapping); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - assertNull(attributeResource.getAnnotation(TransientAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getAnnotation(OneToOneAnnotation.ANNOTATION_NAME)); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + assertNull(resourceField.getAnnotation(TransientAnnotation.ANNOTATION_NAME)); + assertNotNull(resourceField.getAnnotation(OneToOneAnnotation.ANNOTATION_NAME)); } public void testMorphToOneToManyMapping() throws Exception { createTestEntityWithTransientMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); TransientMapping transientMapping = (TransientMapping) persistentAttribute.getMapping(); assertFalse(transientMapping.isDefault()); persistentAttribute.setMappingKey(MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY); assertTrue(persistentAttribute.getMapping() instanceof OneToManyMapping); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - assertNull(attributeResource.getAnnotation(TransientAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getAnnotation(OneToManyAnnotation.ANNOTATION_NAME)); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + assertNull(resourceField.getAnnotation(TransientAnnotation.ANNOTATION_NAME)); + assertNotNull(resourceField.getAnnotation(OneToManyAnnotation.ANNOTATION_NAME)); } public void testMorphToManyToOneMapping() throws Exception { createTestEntityWithTransientMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); TransientMapping transientMapping = (TransientMapping) persistentAttribute.getMapping(); assertFalse(transientMapping.isDefault()); persistentAttribute.setMappingKey(MappingKeys.MANY_TO_ONE_ATTRIBUTE_MAPPING_KEY); assertTrue(persistentAttribute.getMapping() instanceof ManyToOneMapping); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - assertNull(attributeResource.getAnnotation(TransientAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getAnnotation(ManyToOneAnnotation.ANNOTATION_NAME)); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + assertNull(resourceField.getAnnotation(TransientAnnotation.ANNOTATION_NAME)); + assertNotNull(resourceField.getAnnotation(ManyToOneAnnotation.ANNOTATION_NAME)); } public void testMorphToManyToManyMapping() throws Exception { createTestEntityWithTransientMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); TransientMapping transientMapping = (TransientMapping) persistentAttribute.getMapping(); assertFalse(transientMapping.isDefault()); persistentAttribute.setMappingKey(MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); assertTrue(persistentAttribute.getMapping() instanceof ManyToManyMapping); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - assertNull(attributeResource.getAnnotation(TransientAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getAnnotation(ManyToManyAnnotation.ANNOTATION_NAME)); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + assertNull(resourceField.getAnnotation(TransientAnnotation.ANNOTATION_NAME)); + assertNotNull(resourceField.getAnnotation(ManyToManyAnnotation.ANNOTATION_NAME)); } public void testTransientMapping() throws Exception { createTestEntityWithTransientMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); TransientMapping transientMapping = (TransientMapping) persistentAttribute.getMapping(); assertNotNull(transientMapping); diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaVersionMappingTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaVersionMappingTests.java index 196ec6b277..ddf1b927f4 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaVersionMappingTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaVersionMappingTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2010 Oracle. All rights reserved. + * Copyright (c) 2007, 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. @@ -11,6 +11,9 @@ package org.eclipse.jpt.jpa.core.tests.internal.context.java; import java.util.Iterator; import org.eclipse.jdt.core.ICompilationUnit; +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.JavaResourceAnnotatedElement.Kind; import org.eclipse.jpt.common.utility.internal.iterators.ArrayIterator; import org.eclipse.jpt.jpa.core.MappingKeys; import org.eclipse.jpt.jpa.core.context.BasicMapping; @@ -32,8 +35,6 @@ 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.ManyToManyAnnotation; import org.eclipse.jpt.jpa.core.resource.java.ManyToOneAnnotation; import org.eclipse.jpt.jpa.core.resource.java.OneToManyAnnotation; @@ -91,7 +92,7 @@ public class JavaVersionMappingTests extends ContextModelTestCase createTestEntityWithVersionMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); VersionMapping versionMapping = (VersionMapping) persistentAttribute.getMapping(); assertFalse(versionMapping.isDefault()); versionMapping.getColumn().setSpecifiedName("FOO"); @@ -103,19 +104,19 @@ public class JavaVersionMappingTests extends ContextModelTestCase assertEquals("FOO", ((BasicMapping) persistentAttribute.getMapping()).getColumn().getSpecifiedName()); assertEquals(TemporalType.TIME, ((TemporalConverter) ((BasicMapping) persistentAttribute.getMapping()).getConverter()).getTemporalType()); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - assertNull(attributeResource.getAnnotation(VersionAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getAnnotation(BasicAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getAnnotation(ColumnAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getAnnotation(TemporalAnnotation.ANNOTATION_NAME)); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + assertNull(resourceField.getAnnotation(VersionAnnotation.ANNOTATION_NAME)); + assertNotNull(resourceField.getAnnotation(BasicAnnotation.ANNOTATION_NAME)); + assertNotNull(resourceField.getAnnotation(ColumnAnnotation.ANNOTATION_NAME)); + assertNotNull(resourceField.getAnnotation(TemporalAnnotation.ANNOTATION_NAME)); } public void testMorphToDefault() throws Exception { createTestEntityWithVersionMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); VersionMapping versionMapping = (VersionMapping) persistentAttribute.getMapping(); assertFalse(versionMapping.isDefault()); versionMapping.getColumn().setSpecifiedName("FOO"); @@ -127,18 +128,18 @@ public class JavaVersionMappingTests extends ContextModelTestCase assertEquals("FOO", ((BasicMapping) persistentAttribute.getMapping()).getColumn().getSpecifiedName()); assertEquals(TemporalType.TIME, ((TemporalConverter) ((BasicMapping) persistentAttribute.getMapping()).getConverter()).getTemporalType()); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - assertNull(attributeResource.getAnnotation(VersionAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getAnnotation(ColumnAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getAnnotation(TemporalAnnotation.ANNOTATION_NAME)); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + assertNull(resourceField.getAnnotation(VersionAnnotation.ANNOTATION_NAME)); + assertNotNull(resourceField.getAnnotation(ColumnAnnotation.ANNOTATION_NAME)); + assertNotNull(resourceField.getAnnotation(TemporalAnnotation.ANNOTATION_NAME)); } public void testMorphToIdMapping() throws Exception { createTestEntityWithVersionMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); VersionMapping versionMapping = (VersionMapping) persistentAttribute.getMapping(); assertFalse(versionMapping.isDefault()); versionMapping.getColumn().setSpecifiedName("FOO"); @@ -150,19 +151,19 @@ public class JavaVersionMappingTests extends ContextModelTestCase assertEquals("FOO", ((IdMapping) persistentAttribute.getMapping()).getColumn().getSpecifiedName()); assertEquals(TemporalType.TIME, ((TemporalConverter) ((IdMapping) persistentAttribute.getMapping()).getConverter()).getTemporalType()); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - assertNull(attributeResource.getAnnotation(VersionAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getAnnotation(IdAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getAnnotation(ColumnAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getAnnotation(TemporalAnnotation.ANNOTATION_NAME)); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + assertNull(resourceField.getAnnotation(VersionAnnotation.ANNOTATION_NAME)); + assertNotNull(resourceField.getAnnotation(IdAnnotation.ANNOTATION_NAME)); + assertNotNull(resourceField.getAnnotation(ColumnAnnotation.ANNOTATION_NAME)); + assertNotNull(resourceField.getAnnotation(TemporalAnnotation.ANNOTATION_NAME)); } public void testMorphToEmbeddedMapping() throws Exception { createTestEntityWithVersionMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); VersionMapping versionMapping = (VersionMapping) persistentAttribute.getMapping(); assertFalse(versionMapping.isDefault()); versionMapping.getColumn().setSpecifiedName("FOO"); @@ -173,19 +174,19 @@ public class JavaVersionMappingTests extends ContextModelTestCase persistentAttribute.setMappingKey(MappingKeys.EMBEDDED_ATTRIBUTE_MAPPING_KEY); assertTrue(persistentAttribute.getMapping() instanceof EmbeddedMapping); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - assertNull(attributeResource.getAnnotation(VersionAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getAnnotation(EmbeddedAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(ColumnAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(TemporalAnnotation.ANNOTATION_NAME)); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + assertNull(resourceField.getAnnotation(VersionAnnotation.ANNOTATION_NAME)); + assertNotNull(resourceField.getAnnotation(EmbeddedAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(ColumnAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(TemporalAnnotation.ANNOTATION_NAME)); } public void testMorphToTransientMapping() throws Exception { createTestEntityWithVersionMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); VersionMapping versionMapping = (VersionMapping) persistentAttribute.getMapping(); assertFalse(versionMapping.isDefault()); versionMapping.getColumn().setSpecifiedName("FOO"); @@ -196,19 +197,19 @@ public class JavaVersionMappingTests extends ContextModelTestCase persistentAttribute.setMappingKey(MappingKeys.TRANSIENT_ATTRIBUTE_MAPPING_KEY); assertTrue(persistentAttribute.getMapping() instanceof TransientMapping); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - assertNull(attributeResource.getAnnotation(VersionAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getAnnotation(TransientAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(ColumnAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(TemporalAnnotation.ANNOTATION_NAME)); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + assertNull(resourceField.getAnnotation(VersionAnnotation.ANNOTATION_NAME)); + assertNotNull(resourceField.getAnnotation(TransientAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(ColumnAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(TemporalAnnotation.ANNOTATION_NAME)); } public void testMorphToEmbeddedIdMapping() throws Exception { createTestEntityWithVersionMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); VersionMapping versionMapping = (VersionMapping) persistentAttribute.getMapping(); assertFalse(versionMapping.isDefault()); versionMapping.getColumn().setSpecifiedName("FOO"); @@ -219,19 +220,19 @@ public class JavaVersionMappingTests extends ContextModelTestCase persistentAttribute.setMappingKey(MappingKeys.EMBEDDED_ID_ATTRIBUTE_MAPPING_KEY); assertTrue(persistentAttribute.getMapping() instanceof EmbeddedIdMapping); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - assertNull(attributeResource.getAnnotation(VersionAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getAnnotation(EmbeddedIdAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(ColumnAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(TemporalAnnotation.ANNOTATION_NAME)); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + assertNull(resourceField.getAnnotation(VersionAnnotation.ANNOTATION_NAME)); + assertNotNull(resourceField.getAnnotation(EmbeddedIdAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(ColumnAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(TemporalAnnotation.ANNOTATION_NAME)); } public void testMorphToOneToOneMapping() throws Exception { createTestEntityWithVersionMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); VersionMapping versionMapping = (VersionMapping) persistentAttribute.getMapping(); assertFalse(versionMapping.isDefault()); versionMapping.getColumn().setSpecifiedName("FOO"); @@ -242,19 +243,19 @@ public class JavaVersionMappingTests extends ContextModelTestCase persistentAttribute.setMappingKey(MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY); assertTrue(persistentAttribute.getMapping() instanceof OneToOneMapping); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - assertNull(attributeResource.getAnnotation(VersionAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getAnnotation(OneToOneAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(ColumnAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(TemporalAnnotation.ANNOTATION_NAME)); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + assertNull(resourceField.getAnnotation(VersionAnnotation.ANNOTATION_NAME)); + assertNotNull(resourceField.getAnnotation(OneToOneAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(ColumnAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(TemporalAnnotation.ANNOTATION_NAME)); } public void testMorphToOneToManyMapping() throws Exception { createTestEntityWithVersionMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); VersionMapping versionMapping = (VersionMapping) persistentAttribute.getMapping(); assertFalse(versionMapping.isDefault()); versionMapping.getColumn().setSpecifiedName("FOO"); @@ -265,19 +266,19 @@ public class JavaVersionMappingTests extends ContextModelTestCase persistentAttribute.setMappingKey(MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY); assertTrue(persistentAttribute.getMapping() instanceof OneToManyMapping); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - assertNull(attributeResource.getAnnotation(VersionAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getAnnotation(OneToManyAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(ColumnAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(TemporalAnnotation.ANNOTATION_NAME)); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + assertNull(resourceField.getAnnotation(VersionAnnotation.ANNOTATION_NAME)); + assertNotNull(resourceField.getAnnotation(OneToManyAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(ColumnAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(TemporalAnnotation.ANNOTATION_NAME)); } public void testMorphToManyToOneMapping() throws Exception { createTestEntityWithVersionMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); VersionMapping versionMapping = (VersionMapping) persistentAttribute.getMapping(); assertFalse(versionMapping.isDefault()); versionMapping.getColumn().setSpecifiedName("FOO"); @@ -288,19 +289,19 @@ public class JavaVersionMappingTests extends ContextModelTestCase persistentAttribute.setMappingKey(MappingKeys.MANY_TO_ONE_ATTRIBUTE_MAPPING_KEY); assertTrue(persistentAttribute.getMapping() instanceof ManyToOneMapping); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - assertNull(attributeResource.getAnnotation(VersionAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getAnnotation(ManyToOneAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(ColumnAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(TemporalAnnotation.ANNOTATION_NAME)); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + assertNull(resourceField.getAnnotation(VersionAnnotation.ANNOTATION_NAME)); + assertNotNull(resourceField.getAnnotation(ManyToOneAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(ColumnAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(TemporalAnnotation.ANNOTATION_NAME)); } public void testMorphToManyToManyMapping() throws Exception { createTestEntityWithVersionMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); VersionMapping versionMapping = (VersionMapping) persistentAttribute.getMapping(); assertFalse(versionMapping.isDefault()); versionMapping.getColumn().setSpecifiedName("FOO"); @@ -311,12 +312,12 @@ public class JavaVersionMappingTests extends ContextModelTestCase persistentAttribute.setMappingKey(MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); assertTrue(persistentAttribute.getMapping() instanceof ManyToManyMapping); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - assertNull(attributeResource.getAnnotation(VersionAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getAnnotation(ManyToManyAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(ColumnAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(TemporalAnnotation.ANNOTATION_NAME)); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + assertNull(resourceField.getAnnotation(VersionAnnotation.ANNOTATION_NAME)); + assertNotNull(resourceField.getAnnotation(ManyToManyAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(ColumnAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(TemporalAnnotation.ANNOTATION_NAME)); } @@ -324,7 +325,7 @@ public class JavaVersionMappingTests extends ContextModelTestCase createTestEntityWithTemporal(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); VersionMapping versionMapping = (VersionMapping) persistentAttribute.getMapping(); assertEquals(TemporalType.TIMESTAMP, ((TemporalConverter) versionMapping.getConverter()).getTemporalType()); @@ -334,42 +335,42 @@ public class JavaVersionMappingTests extends ContextModelTestCase createTestEntityWithVersionMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); VersionMapping versionMapping = (VersionMapping) persistentAttribute.getMapping(); assertNull(versionMapping.getConverter().getType()); versionMapping.setConverter(TemporalConverter.class); ((TemporalConverter) versionMapping.getConverter()).setTemporalType(TemporalType.TIME); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - TemporalAnnotation temporal = (TemporalAnnotation) attributeResource.getAnnotation(TemporalAnnotation.ANNOTATION_NAME); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + TemporalAnnotation temporal = (TemporalAnnotation) resourceField.getAnnotation(TemporalAnnotation.ANNOTATION_NAME); assertEquals(org.eclipse.jpt.jpa.core.resource.java.TemporalType.TIME, temporal.getValue()); versionMapping.setConverter(null); - assertNull(attributeResource.getAnnotation(TemporalAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(TemporalAnnotation.ANNOTATION_NAME)); } public void testGetTemporalUpdatesFromResourceModelChange() throws Exception { createTestEntityWithVersionMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); VersionMapping versionMapping = (VersionMapping) persistentAttribute.getMapping(); assertNull(versionMapping.getConverter().getType()); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - TemporalAnnotation temporal = (TemporalAnnotation) attributeResource.addAnnotation(TemporalAnnotation.ANNOTATION_NAME); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + TemporalAnnotation temporal = (TemporalAnnotation) resourceField.addAnnotation(TemporalAnnotation.ANNOTATION_NAME); temporal.setValue(org.eclipse.jpt.jpa.core.resource.java.TemporalType.DATE); getJpaProject().synchronizeContextModel(); assertEquals(TemporalType.DATE, ((TemporalConverter) versionMapping.getConverter()).getTemporalType()); - attributeResource.removeAnnotation(TemporalAnnotation.ANNOTATION_NAME); + resourceField.removeAnnotation(TemporalAnnotation.ANNOTATION_NAME); getJpaProject().synchronizeContextModel(); assertNull(versionMapping.getConverter().getType()); @@ -381,15 +382,15 @@ public class JavaVersionMappingTests extends ContextModelTestCase createTestEntityWithVersionMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); VersionMapping versionMapping = (VersionMapping) persistentAttribute.getMapping(); assertNull(versionMapping.getColumn().getSpecifiedName()); assertEquals("id", versionMapping.getColumn().getName()); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - ColumnAnnotation column = (ColumnAnnotation) attributeResource.addAnnotation(JPA.COLUMN); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + ColumnAnnotation column = (ColumnAnnotation) resourceField.addAnnotation(JPA.COLUMN); column.setName("foo"); getJpaProject().synchronizeContextModel(); diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/EntityMappingsTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/EntityMappingsTests.java index 9c9c496160..75e9d99837 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/EntityMappingsTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/EntityMappingsTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2010 Oracle. All rights reserved. + * Copyright (c) 2007, 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. @@ -467,7 +467,7 @@ public class EntityMappingsTests extends ContextModelTestCase public void testUpdateTableGenerators() throws Exception { assertEquals(0, getEntityMappings().getTableGeneratorsSize()); assertEquals(0, getXmlEntityMappings().getTableGenerators().size()); - assertEquals(0, getEntityMappings().getPersistenceUnit().generatorsSize()); + assertEquals(0, getEntityMappings().getPersistenceUnit().getGeneratorsSize()); XmlTableGenerator tableGeneratorResource = OrmFactory.eINSTANCE.createXmlTableGenerator(); getXmlEntityMappings().getTableGenerators().add(tableGeneratorResource); @@ -475,7 +475,7 @@ public class EntityMappingsTests extends ContextModelTestCase TableGenerator tableGenerator = getEntityMappings().getTableGenerators().iterator().next(); assertEquals("FOO", tableGenerator.getName()); - assertEquals(1, getEntityMappings().getPersistenceUnit().generatorsSize()); + assertEquals(1, getEntityMappings().getPersistenceUnit().getGeneratorsSize()); XmlTableGenerator tableGeneratorResource2 = OrmFactory.eINSTANCE.createXmlTableGenerator(); getXmlEntityMappings().getTableGenerators().add(0, tableGeneratorResource2); @@ -485,7 +485,7 @@ public class EntityMappingsTests extends ContextModelTestCase assertEquals("BAR", tableGenerators.next().getName()); assertEquals("FOO", tableGenerators.next().getName()); assertFalse(tableGenerators.hasNext()); - assertEquals(2, getEntityMappings().getPersistenceUnit().generatorsSize()); + assertEquals(2, getEntityMappings().getPersistenceUnit().getGeneratorsSize()); XmlTableGenerator tableGeneratorResource3 = OrmFactory.eINSTANCE.createXmlTableGenerator(); getXmlEntityMappings().getTableGenerators().add(1, tableGeneratorResource3); @@ -496,7 +496,7 @@ public class EntityMappingsTests extends ContextModelTestCase assertEquals("BAZ", tableGenerators.next().getName()); assertEquals("FOO", tableGenerators.next().getName()); assertFalse(tableGenerators.hasNext()); - assertEquals(3, getEntityMappings().getPersistenceUnit().generatorsSize()); + assertEquals(3, getEntityMappings().getPersistenceUnit().getGeneratorsSize()); getXmlEntityMappings().getTableGenerators().move(2, 0); tableGenerators = getEntityMappings().getTableGenerators().iterator(); @@ -504,25 +504,25 @@ public class EntityMappingsTests extends ContextModelTestCase assertEquals("FOO", tableGenerators.next().getName()); assertEquals("BAR", tableGenerators.next().getName()); assertFalse(tableGenerators.hasNext()); - assertEquals(3, getEntityMappings().getPersistenceUnit().generatorsSize()); + assertEquals(3, getEntityMappings().getPersistenceUnit().getGeneratorsSize()); getXmlEntityMappings().getTableGenerators().remove(0); tableGenerators = getEntityMappings().getTableGenerators().iterator(); assertEquals("FOO", tableGenerators.next().getName()); assertEquals("BAR", tableGenerators.next().getName()); assertFalse(tableGenerators.hasNext()); - assertEquals(2, getEntityMappings().getPersistenceUnit().generatorsSize()); + assertEquals(2, getEntityMappings().getPersistenceUnit().getGeneratorsSize()); getXmlEntityMappings().getTableGenerators().remove(1); tableGenerators = getEntityMappings().getTableGenerators().iterator(); assertEquals("FOO", tableGenerators.next().getName()); assertFalse(tableGenerators.hasNext()); - assertEquals(1, getEntityMappings().getPersistenceUnit().generatorsSize()); + assertEquals(1, getEntityMappings().getPersistenceUnit().getGeneratorsSize()); getXmlEntityMappings().getTableGenerators().clear(); tableGenerators = getEntityMappings().getTableGenerators().iterator(); assertFalse(tableGenerators.hasNext()); - assertEquals(0, getEntityMappings().getPersistenceUnit().generatorsSize()); + assertEquals(0, getEntityMappings().getPersistenceUnit().getGeneratorsSize()); } public void testAddTableGenerator() throws Exception { @@ -636,7 +636,7 @@ public class EntityMappingsTests extends ContextModelTestCase public void testUpdateSequenceGenerators() throws Exception { assertEquals(0, getEntityMappings().getSequenceGeneratorsSize()); assertEquals(0, getXmlEntityMappings().getSequenceGenerators().size()); - assertEquals(0, getEntityMappings().getPersistenceUnit().generatorsSize()); + assertEquals(0, getEntityMappings().getPersistenceUnit().getGeneratorsSize()); XmlSequenceGenerator sequenceGeneratorResource = OrmFactory.eINSTANCE.createXmlSequenceGenerator(); getXmlEntityMappings().getSequenceGenerators().add(sequenceGeneratorResource); @@ -644,7 +644,7 @@ public class EntityMappingsTests extends ContextModelTestCase SequenceGenerator sequenceGenerator = getEntityMappings().getSequenceGenerators().iterator().next(); assertEquals("FOO", sequenceGenerator.getName()); - assertEquals(1, getEntityMappings().getPersistenceUnit().generatorsSize()); + assertEquals(1, getEntityMappings().getPersistenceUnit().getGeneratorsSize()); XmlSequenceGenerator sequenceGeneratorResource2 = OrmFactory.eINSTANCE.createXmlSequenceGenerator(); getXmlEntityMappings().getSequenceGenerators().add(0, sequenceGeneratorResource2); @@ -654,7 +654,7 @@ public class EntityMappingsTests extends ContextModelTestCase assertEquals("BAR", sequenceGenerators.next().getName()); assertEquals("FOO", sequenceGenerators.next().getName()); assertFalse(sequenceGenerators.hasNext()); - assertEquals(2, getEntityMappings().getPersistenceUnit().generatorsSize()); + assertEquals(2, getEntityMappings().getPersistenceUnit().getGeneratorsSize()); XmlSequenceGenerator sequenceGeneratorResource3 = OrmFactory.eINSTANCE.createXmlSequenceGenerator(); getXmlEntityMappings().getSequenceGenerators().add(1, sequenceGeneratorResource3); @@ -665,7 +665,7 @@ public class EntityMappingsTests extends ContextModelTestCase assertEquals("BAZ", sequenceGenerators.next().getName()); assertEquals("FOO", sequenceGenerators.next().getName()); assertFalse(sequenceGenerators.hasNext()); - assertEquals(3, getEntityMappings().getPersistenceUnit().generatorsSize()); + assertEquals(3, getEntityMappings().getPersistenceUnit().getGeneratorsSize()); getXmlEntityMappings().getSequenceGenerators().move(2, 0); sequenceGenerators = getEntityMappings().getSequenceGenerators().iterator(); @@ -679,18 +679,18 @@ public class EntityMappingsTests extends ContextModelTestCase assertEquals("FOO", sequenceGenerators.next().getName()); assertEquals("BAR", sequenceGenerators.next().getName()); assertFalse(sequenceGenerators.hasNext()); - assertEquals(2, getEntityMappings().getPersistenceUnit().generatorsSize()); + assertEquals(2, getEntityMappings().getPersistenceUnit().getGeneratorsSize()); getXmlEntityMappings().getSequenceGenerators().remove(1); sequenceGenerators = getEntityMappings().getSequenceGenerators().iterator(); assertEquals("FOO", sequenceGenerators.next().getName()); assertFalse(sequenceGenerators.hasNext()); - assertEquals(1, getEntityMappings().getPersistenceUnit().generatorsSize()); + assertEquals(1, getEntityMappings().getPersistenceUnit().getGeneratorsSize()); getXmlEntityMappings().getSequenceGenerators().clear(); sequenceGenerators = getEntityMappings().getSequenceGenerators().iterator(); assertFalse(sequenceGenerators.hasNext()); - assertEquals(0, getEntityMappings().getPersistenceUnit().generatorsSize()); + assertEquals(0, getEntityMappings().getPersistenceUnit().getGeneratorsSize()); } public void testAddSequenceGenerator() throws Exception { @@ -823,12 +823,12 @@ public class EntityMappingsTests extends ContextModelTestCase assertEquals("BAZ", getXmlEntityMappings().getNamedQueries().get(1).getName()); assertEquals("FOO", getXmlEntityMappings().getNamedQueries().get(2).getName()); - ListIterator namedQueries = getEntityMappings().getQueryContainer().namedQueries(); + ListIterator namedQueries = getEntityMappings().getQueryContainer().getNamedQueries().iterator(); assertEquals(namedQuery2, namedQueries.next()); assertEquals(namedQuery3, namedQueries.next()); assertEquals(namedQuery, namedQueries.next()); - namedQueries = getEntityMappings().getQueryContainer().namedQueries(); + namedQueries = getEntityMappings().getQueryContainer().getNamedQueries().iterator(); assertEquals("BAR", namedQueries.next().getName()); assertEquals("BAZ", namedQueries.next().getName()); assertEquals("FOO", namedQueries.next().getName()); @@ -863,7 +863,7 @@ public class EntityMappingsTests extends ContextModelTestCase getEntityMappings().getQueryContainer().moveNamedQuery(2, 0); - ListIterator namedQueries = getEntityMappings().getQueryContainer().namedQueries(); + ListIterator namedQueries = getEntityMappings().getQueryContainer().getNamedQueries().iterator(); assertEquals("BAR", namedQueries.next().getName()); assertEquals("BAZ", namedQueries.next().getName()); assertEquals("FOO", namedQueries.next().getName()); @@ -874,7 +874,7 @@ public class EntityMappingsTests extends ContextModelTestCase getEntityMappings().getQueryContainer().moveNamedQuery(0, 1); - namedQueries = getEntityMappings().getQueryContainer().namedQueries(); + namedQueries = getEntityMappings().getQueryContainer().getNamedQueries().iterator(); assertEquals("BAZ", namedQueries.next().getName()); assertEquals("BAR", namedQueries.next().getName()); assertEquals("FOO", namedQueries.next().getName()); @@ -885,7 +885,7 @@ public class EntityMappingsTests extends ContextModelTestCase } public void testUpdateNamedQueries() throws Exception { - assertEquals(0, getEntityMappings().getPersistenceUnit().queriesSize()); + assertEquals(0, getEntityMappings().getPersistenceUnit().getQueriesSize()); getXmlEntityMappings().getNamedQueries().add(OrmFactory.eINSTANCE.createXmlNamedQuery()); getXmlEntityMappings().getNamedQueries().add(OrmFactory.eINSTANCE.createXmlNamedQuery()); @@ -895,43 +895,43 @@ public class EntityMappingsTests extends ContextModelTestCase getXmlEntityMappings().getNamedQueries().get(1).setName("BAR"); getXmlEntityMappings().getNamedQueries().get(2).setName("BAZ"); - ListIterator namedQueries = getEntityMappings().getQueryContainer().namedQueries(); + ListIterator namedQueries = getEntityMappings().getQueryContainer().getNamedQueries().iterator(); assertEquals("FOO", namedQueries.next().getName()); assertEquals("BAR", namedQueries.next().getName()); assertEquals("BAZ", namedQueries.next().getName()); assertFalse(namedQueries.hasNext()); - assertEquals(3, getEntityMappings().getPersistenceUnit().queriesSize()); + assertEquals(3, getEntityMappings().getPersistenceUnit().getQueriesSize()); getXmlEntityMappings().getNamedQueries().move(2, 0); - namedQueries = getEntityMappings().getQueryContainer().namedQueries(); + namedQueries = getEntityMappings().getQueryContainer().getNamedQueries().iterator(); assertEquals("BAR", namedQueries.next().getName()); assertEquals("BAZ", namedQueries.next().getName()); assertEquals("FOO", namedQueries.next().getName()); assertFalse(namedQueries.hasNext()); getXmlEntityMappings().getNamedQueries().move(0, 1); - namedQueries = getEntityMappings().getQueryContainer().namedQueries(); + namedQueries = getEntityMappings().getQueryContainer().getNamedQueries().iterator(); assertEquals("BAZ", namedQueries.next().getName()); assertEquals("BAR", namedQueries.next().getName()); assertEquals("FOO", namedQueries.next().getName()); assertFalse(namedQueries.hasNext()); getXmlEntityMappings().getNamedQueries().remove(1); - namedQueries = getEntityMappings().getQueryContainer().namedQueries(); + namedQueries = getEntityMappings().getQueryContainer().getNamedQueries().iterator(); assertEquals("BAZ", namedQueries.next().getName()); assertEquals("FOO", namedQueries.next().getName()); assertFalse(namedQueries.hasNext()); - assertEquals(2, getEntityMappings().getPersistenceUnit().queriesSize()); + assertEquals(2, getEntityMappings().getPersistenceUnit().getQueriesSize()); getXmlEntityMappings().getNamedQueries().remove(1); - namedQueries = getEntityMappings().getQueryContainer().namedQueries(); + namedQueries = getEntityMappings().getQueryContainer().getNamedQueries().iterator(); assertEquals("BAZ", namedQueries.next().getName()); assertFalse(namedQueries.hasNext()); - assertEquals(1, getEntityMappings().getPersistenceUnit().queriesSize()); + assertEquals(1, getEntityMappings().getPersistenceUnit().getQueriesSize()); getXmlEntityMappings().getNamedQueries().remove(0); - assertFalse(getEntityMappings().getQueryContainer().namedQueries().hasNext()); - assertEquals(0, getEntityMappings().getPersistenceUnit().queriesSize()); + assertFalse(getEntityMappings().getQueryContainer().getNamedQueries().iterator().hasNext()); + assertEquals(0, getEntityMappings().getPersistenceUnit().getQueriesSize()); } public void testAddNamedNativeQuery() throws Exception { @@ -953,12 +953,12 @@ public class EntityMappingsTests extends ContextModelTestCase assertEquals("BAZ", getXmlEntityMappings().getNamedNativeQueries().get(1).getName()); assertEquals("FOO", getXmlEntityMappings().getNamedNativeQueries().get(2).getName()); - ListIterator namedNativeQueries = getEntityMappings().getQueryContainer().namedNativeQueries(); + ListIterator namedNativeQueries = getEntityMappings().getQueryContainer().getNamedNativeQueries().iterator(); assertEquals(namedNativeQuery2, namedNativeQueries.next()); assertEquals(namedNativeQuery3, namedNativeQueries.next()); assertEquals(namedNativeQuery, namedNativeQueries.next()); - namedNativeQueries = getEntityMappings().getQueryContainer().namedNativeQueries(); + namedNativeQueries = getEntityMappings().getQueryContainer().getNamedNativeQueries().iterator(); assertEquals("BAR", namedNativeQueries.next().getName()); assertEquals("BAZ", namedNativeQueries.next().getName()); assertEquals("FOO", namedNativeQueries.next().getName()); @@ -993,7 +993,7 @@ public class EntityMappingsTests extends ContextModelTestCase getEntityMappings().getQueryContainer().moveNamedNativeQuery(2, 0); - ListIterator namedNativeQueries = getEntityMappings().getQueryContainer().namedNativeQueries(); + ListIterator namedNativeQueries = getEntityMappings().getQueryContainer().getNamedNativeQueries().iterator(); assertEquals("BAR", namedNativeQueries.next().getName()); assertEquals("BAZ", namedNativeQueries.next().getName()); assertEquals("FOO", namedNativeQueries.next().getName()); @@ -1004,7 +1004,7 @@ public class EntityMappingsTests extends ContextModelTestCase getEntityMappings().getQueryContainer().moveNamedNativeQuery(0, 1); - namedNativeQueries = getEntityMappings().getQueryContainer().namedNativeQueries(); + namedNativeQueries = getEntityMappings().getQueryContainer().getNamedNativeQueries().iterator(); assertEquals("BAZ", namedNativeQueries.next().getName()); assertEquals("BAR", namedNativeQueries.next().getName()); assertEquals("FOO", namedNativeQueries.next().getName()); @@ -1015,7 +1015,7 @@ public class EntityMappingsTests extends ContextModelTestCase } public void testUpdateNamedNativeQueries() throws Exception { - assertEquals(0, getEntityMappings().getPersistenceUnit().queriesSize()); + assertEquals(0, getEntityMappings().getPersistenceUnit().getQueriesSize()); getXmlEntityMappings().getNamedNativeQueries().add(OrmFactory.eINSTANCE.createXmlNamedNativeQuery()); getXmlEntityMappings().getNamedNativeQueries().add(OrmFactory.eINSTANCE.createXmlNamedNativeQuery()); @@ -1025,42 +1025,42 @@ public class EntityMappingsTests extends ContextModelTestCase getXmlEntityMappings().getNamedNativeQueries().get(1).setName("BAR"); getXmlEntityMappings().getNamedNativeQueries().get(2).setName("BAZ"); - ListIterator namedNativeQueries = getEntityMappings().getQueryContainer().namedNativeQueries(); + ListIterator namedNativeQueries = getEntityMappings().getQueryContainer().getNamedNativeQueries().iterator(); assertEquals("FOO", namedNativeQueries.next().getName()); assertEquals("BAR", namedNativeQueries.next().getName()); assertEquals("BAZ", namedNativeQueries.next().getName()); assertFalse(namedNativeQueries.hasNext()); - assertEquals(3, getEntityMappings().getPersistenceUnit().queriesSize()); + assertEquals(3, getEntityMappings().getPersistenceUnit().getQueriesSize()); getXmlEntityMappings().getNamedNativeQueries().move(2, 0); - namedNativeQueries = getEntityMappings().getQueryContainer().namedNativeQueries(); + namedNativeQueries = getEntityMappings().getQueryContainer().getNamedNativeQueries().iterator(); assertEquals("BAR", namedNativeQueries.next().getName()); assertEquals("BAZ", namedNativeQueries.next().getName()); assertEquals("FOO", namedNativeQueries.next().getName()); assertFalse(namedNativeQueries.hasNext()); getXmlEntityMappings().getNamedNativeQueries().move(0, 1); - namedNativeQueries = getEntityMappings().getQueryContainer().namedNativeQueries(); + namedNativeQueries = getEntityMappings().getQueryContainer().getNamedNativeQueries().iterator(); assertEquals("BAZ", namedNativeQueries.next().getName()); assertEquals("BAR", namedNativeQueries.next().getName()); assertEquals("FOO", namedNativeQueries.next().getName()); assertFalse(namedNativeQueries.hasNext()); getXmlEntityMappings().getNamedNativeQueries().remove(1); - namedNativeQueries = getEntityMappings().getQueryContainer().namedNativeQueries(); + namedNativeQueries = getEntityMappings().getQueryContainer().getNamedNativeQueries().iterator(); assertEquals("BAZ", namedNativeQueries.next().getName()); assertEquals("FOO", namedNativeQueries.next().getName()); assertFalse(namedNativeQueries.hasNext()); - assertEquals(2, getEntityMappings().getPersistenceUnit().queriesSize()); + assertEquals(2, getEntityMappings().getPersistenceUnit().getQueriesSize()); getXmlEntityMappings().getNamedNativeQueries().remove(1); - namedNativeQueries = getEntityMappings().getQueryContainer().namedNativeQueries(); + namedNativeQueries = getEntityMappings().getQueryContainer().getNamedNativeQueries().iterator(); assertEquals("BAZ", namedNativeQueries.next().getName()); assertFalse(namedNativeQueries.hasNext()); - assertEquals(1, getEntityMappings().getPersistenceUnit().queriesSize()); + assertEquals(1, getEntityMappings().getPersistenceUnit().getQueriesSize()); getXmlEntityMappings().getNamedNativeQueries().remove(0); - assertFalse(getEntityMappings().getQueryContainer().namedNativeQueries().hasNext()); - assertEquals(0, getEntityMappings().getPersistenceUnit().queriesSize()); + assertFalse(getEntityMappings().getQueryContainer().getNamedNativeQueries().iterator().hasNext()); + assertEquals(0, getEntityMappings().getPersistenceUnit().getQueriesSize()); } } \ No newline at end of file diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/GenericOrmPersistentAttributeTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/GenericOrmPersistentAttributeTests.java index 00dfabd8bb..ce45b8a0d2 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/GenericOrmPersistentAttributeTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/GenericOrmPersistentAttributeTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008, 2010 Oracle. All rights reserved. + * Copyright (c) 2008, 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. @@ -10,7 +10,9 @@ package org.eclipse.jpt.jpa.core.tests.internal.context.orm; import java.util.Iterator; +import java.util.ListIterator; import org.eclipse.jdt.core.ICompilationUnit; +import org.eclipse.jpt.common.core.resource.java.JavaResourceAttribute; import org.eclipse.jpt.common.utility.internal.iterators.ArrayIterator; import org.eclipse.jpt.jpa.core.JptJpaCorePlugin; import org.eclipse.jpt.jpa.core.MappingKeys; @@ -25,7 +27,6 @@ import org.eclipse.jpt.jpa.core.context.orm.OrmReadOnlyPersistentAttribute; import org.eclipse.jpt.jpa.core.internal.jpa1.context.orm.GenericOrmIdMapping; import org.eclipse.jpt.jpa.core.internal.jpa1.context.orm.GenericOrmOneToOneMapping; 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.persistence.PersistenceFactory; import org.eclipse.jpt.jpa.core.resource.persistence.XmlMappingFileRef; import org.eclipse.jpt.jpa.core.tests.internal.context.ContextModelTestCase; @@ -98,25 +99,25 @@ public class GenericOrmPersistentAttributeTests extends ContextModelTestCase createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - assertEquals(2, ormPersistentType.virtualAttributesSize()); + assertEquals(2, ormPersistentType.getVirtualAttributesSize()); - OrmReadOnlyPersistentAttribute ormPersistentAttribute = ormPersistentType.virtualAttributes().next(); + OrmReadOnlyPersistentAttribute ormPersistentAttribute = ormPersistentType.getVirtualAttributes().iterator().next(); assertEquals("id", ormPersistentAttribute.getName()); assertTrue(ormPersistentAttribute.isVirtual()); ormPersistentAttribute.convertToSpecified(); - assertEquals(1, ormPersistentType.virtualAttributesSize()); - assertEquals(1, ormPersistentType.specifiedAttributesSize()); - OrmPersistentAttribute specifiedOrmPersistentAttribute = ormPersistentType.specifiedAttributes().next(); + assertEquals(1, ormPersistentType.getVirtualAttributesSize()); + assertEquals(1, ormPersistentType.getSpecifiedAttributesSize()); + OrmPersistentAttribute specifiedOrmPersistentAttribute = ormPersistentType.getSpecifiedAttributes().iterator().next(); assertEquals("id", specifiedOrmPersistentAttribute.getName()); assertFalse(specifiedOrmPersistentAttribute.isVirtual()); - ormPersistentAttribute = ormPersistentType.virtualAttributes().next(); + ormPersistentAttribute = ormPersistentType.getVirtualAttributes().iterator().next(); ormPersistentAttribute.convertToSpecified(); - assertEquals(0, ormPersistentType.virtualAttributesSize()); - assertEquals(2, ormPersistentType.specifiedAttributesSize()); - Iterator specifiedAttributes = ormPersistentType.specifiedAttributes(); + assertEquals(0, ormPersistentType.getVirtualAttributesSize()); + assertEquals(2, ormPersistentType.getSpecifiedAttributesSize()); + Iterator specifiedAttributes = ormPersistentType.getSpecifiedAttributes().iterator(); specifiedOrmPersistentAttribute = specifiedAttributes.next(); assertEquals("id", specifiedOrmPersistentAttribute.getName()); assertFalse(specifiedOrmPersistentAttribute.isVirtual()); @@ -130,29 +131,29 @@ public class GenericOrmPersistentAttributeTests extends ContextModelTestCase createTestTypeNullAttributeMapping(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - assertEquals(3, ormPersistentType.virtualAttributesSize()); + assertEquals(3, ormPersistentType.getVirtualAttributesSize()); //take a virtual mapping with a mapping type and make it specified - OrmReadOnlyPersistentAttribute ormPersistentAttribute = ormPersistentType.virtualAttributes().next(); + OrmReadOnlyPersistentAttribute ormPersistentAttribute = ormPersistentType.getVirtualAttributes().iterator().next(); assertEquals("address", ormPersistentAttribute.getName()); assertTrue(ormPersistentAttribute.isVirtual()); assertNull(ormPersistentAttribute.getMapping().getKey()); ormPersistentAttribute.convertToSpecified(MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY); - assertEquals(2, ormPersistentType.virtualAttributesSize()); - assertEquals(1, ormPersistentType.specifiedAttributesSize()); - OrmPersistentAttribute specifiedOrmPersistentAttribute = ormPersistentType.specifiedAttributes().next(); + assertEquals(2, ormPersistentType.getVirtualAttributesSize()); + assertEquals(1, ormPersistentType.getSpecifiedAttributesSize()); + OrmPersistentAttribute specifiedOrmPersistentAttribute = ormPersistentType.getSpecifiedAttributes().iterator().next(); assertEquals("address", specifiedOrmPersistentAttribute.getName()); assertFalse(specifiedOrmPersistentAttribute.isVirtual()); assertTrue(specifiedOrmPersistentAttribute.getMapping() instanceof GenericOrmOneToOneMapping); - ormPersistentAttribute = ormPersistentType.virtualAttributes().next(); + ormPersistentAttribute = ormPersistentType.getVirtualAttributes().iterator().next(); ormPersistentAttribute.convertToSpecified(MappingKeys.ID_ATTRIBUTE_MAPPING_KEY); - assertEquals(1, ormPersistentType.virtualAttributesSize()); - assertEquals(2, ormPersistentType.specifiedAttributesSize()); - Iterator specifiedAttributes = ormPersistentType.specifiedAttributes(); + assertEquals(1, ormPersistentType.getVirtualAttributesSize()); + assertEquals(2, ormPersistentType.getSpecifiedAttributesSize()); + Iterator specifiedAttributes = ormPersistentType.getSpecifiedAttributes().iterator(); specifiedOrmPersistentAttribute = specifiedAttributes.next(); assertEquals("id", specifiedOrmPersistentAttribute.getName()); @@ -168,27 +169,27 @@ public class GenericOrmPersistentAttributeTests extends ContextModelTestCase createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - assertEquals(2, ormPersistentType.virtualAttributesSize()); + assertEquals(2, ormPersistentType.getVirtualAttributesSize()); - ormPersistentType.virtualAttributes().next().convertToSpecified(); - ormPersistentType.virtualAttributes().next().convertToSpecified(); + ormPersistentType.getVirtualAttributes().iterator().next().convertToSpecified(); + ormPersistentType.getVirtualAttributes().iterator().next().convertToSpecified(); - assertEquals(0, ormPersistentType.virtualAttributesSize()); - assertEquals(2, ormPersistentType.specifiedAttributesSize()); - OrmPersistentAttribute specifiedOrmPersistentAttribute = ormPersistentType.specifiedAttributes().next(); + assertEquals(0, ormPersistentType.getVirtualAttributesSize()); + assertEquals(2, ormPersistentType.getSpecifiedAttributesSize()); + OrmPersistentAttribute specifiedOrmPersistentAttribute = ormPersistentType.getSpecifiedAttributes().iterator().next(); assertEquals("id", specifiedOrmPersistentAttribute.getName()); assertFalse(specifiedOrmPersistentAttribute.isVirtual()); specifiedOrmPersistentAttribute.convertToVirtual(); - assertEquals(1, ormPersistentType.virtualAttributesSize()); - assertEquals(1, ormPersistentType.specifiedAttributesSize()); + assertEquals(1, ormPersistentType.getVirtualAttributesSize()); + assertEquals(1, ormPersistentType.getSpecifiedAttributesSize()); - specifiedOrmPersistentAttribute = ormPersistentType.specifiedAttributes().next(); + specifiedOrmPersistentAttribute = ormPersistentType.getSpecifiedAttributes().iterator().next(); specifiedOrmPersistentAttribute.convertToVirtual(); - assertEquals(2, ormPersistentType.virtualAttributesSize()); - assertEquals(0, ormPersistentType.specifiedAttributesSize()); + assertEquals(2, ormPersistentType.getVirtualAttributesSize()); + assertEquals(0, ormPersistentType.getSpecifiedAttributesSize()); - Iterator virtualAttributes = ormPersistentType.virtualAttributes(); + Iterator virtualAttributes = ormPersistentType.getVirtualAttributes().iterator(); OrmReadOnlyPersistentAttribute virtualAttribute = virtualAttributes.next(); assertEquals("id", virtualAttribute.getName()); virtualAttribute = virtualAttributes.next(); @@ -199,31 +200,31 @@ public class GenericOrmPersistentAttributeTests extends ContextModelTestCase createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - assertEquals(2, ormPersistentType.virtualAttributesSize()); + assertEquals(2, ormPersistentType.getVirtualAttributesSize()); - ormPersistentType.virtualAttributes().next().convertToSpecified(); - ormPersistentType.virtualAttributes().next().convertToSpecified(); + ormPersistentType.getVirtualAttributes().iterator().next().convertToSpecified(); + ormPersistentType.getVirtualAttributes().iterator().next().convertToSpecified(); - ormPersistentType.specifiedAttributes().next().getMapping().setName("noJavaAttribute"); - assertEquals(1, ormPersistentType.virtualAttributesSize()); - assertEquals(2, ormPersistentType.specifiedAttributesSize()); + ormPersistentType.getSpecifiedAttributes().iterator().next().getMapping().setName("noJavaAttribute"); + assertEquals(1, ormPersistentType.getVirtualAttributesSize()); + assertEquals(2, ormPersistentType.getSpecifiedAttributesSize()); - OrmPersistentAttribute specifiedOrmPersistentAttribute = ormPersistentType.specifiedAttributes().next(); + OrmPersistentAttribute specifiedOrmPersistentAttribute = ormPersistentType.getSpecifiedAttributes().iterator().next(); specifiedOrmPersistentAttribute.convertToVirtual(); - assertEquals(1, ormPersistentType.virtualAttributesSize()); - assertEquals(1, ormPersistentType.specifiedAttributesSize()); + assertEquals(1, ormPersistentType.getVirtualAttributesSize()); + assertEquals(1, ormPersistentType.getSpecifiedAttributesSize()); - assertEquals("id", ormPersistentType.virtualAttributes().next().getName()); - assertEquals("name", ormPersistentType.specifiedAttributes().next().getName()); + assertEquals("id", ormPersistentType.getVirtualAttributes().iterator().next().getName()); + assertEquals("name", ormPersistentType.getSpecifiedAttributes().iterator().next().getName()); } public void testVirtualMappingTypeWhenMetadataComplete() throws Exception { createTestEntityIdMapping(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmReadOnlyPersistentAttribute ormPersistentAttribute = ormPersistentType.virtualAttributes().next(); + OrmReadOnlyPersistentAttribute ormPersistentAttribute = ormPersistentType.getVirtualAttributes().iterator().next(); assertEquals("id", ormPersistentAttribute.getName()); assertEquals(MappingKeys.ID_ATTRIBUTE_MAPPING_KEY, ormPersistentAttribute.getMappingKey()); assertEquals("FOO", ((IdMapping) ormPersistentAttribute.getMapping()).getColumn().getName()); @@ -241,7 +242,7 @@ public class GenericOrmPersistentAttributeTests extends ContextModelTestCase createTestEntityOneToOneMapping(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmReadOnlyPersistentAttribute ormPersistentAttribute = ormPersistentType.virtualAttributes().next(); + OrmReadOnlyPersistentAttribute ormPersistentAttribute = ormPersistentType.getVirtualAttributes().iterator().next(); assertEquals("address", ormPersistentAttribute.getName()); assertEquals(MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY, ormPersistentAttribute.getMappingKey()); @@ -265,10 +266,9 @@ public class GenericOrmPersistentAttributeTests extends ContextModelTestCase assertTrue(ormPersistentAttribute.isVirtual()); assertNotSame(javaPersistentAttribute, ormPersistentAttribute.getJavaPersistentAttribute()); assertEquals(AccessType.FIELD, javaPersistentAttribute.getAccess()); - JavaResourcePersistentAttribute javaResourcePersistentAttribute = ormPersistentAttribute.getJavaPersistentAttribute().getResourcePersistentAttribute(); - assertTrue(javaResourcePersistentAttribute.isField()); - assertEquals("id", javaResourcePersistentAttribute.getName()); - assertEquals(javaPersistentType.getResourcePersistentType().persistableFields().next(), javaResourcePersistentAttribute); + JavaResourceAttribute javaResourceAttribute = ormPersistentAttribute.getJavaPersistentAttribute().getResourceAttribute(); + assertEquals("id", javaResourceAttribute.getName()); + assertEquals(javaPersistentType.getJavaResourceType().getFields().iterator().next(), javaResourceAttribute); //specified orm attribute, access type matches java : FIELD, name matches java @@ -280,19 +280,24 @@ public class GenericOrmPersistentAttributeTests extends ContextModelTestCase //virtual orm attribute, java access type FIELD, orm access type PROPERTY, name matches java - //verify the property java resource persistent attribute is used in orm. + //verify both the property java resource attribute and the field java resource attribute are used in orm + //because the field is annotated and property is specified ((OrmPersistentAttribute) ormPersistentAttribute).convertToVirtual(); ormPersistentAttribute = ormPersistentType.getAttributeNamed("id"); ormPersistentType.setSpecifiedAccess(AccessType.PROPERTY); - assertNotSame(ormPersistentAttribute, ormPersistentType.getAttributeNamed("id")); - ormPersistentAttribute = ormPersistentType.getAttributeNamed("id"); + ListIterator attributes = ormPersistentType.getAttributes().iterator(); + OrmReadOnlyPersistentAttribute idFieldAttribute = attributes.next(); + OrmReadOnlyPersistentAttribute idPropertyAttribute = attributes.next(); + assertEquals(ormPersistentAttribute, idFieldAttribute); + assertNotSame(ormPersistentAttribute, idPropertyAttribute); + ormPersistentAttribute = idPropertyAttribute; assertNotSame(javaPersistentAttribute, ormPersistentAttribute.getJavaPersistentAttribute()); assertEquals(AccessType.FIELD, javaPersistentAttribute.getAccess()); assertEquals(AccessType.PROPERTY, ormPersistentAttribute.getJavaPersistentAttribute().getAccess()); - javaResourcePersistentAttribute = ormPersistentAttribute.getJavaPersistentAttribute().getResourcePersistentAttribute(); - assertTrue(javaResourcePersistentAttribute.isProperty()); - assertEquals("id", javaResourcePersistentAttribute.getName()); - assertEquals(javaPersistentType.getResourcePersistentType().persistableProperties().next(), javaResourcePersistentAttribute); + assertEquals(AccessType.FIELD, idFieldAttribute.getJavaPersistentAttribute().getAccess()); + javaResourceAttribute = ormPersistentAttribute.getJavaPersistentAttribute().getResourceAttribute(); + assertEquals("id", javaResourceAttribute.getName()); + assertEquals(javaPersistentType.getJavaResourceType().getMethods().iterator().next(), javaResourceAttribute); ormPersistentType.setSpecifiedAccess(null);//default access will be field diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/GenericOrmPersistentTypeTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/GenericOrmPersistentTypeTests.java index 9bb84be6f6..b35ba86429 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/GenericOrmPersistentTypeTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/GenericOrmPersistentTypeTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2010 Oracle. All rights reserved. + * Copyright (c) 2007, 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. @@ -194,7 +194,7 @@ public class GenericOrmPersistentTypeTests extends ContextModelTestCase assertEquals("idAttribute", id.getName()); - Iterator persistentAttributes = entityPersistentType.specifiedAttributes(); + Iterator persistentAttributes = entityPersistentType.getSpecifiedAttributes().iterator(); assertEquals("idAttribute", persistentAttributes.next().getName()); assertEquals("basicAttribute", persistentAttributes.next().getName()); assertEquals("versionAttribute", persistentAttributes.next().getName()); @@ -305,7 +305,7 @@ public class GenericOrmPersistentTypeTests extends ContextModelTestCase entity.getAttributes().getBasics().add(basic); basic.setName("basicAttribute"); - OrmReadOnlyPersistentAttribute ormPersistentAttribute = entityPersistentType.attributes().next(); + OrmReadOnlyPersistentAttribute ormPersistentAttribute = entityPersistentType.getAttributes().iterator().next(); assertEquals("basicAttribute", ormPersistentAttribute.getName()); assertEquals(MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY, ormPersistentAttribute.getMapping().getKey()); @@ -313,7 +313,7 @@ public class GenericOrmPersistentTypeTests extends ContextModelTestCase entity.getAttributes().getEmbeddeds().add(embedded); embedded.setName("embeddedAttribute"); - Iterator attributes = entityPersistentType.attributes(); + Iterator attributes = entityPersistentType.getAttributes().iterator(); ormPersistentAttribute = attributes.next(); assertEquals("basicAttribute", ormPersistentAttribute.getName()); assertEquals(MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY, ormPersistentAttribute.getMapping().getKey()); @@ -326,7 +326,7 @@ public class GenericOrmPersistentTypeTests extends ContextModelTestCase entity.getAttributes().getVersions().add(version); version.setName("versionAttribute"); - attributes = entityPersistentType.attributes(); + attributes = entityPersistentType.getAttributes().iterator(); ormPersistentAttribute = attributes.next(); assertEquals("basicAttribute", ormPersistentAttribute.getName()); assertEquals(MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY, ormPersistentAttribute.getMapping().getKey()); @@ -342,7 +342,7 @@ public class GenericOrmPersistentTypeTests extends ContextModelTestCase entity.getAttributes().getIds().add(id); id.setName("idAttribute"); - attributes = entityPersistentType.attributes(); + attributes = entityPersistentType.getAttributes().iterator(); ormPersistentAttribute = attributes.next(); assertEquals("idAttribute", ormPersistentAttribute.getName()); assertEquals(MappingKeys.ID_ATTRIBUTE_MAPPING_KEY, ormPersistentAttribute.getMapping().getKey()); @@ -361,7 +361,7 @@ public class GenericOrmPersistentTypeTests extends ContextModelTestCase entity.getAttributes().getTransients().add(transientResource); transientResource.setName("transientAttribute"); - attributes = entityPersistentType.attributes(); + attributes = entityPersistentType.getAttributes().iterator(); ormPersistentAttribute = attributes.next(); assertEquals("idAttribute", ormPersistentAttribute.getName()); assertEquals(MappingKeys.ID_ATTRIBUTE_MAPPING_KEY, ormPersistentAttribute.getMapping().getKey()); @@ -383,7 +383,7 @@ public class GenericOrmPersistentTypeTests extends ContextModelTestCase entity.getAttributes().getManyToOnes().add(manyToOneResource); manyToOneResource.setName("manyToOneAttribute"); - attributes = entityPersistentType.attributes(); + attributes = entityPersistentType.getAttributes().iterator(); ormPersistentAttribute = attributes.next(); assertEquals("idAttribute", ormPersistentAttribute.getName()); assertEquals(MappingKeys.ID_ATTRIBUTE_MAPPING_KEY, ormPersistentAttribute.getMapping().getKey()); @@ -408,7 +408,7 @@ public class GenericOrmPersistentTypeTests extends ContextModelTestCase entity.getAttributes().getManyToManys().add(manyToManyResource); manyToManyResource.setName("manyToManyAttribute"); - attributes = entityPersistentType.attributes(); + attributes = entityPersistentType.getAttributes().iterator(); ormPersistentAttribute = attributes.next(); assertEquals("idAttribute", ormPersistentAttribute.getName()); assertEquals(MappingKeys.ID_ATTRIBUTE_MAPPING_KEY, ormPersistentAttribute.getMapping().getKey()); @@ -436,7 +436,7 @@ public class GenericOrmPersistentTypeTests extends ContextModelTestCase entity.getAttributes().getOneToManys().add(oneToManyResource); oneToManyResource.setName("oneToManyAttribute"); - attributes = entityPersistentType.attributes(); + attributes = entityPersistentType.getAttributes().iterator(); ormPersistentAttribute = attributes.next(); assertEquals("idAttribute", ormPersistentAttribute.getName()); assertEquals(MappingKeys.ID_ATTRIBUTE_MAPPING_KEY, ormPersistentAttribute.getMapping().getKey()); @@ -467,7 +467,7 @@ public class GenericOrmPersistentTypeTests extends ContextModelTestCase entity.getAttributes().getOneToOnes().add(oneToOneResource); oneToOneResource.setName("oneToOneAttribute"); - attributes = entityPersistentType.attributes(); + attributes = entityPersistentType.getAttributes().iterator(); ormPersistentAttribute = attributes.next(); assertEquals("idAttribute", ormPersistentAttribute.getName()); assertEquals(MappingKeys.ID_ATTRIBUTE_MAPPING_KEY, ormPersistentAttribute.getMapping().getKey()); @@ -502,7 +502,7 @@ public class GenericOrmPersistentTypeTests extends ContextModelTestCase entity.getAttributes().getEmbeddedIds().add(embeddedIdResource); embeddedIdResource.setName("embeddedIdAttribute"); - attributes = entityPersistentType.attributes(); + attributes = entityPersistentType.getAttributes().iterator(); ormPersistentAttribute = attributes.next(); assertEquals("idAttribute", ormPersistentAttribute.getName()); assertEquals(MappingKeys.ID_ATTRIBUTE_MAPPING_KEY, ormPersistentAttribute.getMapping().getKey()); @@ -545,7 +545,7 @@ public class GenericOrmPersistentTypeTests extends ContextModelTestCase entity.getAttributes().getOneToManys().remove(0); entity.getAttributes().getOneToOnes().remove(0); entity.getAttributes().getEmbeddedIds().remove(0); - assertFalse(entityPersistentType.attributes().hasNext()); + assertFalse(entityPersistentType.getAttributes().iterator().hasNext()); assertNotNull(entity.getAttributes()); } @@ -569,6 +569,6 @@ public class GenericOrmPersistentTypeTests extends ContextModelTestCase assertNotNull(javaPersistentAttribute); assertEquals("id", javaPersistentAttribute.getName()); assertEquals("test.Employee", javaPersistentAttribute.getOwningPersistentType().getName()); - assertEquals("test.Model", javaPersistentAttribute.getResourcePersistentAttribute().getParent().getQualifiedName()); + assertEquals("test.Model", javaPersistentAttribute.getResourceAttribute().getParent().getQualifiedName()); } } \ No newline at end of file diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmAssociationOverrideTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmAssociationOverrideTests.java index a667b48a71..fd8da14991 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmAssociationOverrideTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmAssociationOverrideTests.java @@ -49,11 +49,11 @@ public class OrmAssociationOverrideTests extends ContextModelTestCase XmlEntity entityResource = getXmlEntityMappings().getEntities().get(0); entityResource.getAssociationOverrides().add(OrmFactory.eINSTANCE.createXmlAssociationOverride()); XmlAssociationOverride xmlAssociationOverride = entityResource.getAssociationOverrides().get(0); - OrmAssociationOverride ormAssociationOverride = overrideContainer.specifiedOverrides().next(); + OrmAssociationOverride ormAssociationOverride = overrideContainer.getSpecifiedOverrides().iterator().next(); assertNull(ormAssociationOverride.getName()); assertNull(xmlAssociationOverride.getName()); - assertTrue(overrideContainer.overrides().hasNext()); + assertTrue(overrideContainer.getOverrides().iterator().hasNext()); assertFalse(entityResource.getAssociationOverrides().isEmpty()); //set name in the resource model, verify context model updated @@ -71,7 +71,7 @@ public class OrmAssociationOverrideTests extends ContextModelTestCase assertEquals("FOO", xmlAssociationOverride.getName()); entityResource.getAssociationOverrides().remove(0); - assertFalse(overrideContainer.overrides().hasNext()); + assertFalse(overrideContainer.getOverrides().iterator().hasNext()); assertTrue(entityResource.getAssociationOverrides().isEmpty()); } @@ -83,7 +83,7 @@ public class OrmAssociationOverrideTests extends ContextModelTestCase XmlEntity entityResource = getXmlEntityMappings().getEntities().get(0); entityResource.getAssociationOverrides().add(OrmFactory.eINSTANCE.createXmlAssociationOverride()); XmlAssociationOverride xmlAssociationOverride = entityResource.getAssociationOverrides().get(0); - OrmAssociationOverride ormAssociationOverride = overrideContainer.specifiedOverrides().next(); + OrmAssociationOverride ormAssociationOverride = overrideContainer.getSpecifiedOverrides().iterator().next(); assertNull(ormAssociationOverride.getName()); assertNull(xmlAssociationOverride.getName()); @@ -107,7 +107,7 @@ public class OrmAssociationOverrideTests extends ContextModelTestCase XmlEntity entityResource = getXmlEntityMappings().getEntities().get(0); entityResource.getAssociationOverrides().add(OrmFactory.eINSTANCE.createXmlAssociationOverride()); - OrmAssociationOverride ormAssociationOverride = overrideContainer.specifiedOverrides().next(); + OrmAssociationOverride ormAssociationOverride = overrideContainer.getSpecifiedOverrides().iterator().next(); OrmJoinColumnRelationshipStrategy joiningStrategy = ormAssociationOverride.getRelationship().getJoinColumnStrategy(); XmlAssociationOverride xmlAssociationOverride = entityResource.getAssociationOverrides().get(0); @@ -130,12 +130,12 @@ public class OrmAssociationOverrideTests extends ContextModelTestCase assertEquals("BAZ", xmlAssociationOverride.getJoinColumns().get(1).getName()); assertEquals("FOO", xmlAssociationOverride.getJoinColumns().get(2).getName()); - ListIterator joinColumns = joiningStrategy.specifiedJoinColumns(); + ListIterator joinColumns = joiningStrategy.getSpecifiedJoinColumns().iterator(); assertEquals(joinColumn2, joinColumns.next()); assertEquals(joinColumn3, joinColumns.next()); assertEquals(joinColumn, joinColumns.next()); - joinColumns = joiningStrategy.specifiedJoinColumns(); + joinColumns = joiningStrategy.getSpecifiedJoinColumns().iterator(); assertEquals("BAR", joinColumns.next().getName()); assertEquals("BAZ", joinColumns.next().getName()); assertEquals("FOO", joinColumns.next().getName()); @@ -147,7 +147,7 @@ public class OrmAssociationOverrideTests extends ContextModelTestCase OrmAssociationOverrideContainer overrideContainer = ormEntity.getAssociationOverrideContainer(); XmlEntity entityResource = getXmlEntityMappings().getEntities().get(0); entityResource.getAssociationOverrides().add(OrmFactory.eINSTANCE.createXmlAssociationOverride()); - OrmAssociationOverride ormAssociationOverride = overrideContainer.specifiedOverrides().next(); + OrmAssociationOverride ormAssociationOverride = overrideContainer.getSpecifiedOverrides().iterator().next(); OrmJoinColumnRelationshipStrategy joiningStrategy = ormAssociationOverride.getRelationship().getJoinColumnStrategy(); XmlAssociationOverride xmlAssociationOverride = entityResource.getAssociationOverrides().get(0); @@ -177,7 +177,7 @@ public class OrmAssociationOverrideTests extends ContextModelTestCase OrmAssociationOverrideContainer overrideContainer = ormEntity.getAssociationOverrideContainer(); XmlEntity entityResource = getXmlEntityMappings().getEntities().get(0); entityResource.getAssociationOverrides().add(OrmFactory.eINSTANCE.createXmlAssociationOverride()); - OrmAssociationOverride ormAssociationOverride = overrideContainer.specifiedOverrides().next(); + OrmAssociationOverride ormAssociationOverride = overrideContainer.getSpecifiedOverrides().iterator().next(); OrmJoinColumnRelationshipStrategy joiningStrategy = ormAssociationOverride.getRelationship().getJoinColumnStrategy(); XmlAssociationOverride xmlAssociationOverride = entityResource.getAssociationOverrides().get(0); @@ -190,7 +190,7 @@ public class OrmAssociationOverrideTests extends ContextModelTestCase joiningStrategy.moveSpecifiedJoinColumn(2, 0); - ListIterator joinColumns = joiningStrategy.specifiedJoinColumns(); + ListIterator joinColumns = joiningStrategy.getSpecifiedJoinColumns().iterator(); assertEquals("BAR", joinColumns.next().getName()); assertEquals("BAZ", joinColumns.next().getName()); assertEquals("FOO", joinColumns.next().getName()); @@ -201,7 +201,7 @@ public class OrmAssociationOverrideTests extends ContextModelTestCase joiningStrategy.moveSpecifiedJoinColumn(0, 1); - joinColumns = joiningStrategy.specifiedJoinColumns(); + joinColumns = joiningStrategy.getSpecifiedJoinColumns().iterator(); assertEquals("BAZ", joinColumns.next().getName()); assertEquals("BAR", joinColumns.next().getName()); assertEquals("FOO", joinColumns.next().getName()); @@ -217,7 +217,7 @@ public class OrmAssociationOverrideTests extends ContextModelTestCase OrmAssociationOverrideContainer overrideContainer = ormEntity.getAssociationOverrideContainer(); XmlEntity entityResource = getXmlEntityMappings().getEntities().get(0); entityResource.getAssociationOverrides().add(OrmFactory.eINSTANCE.createXmlAssociationOverride()); - OrmAssociationOverride ormAssociationOverride = overrideContainer.specifiedOverrides().next(); + OrmAssociationOverride ormAssociationOverride = overrideContainer.getSpecifiedOverrides().iterator().next(); OrmJoinColumnRelationshipStrategy joiningStrategy = ormAssociationOverride.getRelationship().getJoinColumnStrategy(); XmlAssociationOverride xmlAssociationOverride = entityResource.getAssociationOverrides().get(0); @@ -230,38 +230,38 @@ public class OrmAssociationOverrideTests extends ContextModelTestCase xmlAssociationOverride.getJoinColumns().get(1).setName("BAR"); xmlAssociationOverride.getJoinColumns().get(2).setName("BAZ"); - ListIterator joinColumns = joiningStrategy.specifiedJoinColumns(); + ListIterator joinColumns = joiningStrategy.getSpecifiedJoinColumns().iterator(); assertEquals("FOO", joinColumns.next().getName()); assertEquals("BAR", joinColumns.next().getName()); assertEquals("BAZ", joinColumns.next().getName()); assertFalse(joinColumns.hasNext()); xmlAssociationOverride.getJoinColumns().move(2, 0); - joinColumns = joiningStrategy.specifiedJoinColumns(); + joinColumns = joiningStrategy.getSpecifiedJoinColumns().iterator(); assertEquals("BAR", joinColumns.next().getName()); assertEquals("BAZ", joinColumns.next().getName()); assertEquals("FOO", joinColumns.next().getName()); assertFalse(joinColumns.hasNext()); xmlAssociationOverride.getJoinColumns().move(0, 1); - joinColumns = joiningStrategy.specifiedJoinColumns(); + joinColumns = joiningStrategy.getSpecifiedJoinColumns().iterator(); assertEquals("BAZ", joinColumns.next().getName()); assertEquals("BAR", joinColumns.next().getName()); assertEquals("FOO", joinColumns.next().getName()); assertFalse(joinColumns.hasNext()); xmlAssociationOverride.getJoinColumns().remove(1); - joinColumns = joiningStrategy.specifiedJoinColumns(); + joinColumns = joiningStrategy.getSpecifiedJoinColumns().iterator(); assertEquals("BAZ", joinColumns.next().getName()); assertEquals("FOO", joinColumns.next().getName()); assertFalse(joinColumns.hasNext()); xmlAssociationOverride.getJoinColumns().remove(1); - joinColumns = joiningStrategy.specifiedJoinColumns(); + joinColumns = joiningStrategy.getSpecifiedJoinColumns().iterator(); assertEquals("BAZ", joinColumns.next().getName()); assertFalse(joinColumns.hasNext()); xmlAssociationOverride.getJoinColumns().remove(0); - assertFalse(joiningStrategy.specifiedJoinColumns().hasNext()); + assertFalse(joiningStrategy.getSpecifiedJoinColumns().iterator().hasNext()); } } \ No newline at end of file diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmAttributeOverrideTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmAttributeOverrideTests.java index b451515549..a2879c6303 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmAttributeOverrideTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmAttributeOverrideTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2010 Oracle. All rights reserved. + * Copyright (c) 2007, 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. @@ -46,11 +46,11 @@ public class OrmAttributeOverrideTests extends ContextModelTestCase XmlEntity entityResource = getXmlEntityMappings().getEntities().get(0); entityResource.getAttributeOverrides().add(OrmFactory.eINSTANCE.createXmlAttributeOverride()); XmlAttributeOverride attributeOverrideResource = entityResource.getAttributeOverrides().get(0); - OrmAttributeOverride ormAttributeOverride = overrideContainer.specifiedOverrides().next(); + OrmAttributeOverride ormAttributeOverride = overrideContainer.getSpecifiedOverrides().iterator().next(); assertNull(ormAttributeOverride.getName()); assertNull(attributeOverrideResource.getName()); - assertTrue(overrideContainer.overrides().hasNext()); + assertTrue(overrideContainer.getOverrides().iterator().hasNext()); assertFalse(entityResource.getAttributeOverrides().isEmpty()); //set name in the resource model, verify context model updated @@ -68,7 +68,7 @@ public class OrmAttributeOverrideTests extends ContextModelTestCase assertEquals("FOO", attributeOverrideResource.getName()); entityResource.getAttributeOverrides().remove(0); - assertFalse(overrideContainer.overrides().hasNext()); + assertFalse(overrideContainer.getOverrides().iterator().hasNext()); assertTrue(entityResource.getAttributeOverrides().isEmpty()); } @@ -80,7 +80,7 @@ public class OrmAttributeOverrideTests extends ContextModelTestCase XmlEntity entityResource = getXmlEntityMappings().getEntities().get(0); entityResource.getAttributeOverrides().add(OrmFactory.eINSTANCE.createXmlAttributeOverride()); XmlAttributeOverride attributeOverrideResource = entityResource.getAttributeOverrides().get(0); - OrmAttributeOverride ormAttributeOverride = overrideContainer.specifiedOverrides().next(); + OrmAttributeOverride ormAttributeOverride = overrideContainer.getSpecifiedOverrides().iterator().next(); assertNull(ormAttributeOverride.getName()); assertNull(attributeOverrideResource.getName()); diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmBasicMappingTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmBasicMappingTests.java index c7f47c0121..d3b18d40a3 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmBasicMappingTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmBasicMappingTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2010 Oracle. All rights reserved. + * Copyright (c) 2007, 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. @@ -375,9 +375,9 @@ public class OrmBasicMappingTests extends ContextModelTestCase OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); ormPersistentType.addSpecifiedAttribute(MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY, "foo"); - assertEquals(2, ormPersistentType.virtualAttributesSize()); + assertEquals(2, ormPersistentType.getVirtualAttributesSize()); - OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.specifiedAttributes().next(); + OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.getSpecifiedAttributes().iterator().next(); OrmBasicMapping ormBasicMapping = (OrmBasicMapping) ormPersistentAttribute.getMapping(); assertEquals("foo", ormBasicMapping.getName()); @@ -422,8 +422,8 @@ public class OrmBasicMappingTests extends ContextModelTestCase public void testVirtualMappingMetadataCompleteFalse() throws Exception { createTestEntityBasicMapping(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - assertEquals(2, ormPersistentType.virtualAttributesSize()); - OrmReadOnlyPersistentAttribute ormPersistentAttribute = ormPersistentType.virtualAttributes().next(); + assertEquals(2, ormPersistentType.getVirtualAttributesSize()); + OrmReadOnlyPersistentAttribute ormPersistentAttribute = ormPersistentType.getVirtualAttributes().iterator().next(); BasicMapping basicMapping = (BasicMapping) ormPersistentAttribute.getMapping(); assertEquals("id", basicMapping.getName()); @@ -449,8 +449,8 @@ public class OrmBasicMappingTests extends ContextModelTestCase createTestEntityBasicMapping(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); ormPersistentType.getMapping().setSpecifiedMetadataComplete(Boolean.TRUE); - assertEquals(2, ormPersistentType.virtualAttributesSize()); - OrmReadOnlyPersistentAttribute ormPersistentAttribute = ormPersistentType.virtualAttributes().next(); + assertEquals(2, ormPersistentType.getVirtualAttributesSize()); + OrmReadOnlyPersistentAttribute ormPersistentAttribute = ormPersistentType.getVirtualAttributes().iterator().next(); BasicMapping basicMapping = (BasicMapping) ormPersistentAttribute.getMapping(); assertEquals("id", basicMapping.getName()); @@ -476,9 +476,9 @@ public class OrmBasicMappingTests extends ContextModelTestCase OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); ormPersistentType.addSpecifiedAttribute(MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY, "id"); - assertEquals(1, ormPersistentType.virtualAttributesSize()); + assertEquals(1, ormPersistentType.getVirtualAttributesSize()); - OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.specifiedAttributes().next(); + OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.getSpecifiedAttributes().iterator().next(); OrmBasicMapping ormBasicMapping = (OrmBasicMapping) ormPersistentAttribute.getMapping(); assertEquals("id", ormBasicMapping.getName()); @@ -533,8 +533,8 @@ public class OrmBasicMappingTests extends ContextModelTestCase assertFalse(basicMapping.isDefault()); ormPersistentAttribute.setMappingKey(MappingKeys.ID_ATTRIBUTE_MAPPING_KEY); - assertEquals(1, ormPersistentType.specifiedAttributesSize()); - assertEquals(ormPersistentAttribute, ormPersistentType.specifiedAttributes().next()); + assertEquals(1, ormPersistentType.getSpecifiedAttributesSize()); + assertEquals(ormPersistentAttribute, ormPersistentType.getSpecifiedAttributes().iterator().next()); assertTrue(ormPersistentAttribute.getMapping() instanceof IdMapping); assertEquals("basic", ormPersistentAttribute.getMapping().getName()); assertEquals("FOO", ((IdMapping) ormPersistentAttribute.getMapping()).getColumn().getSpecifiedName()); @@ -555,8 +555,8 @@ public class OrmBasicMappingTests extends ContextModelTestCase assertFalse(basicMapping.isDefault()); ormPersistentAttribute.setMappingKey(MappingKeys.VERSION_ATTRIBUTE_MAPPING_KEY); - assertEquals(1, ormPersistentType.specifiedAttributesSize()); - assertEquals(ormPersistentAttribute, ormPersistentType.specifiedAttributes().next()); + assertEquals(1, ormPersistentType.getSpecifiedAttributesSize()); + assertEquals(ormPersistentAttribute, ormPersistentType.getSpecifiedAttributes().iterator().next()); assertTrue(ormPersistentAttribute.getMapping() instanceof VersionMapping); assertEquals("basic", ormPersistentAttribute.getMapping().getName()); assertEquals("FOO", ((VersionMapping) ormPersistentAttribute.getMapping()).getColumn().getSpecifiedName()); @@ -577,8 +577,8 @@ public class OrmBasicMappingTests extends ContextModelTestCase assertFalse(basicMapping.isDefault()); ormPersistentAttribute.setMappingKey(MappingKeys.TRANSIENT_ATTRIBUTE_MAPPING_KEY); - assertEquals(1, ormPersistentType.specifiedAttributesSize()); - assertEquals(ormPersistentAttribute, ormPersistentType.specifiedAttributes().next()); + assertEquals(1, ormPersistentType.getSpecifiedAttributesSize()); + assertEquals(ormPersistentAttribute, ormPersistentType.getSpecifiedAttributes().iterator().next()); assertTrue(ormPersistentAttribute.getMapping() instanceof TransientMapping); assertEquals("basic", ormPersistentAttribute.getMapping().getName()); } @@ -598,8 +598,8 @@ public class OrmBasicMappingTests extends ContextModelTestCase assertFalse(basicMapping.isDefault()); ormPersistentAttribute.setMappingKey(MappingKeys.EMBEDDED_ATTRIBUTE_MAPPING_KEY); - assertEquals(1, ormPersistentType.specifiedAttributesSize()); - assertEquals(ormPersistentAttribute, ormPersistentType.specifiedAttributes().next()); + assertEquals(1, ormPersistentType.getSpecifiedAttributesSize()); + assertEquals(ormPersistentAttribute, ormPersistentType.getSpecifiedAttributes().iterator().next()); assertTrue(ormPersistentAttribute.getMapping() instanceof EmbeddedMapping); assertEquals("basic", ormPersistentAttribute.getMapping().getName()); } @@ -619,8 +619,8 @@ public class OrmBasicMappingTests extends ContextModelTestCase assertFalse(basicMapping.isDefault()); ormPersistentAttribute.setMappingKey(MappingKeys.EMBEDDED_ID_ATTRIBUTE_MAPPING_KEY); - assertEquals(1, ormPersistentType.specifiedAttributesSize()); - assertEquals(ormPersistentAttribute, ormPersistentType.specifiedAttributes().next()); + assertEquals(1, ormPersistentType.getSpecifiedAttributesSize()); + assertEquals(ormPersistentAttribute, ormPersistentType.getSpecifiedAttributes().iterator().next()); assertTrue(ormPersistentAttribute.getMapping() instanceof EmbeddedIdMapping); assertEquals("basic", ormPersistentAttribute.getMapping().getName()); } @@ -640,8 +640,8 @@ public class OrmBasicMappingTests extends ContextModelTestCase assertFalse(basicMapping.isDefault()); ormPersistentAttribute.setMappingKey(MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY); - assertEquals(1, ormPersistentType.specifiedAttributesSize()); - assertEquals(ormPersistentAttribute, ormPersistentType.specifiedAttributes().next()); + assertEquals(1, ormPersistentType.getSpecifiedAttributesSize()); + assertEquals(ormPersistentAttribute, ormPersistentType.getSpecifiedAttributes().iterator().next()); assertTrue(ormPersistentAttribute.getMapping() instanceof OneToOneMapping); assertEquals("basic", ormPersistentAttribute.getMapping().getName()); } @@ -661,8 +661,8 @@ public class OrmBasicMappingTests extends ContextModelTestCase assertFalse(basicMapping.isDefault()); ormPersistentAttribute.setMappingKey(MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY); - assertEquals(1, ormPersistentType.specifiedAttributesSize()); - assertEquals(ormPersistentAttribute, ormPersistentType.specifiedAttributes().next()); + assertEquals(1, ormPersistentType.getSpecifiedAttributesSize()); + assertEquals(ormPersistentAttribute, ormPersistentType.getSpecifiedAttributes().iterator().next()); assertTrue(ormPersistentAttribute.getMapping() instanceof OneToManyMapping); assertEquals("basic", ormPersistentAttribute.getMapping().getName()); } @@ -682,8 +682,8 @@ public class OrmBasicMappingTests extends ContextModelTestCase assertFalse(basicMapping.isDefault()); ormPersistentAttribute.setMappingKey(MappingKeys.MANY_TO_ONE_ATTRIBUTE_MAPPING_KEY); - assertEquals(1, ormPersistentType.specifiedAttributesSize()); - assertEquals(ormPersistentAttribute, ormPersistentType.specifiedAttributes().next()); + assertEquals(1, ormPersistentType.getSpecifiedAttributesSize()); + assertEquals(ormPersistentAttribute, ormPersistentType.getSpecifiedAttributes().iterator().next()); assertTrue(ormPersistentAttribute.getMapping() instanceof ManyToOneMapping); assertEquals("basic", ormPersistentAttribute.getMapping().getName()); } @@ -703,8 +703,8 @@ public class OrmBasicMappingTests extends ContextModelTestCase assertFalse(basicMapping.isDefault()); ormPersistentAttribute.setMappingKey(MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); - assertEquals(1, ormPersistentType.specifiedAttributesSize()); - assertEquals(ormPersistentAttribute, ormPersistentType.specifiedAttributes().next()); + assertEquals(1, ormPersistentType.getSpecifiedAttributesSize()); + assertEquals(ormPersistentAttribute, ormPersistentType.getSpecifiedAttributes().iterator().next()); assertTrue(ormPersistentAttribute.getMapping() instanceof ManyToManyMapping); assertEquals("basic", ormPersistentAttribute.getMapping().getName()); } diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmColumnTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmColumnTests.java index 134d437125..2db4c1b957 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmColumnTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmColumnTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2010 Oracle. All rights reserved. + * Copyright (c) 2007, 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. @@ -619,7 +619,7 @@ public class OrmColumnTests extends ContextModelTestCase createTestEntity(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - Iterator attributes = ormPersistentType.virtualAttributes(); + Iterator attributes = ormPersistentType.getVirtualAttributes().iterator(); attributes.next(); //virtual attribute in orm.xml, java attribute has no Column annotation diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmEmbeddedIdMappingTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmEmbeddedIdMappingTests.java index cbc2d88ba4..1b2238fc02 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmEmbeddedIdMappingTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmEmbeddedIdMappingTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2010 Oracle. All rights reserved. + * Copyright (c) 2007, 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. @@ -329,14 +329,14 @@ public class OrmEmbeddedIdMappingTests extends ContextModelTestCase assertFalse(embeddedIdMapping.isDefault()); XmlEmbeddedId embeddedIdResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getEmbeddedIds().get(0); embeddedIdResource.getAttributeOverrides().add(OrmFactory.eINSTANCE.createXmlAttributeOverride()); - AttributeOverride attributeOverride = embeddedIdMapping.getAttributeOverrideContainer().specifiedOverrides().next(); + AttributeOverride attributeOverride = embeddedIdMapping.getAttributeOverrideContainer().getSpecifiedOverrides().iterator().next(); attributeOverride.setName("override"); attributeOverride.getColumn().setSpecifiedName("OVERRIDE_COLUMN"); assertFalse(embeddedIdMapping.isDefault()); ormPersistentAttribute.setMappingKey(MappingKeys.ID_ATTRIBUTE_MAPPING_KEY); - assertEquals(1, ormPersistentType.specifiedAttributesSize()); - assertEquals(ormPersistentAttribute, ormPersistentType.specifiedAttributes().next()); + assertEquals(1, ormPersistentType.getSpecifiedAttributesSize()); + assertEquals(ormPersistentAttribute, ormPersistentType.getSpecifiedAttributes().iterator().next()); assertTrue(ormPersistentAttribute.getMapping() instanceof IdMapping); assertEquals("embeddedId", ormPersistentAttribute.getMapping().getName()); } @@ -350,14 +350,14 @@ public class OrmEmbeddedIdMappingTests extends ContextModelTestCase assertFalse(embeddedIdMapping.isDefault()); XmlEmbeddedId embeddedIdResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getEmbeddedIds().get(0); embeddedIdResource.getAttributeOverrides().add(OrmFactory.eINSTANCE.createXmlAttributeOverride()); - AttributeOverride attributeOverride = embeddedIdMapping.getAttributeOverrideContainer().specifiedOverrides().next(); + AttributeOverride attributeOverride = embeddedIdMapping.getAttributeOverrideContainer().getSpecifiedOverrides().iterator().next(); attributeOverride.setName("override"); attributeOverride.getColumn().setSpecifiedName("OVERRIDE_COLUMN"); assertFalse(embeddedIdMapping.isDefault()); ormPersistentAttribute.setMappingKey(MappingKeys.VERSION_ATTRIBUTE_MAPPING_KEY); - assertEquals(1, ormPersistentType.specifiedAttributesSize()); - assertEquals(ormPersistentAttribute, ormPersistentType.specifiedAttributes().next()); + assertEquals(1, ormPersistentType.getSpecifiedAttributesSize()); + assertEquals(ormPersistentAttribute, ormPersistentType.getSpecifiedAttributes().iterator().next()); assertTrue(ormPersistentAttribute.getMapping() instanceof VersionMapping); assertEquals("embeddedId", ormPersistentAttribute.getMapping().getName()); } @@ -371,14 +371,14 @@ public class OrmEmbeddedIdMappingTests extends ContextModelTestCase assertFalse(embeddedIdMapping.isDefault()); XmlEmbeddedId embeddedIdResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getEmbeddedIds().get(0); embeddedIdResource.getAttributeOverrides().add(OrmFactory.eINSTANCE.createXmlAttributeOverride()); - AttributeOverride attributeOverride = embeddedIdMapping.getAttributeOverrideContainer().specifiedOverrides().next(); + AttributeOverride attributeOverride = embeddedIdMapping.getAttributeOverrideContainer().getSpecifiedOverrides().iterator().next(); attributeOverride.setName("override"); attributeOverride.getColumn().setSpecifiedName("OVERRIDE_COLUMN"); assertFalse(embeddedIdMapping.isDefault()); ormPersistentAttribute.setMappingKey(MappingKeys.TRANSIENT_ATTRIBUTE_MAPPING_KEY); - assertEquals(1, ormPersistentType.specifiedAttributesSize()); - assertEquals(ormPersistentAttribute, ormPersistentType.specifiedAttributes().next()); + assertEquals(1, ormPersistentType.getSpecifiedAttributesSize()); + assertEquals(ormPersistentAttribute, ormPersistentType.getSpecifiedAttributes().iterator().next()); assertTrue(ormPersistentAttribute.getMapping() instanceof TransientMapping); assertEquals("embeddedId", ormPersistentAttribute.getMapping().getName()); } @@ -392,14 +392,14 @@ public class OrmEmbeddedIdMappingTests extends ContextModelTestCase assertFalse(embeddedIdMapping.isDefault()); XmlEmbeddedId embeddedIdResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getEmbeddedIds().get(0); embeddedIdResource.getAttributeOverrides().add(OrmFactory.eINSTANCE.createXmlAttributeOverride()); - AttributeOverride attributeOverride = embeddedIdMapping.getAttributeOverrideContainer().specifiedOverrides().next(); + AttributeOverride attributeOverride = embeddedIdMapping.getAttributeOverrideContainer().getSpecifiedOverrides().iterator().next(); attributeOverride.setName("override"); attributeOverride.getColumn().setSpecifiedName("OVERRIDE_COLUMN"); assertFalse(embeddedIdMapping.isDefault()); ormPersistentAttribute.setMappingKey(MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY); - assertEquals(1, ormPersistentType.specifiedAttributesSize()); - assertEquals(ormPersistentAttribute, ormPersistentType.specifiedAttributes().next()); + assertEquals(1, ormPersistentType.getSpecifiedAttributesSize()); + assertEquals(ormPersistentAttribute, ormPersistentType.getSpecifiedAttributes().iterator().next()); assertTrue(ormPersistentAttribute.getMapping() instanceof BasicMapping); assertEquals("embeddedId", ormPersistentAttribute.getMapping().getName()); } @@ -413,17 +413,17 @@ public class OrmEmbeddedIdMappingTests extends ContextModelTestCase assertFalse(embeddedIdMapping.isDefault()); XmlEmbeddedId embeddedIdResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getEmbeddedIds().get(0); embeddedIdResource.getAttributeOverrides().add(OrmFactory.eINSTANCE.createXmlAttributeOverride()); - AttributeOverride attributeOverride = embeddedIdMapping.getAttributeOverrideContainer().specifiedOverrides().next(); + AttributeOverride attributeOverride = embeddedIdMapping.getAttributeOverrideContainer().getSpecifiedOverrides().iterator().next(); attributeOverride.setName("override"); attributeOverride.getColumn().setSpecifiedName("OVERRIDE_COLUMN"); assertFalse(embeddedIdMapping.isDefault()); ormPersistentAttribute.setMappingKey(MappingKeys.EMBEDDED_ATTRIBUTE_MAPPING_KEY); - assertEquals(1, ormPersistentType.specifiedAttributesSize()); - assertEquals(ormPersistentAttribute, ormPersistentType.specifiedAttributes().next()); + assertEquals(1, ormPersistentType.getSpecifiedAttributesSize()); + assertEquals(ormPersistentAttribute, ormPersistentType.getSpecifiedAttributes().iterator().next()); assertTrue(ormPersistentAttribute.getMapping() instanceof EmbeddedMapping); assertEquals("embeddedId", ormPersistentAttribute.getMapping().getName()); - attributeOverride = ((EmbeddedMapping) ormPersistentAttribute.getMapping()).getAttributeOverrideContainer().specifiedOverrides().next(); + attributeOverride = ((EmbeddedMapping) ormPersistentAttribute.getMapping()).getAttributeOverrideContainer().getSpecifiedOverrides().iterator().next(); assertEquals("override", attributeOverride.getName()); assertEquals("OVERRIDE_COLUMN", attributeOverride.getColumn().getSpecifiedName()); } @@ -437,14 +437,14 @@ public class OrmEmbeddedIdMappingTests extends ContextModelTestCase assertFalse(embeddedIdMapping.isDefault()); XmlEmbeddedId embeddedIdResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getEmbeddedIds().get(0); embeddedIdResource.getAttributeOverrides().add(OrmFactory.eINSTANCE.createXmlAttributeOverride()); - AttributeOverride attributeOverride = embeddedIdMapping.getAttributeOverrideContainer().specifiedOverrides().next(); + AttributeOverride attributeOverride = embeddedIdMapping.getAttributeOverrideContainer().getSpecifiedOverrides().iterator().next(); attributeOverride.setName("override"); attributeOverride.getColumn().setSpecifiedName("OVERRIDE_COLUMN"); assertFalse(embeddedIdMapping.isDefault()); ormPersistentAttribute.setMappingKey(MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY); - assertEquals(1, ormPersistentType.specifiedAttributesSize()); - assertEquals(ormPersistentAttribute, ormPersistentType.specifiedAttributes().next()); + assertEquals(1, ormPersistentType.getSpecifiedAttributesSize()); + assertEquals(ormPersistentAttribute, ormPersistentType.getSpecifiedAttributes().iterator().next()); assertTrue(ormPersistentAttribute.getMapping() instanceof OneToOneMapping); assertEquals("embeddedId", ormPersistentAttribute.getMapping().getName()); } @@ -458,14 +458,14 @@ public class OrmEmbeddedIdMappingTests extends ContextModelTestCase assertFalse(embeddedIdMapping.isDefault()); XmlEmbeddedId embeddedIdResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getEmbeddedIds().get(0); embeddedIdResource.getAttributeOverrides().add(OrmFactory.eINSTANCE.createXmlAttributeOverride()); - AttributeOverride attributeOverride = embeddedIdMapping.getAttributeOverrideContainer().specifiedOverrides().next(); + AttributeOverride attributeOverride = embeddedIdMapping.getAttributeOverrideContainer().getSpecifiedOverrides().iterator().next(); attributeOverride.setName("override"); attributeOverride.getColumn().setSpecifiedName("OVERRIDE_COLUMN"); assertFalse(embeddedIdMapping.isDefault()); ormPersistentAttribute.setMappingKey(MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY); - assertEquals(1, ormPersistentType.specifiedAttributesSize()); - assertEquals(ormPersistentAttribute, ormPersistentType.specifiedAttributes().next()); + assertEquals(1, ormPersistentType.getSpecifiedAttributesSize()); + assertEquals(ormPersistentAttribute, ormPersistentType.getSpecifiedAttributes().iterator().next()); assertTrue(ormPersistentAttribute.getMapping() instanceof OneToManyMapping); assertEquals("embeddedId", ormPersistentAttribute.getMapping().getName()); } @@ -479,7 +479,7 @@ public class OrmEmbeddedIdMappingTests extends ContextModelTestCase assertFalse(embeddedIdMapping.isDefault()); XmlEmbeddedId embeddedIdResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getEmbeddedIds().get(0); embeddedIdResource.getAttributeOverrides().add(OrmFactory.eINSTANCE.createXmlAttributeOverride()); - AttributeOverride attributeOverride = embeddedIdMapping.getAttributeOverrideContainer().specifiedOverrides().next(); + AttributeOverride attributeOverride = embeddedIdMapping.getAttributeOverrideContainer().getSpecifiedOverrides().iterator().next(); attributeOverride.setName("override"); attributeOverride.getColumn().setSpecifiedName("OVERRIDE_COLUMN"); assertFalse(embeddedIdMapping.isDefault()); @@ -498,14 +498,14 @@ public class OrmEmbeddedIdMappingTests extends ContextModelTestCase assertFalse(embeddedIdMapping.isDefault()); XmlEmbeddedId embeddedIdResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getEmbeddedIds().get(0); embeddedIdResource.getAttributeOverrides().add(OrmFactory.eINSTANCE.createXmlAttributeOverride()); - AttributeOverride attributeOverride = embeddedIdMapping.getAttributeOverrideContainer().specifiedOverrides().next(); + AttributeOverride attributeOverride = embeddedIdMapping.getAttributeOverrideContainer().getSpecifiedOverrides().iterator().next(); attributeOverride.setName("override"); attributeOverride.getColumn().setSpecifiedName("OVERRIDE_COLUMN"); assertFalse(embeddedIdMapping.isDefault()); ormPersistentAttribute.setMappingKey(MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); - assertEquals(1, ormPersistentType.specifiedAttributesSize()); - assertEquals(ormPersistentAttribute, ormPersistentType.specifiedAttributes().next()); + assertEquals(1, ormPersistentType.getSpecifiedAttributesSize()); + assertEquals(ormPersistentAttribute, ormPersistentType.getSpecifiedAttributes().iterator().next()); assertTrue(ormPersistentAttribute.getMapping() instanceof ManyToManyMapping); assertEquals("embeddedId", ormPersistentAttribute.getMapping().getName()); } @@ -568,7 +568,7 @@ public class OrmEmbeddedIdMappingTests extends ContextModelTestCase assertEquals(3, embeddedIdResource.getAttributeOverrides().size()); attributeOverrideContainer.moveSpecifiedOverride(2, 0); - ListIterator attributeOverrides = attributeOverrideContainer.specifiedOverrides(); + ListIterator attributeOverrides = attributeOverrideContainer.getSpecifiedOverrides().iterator(); assertEquals("BAR", attributeOverrides.next().getName()); assertEquals("BAZ", attributeOverrides.next().getName()); assertEquals("FOO", attributeOverrides.next().getName()); @@ -579,7 +579,7 @@ public class OrmEmbeddedIdMappingTests extends ContextModelTestCase attributeOverrideContainer.moveSpecifiedOverride(0, 1); - attributeOverrides = attributeOverrideContainer.specifiedOverrides(); + attributeOverrides = attributeOverrideContainer.getSpecifiedOverrides().iterator(); assertEquals("BAZ", attributeOverrides.next().getName()); assertEquals("BAR", attributeOverrides.next().getName()); assertEquals("FOO", attributeOverrides.next().getName()); @@ -604,39 +604,39 @@ public class OrmEmbeddedIdMappingTests extends ContextModelTestCase embeddedIdResource.getAttributeOverrides().get(1).setName("BAR"); embeddedIdResource.getAttributeOverrides().get(2).setName("BAZ"); - ListIterator attributeOverrides = attributeOverrideContainer.specifiedOverrides(); + ListIterator attributeOverrides = attributeOverrideContainer.getSpecifiedOverrides().iterator(); assertEquals("FOO", attributeOverrides.next().getName()); assertEquals("BAR", attributeOverrides.next().getName()); assertEquals("BAZ", attributeOverrides.next().getName()); assertFalse(attributeOverrides.hasNext()); embeddedIdResource.getAttributeOverrides().move(2, 0); - attributeOverrides = attributeOverrideContainer.specifiedOverrides(); + attributeOverrides = attributeOverrideContainer.getSpecifiedOverrides().iterator(); assertEquals("BAR", attributeOverrides.next().getName()); assertEquals("BAZ", attributeOverrides.next().getName()); assertEquals("FOO", attributeOverrides.next().getName()); assertFalse(attributeOverrides.hasNext()); embeddedIdResource.getAttributeOverrides().move(0, 1); - attributeOverrides = attributeOverrideContainer.specifiedOverrides(); + attributeOverrides = attributeOverrideContainer.getSpecifiedOverrides().iterator(); assertEquals("BAZ", attributeOverrides.next().getName()); assertEquals("BAR", attributeOverrides.next().getName()); assertEquals("FOO", attributeOverrides.next().getName()); assertFalse(attributeOverrides.hasNext()); embeddedIdResource.getAttributeOverrides().remove(1); - attributeOverrides = attributeOverrideContainer.specifiedOverrides(); + attributeOverrides = attributeOverrideContainer.getSpecifiedOverrides().iterator(); assertEquals("BAZ", attributeOverrides.next().getName()); assertEquals("FOO", attributeOverrides.next().getName()); assertFalse(attributeOverrides.hasNext()); embeddedIdResource.getAttributeOverrides().remove(1); - attributeOverrides = attributeOverrideContainer.specifiedOverrides(); + attributeOverrides = attributeOverrideContainer.getSpecifiedOverrides().iterator(); assertEquals("BAZ", attributeOverrides.next().getName()); assertFalse(attributeOverrides.hasNext()); embeddedIdResource.getAttributeOverrides().remove(0); - assertFalse(attributeOverrideContainer.specifiedOverrides().hasNext()); + assertFalse(attributeOverrideContainer.getSpecifiedOverrides().iterator().hasNext()); } @@ -647,17 +647,17 @@ public class OrmEmbeddedIdMappingTests extends ContextModelTestCase OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); getEntityMappings().addPersistentType(MappingKeys.EMBEDDABLE_TYPE_MAPPING_KEY, PACKAGE_NAME + ".Address"); ormPersistentType.addSpecifiedAttribute(MappingKeys.EMBEDDED_ID_ATTRIBUTE_MAPPING_KEY, "foo"); - assertEquals(3, ormPersistentType.virtualAttributesSize()); + assertEquals(3, ormPersistentType.getVirtualAttributesSize()); - OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.specifiedAttributes().next(); + OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.getSpecifiedAttributes().iterator().next(); OrmEmbeddedIdMapping ormEmbeddedIdMapping = (OrmEmbeddedIdMapping) ormPersistentAttribute.getMapping(); OrmAttributeOverrideContainer attributeOverrideContainer = ormEmbeddedIdMapping.getAttributeOverrideContainer(); assertEquals("foo", ormEmbeddedIdMapping.getName()); - assertFalse(attributeOverrideContainer.specifiedOverrides().hasNext()); - assertFalse(attributeOverrideContainer.virtualOverrides().hasNext()); + assertFalse(attributeOverrideContainer.getSpecifiedOverrides().iterator().hasNext()); + assertFalse(attributeOverrideContainer.getVirtualOverrides().iterator().hasNext()); } public void testVirtualAttributeOverrides() throws Exception { @@ -670,15 +670,15 @@ public class OrmEmbeddedIdMappingTests extends ContextModelTestCase OrmReadOnlyPersistentAttribute ormPersistentAttribute = persistentType.getAttributeNamed("address"); JavaEmbeddedIdMapping embeddedIdMapping = (JavaEmbeddedIdMapping) ormPersistentAttribute.getMapping(); JavaAttributeOverrideContainer attributeOverrideContainer = embeddedIdMapping.getAttributeOverrideContainer(); - assertEquals(4, attributeOverrideContainer.overridesSize()); - assertEquals(3, attributeOverrideContainer.virtualOverridesSize()); - assertEquals(1, attributeOverrideContainer.specifiedOverridesSize()); + assertEquals(4, attributeOverrideContainer.getOverridesSize()); + assertEquals(3, attributeOverrideContainer.getVirtualOverridesSize()); + assertEquals(1, attributeOverrideContainer.getSpecifiedOverridesSize()); - ListIterator specifiedAttributeOverrides = attributeOverrideContainer.specifiedOverrides(); + ListIterator specifiedAttributeOverrides = attributeOverrideContainer.getSpecifiedOverrides().iterator(); AttributeOverride specifiedAttributeOverride = specifiedAttributeOverrides.next(); assertEquals("city", specifiedAttributeOverride.getName()); - ListIterator virtualAttributeOverrides = attributeOverrideContainer.virtualOverrides(); + ListIterator virtualAttributeOverrides = attributeOverrideContainer.getVirtualOverrides().iterator(); JavaVirtualAttributeOverride virtualAttributeOverride = virtualAttributeOverrides.next(); assertEquals("id", virtualAttributeOverride.getName()); virtualAttributeOverride = virtualAttributeOverrides.next(); @@ -687,7 +687,7 @@ public class OrmEmbeddedIdMappingTests extends ContextModelTestCase assertEquals("zip", virtualAttributeOverride.getName()); JavaEmbeddedIdMapping javaEmbeddedIdMapping = (JavaEmbeddedIdMapping) ormPersistentAttribute.resolveJavaPersistentAttribute().getMapping(); - Column javaAttributeOverrideColumn = javaEmbeddedIdMapping.getAttributeOverrideContainer().specifiedOverrides().next().getColumn(); + Column javaAttributeOverrideColumn = javaEmbeddedIdMapping.getAttributeOverrideContainer().getSpecifiedOverrides().iterator().next().getColumn(); javaAttributeOverrideColumn.setSpecifiedName("FOO_COLUMN"); javaAttributeOverrideColumn.setSpecifiedTable("FOO_TABLE"); @@ -702,10 +702,10 @@ public class OrmEmbeddedIdMappingTests extends ContextModelTestCase JavaBasicMapping javaBasicMapping = (JavaBasicMapping) embeddableAddressType.getJavaPersistentType().getAttributeNamed("state").getMapping(); javaBasicMapping.getColumn().setSpecifiedName("MY_STATE_COLUMN"); - assertEquals(4, attributeOverrideContainer.overridesSize()); - assertEquals(3, attributeOverrideContainer.virtualOverridesSize()); - assertEquals(1, attributeOverrideContainer.specifiedOverridesSize()); - specifiedAttributeOverrides = attributeOverrideContainer.specifiedOverrides(); + assertEquals(4, attributeOverrideContainer.getOverridesSize()); + assertEquals(3, attributeOverrideContainer.getVirtualOverridesSize()); + assertEquals(1, attributeOverrideContainer.getSpecifiedOverridesSize()); + specifiedAttributeOverrides = attributeOverrideContainer.getSpecifiedOverrides().iterator(); specifiedAttributeOverride = specifiedAttributeOverrides.next(); assertEquals("city", specifiedAttributeOverride.getName()); assertEquals("FOO_COLUMN", specifiedAttributeOverride.getColumn().getSpecifiedName()); @@ -719,7 +719,7 @@ public class OrmEmbeddedIdMappingTests extends ContextModelTestCase assertEquals(6, specifiedAttributeOverride.getColumn().getPrecision()); assertEquals(7, specifiedAttributeOverride.getColumn().getScale()); - virtualAttributeOverrides = attributeOverrideContainer.virtualOverrides(); + virtualAttributeOverrides = attributeOverrideContainer.getVirtualOverrides().iterator(); virtualAttributeOverride = virtualAttributeOverrides.next(); assertEquals("id", virtualAttributeOverride.getName()); virtualAttributeOverride = virtualAttributeOverrides.next(); @@ -734,10 +734,10 @@ public class OrmEmbeddedIdMappingTests extends ContextModelTestCase persistentType.getAttributeNamed("address").convertToSpecified(); OrmEmbeddedIdMapping ormMapping = (OrmEmbeddedIdMapping) persistentType.getAttributeNamed("address").getMapping(); OrmAttributeOverrideContainer ormOverrideContainer = ormMapping.getAttributeOverrideContainer(); - assertEquals(4, ormOverrideContainer.overridesSize()); - assertEquals(4, ormOverrideContainer.virtualOverridesSize()); - assertEquals(0, ormOverrideContainer.specifiedOverridesSize()); - ListIterator ormOverrides = ormOverrideContainer.virtualOverrides(); + assertEquals(4, ormOverrideContainer.getOverridesSize()); + assertEquals(4, ormOverrideContainer.getVirtualOverridesSize()); + assertEquals(0, ormOverrideContainer.getSpecifiedOverridesSize()); + ListIterator ormOverrides = ormOverrideContainer.getVirtualOverrides().iterator(); OrmVirtualAttributeOverride ormOverride = ormOverrides.next(); assertEquals("id", ormOverride.getName()); ormOverride = ormOverrides.next(); @@ -760,13 +760,13 @@ public class OrmEmbeddedIdMappingTests extends ContextModelTestCase assertEquals("zip", ormOverride.getName()); //set one of the virtual attribute overrides to specified, verify others are still virtual - ormOverrideContainer.virtualOverrides().next().convertToSpecified(); + ormOverrideContainer.getVirtualOverrides().iterator().next().convertToSpecified(); - assertEquals(4, ormOverrideContainer.overridesSize()); - assertEquals(1, ormOverrideContainer.specifiedOverridesSize()); - assertEquals(3, ormOverrideContainer.virtualOverridesSize()); - assertEquals("id", ormOverrideContainer.specifiedOverrides().next().getName()); - ormOverrides = ormOverrideContainer.virtualOverrides(); + assertEquals(4, ormOverrideContainer.getOverridesSize()); + assertEquals(1, ormOverrideContainer.getSpecifiedOverridesSize()); + assertEquals(3, ormOverrideContainer.getVirtualOverridesSize()); + assertEquals("id", ormOverrideContainer.getSpecifiedOverrides().iterator().next().getName()); + ormOverrides = ormOverrideContainer.getVirtualOverrides().iterator(); ormOverride = ormOverrides.next(); assertEquals("city", ormOverride.getName()); ormOverride = ormOverrides.next(); @@ -781,25 +781,25 @@ public class OrmEmbeddedIdMappingTests extends ContextModelTestCase OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); getEntityMappings().addPersistentType(MappingKeys.EMBEDDABLE_TYPE_MAPPING_KEY, PACKAGE_NAME_ + "Address"); - assertEquals(3, ormPersistentType.virtualAttributesSize()); - OrmReadOnlyPersistentAttribute ormPersistentAttribute = ormPersistentType.virtualAttributes().next(); + assertEquals(3, ormPersistentType.getVirtualAttributesSize()); + OrmReadOnlyPersistentAttribute ormPersistentAttribute = ormPersistentType.getVirtualAttributes().iterator().next(); JavaEmbeddedIdMapping embeddedIdMapping = (JavaEmbeddedIdMapping) ormPersistentAttribute.getMapping(); JavaAttributeOverrideContainer attributeOverrideContainer = embeddedIdMapping.getAttributeOverrideContainer(); assertEquals("address", embeddedIdMapping.getName()); - assertEquals(4, attributeOverrideContainer.overridesSize()); - assertEquals(1, attributeOverrideContainer.specifiedOverridesSize()); - assertEquals(3, attributeOverrideContainer.virtualOverridesSize()); + assertEquals(4, attributeOverrideContainer.getOverridesSize()); + assertEquals(1, attributeOverrideContainer.getSpecifiedOverridesSize()); + assertEquals(3, attributeOverrideContainer.getVirtualOverridesSize()); - ListIterator specifiedAttributeOverrides = attributeOverrideContainer.specifiedOverrides(); + ListIterator specifiedAttributeOverrides = attributeOverrideContainer.getSpecifiedOverrides().iterator(); AttributeOverride specifiedAttributeOverride = specifiedAttributeOverrides.next(); assertEquals(ATTRIBUTE_OVERRIDE_NAME, specifiedAttributeOverride.getName()); Column column = specifiedAttributeOverride.getColumn(); assertEquals(ATTRIBUTE_OVERRIDE_COLUMN_NAME, column.getSpecifiedName()); this.ormXmlResource.saveIfNecessary(); - ListIterator virtualAttributeOverrides = attributeOverrideContainer.virtualOverrides(); + ListIterator virtualAttributeOverrides = attributeOverrideContainer.getVirtualOverrides().iterator(); JavaVirtualAttributeOverride virtualAttributeOverride = virtualAttributeOverrides.next(); assertEquals("id", virtualAttributeOverride.getName()); JavaVirtualColumn virtualColumn = virtualAttributeOverride.getColumn(); @@ -827,7 +827,7 @@ public class OrmEmbeddedIdMappingTests extends ContextModelTestCase OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); getEntityMappings().addPersistentType(MappingKeys.EMBEDDABLE_TYPE_MAPPING_KEY, PACKAGE_NAME + ".Address"); ormPersistentType.getMapping().setSpecifiedMetadataComplete(Boolean.TRUE); - assertEquals(3, ormPersistentType.virtualAttributesSize()); + assertEquals(3, ormPersistentType.getVirtualAttributesSize()); OrmReadOnlyPersistentAttribute ormPersistentAttribute = ormPersistentType.getAttributeNamed("address"); assertTrue(ormPersistentAttribute.isVirtual()); @@ -878,14 +878,14 @@ public class OrmEmbeddedIdMappingTests extends ContextModelTestCase getEntityMappings().addPersistentType(MappingKeys.EMBEDDABLE_TYPE_MAPPING_KEY, PACKAGE_NAME + ".Address"); ormPersistentType.addSpecifiedAttribute(MappingKeys.EMBEDDED_ID_ATTRIBUTE_MAPPING_KEY, "address"); - assertEquals(2, ormPersistentType.virtualAttributesSize()); + assertEquals(2, ormPersistentType.getVirtualAttributesSize()); - OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.specifiedAttributes().next(); + OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.getSpecifiedAttributes().iterator().next(); OrmEmbeddedIdMapping ormEmbeddedIdMapping = (OrmEmbeddedIdMapping) ormPersistentAttribute.getMapping(); assertEquals("address", ormEmbeddedIdMapping.getName()); - assertEquals(0, ormEmbeddedIdMapping.getAttributeOverrideContainer().specifiedOverridesSize()); + assertEquals(0, ormEmbeddedIdMapping.getAttributeOverrideContainer().getSpecifiedOverridesSize()); //TODO // assertEquals(4, CollectionTools.size(ormEmbeddedIdMapping.defaultAttributeOverrides())); // ListIterator ormAttributeOverrides = ormEmbeddedIdMapping.defaultAttributeOverrides(); diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmEmbeddedMappingTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmEmbeddedMappingTests.java index 66a3ce0f86..f5bcd81c2f 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmEmbeddedMappingTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmEmbeddedMappingTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2010 Oracle. All rights reserved. + * Copyright (c) 2007, 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. @@ -337,7 +337,7 @@ public class OrmEmbeddedMappingTests extends ContextModelTestCase assertEquals(3, embeddedResource.getAttributeOverrides().size()); attributeOverrideContainer.moveSpecifiedOverride(2, 0); - ListIterator attributeOverrides = attributeOverrideContainer.specifiedOverrides(); + ListIterator attributeOverrides = attributeOverrideContainer.getSpecifiedOverrides().iterator(); assertEquals("BAR", attributeOverrides.next().getName()); assertEquals("BAZ", attributeOverrides.next().getName()); assertEquals("FOO", attributeOverrides.next().getName()); @@ -348,7 +348,7 @@ public class OrmEmbeddedMappingTests extends ContextModelTestCase attributeOverrideContainer.moveSpecifiedOverride(0, 1); - attributeOverrides = attributeOverrideContainer.specifiedOverrides(); + attributeOverrides = attributeOverrideContainer.getSpecifiedOverrides().iterator(); assertEquals("BAZ", attributeOverrides.next().getName()); assertEquals("BAR", attributeOverrides.next().getName()); assertEquals("FOO", attributeOverrides.next().getName()); @@ -373,39 +373,39 @@ public class OrmEmbeddedMappingTests extends ContextModelTestCase embeddedResource.getAttributeOverrides().get(1).setName("BAR"); embeddedResource.getAttributeOverrides().get(2).setName("BAZ"); - ListIterator attributeOverrides = attributeOverrideContainer.specifiedOverrides(); + ListIterator attributeOverrides = attributeOverrideContainer.getSpecifiedOverrides().iterator(); assertEquals("FOO", attributeOverrides.next().getName()); assertEquals("BAR", attributeOverrides.next().getName()); assertEquals("BAZ", attributeOverrides.next().getName()); assertFalse(attributeOverrides.hasNext()); embeddedResource.getAttributeOverrides().move(2, 0); - attributeOverrides = attributeOverrideContainer.specifiedOverrides(); + attributeOverrides = attributeOverrideContainer.getSpecifiedOverrides().iterator(); assertEquals("BAR", attributeOverrides.next().getName()); assertEquals("BAZ", attributeOverrides.next().getName()); assertEquals("FOO", attributeOverrides.next().getName()); assertFalse(attributeOverrides.hasNext()); embeddedResource.getAttributeOverrides().move(0, 1); - attributeOverrides = attributeOverrideContainer.specifiedOverrides(); + attributeOverrides = attributeOverrideContainer.getSpecifiedOverrides().iterator(); assertEquals("BAZ", attributeOverrides.next().getName()); assertEquals("BAR", attributeOverrides.next().getName()); assertEquals("FOO", attributeOverrides.next().getName()); assertFalse(attributeOverrides.hasNext()); embeddedResource.getAttributeOverrides().remove(1); - attributeOverrides = attributeOverrideContainer.specifiedOverrides(); + attributeOverrides = attributeOverrideContainer.getSpecifiedOverrides().iterator(); assertEquals("BAZ", attributeOverrides.next().getName()); assertEquals("FOO", attributeOverrides.next().getName()); assertFalse(attributeOverrides.hasNext()); embeddedResource.getAttributeOverrides().remove(1); - attributeOverrides = attributeOverrideContainer.specifiedOverrides(); + attributeOverrides = attributeOverrideContainer.getSpecifiedOverrides().iterator(); assertEquals("BAZ", attributeOverrides.next().getName()); assertFalse(attributeOverrides.hasNext()); embeddedResource.getAttributeOverrides().remove(0); - assertFalse(attributeOverrideContainer.specifiedOverrides().hasNext()); + assertFalse(attributeOverrideContainer.getSpecifiedOverrides().iterator().hasNext()); } @@ -416,17 +416,17 @@ public class OrmEmbeddedMappingTests extends ContextModelTestCase OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); getEntityMappings().addPersistentType(MappingKeys.EMBEDDABLE_TYPE_MAPPING_KEY, PACKAGE_NAME + ".Address"); ormPersistentType.addSpecifiedAttribute(MappingKeys.EMBEDDED_ATTRIBUTE_MAPPING_KEY, "foo"); - assertEquals(3, ormPersistentType.virtualAttributesSize()); + assertEquals(3, ormPersistentType.getVirtualAttributesSize()); - OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.specifiedAttributes().next(); + OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.getSpecifiedAttributes().iterator().next(); OrmEmbeddedMapping ormEmbeddedMapping = (OrmEmbeddedMapping) ormPersistentAttribute.getMapping(); OrmAttributeOverrideContainer attributeOverrideContainer = ormEmbeddedMapping.getAttributeOverrideContainer(); assertEquals("foo", ormEmbeddedMapping.getName()); - assertFalse(attributeOverrideContainer.specifiedOverrides().hasNext()); - assertFalse(attributeOverrideContainer.virtualOverrides().hasNext()); + assertFalse(attributeOverrideContainer.getSpecifiedOverrides().iterator().hasNext()); + assertFalse(attributeOverrideContainer.getVirtualOverrides().iterator().hasNext()); } public void testVirtualAttributeOverrides() throws Exception { @@ -439,13 +439,13 @@ public class OrmEmbeddedMappingTests extends ContextModelTestCase OrmReadOnlyPersistentAttribute ormPersistentAttribute = persistentType.getAttributeNamed("address"); JavaEmbeddedMapping embeddedMapping = (JavaEmbeddedMapping) ormPersistentAttribute.getMapping(); JavaAttributeOverrideContainer attributeOverrideContainer = embeddedMapping.getAttributeOverrideContainer(); - assertEquals(4, attributeOverrideContainer.overridesSize()); - assertEquals(3, attributeOverrideContainer.virtualOverridesSize()); - assertEquals(1, attributeOverrideContainer.specifiedOverridesSize()); - ListIterator specifiedAttributeOverrides = attributeOverrideContainer.specifiedOverrides(); + assertEquals(4, attributeOverrideContainer.getOverridesSize()); + assertEquals(3, attributeOverrideContainer.getVirtualOverridesSize()); + assertEquals(1, attributeOverrideContainer.getSpecifiedOverridesSize()); + ListIterator specifiedAttributeOverrides = attributeOverrideContainer.getSpecifiedOverrides().iterator(); AttributeOverride attributeOverride = specifiedAttributeOverrides.next(); assertEquals("city", attributeOverride.getName()); - ListIterator virtualAttributeOverrides = attributeOverrideContainer.virtualOverrides(); + ListIterator virtualAttributeOverrides = attributeOverrideContainer.getVirtualOverrides().iterator(); JavaVirtualAttributeOverride virtualOverride = virtualAttributeOverrides.next(); assertEquals("id", virtualOverride.getName()); virtualOverride = virtualAttributeOverrides.next(); @@ -454,7 +454,7 @@ public class OrmEmbeddedMappingTests extends ContextModelTestCase assertEquals("zip", virtualOverride.getName()); JavaEmbeddedMapping javaEmbeddedMapping = (JavaEmbeddedMapping) ormPersistentAttribute.getJavaPersistentAttribute().getMapping(); - Column javaAttributeOverrideColumn = javaEmbeddedMapping.getAttributeOverrideContainer().specifiedOverrides().next().getColumn(); + Column javaAttributeOverrideColumn = javaEmbeddedMapping.getAttributeOverrideContainer().getSpecifiedOverrides().iterator().next().getColumn(); javaAttributeOverrideColumn.setSpecifiedName("FOO_COLUMN"); javaAttributeOverrideColumn.setSpecifiedTable("FOO_TABLE"); @@ -471,10 +471,10 @@ public class OrmEmbeddedMappingTests extends ContextModelTestCase javaBasicMapping.getColumn().setSpecifiedName("MY_STATE_COLUMN"); embeddedMapping = (JavaEmbeddedMapping) ormPersistentAttribute.getMapping(); attributeOverrideContainer = embeddedMapping.getAttributeOverrideContainer(); - assertEquals(4, attributeOverrideContainer.overridesSize()); - assertEquals(3, attributeOverrideContainer.virtualOverridesSize()); - assertEquals(1, attributeOverrideContainer.specifiedOverridesSize()); - specifiedAttributeOverrides = attributeOverrideContainer.specifiedOverrides(); + assertEquals(4, attributeOverrideContainer.getOverridesSize()); + assertEquals(3, attributeOverrideContainer.getVirtualOverridesSize()); + assertEquals(1, attributeOverrideContainer.getSpecifiedOverridesSize()); + specifiedAttributeOverrides = attributeOverrideContainer.getSpecifiedOverrides().iterator(); attributeOverride = specifiedAttributeOverrides.next(); assertEquals("city", attributeOverride.getName()); assertEquals("FOO_COLUMN", attributeOverride.getColumn().getSpecifiedName()); @@ -488,7 +488,7 @@ public class OrmEmbeddedMappingTests extends ContextModelTestCase assertEquals(6, attributeOverride.getColumn().getPrecision()); assertEquals(7, attributeOverride.getColumn().getScale()); - virtualAttributeOverrides = attributeOverrideContainer.virtualOverrides(); + virtualAttributeOverrides = attributeOverrideContainer.getVirtualOverrides().iterator(); virtualOverride = virtualAttributeOverrides.next(); assertEquals("id", virtualOverride.getName()); virtualOverride = virtualAttributeOverrides.next(); @@ -502,10 +502,10 @@ public class OrmEmbeddedMappingTests extends ContextModelTestCase persistentType.getAttributeNamed("address").convertToSpecified(); OrmEmbeddedMapping ormMapping = (OrmEmbeddedMapping) persistentType.getAttributeNamed("address").getMapping(); OrmAttributeOverrideContainer ormOverrideContainer = ormMapping.getAttributeOverrideContainer(); - assertEquals(4, ormOverrideContainer.overridesSize()); - assertEquals(4, ormOverrideContainer.virtualOverridesSize()); - assertEquals(0, ormOverrideContainer.specifiedOverridesSize()); - ListIterator ormVirtualAttributeOverrides = ormOverrideContainer.virtualOverrides(); + assertEquals(4, ormOverrideContainer.getOverridesSize()); + assertEquals(4, ormOverrideContainer.getVirtualOverridesSize()); + assertEquals(0, ormOverrideContainer.getSpecifiedOverridesSize()); + ListIterator ormVirtualAttributeOverrides = ormOverrideContainer.getVirtualOverrides().iterator(); OrmVirtualAttributeOverride ormVirtualOverride = ormVirtualAttributeOverrides.next(); assertEquals("id", ormVirtualOverride.getName()); ormVirtualOverride = ormVirtualAttributeOverrides.next(); @@ -528,13 +528,13 @@ public class OrmEmbeddedMappingTests extends ContextModelTestCase assertEquals("zip", ormVirtualOverride.getName()); //set one of the virtual attribute overrides to specified, verify others are still virtual - ormOverrideContainer.virtualOverrides().next().convertToSpecified(); + ormOverrideContainer.getVirtualOverrides().iterator().next().convertToSpecified(); - assertEquals(4, ormOverrideContainer.overridesSize()); - assertEquals(1, ormOverrideContainer.specifiedOverridesSize()); - assertEquals(3, ormOverrideContainer.virtualOverridesSize()); - assertEquals("id", ormOverrideContainer.specifiedOverrides().next().getName()); - ormVirtualAttributeOverrides = ormOverrideContainer.virtualOverrides(); + assertEquals(4, ormOverrideContainer.getOverridesSize()); + assertEquals(1, ormOverrideContainer.getSpecifiedOverridesSize()); + assertEquals(3, ormOverrideContainer.getVirtualOverridesSize()); + assertEquals("id", ormOverrideContainer.getSpecifiedOverrides().iterator().next().getName()); + ormVirtualAttributeOverrides = ormOverrideContainer.getVirtualOverrides().iterator(); ormVirtualOverride = ormVirtualAttributeOverrides.next(); assertEquals("city", ormVirtualOverride.getName()); ormVirtualOverride = ormVirtualAttributeOverrides.next(); @@ -550,25 +550,25 @@ public class OrmEmbeddedMappingTests extends ContextModelTestCase OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); getEntityMappings().addPersistentType(MappingKeys.EMBEDDABLE_TYPE_MAPPING_KEY, PACKAGE_NAME + ".Address"); - assertEquals(3, ormPersistentType.virtualAttributesSize()); - OrmReadOnlyPersistentAttribute ormPersistentAttribute = ormPersistentType.virtualAttributes().next(); + assertEquals(3, ormPersistentType.getVirtualAttributesSize()); + OrmReadOnlyPersistentAttribute ormPersistentAttribute = ormPersistentType.getVirtualAttributes().iterator().next(); JavaEmbeddedMapping embeddedMapping = (JavaEmbeddedMapping) ormPersistentAttribute.getMapping(); JavaAttributeOverrideContainer attributeOverrideContainer = embeddedMapping.getAttributeOverrideContainer(); assertEquals("address", embeddedMapping.getName()); - assertEquals(4, attributeOverrideContainer.overridesSize()); - assertEquals(1, attributeOverrideContainer.specifiedOverridesSize()); - assertEquals(3, attributeOverrideContainer.virtualOverridesSize()); + assertEquals(4, attributeOverrideContainer.getOverridesSize()); + assertEquals(1, attributeOverrideContainer.getSpecifiedOverridesSize()); + assertEquals(3, attributeOverrideContainer.getVirtualOverridesSize()); - ListIterator specifiedAttributeOverrides = attributeOverrideContainer.specifiedOverrides(); + ListIterator specifiedAttributeOverrides = attributeOverrideContainer.getSpecifiedOverrides().iterator(); JavaAttributeOverride specifiedAttributeOverride = specifiedAttributeOverrides.next(); assertEquals(ATTRIBUTE_OVERRIDE_NAME, specifiedAttributeOverride.getName()); Column column = specifiedAttributeOverride.getColumn(); assertEquals(ATTRIBUTE_OVERRIDE_COLUMN_NAME, column.getSpecifiedName()); - ListIterator virtualAttributeOverrides = attributeOverrideContainer.virtualOverrides(); + ListIterator virtualAttributeOverrides = attributeOverrideContainer.getVirtualOverrides().iterator(); JavaVirtualAttributeOverride virtualAttributeOverride = virtualAttributeOverrides.next(); assertEquals("id", virtualAttributeOverride.getName()); VirtualColumn virtualColumn = virtualAttributeOverride.getColumn(); @@ -593,8 +593,8 @@ public class OrmEmbeddedMappingTests extends ContextModelTestCase OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); getEntityMappings().addPersistentType(MappingKeys.EMBEDDABLE_TYPE_MAPPING_KEY, PACKAGE_NAME + ".Address"); ormPersistentType.getMapping().setSpecifiedMetadataComplete(Boolean.TRUE); - assertEquals(3, ormPersistentType.virtualAttributesSize()); - OrmReadOnlyPersistentAttribute ormPersistentAttribute = ormPersistentType.virtualAttributes().next(); + assertEquals(3, ormPersistentType.getVirtualAttributesSize()); + OrmReadOnlyPersistentAttribute ormPersistentAttribute = ormPersistentType.getVirtualAttributes().iterator().next(); EmbeddedMapping embeddedMapping = (EmbeddedMapping) ormPersistentAttribute.getMapping(); assertEquals("address", embeddedMapping.getName()); @@ -642,14 +642,14 @@ public class OrmEmbeddedMappingTests extends ContextModelTestCase getEntityMappings().addPersistentType(MappingKeys.EMBEDDABLE_TYPE_MAPPING_KEY, PACKAGE_NAME + ".Address"); ormPersistentType.addSpecifiedAttribute(MappingKeys.EMBEDDED_ATTRIBUTE_MAPPING_KEY, "address"); - assertEquals(2, ormPersistentType.virtualAttributesSize()); + assertEquals(2, ormPersistentType.getVirtualAttributesSize()); - OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.specifiedAttributes().next(); + OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.getSpecifiedAttributes().iterator().next(); OrmEmbeddedMapping ormEmbeddedMapping = (OrmEmbeddedMapping) ormPersistentAttribute.getMapping(); assertEquals("address", ormEmbeddedMapping.getName()); - assertEquals(0, ormEmbeddedMapping.getAttributeOverrideContainer().specifiedOverridesSize()); + assertEquals(0, ormEmbeddedMapping.getAttributeOverrideContainer().getSpecifiedOverridesSize()); //TODO // assertEquals(4, CollectionTools.size(ormEmbeddedMapping.defaultAttributeOverrides())); // ListIterator ormAttributeOverrides = ormEmbeddedMapping.defaultAttributeOverrides(); @@ -694,14 +694,14 @@ public class OrmEmbeddedMappingTests extends ContextModelTestCase assertFalse(embeddedMapping.isDefault()); XmlEmbedded embeddedResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getEmbeddeds().get(0); embeddedResource.getAttributeOverrides().add(OrmFactory.eINSTANCE.createXmlAttributeOverride()); - AttributeOverride attributeOverride = embeddedMapping.getAttributeOverrideContainer().specifiedOverrides().next(); + AttributeOverride attributeOverride = embeddedMapping.getAttributeOverrideContainer().getSpecifiedOverrides().iterator().next(); attributeOverride.setName("override"); attributeOverride.getColumn().setSpecifiedName("OVERRIDE_COLUMN"); assertFalse(embeddedMapping.isDefault()); ormPersistentAttribute.setMappingKey(MappingKeys.ID_ATTRIBUTE_MAPPING_KEY); - assertEquals(1, ormPersistentType.specifiedAttributesSize()); - assertEquals(ormPersistentAttribute, ormPersistentType.specifiedAttributes().next()); + assertEquals(1, ormPersistentType.getSpecifiedAttributesSize()); + assertEquals(ormPersistentAttribute, ormPersistentType.getSpecifiedAttributes().iterator().next()); assertTrue(ormPersistentAttribute.getMapping() instanceof IdMapping); assertEquals("embedded", ormPersistentAttribute.getMapping().getName()); } @@ -715,14 +715,14 @@ public class OrmEmbeddedMappingTests extends ContextModelTestCase assertFalse(embeddedMapping.isDefault()); XmlEmbedded embeddedResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getEmbeddeds().get(0); embeddedResource.getAttributeOverrides().add(OrmFactory.eINSTANCE.createXmlAttributeOverride()); - AttributeOverride attributeOverride = embeddedMapping.getAttributeOverrideContainer().specifiedOverrides().next(); + AttributeOverride attributeOverride = embeddedMapping.getAttributeOverrideContainer().getSpecifiedOverrides().iterator().next(); attributeOverride.setName("override"); attributeOverride.getColumn().setSpecifiedName("OVERRIDE_COLUMN"); assertFalse(embeddedMapping.isDefault()); ormPersistentAttribute.setMappingKey(MappingKeys.VERSION_ATTRIBUTE_MAPPING_KEY); - assertEquals(1, ormPersistentType.specifiedAttributesSize()); - assertEquals(ormPersistentAttribute, ormPersistentType.specifiedAttributes().next()); + assertEquals(1, ormPersistentType.getSpecifiedAttributesSize()); + assertEquals(ormPersistentAttribute, ormPersistentType.getSpecifiedAttributes().iterator().next()); assertTrue(ormPersistentAttribute.getMapping() instanceof VersionMapping); assertEquals("embedded", ormPersistentAttribute.getMapping().getName()); } @@ -736,14 +736,14 @@ public class OrmEmbeddedMappingTests extends ContextModelTestCase assertFalse(embeddedMapping.isDefault()); XmlEmbedded embeddedResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getEmbeddeds().get(0); embeddedResource.getAttributeOverrides().add(OrmFactory.eINSTANCE.createXmlAttributeOverride()); - AttributeOverride attributeOverride = embeddedMapping.getAttributeOverrideContainer().specifiedOverrides().next(); + AttributeOverride attributeOverride = embeddedMapping.getAttributeOverrideContainer().getSpecifiedOverrides().iterator().next(); attributeOverride.setName("override"); attributeOverride.getColumn().setSpecifiedName("OVERRIDE_COLUMN"); assertFalse(embeddedMapping.isDefault()); ormPersistentAttribute.setMappingKey(MappingKeys.TRANSIENT_ATTRIBUTE_MAPPING_KEY); - assertEquals(1, ormPersistentType.specifiedAttributesSize()); - assertEquals(ormPersistentAttribute, ormPersistentType.specifiedAttributes().next()); + assertEquals(1, ormPersistentType.getSpecifiedAttributesSize()); + assertEquals(ormPersistentAttribute, ormPersistentType.getSpecifiedAttributes().iterator().next()); assertTrue(ormPersistentAttribute.getMapping() instanceof TransientMapping); assertEquals("embedded", ormPersistentAttribute.getMapping().getName()); } @@ -757,14 +757,14 @@ public class OrmEmbeddedMappingTests extends ContextModelTestCase assertFalse(embeddedMapping.isDefault()); XmlEmbedded embeddedResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getEmbeddeds().get(0); embeddedResource.getAttributeOverrides().add(OrmFactory.eINSTANCE.createXmlAttributeOverride()); - AttributeOverride attributeOverride = embeddedMapping.getAttributeOverrideContainer().specifiedOverrides().next(); + AttributeOverride attributeOverride = embeddedMapping.getAttributeOverrideContainer().getSpecifiedOverrides().iterator().next(); attributeOverride.setName("override"); attributeOverride.getColumn().setSpecifiedName("OVERRIDE_COLUMN"); assertFalse(embeddedMapping.isDefault()); ormPersistentAttribute.setMappingKey(MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY); - assertEquals(1, ormPersistentType.specifiedAttributesSize()); - assertEquals(ormPersistentAttribute, ormPersistentType.specifiedAttributes().next()); + assertEquals(1, ormPersistentType.getSpecifiedAttributesSize()); + assertEquals(ormPersistentAttribute, ormPersistentType.getSpecifiedAttributes().iterator().next()); assertTrue(ormPersistentAttribute.getMapping() instanceof BasicMapping); assertEquals("embedded", ormPersistentAttribute.getMapping().getName()); } @@ -778,17 +778,17 @@ public class OrmEmbeddedMappingTests extends ContextModelTestCase assertFalse(embeddedMapping.isDefault()); XmlEmbedded embeddedResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getEmbeddeds().get(0); embeddedResource.getAttributeOverrides().add(OrmFactory.eINSTANCE.createXmlAttributeOverride()); - AttributeOverride attributeOverride = embeddedMapping.getAttributeOverrideContainer().specifiedOverrides().next(); + AttributeOverride attributeOverride = embeddedMapping.getAttributeOverrideContainer().getSpecifiedOverrides().iterator().next(); attributeOverride.setName("override"); attributeOverride.getColumn().setSpecifiedName("OVERRIDE_COLUMN"); assertFalse(embeddedMapping.isDefault()); ormPersistentAttribute.setMappingKey(MappingKeys.EMBEDDED_ID_ATTRIBUTE_MAPPING_KEY); assertTrue(ormPersistentAttribute.getMapping() instanceof EmbeddedIdMapping); - assertEquals(1, ormPersistentType.specifiedAttributesSize()); - assertEquals(ormPersistentAttribute, ormPersistentType.specifiedAttributes().next()); + assertEquals(1, ormPersistentType.getSpecifiedAttributesSize()); + assertEquals(ormPersistentAttribute, ormPersistentType.getSpecifiedAttributes().iterator().next()); assertEquals("embedded", ormPersistentAttribute.getMapping().getName()); - attributeOverride = ((EmbeddedIdMapping) ormPersistentAttribute.getMapping()).getAttributeOverrideContainer().specifiedOverrides().next(); + attributeOverride = ((EmbeddedIdMapping) ormPersistentAttribute.getMapping()).getAttributeOverrideContainer().getSpecifiedOverrides().iterator().next(); assertEquals("override", attributeOverride.getName()); assertEquals("OVERRIDE_COLUMN", attributeOverride.getColumn().getSpecifiedName()); } @@ -802,14 +802,14 @@ public class OrmEmbeddedMappingTests extends ContextModelTestCase assertFalse(embeddedMapping.isDefault()); XmlEmbedded embeddedResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getEmbeddeds().get(0); embeddedResource.getAttributeOverrides().add(OrmFactory.eINSTANCE.createXmlAttributeOverride()); - AttributeOverride attributeOverride = embeddedMapping.getAttributeOverrideContainer().specifiedOverrides().next(); + AttributeOverride attributeOverride = embeddedMapping.getAttributeOverrideContainer().getSpecifiedOverrides().iterator().next(); attributeOverride.setName("override"); attributeOverride.getColumn().setSpecifiedName("OVERRIDE_COLUMN"); assertFalse(embeddedMapping.isDefault()); ormPersistentAttribute.setMappingKey(MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY); - assertEquals(1, ormPersistentType.specifiedAttributesSize()); - assertEquals(ormPersistentAttribute, ormPersistentType.specifiedAttributes().next()); + assertEquals(1, ormPersistentType.getSpecifiedAttributesSize()); + assertEquals(ormPersistentAttribute, ormPersistentType.getSpecifiedAttributes().iterator().next()); assertTrue(ormPersistentAttribute.getMapping() instanceof OneToOneMapping); assertEquals("embedded", ormPersistentAttribute.getMapping().getName()); } @@ -823,14 +823,14 @@ public class OrmEmbeddedMappingTests extends ContextModelTestCase assertFalse(embeddedMapping.isDefault()); XmlEmbedded embeddedResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getEmbeddeds().get(0); embeddedResource.getAttributeOverrides().add(OrmFactory.eINSTANCE.createXmlAttributeOverride()); - AttributeOverride attributeOverride = embeddedMapping.getAttributeOverrideContainer().specifiedOverrides().next(); + AttributeOverride attributeOverride = embeddedMapping.getAttributeOverrideContainer().getSpecifiedOverrides().iterator().next(); attributeOverride.setName("override"); attributeOverride.getColumn().setSpecifiedName("OVERRIDE_COLUMN"); assertFalse(embeddedMapping.isDefault()); ormPersistentAttribute.setMappingKey(MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY); - assertEquals(1, ormPersistentType.specifiedAttributesSize()); - assertEquals(ormPersistentAttribute, ormPersistentType.specifiedAttributes().next()); + assertEquals(1, ormPersistentType.getSpecifiedAttributesSize()); + assertEquals(ormPersistentAttribute, ormPersistentType.getSpecifiedAttributes().iterator().next()); assertTrue(ormPersistentAttribute.getMapping() instanceof OneToManyMapping); assertEquals("embedded", ormPersistentAttribute.getMapping().getName()); } @@ -844,14 +844,14 @@ public class OrmEmbeddedMappingTests extends ContextModelTestCase assertFalse(embeddedMapping.isDefault()); XmlEmbedded embeddedResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getEmbeddeds().get(0); embeddedResource.getAttributeOverrides().add(OrmFactory.eINSTANCE.createXmlAttributeOverride()); - AttributeOverride attributeOverride = embeddedMapping.getAttributeOverrideContainer().specifiedOverrides().next(); + AttributeOverride attributeOverride = embeddedMapping.getAttributeOverrideContainer().getSpecifiedOverrides().iterator().next(); attributeOverride.setName("override"); attributeOverride.getColumn().setSpecifiedName("OVERRIDE_COLUMN"); assertFalse(embeddedMapping.isDefault()); ormPersistentAttribute.setMappingKey(MappingKeys.MANY_TO_ONE_ATTRIBUTE_MAPPING_KEY); - assertEquals(1, ormPersistentType.specifiedAttributesSize()); - assertEquals(ormPersistentAttribute, ormPersistentType.specifiedAttributes().next()); + assertEquals(1, ormPersistentType.getSpecifiedAttributesSize()); + assertEquals(ormPersistentAttribute, ormPersistentType.getSpecifiedAttributes().iterator().next()); assertTrue(ormPersistentAttribute.getMapping() instanceof ManyToOneMapping); assertEquals("embedded", ormPersistentAttribute.getMapping().getName()); } @@ -865,7 +865,7 @@ public class OrmEmbeddedMappingTests extends ContextModelTestCase assertFalse(embeddedMapping.isDefault()); XmlEmbedded embeddedResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getEmbeddeds().get(0); embeddedResource.getAttributeOverrides().add(OrmFactory.eINSTANCE.createXmlAttributeOverride()); - AttributeOverride attributeOverride = embeddedMapping.getAttributeOverrideContainer().specifiedOverrides().next(); + AttributeOverride attributeOverride = embeddedMapping.getAttributeOverrideContainer().getSpecifiedOverrides().iterator().next(); attributeOverride.setName("override"); attributeOverride.getColumn().setSpecifiedName("OVERRIDE_COLUMN"); assertFalse(embeddedMapping.isDefault()); @@ -889,8 +889,8 @@ public class OrmEmbeddedMappingTests extends ContextModelTestCase OrmEmbeddedMapping embeddedMapping = (OrmEmbeddedMapping) customerPersistentType.getAttributeNamed("address").getMapping(); OrmAttributeOverrideContainer attributeOverrideContainer = embeddedMapping.getAttributeOverrideContainer(); - assertEquals(3, attributeOverrideContainer.virtualOverridesSize()); - ListIterator virtualAttributeOverrides = attributeOverrideContainer.virtualOverrides(); + assertEquals(3, attributeOverrideContainer.getVirtualOverridesSize()); + ListIterator virtualAttributeOverrides = attributeOverrideContainer.getVirtualOverrides().iterator(); OrmVirtualAttributeOverride virtualAttributeOverride = virtualAttributeOverrides.next(); assertEquals("street", virtualAttributeOverride.getName()); virtualAttributeOverride = virtualAttributeOverrides.next(); @@ -902,8 +902,8 @@ public class OrmEmbeddedMappingTests extends ContextModelTestCase addressPersistentType.getAttributeNamed("zipCode").convertToSpecified(); OrmEmbeddedMapping nestedEmbeddedMapping = (OrmEmbeddedMapping) addressPersistentType.getAttributeNamed("zipCode").getMapping(); OrmAttributeOverrideContainer nestedAttributeOverrideContainer = nestedEmbeddedMapping.getAttributeOverrideContainer(); - assertEquals(2, nestedAttributeOverrideContainer.virtualOverridesSize()); - virtualAttributeOverrides = nestedAttributeOverrideContainer.virtualOverrides(); + assertEquals(2, nestedAttributeOverrideContainer.getVirtualOverridesSize()); + virtualAttributeOverrides = nestedAttributeOverrideContainer.getVirtualOverrides().iterator(); virtualAttributeOverride = virtualAttributeOverrides.next(); assertEquals("zip", virtualAttributeOverride.getName()); virtualAttributeOverride = virtualAttributeOverrides.next(); diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmEntityTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmEntityTests.java index 6f9b9607eb..488b614da6 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmEntityTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmEntityTests.java @@ -798,12 +798,12 @@ public class OrmEntityTests extends ContextModelTestCase assertEquals("BAZ", entityResource.getSecondaryTables().get(1).getName()); assertEquals("FOO", entityResource.getSecondaryTables().get(2).getName()); - ListIterator secondaryTables = ormEntity.specifiedSecondaryTables(); + ListIterator secondaryTables = ormEntity.getSpecifiedSecondaryTables().iterator(); assertEquals(secondaryTable2, secondaryTables.next()); assertEquals(secondaryTable3, secondaryTables.next()); assertEquals(secondaryTable, secondaryTables.next()); - secondaryTables = ormEntity.specifiedSecondaryTables(); + secondaryTables = ormEntity.getSpecifiedSecondaryTables().iterator(); assertEquals("BAR", secondaryTables.next().getName()); assertEquals("BAZ", secondaryTables.next().getName()); assertEquals("FOO", secondaryTables.next().getName()); @@ -846,7 +846,7 @@ public class OrmEntityTests extends ContextModelTestCase ormEntity.moveSpecifiedSecondaryTable(2, 0); - ListIterator secondaryTables = ormEntity.specifiedSecondaryTables(); + ListIterator secondaryTables = ormEntity.getSpecifiedSecondaryTables().iterator(); assertEquals("BAR", secondaryTables.next().getName()); assertEquals("BAZ", secondaryTables.next().getName()); assertEquals("FOO", secondaryTables.next().getName()); @@ -857,7 +857,7 @@ public class OrmEntityTests extends ContextModelTestCase ormEntity.moveSpecifiedSecondaryTable(0, 1); - secondaryTables = ormEntity.specifiedSecondaryTables(); + secondaryTables = ormEntity.getSpecifiedSecondaryTables().iterator(); assertEquals("BAZ", secondaryTables.next().getName()); assertEquals("BAR", secondaryTables.next().getName()); assertEquals("FOO", secondaryTables.next().getName()); @@ -880,39 +880,39 @@ public class OrmEntityTests extends ContextModelTestCase entityResource.getSecondaryTables().get(1).setName("BAR"); entityResource.getSecondaryTables().get(2).setName("BAZ"); - ListIterator secondaryTables = ormEntity.specifiedSecondaryTables(); + ListIterator secondaryTables = ormEntity.getSpecifiedSecondaryTables().iterator(); assertEquals("FOO", secondaryTables.next().getName()); assertEquals("BAR", secondaryTables.next().getName()); assertEquals("BAZ", secondaryTables.next().getName()); assertFalse(secondaryTables.hasNext()); entityResource.getSecondaryTables().move(2, 0); - secondaryTables = ormEntity.specifiedSecondaryTables(); + secondaryTables = ormEntity.getSpecifiedSecondaryTables().iterator(); assertEquals("BAR", secondaryTables.next().getName()); assertEquals("BAZ", secondaryTables.next().getName()); assertEquals("FOO", secondaryTables.next().getName()); assertFalse(secondaryTables.hasNext()); entityResource.getSecondaryTables().move(0, 1); - secondaryTables = ormEntity.specifiedSecondaryTables(); + secondaryTables = ormEntity.getSpecifiedSecondaryTables().iterator(); assertEquals("BAZ", secondaryTables.next().getName()); assertEquals("BAR", secondaryTables.next().getName()); assertEquals("FOO", secondaryTables.next().getName()); assertFalse(secondaryTables.hasNext()); entityResource.getSecondaryTables().remove(1); - secondaryTables = ormEntity.specifiedSecondaryTables(); + secondaryTables = ormEntity.getSpecifiedSecondaryTables().iterator(); assertEquals("BAZ", secondaryTables.next().getName()); assertEquals("FOO", secondaryTables.next().getName()); assertFalse(secondaryTables.hasNext()); entityResource.getSecondaryTables().remove(1); - secondaryTables = ormEntity.specifiedSecondaryTables(); + secondaryTables = ormEntity.getSpecifiedSecondaryTables().iterator(); assertEquals("BAZ", secondaryTables.next().getName()); assertFalse(secondaryTables.hasNext()); entityResource.getSecondaryTables().remove(0); - assertFalse(ormEntity.specifiedSecondaryTables().hasNext()); + assertFalse(ormEntity.getSpecifiedSecondaryTables().iterator().hasNext()); } public void testVirtualSecondaryTables() throws Exception { @@ -927,67 +927,67 @@ public class OrmEntityTests extends ContextModelTestCase JavaSecondaryTable javaSecondaryTableFoo = javaEntity.addSpecifiedSecondaryTable(0); javaSecondaryTableFoo.setSpecifiedName("FOO"); - OrmVirtualSecondaryTable virtualSecondaryTableFoo = childOrmEntity.virtualSecondaryTables().next(); - assertEquals("FOO", childOrmEntity.secondaryTables().next().getName()); + OrmVirtualSecondaryTable virtualSecondaryTableFoo = childOrmEntity.getVirtualSecondaryTables().iterator().next(); + assertEquals("FOO", childOrmEntity.getSecondaryTables().iterator().next().getName()); assertEquals("FOO", virtualSecondaryTableFoo.getName()); - assertEquals(0, virtualSecondaryTableFoo.specifiedPrimaryKeyJoinColumnsSize()); + assertEquals(0, virtualSecondaryTableFoo.getSpecifiedPrimaryKeyJoinColumnsSize()); assertEquals("id", virtualSecondaryTableFoo.getDefaultPrimaryKeyJoinColumn().getDefaultName()); assertEquals("id", virtualSecondaryTableFoo.getDefaultPrimaryKeyJoinColumn().getDefaultReferencedColumnName()); - assertEquals(0, childOrmEntity.specifiedSecondaryTablesSize()); - assertEquals(1, childOrmEntity.virtualSecondaryTablesSize()); - assertEquals(1, childOrmEntity.secondaryTablesSize()); + assertEquals(0, childOrmEntity.getSpecifiedSecondaryTablesSize()); + assertEquals(1, childOrmEntity.getVirtualSecondaryTablesSize()); + assertEquals(1, childOrmEntity.getSecondaryTablesSize()); javaEntity.addSpecifiedSecondaryTable(0).setSpecifiedName("BAR"); - ListIterator virtualSecondaryTables = childOrmEntity.virtualSecondaryTables(); - ListIterator secondaryTables = childOrmEntity.secondaryTables(); + ListIterator virtualSecondaryTables = childOrmEntity.getVirtualSecondaryTables().iterator(); + ListIterator secondaryTables = childOrmEntity.getSecondaryTables().iterator(); assertEquals("BAR", virtualSecondaryTables.next().getName()); assertEquals("FOO", virtualSecondaryTables.next().getName()); assertEquals("BAR", secondaryTables.next().getName()); assertEquals("FOO", secondaryTables.next().getName()); - assertEquals(0, childOrmEntity.specifiedSecondaryTablesSize()); - assertEquals(2, childOrmEntity.virtualSecondaryTablesSize()); - assertEquals(2, childOrmEntity.secondaryTablesSize()); + assertEquals(0, childOrmEntity.getSpecifiedSecondaryTablesSize()); + assertEquals(2, childOrmEntity.getVirtualSecondaryTablesSize()); + assertEquals(2, childOrmEntity.getSecondaryTablesSize()); childOrmEntity.setSpecifiedMetadataComplete(Boolean.TRUE); - assertEquals(0, childOrmEntity.virtualSecondaryTablesSize()); + assertEquals(0, childOrmEntity.getVirtualSecondaryTablesSize()); childOrmEntity.setSpecifiedMetadataComplete(Boolean.FALSE); - assertEquals(2, childOrmEntity.virtualSecondaryTablesSize()); + assertEquals(2, childOrmEntity.getVirtualSecondaryTablesSize()); childOrmEntity.setSecondaryTablesAreDefinedInXml(true); - assertEquals(0, childOrmEntity.virtualSecondaryTablesSize()); - assertEquals(2, childOrmEntity.specifiedSecondaryTablesSize()); - assertEquals(2, childOrmEntity.secondaryTablesSize()); - ListIterator specifiedSecondaryTables = childOrmEntity.specifiedSecondaryTables(); + assertEquals(0, childOrmEntity.getVirtualSecondaryTablesSize()); + assertEquals(2, childOrmEntity.getSpecifiedSecondaryTablesSize()); + assertEquals(2, childOrmEntity.getSecondaryTablesSize()); + ListIterator specifiedSecondaryTables = childOrmEntity.getSpecifiedSecondaryTables().iterator(); assertEquals("BAR", specifiedSecondaryTables.next().getName()); OrmSecondaryTable specifiedSecondaryTableFoo = specifiedSecondaryTables.next(); assertEquals("FOO", specifiedSecondaryTableFoo.getName()); - assertEquals(0, specifiedSecondaryTableFoo.specifiedPrimaryKeyJoinColumnsSize()); + assertEquals(0, specifiedSecondaryTableFoo.getSpecifiedPrimaryKeyJoinColumnsSize()); assertEquals("id", specifiedSecondaryTableFoo.getDefaultPrimaryKeyJoinColumn().getDefaultName()); assertEquals("id", specifiedSecondaryTableFoo.getDefaultPrimaryKeyJoinColumn().getDefaultReferencedColumnName()); childOrmEntity.removeSpecifiedSecondaryTable(0); - assertEquals(0, childOrmEntity.virtualSecondaryTablesSize()); - assertEquals(1, childOrmEntity.specifiedSecondaryTablesSize()); - assertEquals(1, childOrmEntity.secondaryTablesSize()); - assertEquals("FOO", childOrmEntity.specifiedSecondaryTables().next().getName()); + assertEquals(0, childOrmEntity.getVirtualSecondaryTablesSize()); + assertEquals(1, childOrmEntity.getSpecifiedSecondaryTablesSize()); + assertEquals(1, childOrmEntity.getSecondaryTablesSize()); + assertEquals("FOO", childOrmEntity.getSpecifiedSecondaryTables().iterator().next().getName()); childOrmEntity.removeSpecifiedSecondaryTable(0); - assertEquals(0, childOrmEntity.specifiedSecondaryTablesSize()); - assertEquals(2, childOrmEntity.virtualSecondaryTablesSize()); - assertEquals(2, childOrmEntity.secondaryTablesSize()); - virtualSecondaryTables = childOrmEntity.virtualSecondaryTables(); + assertEquals(0, childOrmEntity.getSpecifiedSecondaryTablesSize()); + assertEquals(2, childOrmEntity.getVirtualSecondaryTablesSize()); + assertEquals(2, childOrmEntity.getSecondaryTablesSize()); + virtualSecondaryTables = childOrmEntity.getVirtualSecondaryTables().iterator(); assertEquals("BAR", virtualSecondaryTables.next().getName()); assertEquals("FOO", virtualSecondaryTables.next().getName()); //add a specified secondary table to the parent, this will not affect virtual secondaryTables in child parentOrmEntity.addSpecifiedSecondaryTable(0).setSpecifiedName("PARENT_TABLE"); - assertEquals(2, childOrmEntity.virtualSecondaryTablesSize()); + assertEquals(2, childOrmEntity.getVirtualSecondaryTablesSize()); } public void testAssociatedTables() throws Exception { @@ -1162,21 +1162,21 @@ public class OrmEntityTests extends ContextModelTestCase assertNull(ormEntity.getGeneratorContainer().getSequenceGenerator()); assertNull(entityResource.getSequenceGenerator()); - assertEquals(0, ormEntity.getPersistenceUnit().generatorsSize()); + assertEquals(0, ormEntity.getPersistenceUnit().getGeneratorsSize()); entityResource.setSequenceGenerator(OrmFactory.eINSTANCE.createXmlSequenceGenerator()); assertNotNull(ormEntity.getGeneratorContainer().getSequenceGenerator()); assertNotNull(entityResource.getSequenceGenerator()); - assertEquals(1, ormEntity.getPersistenceUnit().generatorsSize()); + assertEquals(1, ormEntity.getPersistenceUnit().getGeneratorsSize()); ormEntity.getGeneratorContainer().getSequenceGenerator().setName("foo"); - assertEquals(1, ormEntity.getPersistenceUnit().generatorsSize()); + assertEquals(1, ormEntity.getPersistenceUnit().getGeneratorsSize()); entityResource.setSequenceGenerator(null); assertNull(ormEntity.getGeneratorContainer().getSequenceGenerator()); assertNull(entityResource.getSequenceGenerator()); - assertEquals(0, ormEntity.getPersistenceUnit().generatorsSize()); + assertEquals(0, ormEntity.getPersistenceUnit().getGeneratorsSize()); } public void testAddTableGenerator() throws Exception { @@ -1234,21 +1234,21 @@ public class OrmEntityTests extends ContextModelTestCase assertNull(ormEntity.getGeneratorContainer().getTableGenerator()); assertNull(entityResource.getTableGenerator()); - assertEquals(0, ormEntity.getPersistenceUnit().generatorsSize()); + assertEquals(0, ormEntity.getPersistenceUnit().getGeneratorsSize()); entityResource.setTableGenerator(OrmFactory.eINSTANCE.createXmlTableGenerator()); assertNotNull(ormEntity.getGeneratorContainer().getTableGenerator()); assertNotNull(entityResource.getTableGenerator()); - assertEquals(1, ormEntity.getPersistenceUnit().generatorsSize()); + assertEquals(1, ormEntity.getPersistenceUnit().getGeneratorsSize()); ormEntity.getGeneratorContainer().getTableGenerator().setName("foo"); - assertEquals(1, ormEntity.getPersistenceUnit().generatorsSize()); + assertEquals(1, ormEntity.getPersistenceUnit().getGeneratorsSize()); entityResource.setTableGenerator(null); assertNull(ormEntity.getGeneratorContainer().getTableGenerator()); assertNull(entityResource.getTableGenerator()); - assertEquals(0, ormEntity.getPersistenceUnit().generatorsSize()); + assertEquals(0, ormEntity.getPersistenceUnit().getGeneratorsSize()); } public void testUpdateDiscriminatorColumn() throws Exception { @@ -1358,12 +1358,12 @@ public class OrmEntityTests extends ContextModelTestCase assertEquals("BAZ", entityResource.getPrimaryKeyJoinColumns().get(1).getName()); assertEquals("FOO", entityResource.getPrimaryKeyJoinColumns().get(2).getName()); - ListIterator primaryKeyJoinColumns = ormEntity.specifiedPrimaryKeyJoinColumns(); + ListIterator primaryKeyJoinColumns = ormEntity.getSpecifiedPrimaryKeyJoinColumns().iterator(); assertEquals(primaryKeyJoinColumn2, primaryKeyJoinColumns.next()); assertEquals(primaryKeyJoinColumn3, primaryKeyJoinColumns.next()); assertEquals(primaryKeyJoinColumn, primaryKeyJoinColumns.next()); - primaryKeyJoinColumns = ormEntity.specifiedPrimaryKeyJoinColumns(); + primaryKeyJoinColumns = ormEntity.getSpecifiedPrimaryKeyJoinColumns().iterator(); assertEquals("BAR", primaryKeyJoinColumns.next().getName()); assertEquals("BAZ", primaryKeyJoinColumns.next().getName()); assertEquals("FOO", primaryKeyJoinColumns.next().getName()); @@ -1406,7 +1406,7 @@ public class OrmEntityTests extends ContextModelTestCase ormEntity.moveSpecifiedPrimaryKeyJoinColumn(2, 0); - ListIterator primaryKeyJoinColumns = ormEntity.specifiedPrimaryKeyJoinColumns(); + ListIterator primaryKeyJoinColumns = ormEntity.getSpecifiedPrimaryKeyJoinColumns().iterator(); assertEquals("BAR", primaryKeyJoinColumns.next().getName()); assertEquals("BAZ", primaryKeyJoinColumns.next().getName()); assertEquals("FOO", primaryKeyJoinColumns.next().getName()); @@ -1417,7 +1417,7 @@ public class OrmEntityTests extends ContextModelTestCase ormEntity.moveSpecifiedPrimaryKeyJoinColumn(0, 1); - primaryKeyJoinColumns = ormEntity.specifiedPrimaryKeyJoinColumns(); + primaryKeyJoinColumns = ormEntity.getSpecifiedPrimaryKeyJoinColumns().iterator(); assertEquals("BAZ", primaryKeyJoinColumns.next().getName()); assertEquals("BAR", primaryKeyJoinColumns.next().getName()); assertEquals("FOO", primaryKeyJoinColumns.next().getName()); @@ -1440,39 +1440,39 @@ public class OrmEntityTests extends ContextModelTestCase entityResource.getPrimaryKeyJoinColumns().get(1).setName("BAR"); entityResource.getPrimaryKeyJoinColumns().get(2).setName("BAZ"); - ListIterator primaryKeyJoinColumns = ormEntity.specifiedPrimaryKeyJoinColumns(); + ListIterator primaryKeyJoinColumns = ormEntity.getSpecifiedPrimaryKeyJoinColumns().iterator(); assertEquals("FOO", primaryKeyJoinColumns.next().getName()); assertEquals("BAR", primaryKeyJoinColumns.next().getName()); assertEquals("BAZ", primaryKeyJoinColumns.next().getName()); assertFalse(primaryKeyJoinColumns.hasNext()); entityResource.getPrimaryKeyJoinColumns().move(2, 0); - primaryKeyJoinColumns = ormEntity.specifiedPrimaryKeyJoinColumns(); + primaryKeyJoinColumns = ormEntity.getSpecifiedPrimaryKeyJoinColumns().iterator(); assertEquals("BAR", primaryKeyJoinColumns.next().getName()); assertEquals("BAZ", primaryKeyJoinColumns.next().getName()); assertEquals("FOO", primaryKeyJoinColumns.next().getName()); assertFalse(primaryKeyJoinColumns.hasNext()); entityResource.getPrimaryKeyJoinColumns().move(0, 1); - primaryKeyJoinColumns = ormEntity.specifiedPrimaryKeyJoinColumns(); + primaryKeyJoinColumns = ormEntity.getSpecifiedPrimaryKeyJoinColumns().iterator(); assertEquals("BAZ", primaryKeyJoinColumns.next().getName()); assertEquals("BAR", primaryKeyJoinColumns.next().getName()); assertEquals("FOO", primaryKeyJoinColumns.next().getName()); assertFalse(primaryKeyJoinColumns.hasNext()); entityResource.getPrimaryKeyJoinColumns().remove(1); - primaryKeyJoinColumns = ormEntity.specifiedPrimaryKeyJoinColumns(); + primaryKeyJoinColumns = ormEntity.getSpecifiedPrimaryKeyJoinColumns().iterator(); assertEquals("BAZ", primaryKeyJoinColumns.next().getName()); assertEquals("FOO", primaryKeyJoinColumns.next().getName()); assertFalse(primaryKeyJoinColumns.hasNext()); entityResource.getPrimaryKeyJoinColumns().remove(1); - primaryKeyJoinColumns = ormEntity.specifiedPrimaryKeyJoinColumns(); + primaryKeyJoinColumns = ormEntity.getSpecifiedPrimaryKeyJoinColumns().iterator(); assertEquals("BAZ", primaryKeyJoinColumns.next().getName()); assertFalse(primaryKeyJoinColumns.hasNext()); entityResource.getPrimaryKeyJoinColumns().remove(0); - assertFalse(ormEntity.specifiedPrimaryKeyJoinColumns().hasNext()); + assertFalse(ormEntity.getSpecifiedPrimaryKeyJoinColumns().iterator().hasNext()); } public void testDefaultPrimaryKeyJoinColumns() throws Exception { @@ -1489,28 +1489,28 @@ public class OrmEntityTests extends ContextModelTestCase OrmEntity childEntity = (OrmEntity) childPersistentType.getMapping(); - assertTrue(childEntity.defaultPrimaryKeyJoinColumns().hasNext()); - assertEquals("id", childEntity.defaultPrimaryKeyJoinColumns().next().getDefaultName()); - assertEquals("id", childEntity.defaultPrimaryKeyJoinColumns().next().getDefaultReferencedColumnName()); + assertTrue(childEntity.getDefaultPrimaryKeyJoinColumns().iterator().hasNext()); + assertEquals("id", childEntity.getDefaultPrimaryKeyJoinColumns().iterator().next().getDefaultName()); + assertEquals("id", childEntity.getDefaultPrimaryKeyJoinColumns().iterator().next().getDefaultReferencedColumnName()); childPersistentType.getJavaPersistentType().setMappingKey(MappingKeys.ENTITY_TYPE_MAPPING_KEY); persistentType.getJavaPersistentType().setMappingKey(MappingKeys.ENTITY_TYPE_MAPPING_KEY); - assertTrue(childEntity.defaultPrimaryKeyJoinColumns().hasNext()); - assertEquals("id", childEntity.defaultPrimaryKeyJoinColumns().next().getDefaultName()); - assertEquals("id", childEntity.defaultPrimaryKeyJoinColumns().next().getDefaultReferencedColumnName()); + assertTrue(childEntity.getDefaultPrimaryKeyJoinColumns().iterator().hasNext()); + assertEquals("id", childEntity.getDefaultPrimaryKeyJoinColumns().iterator().next().getDefaultName()); + assertEquals("id", childEntity.getDefaultPrimaryKeyJoinColumns().iterator().next().getDefaultReferencedColumnName()); OrmPrimaryKeyJoinColumn specifiedPkJoinColumn = childEntity.addSpecifiedPrimaryKeyJoinColumn(0); specifiedPkJoinColumn.setSpecifiedName("FOO"); specifiedPkJoinColumn.setSpecifiedReferencedColumnName("BAR"); - assertFalse(childEntity.defaultPrimaryKeyJoinColumns().hasNext()); + assertFalse(childEntity.getDefaultPrimaryKeyJoinColumns().iterator().hasNext()); //remove the pkJoinColumn from the context mode, verify context model has a default pkJoinColumn childEntity.removeSpecifiedPrimaryKeyJoinColumn(0); - assertTrue(childEntity.defaultPrimaryKeyJoinColumns().hasNext()); - assertEquals("id", childEntity.defaultPrimaryKeyJoinColumns().next().getDefaultName()); - assertEquals("id", childEntity.defaultPrimaryKeyJoinColumns().next().getDefaultReferencedColumnName()); + assertTrue(childEntity.getDefaultPrimaryKeyJoinColumns().iterator().hasNext()); + assertEquals("id", childEntity.getDefaultPrimaryKeyJoinColumns().iterator().next().getDefaultName()); + assertEquals("id", childEntity.getDefaultPrimaryKeyJoinColumns().iterator().next().getDefaultReferencedColumnName()); childPersistentType.getJavaPersistentType().setMappingKey(MappingKeys.NULL_TYPE_MAPPING_KEY); @@ -1519,12 +1519,12 @@ public class OrmEntityTests extends ContextModelTestCase specifiedPkJoinColumn = childEntity.addSpecifiedPrimaryKeyJoinColumn(0); specifiedPkJoinColumn.setSpecifiedName("FOO"); specifiedPkJoinColumn.setSpecifiedReferencedColumnName("BAR"); - assertFalse(childEntity.defaultPrimaryKeyJoinColumns().hasNext()); + assertFalse(childEntity.getDefaultPrimaryKeyJoinColumns().iterator().hasNext()); //now remove the pkJoinColumn from the resource model, verify context model updates and has a default pkJoinColumn childEntity.getXmlTypeMapping().getPrimaryKeyJoinColumns().remove(0); - assertTrue(childEntity.defaultPrimaryKeyJoinColumns().hasNext()); - assertEquals("id", childEntity.defaultPrimaryKeyJoinColumns().next().getDefaultName()); - assertEquals("id", childEntity.defaultPrimaryKeyJoinColumns().next().getDefaultReferencedColumnName()); + assertTrue(childEntity.getDefaultPrimaryKeyJoinColumns().iterator().hasNext()); + assertEquals("id", childEntity.getDefaultPrimaryKeyJoinColumns().iterator().next().getDefaultName()); + assertEquals("id", childEntity.getDefaultPrimaryKeyJoinColumns().iterator().next().getDefaultReferencedColumnName()); } public void testDefaultPrimaryKeyJoinColumnsFromJava() throws Exception { @@ -1539,9 +1539,9 @@ public class OrmEntityTests extends ContextModelTestCase OrmEntity childEntity = (OrmEntity) childPersistentType.getMapping(); - assertTrue(childEntity.defaultPrimaryKeyJoinColumns().hasNext()); - assertEquals("id", childEntity.defaultPrimaryKeyJoinColumns().next().getDefaultName()); - assertEquals("id", childEntity.defaultPrimaryKeyJoinColumns().next().getDefaultReferencedColumnName()); + assertTrue(childEntity.getDefaultPrimaryKeyJoinColumns().iterator().hasNext()); + assertEquals("id", childEntity.getDefaultPrimaryKeyJoinColumns().iterator().next().getDefaultName()); + assertEquals("id", childEntity.getDefaultPrimaryKeyJoinColumns().iterator().next().getDefaultReferencedColumnName()); JavaEntity javaEntity = (JavaEntity) childPersistentType.getJavaPersistentType().getMapping(); JavaPrimaryKeyJoinColumn javaPrimaryKeyJoinColumn = javaEntity.addSpecifiedPrimaryKeyJoinColumn(0); @@ -1555,7 +1555,7 @@ public class OrmEntityTests extends ContextModelTestCase childPersistentType.getJavaPersistentType().setMappingKey(MappingKeys.ENTITY_TYPE_MAPPING_KEY); persistentType.getJavaPersistentType().setMappingKey(MappingKeys.ENTITY_TYPE_MAPPING_KEY); - ListIterator defaultPrimaryKeyJoinColumns = childEntity.defaultPrimaryKeyJoinColumns(); + ListIterator defaultPrimaryKeyJoinColumns = childEntity.getDefaultPrimaryKeyJoinColumns().iterator(); ReadOnlyPrimaryKeyJoinColumn defaultPrimaryKeyJoinColumn = defaultPrimaryKeyJoinColumns.next(); assertEquals("FOO", defaultPrimaryKeyJoinColumn.getName()); assertEquals("BAR", defaultPrimaryKeyJoinColumn.getReferencedColumnName()); @@ -1566,7 +1566,7 @@ public class OrmEntityTests extends ContextModelTestCase assertFalse(defaultPrimaryKeyJoinColumns.hasNext()); childEntity.setSpecifiedMetadataComplete(Boolean.TRUE); - defaultPrimaryKeyJoinColumns = childEntity.defaultPrimaryKeyJoinColumns(); + defaultPrimaryKeyJoinColumns = childEntity.getDefaultPrimaryKeyJoinColumns().iterator(); defaultPrimaryKeyJoinColumn = defaultPrimaryKeyJoinColumns.next(); assertEquals("id", defaultPrimaryKeyJoinColumn.getDefaultName()); assertEquals("id", defaultPrimaryKeyJoinColumn.getDefaultReferencedColumnName()); @@ -1593,7 +1593,7 @@ public class OrmEntityTests extends ContextModelTestCase overrideContainer.moveSpecifiedOverride(2, 0); - ListIterator attributeOverrides = overrideContainer.specifiedOverrides(); + ListIterator attributeOverrides = overrideContainer.getSpecifiedOverrides().iterator(); assertEquals("BAR", attributeOverrides.next().getName()); assertEquals("BAZ", attributeOverrides.next().getName()); assertEquals("FOO", attributeOverrides.next().getName()); @@ -1604,7 +1604,7 @@ public class OrmEntityTests extends ContextModelTestCase overrideContainer.moveSpecifiedOverride(0, 1); - attributeOverrides = overrideContainer.specifiedOverrides(); + attributeOverrides = overrideContainer.getSpecifiedOverrides().iterator(); assertEquals("BAZ", attributeOverrides.next().getName()); assertEquals("BAR", attributeOverrides.next().getName()); assertEquals("FOO", attributeOverrides.next().getName()); @@ -1628,39 +1628,39 @@ public class OrmEntityTests extends ContextModelTestCase entityResource.getAttributeOverrides().get(1).setName("BAR"); entityResource.getAttributeOverrides().get(2).setName("BAZ"); - ListIterator attributeOverrides = overrideContainer.specifiedOverrides(); + ListIterator attributeOverrides = overrideContainer.getSpecifiedOverrides().iterator(); assertEquals("FOO", attributeOverrides.next().getName()); assertEquals("BAR", attributeOverrides.next().getName()); assertEquals("BAZ", attributeOverrides.next().getName()); assertFalse(attributeOverrides.hasNext()); entityResource.getAttributeOverrides().move(2, 0); - attributeOverrides = overrideContainer.specifiedOverrides(); + attributeOverrides = overrideContainer.getSpecifiedOverrides().iterator(); assertEquals("BAR", attributeOverrides.next().getName()); assertEquals("BAZ", attributeOverrides.next().getName()); assertEquals("FOO", attributeOverrides.next().getName()); assertFalse(attributeOverrides.hasNext()); entityResource.getAttributeOverrides().move(0, 1); - attributeOverrides = overrideContainer.specifiedOverrides(); + attributeOverrides = overrideContainer.getSpecifiedOverrides().iterator(); assertEquals("BAZ", attributeOverrides.next().getName()); assertEquals("BAR", attributeOverrides.next().getName()); assertEquals("FOO", attributeOverrides.next().getName()); assertFalse(attributeOverrides.hasNext()); entityResource.getAttributeOverrides().remove(1); - attributeOverrides = overrideContainer.specifiedOverrides(); + attributeOverrides = overrideContainer.getSpecifiedOverrides().iterator(); assertEquals("BAZ", attributeOverrides.next().getName()); assertEquals("FOO", attributeOverrides.next().getName()); assertFalse(attributeOverrides.hasNext()); entityResource.getAttributeOverrides().remove(1); - attributeOverrides = overrideContainer.specifiedOverrides(); + attributeOverrides = overrideContainer.getSpecifiedOverrides().iterator(); assertEquals("BAZ", attributeOverrides.next().getName()); assertFalse(attributeOverrides.hasNext()); entityResource.getAttributeOverrides().remove(0); - assertFalse(overrideContainer.specifiedOverrides().hasNext()); + assertFalse(overrideContainer.getSpecifiedOverrides().iterator().hasNext()); } public void testVirtualAttributeOverrides() throws Exception { @@ -1673,8 +1673,8 @@ public class OrmEntityTests extends ContextModelTestCase OrmEntity entity = (OrmEntity) persistentType.getMapping(); OrmAttributeOverrideContainer overrideContainer = entity.getAttributeOverrideContainer(); - assertEquals(4, overrideContainer.virtualOverridesSize()); - ListIterator virtualAttributeOverrides = overrideContainer.virtualOverrides(); + assertEquals(4, overrideContainer.getVirtualOverridesSize()); + ListIterator virtualAttributeOverrides = overrideContainer.getVirtualOverrides().iterator(); OrmVirtualAttributeOverride virtualOverride = virtualAttributeOverrides.next(); assertEquals("foo", virtualOverride.getName()); virtualOverride = virtualAttributeOverrides.next(); @@ -1694,10 +1694,10 @@ public class OrmEntityTests extends ContextModelTestCase assertEquals(0, virtualOverride.getColumn().getPrecision()); assertEquals(0, virtualOverride.getColumn().getScale()); - overrideContainer.virtualOverrides().next().convertToSpecified(); + overrideContainer.getVirtualOverrides().iterator().next().convertToSpecified(); - assertEquals(3, overrideContainer.virtualOverridesSize()); - virtualAttributeOverrides = overrideContainer.virtualOverrides(); + assertEquals(3, overrideContainer.getVirtualOverridesSize()); + virtualAttributeOverrides = overrideContainer.getVirtualOverrides().iterator(); virtualOverride = virtualAttributeOverrides.next(); assertEquals("basic", virtualOverride.getName()); virtualOverride = virtualAttributeOverrides.next(); @@ -1706,8 +1706,8 @@ public class OrmEntityTests extends ContextModelTestCase assertEquals("name", virtualOverride.getName()); entity.setSpecifiedMetadataComplete(Boolean.TRUE); - assertEquals(3, overrideContainer.virtualOverridesSize()); - virtualAttributeOverrides = overrideContainer.virtualOverrides(); + assertEquals(3, overrideContainer.getVirtualOverridesSize()); + virtualAttributeOverrides = overrideContainer.getVirtualOverrides().iterator(); virtualOverride = virtualAttributeOverrides.next(); assertEquals("basic", virtualOverride.getName()); virtualOverride = virtualAttributeOverrides.next(); @@ -1715,10 +1715,10 @@ public class OrmEntityTests extends ContextModelTestCase virtualOverride = virtualAttributeOverrides.next(); assertEquals("name", virtualOverride.getName()); - overrideContainer.specifiedOverrides().next().convertToVirtual(); + overrideContainer.getSpecifiedOverrides().iterator().next().convertToVirtual(); entity.setSpecifiedMetadataComplete(Boolean.FALSE); - entity.getJavaTypeMapping().getAttributeOverrideContainer().virtualOverrides().next().convertToSpecified(); - JavaColumn javaColumn = entity.getJavaTypeMapping().getAttributeOverrideContainer().specifiedOverrides().next().getColumn(); + entity.getJavaTypeMapping().getAttributeOverrideContainer().getVirtualOverrides().iterator().next().convertToSpecified(); + JavaColumn javaColumn = entity.getJavaTypeMapping().getAttributeOverrideContainer().getSpecifiedOverrides().iterator().next().getColumn(); javaColumn.setSpecifiedName("FOO"); javaColumn.setSpecifiedTable("BAR"); javaColumn.setColumnDefinition("COLUMN_DEF"); @@ -1730,8 +1730,8 @@ public class OrmEntityTests extends ContextModelTestCase javaColumn.setSpecifiedPrecision(Integer.valueOf(8)); javaColumn.setSpecifiedScale(Integer.valueOf(9)); - assertEquals(4, overrideContainer.virtualOverridesSize()); - virtualAttributeOverrides = overrideContainer.virtualOverrides(); + assertEquals(4, overrideContainer.getVirtualOverridesSize()); + virtualAttributeOverrides = overrideContainer.getVirtualOverrides().iterator(); virtualOverride = virtualAttributeOverrides.next(); assertEquals("foo", virtualOverride.getName()); assertEquals("FOO", virtualOverride.getColumn().getSpecifiedName()); @@ -1770,8 +1770,8 @@ public class OrmEntityTests extends ContextModelTestCase - assertEquals(4, overrideContainer.virtualOverridesSize()); - virtualAttributeOverrides = overrideContainer.virtualOverrides(); + assertEquals(4, overrideContainer.getVirtualOverridesSize()); + virtualAttributeOverrides = overrideContainer.getVirtualOverrides().iterator(); virtualOverride = virtualAttributeOverrides.next(); assertEquals("foo", virtualOverride.getName()); assertEquals("FOO", virtualOverride.getColumn().getSpecifiedName());//TODO specified or default? @@ -1812,8 +1812,8 @@ public class OrmEntityTests extends ContextModelTestCase OrmAttributeOverrideContainer overrideContainer = entity.getAttributeOverrideContainer(); persistentType.getJavaPersistentType().setMappingKey(MappingKeys.NULL_TYPE_MAPPING_KEY); - assertEquals(4, overrideContainer.virtualOverridesSize()); - ListIterator virtualAttributeOverrides = overrideContainer.virtualOverrides(); + assertEquals(4, overrideContainer.getVirtualOverridesSize()); + ListIterator virtualAttributeOverrides = overrideContainer.getVirtualOverrides().iterator(); OrmVirtualAttributeOverride attributeOverride = virtualAttributeOverrides.next(); assertEquals("foo", attributeOverride.getName()); attributeOverride = virtualAttributeOverrides.next(); @@ -1834,9 +1834,9 @@ public class OrmEntityTests extends ContextModelTestCase OrmEntity entity = (OrmEntity) persistentType.getMapping(); OrmAttributeOverrideContainer overrideContainer = entity.getAttributeOverrideContainer(); - overrideContainer.virtualOverrides().next().convertToSpecified(); + overrideContainer.getVirtualOverrides().iterator().next().convertToSpecified(); - OrmAttributeOverride attributeOverride = overrideContainer.specifiedOverrides().next(); + OrmAttributeOverride attributeOverride = overrideContainer.getSpecifiedOverrides().iterator().next(); assertEquals("foo", attributeOverride.getColumn().getDefaultName()); assertEquals(CHILD_TYPE_NAME, attributeOverride.getColumn().getDefaultTable()); @@ -1862,7 +1862,7 @@ public class OrmEntityTests extends ContextModelTestCase OrmEntity childEntity = (OrmEntity) childType.getMapping(); OrmAttributeOverrideContainer childOverrideContainer = childEntity.getAttributeOverrideContainer(); - OrmReadOnlyAttributeOverride attributeOverride = childOverrideContainer.virtualOverrides().next(); + OrmReadOnlyAttributeOverride attributeOverride = childOverrideContainer.getVirtualOverrides().iterator().next(); ((OrmReadOnlyPersistentAttribute) childType.getSuperPersistentType().getAttributeNamed("id")).convertToSpecified(); BasicMapping basicMapping = (BasicMapping) ((OrmReadOnlyPersistentAttribute) childType.getSuperPersistentType().getAttributeNamed("id")).getMapping(); basicMapping.getColumn().setSpecifiedName("MY_COLUMN"); @@ -1873,7 +1873,7 @@ public class OrmEntityTests extends ContextModelTestCase getEntityMappings().getPersistenceUnitMetadata().setXmlMappingMetadataComplete(true); - attributeOverride = childOverrideContainer.virtualOverrides().next(); + attributeOverride = childOverrideContainer.getVirtualOverrides().iterator().next(); assertEquals("MY_COLUMN", attributeOverride.getColumn().getName()); assertEquals("BAR", attributeOverride.getColumn().getTable()); } @@ -1957,8 +1957,8 @@ public class OrmEntityTests extends ContextModelTestCase OrmEntity concreteEntity = (OrmEntity) concretePersistentType.getMapping(); OrmAttributeOverrideContainer overrideContainer = concreteEntity.getAttributeOverrideContainer(); - assertEquals(3, overrideContainer.virtualOverridesSize()); - OrmVirtualAttributeOverride virtualAttributeOverride = overrideContainer.virtualOverrides().next(); + assertEquals(3, overrideContainer.getVirtualOverridesSize()); + OrmVirtualAttributeOverride virtualAttributeOverride = overrideContainer.getVirtualOverrides().iterator().next(); assertEquals("id", virtualAttributeOverride.getName()); assertEquals("id", virtualAttributeOverride.getColumn().getName()); assertEquals(CHILD_TYPE_NAME, virtualAttributeOverride.getColumn().getTable()); @@ -1970,8 +1970,8 @@ public class OrmEntityTests extends ContextModelTestCase idMapping.getColumn().setSpecifiedTable("BAR"); - 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()); @@ -1979,13 +1979,13 @@ public class OrmEntityTests extends ContextModelTestCase idMapping.getColumn().setSpecifiedName(null); idMapping.getColumn().setSpecifiedTable(null); - virtualAttributeOverride = overrideContainer.virtualOverrides().next(); + virtualAttributeOverride = overrideContainer.getVirtualOverrides().iterator().next(); assertEquals("id", virtualAttributeOverride.getName()); assertEquals("id", virtualAttributeOverride.getColumn().getName()); assertEquals(CHILD_TYPE_NAME, virtualAttributeOverride.getColumn().getTable()); virtualAttributeOverride.convertToSpecified(); - assertEquals(2, overrideContainer.virtualOverridesSize()); + assertEquals(2, overrideContainer.getVirtualOverridesSize()); } public void testMoveSpecifiedAssociationOverride() throws Exception { @@ -2006,7 +2006,7 @@ public class OrmEntityTests extends ContextModelTestCase overrideContainer.moveSpecifiedOverride(2, 0); - ListIterator associationOverrides = overrideContainer.specifiedOverrides(); + ListIterator associationOverrides = overrideContainer.getSpecifiedOverrides().iterator(); assertEquals("BAR", associationOverrides.next().getName()); assertEquals("BAZ", associationOverrides.next().getName()); assertEquals("FOO", associationOverrides.next().getName()); @@ -2017,7 +2017,7 @@ public class OrmEntityTests extends ContextModelTestCase overrideContainer.moveSpecifiedOverride(0, 1); - associationOverrides = overrideContainer.specifiedOverrides(); + associationOverrides = overrideContainer.getSpecifiedOverrides().iterator(); assertEquals("BAZ", associationOverrides.next().getName()); assertEquals("BAR", associationOverrides.next().getName()); assertEquals("FOO", associationOverrides.next().getName()); @@ -2041,39 +2041,39 @@ public class OrmEntityTests extends ContextModelTestCase entityResource.getAssociationOverrides().get(1).setName("BAR"); entityResource.getAssociationOverrides().get(2).setName("BAZ"); - ListIterator associationOverrides = overrideContainer.specifiedOverrides(); + ListIterator associationOverrides = overrideContainer.getSpecifiedOverrides().iterator(); assertEquals("FOO", associationOverrides.next().getName()); assertEquals("BAR", associationOverrides.next().getName()); assertEquals("BAZ", associationOverrides.next().getName()); assertFalse(associationOverrides.hasNext()); entityResource.getAssociationOverrides().move(2, 0); - associationOverrides = overrideContainer.specifiedOverrides(); + associationOverrides = overrideContainer.getSpecifiedOverrides().iterator(); assertEquals("BAR", associationOverrides.next().getName()); assertEquals("BAZ", associationOverrides.next().getName()); assertEquals("FOO", associationOverrides.next().getName()); assertFalse(associationOverrides.hasNext()); entityResource.getAssociationOverrides().move(0, 1); - associationOverrides = overrideContainer.specifiedOverrides(); + associationOverrides = overrideContainer.getSpecifiedOverrides().iterator(); assertEquals("BAZ", associationOverrides.next().getName()); assertEquals("BAR", associationOverrides.next().getName()); assertEquals("FOO", associationOverrides.next().getName()); assertFalse(associationOverrides.hasNext()); entityResource.getAssociationOverrides().remove(1); - associationOverrides = overrideContainer.specifiedOverrides(); + associationOverrides = overrideContainer.getSpecifiedOverrides().iterator(); assertEquals("BAZ", associationOverrides.next().getName()); assertEquals("FOO", associationOverrides.next().getName()); assertFalse(associationOverrides.hasNext()); entityResource.getAssociationOverrides().remove(1); - associationOverrides = overrideContainer.specifiedOverrides(); + associationOverrides = overrideContainer.getSpecifiedOverrides().iterator(); assertEquals("BAZ", associationOverrides.next().getName()); assertFalse(associationOverrides.hasNext()); entityResource.getAssociationOverrides().remove(0); - assertFalse(overrideContainer.specifiedOverrides().hasNext()); + assertFalse(overrideContainer.getSpecifiedOverrides().iterator().hasNext()); } public void testVirtualAssociationOverrides() throws Exception { @@ -2086,14 +2086,14 @@ public class OrmEntityTests extends ContextModelTestCase OrmEntity ormEntity = (OrmEntity) persistentType.getMapping(); OrmAssociationOverrideContainer overrideContainer = ormEntity.getAssociationOverrideContainer(); - assertEquals(2, overrideContainer.virtualOverridesSize()); - ListIterator virtualOverrides = overrideContainer.virtualOverrides(); + assertEquals(2, overrideContainer.getVirtualOverridesSize()); + ListIterator virtualOverrides = overrideContainer.getVirtualOverrides().iterator(); OrmVirtualAssociationOverride virtualOverride = virtualOverrides.next(); OrmVirtualJoinColumnRelationshipStrategy joiningStrategy = ((OrmVirtualJoinColumnRelationship) virtualOverride.getRelationship()).getJoinColumnStrategy(); assertEquals("oneToOne", virtualOverride.getName()); - assertEquals(1, joiningStrategy.joinColumnsSize()); - OrmVirtualJoinColumn virtualJoinColumn = joiningStrategy.joinColumns().next(); + assertEquals(1, joiningStrategy.getJoinColumnsSize()); + OrmVirtualJoinColumn virtualJoinColumn = joiningStrategy.getJoinColumns().iterator().next(); assertEquals("oneToOne_id", virtualJoinColumn.getName()); assertEquals("id", virtualJoinColumn.getReferencedColumnName()); assertEquals(CHILD_TYPE_NAME, virtualJoinColumn.getTable()); @@ -2109,27 +2109,27 @@ public class OrmEntityTests extends ContextModelTestCase assertFalse(virtualOverrides.hasNext()); - overrideContainer.virtualOverrides().next().convertToSpecified(); + overrideContainer.getVirtualOverrides().iterator().next().convertToSpecified(); - assertEquals(1, overrideContainer.virtualOverridesSize()); - virtualOverrides = overrideContainer.virtualOverrides(); + assertEquals(1, overrideContainer.getVirtualOverridesSize()); + virtualOverrides = overrideContainer.getVirtualOverrides().iterator(); virtualOverride = virtualOverrides.next(); assertEquals("manyToOne", virtualOverride.getName()); ormEntity.setSpecifiedMetadataComplete(Boolean.TRUE); - assertEquals(1, overrideContainer.virtualOverridesSize()); - virtualOverrides = overrideContainer.virtualOverrides(); + assertEquals(1, overrideContainer.getVirtualOverridesSize()); + virtualOverrides = overrideContainer.getVirtualOverrides().iterator(); virtualOverride = virtualOverrides.next(); assertEquals("manyToOne", virtualOverride.getName()); - overrideContainer.specifiedOverrides().next().convertToVirtual(); + overrideContainer.getSpecifiedOverrides().iterator().next().convertToVirtual(); ormEntity.setSpecifiedMetadataComplete(Boolean.FALSE); - ormEntity.getJavaTypeMapping().getAssociationOverrideContainer().virtualOverrides().next().convertToSpecified(); + ormEntity.getJavaTypeMapping().getAssociationOverrideContainer().getVirtualOverrides().iterator().next().convertToSpecified(); - JavaAssociationOverride javaAssociationOverride = ormEntity.getJavaTypeMapping().getAssociationOverrideContainer().specifiedOverrides().next(); + JavaAssociationOverride javaAssociationOverride = ormEntity.getJavaTypeMapping().getAssociationOverrideContainer().getSpecifiedOverrides().iterator().next(); JavaJoinColumnRelationshipStrategy javaJoiningStrategy = javaAssociationOverride.getRelationship().getJoinColumnStrategy(); - JavaJoinColumn javaJoinColumn = javaJoiningStrategy.joinColumns().next(); + JavaJoinColumn javaJoinColumn = javaJoiningStrategy.getJoinColumns().iterator().next(); javaJoinColumn.setSpecifiedName("FOO"); javaJoinColumn.setSpecifiedReferencedColumnName("REFERENCE"); javaJoinColumn.setSpecifiedTable("BAR"); @@ -2139,12 +2139,12 @@ public class OrmEntityTests extends ContextModelTestCase javaJoinColumn.setSpecifiedUnique(Boolean.TRUE); javaJoinColumn.setSpecifiedNullable(Boolean.FALSE); - assertEquals(2, overrideContainer.virtualOverridesSize()); - virtualOverrides = overrideContainer.virtualOverrides(); + assertEquals(2, overrideContainer.getVirtualOverridesSize()); + virtualOverrides = overrideContainer.getVirtualOverrides().iterator(); virtualOverride = virtualOverrides.next(); joiningStrategy = virtualOverride.getRelationship().getJoinColumnStrategy(); assertEquals("oneToOne", virtualOverride.getName()); - OrmVirtualJoinColumn ormJoinColumn = joiningStrategy.joinColumns().next(); + OrmVirtualJoinColumn ormJoinColumn = joiningStrategy.getJoinColumns().iterator().next(); assertEquals("FOO", ormJoinColumn.getSpecifiedName()); assertEquals("REFERENCE", ormJoinColumn.getSpecifiedReferencedColumnName()); assertEquals("BAR", ormJoinColumn.getSpecifiedTable()); @@ -2157,7 +2157,7 @@ public class OrmEntityTests extends ContextModelTestCase virtualOverride = virtualOverrides.next(); joiningStrategy = virtualOverride.getRelationship().getJoinColumnStrategy(); assertEquals("manyToOne", virtualOverride.getName()); - assertEquals(null, joiningStrategy.joinColumns().next().getSpecifiedName()); + assertEquals(null, joiningStrategy.getJoinColumns().iterator().next().getSpecifiedName()); persistentType2.getAttributeNamed("manyToOne").convertToSpecified(); OrmManyToOneMapping manyToOneMapping = (OrmManyToOneMapping) persistentType2.getAttributeNamed("manyToOne").getMapping(); @@ -2172,12 +2172,12 @@ public class OrmEntityTests extends ContextModelTestCase joinColumn.setSpecifiedNullable(Boolean.FALSE); - assertEquals(2, overrideContainer.virtualOverridesSize()); - virtualOverrides = overrideContainer.virtualOverrides(); + assertEquals(2, overrideContainer.getVirtualOverridesSize()); + virtualOverrides = overrideContainer.getVirtualOverrides().iterator(); virtualOverride = virtualOverrides.next(); joiningStrategy = virtualOverride.getRelationship().getJoinColumnStrategy(); assertEquals("oneToOne", virtualOverride.getName()); - ormJoinColumn = joiningStrategy.joinColumns().next(); + ormJoinColumn = joiningStrategy.getJoinColumns().iterator().next(); assertEquals("FOO", ormJoinColumn.getSpecifiedName()); assertEquals("REFERENCE", ormJoinColumn.getSpecifiedReferencedColumnName()); assertEquals("BAR", ormJoinColumn.getSpecifiedTable()); @@ -2190,7 +2190,7 @@ public class OrmEntityTests extends ContextModelTestCase virtualOverride = virtualOverrides.next(); joiningStrategy = virtualOverride.getRelationship().getJoinColumnStrategy(); assertEquals("manyToOne", virtualOverride.getName()); - ormJoinColumn = joiningStrategy.joinColumns().next(); + ormJoinColumn = joiningStrategy.getJoinColumns().iterator().next(); assertEquals("MY_NAME", ormJoinColumn.getSpecifiedName()); assertEquals("MY_REFERNCE_NAME", ormJoinColumn.getSpecifiedReferencedColumnName()); assertEquals("BAR2", ormJoinColumn.getSpecifiedTable()); @@ -2346,12 +2346,12 @@ public class OrmEntityTests extends ContextModelTestCase assertEquals("BAZ", entityResource.getNamedQueries().get(1).getName()); assertEquals("FOO", entityResource.getNamedQueries().get(2).getName()); - ListIterator namedQueries = ormEntity.getQueryContainer().namedQueries(); + ListIterator namedQueries = ormEntity.getQueryContainer().getNamedQueries().iterator(); assertEquals(namedQuery2, namedQueries.next()); assertEquals(namedQuery3, namedQueries.next()); assertEquals(namedQuery, namedQueries.next()); - namedQueries = ormEntity.getQueryContainer().namedQueries(); + namedQueries = ormEntity.getQueryContainer().getNamedQueries().iterator(); assertEquals("BAR", namedQueries.next().getName()); assertEquals("BAZ", namedQueries.next().getName()); assertEquals("FOO", namedQueries.next().getName()); @@ -2394,7 +2394,7 @@ public class OrmEntityTests extends ContextModelTestCase ormEntity.getQueryContainer().moveNamedQuery(2, 0); - ListIterator namedQueries = ormEntity.getQueryContainer().namedQueries(); + ListIterator namedQueries = ormEntity.getQueryContainer().getNamedQueries().iterator(); assertEquals("BAR", namedQueries.next().getName()); assertEquals("BAZ", namedQueries.next().getName()); assertEquals("FOO", namedQueries.next().getName()); @@ -2405,7 +2405,7 @@ public class OrmEntityTests extends ContextModelTestCase ormEntity.getQueryContainer().moveNamedQuery(0, 1); - namedQueries = ormEntity.getQueryContainer().namedQueries(); + namedQueries = ormEntity.getQueryContainer().getNamedQueries().iterator(); assertEquals("BAZ", namedQueries.next().getName()); assertEquals("BAR", namedQueries.next().getName()); assertEquals("FOO", namedQueries.next().getName()); @@ -2419,7 +2419,7 @@ public class OrmEntityTests extends ContextModelTestCase OrmPersistentType persistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); OrmEntity ormEntity = (OrmEntity) persistentType.getMapping(); - assertEquals(0, ormEntity.getPersistenceUnit().queriesSize()); + assertEquals(0, ormEntity.getPersistenceUnit().getQueriesSize()); XmlEntity entityResource = getXmlEntityMappings().getEntities().get(0); entityResource.getNamedQueries().add(OrmFactory.eINSTANCE.createXmlNamedQuery()); @@ -2429,43 +2429,43 @@ public class OrmEntityTests extends ContextModelTestCase entityResource.getNamedQueries().get(1).setName("BAR"); entityResource.getNamedQueries().get(2).setName("BAZ"); - ListIterator namedQueries = ormEntity.getQueryContainer().namedQueries(); + ListIterator namedQueries = ormEntity.getQueryContainer().getNamedQueries().iterator(); assertEquals("FOO", namedQueries.next().getName()); assertEquals("BAR", namedQueries.next().getName()); assertEquals("BAZ", namedQueries.next().getName()); assertFalse(namedQueries.hasNext()); - assertEquals(3, ormEntity.getPersistenceUnit().queriesSize()); + assertEquals(3, ormEntity.getPersistenceUnit().getQueriesSize()); entityResource.getNamedQueries().move(2, 0); - namedQueries = ormEntity.getQueryContainer().namedQueries(); + namedQueries = ormEntity.getQueryContainer().getNamedQueries().iterator(); assertEquals("BAR", namedQueries.next().getName()); assertEquals("BAZ", namedQueries.next().getName()); assertEquals("FOO", namedQueries.next().getName()); assertFalse(namedQueries.hasNext()); entityResource.getNamedQueries().move(0, 1); - namedQueries = ormEntity.getQueryContainer().namedQueries(); + namedQueries = ormEntity.getQueryContainer().getNamedQueries().iterator(); assertEquals("BAZ", namedQueries.next().getName()); assertEquals("BAR", namedQueries.next().getName()); assertEquals("FOO", namedQueries.next().getName()); assertFalse(namedQueries.hasNext()); entityResource.getNamedQueries().remove(1); - namedQueries = ormEntity.getQueryContainer().namedQueries(); + namedQueries = ormEntity.getQueryContainer().getNamedQueries().iterator(); assertEquals("BAZ", namedQueries.next().getName()); assertEquals("FOO", namedQueries.next().getName()); assertFalse(namedQueries.hasNext()); - assertEquals(2, ormEntity.getPersistenceUnit().queriesSize()); + assertEquals(2, ormEntity.getPersistenceUnit().getQueriesSize()); entityResource.getNamedQueries().remove(1); - namedQueries = ormEntity.getQueryContainer().namedQueries(); + namedQueries = ormEntity.getQueryContainer().getNamedQueries().iterator(); assertEquals("BAZ", namedQueries.next().getName()); assertFalse(namedQueries.hasNext()); - assertEquals(1, ormEntity.getPersistenceUnit().queriesSize()); + assertEquals(1, ormEntity.getPersistenceUnit().getQueriesSize()); entityResource.getNamedQueries().remove(0); - assertFalse(ormEntity.getQueryContainer().namedQueries().hasNext()); - assertEquals(0, ormEntity.getPersistenceUnit().queriesSize()); + assertFalse(ormEntity.getQueryContainer().getNamedQueries().iterator().hasNext()); + assertEquals(0, ormEntity.getPersistenceUnit().getQueriesSize()); } public void testAddNamedNativeQuery() throws Exception { @@ -2491,12 +2491,12 @@ public class OrmEntityTests extends ContextModelTestCase assertEquals("BAZ", entityResource.getNamedNativeQueries().get(1).getName()); assertEquals("FOO", entityResource.getNamedNativeQueries().get(2).getName()); - ListIterator namedNativeQueries = ormEntity.getQueryContainer().namedNativeQueries(); + ListIterator namedNativeQueries = ormEntity.getQueryContainer().getNamedNativeQueries().iterator(); assertEquals(namedNativeQuery2, namedNativeQueries.next()); assertEquals(namedNativeQuery3, namedNativeQueries.next()); assertEquals(namedNativeQuery, namedNativeQueries.next()); - namedNativeQueries = ormEntity.getQueryContainer().namedNativeQueries(); + namedNativeQueries = ormEntity.getQueryContainer().getNamedNativeQueries().iterator(); assertEquals("BAR", namedNativeQueries.next().getName()); assertEquals("BAZ", namedNativeQueries.next().getName()); assertEquals("FOO", namedNativeQueries.next().getName()); @@ -2539,7 +2539,7 @@ public class OrmEntityTests extends ContextModelTestCase ormEntity.getQueryContainer().moveNamedNativeQuery(2, 0); - ListIterator namedNativeQueries = ormEntity.getQueryContainer().namedNativeQueries(); + ListIterator namedNativeQueries = ormEntity.getQueryContainer().getNamedNativeQueries().iterator(); assertEquals("BAR", namedNativeQueries.next().getName()); assertEquals("BAZ", namedNativeQueries.next().getName()); assertEquals("FOO", namedNativeQueries.next().getName()); @@ -2550,7 +2550,7 @@ public class OrmEntityTests extends ContextModelTestCase ormEntity.getQueryContainer().moveNamedNativeQuery(0, 1); - namedNativeQueries = ormEntity.getQueryContainer().namedNativeQueries(); + namedNativeQueries = ormEntity.getQueryContainer().getNamedNativeQueries().iterator(); assertEquals("BAZ", namedNativeQueries.next().getName()); assertEquals("BAR", namedNativeQueries.next().getName()); assertEquals("FOO", namedNativeQueries.next().getName()); @@ -2564,7 +2564,7 @@ public class OrmEntityTests extends ContextModelTestCase OrmPersistentType persistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); OrmEntity ormEntity = (OrmEntity) persistentType.getMapping(); - assertEquals(0, ormEntity.getPersistenceUnit().queriesSize()); + assertEquals(0, ormEntity.getPersistenceUnit().getQueriesSize()); XmlEntity entityResource = getXmlEntityMappings().getEntities().get(0); entityResource.getNamedNativeQueries().add(OrmFactory.eINSTANCE.createXmlNamedNativeQuery()); @@ -2573,43 +2573,43 @@ public class OrmEntityTests extends ContextModelTestCase entityResource.getNamedNativeQueries().get(0).setName("FOO"); entityResource.getNamedNativeQueries().get(1).setName("BAR"); entityResource.getNamedNativeQueries().get(2).setName("BAZ"); - ListIterator namedNativeQueries = ormEntity.getQueryContainer().namedNativeQueries(); + ListIterator namedNativeQueries = ormEntity.getQueryContainer().getNamedNativeQueries().iterator(); assertEquals("FOO", namedNativeQueries.next().getName()); assertEquals("BAR", namedNativeQueries.next().getName()); assertEquals("BAZ", namedNativeQueries.next().getName()); assertFalse(namedNativeQueries.hasNext()); - assertEquals(3, ormEntity.getPersistenceUnit().queriesSize()); + assertEquals(3, ormEntity.getPersistenceUnit().getQueriesSize()); entityResource.getNamedNativeQueries().move(2, 0); - namedNativeQueries = ormEntity.getQueryContainer().namedNativeQueries(); + namedNativeQueries = ormEntity.getQueryContainer().getNamedNativeQueries().iterator(); assertEquals("BAR", namedNativeQueries.next().getName()); assertEquals("BAZ", namedNativeQueries.next().getName()); assertEquals("FOO", namedNativeQueries.next().getName()); assertFalse(namedNativeQueries.hasNext()); entityResource.getNamedNativeQueries().move(0, 1); - namedNativeQueries = ormEntity.getQueryContainer().namedNativeQueries(); + namedNativeQueries = ormEntity.getQueryContainer().getNamedNativeQueries().iterator(); assertEquals("BAZ", namedNativeQueries.next().getName()); assertEquals("BAR", namedNativeQueries.next().getName()); assertEquals("FOO", namedNativeQueries.next().getName()); assertFalse(namedNativeQueries.hasNext()); entityResource.getNamedNativeQueries().remove(1); - namedNativeQueries = ormEntity.getQueryContainer().namedNativeQueries(); + namedNativeQueries = ormEntity.getQueryContainer().getNamedNativeQueries().iterator(); assertEquals("BAZ", namedNativeQueries.next().getName()); assertEquals("FOO", namedNativeQueries.next().getName()); assertFalse(namedNativeQueries.hasNext()); - assertEquals(2, ormEntity.getPersistenceUnit().queriesSize()); + assertEquals(2, ormEntity.getPersistenceUnit().getQueriesSize()); entityResource.getNamedNativeQueries().remove(1); - namedNativeQueries = ormEntity.getQueryContainer().namedNativeQueries(); + namedNativeQueries = ormEntity.getQueryContainer().getNamedNativeQueries().iterator(); assertEquals("BAZ", namedNativeQueries.next().getName()); assertFalse(namedNativeQueries.hasNext()); - assertEquals(1, ormEntity.getPersistenceUnit().queriesSize()); + assertEquals(1, ormEntity.getPersistenceUnit().getQueriesSize()); entityResource.getNamedNativeQueries().remove(0); - assertFalse(ormEntity.getQueryContainer().namedNativeQueries().hasNext()); - assertEquals(0, ormEntity.getPersistenceUnit().queriesSize()); + assertFalse(ormEntity.getQueryContainer().getNamedNativeQueries().iterator().hasNext()); + assertEquals(0, ormEntity.getPersistenceUnit().getQueriesSize()); } public void testUpdateIdClass() throws Exception { @@ -2703,7 +2703,7 @@ public class OrmEntityTests extends ContextModelTestCase assertEquals("MY_ID", childXmlEntity.getPrimaryKeyColumnName()); //TODO once bug 228718 is fixed - OrmVirtualAttributeOverride ormAttributeOverride = childXmlEntity.getAttributeOverrideContainer().virtualOverrides().next(); + OrmVirtualAttributeOverride ormAttributeOverride = childXmlEntity.getAttributeOverrideContainer().getVirtualOverrides().iterator().next(); assertEquals("id", ormAttributeOverride.getName()); ormAttributeOverride.convertToSpecified().getColumn().setSpecifiedName("ID"); diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmGeneratedValueTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmGeneratedValueTests.java index a88d412e46..02baa501ef 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmGeneratedValueTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmGeneratedValueTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2010 Oracle. All rights reserved. + * Copyright (c) 2007, 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. @@ -104,11 +104,11 @@ import org.eclipse.jpt.jpa.core.tests.internal.context.ContextModelTestCase; createTestEntity(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmReadOnlyPersistentAttribute ormIdAttribute = ormPersistentType.virtualAttributes().next(); + OrmReadOnlyPersistentAttribute ormIdAttribute = ormPersistentType.getVirtualAttributes().iterator().next(); IdMapping ormIdMapping = (IdMapping) ormIdAttribute.getMapping(); assertEquals(null, ormIdMapping.getGeneratedValue()); - IdMapping javaIdMapping = (IdMapping) ormPersistentType.getJavaPersistentType().attributes().next().getMapping(); + IdMapping javaIdMapping = (IdMapping) ormPersistentType.getJavaPersistentType().getAttributes().iterator().next().getMapping(); GeneratedValue javaGeneratedValue = javaIdMapping.addGeneratedValue(); javaGeneratedValue.setSpecifiedGenerator("Foo"); javaGeneratedValue.setSpecifiedStrategy(GenerationType.SEQUENCE); @@ -119,7 +119,7 @@ import org.eclipse.jpt.jpa.core.tests.internal.context.ContextModelTestCase; assertEquals(GenerationType.SEQUENCE, javaGeneratedValue.getSpecifiedStrategy()); ormIdAttribute.convertToSpecified(); - ormIdAttribute = ormPersistentType.specifiedAttributes().next(); + ormIdAttribute = ormPersistentType.getSpecifiedAttributes().iterator().next(); ormIdMapping = (IdMapping) ormIdAttribute.getMapping(); assertEquals(null, ormIdMapping.getGeneratedValue()); assertEquals("Foo", javaGeneratedValue.getSpecifiedGenerator()); diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmIdMappingTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmIdMappingTests.java index ab7850d978..b8c9fa1f03 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmIdMappingTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmIdMappingTests.java @@ -247,20 +247,20 @@ public class OrmIdMappingTests extends ContextModelTestCase assertNull(ormIdMapping.getGeneratorContainer().getSequenceGenerator()); assertNull(idResource.getSequenceGenerator()); - assertEquals(0, ormIdMapping.getPersistenceUnit().generatorsSize()); + assertEquals(0, ormIdMapping.getPersistenceUnit().getGeneratorsSize()); idResource.setSequenceGenerator(OrmFactory.eINSTANCE.createXmlSequenceGenerator()); assertNotNull(ormIdMapping.getGeneratorContainer().getSequenceGenerator()); assertNotNull(idResource.getSequenceGenerator()); - assertEquals(1, ormIdMapping.getPersistenceUnit().generatorsSize()); + assertEquals(1, ormIdMapping.getPersistenceUnit().getGeneratorsSize()); ormIdMapping.getGeneratorContainer().getSequenceGenerator().setName("foo"); - assertEquals(1, ormIdMapping.getPersistenceUnit().generatorsSize()); + assertEquals(1, ormIdMapping.getPersistenceUnit().getGeneratorsSize()); idResource.setSequenceGenerator(null); assertNull(ormIdMapping.getGeneratorContainer().getSequenceGenerator()); assertNull(idResource.getSequenceGenerator()); - assertEquals(0, ormIdMapping.getPersistenceUnit().generatorsSize()); + assertEquals(0, ormIdMapping.getPersistenceUnit().getGeneratorsSize()); } public void testAddTableGenerator() throws Exception { @@ -321,20 +321,20 @@ public class OrmIdMappingTests extends ContextModelTestCase assertNull(ormIdMapping.getGeneratorContainer().getTableGenerator()); assertNull(idResource.getTableGenerator()); - assertEquals(0, ormIdMapping.getPersistenceUnit().generatorsSize()); + assertEquals(0, ormIdMapping.getPersistenceUnit().getGeneratorsSize()); idResource.setTableGenerator(OrmFactory.eINSTANCE.createXmlTableGenerator()); assertNotNull(ormIdMapping.getGeneratorContainer().getTableGenerator()); assertNotNull(idResource.getTableGenerator()); - assertEquals(1, ormIdMapping.getPersistenceUnit().generatorsSize()); + assertEquals(1, ormIdMapping.getPersistenceUnit().getGeneratorsSize()); ormIdMapping.getGeneratorContainer().getTableGenerator().setName("foo"); - assertEquals(1, ormIdMapping.getGeneratorContainer().getPersistenceUnit().generatorsSize()); + assertEquals(1, ormIdMapping.getGeneratorContainer().getPersistenceUnit().getGeneratorsSize()); idResource.setTableGenerator(null); assertNull(ormIdMapping.getGeneratorContainer().getTableGenerator()); assertNull(idResource.getTableGenerator()); - assertEquals(0, ormIdMapping.getPersistenceUnit().generatorsSize()); + assertEquals(0, ormIdMapping.getPersistenceUnit().getGeneratorsSize()); } public void testAddGeneratedValue() throws Exception { @@ -412,9 +412,9 @@ public class OrmIdMappingTests extends ContextModelTestCase OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); ormPersistentType.addSpecifiedAttribute(MappingKeys.ID_ATTRIBUTE_MAPPING_KEY, "foo"); - assertEquals(2, ormPersistentType.virtualAttributesSize()); + assertEquals(2, ormPersistentType.getVirtualAttributesSize()); - OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.specifiedAttributes().next(); + OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.getSpecifiedAttributes().iterator().next(); OrmIdMapping ormIdMapping = (OrmIdMapping) ormPersistentAttribute.getMapping(); assertEquals("foo", ormIdMapping.getName()); @@ -458,8 +458,8 @@ public class OrmIdMappingTests extends ContextModelTestCase public void testVirtualMappingMetadataCompleteFalse() throws Exception { createTestEntityIdMapping(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - assertEquals(2, ormPersistentType.virtualAttributesSize()); - OrmReadOnlyPersistentAttribute ormPersistentAttribute = ormPersistentType.virtualAttributes().next(); + assertEquals(2, ormPersistentType.getVirtualAttributesSize()); + OrmReadOnlyPersistentAttribute ormPersistentAttribute = ormPersistentType.getVirtualAttributes().iterator().next(); IdMapping idMapping = (IdMapping) ormPersistentAttribute.getMapping(); assertEquals("id", idMapping.getName()); @@ -508,7 +508,7 @@ public class OrmIdMappingTests extends ContextModelTestCase createTestEntityIdMapping(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); ormPersistentType.getMapping().setSpecifiedMetadataComplete(Boolean.TRUE); - assertEquals(2, ormPersistentType.virtualAttributesSize()); + assertEquals(2, ormPersistentType.getVirtualAttributesSize()); OrmReadOnlyPersistentAttribute ormPersistentAttribute = ormPersistentType.getAttributeNamed("id"); assertEquals(MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY, ormPersistentAttribute.getMappingKey()); @@ -542,9 +542,9 @@ public class OrmIdMappingTests extends ContextModelTestCase OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); ormPersistentType.addSpecifiedAttribute(MappingKeys.ID_ATTRIBUTE_MAPPING_KEY, "id"); - assertEquals(1, ormPersistentType.virtualAttributesSize()); + assertEquals(1, ormPersistentType.getVirtualAttributesSize()); - OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.specifiedAttributes().next(); + OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.getSpecifiedAttributes().iterator().next(); OrmIdMapping ormIdMapping = (OrmIdMapping) ormPersistentAttribute.getMapping(); assertEquals("id", ormIdMapping.getName()); @@ -595,8 +595,8 @@ public class OrmIdMappingTests extends ContextModelTestCase assertFalse(idMapping.isDefault()); ormPersistentAttribute.setMappingKey(MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY); - assertEquals(1, ormPersistentType.specifiedAttributesSize()); - assertEquals(ormPersistentAttribute, ormPersistentType.specifiedAttributes().next()); + assertEquals(1, ormPersistentType.getSpecifiedAttributesSize()); + assertEquals(ormPersistentAttribute, ormPersistentType.getSpecifiedAttributes().iterator().next()); assertTrue(ormPersistentAttribute.getMapping() instanceof BasicMapping); assertEquals("id", ormPersistentAttribute.getMapping().getName()); assertEquals("FOO", ((BasicMapping) ormPersistentAttribute.getMapping()).getColumn().getSpecifiedName()); @@ -615,8 +615,8 @@ public class OrmIdMappingTests extends ContextModelTestCase assertFalse(idMapping.isDefault()); ormPersistentAttribute.setMappingKey(MappingKeys.VERSION_ATTRIBUTE_MAPPING_KEY); - assertEquals(1, ormPersistentType.specifiedAttributesSize()); - assertEquals(ormPersistentAttribute, ormPersistentType.specifiedAttributes().next()); + assertEquals(1, ormPersistentType.getSpecifiedAttributesSize()); + assertEquals(ormPersistentAttribute, ormPersistentType.getSpecifiedAttributes().iterator().next()); assertTrue(ormPersistentAttribute.getMapping() instanceof VersionMapping); assertEquals("id", ormPersistentAttribute.getMapping().getName()); assertEquals("FOO", ((VersionMapping) ormPersistentAttribute.getMapping()).getColumn().getSpecifiedName()); @@ -652,8 +652,8 @@ public class OrmIdMappingTests extends ContextModelTestCase assertFalse(idMapping.isDefault()); ormPersistentAttribute.setMappingKey(MappingKeys.EMBEDDED_ATTRIBUTE_MAPPING_KEY); - assertEquals(1, ormPersistentType.specifiedAttributesSize()); - assertEquals(ormPersistentAttribute, ormPersistentType.specifiedAttributes().next()); + assertEquals(1, ormPersistentType.getSpecifiedAttributesSize()); + assertEquals(ormPersistentAttribute, ormPersistentType.getSpecifiedAttributes().iterator().next()); assertTrue(ormPersistentAttribute.getMapping() instanceof EmbeddedMapping); assertEquals("id", ormPersistentAttribute.getMapping().getName()); } @@ -688,8 +688,8 @@ public class OrmIdMappingTests extends ContextModelTestCase assertFalse(idMapping.isDefault()); ormPersistentAttribute.setMappingKey(MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY); - assertEquals(1, ormPersistentType.specifiedAttributesSize()); - assertEquals(ormPersistentAttribute, ormPersistentType.specifiedAttributes().next()); + assertEquals(1, ormPersistentType.getSpecifiedAttributesSize()); + assertEquals(ormPersistentAttribute, ormPersistentType.getSpecifiedAttributes().iterator().next()); assertTrue(ormPersistentAttribute.getMapping() instanceof OneToOneMapping); assertEquals("id", ormPersistentAttribute.getMapping().getName()); } @@ -707,8 +707,8 @@ public class OrmIdMappingTests extends ContextModelTestCase assertFalse(idMapping.isDefault()); ormPersistentAttribute.setMappingKey(MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY); - assertEquals(1, ormPersistentType.specifiedAttributesSize()); - assertEquals(ormPersistentAttribute, ormPersistentType.specifiedAttributes().next()); + assertEquals(1, ormPersistentType.getSpecifiedAttributesSize()); + assertEquals(ormPersistentAttribute, ormPersistentType.getSpecifiedAttributes().iterator().next()); assertTrue(ormPersistentAttribute.getMapping() instanceof OneToManyMapping); assertEquals("id", ormPersistentAttribute.getMapping().getName()); } @@ -726,8 +726,8 @@ public class OrmIdMappingTests extends ContextModelTestCase assertFalse(idMapping.isDefault()); ormPersistentAttribute.setMappingKey(MappingKeys.MANY_TO_ONE_ATTRIBUTE_MAPPING_KEY); - assertEquals(1, ormPersistentType.specifiedAttributesSize()); - assertEquals(ormPersistentAttribute, ormPersistentType.specifiedAttributes().next()); + assertEquals(1, ormPersistentType.getSpecifiedAttributesSize()); + assertEquals(ormPersistentAttribute, ormPersistentType.getSpecifiedAttributes().iterator().next()); assertTrue(ormPersistentAttribute.getMapping() instanceof ManyToOneMapping); assertEquals("id", ormPersistentAttribute.getMapping().getName()); } @@ -745,8 +745,8 @@ public class OrmIdMappingTests extends ContextModelTestCase assertFalse(idMapping.isDefault()); ormPersistentAttribute.setMappingKey(MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); - assertEquals(1, ormPersistentType.specifiedAttributesSize()); - assertEquals(ormPersistentAttribute, ormPersistentType.specifiedAttributes().next()); + assertEquals(1, ormPersistentType.getSpecifiedAttributesSize()); + assertEquals(ormPersistentAttribute, ormPersistentType.getSpecifiedAttributes().iterator().next()); assertTrue(ormPersistentAttribute.getMapping() instanceof ManyToManyMapping); assertEquals("id", ormPersistentAttribute.getMapping().getName()); } diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmJoinColumnTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmJoinColumnTests.java index fd43faa562..81466a3691 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmJoinColumnTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmJoinColumnTests.java @@ -68,7 +68,7 @@ public class OrmJoinColumnTests extends ContextModelTestCase assertEquals("FOO", joinColumnResource.getName()); joinTableResource.getJoinColumns().remove(0); - assertFalse(ormJoinTable.specifiedJoinColumns().hasNext()); + assertFalse(ormJoinTable.getSpecifiedJoinColumns().iterator().hasNext()); assertTrue(joinTableResource.getJoinColumns().isEmpty()); } @@ -126,7 +126,7 @@ public class OrmJoinColumnTests extends ContextModelTestCase assertEquals("FOO", joinColumnResource.getReferencedColumnName()); joinTableResource.getJoinColumns().remove(0); - assertFalse(ormJoinTable.specifiedJoinColumns().hasNext()); + assertFalse(ormJoinTable.getSpecifiedJoinColumns().iterator().hasNext()); assertTrue(joinTableResource.getJoinColumns().isEmpty()); } @@ -184,7 +184,7 @@ public class OrmJoinColumnTests extends ContextModelTestCase assertEquals("FOO", joinColumnResource.getColumnDefinition()); joinTableResource.getJoinColumns().remove(0); - assertFalse(ormJoinTable.specifiedJoinColumns().hasNext()); + assertFalse(ormJoinTable.getSpecifiedJoinColumns().iterator().hasNext()); assertTrue(joinTableResource.getJoinColumns().isEmpty()); } @@ -242,7 +242,7 @@ public class OrmJoinColumnTests extends ContextModelTestCase assertEquals("FOO", joinColumnResource.getTable()); joinTableResource.getJoinColumns().remove(0); - assertFalse(ormJoinTable.specifiedJoinColumns().hasNext()); + assertFalse(ormJoinTable.getSpecifiedJoinColumns().iterator().hasNext()); assertTrue(joinTableResource.getJoinColumns().isEmpty()); } @@ -300,7 +300,7 @@ public class OrmJoinColumnTests extends ContextModelTestCase assertEquals(Boolean.FALSE, joinColumnResource.getNullable()); joinTableResource.getJoinColumns().remove(0); - assertFalse(ormJoinTable.specifiedJoinColumns().hasNext()); + assertFalse(ormJoinTable.getSpecifiedJoinColumns().iterator().hasNext()); assertTrue(joinTableResource.getJoinColumns().isEmpty()); } @@ -358,7 +358,7 @@ public class OrmJoinColumnTests extends ContextModelTestCase assertEquals(Boolean.FALSE, joinColumnResource.getUpdatable()); joinTableResource.getJoinColumns().remove(0); - assertFalse(ormJoinTable.specifiedJoinColumns().hasNext()); + assertFalse(ormJoinTable.getSpecifiedJoinColumns().iterator().hasNext()); assertTrue(joinTableResource.getJoinColumns().isEmpty()); } @@ -416,7 +416,7 @@ public class OrmJoinColumnTests extends ContextModelTestCase assertEquals(Boolean.FALSE, joinColumnResource.getInsertable()); joinTableResource.getJoinColumns().remove(0); - assertFalse(ormJoinTable.specifiedJoinColumns().hasNext()); + assertFalse(ormJoinTable.getSpecifiedJoinColumns().iterator().hasNext()); assertTrue(joinTableResource.getJoinColumns().isEmpty()); } @@ -474,7 +474,7 @@ public class OrmJoinColumnTests extends ContextModelTestCase assertEquals(Boolean.FALSE, joinColumnResource.getUnique()); joinTableResource.getJoinColumns().remove(0); - assertFalse(ormJoinTable.specifiedJoinColumns().hasNext()); + assertFalse(ormJoinTable.getSpecifiedJoinColumns().iterator().hasNext()); assertTrue(joinTableResource.getJoinColumns().isEmpty()); } diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmJoinTableTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmJoinTableTests.java index 9bcafc9500..4c1fd47226 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmJoinTableTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmJoinTableTests.java @@ -209,8 +209,8 @@ public class OrmJoinTableTests extends ContextModelTestCase assertEquals(TYPE_NAME + "_Project", virtualJoinTable.getName()); assertNull(virtualJoinTable.getSpecifiedCatalog()); assertNull(virtualJoinTable.getSpecifiedSchema()); - assertEquals(0, virtualJoinTable.specifiedJoinColumnsSize()); - assertEquals(0, virtualJoinTable.specifiedInverseJoinColumnsSize()); + assertEquals(0, virtualJoinTable.getSpecifiedJoinColumnsSize()); + assertEquals(0, virtualJoinTable.getSpecifiedInverseJoinColumnsSize()); JoinColumn ormJoinColumn = virtualJoinTable.getDefaultJoinColumn(); //TODO need to test joinColumn defaults here as well as in java and all the relatioship mapping types // assertEquals("id_project_id", ormJoinColumn.getDefaultName()); @@ -235,12 +235,12 @@ public class OrmJoinTableTests extends ContextModelTestCase assertEquals("FOO", virtualJoinTable.getSpecifiedName()); assertEquals("CATALOG", virtualJoinTable.getSpecifiedCatalog()); assertEquals("SCHEMA", virtualJoinTable.getSpecifiedSchema()); - assertEquals(1, virtualJoinTable.specifiedJoinColumnsSize()); - assertEquals(1, virtualJoinTable.specifiedInverseJoinColumnsSize()); - ormJoinColumn = virtualJoinTable.specifiedJoinColumns().next(); + assertEquals(1, virtualJoinTable.getSpecifiedJoinColumnsSize()); + assertEquals(1, virtualJoinTable.getSpecifiedInverseJoinColumnsSize()); + ormJoinColumn = virtualJoinTable.getSpecifiedJoinColumns().iterator().next(); assertEquals("NAME", ormJoinColumn.getSpecifiedName()); assertEquals("REFERENCED_NAME", ormJoinColumn.getSpecifiedReferencedColumnName()); - inverseOrmJoinColumn = virtualJoinTable.specifiedInverseJoinColumns().next(); + inverseOrmJoinColumn = virtualJoinTable.getSpecifiedInverseJoinColumns().iterator().next(); assertEquals("INVERSE_NAME", inverseOrmJoinColumn.getSpecifiedName()); assertEquals("INVERSE_REFERENCED_NAME", inverseOrmJoinColumn.getSpecifiedReferencedColumnName()); } @@ -632,12 +632,12 @@ public class OrmJoinTableTests extends ContextModelTestCase assertEquals("BAZ", joinTableResource.getJoinColumns().get(1).getName()); assertEquals("FOO", joinTableResource.getJoinColumns().get(2).getName()); - ListIterator joinColumns = ormJoinTable.specifiedJoinColumns(); + ListIterator joinColumns = ormJoinTable.getSpecifiedJoinColumns().iterator(); assertEquals(joinColumn2, joinColumns.next()); assertEquals(joinColumn3, joinColumns.next()); assertEquals(joinColumn, joinColumns.next()); - joinColumns = ormJoinTable.specifiedJoinColumns(); + joinColumns = ormJoinTable.getSpecifiedJoinColumns().iterator(); assertEquals("BAR", joinColumns.next().getName()); assertEquals("BAZ", joinColumns.next().getName()); assertEquals("FOO", joinColumns.next().getName()); @@ -688,7 +688,7 @@ public class OrmJoinTableTests extends ContextModelTestCase ormJoinTable.moveSpecifiedJoinColumn(2, 0); - ListIterator joinColumns = ormJoinTable.specifiedJoinColumns(); + ListIterator joinColumns = ormJoinTable.getSpecifiedJoinColumns().iterator(); assertEquals("BAR", joinColumns.next().getName()); assertEquals("BAZ", joinColumns.next().getName()); assertEquals("FOO", joinColumns.next().getName()); @@ -699,7 +699,7 @@ public class OrmJoinTableTests extends ContextModelTestCase ormJoinTable.moveSpecifiedJoinColumn(0, 1); - joinColumns = ormJoinTable.specifiedJoinColumns(); + joinColumns = ormJoinTable.getSpecifiedJoinColumns().iterator(); assertEquals("BAZ", joinColumns.next().getName()); assertEquals("BAR", joinColumns.next().getName()); assertEquals("FOO", joinColumns.next().getName()); @@ -727,39 +727,39 @@ public class OrmJoinTableTests extends ContextModelTestCase joinTableResource.getInverseJoinColumns().get(1).setName("BAR"); joinTableResource.getInverseJoinColumns().get(2).setName("BAZ"); - ListIterator joinColumns = ormJoinTable.specifiedInverseJoinColumns(); + ListIterator joinColumns = ormJoinTable.getSpecifiedInverseJoinColumns().iterator(); assertEquals("FOO", joinColumns.next().getName()); assertEquals("BAR", joinColumns.next().getName()); assertEquals("BAZ", joinColumns.next().getName()); assertFalse(joinColumns.hasNext()); joinTableResource.getInverseJoinColumns().move(2, 0); - joinColumns = ormJoinTable.specifiedInverseJoinColumns(); + joinColumns = ormJoinTable.getSpecifiedInverseJoinColumns().iterator(); assertEquals("BAR", joinColumns.next().getName()); assertEquals("BAZ", joinColumns.next().getName()); assertEquals("FOO", joinColumns.next().getName()); assertFalse(joinColumns.hasNext()); joinTableResource.getInverseJoinColumns().move(0, 1); - joinColumns = ormJoinTable.specifiedInverseJoinColumns(); + joinColumns = ormJoinTable.getSpecifiedInverseJoinColumns().iterator(); assertEquals("BAZ", joinColumns.next().getName()); assertEquals("BAR", joinColumns.next().getName()); assertEquals("FOO", joinColumns.next().getName()); assertFalse(joinColumns.hasNext()); joinTableResource.getInverseJoinColumns().remove(1); - joinColumns = ormJoinTable.specifiedInverseJoinColumns(); + joinColumns = ormJoinTable.getSpecifiedInverseJoinColumns().iterator(); assertEquals("BAZ", joinColumns.next().getName()); assertEquals("FOO", joinColumns.next().getName()); assertFalse(joinColumns.hasNext()); joinTableResource.getInverseJoinColumns().remove(1); - joinColumns = ormJoinTable.specifiedInverseJoinColumns(); + joinColumns = ormJoinTable.getSpecifiedInverseJoinColumns().iterator(); assertEquals("BAZ", joinColumns.next().getName()); assertFalse(joinColumns.hasNext()); joinTableResource.getInverseJoinColumns().remove(0); - assertFalse(ormJoinTable.specifiedInverseJoinColumns().hasNext()); + assertFalse(ormJoinTable.getSpecifiedInverseJoinColumns().iterator().hasNext()); } public void testAddSpecifiedInverseJoinColumn() throws Exception { @@ -789,12 +789,12 @@ public class OrmJoinTableTests extends ContextModelTestCase assertEquals("BAZ", joinTableResource.getInverseJoinColumns().get(1).getName()); assertEquals("FOO", joinTableResource.getInverseJoinColumns().get(2).getName()); - ListIterator joinColumns = ormJoinTable.specifiedInverseJoinColumns(); + ListIterator joinColumns = ormJoinTable.getSpecifiedInverseJoinColumns().iterator(); assertEquals(joinColumn2, joinColumns.next()); assertEquals(joinColumn3, joinColumns.next()); assertEquals(joinColumn, joinColumns.next()); - joinColumns = ormJoinTable.specifiedInverseJoinColumns(); + joinColumns = ormJoinTable.getSpecifiedInverseJoinColumns().iterator(); assertEquals("BAR", joinColumns.next().getName()); assertEquals("BAZ", joinColumns.next().getName()); assertEquals("FOO", joinColumns.next().getName()); @@ -845,7 +845,7 @@ public class OrmJoinTableTests extends ContextModelTestCase ormJoinTable.moveSpecifiedInverseJoinColumn(2, 0); - ListIterator joinColumns = ormJoinTable.specifiedInverseJoinColumns(); + ListIterator joinColumns = ormJoinTable.getSpecifiedInverseJoinColumns().iterator(); assertEquals("BAR", joinColumns.next().getName()); assertEquals("BAZ", joinColumns.next().getName()); assertEquals("FOO", joinColumns.next().getName()); @@ -856,7 +856,7 @@ public class OrmJoinTableTests extends ContextModelTestCase ormJoinTable.moveSpecifiedInverseJoinColumn(0, 1); - joinColumns = ormJoinTable.specifiedInverseJoinColumns(); + joinColumns = ormJoinTable.getSpecifiedInverseJoinColumns().iterator(); assertEquals("BAZ", joinColumns.next().getName()); assertEquals("BAR", joinColumns.next().getName()); assertEquals("FOO", joinColumns.next().getName()); @@ -884,39 +884,39 @@ public class OrmJoinTableTests extends ContextModelTestCase joinTableResource.getJoinColumns().get(1).setName("BAR"); joinTableResource.getJoinColumns().get(2).setName("BAZ"); - ListIterator joinColumns = ormJoinTable.specifiedJoinColumns(); + ListIterator joinColumns = ormJoinTable.getSpecifiedJoinColumns().iterator(); assertEquals("FOO", joinColumns.next().getName()); assertEquals("BAR", joinColumns.next().getName()); assertEquals("BAZ", joinColumns.next().getName()); assertFalse(joinColumns.hasNext()); joinTableResource.getJoinColumns().move(2, 0); - joinColumns = ormJoinTable.specifiedJoinColumns(); + joinColumns = ormJoinTable.getSpecifiedJoinColumns().iterator(); assertEquals("BAR", joinColumns.next().getName()); assertEquals("BAZ", joinColumns.next().getName()); assertEquals("FOO", joinColumns.next().getName()); assertFalse(joinColumns.hasNext()); joinTableResource.getJoinColumns().move(0, 1); - joinColumns = ormJoinTable.specifiedJoinColumns(); + joinColumns = ormJoinTable.getSpecifiedJoinColumns().iterator(); assertEquals("BAZ", joinColumns.next().getName()); assertEquals("BAR", joinColumns.next().getName()); assertEquals("FOO", joinColumns.next().getName()); assertFalse(joinColumns.hasNext()); joinTableResource.getJoinColumns().remove(1); - joinColumns = ormJoinTable.specifiedJoinColumns(); + joinColumns = ormJoinTable.getSpecifiedJoinColumns().iterator(); assertEquals("BAZ", joinColumns.next().getName()); assertEquals("FOO", joinColumns.next().getName()); assertFalse(joinColumns.hasNext()); joinTableResource.getJoinColumns().remove(1); - joinColumns = ormJoinTable.specifiedJoinColumns(); + joinColumns = ormJoinTable.getSpecifiedJoinColumns().iterator(); assertEquals("BAZ", joinColumns.next().getName()); assertFalse(joinColumns.hasNext()); joinTableResource.getJoinColumns().remove(0); - assertFalse(ormJoinTable.specifiedJoinColumns().hasNext()); + assertFalse(ormJoinTable.getSpecifiedJoinColumns().iterator().hasNext()); } @@ -930,7 +930,7 @@ public class OrmJoinTableTests extends ContextModelTestCase manyToMany.setJoinTable(OrmFactory.eINSTANCE.createXmlJoinTable()); XmlJoinTable joinTableResource = manyToMany.getJoinTable(); - ListIterator uniqueConstraints = ormJoinTable.uniqueConstraints(); + ListIterator uniqueConstraints = ormJoinTable.getUniqueConstraints().iterator(); assertFalse(uniqueConstraints.hasNext()); XmlUniqueConstraint uniqueConstraintResource = OrmFactory.eINSTANCE.createXmlUniqueConstraint(); @@ -941,7 +941,7 @@ public class OrmJoinTableTests extends ContextModelTestCase joinTableResource.getUniqueConstraints().add(0, uniqueConstraintResource); uniqueConstraintResource.getColumnNames().add(0, "bar"); - uniqueConstraints = ormJoinTable.uniqueConstraints(); + uniqueConstraints = ormJoinTable.getUniqueConstraints().iterator(); assertTrue(uniqueConstraints.hasNext()); assertEquals("bar", uniqueConstraints.next().getColumnNames().iterator().next()); assertEquals("foo", uniqueConstraints.next().getColumnNames().iterator().next()); @@ -958,7 +958,7 @@ public class OrmJoinTableTests extends ContextModelTestCase manyToMany.setJoinTable(OrmFactory.eINSTANCE.createXmlJoinTable()); XmlJoinTable joinTableResource = manyToMany.getJoinTable(); - assertEquals(0, ormJoinTable.uniqueConstraintsSize()); + assertEquals(0, ormJoinTable.getUniqueConstraintsSize()); XmlUniqueConstraint uniqueConstraintResource = OrmFactory.eINSTANCE.createXmlUniqueConstraint(); joinTableResource.getUniqueConstraints().add(0, uniqueConstraintResource); @@ -968,7 +968,7 @@ public class OrmJoinTableTests extends ContextModelTestCase joinTableResource.getUniqueConstraints().add(1, uniqueConstraintResource); uniqueConstraintResource.getColumnNames().add(0, "bar"); - assertEquals(2, ormJoinTable.uniqueConstraintsSize()); + assertEquals(2, ormJoinTable.getUniqueConstraintsSize()); } public void testAddUniqueConstraint() throws Exception { @@ -1038,7 +1038,7 @@ public class OrmJoinTableTests extends ContextModelTestCase assertEquals("BAZ", uniqueConstraintResources.next().getColumnNames().get(0)); assertFalse(uniqueConstraintResources.hasNext()); - Iterator uniqueConstraints = ormJoinTable.uniqueConstraints(); + Iterator uniqueConstraints = ormJoinTable.getUniqueConstraints().iterator(); assertEquals("FOO", uniqueConstraints.next().getColumnNames().iterator().next()); assertEquals("BAZ", uniqueConstraints.next().getColumnNames().iterator().next()); assertFalse(uniqueConstraints.hasNext()); @@ -1049,7 +1049,7 @@ public class OrmJoinTableTests extends ContextModelTestCase assertEquals("FOO", uniqueConstraintResources.next().getColumnNames().get(0)); assertFalse(uniqueConstraintResources.hasNext()); - uniqueConstraints = ormJoinTable.uniqueConstraints(); + uniqueConstraints = ormJoinTable.getUniqueConstraints().iterator(); assertEquals("FOO", uniqueConstraints.next().getColumnNames().iterator().next()); assertFalse(uniqueConstraints.hasNext()); @@ -1057,7 +1057,7 @@ public class OrmJoinTableTests extends ContextModelTestCase ormJoinTable.removeUniqueConstraint(0); uniqueConstraintResources = joinTableResource.getUniqueConstraints().listIterator(); assertFalse(uniqueConstraintResources.hasNext()); - uniqueConstraints = ormJoinTable.uniqueConstraints(); + uniqueConstraints = ormJoinTable.getUniqueConstraints().iterator(); assertFalse(uniqueConstraints.hasNext()); } @@ -1079,7 +1079,7 @@ public class OrmJoinTableTests extends ContextModelTestCase ormJoinTable.moveUniqueConstraint(2, 0); - ListIterator uniqueConstraints = ormJoinTable.uniqueConstraints(); + ListIterator uniqueConstraints = ormJoinTable.getUniqueConstraints().iterator(); assertEquals("BAR", uniqueConstraints.next().getColumnNames().iterator().next()); assertEquals("BAZ", uniqueConstraints.next().getColumnNames().iterator().next()); assertEquals("FOO", uniqueConstraints.next().getColumnNames().iterator().next()); @@ -1091,7 +1091,7 @@ public class OrmJoinTableTests extends ContextModelTestCase ormJoinTable.moveUniqueConstraint(0, 1); - uniqueConstraints = ormJoinTable.uniqueConstraints(); + uniqueConstraints = ormJoinTable.getUniqueConstraints().iterator(); assertEquals("BAZ", uniqueConstraints.next().getColumnNames().iterator().next()); assertEquals("BAR", uniqueConstraints.next().getColumnNames().iterator().next()); assertEquals("FOO", uniqueConstraints.next().getColumnNames().iterator().next()); @@ -1125,39 +1125,39 @@ public class OrmJoinTableTests extends ContextModelTestCase uniqueConstraintResource.getColumnNames().add(0, "BAZ"); - ListIterator uniqueConstraints = ormJoinTable.uniqueConstraints(); + ListIterator uniqueConstraints = ormJoinTable.getUniqueConstraints().iterator(); assertEquals("FOO", uniqueConstraints.next().getColumnNames().iterator().next()); assertEquals("BAR", uniqueConstraints.next().getColumnNames().iterator().next()); assertEquals("BAZ", uniqueConstraints.next().getColumnNames().iterator().next()); assertFalse(uniqueConstraints.hasNext()); joinTableResource.getUniqueConstraints().move(2, 0); - uniqueConstraints = ormJoinTable.uniqueConstraints(); + uniqueConstraints = ormJoinTable.getUniqueConstraints().iterator(); assertEquals("BAR", uniqueConstraints.next().getColumnNames().iterator().next()); assertEquals("BAZ", uniqueConstraints.next().getColumnNames().iterator().next()); assertEquals("FOO", uniqueConstraints.next().getColumnNames().iterator().next()); assertFalse(uniqueConstraints.hasNext()); joinTableResource.getUniqueConstraints().move(0, 1); - uniqueConstraints = ormJoinTable.uniqueConstraints(); + uniqueConstraints = ormJoinTable.getUniqueConstraints().iterator(); assertEquals("BAZ", uniqueConstraints.next().getColumnNames().iterator().next()); assertEquals("BAR", uniqueConstraints.next().getColumnNames().iterator().next()); assertEquals("FOO", uniqueConstraints.next().getColumnNames().iterator().next()); assertFalse(uniqueConstraints.hasNext()); joinTableResource.getUniqueConstraints().remove(1); - uniqueConstraints = ormJoinTable.uniqueConstraints(); + uniqueConstraints = ormJoinTable.getUniqueConstraints().iterator(); assertEquals("BAZ", uniqueConstraints.next().getColumnNames().iterator().next()); assertEquals("FOO", uniqueConstraints.next().getColumnNames().iterator().next()); assertFalse(uniqueConstraints.hasNext()); joinTableResource.getUniqueConstraints().remove(1); - uniqueConstraints = ormJoinTable.uniqueConstraints(); + uniqueConstraints = ormJoinTable.getUniqueConstraints().iterator(); assertEquals("BAZ", uniqueConstraints.next().getColumnNames().iterator().next()); assertFalse(uniqueConstraints.hasNext()); joinTableResource.getUniqueConstraints().remove(0); - uniqueConstraints = ormJoinTable.uniqueConstraints(); + uniqueConstraints = ormJoinTable.getUniqueConstraints().iterator(); assertFalse(uniqueConstraints.hasNext()); } @@ -1166,23 +1166,23 @@ public class OrmJoinTableTests extends ContextModelTestCase createTestEntityWithValidManyToMany(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - ReadOnlyPersistentAttribute virtualAttribute = ormPersistentType.attributes().next(); + ReadOnlyPersistentAttribute virtualAttribute = ormPersistentType.getAttributes().iterator().next(); ManyToManyMapping virtualManyToManyMapping = (ManyToManyMapping) virtualAttribute.getMapping(); JoinTable virtualJoinTable = virtualManyToManyMapping.getRelationship().getJoinTableStrategy().getJoinTable(); assertTrue(virtualAttribute.isVirtual()); - ListIterator uniqueConstraints = (ListIterator) virtualJoinTable.uniqueConstraints(); + ListIterator uniqueConstraints = virtualJoinTable.getUniqueConstraints().iterator(); assertFalse(uniqueConstraints.hasNext()); - JavaManyToManyMapping javaManyToManyMapping = (JavaManyToManyMapping) ormPersistentType.getJavaPersistentType().attributes().next().getMapping(); + JavaManyToManyMapping javaManyToManyMapping = (JavaManyToManyMapping) ormPersistentType.getJavaPersistentType().getAttributes().iterator().next().getMapping(); JavaJoinTable javaJoinTable = javaManyToManyMapping.getRelationship().getJoinTableStrategy().getJoinTable(); javaJoinTable.addUniqueConstraint(0).addColumnName(0, "FOO"); javaJoinTable.addUniqueConstraint(1).addColumnName(0, "BAR"); javaJoinTable.addUniqueConstraint(2).addColumnName(0, "BAZ"); - uniqueConstraints = (ListIterator) virtualJoinTable.uniqueConstraints(); + uniqueConstraints = virtualJoinTable.getUniqueConstraints().iterator(); assertTrue(uniqueConstraints.hasNext()); assertEquals("FOO", uniqueConstraints.next().getColumnNames().iterator().next()); assertEquals("BAR", uniqueConstraints.next().getColumnNames().iterator().next()); @@ -1190,7 +1190,7 @@ public class OrmJoinTableTests extends ContextModelTestCase assertFalse(uniqueConstraints.hasNext()); OrmManyToManyMapping specifiedManyToManyMapping = (OrmManyToManyMapping) ((VirtualOrmPersistentAttribute) virtualAttribute).convertToSpecified().getMapping(); - assertEquals(0, specifiedManyToManyMapping.getRelationship().getJoinTableStrategy().getJoinTable().uniqueConstraintsSize()); + assertEquals(0, specifiedManyToManyMapping.getRelationship().getJoinTableStrategy().getJoinTable().getUniqueConstraintsSize()); } public void testDefaultName() throws Exception { @@ -1241,8 +1241,8 @@ public class OrmJoinTableTests extends ContextModelTestCase ormPersistentType.getAttributeNamed("projects").convertToSpecified(); OrmManyToManyMapping manyToManyMapping = (OrmManyToManyMapping) ormPersistentType.getAttributeNamed("projects").getMapping(); JoinTable joinTable = manyToManyMapping.getRelationship().getJoinTableStrategy().getJoinTable(); - JoinColumn joinColumn = joinTable.joinColumns().next(); - JoinColumn inverseJoinColumn = joinTable.inverseJoinColumns().next(); + JoinColumn joinColumn = joinTable.getJoinColumns().iterator().next(); + JoinColumn inverseJoinColumn = joinTable.getInverseJoinColumns().iterator().next(); //joinTable default name is null because targetEntity is not in the persistence unit assertNull(joinColumn.getDefaultName()); @@ -1305,8 +1305,8 @@ public class OrmJoinTableTests extends ContextModelTestCase ormPersistentType.getAttributeNamed("projects").convertToSpecified(); OrmManyToManyMapping manyToManyMapping = (OrmManyToManyMapping) ormPersistentType.getAttributeNamed("projects").getMapping(); JoinTable joinTable = manyToManyMapping.getRelationship().getJoinTableStrategy().getJoinTable(); - JoinColumn joinColumn = joinTable.joinColumns().next(); - JoinColumn inverseJoinColumn = joinTable.inverseJoinColumns().next(); + JoinColumn joinColumn = joinTable.getJoinColumns().iterator().next(); + JoinColumn inverseJoinColumn = joinTable.getInverseJoinColumns().iterator().next(); //joinTable default name is null because targetEntity is not in the persistence unit assertNull(joinColumn.getDefaultName()); diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmManyToManyMappingTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmManyToManyMappingTests.java index d19b25b189..e7077ba8f6 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmManyToManyMappingTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmManyToManyMappingTests.java @@ -12,7 +12,6 @@ package org.eclipse.jpt.jpa.core.tests.internal.context.orm; import java.util.Iterator; import org.eclipse.jdt.core.ICompilationUnit; 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; import org.eclipse.jpt.jpa.core.JptJpaCorePlugin; import org.eclipse.jpt.jpa.core.MappingKeys; @@ -92,7 +91,7 @@ public class OrmManyToManyMappingTests extends ContextModelTestCase } }); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - for (OrmReadOnlyPersistentAttribute each : CollectionTools.iterable(ormPersistentType.attributes())) { + for (OrmReadOnlyPersistentAttribute each : ormPersistentType.getAttributes()) { each.convertToSpecified(); } } @@ -686,8 +685,8 @@ public class OrmManyToManyMappingTests extends ContextModelTestCase assertFalse(manyToManyMapping.isDefault()); ormPersistentAttribute.setMappingKey(MappingKeys.ID_ATTRIBUTE_MAPPING_KEY); - assertEquals(1, ormPersistentType.specifiedAttributesSize()); - assertEquals(ormPersistentAttribute, ormPersistentType.specifiedAttributes().next()); + assertEquals(1, ormPersistentType.getSpecifiedAttributesSize()); + assertEquals(ormPersistentAttribute, ormPersistentType.getSpecifiedAttributes().iterator().next()); assertTrue(ormPersistentAttribute.getMapping() instanceof IdMapping); assertEquals("manyToMany", ormPersistentAttribute.getMapping().getName()); } @@ -705,8 +704,8 @@ public class OrmManyToManyMappingTests extends ContextModelTestCase assertFalse(manyToManyMapping.isDefault()); ormPersistentAttribute.setMappingKey(MappingKeys.VERSION_ATTRIBUTE_MAPPING_KEY); - assertEquals(1, ormPersistentType.specifiedAttributesSize()); - assertEquals(ormPersistentAttribute, ormPersistentType.specifiedAttributes().next()); + assertEquals(1, ormPersistentType.getSpecifiedAttributesSize()); + assertEquals(ormPersistentAttribute, ormPersistentType.getSpecifiedAttributes().iterator().next()); assertTrue(ormPersistentAttribute.getMapping() instanceof VersionMapping); assertEquals("manyToMany", ormPersistentAttribute.getMapping().getName()); } @@ -724,8 +723,8 @@ public class OrmManyToManyMappingTests extends ContextModelTestCase assertFalse(manyToManyMapping.isDefault()); ormPersistentAttribute.setMappingKey(MappingKeys.TRANSIENT_ATTRIBUTE_MAPPING_KEY); - assertEquals(1, ormPersistentType.specifiedAttributesSize()); - assertEquals(ormPersistentAttribute, ormPersistentType.specifiedAttributes().next()); + assertEquals(1, ormPersistentType.getSpecifiedAttributesSize()); + assertEquals(ormPersistentAttribute, ormPersistentType.getSpecifiedAttributes().iterator().next()); assertTrue(ormPersistentAttribute.getMapping() instanceof TransientMapping); assertEquals("manyToMany", ormPersistentAttribute.getMapping().getName()); } @@ -743,8 +742,8 @@ public class OrmManyToManyMappingTests extends ContextModelTestCase assertFalse(manyToManyMapping.isDefault()); ormPersistentAttribute.setMappingKey(MappingKeys.EMBEDDED_ATTRIBUTE_MAPPING_KEY); - assertEquals(1, ormPersistentType.specifiedAttributesSize()); - assertEquals(ormPersistentAttribute, ormPersistentType.specifiedAttributes().next()); + assertEquals(1, ormPersistentType.getSpecifiedAttributesSize()); + assertEquals(ormPersistentAttribute, ormPersistentType.getSpecifiedAttributes().iterator().next()); assertTrue(ormPersistentAttribute.getMapping() instanceof EmbeddedMapping); assertEquals("manyToMany", ormPersistentAttribute.getMapping().getName()); } @@ -762,8 +761,8 @@ public class OrmManyToManyMappingTests extends ContextModelTestCase assertFalse(manyToManyMapping.isDefault()); ormPersistentAttribute.setMappingKey(MappingKeys.EMBEDDED_ID_ATTRIBUTE_MAPPING_KEY); - assertEquals(1, ormPersistentType.specifiedAttributesSize()); - assertEquals(ormPersistentAttribute, ormPersistentType.specifiedAttributes().next()); + assertEquals(1, ormPersistentType.getSpecifiedAttributesSize()); + assertEquals(ormPersistentAttribute, ormPersistentType.getSpecifiedAttributes().iterator().next()); assertTrue(ormPersistentAttribute.getMapping() instanceof EmbeddedIdMapping); assertEquals("manyToMany", ormPersistentAttribute.getMapping().getName()); } @@ -787,8 +786,8 @@ public class OrmManyToManyMappingTests extends ContextModelTestCase assertFalse(manyToManyMapping.isDefault()); ormPersistentAttribute.setMappingKey(MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY); - assertEquals(1, ormPersistentType.specifiedAttributesSize()); - assertEquals(ormPersistentAttribute, ormPersistentType.specifiedAttributes().next()); + assertEquals(1, ormPersistentType.getSpecifiedAttributesSize()); + assertEquals(ormPersistentAttribute, ormPersistentType.getSpecifiedAttributes().iterator().next()); assertTrue(ormPersistentAttribute.getMapping() instanceof OneToOneMapping); assertEquals("manyToMany", ormPersistentAttribute.getMapping().getName()); assertEquals(FetchType.EAGER, ((OneToOneMapping) ormPersistentAttribute.getMapping()).getSpecifiedFetch()); @@ -826,8 +825,8 @@ public class OrmManyToManyMappingTests extends ContextModelTestCase assertFalse(manyToManyMapping.isDefault()); ormPersistentAttribute.setMappingKey(MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY); - assertEquals(1, ormPersistentType.specifiedAttributesSize()); - assertEquals(ormPersistentAttribute, ormPersistentType.specifiedAttributes().next()); + assertEquals(1, ormPersistentType.getSpecifiedAttributesSize()); + assertEquals(ormPersistentAttribute, ormPersistentType.getSpecifiedAttributes().iterator().next()); assertTrue(ormPersistentAttribute.getMapping() instanceof OneToManyMapping); assertEquals("manyToMany", ormPersistentAttribute.getMapping().getName()); assertEquals(FetchType.EAGER, ((OneToManyMapping) ormPersistentAttribute.getMapping()).getSpecifiedFetch()); @@ -839,10 +838,10 @@ public class OrmManyToManyMappingTests extends ContextModelTestCase assertTrue(((OneToManyMapping) ormPersistentAttribute.getMapping()).getCascade().isRemove()); JoinTable joinTable = ((OneToManyMapping) ormPersistentAttribute.getMapping()).getRelationship().getJoinTableStrategy().getJoinTable(); assertEquals("MY_JOIN_TABLE", joinTable.getName()); - assertEquals("name", joinTable.joinColumns().next().getSpecifiedName()); - assertEquals("referenceName", joinTable.joinColumns().next().getSpecifiedReferencedColumnName()); - assertEquals("inverseName", joinTable.inverseJoinColumns().next().getSpecifiedName()); - assertEquals("inverseReferenceName", joinTable.inverseJoinColumns().next().getSpecifiedReferencedColumnName()); + assertEquals("name", joinTable.getJoinColumns().iterator().next().getSpecifiedName()); + assertEquals("referenceName", joinTable.getJoinColumns().iterator().next().getSpecifiedReferencedColumnName()); + assertEquals("inverseName", joinTable.getInverseJoinColumns().iterator().next().getSpecifiedName()); + assertEquals("inverseReferenceName", joinTable.getInverseJoinColumns().iterator().next().getSpecifiedReferencedColumnName()); } public void testManyToManyMorphToManyToOneMapping() throws Exception { @@ -863,8 +862,8 @@ public class OrmManyToManyMappingTests extends ContextModelTestCase assertFalse(manyToManyMapping.isDefault()); ormPersistentAttribute.setMappingKey(MappingKeys.MANY_TO_ONE_ATTRIBUTE_MAPPING_KEY); - assertEquals(1, ormPersistentType.specifiedAttributesSize()); - assertEquals(ormPersistentAttribute, ormPersistentType.specifiedAttributes().next()); + assertEquals(1, ormPersistentType.getSpecifiedAttributesSize()); + assertEquals(ormPersistentAttribute, ormPersistentType.getSpecifiedAttributes().iterator().next()); assertTrue(ormPersistentAttribute.getMapping() instanceof ManyToOneMapping); assertEquals("manyToMany", ormPersistentAttribute.getMapping().getName()); assertEquals(FetchType.EAGER, ((ManyToOneMapping) ormPersistentAttribute.getMapping()).getSpecifiedFetch()); @@ -894,8 +893,8 @@ public class OrmManyToManyMappingTests extends ContextModelTestCase assertFalse(manyToManyMapping.isDefault()); ormPersistentAttribute.setMappingKey(MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY); - assertEquals(1, ormPersistentType.specifiedAttributesSize()); - assertEquals(ormPersistentAttribute, ormPersistentType.specifiedAttributes().next()); + assertEquals(1, ormPersistentType.getSpecifiedAttributesSize()); + assertEquals(ormPersistentAttribute, ormPersistentType.getSpecifiedAttributes().iterator().next()); assertTrue(ormPersistentAttribute.getMapping() instanceof BasicMapping); assertEquals("manyToMany", ormPersistentAttribute.getMapping().getName()); //TODO assertEquals(FetchType.EAGER, ((IBasicMapping) ormPersistentAttribute.getMapping()).getSpecifiedFetch()); @@ -914,7 +913,7 @@ public class OrmManyToManyMappingTests extends ContextModelTestCase addXmlClassRef(PACKAGE_NAME + ".Address"); addXmlClassRef(PACKAGE_NAME + ".State"); - ReadOnlyPersistentAttribute persistentAttribute = ormPersistentType.attributes().next(); + ReadOnlyPersistentAttribute persistentAttribute = ormPersistentType.getAttributes().iterator().next(); ManyToManyMapping manyToManyMapping = (ManyToManyMapping) persistentAttribute.getMapping(); Iterator attributeNames = @@ -1009,8 +1008,8 @@ public class OrmManyToManyMappingTests extends ContextModelTestCase OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, PACKAGE_NAME + ".Address"); - assertEquals(3, ormPersistentType.virtualAttributesSize()); - OrmReadOnlyPersistentAttribute virtualPersistentAttribute = ormPersistentType.virtualAttributes().next(); + assertEquals(3, ormPersistentType.getVirtualAttributesSize()); + OrmReadOnlyPersistentAttribute virtualPersistentAttribute = ormPersistentType.getVirtualAttributes().iterator().next(); ManyToManyMapping virtualManyToManyMapping = (ManyToManyMapping) virtualPersistentAttribute.getMapping(); assertEquals("address", virtualManyToManyMapping.getName()); @@ -1037,14 +1036,14 @@ public class OrmManyToManyMappingTests extends ContextModelTestCase OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, PACKAGE_NAME + ".Address"); ormPersistentType.getMapping().setSpecifiedMetadataComplete(Boolean.TRUE); - assertEquals(3, ormPersistentType.virtualAttributesSize()); + assertEquals(3, ormPersistentType.getVirtualAttributesSize()); OrmReadOnlyPersistentAttribute virtualPersistentAttribute = ormPersistentType.getAttributeNamed("address"); assertEquals(MappingKeys.NULL_ATTRIBUTE_MAPPING_KEY, virtualPersistentAttribute.getMappingKey()); assertTrue(virtualPersistentAttribute.isVirtual()); virtualPersistentAttribute.convertToSpecified(MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); - OrmPersistentAttribute ormPersistentAttribute= ormPersistentType.specifiedAttributes().next(); + OrmPersistentAttribute ormPersistentAttribute= ormPersistentType.getSpecifiedAttributes().iterator().next(); OrmManyToManyMapping ormManyToManyMapping = (OrmManyToManyMapping) ormPersistentAttribute.getMapping(); assertEquals("address", ormManyToManyMapping.getName()); diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmManyToOneMappingTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmManyToOneMappingTests.java index 65b26995f2..473d2ca0b0 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmManyToOneMappingTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmManyToOneMappingTests.java @@ -13,7 +13,6 @@ import java.util.Iterator; import java.util.ListIterator; import org.eclipse.jdt.core.ICompilationUnit; 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; import org.eclipse.jpt.jpa.core.JptJpaCorePlugin; import org.eclipse.jpt.jpa.core.MappingKeys; @@ -94,7 +93,7 @@ public class OrmManyToOneMappingTests extends ContextModelTestCase } }); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - for (OrmReadOnlyPersistentAttribute each : CollectionTools.iterable(ormPersistentType.attributes())) { + for (OrmReadOnlyPersistentAttribute each : ormPersistentType.getAttributes()) { each.convertToSpecified(); } } @@ -333,12 +332,12 @@ public class OrmManyToOneMappingTests extends ContextModelTestCase assertEquals("BAZ", manyToOneResource.getJoinColumns().get(1).getName()); assertEquals("FOO", manyToOneResource.getJoinColumns().get(2).getName()); - ListIterator joinColumns = strategy.specifiedJoinColumns(); + ListIterator joinColumns = strategy.getSpecifiedJoinColumns().iterator(); assertEquals(joinColumn2, joinColumns.next()); assertEquals(joinColumn3, joinColumns.next()); assertEquals(joinColumn, joinColumns.next()); - joinColumns = strategy.specifiedJoinColumns(); + joinColumns = strategy.getSpecifiedJoinColumns().iterator(); assertEquals("BAR", joinColumns.next().getName()); assertEquals("BAZ", joinColumns.next().getName()); assertEquals("FOO", joinColumns.next().getName()); @@ -425,7 +424,7 @@ public class OrmManyToOneMappingTests extends ContextModelTestCase strategy.moveSpecifiedJoinColumn(2, 0); - ListIterator joinColumns = strategy.specifiedJoinColumns(); + ListIterator joinColumns = strategy.getSpecifiedJoinColumns().iterator(); assertEquals("BAR", joinColumns.next().getName()); assertEquals("BAZ", joinColumns.next().getName()); assertEquals("FOO", joinColumns.next().getName()); @@ -436,7 +435,7 @@ public class OrmManyToOneMappingTests extends ContextModelTestCase strategy.moveSpecifiedJoinColumn(0, 1); - joinColumns = strategy.specifiedJoinColumns(); + joinColumns = strategy.getSpecifiedJoinColumns().iterator(); assertEquals("BAZ", joinColumns.next().getName()); assertEquals("BAR", joinColumns.next().getName()); assertEquals("FOO", joinColumns.next().getName()); @@ -454,9 +453,9 @@ public class OrmManyToOneMappingTests extends ContextModelTestCase OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, PACKAGE_NAME + ".Address"); ormPersistentType.addSpecifiedAttribute(MappingKeys.MANY_TO_ONE_ATTRIBUTE_MAPPING_KEY, "foo"); - assertEquals(3, ormPersistentType.virtualAttributesSize()); + assertEquals(3, ormPersistentType.getVirtualAttributesSize()); - OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.specifiedAttributes().next(); + OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.getSpecifiedAttributes().iterator().next(); OrmManyToOneMapping ormManyToOneMapping = (OrmManyToOneMapping) ormPersistentAttribute.getMapping(); OrmJoinColumnRelationshipStrategy strategy = ormManyToOneMapping.getRelationship().getJoinColumnStrategy(); @@ -470,7 +469,7 @@ public class OrmManyToOneMappingTests extends ContextModelTestCase assertNull(ormManyToOneMapping.getTargetEntity()); - assertFalse(strategy.specifiedJoinColumns().hasNext()); + assertFalse(strategy.getSpecifiedJoinColumns().iterator().hasNext()); //TODO default joinColumns //assertTrue(ormManyToOneMapping.defaultJoinColumns().hasNext()); @@ -489,8 +488,8 @@ public class OrmManyToOneMappingTests extends ContextModelTestCase OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, PACKAGE_NAME + ".Address"); - assertEquals(3, ormPersistentType.virtualAttributesSize()); - OrmReadOnlyPersistentAttribute ormPersistentAttribute = ormPersistentType.virtualAttributes().next(); + assertEquals(3, ormPersistentType.getVirtualAttributesSize()); + OrmReadOnlyPersistentAttribute ormPersistentAttribute = ormPersistentType.getVirtualAttributes().iterator().next(); ManyToOneMapping manyToOneMapping = (ManyToOneMapping) ormPersistentAttribute.getMapping(); assertEquals("address", manyToOneMapping.getName()); @@ -498,7 +497,7 @@ public class OrmManyToOneMappingTests extends ContextModelTestCase assertEquals(Boolean.FALSE, manyToOneMapping.getSpecifiedOptional()); assertEquals("Address", manyToOneMapping.getSpecifiedTargetEntity()); - JoinColumn joinColumn = manyToOneMapping.getRelationship().getJoinColumnStrategy().specifiedJoinColumns().next(); + JoinColumn joinColumn = manyToOneMapping.getRelationship().getJoinColumnStrategy().getSpecifiedJoinColumns().iterator().next(); assertEquals("MY_COLUMN", joinColumn.getSpecifiedName()); assertEquals("MY_REFERENCED_COLUMN", joinColumn.getSpecifiedReferencedColumnName()); assertEquals(Boolean.TRUE, joinColumn.getSpecifiedUnique()); @@ -523,14 +522,14 @@ public class OrmManyToOneMappingTests extends ContextModelTestCase OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, PACKAGE_NAME + ".Address"); ormPersistentType.getMapping().setSpecifiedMetadataComplete(Boolean.TRUE); - assertEquals(3, ormPersistentType.virtualAttributesSize()); + assertEquals(3, ormPersistentType.getVirtualAttributesSize()); OrmReadOnlyPersistentAttribute ormPersistentAttribute = ormPersistentType.getAttributeNamed("address"); assertEquals(MappingKeys.NULL_ATTRIBUTE_MAPPING_KEY, ormPersistentAttribute.getMappingKey()); assertTrue(ormPersistentAttribute.isVirtual()); ormPersistentAttribute.convertToSpecified(MappingKeys.MANY_TO_ONE_ATTRIBUTE_MAPPING_KEY); - ormPersistentAttribute= ormPersistentType.specifiedAttributes().next(); + ormPersistentAttribute= ormPersistentType.getSpecifiedAttributes().iterator().next(); OrmManyToOneMapping ormManyToOneMapping = (OrmManyToOneMapping) ormPersistentAttribute.getMapping(); assertEquals("address", ormManyToOneMapping.getName()); @@ -567,9 +566,9 @@ public class OrmManyToOneMappingTests extends ContextModelTestCase getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, PACKAGE_NAME + ".Address"); ormPersistentType.addSpecifiedAttribute(MappingKeys.MANY_TO_ONE_ATTRIBUTE_MAPPING_KEY, "address"); - assertEquals(2, ormPersistentType.virtualAttributesSize()); + assertEquals(2, ormPersistentType.getVirtualAttributesSize()); - OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.specifiedAttributes().next(); + OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.getSpecifiedAttributes().iterator().next(); OrmManyToOneMapping ormManyToOneMapping = (OrmManyToOneMapping) ormPersistentAttribute.getMapping(); assertEquals("address", ormManyToOneMapping.getName()); @@ -580,7 +579,7 @@ public class OrmManyToOneMappingTests extends ContextModelTestCase assertEquals(true, ormManyToOneMapping.isOptional()); assertEquals("test.Address", ormManyToOneMapping.getDefaultTargetEntity()); - assertFalse(ormManyToOneMapping.getRelationship().getJoinColumnStrategy().specifiedJoinColumns().hasNext()); + assertFalse(ormManyToOneMapping.getRelationship().getJoinColumnStrategy().getSpecifiedJoinColumns().iterator().hasNext()); //TODO default join columns for specified xmlManyToOne mapping // XmlJoinColumn ormJoinColumn = ormManyToOneMapping.defaultJoinColumns().next(); diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmOneToManyMappingTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmOneToManyMappingTests.java index fac4c2686e..052359241c 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmOneToManyMappingTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmOneToManyMappingTests.java @@ -12,7 +12,6 @@ package org.eclipse.jpt.jpa.core.tests.internal.context.orm; import java.util.Iterator; import org.eclipse.jdt.core.ICompilationUnit; 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; import org.eclipse.jpt.jpa.core.JptJpaCorePlugin; import org.eclipse.jpt.jpa.core.MappingKeys; @@ -104,7 +103,7 @@ public class OrmOneToManyMappingTests extends ContextModelTestCase } }); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - for (OrmReadOnlyPersistentAttribute each : CollectionTools.iterable(ormPersistentType.attributes())) { + for (OrmReadOnlyPersistentAttribute each :ormPersistentType.getAttributes()) { each.convertToSpecified(); } } @@ -662,8 +661,8 @@ public class OrmOneToManyMappingTests extends ContextModelTestCase assertFalse(oneToManyMapping.isDefault()); ormPersistentAttribute.setMappingKey(MappingKeys.ID_ATTRIBUTE_MAPPING_KEY); - assertEquals(1, ormPersistentType.specifiedAttributesSize()); - assertEquals(ormPersistentAttribute, ormPersistentType.specifiedAttributes().next()); + assertEquals(1, ormPersistentType.getSpecifiedAttributesSize()); + assertEquals(ormPersistentAttribute, ormPersistentType.getSpecifiedAttributes().iterator().next()); assertTrue(ormPersistentAttribute.getMapping() instanceof IdMapping); assertEquals("oneToMany", ormPersistentAttribute.getMapping().getName()); } @@ -688,8 +687,8 @@ public class OrmOneToManyMappingTests extends ContextModelTestCase assertFalse(oneToManyMapping.isDefault()); ormPersistentAttribute.setMappingKey(MappingKeys.VERSION_ATTRIBUTE_MAPPING_KEY); - assertEquals(1, ormPersistentType.specifiedAttributesSize()); - assertEquals(ormPersistentAttribute, ormPersistentType.specifiedAttributes().next()); + assertEquals(1, ormPersistentType.getSpecifiedAttributesSize()); + assertEquals(ormPersistentAttribute, ormPersistentType.getSpecifiedAttributes().iterator().next()); assertTrue(ormPersistentAttribute.getMapping() instanceof VersionMapping); assertEquals("oneToMany", ormPersistentAttribute.getMapping().getName()); } @@ -708,8 +707,8 @@ public class OrmOneToManyMappingTests extends ContextModelTestCase assertFalse(oneToManyMapping.isDefault()); ormPersistentAttribute.setMappingKey(MappingKeys.TRANSIENT_ATTRIBUTE_MAPPING_KEY); - assertEquals(1, ormPersistentType.specifiedAttributesSize()); - assertEquals(ormPersistentAttribute, ormPersistentType.specifiedAttributes().next()); + assertEquals(1, ormPersistentType.getSpecifiedAttributesSize()); + assertEquals(ormPersistentAttribute, ormPersistentType.getSpecifiedAttributes().iterator().next()); assertTrue(ormPersistentAttribute.getMapping() instanceof TransientMapping); assertEquals("oneToMany", ormPersistentAttribute.getMapping().getName()); } @@ -734,8 +733,8 @@ public class OrmOneToManyMappingTests extends ContextModelTestCase assertFalse(oneToManyMapping.isDefault()); ormPersistentAttribute.setMappingKey(MappingKeys.EMBEDDED_ATTRIBUTE_MAPPING_KEY); - assertEquals(1, ormPersistentType.specifiedAttributesSize()); - assertEquals(ormPersistentAttribute, ormPersistentType.specifiedAttributes().next()); + assertEquals(1, ormPersistentType.getSpecifiedAttributesSize()); + assertEquals(ormPersistentAttribute, ormPersistentType.getSpecifiedAttributes().iterator().next()); assertTrue(ormPersistentAttribute.getMapping() instanceof EmbeddedMapping); assertEquals("oneToMany", ormPersistentAttribute.getMapping().getName()); } @@ -754,8 +753,8 @@ public class OrmOneToManyMappingTests extends ContextModelTestCase assertFalse(oneToManyMapping.isDefault()); ormPersistentAttribute.setMappingKey(MappingKeys.EMBEDDED_ID_ATTRIBUTE_MAPPING_KEY); - assertEquals(1, ormPersistentType.specifiedAttributesSize()); - assertEquals(ormPersistentAttribute, ormPersistentType.specifiedAttributes().next()); + assertEquals(1, ormPersistentType.getSpecifiedAttributesSize()); + assertEquals(ormPersistentAttribute, ormPersistentType.getSpecifiedAttributes().iterator().next()); assertTrue(ormPersistentAttribute.getMapping() instanceof EmbeddedIdMapping); assertEquals("oneToMany", ormPersistentAttribute.getMapping().getName()); } @@ -779,8 +778,8 @@ public class OrmOneToManyMappingTests extends ContextModelTestCase assertFalse(oneToManyMapping.isDefault()); ormPersistentAttribute.setMappingKey(MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY); - assertEquals(1, ormPersistentType.specifiedAttributesSize()); - assertEquals(ormPersistentAttribute, ormPersistentType.specifiedAttributes().next()); + assertEquals(1, ormPersistentType.getSpecifiedAttributesSize()); + assertEquals(ormPersistentAttribute, ormPersistentType.getSpecifiedAttributes().iterator().next()); assertTrue(ormPersistentAttribute.getMapping() instanceof OneToOneMapping); assertEquals("oneToMany", ormPersistentAttribute.getMapping().getName()); assertEquals(FetchType.EAGER, ((OneToOneMapping) ormPersistentAttribute.getMapping()).getSpecifiedFetch()); @@ -818,8 +817,8 @@ public class OrmOneToManyMappingTests extends ContextModelTestCase assertFalse(oneToManyMapping.isDefault()); ormPersistentAttribute.setMappingKey(MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); - assertEquals(1, ormPersistentType.specifiedAttributesSize()); - assertEquals(ormPersistentAttribute, ormPersistentType.specifiedAttributes().next()); + assertEquals(1, ormPersistentType.getSpecifiedAttributesSize()); + assertEquals(ormPersistentAttribute, ormPersistentType.getSpecifiedAttributes().iterator().next()); assertTrue(ormPersistentAttribute.getMapping() instanceof ManyToManyMapping); assertEquals("oneToMany", ormPersistentAttribute.getMapping().getName()); assertEquals(FetchType.EAGER, ((ManyToManyMapping) ormPersistentAttribute.getMapping()).getSpecifiedFetch()); @@ -831,10 +830,10 @@ public class OrmOneToManyMappingTests extends ContextModelTestCase assertTrue(((ManyToManyMapping) ormPersistentAttribute.getMapping()).getCascade().isRemove()); JoinTable joinTable = ((ManyToManyMapping) ormPersistentAttribute.getMapping()).getRelationship().getJoinTableStrategy().getJoinTable(); assertEquals("MY_JOIN_TABLE", joinTable.getName()); - assertEquals("name", joinTable.joinColumns().next().getSpecifiedName()); - assertEquals("referenceName", joinTable.joinColumns().next().getSpecifiedReferencedColumnName()); - assertEquals("inverseName", joinTable.inverseJoinColumns().next().getSpecifiedName()); - assertEquals("inverseReferenceName", joinTable.inverseJoinColumns().next().getSpecifiedReferencedColumnName()); + assertEquals("name", joinTable.getJoinColumns().iterator().next().getSpecifiedName()); + assertEquals("referenceName", joinTable.getJoinColumns().iterator().next().getSpecifiedReferencedColumnName()); + assertEquals("inverseName", joinTable.getInverseJoinColumns().iterator().next().getSpecifiedName()); + assertEquals("inverseReferenceName", joinTable.getInverseJoinColumns().iterator().next().getSpecifiedReferencedColumnName()); } public void testOneToManyMorphToManyToOneMapping() throws Exception { @@ -856,8 +855,8 @@ public class OrmOneToManyMappingTests extends ContextModelTestCase assertFalse(oneToManyMapping.isDefault()); ormPersistentAttribute.setMappingKey(MappingKeys.MANY_TO_ONE_ATTRIBUTE_MAPPING_KEY); - assertEquals(1, ormPersistentType.specifiedAttributesSize()); - assertEquals(ormPersistentAttribute, ormPersistentType.specifiedAttributes().next()); + assertEquals(1, ormPersistentType.getSpecifiedAttributesSize()); + assertEquals(ormPersistentAttribute, ormPersistentType.getSpecifiedAttributes().iterator().next()); assertTrue(ormPersistentAttribute.getMapping() instanceof ManyToOneMapping); assertEquals("oneToMany", ormPersistentAttribute.getMapping().getName()); assertEquals(FetchType.EAGER, ((ManyToOneMapping) ormPersistentAttribute.getMapping()).getSpecifiedFetch()); @@ -888,8 +887,8 @@ public class OrmOneToManyMappingTests extends ContextModelTestCase assertFalse(oneToManyMapping.isDefault()); ormPersistentAttribute.setMappingKey(MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY); - assertEquals(1, ormPersistentType.specifiedAttributesSize()); - assertEquals(ormPersistentAttribute, ormPersistentType.specifiedAttributes().next()); + assertEquals(1, ormPersistentType.getSpecifiedAttributesSize()); + assertEquals(ormPersistentAttribute, ormPersistentType.getSpecifiedAttributes().iterator().next()); assertTrue(ormPersistentAttribute.getMapping() instanceof BasicMapping); assertEquals("oneToMany", ormPersistentAttribute.getMapping().getName()); //TODO assertEquals(FetchType.EAGER, ((IBasicMapping) ormPersistentAttribute.getMapping()).getSpecifiedFetch()); @@ -908,7 +907,7 @@ public class OrmOneToManyMappingTests extends ContextModelTestCase addXmlClassRef(PACKAGE_NAME + ".Address"); addXmlClassRef(PACKAGE_NAME + ".State"); - ReadOnlyPersistentAttribute persistentAttribute = ormPersistentType.attributes().next(); + ReadOnlyPersistentAttribute persistentAttribute = ormPersistentType.getAttributes().iterator().next(); OneToManyMapping oneToManyMapping = (OneToManyMapping) persistentAttribute.getMapping(); Iterator attributeNames = @@ -1003,8 +1002,8 @@ public class OrmOneToManyMappingTests extends ContextModelTestCase OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, PACKAGE_NAME + ".Address"); - assertEquals(3, ormPersistentType.virtualAttributesSize()); - OrmReadOnlyPersistentAttribute virtualPersistentAttribute = ormPersistentType.virtualAttributes().next(); + assertEquals(3, ormPersistentType.getVirtualAttributesSize()); + OrmReadOnlyPersistentAttribute virtualPersistentAttribute = ormPersistentType.getVirtualAttributes().iterator().next(); OneToManyMapping virtualOneToManyMapping = (OneToManyMapping) virtualPersistentAttribute.getMapping(); assertEquals("address", virtualOneToManyMapping.getName()); @@ -1031,7 +1030,7 @@ public class OrmOneToManyMappingTests extends ContextModelTestCase OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, PACKAGE_NAME + ".Address"); ormPersistentType.getMapping().setSpecifiedMetadataComplete(Boolean.TRUE); - assertEquals(3, ormPersistentType.virtualAttributesSize()); + assertEquals(3, ormPersistentType.getVirtualAttributesSize()); OrmReadOnlyPersistentAttribute virtualPersistentAttribute = ormPersistentType.getAttributeNamed("address"); assertEquals(MappingKeys.NULL_ATTRIBUTE_MAPPING_KEY, virtualPersistentAttribute.getMappingKey()); diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmOneToOneMappingTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmOneToOneMappingTests.java index c5e11ee06d..ad11571e15 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmOneToOneMappingTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmOneToOneMappingTests.java @@ -13,7 +13,6 @@ import java.util.Iterator; import java.util.ListIterator; import org.eclipse.jdt.core.ICompilationUnit; 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; import org.eclipse.jpt.jpa.core.JptJpaCorePlugin; import org.eclipse.jpt.jpa.core.MappingKeys; @@ -108,7 +107,7 @@ public class OrmOneToOneMappingTests extends ContextModelTestCase } }); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - for (OrmReadOnlyPersistentAttribute each : CollectionTools.iterable(ormPersistentType.attributes())) { + for (OrmReadOnlyPersistentAttribute each : ormPersistentType.getAttributes()) { each.convertToSpecified(); } } @@ -546,12 +545,12 @@ public class OrmOneToOneMappingTests extends ContextModelTestCase assertEquals("BAZ", oneToOneResource.getJoinColumns().get(1).getName()); assertEquals("FOO", oneToOneResource.getJoinColumns().get(2).getName()); - ListIterator joinColumns = strategy.specifiedJoinColumns(); + ListIterator joinColumns = strategy.getSpecifiedJoinColumns().iterator(); assertEquals(joinColumn2, joinColumns.next()); assertEquals(joinColumn3, joinColumns.next()); assertEquals(joinColumn, joinColumns.next()); - joinColumns = strategy.specifiedJoinColumns(); + joinColumns = strategy.getSpecifiedJoinColumns().iterator(); assertEquals("BAR", joinColumns.next().getName()); assertEquals("BAZ", joinColumns.next().getName()); assertEquals("FOO", joinColumns.next().getName()); @@ -598,7 +597,7 @@ public class OrmOneToOneMappingTests extends ContextModelTestCase strategy.moveSpecifiedJoinColumn(2, 0); - ListIterator joinColumns = strategy.specifiedJoinColumns(); + ListIterator joinColumns = strategy.getSpecifiedJoinColumns().iterator(); assertEquals("BAR", joinColumns.next().getName()); assertEquals("BAZ", joinColumns.next().getName()); assertEquals("FOO", joinColumns.next().getName()); @@ -609,7 +608,7 @@ public class OrmOneToOneMappingTests extends ContextModelTestCase strategy.moveSpecifiedJoinColumn(0, 1); - joinColumns = strategy.specifiedJoinColumns(); + joinColumns = strategy.getSpecifiedJoinColumns().iterator(); assertEquals("BAZ", joinColumns.next().getName()); assertEquals("BAR", joinColumns.next().getName()); assertEquals("FOO", joinColumns.next().getName()); @@ -626,9 +625,9 @@ public class OrmOneToOneMappingTests extends ContextModelTestCase OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, PACKAGE_NAME + ".Address"); ormPersistentType.addSpecifiedAttribute(MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY, "foo"); - assertEquals(3, ormPersistentType.virtualAttributesSize()); + assertEquals(3, ormPersistentType.getVirtualAttributesSize()); - OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.specifiedAttributes().next(); + OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.getSpecifiedAttributes().iterator().next(); OrmOneToOneMapping ormOneToOneMapping = (OrmOneToOneMapping) ormPersistentAttribute.getMapping(); assertEquals("foo", ormOneToOneMapping.getName()); @@ -641,7 +640,7 @@ public class OrmOneToOneMappingTests extends ContextModelTestCase assertNull(ormOneToOneMapping.getTargetEntity()); - assertTrue(ormOneToOneMapping.getRelationship().getJoinColumnStrategy().joinColumnsSize() > 0); + assertTrue(ormOneToOneMapping.getRelationship().getJoinColumnStrategy().getJoinColumnsSize() > 0); //TODO default joinColumns //assertTrue(ormOneToOneMapping.defaultJoinColumns().hasNext()); @@ -661,8 +660,8 @@ public class OrmOneToOneMappingTests extends ContextModelTestCase OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, PACKAGE_NAME + ".Address"); - assertEquals(3, ormPersistentType.virtualAttributesSize()); - OrmReadOnlyPersistentAttribute ormPersistentAttribute = ormPersistentType.virtualAttributes().next(); + assertEquals(3, ormPersistentType.getVirtualAttributesSize()); + OrmReadOnlyPersistentAttribute ormPersistentAttribute = ormPersistentType.getVirtualAttributes().iterator().next(); OneToOneMapping oneToOneMapping = (OneToOneMapping) ormPersistentAttribute.getMapping(); assertEquals("address", oneToOneMapping.getName()); @@ -673,7 +672,7 @@ public class OrmOneToOneMappingTests extends ContextModelTestCase getMappedByStrategy().getMappedByAttribute()); JoinColumn joinColumn = - oneToOneMapping.getRelationship().getJoinColumnStrategy().specifiedJoinColumns().next(); + oneToOneMapping.getRelationship().getJoinColumnStrategy().getSpecifiedJoinColumns().iterator().next(); assertEquals("MY_COLUMN", joinColumn.getSpecifiedName()); assertEquals("MY_REFERENCED_COLUMN", joinColumn.getSpecifiedReferencedColumnName()); assertEquals(Boolean.TRUE, joinColumn.getSpecifiedUnique()); @@ -698,14 +697,14 @@ public class OrmOneToOneMappingTests extends ContextModelTestCase OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, PACKAGE_NAME + ".Address"); ormPersistentType.getMapping().setSpecifiedMetadataComplete(Boolean.TRUE); - assertEquals(3, ormPersistentType.virtualAttributesSize()); + assertEquals(3, ormPersistentType.getVirtualAttributesSize()); OrmReadOnlyPersistentAttribute ormPersistentAttribute = ormPersistentType.getAttributeNamed("address"); assertEquals(MappingKeys.NULL_ATTRIBUTE_MAPPING_KEY, ormPersistentAttribute.getMappingKey()); assertTrue(ormPersistentAttribute.isVirtual()); ormPersistentAttribute.convertToSpecified(MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY); - ormPersistentAttribute= ormPersistentType.specifiedAttributes().next(); + ormPersistentAttribute= ormPersistentType.getSpecifiedAttributes().iterator().next(); OrmOneToOneMapping ormOneToOneMapping = (OrmOneToOneMapping) ormPersistentAttribute.getMapping(); assertEquals("address", ormOneToOneMapping.getName()); @@ -742,9 +741,9 @@ public class OrmOneToOneMappingTests extends ContextModelTestCase getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, PACKAGE_NAME + ".Address"); ormPersistentType.addSpecifiedAttribute(MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY, "address"); - assertEquals(2, ormPersistentType.virtualAttributesSize()); + assertEquals(2, ormPersistentType.getVirtualAttributesSize()); - OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.specifiedAttributes().next(); + OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.getSpecifiedAttributes().iterator().next(); OrmOneToOneMapping ormOneToOneMapping = (OrmOneToOneMapping) ormPersistentAttribute.getMapping(); assertEquals("address", ormOneToOneMapping.getName()); @@ -757,7 +756,7 @@ public class OrmOneToOneMappingTests extends ContextModelTestCase //TODO default target entity in xml //assertEquals("test.Address", ormOneToOneMapping.getDefaultTargetEntity()); - assertTrue(ormOneToOneMapping.getRelationship().getJoinColumnStrategy().joinColumnsSize() > 0); + assertTrue(ormOneToOneMapping.getRelationship().getJoinColumnStrategy().getJoinColumnsSize() > 0); //TODO default join columns for specified xmlOneToOne mapping // XmlJoinColumn ormJoinColumn = ormOneToOneMapping.defaultJoinColumns().next(); @@ -808,8 +807,8 @@ public class OrmOneToOneMappingTests extends ContextModelTestCase assertFalse(oneToOneMapping.isDefault()); ormPersistentAttribute.setMappingKey(MappingKeys.ID_ATTRIBUTE_MAPPING_KEY); - assertEquals(1, ormPersistentType.specifiedAttributesSize()); - assertEquals(ormPersistentAttribute, ormPersistentType.specifiedAttributes().next()); + assertEquals(1, ormPersistentType.getSpecifiedAttributesSize()); + assertEquals(ormPersistentAttribute, ormPersistentType.getSpecifiedAttributes().iterator().next()); assertTrue(ormPersistentAttribute.getMapping() instanceof IdMapping); assertEquals("oneToOne", ormPersistentAttribute.getMapping().getName()); } @@ -834,8 +833,8 @@ public class OrmOneToOneMappingTests extends ContextModelTestCase assertFalse(oneToOneMapping.isDefault()); ormPersistentAttribute.setMappingKey(MappingKeys.VERSION_ATTRIBUTE_MAPPING_KEY); - assertEquals(1, ormPersistentType.specifiedAttributesSize()); - assertEquals(ormPersistentAttribute, ormPersistentType.specifiedAttributes().next()); + assertEquals(1, ormPersistentType.getSpecifiedAttributesSize()); + assertEquals(ormPersistentAttribute, ormPersistentType.getSpecifiedAttributes().iterator().next()); assertTrue(ormPersistentAttribute.getMapping() instanceof VersionMapping); assertEquals("oneToOne", ormPersistentAttribute.getMapping().getName()); } @@ -860,8 +859,8 @@ public class OrmOneToOneMappingTests extends ContextModelTestCase assertFalse(oneToOneMapping.isDefault()); ormPersistentAttribute.setMappingKey(MappingKeys.TRANSIENT_ATTRIBUTE_MAPPING_KEY); - assertEquals(1, ormPersistentType.specifiedAttributesSize()); - assertEquals(ormPersistentAttribute, ormPersistentType.specifiedAttributes().next()); + assertEquals(1, ormPersistentType.getSpecifiedAttributesSize()); + assertEquals(ormPersistentAttribute, ormPersistentType.getSpecifiedAttributes().iterator().next()); assertTrue(ormPersistentAttribute.getMapping() instanceof TransientMapping); assertEquals("oneToOne", ormPersistentAttribute.getMapping().getName()); } @@ -886,8 +885,8 @@ public class OrmOneToOneMappingTests extends ContextModelTestCase assertFalse(oneToOneMapping.isDefault()); ormPersistentAttribute.setMappingKey(MappingKeys.EMBEDDED_ATTRIBUTE_MAPPING_KEY); - assertEquals(1, ormPersistentType.specifiedAttributesSize()); - assertEquals(ormPersistentAttribute, ormPersistentType.specifiedAttributes().next()); + assertEquals(1, ormPersistentType.getSpecifiedAttributesSize()); + assertEquals(ormPersistentAttribute, ormPersistentType.getSpecifiedAttributes().iterator().next()); assertTrue(ormPersistentAttribute.getMapping() instanceof EmbeddedMapping); assertEquals("oneToOne", ormPersistentAttribute.getMapping().getName()); } @@ -912,8 +911,8 @@ public class OrmOneToOneMappingTests extends ContextModelTestCase assertFalse(oneToOneMapping.isDefault()); ormPersistentAttribute.setMappingKey(MappingKeys.EMBEDDED_ID_ATTRIBUTE_MAPPING_KEY); - assertEquals(1, ormPersistentType.specifiedAttributesSize()); - assertEquals(ormPersistentAttribute, ormPersistentType.specifiedAttributes().next()); + assertEquals(1, ormPersistentType.getSpecifiedAttributesSize()); + assertEquals(ormPersistentAttribute, ormPersistentType.getSpecifiedAttributes().iterator().next()); assertTrue(ormPersistentAttribute.getMapping() instanceof EmbeddedIdMapping); assertEquals("oneToOne", ormPersistentAttribute.getMapping().getName()); } @@ -938,8 +937,8 @@ public class OrmOneToOneMappingTests extends ContextModelTestCase assertFalse(oneToOneMapping.isDefault()); ormPersistentAttribute.setMappingKey(MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); - assertEquals(1, ormPersistentType.specifiedAttributesSize()); - assertEquals(ormPersistentAttribute, ormPersistentType.specifiedAttributes().next()); + assertEquals(1, ormPersistentType.getSpecifiedAttributesSize()); + assertEquals(ormPersistentAttribute, ormPersistentType.getSpecifiedAttributes().iterator().next()); assertTrue(ormPersistentAttribute.getMapping() instanceof ManyToManyMapping); assertEquals("oneToOne", ormPersistentAttribute.getMapping().getName()); assertEquals(FetchType.EAGER, ((ManyToManyMapping) ormPersistentAttribute.getMapping()).getSpecifiedFetch()); @@ -972,8 +971,8 @@ public class OrmOneToOneMappingTests extends ContextModelTestCase assertFalse(oneToOneMapping.isDefault()); ormPersistentAttribute.setMappingKey(MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY); - assertEquals(1, ormPersistentType.specifiedAttributesSize()); - assertEquals(ormPersistentAttribute, ormPersistentType.specifiedAttributes().next()); + assertEquals(1, ormPersistentType.getSpecifiedAttributesSize()); + assertEquals(ormPersistentAttribute, ormPersistentType.getSpecifiedAttributes().iterator().next()); assertTrue(ormPersistentAttribute.getMapping() instanceof OneToManyMapping); assertEquals("oneToOne", ormPersistentAttribute.getMapping().getName()); assertEquals(FetchType.EAGER, ((OneToManyMapping) ormPersistentAttribute.getMapping()).getSpecifiedFetch()); @@ -1006,8 +1005,8 @@ public class OrmOneToOneMappingTests extends ContextModelTestCase assertFalse(oneToOneMapping.isDefault()); ormPersistentAttribute.setMappingKey(MappingKeys.MANY_TO_ONE_ATTRIBUTE_MAPPING_KEY); - assertEquals(1, ormPersistentType.specifiedAttributesSize()); - assertEquals(ormPersistentAttribute, ormPersistentType.specifiedAttributes().next()); + assertEquals(1, ormPersistentType.getSpecifiedAttributesSize()); + assertEquals(ormPersistentAttribute, ormPersistentType.getSpecifiedAttributes().iterator().next()); assertTrue(ormPersistentAttribute.getMapping() instanceof ManyToOneMapping); assertEquals("oneToOne", ormPersistentAttribute.getMapping().getName()); assertEquals(FetchType.EAGER, ((ManyToOneMapping) ormPersistentAttribute.getMapping()).getSpecifiedFetch()); @@ -1018,7 +1017,7 @@ public class OrmOneToOneMappingTests extends ContextModelTestCase assertTrue(((ManyToOneMapping) ormPersistentAttribute.getMapping()).getCascade().isRefresh()); assertTrue(((ManyToOneMapping) ormPersistentAttribute.getMapping()).getCascade().isRemove()); - joinColumn = ((ManyToOneMapping) ormPersistentAttribute.getMapping()).getRelationship().getJoinColumnStrategy().specifiedJoinColumns().next(); + joinColumn = ((ManyToOneMapping) ormPersistentAttribute.getMapping()).getRelationship().getJoinColumnStrategy().getSpecifiedJoinColumns().iterator().next(); assertEquals("name", joinColumn.getName()); assertEquals("referenceName", joinColumn.getReferencedColumnName()); } @@ -1043,8 +1042,8 @@ public class OrmOneToOneMappingTests extends ContextModelTestCase assertFalse(oneToOneMapping.isDefault()); ormPersistentAttribute.setMappingKey(MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY); - assertEquals(1, ormPersistentType.specifiedAttributesSize()); - assertEquals(ormPersistentAttribute, ormPersistentType.specifiedAttributes().next()); + assertEquals(1, ormPersistentType.getSpecifiedAttributesSize()); + assertEquals(ormPersistentAttribute, ormPersistentType.getSpecifiedAttributes().iterator().next()); assertTrue(ormPersistentAttribute.getMapping() instanceof BasicMapping); assertEquals("oneToOne", ormPersistentAttribute.getMapping().getName()); //TODO assertEquals(FetchType.EAGER, ((IBasicMapping) ormPersistentAttribute.getMapping()).getSpecifiedFetch()); @@ -1079,12 +1078,12 @@ public class OrmOneToOneMappingTests extends ContextModelTestCase assertEquals("BAZ", oneToOneResource.getPrimaryKeyJoinColumns().get(1).getName()); assertEquals("FOO", oneToOneResource.getPrimaryKeyJoinColumns().get(2).getName()); - ListIterator joinColumns = strategy.primaryKeyJoinColumns(); + ListIterator joinColumns = strategy.getPrimaryKeyJoinColumns().iterator(); assertEquals(joinColumn2, joinColumns.next()); assertEquals(joinColumn3, joinColumns.next()); assertEquals(joinColumn, joinColumns.next()); - joinColumns = strategy.primaryKeyJoinColumns(); + joinColumns = strategy.getPrimaryKeyJoinColumns().iterator(); assertEquals("BAR", joinColumns.next().getName()); assertEquals("BAZ", joinColumns.next().getName()); assertEquals("FOO", joinColumns.next().getName()); @@ -1131,7 +1130,7 @@ public class OrmOneToOneMappingTests extends ContextModelTestCase strategy.movePrimaryKeyJoinColumn(2, 0); - ListIterator joinColumns = strategy.primaryKeyJoinColumns(); + ListIterator joinColumns = strategy.getPrimaryKeyJoinColumns().iterator(); assertEquals("BAR", joinColumns.next().getName()); assertEquals("BAZ", joinColumns.next().getName()); assertEquals("FOO", joinColumns.next().getName()); @@ -1142,7 +1141,7 @@ public class OrmOneToOneMappingTests extends ContextModelTestCase strategy.movePrimaryKeyJoinColumn(0, 1); - joinColumns = strategy.primaryKeyJoinColumns(); + joinColumns = strategy.getPrimaryKeyJoinColumns().iterator(); assertEquals("BAZ", joinColumns.next().getName()); assertEquals("BAR", joinColumns.next().getName()); assertEquals("FOO", joinColumns.next().getName()); @@ -1165,7 +1164,7 @@ public class OrmOneToOneMappingTests extends ContextModelTestCase addXmlClassRef(PACKAGE_NAME + ".Address"); addXmlClassRef(PACKAGE_NAME + ".State"); - ReadOnlyPersistentAttribute persistentAttribute = ormPersistentType.attributes().next(); + ReadOnlyPersistentAttribute persistentAttribute = ormPersistentType.getAttributes().iterator().next(); OneToOneMapping oneToOneMapping = (OneToOneMapping) persistentAttribute.getMapping(); Iterator attributeNames = diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmPrimaryKeyJoinColumnTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmPrimaryKeyJoinColumnTests.java index 52d1dd9420..429125de57 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmPrimaryKeyJoinColumnTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmPrimaryKeyJoinColumnTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2010 Oracle. All rights reserved. + * Copyright (c) 2007, 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. @@ -62,7 +62,7 @@ public class OrmPrimaryKeyJoinColumnTests extends ContextModelTestCase assertEquals("FOO", primaryKeyJoinColumnResource.getName()); entityResource.getPrimaryKeyJoinColumns().remove(0); - assertFalse(ormEntity.specifiedPrimaryKeyJoinColumns().hasNext()); + assertFalse(ormEntity.getSpecifiedPrimaryKeyJoinColumns().iterator().hasNext()); assertTrue(entityResource.getPrimaryKeyJoinColumns().isEmpty()); } @@ -114,7 +114,7 @@ public class OrmPrimaryKeyJoinColumnTests extends ContextModelTestCase assertEquals("FOO", primaryKeyJoinColumnResource.getReferencedColumnName()); entityResource.getPrimaryKeyJoinColumns().remove(0); - assertFalse(ormEntity.specifiedPrimaryKeyJoinColumns().hasNext()); + assertFalse(ormEntity.getSpecifiedPrimaryKeyJoinColumns().iterator().hasNext()); assertTrue(entityResource.getPrimaryKeyJoinColumns().isEmpty()); } @@ -223,7 +223,7 @@ public class OrmPrimaryKeyJoinColumnTests extends ContextModelTestCase assertEquals("FOO", primaryKeyJoinColumnResource.getColumnDefinition()); entityResource.getPrimaryKeyJoinColumns().remove(0); - assertFalse(ormEntity.specifiedPrimaryKeyJoinColumns().hasNext()); + assertFalse(ormEntity.getSpecifiedPrimaryKeyJoinColumns().iterator().hasNext()); assertTrue(entityResource.getPrimaryKeyJoinColumns().isEmpty()); } diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmSecondaryTableTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmSecondaryTableTests.java index e43cb0399f..f9c29b218a 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmSecondaryTableTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmSecondaryTableTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2010 Oracle. All rights reserved. + * Copyright (c) 2007, 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. @@ -98,7 +98,7 @@ public class OrmSecondaryTableTests extends ContextModelTestCase //set name in the resource model, verify context model updated entityResource.getSecondaryTables().add(OrmFactory.eINSTANCE.createXmlSecondaryTable()); entityResource.getSecondaryTables().get(0).setName("FOO"); - OrmSecondaryTable secondaryTable = ormEntity.specifiedSecondaryTables().next(); + OrmSecondaryTable secondaryTable = ormEntity.getSpecifiedSecondaryTables().iterator().next(); assertEquals("FOO", secondaryTable.getSpecifiedName()); assertEquals("FOO", entityResource.getSecondaryTables().get(0).getName()); @@ -108,7 +108,7 @@ public class OrmSecondaryTableTests extends ContextModelTestCase assertNull(entityResource.getSecondaryTables().get(0).getName()); entityResource.getSecondaryTables().remove(0); - assertFalse(ormEntity.specifiedSecondaryTables().hasNext()); + assertFalse(ormEntity.getSpecifiedSecondaryTables().iterator().hasNext()); assertEquals(0, entityResource.getSecondaryTables().size()); } @@ -130,7 +130,7 @@ public class OrmSecondaryTableTests extends ContextModelTestCase assertNull(entityResource.getSecondaryTables().get(0).getName()); ormEntity.removeSpecifiedSecondaryTable(0); - assertFalse(ormEntity.specifiedSecondaryTables().hasNext()); + assertFalse(ormEntity.getSpecifiedSecondaryTables().iterator().hasNext()); assertEquals(0, entityResource.getSecondaryTables().size()); } @@ -142,15 +142,15 @@ public class OrmSecondaryTableTests extends ContextModelTestCase ormEntity.getJavaTypeMapping().addSpecifiedSecondaryTable(0).setSpecifiedName("FOO"); - ReadOnlySecondaryTable ormSecondaryTable = ormEntity.virtualSecondaryTables().next(); + ReadOnlySecondaryTable ormSecondaryTable = ormEntity.getVirtualSecondaryTables().iterator().next(); assertEquals("FOO", ormSecondaryTable.getSpecifiedName()); - ormEntity.getJavaTypeMapping().specifiedSecondaryTables().next().setSpecifiedName("BAZ"); + ormEntity.getJavaTypeMapping().getSpecifiedSecondaryTables().iterator().next().setSpecifiedName("BAZ"); assertEquals("BAZ", ormSecondaryTable.getSpecifiedName()); ormEntity.setSecondaryTablesAreDefinedInXml(true); - assertNull(ormEntity.specifiedSecondaryTables().next().getDefaultName()); - assertEquals("BAZ", ormEntity.specifiedSecondaryTables().next().getSpecifiedName()); + assertNull(ormEntity.getSpecifiedSecondaryTables().iterator().next().getDefaultName()); + assertEquals("BAZ", ormEntity.getSpecifiedSecondaryTables().iterator().next().getSpecifiedName()); } @@ -162,7 +162,7 @@ public class OrmSecondaryTableTests extends ContextModelTestCase //set schema in the resource model, verify context model updated entityResource.getSecondaryTables().add(OrmFactory.eINSTANCE.createXmlSecondaryTable()); entityResource.getSecondaryTables().get(0).setSchema("FOO"); - OrmSecondaryTable secondaryTable = ormEntity.specifiedSecondaryTables().next(); + OrmSecondaryTable secondaryTable = ormEntity.getSpecifiedSecondaryTables().iterator().next(); assertEquals("FOO", secondaryTable.getSpecifiedSchema()); assertEquals("FOO", entityResource.getSecondaryTables().get(0).getSchema()); @@ -172,7 +172,7 @@ public class OrmSecondaryTableTests extends ContextModelTestCase assertNull(entityResource.getSecondaryTables().get(0).getSchema()); entityResource.getSecondaryTables().remove(0); - assertFalse(ormEntity.specifiedSecondaryTables().hasNext()); + assertFalse(ormEntity.getSpecifiedSecondaryTables().iterator().hasNext()); assertEquals(0, entityResource.getSecondaryTables().size()); } @@ -194,7 +194,7 @@ public class OrmSecondaryTableTests extends ContextModelTestCase assertNull(entityResource.getSecondaryTables().get(0).getSchema()); ormEntity.removeSpecifiedSecondaryTable(0); - assertFalse(ormEntity.specifiedSecondaryTables().hasNext()); + assertFalse(ormEntity.getSpecifiedSecondaryTables().iterator().hasNext()); assertEquals(0, entityResource.getSecondaryTables().size()); } @@ -209,7 +209,7 @@ public class OrmSecondaryTableTests extends ContextModelTestCase javaSecondaryTable.setSpecifiedName("FOO"); javaSecondaryTable.setSpecifiedSchema("BAR"); - OrmVirtualSecondaryTable ormSecondaryTable = ormEntity.virtualSecondaryTables().next(); + OrmVirtualSecondaryTable ormSecondaryTable = ormEntity.getVirtualSecondaryTables().iterator().next(); assertEquals("BAR", ormSecondaryTable.getSpecifiedSchema()); javaSecondaryTable.setSpecifiedSchema("BAZ"); @@ -217,8 +217,8 @@ public class OrmSecondaryTableTests extends ContextModelTestCase ormEntity.setSecondaryTablesAreDefinedInXml(true); - assertNull(ormEntity.specifiedSecondaryTables().next().getDefaultSchema()); - assertEquals("BAZ", ormEntity.specifiedSecondaryTables().next().getSpecifiedSchema()); + assertNull(ormEntity.getSpecifiedSecondaryTables().iterator().next().getDefaultSchema()); + assertEquals("BAZ", ormEntity.getSpecifiedSecondaryTables().iterator().next().getSpecifiedSchema()); } public void testUpdateDefaultSchemaFromParent() throws Exception { @@ -277,7 +277,7 @@ public class OrmSecondaryTableTests extends ContextModelTestCase //set catalog in the resource model, verify context model updated entityResource.getSecondaryTables().add(OrmFactory.eINSTANCE.createXmlSecondaryTable()); entityResource.getSecondaryTables().get(0).setCatalog("FOO"); - OrmSecondaryTable secondaryTable = ormEntity.specifiedSecondaryTables().next(); + OrmSecondaryTable secondaryTable = ormEntity.getSpecifiedSecondaryTables().iterator().next(); assertEquals("FOO", secondaryTable.getSpecifiedCatalog()); assertEquals("FOO", entityResource.getSecondaryTables().get(0).getCatalog()); @@ -287,7 +287,7 @@ public class OrmSecondaryTableTests extends ContextModelTestCase assertNull(entityResource.getSecondaryTables().get(0).getCatalog()); entityResource.getSecondaryTables().remove(0); - assertFalse(ormEntity.specifiedSecondaryTables().hasNext()); + assertFalse(ormEntity.getSpecifiedSecondaryTables().iterator().hasNext()); assertEquals(0, entityResource.getSecondaryTables().size()); } @@ -309,7 +309,7 @@ public class OrmSecondaryTableTests extends ContextModelTestCase assertNull(entityResource.getSecondaryTables().get(0).getCatalog()); ormEntity.removeSpecifiedSecondaryTable(0); - assertFalse(ormEntity.specifiedSecondaryTables().hasNext()); + assertFalse(ormEntity.getSpecifiedSecondaryTables().iterator().hasNext()); assertEquals(0, entityResource.getSecondaryTables().size()); } @@ -324,15 +324,15 @@ public class OrmSecondaryTableTests extends ContextModelTestCase javaSecondaryTable.setSpecifiedName("FOO"); javaSecondaryTable.setSpecifiedCatalog("BAR"); - OrmVirtualSecondaryTable ormSecondaryTable = ormEntity.virtualSecondaryTables().next(); + OrmVirtualSecondaryTable ormSecondaryTable = ormEntity.getVirtualSecondaryTables().iterator().next(); assertEquals("BAR", ormSecondaryTable.getSpecifiedCatalog()); javaSecondaryTable.setSpecifiedCatalog("BAZ"); assertEquals("BAZ", ormSecondaryTable.getSpecifiedCatalog()); ormEntity.setSecondaryTablesAreDefinedInXml(true); - assertNull(ormEntity.specifiedSecondaryTables().next().getDefaultCatalog()); - assertEquals("BAZ", ormEntity.specifiedSecondaryTables().next().getSpecifiedCatalog()); + assertNull(ormEntity.getSpecifiedSecondaryTables().iterator().next().getDefaultCatalog()); + assertEquals("BAZ", ormEntity.getSpecifiedSecondaryTables().iterator().next().getSpecifiedCatalog()); } public void testUpdateDefaultCatalogFromPersistenceUnitDefaults() throws Exception { @@ -387,12 +387,12 @@ public class OrmSecondaryTableTests extends ContextModelTestCase assertEquals("BAZ", secondaryTableResource.getPrimaryKeyJoinColumns().get(1).getName()); assertEquals("FOO", secondaryTableResource.getPrimaryKeyJoinColumns().get(2).getName()); - ListIterator primaryKeyJoinColumns = ormSecondaryTable.specifiedPrimaryKeyJoinColumns(); + ListIterator primaryKeyJoinColumns = ormSecondaryTable.getSpecifiedPrimaryKeyJoinColumns().iterator(); assertEquals(primaryKeyJoinColumn2, primaryKeyJoinColumns.next()); assertEquals(primaryKeyJoinColumn3, primaryKeyJoinColumns.next()); assertEquals(primaryKeyJoinColumn, primaryKeyJoinColumns.next()); - primaryKeyJoinColumns = ormSecondaryTable.specifiedPrimaryKeyJoinColumns(); + primaryKeyJoinColumns = ormSecondaryTable.getSpecifiedPrimaryKeyJoinColumns().iterator(); assertEquals("BAR", primaryKeyJoinColumns.next().getName()); assertEquals("BAZ", primaryKeyJoinColumns.next().getName()); assertEquals("FOO", primaryKeyJoinColumns.next().getName()); @@ -439,7 +439,7 @@ public class OrmSecondaryTableTests extends ContextModelTestCase ormSecondaryTable.moveSpecifiedPrimaryKeyJoinColumn(2, 0); - ListIterator primaryKeyJoinColumns = ormSecondaryTable.specifiedPrimaryKeyJoinColumns(); + ListIterator primaryKeyJoinColumns = ormSecondaryTable.getSpecifiedPrimaryKeyJoinColumns().iterator(); assertEquals("BAR", primaryKeyJoinColumns.next().getName()); assertEquals("BAZ", primaryKeyJoinColumns.next().getName()); assertEquals("FOO", primaryKeyJoinColumns.next().getName()); @@ -450,7 +450,7 @@ public class OrmSecondaryTableTests extends ContextModelTestCase ormSecondaryTable.moveSpecifiedPrimaryKeyJoinColumn(0, 1); - primaryKeyJoinColumns = ormSecondaryTable.specifiedPrimaryKeyJoinColumns(); + primaryKeyJoinColumns = ormSecondaryTable.getSpecifiedPrimaryKeyJoinColumns().iterator(); assertEquals("BAZ", primaryKeyJoinColumns.next().getName()); assertEquals("BAR", primaryKeyJoinColumns.next().getName()); assertEquals("FOO", primaryKeyJoinColumns.next().getName()); @@ -475,39 +475,39 @@ public class OrmSecondaryTableTests extends ContextModelTestCase secondaryTableResource.getPrimaryKeyJoinColumns().get(1).setName("BAR"); secondaryTableResource.getPrimaryKeyJoinColumns().get(2).setName("BAZ"); - ListIterator primaryKeyJoinColumns = ormSecondaryTable.specifiedPrimaryKeyJoinColumns(); + ListIterator primaryKeyJoinColumns = ormSecondaryTable.getSpecifiedPrimaryKeyJoinColumns().iterator(); assertEquals("FOO", primaryKeyJoinColumns.next().getName()); assertEquals("BAR", primaryKeyJoinColumns.next().getName()); assertEquals("BAZ", primaryKeyJoinColumns.next().getName()); assertFalse(primaryKeyJoinColumns.hasNext()); secondaryTableResource.getPrimaryKeyJoinColumns().move(2, 0); - primaryKeyJoinColumns = ormSecondaryTable.specifiedPrimaryKeyJoinColumns(); + primaryKeyJoinColumns = ormSecondaryTable.getSpecifiedPrimaryKeyJoinColumns().iterator(); assertEquals("BAR", primaryKeyJoinColumns.next().getName()); assertEquals("BAZ", primaryKeyJoinColumns.next().getName()); assertEquals("FOO", primaryKeyJoinColumns.next().getName()); assertFalse(primaryKeyJoinColumns.hasNext()); secondaryTableResource.getPrimaryKeyJoinColumns().move(0, 1); - primaryKeyJoinColumns = ormSecondaryTable.specifiedPrimaryKeyJoinColumns(); + primaryKeyJoinColumns = ormSecondaryTable.getSpecifiedPrimaryKeyJoinColumns().iterator(); assertEquals("BAZ", primaryKeyJoinColumns.next().getName()); assertEquals("BAR", primaryKeyJoinColumns.next().getName()); assertEquals("FOO", primaryKeyJoinColumns.next().getName()); assertFalse(primaryKeyJoinColumns.hasNext()); secondaryTableResource.getPrimaryKeyJoinColumns().remove(1); - primaryKeyJoinColumns = ormSecondaryTable.specifiedPrimaryKeyJoinColumns(); + primaryKeyJoinColumns = ormSecondaryTable.getSpecifiedPrimaryKeyJoinColumns().iterator(); assertEquals("BAZ", primaryKeyJoinColumns.next().getName()); assertEquals("FOO", primaryKeyJoinColumns.next().getName()); assertFalse(primaryKeyJoinColumns.hasNext()); secondaryTableResource.getPrimaryKeyJoinColumns().remove(1); - primaryKeyJoinColumns = ormSecondaryTable.specifiedPrimaryKeyJoinColumns(); + primaryKeyJoinColumns = ormSecondaryTable.getSpecifiedPrimaryKeyJoinColumns().iterator(); assertEquals("BAZ", primaryKeyJoinColumns.next().getName()); assertFalse(primaryKeyJoinColumns.hasNext()); secondaryTableResource.getPrimaryKeyJoinColumns().remove(0); - assertFalse(ormSecondaryTable.specifiedPrimaryKeyJoinColumns().hasNext()); + assertFalse(ormSecondaryTable.getSpecifiedPrimaryKeyJoinColumns().iterator().hasNext()); } @@ -518,7 +518,7 @@ public class OrmSecondaryTableTests extends ContextModelTestCase XmlEntity entityResource = getXmlEntityMappings().getEntities().get(0); XmlSecondaryTable secondaryTableResource = entityResource.getSecondaryTables().get(0); - ListIterator uniqueConstraints = ormSecondaryTable.uniqueConstraints(); + ListIterator uniqueConstraints = ormSecondaryTable.getUniqueConstraints().iterator(); assertFalse(uniqueConstraints.hasNext()); XmlUniqueConstraint uniqueConstraintResource = OrmFactory.eINSTANCE.createXmlUniqueConstraint(); @@ -529,7 +529,7 @@ public class OrmSecondaryTableTests extends ContextModelTestCase secondaryTableResource.getUniqueConstraints().add(0, uniqueConstraintResource); uniqueConstraintResource.getColumnNames().add(0, "bar"); - uniqueConstraints = ormSecondaryTable.uniqueConstraints(); + uniqueConstraints = ormSecondaryTable.getUniqueConstraints().iterator(); assertTrue(uniqueConstraints.hasNext()); assertEquals("bar", uniqueConstraints.next().getColumnNames().iterator().next()); assertEquals("foo", uniqueConstraints.next().getColumnNames().iterator().next()); @@ -543,7 +543,7 @@ public class OrmSecondaryTableTests extends ContextModelTestCase XmlEntity entityResource = getXmlEntityMappings().getEntities().get(0); XmlSecondaryTable secondaryTableResource = entityResource.getSecondaryTables().get(0); - assertEquals(0, ormSecondaryTable.uniqueConstraintsSize()); + assertEquals(0, ormSecondaryTable.getUniqueConstraintsSize()); XmlUniqueConstraint uniqueConstraintResource = OrmFactory.eINSTANCE.createXmlUniqueConstraint(); secondaryTableResource.getUniqueConstraints().add(0, uniqueConstraintResource); @@ -553,7 +553,7 @@ public class OrmSecondaryTableTests extends ContextModelTestCase secondaryTableResource.getUniqueConstraints().add(1, uniqueConstraintResource); uniqueConstraintResource.getColumnNames().add(0, "bar"); - assertEquals(2, ormSecondaryTable.uniqueConstraintsSize()); + assertEquals(2, ormSecondaryTable.getUniqueConstraintsSize()); } public void testAddUniqueConstraint() throws Exception { @@ -614,7 +614,7 @@ public class OrmSecondaryTableTests extends ContextModelTestCase assertEquals("BAZ", uniqueConstraintResources.next().getColumnNames().get(0)); assertFalse(uniqueConstraintResources.hasNext()); - Iterator uniqueConstraints = ormSecondaryTable.uniqueConstraints(); + Iterator uniqueConstraints = ormSecondaryTable.getUniqueConstraints().iterator(); assertEquals("FOO", uniqueConstraints.next().getColumnNames().iterator().next()); assertEquals("BAZ", uniqueConstraints.next().getColumnNames().iterator().next()); assertFalse(uniqueConstraints.hasNext()); @@ -625,7 +625,7 @@ public class OrmSecondaryTableTests extends ContextModelTestCase assertEquals("FOO", uniqueConstraintResources.next().getColumnNames().get(0)); assertFalse(uniqueConstraintResources.hasNext()); - uniqueConstraints = ormSecondaryTable.uniqueConstraints(); + uniqueConstraints = ormSecondaryTable.getUniqueConstraints().iterator(); assertEquals("FOO", uniqueConstraints.next().getColumnNames().iterator().next()); assertFalse(uniqueConstraints.hasNext()); @@ -633,7 +633,7 @@ public class OrmSecondaryTableTests extends ContextModelTestCase ormSecondaryTable.removeUniqueConstraint(0); uniqueConstraintResources = secondaryTableResource.getUniqueConstraints().listIterator(); assertFalse(uniqueConstraintResources.hasNext()); - uniqueConstraints = ormSecondaryTable.uniqueConstraints(); + uniqueConstraints = ormSecondaryTable.getUniqueConstraints().iterator(); assertFalse(uniqueConstraints.hasNext()); } @@ -652,7 +652,7 @@ public class OrmSecondaryTableTests extends ContextModelTestCase ormSecondaryTable.moveUniqueConstraint(2, 0); - ListIterator uniqueConstraints = ormSecondaryTable.uniqueConstraints(); + ListIterator uniqueConstraints = ormSecondaryTable.getUniqueConstraints().iterator(); assertEquals("BAR", uniqueConstraints.next().getColumnNames().iterator().next()); assertEquals("BAZ", uniqueConstraints.next().getColumnNames().iterator().next()); assertEquals("FOO", uniqueConstraints.next().getColumnNames().iterator().next()); @@ -664,7 +664,7 @@ public class OrmSecondaryTableTests extends ContextModelTestCase ormSecondaryTable.moveUniqueConstraint(0, 1); - uniqueConstraints = ormSecondaryTable.uniqueConstraints(); + uniqueConstraints = ormSecondaryTable.getUniqueConstraints().iterator(); assertEquals("BAZ", uniqueConstraints.next().getColumnNames().iterator().next()); assertEquals("BAR", uniqueConstraints.next().getColumnNames().iterator().next()); assertEquals("FOO", uniqueConstraints.next().getColumnNames().iterator().next()); @@ -695,39 +695,39 @@ public class OrmSecondaryTableTests extends ContextModelTestCase uniqueConstraintResource.getColumnNames().add(0, "BAZ"); - ListIterator uniqueConstraints = ormSecondaryTable.uniqueConstraints(); + ListIterator uniqueConstraints = ormSecondaryTable.getUniqueConstraints().iterator(); assertEquals("FOO", uniqueConstraints.next().getColumnNames().iterator().next()); assertEquals("BAR", uniqueConstraints.next().getColumnNames().iterator().next()); assertEquals("BAZ", uniqueConstraints.next().getColumnNames().iterator().next()); assertFalse(uniqueConstraints.hasNext()); secondaryTableResource.getUniqueConstraints().move(2, 0); - uniqueConstraints = ormSecondaryTable.uniqueConstraints(); + uniqueConstraints = ormSecondaryTable.getUniqueConstraints().iterator(); assertEquals("BAR", uniqueConstraints.next().getColumnNames().iterator().next()); assertEquals("BAZ", uniqueConstraints.next().getColumnNames().iterator().next()); assertEquals("FOO", uniqueConstraints.next().getColumnNames().iterator().next()); assertFalse(uniqueConstraints.hasNext()); secondaryTableResource.getUniqueConstraints().move(0, 1); - uniqueConstraints = ormSecondaryTable.uniqueConstraints(); + uniqueConstraints = ormSecondaryTable.getUniqueConstraints().iterator(); assertEquals("BAZ", uniqueConstraints.next().getColumnNames().iterator().next()); assertEquals("BAR", uniqueConstraints.next().getColumnNames().iterator().next()); assertEquals("FOO", uniqueConstraints.next().getColumnNames().iterator().next()); assertFalse(uniqueConstraints.hasNext()); secondaryTableResource.getUniqueConstraints().remove(1); - uniqueConstraints = ormSecondaryTable.uniqueConstraints(); + uniqueConstraints = ormSecondaryTable.getUniqueConstraints().iterator(); assertEquals("BAZ", uniqueConstraints.next().getColumnNames().iterator().next()); assertEquals("FOO", uniqueConstraints.next().getColumnNames().iterator().next()); assertFalse(uniqueConstraints.hasNext()); secondaryTableResource.getUniqueConstraints().remove(1); - uniqueConstraints = ormSecondaryTable.uniqueConstraints(); + uniqueConstraints = ormSecondaryTable.getUniqueConstraints().iterator(); assertEquals("BAZ", uniqueConstraints.next().getColumnNames().iterator().next()); assertFalse(uniqueConstraints.hasNext()); secondaryTableResource.getUniqueConstraints().remove(0); - uniqueConstraints = ormSecondaryTable.uniqueConstraints(); + uniqueConstraints = ormSecondaryTable.getUniqueConstraints().iterator(); assertFalse(uniqueConstraints.hasNext()); } @@ -741,27 +741,27 @@ public class OrmSecondaryTableTests extends ContextModelTestCase JavaSecondaryTable javaSecondaryTable = javaEntity.addSpecifiedSecondaryTable(); javaSecondaryTable.setSpecifiedName("SECONDARY"); - ReadOnlySecondaryTable ormSecondaryTable = ormEntity.secondaryTables().next(); + ReadOnlySecondaryTable ormSecondaryTable = ormEntity.getSecondaryTables().iterator().next(); assertTrue(ormSecondaryTable.isVirtual()); - assertFalse(ormSecondaryTable.uniqueConstraints().hasNext()); + assertFalse(ormSecondaryTable.getUniqueConstraints().iterator().hasNext()); javaSecondaryTable.addUniqueConstraint().addColumnName("FOO"); javaSecondaryTable.addUniqueConstraint().addColumnName("BAR"); javaSecondaryTable.addUniqueConstraint().addColumnName("BAZ"); - List uniqueConstraints = CollectionTools.list(ormSecondaryTable.uniqueConstraints()); + List uniqueConstraints = CollectionTools.list(ormSecondaryTable.getUniqueConstraints()); assertEquals(3, uniqueConstraints.size()); assertEquals("FOO", uniqueConstraints.get(0).getColumnNames().iterator().next()); assertEquals("BAR", uniqueConstraints.get(1).getColumnNames().iterator().next()); assertEquals("BAZ", uniqueConstraints.get(2).getColumnNames().iterator().next()); ormEntity.setSecondaryTablesAreDefinedInXml(true); - OrmSecondaryTable ormSecondaryTable2 = ormEntity.specifiedSecondaryTables().next(); + OrmSecondaryTable ormSecondaryTable2 = ormEntity.getSpecifiedSecondaryTables().iterator().next(); ormSecondaryTable2.setSpecifiedName("SECONDARY"); assertEquals("SECONDARY", ormSecondaryTable.getSpecifiedName()); assertFalse(ormSecondaryTable2.isVirtual()); - assertEquals(3, ormSecondaryTable2.uniqueConstraintsSize()); + assertEquals(3, ormSecondaryTable2.getUniqueConstraintsSize()); } } \ No newline at end of file diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmTableGeneratorTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmTableGeneratorTests.java index 1ee6bae024..d0783f6dc9 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmTableGeneratorTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmTableGeneratorTests.java @@ -570,10 +570,10 @@ public class OrmTableGeneratorTests extends ContextModelTestCase createTestEntity(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmReadOnlyPersistentAttribute virtualAttribute = ormPersistentType.attributes().next(); + OrmReadOnlyPersistentAttribute virtualAttribute = ormPersistentType.getAttributes().iterator().next(); IdMapping virtualIdMapping = (IdMapping) virtualAttribute.getMapping(); - JavaIdMapping javaIdMapping = (JavaIdMapping) ormPersistentType.getJavaPersistentType().attributes().next().getMapping(); + JavaIdMapping javaIdMapping = (JavaIdMapping) ormPersistentType.getJavaPersistentType().getAttributes().iterator().next().getMapping(); JavaTableGenerator javaTableGenerator = javaIdMapping.getGeneratorContainer().addTableGenerator(); javaTableGenerator.setName("TABLE_GENERATOR"); diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmTableTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmTableTests.java index 334437dcae..ca9d06d9c4 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmTableTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmTableTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2010 Oracle. All rights reserved. + * Copyright (c) 2007, 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. @@ -513,7 +513,7 @@ public class OrmTableTests extends ContextModelTestCase OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); OrmEntity ormEntity = (OrmEntity) ormPersistentType.getMapping(); - ListIterator uniqueConstraints = ormEntity.getTable().uniqueConstraints(); + ListIterator uniqueConstraints = ormEntity.getTable().getUniqueConstraints().iterator(); assertFalse(uniqueConstraints.hasNext()); XmlEntity entityResource = getXmlEntityMappings().getEntities().get(0); @@ -528,7 +528,7 @@ public class OrmTableTests extends ContextModelTestCase tableResource.getUniqueConstraints().add(0, uniqueConstraintResource); uniqueConstraintResource.getColumnNames().add(0, "bar"); - uniqueConstraints = ormEntity.getTable().uniqueConstraints(); + uniqueConstraints = ormEntity.getTable().getUniqueConstraints().iterator(); assertTrue(uniqueConstraints.hasNext()); assertEquals("bar", uniqueConstraints.next().getColumnNames().iterator().next()); assertEquals("foo", uniqueConstraints.next().getColumnNames().iterator().next()); @@ -541,7 +541,7 @@ public class OrmTableTests extends ContextModelTestCase OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); OrmEntity ormEntity = (OrmEntity) ormPersistentType.getMapping(); - assertEquals(0, ormEntity.getTable().uniqueConstraintsSize()); + assertEquals(0, ormEntity.getTable().getUniqueConstraintsSize()); XmlEntity entityResource = getXmlEntityMappings().getEntities().get(0); XmlTable tableResource = OrmFactory.eINSTANCE.createXmlTable(); @@ -555,7 +555,7 @@ public class OrmTableTests extends ContextModelTestCase tableResource.getUniqueConstraints().add(1, uniqueConstraintResource); uniqueConstraintResource.getColumnNames().add(0, "bar"); - assertEquals(2, ormEntity.getTable().uniqueConstraintsSize()); + assertEquals(2, ormEntity.getTable().getUniqueConstraintsSize()); } public void testAddUniqueConstraint() throws Exception { @@ -625,7 +625,7 @@ public class OrmTableTests extends ContextModelTestCase assertEquals("BAZ", uniqueConstraintResources.next().getColumnNames().get(0)); assertFalse(uniqueConstraintResources.hasNext()); - Iterator uniqueConstraints = table.uniqueConstraints(); + Iterator uniqueConstraints = table.getUniqueConstraints().iterator(); assertEquals("FOO", uniqueConstraints.next().getColumnNames().iterator().next()); assertEquals("BAZ", uniqueConstraints.next().getColumnNames().iterator().next()); assertFalse(uniqueConstraints.hasNext()); @@ -636,7 +636,7 @@ public class OrmTableTests extends ContextModelTestCase assertEquals("FOO", uniqueConstraintResources.next().getColumnNames().get(0)); assertFalse(uniqueConstraintResources.hasNext()); - uniqueConstraints = table.uniqueConstraints(); + uniqueConstraints = table.getUniqueConstraints().iterator(); assertEquals("FOO", uniqueConstraints.next().getColumnNames().iterator().next()); assertFalse(uniqueConstraints.hasNext()); @@ -644,7 +644,7 @@ public class OrmTableTests extends ContextModelTestCase table.removeUniqueConstraint(0); uniqueConstraintResources = tableResource.getUniqueConstraints().listIterator(); assertFalse(uniqueConstraintResources.hasNext()); - uniqueConstraints = table.uniqueConstraints(); + uniqueConstraints = table.getUniqueConstraints().iterator(); assertFalse(uniqueConstraints.hasNext()); } @@ -666,7 +666,7 @@ public class OrmTableTests extends ContextModelTestCase table.moveUniqueConstraint(2, 0); - ListIterator uniqueConstraints = table.uniqueConstraints(); + ListIterator uniqueConstraints = table.getUniqueConstraints().iterator(); assertEquals("BAR", uniqueConstraints.next().getColumnNames().iterator().next()); assertEquals("BAZ", uniqueConstraints.next().getColumnNames().iterator().next()); assertEquals("FOO", uniqueConstraints.next().getColumnNames().iterator().next()); @@ -678,7 +678,7 @@ public class OrmTableTests extends ContextModelTestCase table.moveUniqueConstraint(0, 1); - uniqueConstraints = table.uniqueConstraints(); + uniqueConstraints = table.getUniqueConstraints().iterator(); assertEquals("BAZ", uniqueConstraints.next().getColumnNames().iterator().next()); assertEquals("BAR", uniqueConstraints.next().getColumnNames().iterator().next()); assertEquals("FOO", uniqueConstraints.next().getColumnNames().iterator().next()); @@ -714,39 +714,39 @@ public class OrmTableTests extends ContextModelTestCase uniqueConstraintResource.getColumnNames().add(0, "BAZ"); - ListIterator uniqueConstraints = table.uniqueConstraints(); + ListIterator uniqueConstraints = table.getUniqueConstraints().iterator(); assertEquals("FOO", uniqueConstraints.next().getColumnNames().iterator().next()); assertEquals("BAR", uniqueConstraints.next().getColumnNames().iterator().next()); assertEquals("BAZ", uniqueConstraints.next().getColumnNames().iterator().next()); assertFalse(uniqueConstraints.hasNext()); tableResource.getUniqueConstraints().move(2, 0); - uniqueConstraints = table.uniqueConstraints(); + uniqueConstraints = table.getUniqueConstraints().iterator(); assertEquals("BAR", uniqueConstraints.next().getColumnNames().iterator().next()); assertEquals("BAZ", uniqueConstraints.next().getColumnNames().iterator().next()); assertEquals("FOO", uniqueConstraints.next().getColumnNames().iterator().next()); assertFalse(uniqueConstraints.hasNext()); tableResource.getUniqueConstraints().move(0, 1); - uniqueConstraints = table.uniqueConstraints(); + uniqueConstraints = table.getUniqueConstraints().iterator(); assertEquals("BAZ", uniqueConstraints.next().getColumnNames().iterator().next()); assertEquals("BAR", uniqueConstraints.next().getColumnNames().iterator().next()); assertEquals("FOO", uniqueConstraints.next().getColumnNames().iterator().next()); assertFalse(uniqueConstraints.hasNext()); tableResource.getUniqueConstraints().remove(1); - uniqueConstraints = table.uniqueConstraints(); + uniqueConstraints = table.getUniqueConstraints().iterator(); assertEquals("BAZ", uniqueConstraints.next().getColumnNames().iterator().next()); assertEquals("FOO", uniqueConstraints.next().getColumnNames().iterator().next()); assertFalse(uniqueConstraints.hasNext()); tableResource.getUniqueConstraints().remove(1); - uniqueConstraints = table.uniqueConstraints(); + uniqueConstraints = table.getUniqueConstraints().iterator(); assertEquals("BAZ", uniqueConstraints.next().getColumnNames().iterator().next()); assertFalse(uniqueConstraints.hasNext()); tableResource.getUniqueConstraints().remove(0); - uniqueConstraints = table.uniqueConstraints(); + uniqueConstraints = table.getUniqueConstraints().iterator(); assertFalse(uniqueConstraints.hasNext()); } diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmTransientMappingTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmTransientMappingTests.java index 47e76632db..8086ff8db0 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmTransientMappingTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmTransientMappingTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2010 Oracle. All rights reserved. + * Copyright (c) 2007, 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. @@ -112,9 +112,9 @@ public class OrmTransientMappingTests extends ContextModelTestCase OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); ormPersistentType.addSpecifiedAttribute(MappingKeys.TRANSIENT_ATTRIBUTE_MAPPING_KEY, "foo"); - assertEquals(2, ormPersistentType.virtualAttributesSize()); + assertEquals(2, ormPersistentType.getVirtualAttributesSize()); - OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.specifiedAttributes().next(); + OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.getSpecifiedAttributes().iterator().next(); OrmTransientMapping ormTransientMapping = (OrmTransientMapping) ormPersistentAttribute.getMapping(); assertEquals("foo", ormTransientMapping.getName()); @@ -130,8 +130,8 @@ public class OrmTransientMappingTests extends ContextModelTestCase public void testVirtualMappingMetadataCompleteFalse() throws Exception { createTestEntityTransientMapping(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - assertEquals(2, ormPersistentType.virtualAttributesSize()); - OrmReadOnlyPersistentAttribute ormPersistentAttribute = ormPersistentType.virtualAttributes().next(); + assertEquals(2, ormPersistentType.getVirtualAttributesSize()); + OrmReadOnlyPersistentAttribute ormPersistentAttribute = ormPersistentType.getVirtualAttributes().iterator().next(); TransientMapping transientMapping = (TransientMapping) ormPersistentAttribute.getMapping(); assertEquals("id", transientMapping.getName()); @@ -141,7 +141,7 @@ public class OrmTransientMappingTests extends ContextModelTestCase createTestEntityTransientMapping(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); ormPersistentType.getMapping().setSpecifiedMetadataComplete(Boolean.TRUE); - assertEquals(2, ormPersistentType.virtualAttributesSize()); + assertEquals(2, ormPersistentType.getVirtualAttributesSize()); OrmReadOnlyPersistentAttribute ormPersistentAttribute = ormPersistentType.getAttributeNamed("id"); assertEquals(MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY, ormPersistentAttribute.getMappingKey()); @@ -160,9 +160,9 @@ public class OrmTransientMappingTests extends ContextModelTestCase OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); ormPersistentType.addSpecifiedAttribute(MappingKeys.TRANSIENT_ATTRIBUTE_MAPPING_KEY, "id"); - assertEquals(1, ormPersistentType.virtualAttributesSize()); + assertEquals(1, ormPersistentType.getVirtualAttributesSize()); - OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.specifiedAttributes().next(); + OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.getSpecifiedAttributes().iterator().next(); OrmTransientMapping ormTransientMapping = (OrmTransientMapping) ormPersistentAttribute.getMapping(); assertEquals("id", ormTransientMapping.getName()); @@ -177,8 +177,8 @@ public class OrmTransientMappingTests extends ContextModelTestCase assertFalse(transientMapping.isDefault()); ormPersistentAttribute.setMappingKey(MappingKeys.ID_ATTRIBUTE_MAPPING_KEY); - assertEquals(1, ormPersistentType.specifiedAttributesSize()); - assertEquals(ormPersistentAttribute, ormPersistentType.specifiedAttributes().next()); + assertEquals(1, ormPersistentType.getSpecifiedAttributesSize()); + assertEquals(ormPersistentAttribute, ormPersistentType.getSpecifiedAttributes().iterator().next()); assertTrue(ormPersistentAttribute.getMapping() instanceof IdMapping); assertEquals("transient", ormPersistentAttribute.getMapping().getName()); } @@ -192,8 +192,8 @@ public class OrmTransientMappingTests extends ContextModelTestCase assertFalse(transientMapping.isDefault()); ormPersistentAttribute.setMappingKey(MappingKeys.VERSION_ATTRIBUTE_MAPPING_KEY); - assertEquals(1, ormPersistentType.specifiedAttributesSize()); - assertEquals(ormPersistentAttribute, ormPersistentType.specifiedAttributes().next()); + assertEquals(1, ormPersistentType.getSpecifiedAttributesSize()); + assertEquals(ormPersistentAttribute, ormPersistentType.getSpecifiedAttributes().iterator().next()); assertTrue(ormPersistentAttribute.getMapping() instanceof VersionMapping); assertEquals("transient", ormPersistentAttribute.getMapping().getName()); } @@ -207,8 +207,8 @@ public class OrmTransientMappingTests extends ContextModelTestCase assertFalse(transientMapping.isDefault()); ormPersistentAttribute.setMappingKey(MappingKeys.TRANSIENT_ATTRIBUTE_MAPPING_KEY); - assertEquals(1, ormPersistentType.specifiedAttributesSize()); - assertEquals(ormPersistentAttribute, ormPersistentType.specifiedAttributes().next()); + assertEquals(1, ormPersistentType.getSpecifiedAttributesSize()); + assertEquals(ormPersistentAttribute, ormPersistentType.getSpecifiedAttributes().iterator().next()); assertTrue(ormPersistentAttribute.getMapping() instanceof TransientMapping); assertEquals("transient", ormPersistentAttribute.getMapping().getName()); } @@ -222,8 +222,8 @@ public class OrmTransientMappingTests extends ContextModelTestCase assertFalse(transientMapping.isDefault()); ormPersistentAttribute.setMappingKey(MappingKeys.EMBEDDED_ATTRIBUTE_MAPPING_KEY); - assertEquals(1, ormPersistentType.specifiedAttributesSize()); - assertEquals(ormPersistentAttribute, ormPersistentType.specifiedAttributes().next()); + assertEquals(1, ormPersistentType.getSpecifiedAttributesSize()); + assertEquals(ormPersistentAttribute, ormPersistentType.getSpecifiedAttributes().iterator().next()); assertTrue(ormPersistentAttribute.getMapping() instanceof EmbeddedMapping); assertEquals("transient", ormPersistentAttribute.getMapping().getName()); } @@ -237,8 +237,8 @@ public class OrmTransientMappingTests extends ContextModelTestCase assertFalse(transientMapping.isDefault()); ormPersistentAttribute.setMappingKey(MappingKeys.EMBEDDED_ID_ATTRIBUTE_MAPPING_KEY); - assertEquals(1, ormPersistentType.specifiedAttributesSize()); - assertEquals(ormPersistentAttribute, ormPersistentType.specifiedAttributes().next()); + assertEquals(1, ormPersistentType.getSpecifiedAttributesSize()); + assertEquals(ormPersistentAttribute, ormPersistentType.getSpecifiedAttributes().iterator().next()); assertTrue(ormPersistentAttribute.getMapping() instanceof EmbeddedIdMapping); assertEquals("transient", ormPersistentAttribute.getMapping().getName()); } @@ -252,8 +252,8 @@ public class OrmTransientMappingTests extends ContextModelTestCase assertFalse(transientMapping.isDefault()); ormPersistentAttribute.setMappingKey(MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY); - assertEquals(1, ormPersistentType.specifiedAttributesSize()); - assertEquals(ormPersistentAttribute, ormPersistentType.specifiedAttributes().next()); + assertEquals(1, ormPersistentType.getSpecifiedAttributesSize()); + assertEquals(ormPersistentAttribute, ormPersistentType.getSpecifiedAttributes().iterator().next()); assertTrue(ormPersistentAttribute.getMapping() instanceof OneToOneMapping); assertEquals("transient", ormPersistentAttribute.getMapping().getName()); } @@ -267,8 +267,8 @@ public class OrmTransientMappingTests extends ContextModelTestCase assertFalse(transientMapping.isDefault()); ormPersistentAttribute.setMappingKey(MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY); - assertEquals(1, ormPersistentType.specifiedAttributesSize()); - assertEquals(ormPersistentAttribute, ormPersistentType.specifiedAttributes().next()); + assertEquals(1, ormPersistentType.getSpecifiedAttributesSize()); + assertEquals(ormPersistentAttribute, ormPersistentType.getSpecifiedAttributes().iterator().next()); assertTrue(ormPersistentAttribute.getMapping() instanceof OneToManyMapping); assertEquals("transient", ormPersistentAttribute.getMapping().getName()); } @@ -282,8 +282,8 @@ public class OrmTransientMappingTests extends ContextModelTestCase assertFalse(transientMapping.isDefault()); ormPersistentAttribute.setMappingKey(MappingKeys.MANY_TO_ONE_ATTRIBUTE_MAPPING_KEY); - assertEquals(1, ormPersistentType.specifiedAttributesSize()); - assertEquals(ormPersistentAttribute, ormPersistentType.specifiedAttributes().next()); + assertEquals(1, ormPersistentType.getSpecifiedAttributesSize()); + assertEquals(ormPersistentAttribute, ormPersistentType.getSpecifiedAttributes().iterator().next()); assertTrue(ormPersistentAttribute.getMapping() instanceof ManyToOneMapping); assertEquals("transient", ormPersistentAttribute.getMapping().getName()); } @@ -297,8 +297,8 @@ public class OrmTransientMappingTests extends ContextModelTestCase assertFalse(transientMapping.isDefault()); ormPersistentAttribute.setMappingKey(MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); - assertEquals(1, ormPersistentType.specifiedAttributesSize()); - assertEquals(ormPersistentAttribute, ormPersistentType.specifiedAttributes().next()); + assertEquals(1, ormPersistentType.getSpecifiedAttributesSize()); + assertEquals(ormPersistentAttribute, ormPersistentType.getSpecifiedAttributes().iterator().next()); assertTrue(ormPersistentAttribute.getMapping() instanceof ManyToManyMapping); assertEquals("transient", ormPersistentAttribute.getMapping().getName()); } diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmVersionMappingTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmVersionMappingTests.java index a14cd0869c..da7a2d2abf 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmVersionMappingTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmVersionMappingTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2010 Oracle. All rights reserved. + * Copyright (c) 2007, 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. @@ -181,9 +181,9 @@ public class OrmVersionMappingTests extends ContextModelTestCase OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); ormPersistentType.addSpecifiedAttribute(MappingKeys.VERSION_ATTRIBUTE_MAPPING_KEY, "foo"); - assertEquals(2, ormPersistentType.virtualAttributesSize()); + assertEquals(2, ormPersistentType.getVirtualAttributesSize()); - OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.specifiedAttributes().next(); + OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.getSpecifiedAttributes().iterator().next(); OrmVersionMapping ormVersionMapping = (OrmVersionMapping) ormPersistentAttribute.getMapping(); assertEquals("foo", ormVersionMapping.getName()); @@ -224,8 +224,8 @@ public class OrmVersionMappingTests extends ContextModelTestCase public void testVirtualMappingMetadataCompleteFalse() throws Exception { createTestEntityVersionMapping(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - assertEquals(2, ormPersistentType.virtualAttributesSize()); - OrmReadOnlyPersistentAttribute ormPersistentAttribute = ormPersistentType.virtualAttributes().next(); + assertEquals(2, ormPersistentType.getVirtualAttributesSize()); + OrmReadOnlyPersistentAttribute ormPersistentAttribute = ormPersistentType.getVirtualAttributes().iterator().next(); VersionMapping versionMapping = (VersionMapping) ormPersistentAttribute.getMapping(); assertEquals("id", versionMapping.getName()); @@ -249,7 +249,7 @@ public class OrmVersionMappingTests extends ContextModelTestCase createTestEntityVersionMapping(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); ormPersistentType.getMapping().setSpecifiedMetadataComplete(Boolean.TRUE); - assertEquals(2, ormPersistentType.virtualAttributesSize()); + assertEquals(2, ormPersistentType.getVirtualAttributesSize()); OrmReadOnlyPersistentAttribute ormPersistentAttribute = ormPersistentType.getAttributeNamed("id"); assertEquals(MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY, ormPersistentAttribute.getMappingKey()); @@ -281,9 +281,9 @@ public class OrmVersionMappingTests extends ContextModelTestCase OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); ormPersistentType.addSpecifiedAttribute(MappingKeys.VERSION_ATTRIBUTE_MAPPING_KEY, "id"); - assertEquals(1, ormPersistentType.virtualAttributesSize()); + assertEquals(1, ormPersistentType.getVirtualAttributesSize()); - OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.specifiedAttributes().next(); + OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.getSpecifiedAttributes().iterator().next(); OrmVersionMapping ormVersionMapping = (OrmVersionMapping) ormPersistentAttribute.getMapping(); assertEquals("id", ormVersionMapping.getName()); @@ -326,8 +326,8 @@ public class OrmVersionMappingTests extends ContextModelTestCase assertFalse(versionMapping.isDefault()); ormPersistentAttribute.setMappingKey(MappingKeys.ID_ATTRIBUTE_MAPPING_KEY); - assertEquals(1, ormPersistentType.specifiedAttributesSize()); - assertEquals(ormPersistentAttribute, ormPersistentType.specifiedAttributes().next()); + assertEquals(1, ormPersistentType.getSpecifiedAttributesSize()); + assertEquals(ormPersistentAttribute, ormPersistentType.getSpecifiedAttributes().iterator().next()); assertTrue(ormPersistentAttribute.getMapping() instanceof IdMapping); assertEquals("version", ormPersistentAttribute.getMapping().getName()); assertEquals("FOO", ((IdMapping) ormPersistentAttribute.getMapping()).getColumn().getSpecifiedName()); @@ -346,8 +346,8 @@ public class OrmVersionMappingTests extends ContextModelTestCase assertFalse(versionMapping.isDefault()); ormPersistentAttribute.setMappingKey(MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY); - assertEquals(1, ormPersistentType.specifiedAttributesSize()); - assertEquals(ormPersistentAttribute, ormPersistentType.specifiedAttributes().next()); + assertEquals(1, ormPersistentType.getSpecifiedAttributesSize()); + assertEquals(ormPersistentAttribute, ormPersistentType.getSpecifiedAttributes().iterator().next()); assertTrue(ormPersistentAttribute.getMapping() instanceof BasicMapping); assertEquals("version", ormPersistentAttribute.getMapping().getName()); assertEquals("FOO", ((BasicMapping) ormPersistentAttribute.getMapping()).getColumn().getSpecifiedName()); @@ -366,8 +366,8 @@ public class OrmVersionMappingTests extends ContextModelTestCase assertFalse(versionMapping.isDefault()); ormPersistentAttribute.setMappingKey(MappingKeys.TRANSIENT_ATTRIBUTE_MAPPING_KEY); - assertEquals(1, ormPersistentType.specifiedAttributesSize()); - assertEquals(ormPersistentAttribute, ormPersistentType.specifiedAttributes().next()); + assertEquals(1, ormPersistentType.getSpecifiedAttributesSize()); + assertEquals(ormPersistentAttribute, ormPersistentType.getSpecifiedAttributes().iterator().next()); assertTrue(ormPersistentAttribute.getMapping() instanceof TransientMapping); assertEquals("version", ormPersistentAttribute.getMapping().getName()); } @@ -385,8 +385,8 @@ public class OrmVersionMappingTests extends ContextModelTestCase assertFalse(versionMapping.isDefault()); ormPersistentAttribute.setMappingKey(MappingKeys.EMBEDDED_ATTRIBUTE_MAPPING_KEY); - assertEquals(1, ormPersistentType.specifiedAttributesSize()); - assertEquals(ormPersistentAttribute, ormPersistentType.specifiedAttributes().next()); + assertEquals(1, ormPersistentType.getSpecifiedAttributesSize()); + assertEquals(ormPersistentAttribute, ormPersistentType.getSpecifiedAttributes().iterator().next()); assertTrue(ormPersistentAttribute.getMapping() instanceof EmbeddedMapping); assertEquals("version", ormPersistentAttribute.getMapping().getName()); } @@ -404,8 +404,8 @@ public class OrmVersionMappingTests extends ContextModelTestCase assertFalse(versionMapping.isDefault()); ormPersistentAttribute.setMappingKey(MappingKeys.EMBEDDED_ID_ATTRIBUTE_MAPPING_KEY); - assertEquals(1, ormPersistentType.specifiedAttributesSize()); - assertEquals(ormPersistentAttribute, ormPersistentType.specifiedAttributes().next()); + assertEquals(1, ormPersistentType.getSpecifiedAttributesSize()); + assertEquals(ormPersistentAttribute, ormPersistentType.getSpecifiedAttributes().iterator().next()); assertTrue(ormPersistentAttribute.getMapping() instanceof EmbeddedIdMapping); assertEquals("version", ormPersistentAttribute.getMapping().getName()); } @@ -423,8 +423,8 @@ public class OrmVersionMappingTests extends ContextModelTestCase assertFalse(versionMapping.isDefault()); ormPersistentAttribute.setMappingKey(MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY); - assertEquals(1, ormPersistentType.specifiedAttributesSize()); - assertEquals(ormPersistentAttribute, ormPersistentType.specifiedAttributes().next()); + assertEquals(1, ormPersistentType.getSpecifiedAttributesSize()); + assertEquals(ormPersistentAttribute, ormPersistentType.getSpecifiedAttributes().iterator().next()); assertTrue(ormPersistentAttribute.getMapping() instanceof OneToOneMapping); assertEquals("version", ormPersistentAttribute.getMapping().getName()); } @@ -442,8 +442,8 @@ public class OrmVersionMappingTests extends ContextModelTestCase assertFalse(versionMapping.isDefault()); ormPersistentAttribute.setMappingKey(MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY); - assertEquals(1, ormPersistentType.specifiedAttributesSize()); - assertEquals(ormPersistentAttribute, ormPersistentType.specifiedAttributes().next()); + assertEquals(1, ormPersistentType.getSpecifiedAttributesSize()); + assertEquals(ormPersistentAttribute, ormPersistentType.getSpecifiedAttributes().iterator().next()); assertTrue(ormPersistentAttribute.getMapping() instanceof OneToManyMapping); assertEquals("version", ormPersistentAttribute.getMapping().getName()); } @@ -461,8 +461,8 @@ public class OrmVersionMappingTests extends ContextModelTestCase assertFalse(versionMapping.isDefault()); ormPersistentAttribute.setMappingKey(MappingKeys.MANY_TO_ONE_ATTRIBUTE_MAPPING_KEY); - assertEquals(1, ormPersistentType.specifiedAttributesSize()); - assertEquals(ormPersistentAttribute, ormPersistentType.specifiedAttributes().next()); + assertEquals(1, ormPersistentType.getSpecifiedAttributesSize()); + assertEquals(ormPersistentAttribute, ormPersistentType.getSpecifiedAttributes().iterator().next()); assertTrue(ormPersistentAttribute.getMapping() instanceof ManyToOneMapping); assertEquals("version", ormPersistentAttribute.getMapping().getName()); } @@ -480,8 +480,8 @@ public class OrmVersionMappingTests extends ContextModelTestCase assertFalse(versionMapping.isDefault()); ormPersistentAttribute.setMappingKey(MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); - assertEquals(1, ormPersistentType.specifiedAttributesSize()); - assertEquals(ormPersistentAttribute, ormPersistentType.specifiedAttributes().next()); + assertEquals(1, ormPersistentType.getSpecifiedAttributesSize()); + assertEquals(ormPersistentAttribute, ormPersistentType.getSpecifiedAttributes().iterator().next()); assertTrue(ormPersistentAttribute.getMapping() instanceof ManyToManyMapping); assertEquals("version", ormPersistentAttribute.getMapping().getName()); } diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmXmlTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmXmlTests.java index 8978f9faa1..a3bb91a275 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmXmlTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmXmlTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2010 Oracle. All rights reserved. + * Copyright (c) 2007, 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. @@ -36,7 +36,7 @@ public class OrmXmlTests extends ContextModelTestCase } protected OrmXml getOrmXml() { - return (OrmXml) getPersistenceUnit().mappingFileRefs().next().getMappingFile(); + return (OrmXml) getPersistenceUnit().getMappingFileRefs().iterator().next().getMappingFile(); } public void testUpdateAddEntityMappings() throws Exception { diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/persistence/ClassRefTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/persistence/ClassRefTests.java index 069eaafde4..a74b1892a7 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/persistence/ClassRefTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/persistence/ClassRefTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2009 Oracle. + * Copyright (c) 2007, 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 @@ -32,7 +32,7 @@ public class ClassRefTests extends ContextModelTestCase XmlJavaClassRef xmlClassRef = PersistenceFactory.eINSTANCE.createXmlJavaClassRef(); xmlClassRef.setJavaClass("com.foo.Bar"); xmlPersistenceUnit.getClasses().add(xmlClassRef); - ClassRef classRef = persistenceUnit.specifiedClassRefs().next(); + ClassRef classRef = persistenceUnit.getSpecifiedClassRefs().iterator().next(); // test that class names are initially equal assertEquals(classRef.getClassName(), xmlClassRef.getJavaClass()); @@ -40,19 +40,19 @@ public class ClassRefTests extends ContextModelTestCase // set xml class name to different name, test equality xmlClassRef.setJavaClass("com.bar.Foo"); - classRef = persistenceUnit.specifiedClassRefs().next(); + classRef = persistenceUnit.getSpecifiedClassRefs().iterator().next(); assertEquals(classRef.getClassName(), xmlClassRef.getJavaClass()); // set class name to empty string, test equality xmlClassRef.setJavaClass(""); - classRef = persistenceUnit.specifiedClassRefs().next(); + classRef = persistenceUnit.getSpecifiedClassRefs().iterator().next(); assertEquals(classRef.getClassName(), xmlClassRef.getJavaClass()); // set name back to non empty string, test equality xmlClassRef.setJavaClass("com.foo.Bar"); - classRef = persistenceUnit.specifiedClassRefs().next(); + classRef = persistenceUnit.getSpecifiedClassRefs().iterator().next(); assertEquals(classRef.getClassName(), xmlClassRef.getJavaClass()); } @@ -64,7 +64,7 @@ public class ClassRefTests extends ContextModelTestCase XmlJavaClassRef xmlClassRef = PersistenceFactory.eINSTANCE.createXmlJavaClassRef(); xmlClassRef.setJavaClass("com.foo.Bar"); xmlPersistenceUnit.getClasses().add(xmlClassRef); - ClassRef classRef = persistenceUnit.specifiedClassRefs().next(); + ClassRef classRef = persistenceUnit.getSpecifiedClassRefs().iterator().next(); // test that class names are initially equal assertEquals(classRef.getClassName(), xmlClassRef.getJavaClass()); diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/persistence/MappingFileRefTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/persistence/MappingFileRefTests.java index 32c3f1f28e..7881090779 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/persistence/MappingFileRefTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/persistence/MappingFileRefTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2009 Oracle. + * Copyright (c) 2007, 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 @@ -25,7 +25,7 @@ public class MappingFileRefTests extends ContextModelTestCase } protected MappingFileRef mappingFileRef() { - return getPersistenceUnit().mappingFileRefs().next(); + return getPersistenceUnit().getMappingFileRefs().iterator().next(); } public void testUpdateFileName() { @@ -36,7 +36,7 @@ public class MappingFileRefTests extends ContextModelTestCase XmlMappingFileRef xmlFileRef = PersistenceFactory.eINSTANCE.createXmlMappingFileRef(); xmlFileRef.setFileName("foo.xml"); xmlPersistenceUnit.getMappingFiles().add(xmlFileRef); - MappingFileRef fileRef = persistenceUnit.specifiedMappingFileRefs().next(); + MappingFileRef fileRef = persistenceUnit.getSpecifiedMappingFileRefs().iterator().next(); // test that file names are initially equal assertEquals(fileRef.getFileName(), xmlFileRef.getFileName()); @@ -70,7 +70,7 @@ public class MappingFileRefTests extends ContextModelTestCase XmlMappingFileRef xmlFileRef = PersistenceFactory.eINSTANCE.createXmlMappingFileRef(); xmlFileRef.setFileName("foo.xml"); xmlPersistenceUnit.getMappingFiles().add(xmlFileRef); - MappingFileRef fileRef = persistenceUnit.specifiedMappingFileRefs().next(); + MappingFileRef fileRef = persistenceUnit.getSpecifiedMappingFileRefs().iterator().next(); // test that file names are initially equal assertEquals(fileRef.getFileName(), xmlFileRef.getFileName()); diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/persistence/PersistenceTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/persistence/PersistenceTests.java index 48fb32dcf6..d7655ef4db 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/persistence/PersistenceTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/persistence/PersistenceTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2009 Oracle. All rights reserved. + * Copyright (c) 2007, 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. @@ -33,21 +33,21 @@ public class PersistenceTests extends ContextModelTestCase // clear xml persistence units, test that it's clear in context xmlPersistence.getPersistenceUnits().clear(); - assertEquals(0, persistence.persistenceUnitsSize()); + assertEquals(0, persistence.getPersistenceUnitsSize()); // add xml persistence unit, test that it's added to context XmlPersistenceUnit xmlPersistenceUnit = PersistenceFactory.eINSTANCE.createXmlPersistenceUnit(); xmlPersistenceUnit.setName("test"); xmlPersistence.getPersistenceUnits().add(xmlPersistenceUnit); - assertEquals(1, persistence.persistenceUnitsSize()); + assertEquals(1, persistence.getPersistenceUnitsSize()); // add another, test that it *isn't* add to context xmlPersistenceUnit = PersistenceFactory.eINSTANCE.createXmlPersistenceUnit(); xmlPersistenceUnit.setName("test2"); xmlPersistence.getPersistenceUnits().add(xmlPersistenceUnit); - assertEquals(1, persistence.persistenceUnitsSize()); + assertEquals(1, persistence.getPersistenceUnitsSize()); } public void testModifyAddPersistencUnit() { @@ -56,12 +56,12 @@ public class PersistenceTests extends ContextModelTestCase // clear xml persistence units, test that it's clear in context xmlPersistence.getPersistenceUnits().clear(); - assertEquals(0, persistence.persistenceUnitsSize()); + assertEquals(0, persistence.getPersistenceUnitsSize()); // add persistence unit, test that it's added to resource persistence.addPersistenceUnit(); - assertEquals(1, persistence.persistenceUnitsSize()); + assertEquals(1, persistence.getPersistenceUnitsSize()); // add another, test that we get an exception boolean exception = false; @@ -86,21 +86,21 @@ public class PersistenceTests extends ContextModelTestCase xmlPersistence.getPersistenceUnits().add(xmlPersistenceUnit); assertEquals(2, xmlPersistence.getPersistenceUnits().size()); - assertEquals(1, persistence.persistenceUnitsSize()); + assertEquals(1, persistence.getPersistenceUnitsSize()); // remove persistence unit from xml, test that context remains unchanged xmlPersistenceUnit = xmlPersistence.getPersistenceUnits().get(0); xmlPersistence.getPersistenceUnits().remove(xmlPersistenceUnit); assertEquals(1, xmlPersistence.getPersistenceUnits().size()); - assertEquals(1, persistence.persistenceUnitsSize()); + assertEquals(1, persistence.getPersistenceUnitsSize()); // remove another one from xml, text that it's now removed from context xmlPersistenceUnit = xmlPersistence.getPersistenceUnits().get(0); xmlPersistence.getPersistenceUnits().remove(xmlPersistenceUnit); assertEquals(0, xmlPersistence.getPersistenceUnits().size()); - assertEquals(0, persistence.persistenceUnitsSize()); + assertEquals(0, persistence.getPersistenceUnitsSize()); } public void testModifyRemovePersistenceUnit() { @@ -114,7 +114,7 @@ public class PersistenceTests extends ContextModelTestCase xmlPersistence.getPersistenceUnits().add(xmlPersistenceUnit); assertEquals(2, xmlPersistence.getPersistenceUnits().size()); - assertEquals(1, persistence.persistenceUnitsSize()); + assertEquals(1, persistence.getPersistenceUnitsSize()); // remove persistence unit, test that it's removed from resource and that // a *new* persistence unit representing the previously unrepresented one @@ -122,13 +122,13 @@ public class PersistenceTests extends ContextModelTestCase persistence.removePersistenceUnit(0); assertEquals(1, xmlPersistence.getPersistenceUnits().size()); - assertEquals(1, persistence.persistenceUnitsSize()); + assertEquals(1, persistence.getPersistenceUnitsSize()); // remove new persistence unit, test that it's removed from resource and // context persistence.removePersistenceUnit(0); assertEquals(0, xmlPersistence.getPersistenceUnits().size()); - assertEquals(0, persistence.persistenceUnitsSize()); + assertEquals(0, persistence.getPersistenceUnitsSize()); } } diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/persistence/PersistenceUnitTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/persistence/PersistenceUnitTests.java index 30631466ab..d6a932cd4e 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/persistence/PersistenceUnitTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/persistence/PersistenceUnitTests.java @@ -13,6 +13,7 @@ import java.util.Iterator; import java.util.ListIterator; import org.eclipse.jdt.core.ICompilationUnit; import org.eclipse.jpt.common.core.internal.operations.JptFileCreationDataModelProperties; +import org.eclipse.jpt.common.core.resource.java.JavaResourceType; import org.eclipse.jpt.common.utility.internal.CollectionTools; import org.eclipse.jpt.common.utility.internal.Tools; import org.eclipse.jpt.common.utility.internal.iterators.ArrayIterator; @@ -28,7 +29,6 @@ import org.eclipse.jpt.jpa.core.context.persistence.PersistenceUnit; import org.eclipse.jpt.jpa.core.context.persistence.PersistenceUnitTransactionType; import org.eclipse.jpt.jpa.core.internal.operations.OrmFileCreationDataModelProvider; 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.persistence.PersistenceFactory; import org.eclipse.jpt.jpa.core.resource.persistence.XmlJavaClassRef; import org.eclipse.jpt.jpa.core.resource.persistence.XmlMappingFileRef; @@ -420,7 +420,7 @@ public class PersistenceUnitTests extends ContextModelTestCase xmlMappingFileRef.setFileName("META-INF/orm.xml"); xmlPersistenceUnit.getMappingFiles().add(xmlMappingFileRef); - assertEquals(1, persistenceUnit.specifiedMappingFileRefsSize()); + assertEquals(1, persistenceUnit.getSpecifiedMappingFileRefsSize()); assertTrue(ormResource.fileExists()); assertNull(persistenceUnit.getImpliedMappingFileRef()); @@ -432,21 +432,21 @@ public class PersistenceUnitTests extends ContextModelTestCase // test there are none initially assertEquals(0, xmlPersistenceUnit.getMappingFiles().size()); - assertEquals(0, persistenceUnit.specifiedMappingFileRefsSize()); + assertEquals(0, persistenceUnit.getSpecifiedMappingFileRefsSize()); // add mapping file ref, test that it's added to context XmlMappingFileRef xmlMappingFileRef = PersistenceFactory.eINSTANCE.createXmlMappingFileRef(); xmlMappingFileRef.setFileName("orm.xml"); xmlPersistenceUnit.getMappingFiles().add(xmlMappingFileRef); - assertEquals(1, persistenceUnit.specifiedMappingFileRefsSize()); + assertEquals(1, persistenceUnit.getSpecifiedMappingFileRefsSize()); // add another ... xmlMappingFileRef = PersistenceFactory.eINSTANCE.createXmlMappingFileRef(); xmlMappingFileRef.setFileName("orm2.xml"); xmlPersistenceUnit.getMappingFiles().add(xmlMappingFileRef); - assertEquals(2, persistenceUnit.specifiedMappingFileRefsSize()); + assertEquals(2, persistenceUnit.getSpecifiedMappingFileRefsSize()); } public void testUpdateSpecifiedMappingFileRefs2() { @@ -462,19 +462,19 @@ public class PersistenceUnitTests extends ContextModelTestCase xmlPersistenceUnit.getMappingFiles().add(xmlMappingFileRef); assertEquals(xmlPersistenceUnit.getMappingFiles().size(), 2); - assertEquals(2, persistenceUnit.specifiedMappingFileRefsSize()); + assertEquals(2, persistenceUnit.getSpecifiedMappingFileRefsSize()); // remove mapping file ref from xml, test that it's removed from context xmlMappingFileRef = xmlPersistenceUnit.getMappingFiles().get(0); xmlPersistenceUnit.getMappingFiles().remove(xmlMappingFileRef); - assertEquals(1, persistenceUnit.specifiedMappingFileRefsSize()); + assertEquals(1, persistenceUnit.getSpecifiedMappingFileRefsSize()); // remove another one ... xmlMappingFileRef = xmlPersistenceUnit.getMappingFiles().get(0); xmlPersistenceUnit.getMappingFiles().remove(xmlMappingFileRef); - assertEquals(0, persistenceUnit.specifiedMappingFileRefsSize()); + assertEquals(0, persistenceUnit.getSpecifiedMappingFileRefsSize()); } public void testModifySpecifiedMappingFileRefs1() { @@ -483,7 +483,7 @@ public class PersistenceUnitTests extends ContextModelTestCase // test there are none initially assertEquals(0, xmlPersistenceUnit.getMappingFiles().size()); - assertEquals(0, persistenceUnit.specifiedMappingFileRefsSize()); + assertEquals(0, persistenceUnit.getSpecifiedMappingFileRefsSize()); // add mapping file ref, test that it's added to resource persistenceUnit.addSpecifiedMappingFileRef("foo"); @@ -519,7 +519,7 @@ public class PersistenceUnitTests extends ContextModelTestCase xmlPersistenceUnit.getMappingFiles().add(xmlMappingFileRef); assertEquals(2, xmlPersistenceUnit.getMappingFiles().size()); - assertEquals(2, persistenceUnit.specifiedMappingFileRefsSize()); + assertEquals(2, persistenceUnit.getSpecifiedMappingFileRefsSize()); // remove mapping file ref from context, test that it's removed from xml persistenceUnit.removeSpecifiedMappingFileRef(0); @@ -538,21 +538,21 @@ public class PersistenceUnitTests extends ContextModelTestCase // test there are none initially assertEquals(0, xmlPersistenceUnit.getClasses().size()); - assertEquals(0, persistenceUnit.specifiedClassRefsSize()); + assertEquals(0, persistenceUnit.getSpecifiedClassRefsSize()); // add mapping file ref, test that it's added to context XmlJavaClassRef xmlClassRef = PersistenceFactory.eINSTANCE.createXmlJavaClassRef(); xmlClassRef.setJavaClass("com.foo.Bar"); xmlPersistenceUnit.getClasses().add(xmlClassRef); - assertEquals(1, persistenceUnit.specifiedClassRefsSize()); + assertEquals(1, persistenceUnit.getSpecifiedClassRefsSize()); // add another ... xmlClassRef = PersistenceFactory.eINSTANCE.createXmlJavaClassRef(); xmlClassRef.setJavaClass("com.foo.Baz"); xmlPersistenceUnit.getClasses().add(xmlClassRef); - assertEquals(2, persistenceUnit.specifiedClassRefsSize()); + assertEquals(2, persistenceUnit.getSpecifiedClassRefsSize()); } public void testUpdateClassRefs2() { @@ -568,19 +568,19 @@ public class PersistenceUnitTests extends ContextModelTestCase xmlPersistenceUnit.getClasses().add(xmlClassRef); assertEquals(2, xmlPersistenceUnit.getClasses().size()); - assertEquals(2, persistenceUnit.specifiedClassRefsSize()); + assertEquals(2, persistenceUnit.getSpecifiedClassRefsSize()); // remove class ref from xml, test that it's removed from context xmlClassRef = xmlPersistenceUnit.getClasses().get(0); xmlPersistenceUnit.getClasses().remove(xmlClassRef); - assertEquals(1, persistenceUnit.specifiedClassRefsSize()); + assertEquals(1, persistenceUnit.getSpecifiedClassRefsSize()); // remove another one ... xmlClassRef = xmlPersistenceUnit.getClasses().get(0); xmlPersistenceUnit.getClasses().remove(xmlClassRef); - assertEquals(0, persistenceUnit.specifiedClassRefsSize()); + assertEquals(0, persistenceUnit.getSpecifiedClassRefsSize()); } public void testModifyClassRefs1() throws Exception { @@ -589,7 +589,7 @@ public class PersistenceUnitTests extends ContextModelTestCase // test there are none initially assertEquals(0, xmlPersistenceUnit.getClasses().size()); - assertEquals(0, persistenceUnit.specifiedClassRefsSize()); + assertEquals(0, persistenceUnit.getSpecifiedClassRefsSize()); // add class ref, test that it's added to context persistenceUnit.addSpecifiedClassRef("Foo"); @@ -627,7 +627,7 @@ public class PersistenceUnitTests extends ContextModelTestCase xmlPersistenceUnit.getClasses().add(xmlClassRef); assertEquals(2, xmlPersistenceUnit.getClasses().size()); - assertEquals(2, persistenceUnit.specifiedClassRefsSize()); + assertEquals(2, persistenceUnit.getSpecifiedClassRefsSize()); // remove class ref from context, test that it's removed from xml persistenceUnit.removeSpecifiedClassRef(0); @@ -645,36 +645,36 @@ public class PersistenceUnitTests extends ContextModelTestCase getJpaProject().setDiscoversAnnotatedClasses(false); getPersistenceUnit().setSpecifiedExcludeUnlistedClasses(Boolean.TRUE); - assertEquals(0, getPersistenceUnit().impliedClassRefsSize()); + assertEquals(0, getPersistenceUnit().getImpliedClassRefsSize()); getJpaProject().setDiscoversAnnotatedClasses(true); getPersistenceUnit().setSpecifiedExcludeUnlistedClasses(Boolean.FALSE); - assertEquals(2, getPersistenceUnit().impliedClassRefsSize()); + assertEquals(2, getPersistenceUnit().getImpliedClassRefsSize()); this.verifyVirtualClassRef(FULLY_QUALIFIED_TYPE_NAME); this.verifyVirtualClassRef(FULLY_QUALIFIED_INNER_CLASS_NAME); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - assertEquals(1, getPersistenceUnit().impliedClassRefsSize()); + assertEquals(1, getPersistenceUnit().getImpliedClassRefsSize()); this.verifyVirtualClassRef(FULLY_QUALIFIED_INNER_CLASS_NAME); removeXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - assertEquals(2, getPersistenceUnit().impliedClassRefsSize()); + assertEquals(2, getPersistenceUnit().getImpliedClassRefsSize()); this.verifyVirtualClassRef(FULLY_QUALIFIED_TYPE_NAME); this.verifyVirtualClassRef(FULLY_QUALIFIED_INNER_CLASS_NAME); getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - assertEquals(1, getPersistenceUnit().impliedClassRefsSize()); + assertEquals(1, getPersistenceUnit().getImpliedClassRefsSize()); this.verifyVirtualClassRef(FULLY_QUALIFIED_INNER_CLASS_NAME); addXmlClassRef(FULLY_QUALIFIED_INNER_CLASS_NAME); - assertEquals(0, getPersistenceUnit().impliedClassRefsSize()); + assertEquals(0, getPersistenceUnit().getImpliedClassRefsSize()); removeXmlClassRef(FULLY_QUALIFIED_INNER_CLASS_NAME); - assertEquals(1, getPersistenceUnit().impliedClassRefsSize()); + assertEquals(1, getPersistenceUnit().getImpliedClassRefsSize()); this.verifyVirtualClassRef(FULLY_QUALIFIED_INNER_CLASS_NAME); getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_INNER_CLASS_NAME); - assertEquals(0, getPersistenceUnit().impliedClassRefsSize()); + assertEquals(0, getPersistenceUnit().getImpliedClassRefsSize()); } protected void verifyVirtualClassRef(String className) { @@ -684,8 +684,7 @@ public class PersistenceUnitTests extends ContextModelTestCase } protected ClassRef getVirtualClassRef(String className) { - for (Iterator stream = this.getPersistenceUnit().impliedClassRefs(); stream.hasNext(); ) { - ClassRef ref = stream.next(); + for (ClassRef ref : this.getPersistenceUnit().getImpliedClassRefs()) { if (Tools.valuesAreEqual(ref.getClassName(), className)) { return ref; } @@ -696,26 +695,25 @@ public class PersistenceUnitTests extends ContextModelTestCase public void testImpliedClassRefs2() throws Exception { createTestEntity(); getJpaProject().setDiscoversAnnotatedClasses(true); - JavaResourcePersistentType javaType = - getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); + JavaResourceType javaType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME); - assertEquals(1, CollectionTools.size(getPersistenceUnit().impliedClassRefs())); + assertEquals(1, CollectionTools.size(getPersistenceUnit().getImpliedClassRefs())); javaType.removeAnnotation(JPA.ENTITY); getJpaProject().synchronizeContextModel(); - assertEquals(0, getPersistenceUnit().impliedClassRefsSize()); + assertEquals(0, getPersistenceUnit().getImpliedClassRefsSize()); javaType.addAnnotation(JPA.EMBEDDABLE); getJpaProject().synchronizeContextModel(); - assertEquals(1, getPersistenceUnit().impliedClassRefsSize()); + assertEquals(1, getPersistenceUnit().getImpliedClassRefsSize()); javaType.removeAnnotation(JPA.EMBEDDABLE); getJpaProject().synchronizeContextModel(); - assertEquals(0, getPersistenceUnit().impliedClassRefsSize()); + assertEquals(0, getPersistenceUnit().getImpliedClassRefsSize()); javaType.addAnnotation(JPA.MAPPED_SUPERCLASS); getJpaProject().synchronizeContextModel(); - assertEquals(1, getPersistenceUnit().impliedClassRefsSize()); + assertEquals(1, getPersistenceUnit().getImpliedClassRefsSize()); } public void testRenamePersistentTypeImpliedClassRefs() throws Exception { @@ -811,12 +809,12 @@ public class PersistenceUnitTests extends ContextModelTestCase // test there are none initially assertNull(xmlPersistenceUnit.getProperties()); - assertEquals(0, persistenceUnit.propertiesSize()); + assertEquals(0, persistenceUnit.getPropertiesSize()); // add "properties", test that there's no real change to context XmlProperties xmlProperties = PersistenceFactory.eINSTANCE.createXmlProperties(); xmlPersistenceUnit.setProperties(xmlProperties); - assertEquals(0, persistenceUnit.propertiesSize()); + assertEquals(0, persistenceUnit.getPropertiesSize()); // add property, test that it's added to context XmlProperty xmlProperty = PersistenceFactory.eINSTANCE.createXmlProperty(); @@ -824,7 +822,7 @@ public class PersistenceUnitTests extends ContextModelTestCase xmlProperty.setValue("bar"); xmlProperties.getProperties().add(xmlProperty); - assertEquals(1, persistenceUnit.propertiesSize()); + assertEquals(1, persistenceUnit.getPropertiesSize()); // add another ... xmlProperty = PersistenceFactory.eINSTANCE.createXmlProperty(); @@ -832,7 +830,7 @@ public class PersistenceUnitTests extends ContextModelTestCase xmlProperty.setValue("BAR"); xmlProperties.getProperties().add(xmlProperty); - assertEquals(2, persistenceUnit.propertiesSize()); + assertEquals(2, persistenceUnit.getPropertiesSize()); } public void testUpdateProperties2() { @@ -852,19 +850,19 @@ public class PersistenceUnitTests extends ContextModelTestCase xmlProperties.getProperties().add(xmlProperty); assertEquals(2, xmlPersistenceUnit.getProperties().getProperties().size()); - assertEquals(2, persistenceUnit.propertiesSize()); + assertEquals(2, persistenceUnit.getPropertiesSize()); // remove property from xml, test that it's removed from context xmlProperty = xmlProperties.getProperties().get(0); xmlProperties.getProperties().remove(xmlProperty); - assertEquals(1, persistenceUnit.propertiesSize()); + assertEquals(1, persistenceUnit.getPropertiesSize()); // remove another one ... xmlProperty = xmlProperties.getProperties().get(0); xmlProperties.getProperties().remove(xmlProperty); - assertEquals(0, persistenceUnit.propertiesSize()); + assertEquals(0, persistenceUnit.getPropertiesSize()); } public void testModifyProperties1() { @@ -873,7 +871,7 @@ public class PersistenceUnitTests extends ContextModelTestCase // test there are none initially assertNull(xmlPersistenceUnit.getProperties()); - assertEquals(0, persistenceUnit.propertiesSize()); + assertEquals(0, persistenceUnit.getPropertiesSize()); // add property, test that it's added to resource persistenceUnit.addProperty().setName("foo"); @@ -915,7 +913,7 @@ public class PersistenceUnitTests extends ContextModelTestCase xmlProperties.getProperties().add(xmlProperty); assertEquals(2, xmlPersistenceUnit.getProperties().getProperties().size()); - assertEquals(2, persistenceUnit.propertiesSize()); + assertEquals(2, persistenceUnit.getPropertiesSize()); // remove property from context, test that it's removed from resource persistenceUnit.removeProperty("foo"); @@ -937,7 +935,7 @@ public class PersistenceUnitTests extends ContextModelTestCase persistenceUnit.setProperty("FOO", "BAR", false); assertEquals(2, xmlPersistenceUnit.getProperties().getProperties().size()); - assertEquals(2, persistenceUnit.propertiesSize()); + assertEquals(2, persistenceUnit.getPropertiesSize()); // remove property from context, test that it's removed from resource persistenceUnit.removeProperty("foo", "bar"); @@ -959,7 +957,7 @@ public class PersistenceUnitTests extends ContextModelTestCase persistenceUnit.setProperty("FOO", "BAR", false); assertEquals(2, xmlPersistenceUnit.getProperties().getProperties().size()); - assertEquals(2, persistenceUnit.propertiesSize()); + assertEquals(2, persistenceUnit.getPropertiesSize()); // modify a property, test its value persistenceUnit.setProperty("foo", "", false); @@ -993,12 +991,12 @@ public class PersistenceUnitTests extends ContextModelTestCase persistenceUnit.setProperty("foo", "bar 1", true); assertEquals(4, xmlPersistenceUnit.getProperties().getProperties().size()); - assertEquals(4, persistenceUnit.propertiesSize()); + assertEquals(4, persistenceUnit.getPropertiesSize()); // remove a property, test that there are four existing in xml and context persistenceUnit.removeProperty("foo", "bar 1"); assertEquals(3, xmlPersistenceUnit.getProperties().getProperties().size()); - assertEquals(3, persistenceUnit.propertiesSize()); + assertEquals(3, persistenceUnit.getPropertiesSize()); } public void testAccessProperty() { @@ -1017,7 +1015,7 @@ public class PersistenceUnitTests extends ContextModelTestCase } private PersistenceUnit.Property persistenceUnitFirstProperty() { - return getPersistenceUnit().properties().next(); + return getPersistenceUnit().getProperties().iterator().next(); } public void testUpdatePropertyName() { @@ -1085,7 +1083,7 @@ public class PersistenceUnitTests extends ContextModelTestCase addXmlMappingFileRef(JptJpaCorePlugin.DEFAULT_ORM_XML_RUNTIME_PATH.toString()); createOrm2XmlFile(); PersistenceUnit persistenceUnit = getPersistenceUnit(); - ListIterator mappingFileRefs = getPersistenceUnit().mappingFileRefs(); + ListIterator mappingFileRefs = getPersistenceUnit().getMappingFileRefs().iterator(); OrmXml ormMappingFile = (OrmXml) mappingFileRefs.next().getMappingFile(); OrmXml orm2MappingFile = (OrmXml) mappingFileRefs.next().getMappingFile(); @@ -1109,7 +1107,7 @@ public class PersistenceUnitTests extends ContextModelTestCase addXmlMappingFileRef(JptJpaCorePlugin.DEFAULT_ORM_XML_RUNTIME_PATH.toString()); createOrm2XmlFile(); PersistenceUnit persistenceUnit = getPersistenceUnit(); - ListIterator mappingFileRefs = getPersistenceUnit().mappingFileRefs(); + ListIterator mappingFileRefs = getPersistenceUnit().getMappingFileRefs().iterator(); OrmXml ormMappingFile = (OrmXml) mappingFileRefs.next().getMappingFile(); OrmXml orm2MappingFile = (OrmXml) mappingFileRefs.next().getMappingFile(); @@ -1130,7 +1128,7 @@ public class PersistenceUnitTests extends ContextModelTestCase addXmlMappingFileRef(JptJpaCorePlugin.DEFAULT_ORM_XML_RUNTIME_PATH.toString()); createOrm2XmlFile(); PersistenceUnit persistenceUnit = getPersistenceUnit(); - ListIterator mappingFileRefs = getPersistenceUnit().mappingFileRefs(); + ListIterator mappingFileRefs = getPersistenceUnit().getMappingFileRefs().iterator(); OrmXml ormMappingFile = (OrmXml) mappingFileRefs.next().getMappingFile(); OrmXml orm2MappingFile = (OrmXml) mappingFileRefs.next().getMappingFile(); diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/java/GenericJavaAssociationOverride2_0Tests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/java/GenericJavaAssociationOverride2_0Tests.java index 30b42bf061..fa0ff6e174 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/java/GenericJavaAssociationOverride2_0Tests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/java/GenericJavaAssociationOverride2_0Tests.java @@ -12,6 +12,8 @@ package org.eclipse.jpt.jpa.core.tests.internal.jpa2.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.tests.internal.projects.TestJavaProject.SourceWriter; import org.eclipse.jpt.common.utility.internal.iterators.ArrayIterator; import org.eclipse.jpt.jpa.core.context.AssociationOverride; @@ -35,7 +37,6 @@ import org.eclipse.jpt.jpa.core.jpa2.context.VirtualOverrideRelationship2_0; import org.eclipse.jpt.jpa.core.jpa2.resource.java.AssociationOverride2_0Annotation; import org.eclipse.jpt.jpa.core.resource.java.AssociationOverrideAnnotation; import org.eclipse.jpt.jpa.core.resource.java.JPA; -import org.eclipse.jpt.jpa.core.resource.java.JavaResourcePersistentType; import org.eclipse.jpt.jpa.core.tests.internal.jpa2.context.Generic2_0ContextModelTestCase; @SuppressWarnings("nls") @@ -134,15 +135,15 @@ public class GenericJavaAssociationOverride2_0Tests extends Generic2_0ContextMod JavaAssociationOverrideContainer overrideContainer = getJavaEntity().getAssociationOverrideContainer(); - ReadOnlyAssociationOverride javaAssociationOverride = overrideContainer.virtualOverrides().next(); + ReadOnlyAssociationOverride javaAssociationOverride = overrideContainer.getVirtualOverrides().iterator().next(); javaAssociationOverride = ((VirtualAssociationOverride) javaAssociationOverride).convertToSpecified(); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(PACKAGE_NAME + ".AnnotationTestTypeChild"); - AssociationOverrideAnnotation associationOverrideResource = (AssociationOverrideAnnotation) typeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDE); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(PACKAGE_NAME + ".AnnotationTestTypeChild", Kind.TYPE); + AssociationOverrideAnnotation associationOverrideResource = (AssociationOverrideAnnotation) resourceType.getAnnotation(0, JPA.ASSOCIATION_OVERRIDE); assertEquals("address", javaAssociationOverride.getName()); assertEquals("address", associationOverrideResource.getName()); - assertTrue(overrideContainer.overrides().hasNext()); + assertTrue(overrideContainer.getOverrides().iterator().hasNext()); //set name in the resource model, verify context model updated associationOverrideResource.setName("FOO"); @@ -153,20 +154,20 @@ public class GenericJavaAssociationOverride2_0Tests extends Generic2_0ContextMod //set name to null in the resource model associationOverrideResource.setName(null); getJpaProject().synchronizeContextModel(); - assertEquals(0, overrideContainer.specifiedOverridesSize()); + assertEquals(0, overrideContainer.getSpecifiedOverridesSize()); assertNull(associationOverrideResource.getName()); associationOverrideResource.setName("FOO"); getJpaProject().synchronizeContextModel(); - assertEquals(1, overrideContainer.specifiedOverridesSize()); - javaAssociationOverride = overrideContainer.specifiedOverrides().next(); + assertEquals(1, overrideContainer.getSpecifiedOverridesSize()); + javaAssociationOverride = overrideContainer.getSpecifiedOverrides().iterator().next(); assertEquals("FOO", javaAssociationOverride.getName()); assertEquals("FOO", associationOverrideResource.getName()); - typeResource.removeAnnotation(0, JPA.ASSOCIATION_OVERRIDE, JPA.ASSOCIATION_OVERRIDES); + resourceType.removeAnnotation(0, JPA.ASSOCIATION_OVERRIDE); getJpaProject().synchronizeContextModel(); - assertFalse(overrideContainer.specifiedOverrides().hasNext()); - assertFalse(typeResource.annotations(JPA.ASSOCIATION_OVERRIDE, JPA.ASSOCIATION_OVERRIDES).hasNext()); + assertFalse(overrideContainer.getSpecifiedOverrides().iterator().hasNext()); + assertFalse(resourceType.getAnnotations(JPA.ASSOCIATION_OVERRIDE).iterator().hasNext()); } public void testModifyName() throws Exception { @@ -176,15 +177,15 @@ public class GenericJavaAssociationOverride2_0Tests extends Generic2_0ContextMod addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); JavaAssociationOverrideContainer overrideContainer = getJavaEntity().getAssociationOverrideContainer(); - VirtualAssociationOverride virtualAssociationOverride = overrideContainer.virtualOverrides().next(); + VirtualAssociationOverride virtualAssociationOverride = overrideContainer.getVirtualOverrides().iterator().next(); AssociationOverride specifiedAssociationOverride = virtualAssociationOverride.convertToSpecified(); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(PACKAGE_NAME + ".AnnotationTestTypeChild"); - AssociationOverrideAnnotation associationOverrideResource = (AssociationOverrideAnnotation) typeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDE); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(PACKAGE_NAME + ".AnnotationTestTypeChild", Kind.TYPE); + AssociationOverrideAnnotation associationOverrideResource = (AssociationOverrideAnnotation) resourceType.getAnnotation(0, JPA.ASSOCIATION_OVERRIDE); assertEquals("address", specifiedAssociationOverride.getName()); assertEquals("address", associationOverrideResource.getName()); - assertTrue(overrideContainer.overrides().hasNext()); + assertTrue(overrideContainer.getOverrides().iterator().hasNext()); //set name in the context model, verify resource model modified specifiedAssociationOverride.setName("foo"); @@ -194,7 +195,7 @@ public class GenericJavaAssociationOverride2_0Tests extends Generic2_0ContextMod //set name to null in the context model specifiedAssociationOverride.setName(null); assertNull(specifiedAssociationOverride.getName()); - associationOverrideResource = (AssociationOverrideAnnotation) typeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDE); + associationOverrideResource = (AssociationOverrideAnnotation) resourceType.getAnnotation(0, JPA.ASSOCIATION_OVERRIDE); assertNull(associationOverrideResource.getName()); } @@ -205,12 +206,12 @@ public class GenericJavaAssociationOverride2_0Tests extends Generic2_0ContextMod addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); JavaAssociationOverrideContainer overrideContainer = getJavaEntity().getAssociationOverrideContainer(); - AssociationOverride specifiedOverride = overrideContainer.virtualOverrides().next().convertToSpecified(); + AssociationOverride specifiedOverride = overrideContainer.getVirtualOverrides().iterator().next().convertToSpecified(); JoinColumnRelationshipStrategy joiningStrategy = specifiedOverride.getRelationship().getJoinColumnStrategy(); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(PACKAGE_NAME + ".AnnotationTestTypeChild"); - AssociationOverrideAnnotation associationOverrideResource = (AssociationOverrideAnnotation) typeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDE); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(PACKAGE_NAME + ".AnnotationTestTypeChild", Kind.TYPE); + AssociationOverrideAnnotation associationOverrideResource = (AssociationOverrideAnnotation) resourceType.getAnnotation(0, JPA.ASSOCIATION_OVERRIDE); JoinColumn joinColumn = joiningStrategy.addSpecifiedJoinColumn(0); @@ -231,12 +232,12 @@ public class GenericJavaAssociationOverride2_0Tests extends Generic2_0ContextMod assertEquals("BAZ", associationOverrideResource.joinColumnAt(1).getName()); assertEquals("FOO", associationOverrideResource.joinColumnAt(2).getName()); - ListIterator joinColumns = (ListIterator) joiningStrategy.specifiedJoinColumns(); + ListIterator joinColumns = joiningStrategy.getSpecifiedJoinColumns().iterator(); assertEquals(joinColumn2, joinColumns.next()); assertEquals(joinColumn3, joinColumns.next()); assertEquals(joinColumn, joinColumns.next()); - joinColumns = (ListIterator) joiningStrategy.specifiedJoinColumns(); + joinColumns = joiningStrategy.getSpecifiedJoinColumns().iterator(); assertEquals("BAR", joinColumns.next().getName()); assertEquals("BAZ", joinColumns.next().getName()); assertEquals("FOO", joinColumns.next().getName()); @@ -249,34 +250,34 @@ public class GenericJavaAssociationOverride2_0Tests extends Generic2_0ContextMod addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); JavaAssociationOverrideContainer overrideContainer = getJavaEntity().getAssociationOverrideContainer(); - AssociationOverride javaAssociationOverride = overrideContainer.virtualOverrides().next().convertToSpecified(); + AssociationOverride javaAssociationOverride = overrideContainer.getVirtualOverrides().iterator().next().convertToSpecified(); JoinColumnRelationshipStrategy joiningStrategy = javaAssociationOverride.getRelationship().getJoinColumnStrategy(); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(PACKAGE_NAME + ".AnnotationTestTypeChild"); - AssociationOverrideAnnotation associationOverrideResource = (AssociationOverrideAnnotation) typeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDE); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(PACKAGE_NAME + ".AnnotationTestTypeChild", Kind.TYPE); + AssociationOverrideAnnotation associationOverrideResource = (AssociationOverrideAnnotation) resourceType.getAnnotation(0, JPA.ASSOCIATION_OVERRIDE); - assertEquals(1, associationOverrideResource.joinColumnsSize()); + assertEquals(1, associationOverrideResource.getJoinColumnsSize()); joiningStrategy.addSpecifiedJoinColumn(0).setSpecifiedName("FOO"); joiningStrategy.addSpecifiedJoinColumn(1).setSpecifiedName("BAR"); joiningStrategy.addSpecifiedJoinColumn(2).setSpecifiedName("BAZ"); - assertEquals(4, associationOverrideResource.joinColumnsSize()); + assertEquals(4, associationOverrideResource.getJoinColumnsSize()); joiningStrategy.removeSpecifiedJoinColumn(0); - assertEquals(3, associationOverrideResource.joinColumnsSize()); + assertEquals(3, associationOverrideResource.getJoinColumnsSize()); assertEquals("BAR", associationOverrideResource.joinColumnAt(0).getName()); assertEquals("BAZ", associationOverrideResource.joinColumnAt(1).getName()); joiningStrategy.removeSpecifiedJoinColumn(0); - assertEquals(2, associationOverrideResource.joinColumnsSize()); + assertEquals(2, associationOverrideResource.getJoinColumnsSize()); assertEquals("BAZ", associationOverrideResource.joinColumnAt(0).getName()); joiningStrategy.removeSpecifiedJoinColumn(0); - assertEquals(1, associationOverrideResource.joinColumnsSize()); + assertEquals(1, associationOverrideResource.getJoinColumnsSize()); joiningStrategy.removeSpecifiedJoinColumn(0); - assertEquals(0, associationOverrideResource.joinColumnsSize()); + assertEquals(0, associationOverrideResource.getJoinColumnsSize()); } public void testMoveSpecifiedJoinColumn() throws Exception { @@ -286,21 +287,21 @@ public class GenericJavaAssociationOverride2_0Tests extends Generic2_0ContextMod addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); JavaAssociationOverrideContainer overrideContainer = getJavaEntity().getAssociationOverrideContainer(); - AssociationOverride javaAssociationOverride = overrideContainer.virtualOverrides().next().convertToSpecified(); + AssociationOverride javaAssociationOverride = overrideContainer.getVirtualOverrides().iterator().next().convertToSpecified(); JoinColumnRelationshipStrategy joiningStrategy = javaAssociationOverride.getRelationship().getJoinColumnStrategy(); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(PACKAGE_NAME + ".AnnotationTestTypeChild"); - AssociationOverrideAnnotation associationOverrideResource = (AssociationOverrideAnnotation) typeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDE); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(PACKAGE_NAME + ".AnnotationTestTypeChild", Kind.TYPE); + AssociationOverrideAnnotation associationOverrideResource = (AssociationOverrideAnnotation) resourceType.getAnnotation(0, JPA.ASSOCIATION_OVERRIDE); joiningStrategy.addSpecifiedJoinColumn(0).setSpecifiedName("FOO"); joiningStrategy.addSpecifiedJoinColumn(1).setSpecifiedName("BAR"); joiningStrategy.addSpecifiedJoinColumn(2).setSpecifiedName("BAZ"); - assertEquals(4, associationOverrideResource.joinColumnsSize()); + assertEquals(4, associationOverrideResource.getJoinColumnsSize()); joiningStrategy.moveSpecifiedJoinColumn(2, 0); - ListIterator joinColumns = (ListIterator) joiningStrategy.specifiedJoinColumns(); + ListIterator joinColumns = joiningStrategy.getSpecifiedJoinColumns().iterator(); assertEquals("BAR", joinColumns.next().getName()); assertEquals("BAZ", joinColumns.next().getName()); assertEquals("FOO", joinColumns.next().getName()); @@ -311,7 +312,7 @@ public class GenericJavaAssociationOverride2_0Tests extends Generic2_0ContextMod joiningStrategy.moveSpecifiedJoinColumn(0, 1); - joinColumns = (ListIterator) joiningStrategy.specifiedJoinColumns(); + joinColumns = joiningStrategy.getSpecifiedJoinColumns().iterator(); assertEquals("BAZ", joinColumns.next().getName()); assertEquals("BAR", joinColumns.next().getName()); assertEquals("FOO", joinColumns.next().getName()); @@ -328,14 +329,14 @@ public class GenericJavaAssociationOverride2_0Tests extends Generic2_0ContextMod addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); JavaAssociationOverrideContainer overrideContainer = getJavaEntity().getAssociationOverrideContainer(); - JavaVirtualAssociationOverride virtualAssociationOverride = overrideContainer.virtualOverrides().next(); + JavaVirtualAssociationOverride virtualAssociationOverride = overrideContainer.getVirtualOverrides().iterator().next(); JavaAssociationOverride specifiedAssociationOverride = virtualAssociationOverride.convertToSpecified(); JavaJoinColumnRelationshipStrategy joiningStrategy = specifiedAssociationOverride.getRelationship().getJoinColumnStrategy(); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(PACKAGE_NAME + ".AnnotationTestTypeChild"); - AssociationOverrideAnnotation associationOverrideResource = (AssociationOverrideAnnotation) typeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDE); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(PACKAGE_NAME + ".AnnotationTestTypeChild", Kind.TYPE); + AssociationOverrideAnnotation associationOverrideResource = (AssociationOverrideAnnotation) resourceType.getAnnotation(0, JPA.ASSOCIATION_OVERRIDE); - ListIterator joinColumns = joiningStrategy.specifiedJoinColumns(); + ListIterator joinColumns = joiningStrategy.getSpecifiedJoinColumns().iterator(); JoinColumn joinColumn = joinColumns.next(); assertEquals("address_id", joinColumn.getSpecifiedName()); assertEquals("id", joinColumn.getSpecifiedReferencedColumnName()); @@ -349,7 +350,7 @@ public class GenericJavaAssociationOverride2_0Tests extends Generic2_0ContextMod associationOverrideResource.joinColumnAt(2).setName("BAZ"); getJpaProject().synchronizeContextModel(); - joinColumns = joiningStrategy.specifiedJoinColumns(); + joinColumns = joiningStrategy.getSpecifiedJoinColumns().iterator(); assertEquals("FOO", joinColumns.next().getName()); assertEquals("BAR", joinColumns.next().getName()); assertEquals("BAZ", joinColumns.next().getName()); @@ -358,7 +359,7 @@ public class GenericJavaAssociationOverride2_0Tests extends Generic2_0ContextMod associationOverrideResource.moveJoinColumn(2, 0); getJpaProject().synchronizeContextModel(); - joinColumns = joiningStrategy.specifiedJoinColumns(); + joinColumns = joiningStrategy.getSpecifiedJoinColumns().iterator(); assertEquals("BAR", joinColumns.next().getName()); assertEquals("BAZ", joinColumns.next().getName()); assertEquals("FOO", joinColumns.next().getName()); @@ -367,7 +368,7 @@ public class GenericJavaAssociationOverride2_0Tests extends Generic2_0ContextMod associationOverrideResource.moveJoinColumn(0, 1); getJpaProject().synchronizeContextModel(); - joinColumns = joiningStrategy.specifiedJoinColumns(); + joinColumns = joiningStrategy.getSpecifiedJoinColumns().iterator(); assertEquals("BAZ", joinColumns.next().getName()); assertEquals("BAR", joinColumns.next().getName()); assertEquals("FOO", joinColumns.next().getName()); @@ -376,7 +377,7 @@ public class GenericJavaAssociationOverride2_0Tests extends Generic2_0ContextMod associationOverrideResource.removeJoinColumn(1); getJpaProject().synchronizeContextModel(); - joinColumns = joiningStrategy.specifiedJoinColumns(); + joinColumns = joiningStrategy.getSpecifiedJoinColumns().iterator(); assertEquals("BAZ", joinColumns.next().getName()); assertEquals("FOO", joinColumns.next().getName()); assertEquals("address_id", joinColumns.next().getName()); @@ -384,19 +385,19 @@ public class GenericJavaAssociationOverride2_0Tests extends Generic2_0ContextMod associationOverrideResource.removeJoinColumn(1); getJpaProject().synchronizeContextModel(); - joinColumns = joiningStrategy.specifiedJoinColumns(); + joinColumns = joiningStrategy.getSpecifiedJoinColumns().iterator(); assertEquals("BAZ", joinColumns.next().getName()); assertEquals("address_id", joinColumns.next().getName()); assertFalse(joinColumns.hasNext()); associationOverrideResource.removeJoinColumn(0); getJpaProject().synchronizeContextModel(); - joinColumns = joiningStrategy.specifiedJoinColumns(); + joinColumns = joiningStrategy.getSpecifiedJoinColumns().iterator(); assertEquals("address_id", joinColumns.next().getName()); associationOverrideResource.removeJoinColumn(0); getJpaProject().synchronizeContextModel(); - assertFalse(joiningStrategy.specifiedJoinColumns().hasNext()); + assertFalse(joiningStrategy.getSpecifiedJoinColumns().iterator().hasNext()); } public void testGetName() throws Exception { @@ -404,16 +405,16 @@ public class GenericJavaAssociationOverride2_0Tests extends Generic2_0ContextMod addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); JavaAssociationOverrideContainer overrideContainer = getJavaEntity().getAssociationOverrideContainer(); - AssociationOverride specifiedAssociationOverride = overrideContainer.specifiedOverrides().next(); + AssociationOverride specifiedAssociationOverride = overrideContainer.getSpecifiedOverrides().iterator().next(); assertEquals(ASSOCIATION_OVERRIDE_NAME, specifiedAssociationOverride.getName()); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - AssociationOverrideAnnotation associationOverrideResource = (AssociationOverrideAnnotation) typeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDE); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + AssociationOverrideAnnotation associationOverrideResource = (AssociationOverrideAnnotation) resourceType.getAnnotation(0, JPA.ASSOCIATION_OVERRIDE); associationOverrideResource.setName("FOO"); getJpaProject().synchronizeContextModel(); - specifiedAssociationOverride = overrideContainer.specifiedOverrides().next(); + specifiedAssociationOverride = overrideContainer.getSpecifiedOverrides().iterator().next(); assertEquals("FOO", specifiedAssociationOverride.getName()); } @@ -422,13 +423,13 @@ public class GenericJavaAssociationOverride2_0Tests extends Generic2_0ContextMod addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); JavaAssociationOverrideContainer overrideContainer = getJavaEntity().getAssociationOverrideContainer(); - AssociationOverride specifiedAssociationOverride = overrideContainer.specifiedOverrides().next(); + AssociationOverride specifiedAssociationOverride = overrideContainer.getSpecifiedOverrides().iterator().next(); assertEquals(ASSOCIATION_OVERRIDE_NAME, specifiedAssociationOverride.getName()); specifiedAssociationOverride.setName("FOO"); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - AssociationOverrideAnnotation associationOverrideResource = (AssociationOverrideAnnotation) typeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDE); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + AssociationOverrideAnnotation associationOverrideResource = (AssociationOverrideAnnotation) resourceType.getAnnotation(0, JPA.ASSOCIATION_OVERRIDE); assertEquals("FOO", associationOverrideResource.getName()); } @@ -442,9 +443,9 @@ public class GenericJavaAssociationOverride2_0Tests extends Generic2_0ContextMod Entity entity = getJavaEntity(); JavaAssociationOverrideContainer overrideContainer = getJavaEntity().getAssociationOverrideContainer(); assertEquals("AnnotationTestTypeChild", entity.getName()); - assertEquals(1, overrideContainer.virtualOverridesSize()); + assertEquals(1, overrideContainer.getVirtualOverridesSize()); - ReadOnlyAssociationOverride associationOverride = overrideContainer.virtualOverrides().next(); + ReadOnlyAssociationOverride associationOverride = overrideContainer.getVirtualOverrides().iterator().next(); assertEquals("address", associationOverride.getName()); } @@ -457,9 +458,9 @@ public class GenericJavaAssociationOverride2_0Tests extends Generic2_0ContextMod Entity entity = getJavaEntity(); JavaAssociationOverrideContainer overrideContainer = getJavaEntity().getAssociationOverrideContainer(); assertEquals("AnnotationTestTypeChild", entity.getName()); - assertEquals(1, overrideContainer.virtualOverridesSize()); + assertEquals(1, overrideContainer.getVirtualOverridesSize()); - ReadOnlyAssociationOverride associationOverride = overrideContainer.virtualOverrides().next(); + ReadOnlyAssociationOverride associationOverride = overrideContainer.getVirtualOverrides().iterator().next(); assertTrue(associationOverride.isVirtual()); } @@ -471,12 +472,12 @@ public class GenericJavaAssociationOverride2_0Tests extends Generic2_0ContextMod addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); JavaAssociationOverrideContainer overrideContainer = getJavaEntity().getAssociationOverrideContainer(); - ReadOnlyAssociationOverride javaAssociationOverride = overrideContainer.virtualOverrides().next(); + ReadOnlyAssociationOverride javaAssociationOverride = overrideContainer.getVirtualOverrides().iterator().next(); javaAssociationOverride = ((VirtualAssociationOverride) javaAssociationOverride).convertToSpecified(); JoinTableRelationshipStrategy joiningStrategy = ((OverrideRelationship2_0) javaAssociationOverride.getRelationship()).getJoinTableStrategy(); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(PACKAGE_NAME + ".AnnotationTestTypeChild"); - AssociationOverride2_0Annotation associationOverrideResource = (AssociationOverride2_0Annotation) typeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDE); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(PACKAGE_NAME + ".AnnotationTestTypeChild", Kind.TYPE); + AssociationOverride2_0Annotation associationOverrideResource = (AssociationOverride2_0Annotation) resourceType.getAnnotation(0, JPA.ASSOCIATION_OVERRIDE); JoinTable joinTable = joiningStrategy.getJoinTable(); @@ -492,12 +493,12 @@ public class GenericJavaAssociationOverride2_0Tests extends Generic2_0ContextMod addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); JavaAssociationOverrideContainer overrideContainer = getJavaEntity().getAssociationOverrideContainer(); - ReadOnlyAssociationOverride javaAssociationOverride = overrideContainer.virtualOverrides().next(); + ReadOnlyAssociationOverride javaAssociationOverride = overrideContainer.getVirtualOverrides().iterator().next(); javaAssociationOverride = ((VirtualAssociationOverride) javaAssociationOverride).convertToSpecified(); JoinTableRelationshipStrategy joiningStrategy = ((OverrideRelationship2_0) javaAssociationOverride.getRelationship()).getJoinTableStrategy(); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(PACKAGE_NAME + ".AnnotationTestTypeChild"); - AssociationOverride2_0Annotation associationOverrideResource = (AssociationOverride2_0Annotation) typeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDE); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(PACKAGE_NAME + ".AnnotationTestTypeChild", Kind.TYPE); + AssociationOverride2_0Annotation associationOverrideResource = (AssociationOverride2_0Annotation) resourceType.getAnnotation(0, JPA.ASSOCIATION_OVERRIDE); associationOverrideResource.getJoinTable().setName("MY_JOIN_TABLE"); getJpaProject().synchronizeContextModel(); @@ -513,7 +514,7 @@ public class GenericJavaAssociationOverride2_0Tests extends Generic2_0ContextMod associationOverrideResource.getJoinTable().joinColumnAt(2).setName("BAZ"); getJpaProject().synchronizeContextModel(); - ListIterator joinColumns = (ListIterator) joiningStrategy.getJoinTable().specifiedJoinColumns(); + ListIterator joinColumns = joiningStrategy.getJoinTable().getSpecifiedJoinColumns().iterator(); assertEquals("FOO", joinColumns.next().getName()); assertEquals("BAR", joinColumns.next().getName()); assertEquals("BAZ", joinColumns.next().getName()); @@ -521,7 +522,7 @@ public class GenericJavaAssociationOverride2_0Tests extends Generic2_0ContextMod associationOverrideResource.getJoinTable().moveJoinColumn(2, 0); getJpaProject().synchronizeContextModel(); - joinColumns = (ListIterator) joiningStrategy.getJoinTable().specifiedJoinColumns(); + joinColumns = joiningStrategy.getJoinTable().getSpecifiedJoinColumns().iterator(); assertEquals("BAR", joinColumns.next().getName()); assertEquals("BAZ", joinColumns.next().getName()); assertEquals("FOO", joinColumns.next().getName()); @@ -529,7 +530,7 @@ public class GenericJavaAssociationOverride2_0Tests extends Generic2_0ContextMod associationOverrideResource.getJoinTable().moveJoinColumn(0, 1); getJpaProject().synchronizeContextModel(); - joinColumns = (ListIterator) joiningStrategy.getJoinTable().specifiedJoinColumns(); + joinColumns = joiningStrategy.getJoinTable().getSpecifiedJoinColumns().iterator(); assertEquals("BAZ", joinColumns.next().getName()); assertEquals("BAR", joinColumns.next().getName()); assertEquals("FOO", joinColumns.next().getName()); @@ -537,20 +538,20 @@ public class GenericJavaAssociationOverride2_0Tests extends Generic2_0ContextMod associationOverrideResource.getJoinTable().removeJoinColumn(1); getJpaProject().synchronizeContextModel(); - joinColumns = (ListIterator) joiningStrategy.getJoinTable().specifiedJoinColumns(); + joinColumns = joiningStrategy.getJoinTable().getSpecifiedJoinColumns().iterator(); assertEquals("BAZ", joinColumns.next().getName()); assertEquals("FOO", joinColumns.next().getName()); assertFalse(joinColumns.hasNext()); associationOverrideResource.getJoinTable().removeJoinColumn(1); getJpaProject().synchronizeContextModel(); - joinColumns = (ListIterator) joiningStrategy.getJoinTable().specifiedJoinColumns(); + joinColumns = joiningStrategy.getJoinTable().getSpecifiedJoinColumns().iterator(); assertEquals("BAZ", joinColumns.next().getName()); assertFalse(joinColumns.hasNext()); associationOverrideResource.getJoinTable().removeJoinColumn(0); getJpaProject().synchronizeContextModel(); - assertFalse(joiningStrategy.getJoinTable().specifiedJoinColumns().hasNext()); + assertFalse(joiningStrategy.getJoinTable().getSpecifiedJoinColumns().iterator().hasNext()); } public void testDefaultJoinTableName() throws Exception { @@ -560,7 +561,7 @@ public class GenericJavaAssociationOverride2_0Tests extends Generic2_0ContextMod addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); JavaAssociationOverrideContainer overrideContainer = getJavaEntity().getAssociationOverrideContainer(); - ReadOnlyAssociationOverride javaAssociationOverride = overrideContainer.virtualOverrides().next(); + ReadOnlyAssociationOverride javaAssociationOverride = overrideContainer.getVirtualOverrides().iterator().next(); VirtualOverrideRelationship2_0 rel = (VirtualOverrideRelationship2_0) javaAssociationOverride.getRelationship(); VirtualJoinTable joinTable = rel.getJoinTableStrategy().getJoinTable(); diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/java/GenericJavaCascade2_0Tests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/java/GenericJavaCascade2_0Tests.java index 2693d0b513..f7858aa4ed 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/java/GenericJavaCascade2_0Tests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/java/GenericJavaCascade2_0Tests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2010 Oracle. All rights reserved. + * Copyright (c) 2010, 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. @@ -11,14 +11,15 @@ package org.eclipse.jpt.jpa.core.tests.internal.jpa2.context.java; import java.util.Iterator; import org.eclipse.jdt.core.ICompilationUnit; +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.JavaResourceAnnotatedElement.Kind; import org.eclipse.jpt.common.utility.internal.iterators.ArrayIterator; import org.eclipse.jpt.jpa.core.context.PersistentAttribute; import org.eclipse.jpt.jpa.core.jpa2.context.java.JavaCascade2_0; import org.eclipse.jpt.jpa.core.jpa2.context.java.JavaOneToOneMapping2_0; import org.eclipse.jpt.jpa.core.jpa2.resource.java.OneToOne2_0Annotation; 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.OneToOneAnnotation; import org.eclipse.jpt.jpa.core.tests.internal.jpa2.context.Generic2_0ContextModelTestCase; @@ -54,11 +55,11 @@ public class GenericJavaCascade2_0Tests createTestEntityWithOneToOneMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - OneToOne2_0Annotation annotation = (OneToOne2_0Annotation) attributeResource.getAnnotation(OneToOneAnnotation.ANNOTATION_NAME); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + OneToOne2_0Annotation annotation = (OneToOne2_0Annotation) resourceField.getAnnotation(OneToOneAnnotation.ANNOTATION_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); JavaOneToOneMapping2_0 mapping = (JavaOneToOneMapping2_0) persistentAttribute.getMapping(); JavaCascade2_0 cascade = (JavaCascade2_0) mapping.getCascade(); @@ -82,11 +83,11 @@ public class GenericJavaCascade2_0Tests createTestEntityWithOneToOneMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - OneToOne2_0Annotation annotation = (OneToOne2_0Annotation) attributeResource.getAnnotation(OneToOneAnnotation.ANNOTATION_NAME); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + OneToOne2_0Annotation annotation = (OneToOne2_0Annotation) resourceField.getAnnotation(OneToOneAnnotation.ANNOTATION_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); JavaOneToOneMapping2_0 mapping = (JavaOneToOneMapping2_0) persistentAttribute.getMapping(); JavaCascade2_0 cascade = (JavaCascade2_0) mapping.getCascade(); diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/java/GenericJavaCollectionTable2_0Tests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/java/GenericJavaCollectionTable2_0Tests.java index 9089c3dd54..58a2b8f8b1 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/java/GenericJavaCollectionTable2_0Tests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/java/GenericJavaCollectionTable2_0Tests.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,6 +12,9 @@ package org.eclipse.jpt.jpa.core.tests.internal.jpa2.context.java; import java.util.Iterator; import java.util.ListIterator; import org.eclipse.jdt.core.ICompilationUnit; +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.JavaResourceAnnotatedElement.Kind; import org.eclipse.jpt.common.utility.internal.iterators.ArrayIterator; import org.eclipse.jpt.jpa.core.context.JoinColumn; import org.eclipse.jpt.jpa.core.context.java.JavaJoinColumn; @@ -22,8 +25,6 @@ import org.eclipse.jpt.jpa.core.jpa2.context.java.JavaElementCollectionMapping2_ import org.eclipse.jpt.jpa.core.jpa2.resource.java.CollectionTable2_0Annotation; import org.eclipse.jpt.jpa.core.jpa2.resource.java.JPA2_0; 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.UniqueConstraintAnnotation; import org.eclipse.jpt.jpa.core.tests.internal.jpa2.context.Generic2_0ContextModelTestCase; @@ -74,21 +75,21 @@ public class GenericJavaCollectionTable2_0Tests extends Generic2_0ContextModelTe createTestEntityWithElementCollection(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - JavaElementCollectionMapping2_0 elementCollectionMapping = (JavaElementCollectionMapping2_0) getJavaPersistentType().attributes().next().getMapping(); + JavaElementCollectionMapping2_0 elementCollectionMapping = (JavaElementCollectionMapping2_0) getJavaPersistentType().getAttributes().iterator().next().getMapping(); CollectionTable2_0 collectionTable = elementCollectionMapping.getCollectionTable(); - 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(); - CollectionTable2_0Annotation resourceCollectionTable = (CollectionTable2_0Annotation) attributeResource.getAnnotation(CollectionTable2_0Annotation.ANNOTATION_NAME); + CollectionTable2_0Annotation resourceCollectionTable = (CollectionTable2_0Annotation) resourceField.getAnnotation(CollectionTable2_0Annotation.ANNOTATION_NAME); assertNull(collectionTable.getSpecifiedName()); assertNull(resourceCollectionTable); //set name in the resource model, verify context model updated - attributeResource.addAnnotation(CollectionTable2_0Annotation.ANNOTATION_NAME); - resourceCollectionTable = (CollectionTable2_0Annotation) attributeResource.getAnnotation(CollectionTable2_0Annotation.ANNOTATION_NAME); + resourceField.addAnnotation(CollectionTable2_0Annotation.ANNOTATION_NAME); + resourceCollectionTable = (CollectionTable2_0Annotation) resourceField.getAnnotation(CollectionTable2_0Annotation.ANNOTATION_NAME); resourceCollectionTable.setName("FOO"); getJpaProject().synchronizeContextModel(); assertEquals("FOO", collectionTable.getSpecifiedName()); @@ -105,37 +106,37 @@ public class GenericJavaCollectionTable2_0Tests extends Generic2_0ContextModelTe assertEquals("FOO", collectionTable.getSpecifiedName()); assertEquals("FOO", resourceCollectionTable.getName()); - attributeResource.removeAnnotation(CollectionTable2_0Annotation.ANNOTATION_NAME); + resourceField.removeAnnotation(CollectionTable2_0Annotation.ANNOTATION_NAME); getJpaProject().synchronizeContextModel(); assertNull(collectionTable.getSpecifiedName()); - assertNull(attributeResource.getAnnotation(CollectionTable2_0Annotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(CollectionTable2_0Annotation.ANNOTATION_NAME)); } public void testModifySpecifiedName() throws Exception { createTestEntityWithElementCollection(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - JavaElementCollectionMapping2_0 elementCollectionMapping = (JavaElementCollectionMapping2_0) getJavaPersistentType().attributes().next().getMapping(); + JavaElementCollectionMapping2_0 elementCollectionMapping = (JavaElementCollectionMapping2_0) getJavaPersistentType().getAttributes().iterator().next().getMapping(); CollectionTable2_0 collectionTable = elementCollectionMapping.getCollectionTable(); - 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(); - CollectionTable2_0Annotation resourceCollectionTable3 = (CollectionTable2_0Annotation) attributeResource.getAnnotation(CollectionTable2_0Annotation.ANNOTATION_NAME); + CollectionTable2_0Annotation resourceCollectionTable3 = (CollectionTable2_0Annotation) resourceField.getAnnotation(CollectionTable2_0Annotation.ANNOTATION_NAME); assertNull(collectionTable.getSpecifiedName()); assertNull(resourceCollectionTable3); //set name in the context model, verify resource model modified collectionTable.setSpecifiedName("foo"); - resourceCollectionTable3 = (CollectionTable2_0Annotation) attributeResource.getAnnotation(CollectionTable2_0Annotation.ANNOTATION_NAME); + resourceCollectionTable3 = (CollectionTable2_0Annotation) resourceField.getAnnotation(CollectionTable2_0Annotation.ANNOTATION_NAME); assertEquals("foo", collectionTable.getSpecifiedName()); assertEquals("foo", resourceCollectionTable3.getName()); //set name to null in the context model collectionTable.setSpecifiedName(null); assertNull(collectionTable.getSpecifiedName()); - assertNull(attributeResource.getAnnotation(CollectionTable2_0Annotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(CollectionTable2_0Annotation.ANNOTATION_NAME)); } public void testDefaultName() throws Exception { @@ -143,19 +144,19 @@ public class GenericJavaCollectionTable2_0Tests extends Generic2_0ContextModelTe addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - JavaElementCollectionMapping2_0 elementCollectionMapping = (JavaElementCollectionMapping2_0) getJavaPersistentType().attributes().next().getMapping(); + JavaElementCollectionMapping2_0 elementCollectionMapping = (JavaElementCollectionMapping2_0) getJavaPersistentType().getAttributes().iterator().next().getMapping(); CollectionTable2_0 collectionTable = elementCollectionMapping.getCollectionTable(); assertEquals(TYPE_NAME + "_projects", collectionTable.getDefaultName()); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - assertNull(attributeResource.getAnnotation(CollectionTable2_0Annotation.ANNOTATION_NAME)); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + assertNull(resourceField.getAnnotation(CollectionTable2_0Annotation.ANNOTATION_NAME)); //add the collection table annotation, verify default collection table name is the same - attributeResource.addAnnotation(CollectionTable2_0Annotation.ANNOTATION_NAME); + resourceField.addAnnotation(CollectionTable2_0Annotation.ANNOTATION_NAME); assertEquals(TYPE_NAME + "_projects", collectionTable.getDefaultName()); - assertNotNull(attributeResource.getAnnotation(CollectionTable2_0Annotation.ANNOTATION_NAME)); + assertNotNull(resourceField.getAnnotation(CollectionTable2_0Annotation.ANNOTATION_NAME)); //set the entity name, verify default collection table name updates getJavaEntity().setSpecifiedName("Foo"); @@ -166,21 +167,21 @@ public class GenericJavaCollectionTable2_0Tests extends Generic2_0ContextModelTe createTestEntityWithElementCollection(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - JavaElementCollectionMapping2_0 elementCollectionMapping = (JavaElementCollectionMapping2_0) getJavaPersistentType().attributes().next().getMapping(); + JavaElementCollectionMapping2_0 elementCollectionMapping = (JavaElementCollectionMapping2_0) getJavaPersistentType().getAttributes().iterator().next().getMapping(); CollectionTable2_0 collectionTable = elementCollectionMapping.getCollectionTable(); - 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(); - CollectionTable2_0Annotation resourceCollectionTable = (CollectionTable2_0Annotation) attributeResource.getAnnotation(CollectionTable2_0Annotation.ANNOTATION_NAME); + CollectionTable2_0Annotation resourceCollectionTable = (CollectionTable2_0Annotation) resourceField.getAnnotation(CollectionTable2_0Annotation.ANNOTATION_NAME); assertNull(collectionTable.getSpecifiedSchema()); assertNull(resourceCollectionTable); //set schema in the resource model, verify context model updated - attributeResource.addAnnotation(CollectionTable2_0Annotation.ANNOTATION_NAME); - resourceCollectionTable = (CollectionTable2_0Annotation) attributeResource.getAnnotation(CollectionTable2_0Annotation.ANNOTATION_NAME); + resourceField.addAnnotation(CollectionTable2_0Annotation.ANNOTATION_NAME); + resourceCollectionTable = (CollectionTable2_0Annotation) resourceField.getAnnotation(CollectionTable2_0Annotation.ANNOTATION_NAME); resourceCollectionTable.setSchema("FOO"); getJpaProject().synchronizeContextModel(); assertEquals("FOO", collectionTable.getSpecifiedSchema()); @@ -197,58 +198,58 @@ public class GenericJavaCollectionTable2_0Tests extends Generic2_0ContextModelTe assertEquals("FOO", collectionTable.getSpecifiedSchema()); assertEquals("FOO", resourceCollectionTable.getSchema()); - attributeResource.removeAnnotation(CollectionTable2_0Annotation.ANNOTATION_NAME); + resourceField.removeAnnotation(CollectionTable2_0Annotation.ANNOTATION_NAME); getJpaProject().synchronizeContextModel(); assertNull(collectionTable.getSpecifiedSchema()); - assertNull(attributeResource.getAnnotation(CollectionTable2_0Annotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(CollectionTable2_0Annotation.ANNOTATION_NAME)); } public void testModifySpecifiedSchema() throws Exception { createTestEntityWithElementCollection(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - JavaElementCollectionMapping2_0 elementCollectionMapping = (JavaElementCollectionMapping2_0) getJavaPersistentType().attributes().next().getMapping(); + JavaElementCollectionMapping2_0 elementCollectionMapping = (JavaElementCollectionMapping2_0) getJavaPersistentType().getAttributes().iterator().next().getMapping(); CollectionTable2_0 collectionTable = elementCollectionMapping.getCollectionTable(); - 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(); - CollectionTable2_0Annotation resourceCollectionTable = (CollectionTable2_0Annotation) attributeResource.getAnnotation(CollectionTable2_0Annotation.ANNOTATION_NAME); + CollectionTable2_0Annotation resourceCollectionTable = (CollectionTable2_0Annotation) resourceField.getAnnotation(CollectionTable2_0Annotation.ANNOTATION_NAME); assertNull(collectionTable.getSpecifiedSchema()); assertNull(resourceCollectionTable); //set schema in the context model, verify resource model modified collectionTable.setSpecifiedSchema("foo"); - resourceCollectionTable = (CollectionTable2_0Annotation) attributeResource.getAnnotation(CollectionTable2_0Annotation.ANNOTATION_NAME); + resourceCollectionTable = (CollectionTable2_0Annotation) resourceField.getAnnotation(CollectionTable2_0Annotation.ANNOTATION_NAME); assertEquals("foo", collectionTable.getSpecifiedSchema()); assertEquals("foo", resourceCollectionTable.getSchema()); //set schema to null in the context model collectionTable.setSpecifiedSchema(null); assertNull(collectionTable.getSpecifiedSchema()); - assertNull(attributeResource.getAnnotation(CollectionTable2_0Annotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(CollectionTable2_0Annotation.ANNOTATION_NAME)); } public void testUpdateSpecifiedCatalog() throws Exception { createTestEntityWithElementCollection(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - JavaElementCollectionMapping2_0 elementCollectionMapping = (JavaElementCollectionMapping2_0) getJavaPersistentType().attributes().next().getMapping(); + JavaElementCollectionMapping2_0 elementCollectionMapping = (JavaElementCollectionMapping2_0) getJavaPersistentType().getAttributes().iterator().next().getMapping(); CollectionTable2_0 collectionTable = elementCollectionMapping.getCollectionTable(); - 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(); - CollectionTable2_0Annotation resourceCollectionTable = (CollectionTable2_0Annotation) attributeResource.getAnnotation(CollectionTable2_0Annotation.ANNOTATION_NAME); + CollectionTable2_0Annotation resourceCollectionTable = (CollectionTable2_0Annotation) resourceField.getAnnotation(CollectionTable2_0Annotation.ANNOTATION_NAME); assertNull(collectionTable.getSpecifiedCatalog()); assertNull(resourceCollectionTable); //set catalog in the resource model, verify context model updated - attributeResource.addAnnotation(CollectionTable2_0Annotation.ANNOTATION_NAME); - resourceCollectionTable = (CollectionTable2_0Annotation) attributeResource.getAnnotation(CollectionTable2_0Annotation.ANNOTATION_NAME); + resourceField.addAnnotation(CollectionTable2_0Annotation.ANNOTATION_NAME); + resourceCollectionTable = (CollectionTable2_0Annotation) resourceField.getAnnotation(CollectionTable2_0Annotation.ANNOTATION_NAME); resourceCollectionTable.setCatalog("FOO"); getJpaProject().synchronizeContextModel(); assertEquals("FOO", collectionTable.getSpecifiedCatalog()); @@ -265,54 +266,54 @@ public class GenericJavaCollectionTable2_0Tests extends Generic2_0ContextModelTe assertEquals("FOO", collectionTable.getSpecifiedCatalog()); assertEquals("FOO", resourceCollectionTable.getCatalog()); - attributeResource.removeAnnotation(CollectionTable2_0Annotation.ANNOTATION_NAME); + resourceField.removeAnnotation(CollectionTable2_0Annotation.ANNOTATION_NAME); getJpaProject().synchronizeContextModel(); assertNull(collectionTable.getSpecifiedCatalog()); - assertNull(attributeResource.getAnnotation(CollectionTable2_0Annotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(CollectionTable2_0Annotation.ANNOTATION_NAME)); } public void testModifySpecifiedCatalog() throws Exception { createTestEntityWithElementCollection(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - JavaElementCollectionMapping2_0 elementCollectionMapping = (JavaElementCollectionMapping2_0) getJavaPersistentType().attributes().next().getMapping(); + JavaElementCollectionMapping2_0 elementCollectionMapping = (JavaElementCollectionMapping2_0) getJavaPersistentType().getAttributes().iterator().next().getMapping(); CollectionTable2_0 collectionTable = elementCollectionMapping.getCollectionTable(); - 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(); - CollectionTable2_0Annotation resourceCollectionTable = (CollectionTable2_0Annotation) attributeResource.getAnnotation(CollectionTable2_0Annotation.ANNOTATION_NAME); + CollectionTable2_0Annotation resourceCollectionTable = (CollectionTable2_0Annotation) resourceField.getAnnotation(CollectionTable2_0Annotation.ANNOTATION_NAME); assertNull(collectionTable.getSpecifiedCatalog()); assertNull(resourceCollectionTable); //set catalog in the context model, verify resource model modified collectionTable.setSpecifiedCatalog("foo"); - resourceCollectionTable = (CollectionTable2_0Annotation) attributeResource.getAnnotation(CollectionTable2_0Annotation.ANNOTATION_NAME); + resourceCollectionTable = (CollectionTable2_0Annotation) resourceField.getAnnotation(CollectionTable2_0Annotation.ANNOTATION_NAME); assertEquals("foo", collectionTable.getSpecifiedCatalog()); assertEquals("foo", resourceCollectionTable.getCatalog()); //set catalog to null in the context model collectionTable.setSpecifiedCatalog(null); assertNull(collectionTable.getSpecifiedCatalog()); - assertNull(attributeResource.getAnnotation(CollectionTable2_0Annotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(CollectionTable2_0Annotation.ANNOTATION_NAME)); } public void testAddSpecifiedJoinColumn() throws Exception { createTestEntityWithElementCollection(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - JavaElementCollectionMapping2_0 elementCollectionMapping = (JavaElementCollectionMapping2_0) getJavaPersistentType().attributes().next().getMapping(); + JavaElementCollectionMapping2_0 elementCollectionMapping = (JavaElementCollectionMapping2_0) getJavaPersistentType().getAttributes().iterator().next().getMapping(); JavaCollectionTable2_0 collectionTable = elementCollectionMapping.getCollectionTable(); - 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(); JoinColumn joinColumn = collectionTable.addSpecifiedJoinColumn(0); joinColumn.setSpecifiedName("FOO"); - CollectionTable2_0Annotation joinTableResource = (CollectionTable2_0Annotation) attributeResource.getAnnotation(CollectionTable2_0Annotation.ANNOTATION_NAME); + CollectionTable2_0Annotation joinTableResource = (CollectionTable2_0Annotation) resourceField.getAnnotation(CollectionTable2_0Annotation.ANNOTATION_NAME); assertEquals("FOO", joinTableResource.joinColumnAt(0).getName()); @@ -329,12 +330,12 @@ public class GenericJavaCollectionTable2_0Tests extends Generic2_0ContextModelTe assertEquals("BAZ", joinTableResource.joinColumnAt(1).getName()); assertEquals("FOO", joinTableResource.joinColumnAt(2).getName()); - ListIterator joinColumns = collectionTable.specifiedJoinColumns(); + ListIterator joinColumns = collectionTable.getSpecifiedJoinColumns().iterator(); assertEquals(joinColumn2, joinColumns.next()); assertEquals(joinColumn3, joinColumns.next()); assertEquals(joinColumn, joinColumns.next()); - joinColumns = collectionTable.specifiedJoinColumns(); + joinColumns = collectionTable.getSpecifiedJoinColumns().iterator(); assertEquals("BAR", joinColumns.next().getName()); assertEquals("BAZ", joinColumns.next().getName()); assertEquals("FOO", joinColumns.next().getName()); @@ -344,52 +345,52 @@ public class GenericJavaCollectionTable2_0Tests extends Generic2_0ContextModelTe createTestEntityWithElementCollection(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - JavaElementCollectionMapping2_0 elementCollectionMapping = (JavaElementCollectionMapping2_0) getJavaPersistentType().attributes().next().getMapping(); + JavaElementCollectionMapping2_0 elementCollectionMapping = (JavaElementCollectionMapping2_0) getJavaPersistentType().getAttributes().iterator().next().getMapping(); CollectionTable2_0 collectionTable = elementCollectionMapping.getCollectionTable(); - 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(); collectionTable.addSpecifiedJoinColumn(0).setSpecifiedName("FOO"); collectionTable.addSpecifiedJoinColumn(1).setSpecifiedName("BAR"); collectionTable.addSpecifiedJoinColumn(2).setSpecifiedName("BAZ"); - CollectionTable2_0Annotation joinTableResource = (CollectionTable2_0Annotation) attributeResource.getAnnotation(CollectionTable2_0Annotation.ANNOTATION_NAME); - assertEquals(3, joinTableResource.joinColumnsSize()); + CollectionTable2_0Annotation joinTableResource = (CollectionTable2_0Annotation) resourceField.getAnnotation(CollectionTable2_0Annotation.ANNOTATION_NAME); + assertEquals(3, joinTableResource.getJoinColumnsSize()); collectionTable.removeSpecifiedJoinColumn(0); - assertEquals(2, joinTableResource.joinColumnsSize()); + assertEquals(2, joinTableResource.getJoinColumnsSize()); assertEquals("BAR", joinTableResource.joinColumnAt(0).getName()); assertEquals("BAZ", joinTableResource.joinColumnAt(1).getName()); collectionTable.removeSpecifiedJoinColumn(0); - assertEquals(1, joinTableResource.joinColumnsSize()); + assertEquals(1, joinTableResource.getJoinColumnsSize()); assertEquals("BAZ", joinTableResource.joinColumnAt(0).getName()); collectionTable.removeSpecifiedJoinColumn(0); - assertEquals(0, joinTableResource.joinColumnsSize()); + assertEquals(0, joinTableResource.getJoinColumnsSize()); } public void testMoveSpecifiedJoinColumn() throws Exception { createTestEntityWithElementCollection(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - JavaElementCollectionMapping2_0 elementCollectionMapping = (JavaElementCollectionMapping2_0) getJavaPersistentType().attributes().next().getMapping(); + JavaElementCollectionMapping2_0 elementCollectionMapping = (JavaElementCollectionMapping2_0) getJavaPersistentType().getAttributes().iterator().next().getMapping(); JavaCollectionTable2_0 collectionTable = elementCollectionMapping.getCollectionTable(); - 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(); collectionTable.addSpecifiedJoinColumn(0).setSpecifiedName("FOO"); collectionTable.addSpecifiedJoinColumn(1).setSpecifiedName("BAR"); collectionTable.addSpecifiedJoinColumn(2).setSpecifiedName("BAZ"); - CollectionTable2_0Annotation joinTableResource = (CollectionTable2_0Annotation) attributeResource.getAnnotation(CollectionTable2_0Annotation.ANNOTATION_NAME); - assertEquals(3, joinTableResource.joinColumnsSize()); + CollectionTable2_0Annotation joinTableResource = (CollectionTable2_0Annotation) resourceField.getAnnotation(CollectionTable2_0Annotation.ANNOTATION_NAME); + assertEquals(3, joinTableResource.getJoinColumnsSize()); collectionTable.moveSpecifiedJoinColumn(2, 0); - ListIterator joinColumns = collectionTable.specifiedJoinColumns(); + ListIterator joinColumns = collectionTable.getSpecifiedJoinColumns().iterator(); assertEquals("BAR", joinColumns.next().getName()); assertEquals("BAZ", joinColumns.next().getName()); assertEquals("FOO", joinColumns.next().getName()); @@ -400,7 +401,7 @@ public class GenericJavaCollectionTable2_0Tests extends Generic2_0ContextModelTe collectionTable.moveSpecifiedJoinColumn(0, 1); - joinColumns = collectionTable.specifiedJoinColumns(); + joinColumns = collectionTable.getSpecifiedJoinColumns().iterator(); assertEquals("BAZ", joinColumns.next().getName()); assertEquals("BAR", joinColumns.next().getName()); assertEquals("FOO", joinColumns.next().getName()); @@ -414,13 +415,13 @@ public class GenericJavaCollectionTable2_0Tests extends Generic2_0ContextModelTe createTestEntityWithElementCollection(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - JavaElementCollectionMapping2_0 elementCollectionMapping = (JavaElementCollectionMapping2_0) getJavaPersistentType().attributes().next().getMapping(); + JavaElementCollectionMapping2_0 elementCollectionMapping = (JavaElementCollectionMapping2_0) getJavaPersistentType().getAttributes().iterator().next().getMapping(); JavaCollectionTable2_0 collectionTable = elementCollectionMapping.getCollectionTable(); - 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(); - CollectionTable2_0Annotation joinTableResource = (CollectionTable2_0Annotation) attributeResource.addAnnotation(CollectionTable2_0Annotation.ANNOTATION_NAME); + CollectionTable2_0Annotation joinTableResource = (CollectionTable2_0Annotation) resourceField.addAnnotation(CollectionTable2_0Annotation.ANNOTATION_NAME); joinTableResource.addJoinColumn(0); joinTableResource.addJoinColumn(1); @@ -431,7 +432,7 @@ public class GenericJavaCollectionTable2_0Tests extends Generic2_0ContextModelTe joinTableResource.joinColumnAt(2).setName("BAZ"); getJpaProject().synchronizeContextModel(); - ListIterator joinColumns = collectionTable.specifiedJoinColumns(); + ListIterator joinColumns = collectionTable.getSpecifiedJoinColumns().iterator(); assertEquals("FOO", joinColumns.next().getName()); assertEquals("BAR", joinColumns.next().getName()); assertEquals("BAZ", joinColumns.next().getName()); @@ -439,7 +440,7 @@ public class GenericJavaCollectionTable2_0Tests extends Generic2_0ContextModelTe joinTableResource.moveJoinColumn(2, 0); getJpaProject().synchronizeContextModel(); - joinColumns = collectionTable.specifiedJoinColumns(); + joinColumns = collectionTable.getSpecifiedJoinColumns().iterator(); assertEquals("BAR", joinColumns.next().getName()); assertEquals("BAZ", joinColumns.next().getName()); assertEquals("FOO", joinColumns.next().getName()); @@ -447,7 +448,7 @@ public class GenericJavaCollectionTable2_0Tests extends Generic2_0ContextModelTe joinTableResource.moveJoinColumn(0, 1); getJpaProject().synchronizeContextModel(); - joinColumns = collectionTable.specifiedJoinColumns(); + joinColumns = collectionTable.getSpecifiedJoinColumns().iterator(); assertEquals("BAZ", joinColumns.next().getName()); assertEquals("BAR", joinColumns.next().getName()); assertEquals("FOO", joinColumns.next().getName()); @@ -455,20 +456,20 @@ public class GenericJavaCollectionTable2_0Tests extends Generic2_0ContextModelTe joinTableResource.removeJoinColumn(1); getJpaProject().synchronizeContextModel(); - joinColumns = collectionTable.specifiedJoinColumns(); + joinColumns = collectionTable.getSpecifiedJoinColumns().iterator(); assertEquals("BAZ", joinColumns.next().getName()); assertEquals("FOO", joinColumns.next().getName()); assertFalse(joinColumns.hasNext()); joinTableResource.removeJoinColumn(1); getJpaProject().synchronizeContextModel(); - joinColumns = collectionTable.specifiedJoinColumns(); + joinColumns = collectionTable.getSpecifiedJoinColumns().iterator(); assertEquals("BAZ", joinColumns.next().getName()); assertFalse(joinColumns.hasNext()); joinTableResource.removeJoinColumn(0); getJpaProject().synchronizeContextModel(); - assertFalse(collectionTable.specifiedJoinColumns().hasNext()); + assertFalse(collectionTable.getSpecifiedJoinColumns().iterator().hasNext()); } public void testGetDefaultJoinColumn() { @@ -479,36 +480,36 @@ public class GenericJavaCollectionTable2_0Tests extends Generic2_0ContextModelTe createTestEntityWithElementCollection(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - JavaElementCollectionMapping2_0 elementCollectionMapping = (JavaElementCollectionMapping2_0) getJavaPersistentType().attributes().next().getMapping(); + JavaElementCollectionMapping2_0 elementCollectionMapping = (JavaElementCollectionMapping2_0) getJavaPersistentType().getAttributes().iterator().next().getMapping(); CollectionTable2_0 collectionTable = elementCollectionMapping.getCollectionTable(); - assertEquals(0, collectionTable.specifiedJoinColumnsSize()); + assertEquals(0, collectionTable.getSpecifiedJoinColumnsSize()); collectionTable.addSpecifiedJoinColumn(0); - assertEquals(1, collectionTable.specifiedJoinColumnsSize()); + assertEquals(1, collectionTable.getSpecifiedJoinColumnsSize()); collectionTable.removeSpecifiedJoinColumn(0); - assertEquals(0, collectionTable.specifiedJoinColumnsSize()); + assertEquals(0, collectionTable.getSpecifiedJoinColumnsSize()); } public void testUniqueConstraints() throws Exception { createTestEntityWithElementCollection(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - JavaElementCollectionMapping2_0 elementCollectionMapping = (JavaElementCollectionMapping2_0) getJavaPersistentType().attributes().next().getMapping(); + JavaElementCollectionMapping2_0 elementCollectionMapping = (JavaElementCollectionMapping2_0) getJavaPersistentType().getAttributes().iterator().next().getMapping(); JavaCollectionTable2_0 collectionTable = elementCollectionMapping.getCollectionTable(); - ListIterator uniqueConstraints = collectionTable.uniqueConstraints(); + ListIterator uniqueConstraints = collectionTable.getUniqueConstraints().iterator(); assertFalse(uniqueConstraints.hasNext()); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - CollectionTable2_0Annotation joinTableAnnotation = (CollectionTable2_0Annotation) attributeResource.addAnnotation(CollectionTable2_0Annotation.ANNOTATION_NAME); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + CollectionTable2_0Annotation joinTableAnnotation = (CollectionTable2_0Annotation) resourceField.addAnnotation(CollectionTable2_0Annotation.ANNOTATION_NAME); joinTableAnnotation.addUniqueConstraint(0).addColumnName(0, "foo"); joinTableAnnotation.addUniqueConstraint(0).addColumnName(0, "bar"); getJpaProject().synchronizeContextModel(); - uniqueConstraints = collectionTable.uniqueConstraints(); + uniqueConstraints = collectionTable.getUniqueConstraints().iterator(); assertTrue(uniqueConstraints.hasNext()); assertEquals("bar", uniqueConstraints.next().getColumnNames().iterator().next()); assertEquals("foo", uniqueConstraints.next().getColumnNames().iterator().next()); @@ -519,39 +520,39 @@ public class GenericJavaCollectionTable2_0Tests extends Generic2_0ContextModelTe createTestEntityWithElementCollection(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - JavaElementCollectionMapping2_0 elementCollectionMapping = (JavaElementCollectionMapping2_0) getJavaPersistentType().attributes().next().getMapping(); + JavaElementCollectionMapping2_0 elementCollectionMapping = (JavaElementCollectionMapping2_0) getJavaPersistentType().getAttributes().iterator().next().getMapping(); CollectionTable2_0 collectionTable = elementCollectionMapping.getCollectionTable(); - assertEquals(0, collectionTable.uniqueConstraintsSize()); + assertEquals(0, collectionTable.getUniqueConstraintsSize()); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - CollectionTable2_0Annotation joinTableAnnotation = (CollectionTable2_0Annotation) attributeResource.addAnnotation(CollectionTable2_0Annotation.ANNOTATION_NAME); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + CollectionTable2_0Annotation joinTableAnnotation = (CollectionTable2_0Annotation) resourceField.addAnnotation(CollectionTable2_0Annotation.ANNOTATION_NAME); joinTableAnnotation.addUniqueConstraint(0).addColumnName(0, "foo"); joinTableAnnotation.addUniqueConstraint(1).addColumnName(0, "bar"); getJpaProject().synchronizeContextModel(); - assertEquals(2, collectionTable.uniqueConstraintsSize()); + assertEquals(2, collectionTable.getUniqueConstraintsSize()); } public void testAddUniqueConstraint() throws Exception { createTestEntityWithElementCollection(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - JavaElementCollectionMapping2_0 elementCollectionMapping = (JavaElementCollectionMapping2_0) getJavaPersistentType().attributes().next().getMapping(); + JavaElementCollectionMapping2_0 elementCollectionMapping = (JavaElementCollectionMapping2_0) getJavaPersistentType().getAttributes().iterator().next().getMapping(); CollectionTable2_0 collectionTable = elementCollectionMapping.getCollectionTable(); collectionTable.addUniqueConstraint(0).addColumnName(0, "FOO"); collectionTable.addUniqueConstraint(0).addColumnName(0, "BAR"); collectionTable.addUniqueConstraint(0).addColumnName(0, "BAZ"); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - CollectionTable2_0Annotation joinTableAnnotation = (CollectionTable2_0Annotation) attributeResource.getAnnotation(CollectionTable2_0Annotation.ANNOTATION_NAME); - ListIterator uniqueConstraints = joinTableAnnotation.uniqueConstraints(); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + CollectionTable2_0Annotation joinTableAnnotation = (CollectionTable2_0Annotation) resourceField.getAnnotation(CollectionTable2_0Annotation.ANNOTATION_NAME); + ListIterator uniqueConstraints = joinTableAnnotation.getUniqueConstraints().iterator(); - assertEquals("BAZ", uniqueConstraints.next().columnNames().next()); - assertEquals("BAR", uniqueConstraints.next().columnNames().next()); - assertEquals("FOO", uniqueConstraints.next().columnNames().next()); + assertEquals("BAZ", uniqueConstraints.next().columnNameAt(0)); + assertEquals("BAR", uniqueConstraints.next().columnNameAt(0)); + assertEquals("FOO", uniqueConstraints.next().columnNameAt(0)); assertFalse(uniqueConstraints.hasNext()); } @@ -559,20 +560,20 @@ public class GenericJavaCollectionTable2_0Tests extends Generic2_0ContextModelTe createTestEntityWithElementCollection(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - JavaElementCollectionMapping2_0 elementCollectionMapping = (JavaElementCollectionMapping2_0) getJavaPersistentType().attributes().next().getMapping(); + JavaElementCollectionMapping2_0 elementCollectionMapping = (JavaElementCollectionMapping2_0) getJavaPersistentType().getAttributes().iterator().next().getMapping(); CollectionTable2_0 collectionTable = elementCollectionMapping.getCollectionTable(); collectionTable.addUniqueConstraint(0).addColumnName(0, "FOO"); collectionTable.addUniqueConstraint(1).addColumnName(0, "BAR"); collectionTable.addUniqueConstraint(0).addColumnName(0, "BAZ"); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - CollectionTable2_0Annotation joinTableAnnotation = (CollectionTable2_0Annotation) attributeResource.getAnnotation(CollectionTable2_0Annotation.ANNOTATION_NAME); - ListIterator uniqueConstraints = joinTableAnnotation.uniqueConstraints(); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + CollectionTable2_0Annotation joinTableAnnotation = (CollectionTable2_0Annotation) resourceField.getAnnotation(CollectionTable2_0Annotation.ANNOTATION_NAME); + ListIterator uniqueConstraints = joinTableAnnotation.getUniqueConstraints().iterator(); - assertEquals("BAZ", uniqueConstraints.next().columnNames().next()); - assertEquals("FOO", uniqueConstraints.next().columnNames().next()); - assertEquals("BAR", uniqueConstraints.next().columnNames().next()); + assertEquals("BAZ", uniqueConstraints.next().columnNameAt(0)); + assertEquals("FOO", uniqueConstraints.next().columnNameAt(0)); + assertEquals("BAR", uniqueConstraints.next().columnNameAt(0)); assertFalse(uniqueConstraints.hasNext()); } @@ -580,45 +581,45 @@ public class GenericJavaCollectionTable2_0Tests extends Generic2_0ContextModelTe createTestEntityWithElementCollection(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - JavaElementCollectionMapping2_0 elementCollectionMapping = (JavaElementCollectionMapping2_0) getJavaPersistentType().attributes().next().getMapping(); + JavaElementCollectionMapping2_0 elementCollectionMapping = (JavaElementCollectionMapping2_0) getJavaPersistentType().getAttributes().iterator().next().getMapping(); JavaCollectionTable2_0 collectionTable = elementCollectionMapping.getCollectionTable(); collectionTable.addUniqueConstraint(0).addColumnName(0, "FOO"); collectionTable.addUniqueConstraint(1).addColumnName(0, "BAR"); collectionTable.addUniqueConstraint(2).addColumnName(0, "BAZ"); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - CollectionTable2_0Annotation joinTableAnnotation = (CollectionTable2_0Annotation) attributeResource.getAnnotation(CollectionTable2_0Annotation.ANNOTATION_NAME); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + CollectionTable2_0Annotation joinTableAnnotation = (CollectionTable2_0Annotation) resourceField.getAnnotation(CollectionTable2_0Annotation.ANNOTATION_NAME); - assertEquals(3, joinTableAnnotation.uniqueConstraintsSize()); + assertEquals(3, joinTableAnnotation.getUniqueConstraintsSize()); collectionTable.removeUniqueConstraint(1); - ListIterator uniqueConstraintAnnotations = joinTableAnnotation.uniqueConstraints(); - assertEquals("FOO", uniqueConstraintAnnotations.next().columnNames().next()); - assertEquals("BAZ", uniqueConstraintAnnotations.next().columnNames().next()); + ListIterator uniqueConstraintAnnotations = joinTableAnnotation.getUniqueConstraints().iterator(); + assertEquals("FOO", uniqueConstraintAnnotations.next().columnNameAt(0)); + assertEquals("BAZ", uniqueConstraintAnnotations.next().columnNameAt(0)); assertFalse(uniqueConstraintAnnotations.hasNext()); - Iterator uniqueConstraints = collectionTable.uniqueConstraints(); + Iterator uniqueConstraints = collectionTable.getUniqueConstraints().iterator(); assertEquals("FOO", uniqueConstraints.next().getColumnNames().iterator().next()); assertEquals("BAZ", uniqueConstraints.next().getColumnNames().iterator().next()); assertFalse(uniqueConstraints.hasNext()); collectionTable.removeUniqueConstraint(1); - uniqueConstraintAnnotations = joinTableAnnotation.uniqueConstraints(); - assertEquals("FOO", uniqueConstraintAnnotations.next().columnNames().next()); + uniqueConstraintAnnotations = joinTableAnnotation.getUniqueConstraints().iterator(); + assertEquals("FOO", uniqueConstraintAnnotations.next().columnNameAt(0)); assertFalse(uniqueConstraintAnnotations.hasNext()); - uniqueConstraints = collectionTable.uniqueConstraints(); + uniqueConstraints = collectionTable.getUniqueConstraints().iterator(); assertEquals("FOO", uniqueConstraints.next().getColumnNames().iterator().next()); assertFalse(uniqueConstraints.hasNext()); collectionTable.removeUniqueConstraint(0); - uniqueConstraintAnnotations = joinTableAnnotation.uniqueConstraints(); + uniqueConstraintAnnotations = joinTableAnnotation.getUniqueConstraints().iterator(); assertFalse(uniqueConstraintAnnotations.hasNext()); - uniqueConstraints = collectionTable.uniqueConstraints(); + uniqueConstraints = collectionTable.getUniqueConstraints().iterator(); assertFalse(uniqueConstraints.hasNext()); } @@ -626,52 +627,52 @@ public class GenericJavaCollectionTable2_0Tests extends Generic2_0ContextModelTe createTestEntityWithElementCollection(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - JavaElementCollectionMapping2_0 elementCollectionMapping = (JavaElementCollectionMapping2_0) getJavaPersistentType().attributes().next().getMapping(); + JavaElementCollectionMapping2_0 elementCollectionMapping = (JavaElementCollectionMapping2_0) getJavaPersistentType().getAttributes().iterator().next().getMapping(); JavaCollectionTable2_0 collectionTable = elementCollectionMapping.getCollectionTable(); collectionTable.addUniqueConstraint(0).addColumnName(0, "FOO"); collectionTable.addUniqueConstraint(1).addColumnName(0, "BAR"); collectionTable.addUniqueConstraint(2).addColumnName(0, "BAZ"); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - CollectionTable2_0Annotation joinTableAnnotation = (CollectionTable2_0Annotation) attributeResource.getAnnotation(CollectionTable2_0Annotation.ANNOTATION_NAME); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + CollectionTable2_0Annotation joinTableAnnotation = (CollectionTable2_0Annotation) resourceField.getAnnotation(CollectionTable2_0Annotation.ANNOTATION_NAME); - assertEquals(3, joinTableAnnotation.uniqueConstraintsSize()); + assertEquals(3, joinTableAnnotation.getUniqueConstraintsSize()); collectionTable.moveUniqueConstraint(2, 0); - ListIterator uniqueConstraints = collectionTable.uniqueConstraints(); + ListIterator uniqueConstraints = collectionTable.getUniqueConstraints().iterator(); assertEquals("BAR", uniqueConstraints.next().getColumnNames().iterator().next()); assertEquals("BAZ", uniqueConstraints.next().getColumnNames().iterator().next()); assertEquals("FOO", uniqueConstraints.next().getColumnNames().iterator().next()); - ListIterator uniqueConstraintAnnotations = joinTableAnnotation.uniqueConstraints(); - assertEquals("BAR", uniqueConstraintAnnotations.next().columnNames().next()); - assertEquals("BAZ", uniqueConstraintAnnotations.next().columnNames().next()); - assertEquals("FOO", uniqueConstraintAnnotations.next().columnNames().next()); + ListIterator uniqueConstraintAnnotations = joinTableAnnotation.getUniqueConstraints().iterator(); + assertEquals("BAR", uniqueConstraintAnnotations.next().columnNameAt(0)); + assertEquals("BAZ", uniqueConstraintAnnotations.next().columnNameAt(0)); + assertEquals("FOO", uniqueConstraintAnnotations.next().columnNameAt(0)); collectionTable.moveUniqueConstraint(0, 1); - uniqueConstraints = collectionTable.uniqueConstraints(); + uniqueConstraints = collectionTable.getUniqueConstraints().iterator(); assertEquals("BAZ", uniqueConstraints.next().getColumnNames().iterator().next()); assertEquals("BAR", uniqueConstraints.next().getColumnNames().iterator().next()); assertEquals("FOO", uniqueConstraints.next().getColumnNames().iterator().next()); - uniqueConstraintAnnotations = joinTableAnnotation.uniqueConstraints(); - assertEquals("BAZ", uniqueConstraintAnnotations.next().columnNames().next()); - assertEquals("BAR", uniqueConstraintAnnotations.next().columnNames().next()); - assertEquals("FOO", uniqueConstraintAnnotations.next().columnNames().next()); + uniqueConstraintAnnotations = joinTableAnnotation.getUniqueConstraints().iterator(); + assertEquals("BAZ", uniqueConstraintAnnotations.next().columnNameAt(0)); + assertEquals("BAR", uniqueConstraintAnnotations.next().columnNameAt(0)); + assertEquals("FOO", uniqueConstraintAnnotations.next().columnNameAt(0)); } public void testUpdateUniqueConstraints() throws Exception { createTestEntityWithElementCollection(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - JavaElementCollectionMapping2_0 elementCollectionMapping = (JavaElementCollectionMapping2_0) getJavaPersistentType().attributes().next().getMapping(); + JavaElementCollectionMapping2_0 elementCollectionMapping = (JavaElementCollectionMapping2_0) getJavaPersistentType().getAttributes().iterator().next().getMapping(); JavaCollectionTable2_0 collectionTable = elementCollectionMapping.getCollectionTable(); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - CollectionTable2_0Annotation joinTableAnnotation = (CollectionTable2_0Annotation) attributeResource.addAnnotation(CollectionTable2_0Annotation.ANNOTATION_NAME); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + CollectionTable2_0Annotation joinTableAnnotation = (CollectionTable2_0Annotation) resourceField.addAnnotation(CollectionTable2_0Annotation.ANNOTATION_NAME); joinTableAnnotation.addUniqueConstraint(0).addColumnName("FOO"); joinTableAnnotation.addUniqueConstraint(1).addColumnName("BAR"); @@ -679,7 +680,7 @@ public class GenericJavaCollectionTable2_0Tests extends Generic2_0ContextModelTe getJpaProject().synchronizeContextModel(); - ListIterator uniqueConstraints = collectionTable.uniqueConstraints(); + ListIterator uniqueConstraints = collectionTable.getUniqueConstraints().iterator(); assertEquals("FOO", uniqueConstraints.next().getColumnNames().iterator().next()); assertEquals("BAR", uniqueConstraints.next().getColumnNames().iterator().next()); assertEquals("BAZ", uniqueConstraints.next().getColumnNames().iterator().next()); @@ -687,7 +688,7 @@ public class GenericJavaCollectionTable2_0Tests extends Generic2_0ContextModelTe joinTableAnnotation.moveUniqueConstraint(2, 0); getJpaProject().synchronizeContextModel(); - uniqueConstraints = collectionTable.uniqueConstraints(); + uniqueConstraints = collectionTable.getUniqueConstraints().iterator(); assertEquals("BAR", uniqueConstraints.next().getColumnNames().iterator().next()); assertEquals("BAZ", uniqueConstraints.next().getColumnNames().iterator().next()); assertEquals("FOO", uniqueConstraints.next().getColumnNames().iterator().next()); @@ -695,7 +696,7 @@ public class GenericJavaCollectionTable2_0Tests extends Generic2_0ContextModelTe joinTableAnnotation.moveUniqueConstraint(0, 1); getJpaProject().synchronizeContextModel(); - uniqueConstraints = collectionTable.uniqueConstraints(); + uniqueConstraints = collectionTable.getUniqueConstraints().iterator(); assertEquals("BAZ", uniqueConstraints.next().getColumnNames().iterator().next()); assertEquals("BAR", uniqueConstraints.next().getColumnNames().iterator().next()); assertEquals("FOO", uniqueConstraints.next().getColumnNames().iterator().next()); @@ -703,20 +704,20 @@ public class GenericJavaCollectionTable2_0Tests extends Generic2_0ContextModelTe joinTableAnnotation.removeUniqueConstraint(1); getJpaProject().synchronizeContextModel(); - uniqueConstraints = collectionTable.uniqueConstraints(); + uniqueConstraints = collectionTable.getUniqueConstraints().iterator(); assertEquals("BAZ", uniqueConstraints.next().getColumnNames().iterator().next()); assertEquals("FOO", uniqueConstraints.next().getColumnNames().iterator().next()); assertFalse(uniqueConstraints.hasNext()); joinTableAnnotation.removeUniqueConstraint(1); getJpaProject().synchronizeContextModel(); - uniqueConstraints = collectionTable.uniqueConstraints(); + uniqueConstraints = collectionTable.getUniqueConstraints().iterator(); assertEquals("BAZ", uniqueConstraints.next().getColumnNames().iterator().next()); assertFalse(uniqueConstraints.hasNext()); joinTableAnnotation.removeUniqueConstraint(0); getJpaProject().synchronizeContextModel(); - uniqueConstraints = collectionTable.uniqueConstraints(); + uniqueConstraints = collectionTable.getUniqueConstraints().iterator(); assertFalse(uniqueConstraints.hasNext()); } } \ No newline at end of file diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/java/GenericJavaElementCollectionMapping2_0Tests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/java/GenericJavaElementCollectionMapping2_0Tests.java index 1dec604670..9c6dcc0119 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/java/GenericJavaElementCollectionMapping2_0Tests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/java/GenericJavaElementCollectionMapping2_0Tests.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,6 +12,10 @@ package org.eclipse.jpt.jpa.core.tests.internal.jpa2.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.ReflectionTools; import org.eclipse.jpt.common.utility.internal.iterators.ArrayIterator; @@ -47,19 +51,15 @@ import org.eclipse.jpt.jpa.core.jpa2.resource.java.JPA2_0; import org.eclipse.jpt.jpa.core.jpa2.resource.java.MapKeyClass2_0Annotation; import org.eclipse.jpt.jpa.core.jpa2.resource.java.MapKeyColumn2_0Annotation; 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.BasicAnnotation; import org.eclipse.jpt.jpa.core.resource.java.ColumnAnnotation; 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.ManyToManyAnnotation; import org.eclipse.jpt.jpa.core.resource.java.ManyToOneAnnotation; import org.eclipse.jpt.jpa.core.resource.java.MapKeyAnnotation; -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.TransientAnnotation; import org.eclipse.jpt.jpa.core.resource.java.VersionAnnotation; @@ -344,7 +344,7 @@ public class GenericJavaElementCollectionMapping2_0Tests extends Generic2_0Conte createTestEntityWithElementCollectionMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ElementCollectionMapping2_0 elementCollectionMapping = (ElementCollectionMapping2_0) persistentAttribute.getMapping(); assertFalse(elementCollectionMapping.isDefault()); @@ -352,33 +352,33 @@ public class GenericJavaElementCollectionMapping2_0Tests extends Generic2_0Conte 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(ElementCollection2_0Annotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getAnnotation(BasicAnnotation.ANNOTATION_NAME)); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + assertNull(resourceField.getAnnotation(ElementCollection2_0Annotation.ANNOTATION_NAME)); + assertNotNull(resourceField.getAnnotation(BasicAnnotation.ANNOTATION_NAME)); } public void testMorphToDefault() throws Exception { createTestEntityWithElementCollectionMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ElementCollectionMapping2_0 elementCollectionMapping = (ElementCollectionMapping2_0) persistentAttribute.getMapping(); assertFalse(elementCollectionMapping.isDefault()); 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(ElementCollection2_0Annotation.ANNOTATION_NAME)); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + assertNull(resourceField.getAnnotation(ElementCollection2_0Annotation.ANNOTATION_NAME)); } public void testMorphToVersionMapping() throws Exception { createTestEntityWithElementCollectionMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ElementCollectionMapping2_0 elementCollectionMapping = (ElementCollectionMapping2_0) persistentAttribute.getMapping(); assertFalse(elementCollectionMapping.isDefault()); @@ -386,17 +386,17 @@ public class GenericJavaElementCollectionMapping2_0Tests extends Generic2_0Conte 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(ElementCollection2_0Annotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getAnnotation(VersionAnnotation.ANNOTATION_NAME)); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + assertNull(resourceField.getAnnotation(ElementCollection2_0Annotation.ANNOTATION_NAME)); + assertNotNull(resourceField.getAnnotation(VersionAnnotation.ANNOTATION_NAME)); } public void testMorphToIdMapping() throws Exception { createTestEntityWithElementCollectionMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ElementCollectionMapping2_0 elementCollectionMapping = (ElementCollectionMapping2_0) persistentAttribute.getMapping(); assertFalse(elementCollectionMapping.isDefault()); @@ -404,17 +404,17 @@ public class GenericJavaElementCollectionMapping2_0Tests extends Generic2_0Conte 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(ElementCollection2_0Annotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getAnnotation(IdAnnotation.ANNOTATION_NAME)); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + assertNull(resourceField.getAnnotation(ElementCollection2_0Annotation.ANNOTATION_NAME)); + assertNotNull(resourceField.getAnnotation(IdAnnotation.ANNOTATION_NAME)); } public void testMorphToEmbeddedMapping() throws Exception { createTestEntityWithElementCollectionMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ElementCollectionMapping2_0 elementCollectionMapping = (ElementCollectionMapping2_0) persistentAttribute.getMapping(); assertFalse(elementCollectionMapping.isDefault()); @@ -422,17 +422,17 @@ public class GenericJavaElementCollectionMapping2_0Tests extends Generic2_0Conte 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(ElementCollection2_0Annotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getAnnotation(EmbeddedAnnotation.ANNOTATION_NAME)); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + assertNull(resourceField.getAnnotation(ElementCollection2_0Annotation.ANNOTATION_NAME)); + assertNotNull(resourceField.getAnnotation(EmbeddedAnnotation.ANNOTATION_NAME)); } public void testMorphToEmbeddedIdMapping() throws Exception { createTestEntityWithElementCollectionMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ElementCollectionMapping2_0 elementCollectionMapping = (ElementCollectionMapping2_0) persistentAttribute.getMapping(); assertFalse(elementCollectionMapping.isDefault()); @@ -440,17 +440,17 @@ public class GenericJavaElementCollectionMapping2_0Tests extends Generic2_0Conte 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(ElementCollection2_0Annotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getAnnotation(EmbeddedIdAnnotation.ANNOTATION_NAME)); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + assertNull(resourceField.getAnnotation(ElementCollection2_0Annotation.ANNOTATION_NAME)); + assertNotNull(resourceField.getAnnotation(EmbeddedIdAnnotation.ANNOTATION_NAME)); } public void testMorphToTransientMapping() throws Exception { createTestEntityWithElementCollectionMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ElementCollectionMapping2_0 elementCollectionMapping = (ElementCollectionMapping2_0) persistentAttribute.getMapping(); assertFalse(elementCollectionMapping.isDefault()); @@ -458,17 +458,17 @@ public class GenericJavaElementCollectionMapping2_0Tests extends Generic2_0Conte 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(ElementCollection2_0Annotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getAnnotation(TransientAnnotation.ANNOTATION_NAME)); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + assertNull(resourceField.getAnnotation(ElementCollection2_0Annotation.ANNOTATION_NAME)); + assertNotNull(resourceField.getAnnotation(TransientAnnotation.ANNOTATION_NAME)); } public void testMorphToManyToOneMapping() throws Exception { createTestEntityWithElementCollectionMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ElementCollectionMapping2_0 elementCollectionMapping = (ElementCollectionMapping2_0) persistentAttribute.getMapping(); assertFalse(elementCollectionMapping.isDefault()); @@ -476,17 +476,17 @@ public class GenericJavaElementCollectionMapping2_0Tests extends Generic2_0Conte 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(ElementCollection2_0Annotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getAnnotation(ManyToOneAnnotation.ANNOTATION_NAME)); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + assertNull(resourceField.getAnnotation(ElementCollection2_0Annotation.ANNOTATION_NAME)); + assertNotNull(resourceField.getAnnotation(ManyToOneAnnotation.ANNOTATION_NAME)); } public void testMorphToOneToManyMapping() throws Exception { createTestEntityWithElementCollectionMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ElementCollectionMapping2_0 elementCollectionMapping = (ElementCollectionMapping2_0) persistentAttribute.getMapping(); assertFalse(elementCollectionMapping.isDefault()); @@ -494,17 +494,17 @@ public class GenericJavaElementCollectionMapping2_0Tests extends Generic2_0Conte 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(ElementCollection2_0Annotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getAnnotation(OneToManyAnnotation.ANNOTATION_NAME)); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + assertNull(resourceField.getAnnotation(ElementCollection2_0Annotation.ANNOTATION_NAME)); + assertNotNull(resourceField.getAnnotation(OneToManyAnnotation.ANNOTATION_NAME)); } public void testMorphToManyToManyMapping() throws Exception { createTestEntityWithElementCollectionMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ElementCollectionMapping2_0 elementCollectionMapping = (ElementCollectionMapping2_0) persistentAttribute.getMapping(); assertFalse(elementCollectionMapping.isDefault()); @@ -512,22 +512,22 @@ public class GenericJavaElementCollectionMapping2_0Tests extends Generic2_0Conte 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(ElementCollection2_0Annotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getAnnotation(ManyToManyAnnotation.ANNOTATION_NAME)); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + assertNull(resourceField.getAnnotation(ElementCollection2_0Annotation.ANNOTATION_NAME)); + assertNotNull(resourceField.getAnnotation(ManyToManyAnnotation.ANNOTATION_NAME)); } public void testUpdateSpecifiedTargetEntity() throws Exception { createTestEntityWithElementCollectionMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ElementCollectionMapping2_0 elementCollectionMapping = (ElementCollectionMapping2_0) persistentAttribute.getMapping(); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - ElementCollection2_0Annotation elementCollectionAnnotation = (ElementCollection2_0Annotation) attributeResource.getAnnotation(ElementCollection2_0Annotation.ANNOTATION_NAME); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + ElementCollection2_0Annotation elementCollectionAnnotation = (ElementCollection2_0Annotation) resourceField.getAnnotation(ElementCollection2_0Annotation.ANNOTATION_NAME); assertNull(elementCollectionMapping.getSpecifiedTargetClass()); assertNull(elementCollectionAnnotation.getTargetClass()); @@ -549,12 +549,12 @@ public class GenericJavaElementCollectionMapping2_0Tests extends Generic2_0Conte createTestEntityWithElementCollectionMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ElementCollectionMapping2_0 elementCollectionMapping = (ElementCollectionMapping2_0) persistentAttribute.getMapping(); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - ElementCollection2_0Annotation elementCollection = (ElementCollection2_0Annotation) attributeResource.getAnnotation(ElementCollection2_0Annotation.ANNOTATION_NAME); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + ElementCollection2_0Annotation elementCollection = (ElementCollection2_0Annotation) resourceField.getAnnotation(ElementCollection2_0Annotation.ANNOTATION_NAME); assertNull(elementCollectionMapping.getSpecifiedTargetClass()); assertNull(elementCollection.getTargetClass()); @@ -575,7 +575,7 @@ public class GenericJavaElementCollectionMapping2_0Tests extends Generic2_0Conte createTestTargetEmbeddableAddress(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ElementCollectionMapping2_0 elementCollectionMapping = (ElementCollectionMapping2_0) persistentAttribute.getMapping(); //targetEntity not in the persistence unit, default still set, handled by validation @@ -589,7 +589,7 @@ public class GenericJavaElementCollectionMapping2_0Tests extends Generic2_0Conte elementCollectionMapping.setSpecifiedTargetClass("foo"); assertEquals(PACKAGE_NAME + ".Address", elementCollectionMapping.getDefaultTargetClass()); - ListIterator classRefs = getPersistenceUnit().specifiedClassRefs(); + ListIterator classRefs = getPersistenceUnit().getSpecifiedClassRefs().iterator(); classRefs.next(); ClassRef addressClassRef = classRefs.next(); JavaPersistentType addressPersistentType = addressClassRef.getJavaPersistentType(); @@ -605,7 +605,7 @@ public class GenericJavaElementCollectionMapping2_0Tests extends Generic2_0Conte addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); addXmlClassRef(PACKAGE_NAME + ".Address"); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ElementCollectionMapping2_0 elementCollectionMapping = (ElementCollectionMapping2_0) persistentAttribute.getMapping(); assertNull(elementCollectionMapping.getDefaultTargetClass()); @@ -617,7 +617,7 @@ public class GenericJavaElementCollectionMapping2_0Tests extends Generic2_0Conte addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); addXmlClassRef(PACKAGE_NAME + ".Address"); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ElementCollectionMapping2_0 elementCollectionMapping = (ElementCollectionMapping2_0) persistentAttribute.getMapping(); assertEquals(PACKAGE_NAME + ".Address", elementCollectionMapping.getDefaultTargetClass()); @@ -629,7 +629,7 @@ public class GenericJavaElementCollectionMapping2_0Tests extends Generic2_0Conte addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); addXmlClassRef(PACKAGE_NAME + ".Address"); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ElementCollectionMapping2_0 elementCollectionMapping = (ElementCollectionMapping2_0) persistentAttribute.getMapping(); assertNull(elementCollectionMapping.getDefaultTargetClass()); @@ -641,7 +641,7 @@ public class GenericJavaElementCollectionMapping2_0Tests extends Generic2_0Conte addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); addXmlClassRef(PACKAGE_NAME + ".Address"); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ElementCollectionMapping2_0 elementCollectionMapping = (ElementCollectionMapping2_0) persistentAttribute.getMapping(); assertEquals(PACKAGE_NAME + ".Address", elementCollectionMapping.getDefaultTargetClass()); @@ -652,7 +652,7 @@ public class GenericJavaElementCollectionMapping2_0Tests extends Generic2_0Conte createTestTargetEmbeddableAddress(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ElementCollectionMapping2_0 elementCollectionMapping = (ElementCollectionMapping2_0) persistentAttribute.getMapping(); assertEquals(PACKAGE_NAME + ".Address", elementCollectionMapping.getTargetClass()); @@ -672,7 +672,7 @@ public class GenericJavaElementCollectionMapping2_0Tests extends Generic2_0Conte createTestEntityWithGenericEmbeddableElementCollectionMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ElementCollectionMapping2_0 elementCollectionMapping = (ElementCollectionMapping2_0) persistentAttribute.getMapping(); //target embeddable not in the persistence unit @@ -681,7 +681,7 @@ public class GenericJavaElementCollectionMapping2_0Tests extends Generic2_0Conte //add target embeddable to the persistence unit, now target embeddable should resolve createTestTargetEmbeddableAddress(); addXmlClassRef(PACKAGE_NAME + ".Address"); - ListIterator classRefs = getPersistenceUnit().specifiedClassRefs(); + ListIterator classRefs = getPersistenceUnit().getSpecifiedClassRefs().iterator(); classRefs.next(); ClassRef addressClassRef = classRefs.next(); TypeMapping addressTypeMapping = addressClassRef.getJavaPersistentType().getMapping(); @@ -704,7 +704,7 @@ public class GenericJavaElementCollectionMapping2_0Tests extends Generic2_0Conte createTestEntityWithGenericBasicElementCollectionMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ElementCollectionMapping2_0 elementCollectionMapping = (ElementCollectionMapping2_0) persistentAttribute.getMapping(); //target is a basic type, so resolved target embeddable is null @@ -715,12 +715,12 @@ public class GenericJavaElementCollectionMapping2_0Tests extends Generic2_0Conte createTestEntityWithElementCollectionMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ElementCollectionMapping2_0 elementCollectionMapping = (ElementCollectionMapping2_0) persistentAttribute.getMapping(); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - ElementCollection2_0Annotation elementCollection = (ElementCollection2_0Annotation) attributeResource.getAnnotation(ElementCollection2_0Annotation.ANNOTATION_NAME); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + ElementCollection2_0Annotation elementCollection = (ElementCollection2_0Annotation) resourceField.getAnnotation(ElementCollection2_0Annotation.ANNOTATION_NAME); assertNull(elementCollectionMapping.getSpecifiedFetch()); assertNull(elementCollection.getFetch()); @@ -747,12 +747,12 @@ public class GenericJavaElementCollectionMapping2_0Tests extends Generic2_0Conte createTestEntityWithElementCollectionMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ElementCollectionMapping2_0 elementCollectionMapping = (ElementCollectionMapping2_0) persistentAttribute.getMapping(); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - ElementCollection2_0Annotation elementCollection = (ElementCollection2_0Annotation) attributeResource.getAnnotation(ElementCollection2_0Annotation.ANNOTATION_NAME); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + ElementCollection2_0Annotation elementCollection = (ElementCollection2_0Annotation) resourceField.getAnnotation(ElementCollection2_0Annotation.ANNOTATION_NAME); assertNull(elementCollectionMapping.getSpecifiedFetch()); assertNull(elementCollection.getFetch()); @@ -777,7 +777,7 @@ public class GenericJavaElementCollectionMapping2_0Tests extends Generic2_0Conte createTestTargetEmbeddableAddress(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ElementCollectionMapping2_0 elementCollectionMapping = (ElementCollectionMapping2_0) persistentAttribute.getMapping(); assertEquals(ElementCollectionMapping2_0.Type.EMBEDDABLE_TYPE, elementCollectionMapping.getValueType()); @@ -788,7 +788,7 @@ public class GenericJavaElementCollectionMapping2_0Tests extends Generic2_0Conte createTestTargetEmbeddableAddress(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ElementCollectionMapping2_0 elementCollectionMapping = (ElementCollectionMapping2_0) persistentAttribute.getMapping(); assertEquals(ElementCollectionMapping2_0.Type.NO_TYPE, elementCollectionMapping.getValueType()); @@ -802,7 +802,7 @@ public class GenericJavaElementCollectionMapping2_0Tests extends Generic2_0Conte createTestTargetEmbeddableAddress(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ElementCollectionMapping2_0 elementCollectionMapping = (ElementCollectionMapping2_0) persistentAttribute.getMapping(); assertEquals(ElementCollectionMapping2_0.Type.BASIC_TYPE, elementCollectionMapping.getValueType()); @@ -812,19 +812,19 @@ public class GenericJavaElementCollectionMapping2_0Tests extends Generic2_0Conte createTestEntityWithElementCollectionMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ElementCollectionMapping2_0 elementCollectionMapping = (ElementCollectionMapping2_0) persistentAttribute.getMapping(); - 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(); assertNull(elementCollectionMapping.getSpecifiedMapKey()); - assertNull(attributeResource.getAnnotation(MapKeyAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(MapKeyAnnotation.ANNOTATION_NAME)); //set mapKey in the resource model, verify context model does not change - attributeResource.addAnnotation(MapKeyAnnotation.ANNOTATION_NAME); + resourceField.addAnnotation(MapKeyAnnotation.ANNOTATION_NAME); assertNull(elementCollectionMapping.getSpecifiedMapKey()); - MapKeyAnnotation mapKey = (MapKeyAnnotation) attributeResource.getAnnotation(MapKeyAnnotation.ANNOTATION_NAME); + MapKeyAnnotation mapKey = (MapKeyAnnotation) resourceField.getAnnotation(MapKeyAnnotation.ANNOTATION_NAME); assertNotNull(mapKey); //set mapKey name in the resource model, verify context model updated @@ -841,38 +841,38 @@ public class GenericJavaElementCollectionMapping2_0Tests extends Generic2_0Conte assertNull(mapKey.getName()); mapKey.setName("myMapKey"); - attributeResource.removeAnnotation(MapKeyAnnotation.ANNOTATION_NAME); + resourceField.removeAnnotation(MapKeyAnnotation.ANNOTATION_NAME); getJpaProject().synchronizeContextModel(); assertNull(elementCollectionMapping.getSpecifiedMapKey()); - assertNull(attributeResource.getAnnotation(MapKeyAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(MapKeyAnnotation.ANNOTATION_NAME)); } public void testModifyMapKey() throws Exception { createTestEntityWithElementCollectionMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ElementCollectionMapping2_0 elementCollectionMapping = (ElementCollectionMapping2_0) persistentAttribute.getMapping(); - 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(); assertNull(elementCollectionMapping.getSpecifiedMapKey()); - assertNull(attributeResource.getAnnotation(MapKeyAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(MapKeyAnnotation.ANNOTATION_NAME)); //set mapKey in the context model, verify resource model updated elementCollectionMapping.setSpecifiedMapKey("myMapKey"); - MapKeyAnnotation mapKeyAnnotation = (MapKeyAnnotation) attributeResource.getAnnotation(MapKeyAnnotation.ANNOTATION_NAME); + MapKeyAnnotation mapKeyAnnotation = (MapKeyAnnotation) resourceField.getAnnotation(MapKeyAnnotation.ANNOTATION_NAME); assertEquals("myMapKey", elementCollectionMapping.getSpecifiedMapKey()); assertEquals("myMapKey", mapKeyAnnotation.getName()); //set mapKey to null in the context model elementCollectionMapping.setSpecifiedMapKey(null); assertNull(elementCollectionMapping.getSpecifiedMapKey()); - mapKeyAnnotation = (MapKeyAnnotation) attributeResource.getAnnotation(MapKeyAnnotation.ANNOTATION_NAME); + mapKeyAnnotation = (MapKeyAnnotation) resourceField.getAnnotation(MapKeyAnnotation.ANNOTATION_NAME); assertNull(mapKeyAnnotation.getName()); elementCollectionMapping.setNoMapKey(true); - assertNull(attributeResource.getAnnotation(MapKeyAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(MapKeyAnnotation.ANNOTATION_NAME)); } public void testCandidateMapKeyNames() throws Exception { @@ -883,7 +883,7 @@ public class GenericJavaElementCollectionMapping2_0Tests extends Generic2_0Conte addXmlClassRef(PACKAGE_NAME + ".Address"); addXmlClassRef(PACKAGE_NAME + ".State"); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ElementCollectionMapping2_0 elementCollectionMapping2_0 = (ElementCollectionMapping2_0) persistentAttribute.getMapping(); Iterator mapKeyNames = @@ -904,7 +904,7 @@ public class GenericJavaElementCollectionMapping2_0Tests extends Generic2_0Conte addXmlClassRef(PACKAGE_NAME + ".Address"); addXmlClassRef(PACKAGE_NAME + ".State"); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ElementCollectionMapping2_0 elementCollectionMapping2_0 = (ElementCollectionMapping2_0) persistentAttribute.getMapping(); Iterator mapKeyNames = elementCollectionMapping2_0.candidateMapKeyNames(); @@ -928,19 +928,19 @@ public class GenericJavaElementCollectionMapping2_0Tests extends Generic2_0Conte createTestEntityWithElementCollectionMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ElementCollectionMapping2_0 elementCollectionMapping = (ElementCollectionMapping2_0) persistentAttribute.getMapping(); - 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(); assertNull(elementCollectionMapping.getSpecifiedMapKeyClass()); - assertNull(attributeResource.getAnnotation(MapKeyClass2_0Annotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(MapKeyClass2_0Annotation.ANNOTATION_NAME)); //set mapKey in the resource model, verify context model does not change - attributeResource.addAnnotation(MapKeyClass2_0Annotation.ANNOTATION_NAME); + resourceField.addAnnotation(MapKeyClass2_0Annotation.ANNOTATION_NAME); assertNull(elementCollectionMapping.getSpecifiedMapKeyClass()); - MapKeyClass2_0Annotation mapKeyClass = (MapKeyClass2_0Annotation) attributeResource.getAnnotation(MapKeyClass2_0Annotation.ANNOTATION_NAME); + MapKeyClass2_0Annotation mapKeyClass = (MapKeyClass2_0Annotation) resourceField.getAnnotation(MapKeyClass2_0Annotation.ANNOTATION_NAME); assertNotNull(mapKeyClass); //set mapKey name in the resource model, verify context model updated @@ -958,36 +958,36 @@ public class GenericJavaElementCollectionMapping2_0Tests extends Generic2_0Conte assertNull(mapKeyClass.getValue()); mapKeyClass.setValue("myMapKeyClass"); - attributeResource.removeAnnotation(MapKeyClass2_0Annotation.ANNOTATION_NAME); + resourceField.removeAnnotation(MapKeyClass2_0Annotation.ANNOTATION_NAME); getJpaProject().synchronizeContextModel(); assertNull(elementCollectionMapping.getSpecifiedMapKeyClass()); - assertNull(attributeResource.getAnnotation(MapKeyClass2_0Annotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(MapKeyClass2_0Annotation.ANNOTATION_NAME)); } public void testModifyMapKeyClass() throws Exception { createTestEntityWithElementCollectionMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ElementCollectionMapping2_0 elementCollectionMapping = (ElementCollectionMapping2_0) persistentAttribute.getMapping(); - 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(); assertNull(elementCollectionMapping.getSpecifiedMapKeyClass()); - assertNull(attributeResource.getAnnotation(MapKeyClass2_0Annotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(MapKeyClass2_0Annotation.ANNOTATION_NAME)); //set mapKey in the context model, verify resource model updated elementCollectionMapping.setSpecifiedMapKeyClass("String"); - MapKeyClass2_0Annotation mapKeyClass = (MapKeyClass2_0Annotation) attributeResource.getAnnotation(MapKeyClass2_0Annotation.ANNOTATION_NAME); + MapKeyClass2_0Annotation mapKeyClass = (MapKeyClass2_0Annotation) resourceField.getAnnotation(MapKeyClass2_0Annotation.ANNOTATION_NAME); assertEquals("String", elementCollectionMapping.getSpecifiedMapKeyClass()); assertEquals("String", mapKeyClass.getValue()); //set mapKey to null in the context model elementCollectionMapping.setSpecifiedMapKeyClass(null); assertNull(elementCollectionMapping.getSpecifiedMapKeyClass()); - assertNull(attributeResource.getAnnotation(MapKeyClass2_0Annotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(MapKeyClass2_0Annotation.ANNOTATION_NAME)); } public void testDefaultMapKeyClass() throws Exception { @@ -996,7 +996,7 @@ public class GenericJavaElementCollectionMapping2_0Tests extends Generic2_0Conte createTestEmbeddableState(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ElementCollectionMapping2_0 elementCollectionMapping = (ElementCollectionMapping2_0) persistentAttribute.getMapping(); assertEquals("java.lang.Integer", elementCollectionMapping.getDefaultMapKeyClass()); @@ -1010,7 +1010,7 @@ public class GenericJavaElementCollectionMapping2_0Tests extends Generic2_0Conte createTestEntityWithGenericBasicElementCollectionMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ElementCollectionMapping2_0 elementCollectionMapping = (ElementCollectionMapping2_0) persistentAttribute.getMapping(); assertNull(elementCollectionMapping.getDefaultMapKeyClass()); @@ -1020,7 +1020,7 @@ public class GenericJavaElementCollectionMapping2_0Tests extends Generic2_0Conte createTestEntityWithValidGenericMapElementCollectionMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ElementCollectionMapping2_0 elementCollectionMapping = (ElementCollectionMapping2_0) persistentAttribute.getMapping(); assertEquals("java.lang.Integer", elementCollectionMapping.getMapKeyClass()); @@ -1036,7 +1036,7 @@ public class GenericJavaElementCollectionMapping2_0Tests extends Generic2_0Conte createTestEntityWithGenericEmbeddableElementCollectionMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ElementCollectionMapping2_0 elementCollectionMapping = (ElementCollectionMapping2_0) persistentAttribute.getMapping(); Orderable2_0 orderable = ((Orderable2_0) elementCollectionMapping.getOrderable()); @@ -1060,16 +1060,16 @@ public class GenericJavaElementCollectionMapping2_0Tests extends Generic2_0Conte createTestEntityWithElementCollectionMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ElementCollectionMapping2_0 elementCollectionMapping = (ElementCollectionMapping2_0) persistentAttribute.getMapping(); assertNull(elementCollectionMapping.getValueColumn().getSpecifiedName()); assertEquals("id", elementCollectionMapping.getValueColumn().getName()); assertEquals(TYPE_NAME + "_id", elementCollectionMapping.getValueColumn().getTable()); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - ColumnAnnotation column = (ColumnAnnotation) attributeResource.addAnnotation(JPA.COLUMN); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + ColumnAnnotation column = (ColumnAnnotation) resourceField.addAnnotation(JPA.COLUMN); column.setName("foo"); getJpaProject().synchronizeContextModel(); @@ -1090,65 +1090,65 @@ public class GenericJavaElementCollectionMapping2_0Tests extends Generic2_0Conte JavaElementCollectionMapping2_0 elementCollectionMapping = (JavaElementCollectionMapping2_0) getJavaPersistentType().getAttributeNamed("addresses").getMapping(); JavaAttributeOverrideContainer attributeOverrideContainer = elementCollectionMapping.getValueAttributeOverrideContainer(); - ListIterator specifiedAttributeOverrides = attributeOverrideContainer.specifiedOverrides(); + ListIterator specifiedAttributeOverrides = attributeOverrideContainer.getSpecifiedOverrides().iterator(); assertFalse(specifiedAttributeOverrides.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 - AttributeOverrideAnnotation attributeOverride = (AttributeOverrideAnnotation) attributeResource.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + AttributeOverrideAnnotation attributeOverride = (AttributeOverrideAnnotation) resourceField.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE); attributeOverride.setName("FOO"); getJpaProject().synchronizeContextModel(); - specifiedAttributeOverrides = attributeOverrideContainer.specifiedOverrides(); + specifiedAttributeOverrides = attributeOverrideContainer.getSpecifiedOverrides().iterator(); assertEquals("FOO", specifiedAttributeOverrides.next().getName()); assertFalse(specifiedAttributeOverrides.hasNext()); - attributeOverride = (AttributeOverrideAnnotation) attributeResource.addAnnotation(1, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + attributeOverride = (AttributeOverrideAnnotation) resourceField.addAnnotation(1, JPA.ATTRIBUTE_OVERRIDE); attributeOverride.setName("BAR"); getJpaProject().synchronizeContextModel(); - specifiedAttributeOverrides = attributeOverrideContainer.specifiedOverrides(); + specifiedAttributeOverrides = attributeOverrideContainer.getSpecifiedOverrides().iterator(); assertEquals("FOO", specifiedAttributeOverrides.next().getName()); assertEquals("BAR", specifiedAttributeOverrides.next().getName()); assertFalse(specifiedAttributeOverrides.hasNext()); - attributeOverride = (AttributeOverrideAnnotation) attributeResource.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + attributeOverride = (AttributeOverrideAnnotation) resourceField.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE); attributeOverride.setName("BAZ"); getJpaProject().synchronizeContextModel(); - specifiedAttributeOverrides = attributeOverrideContainer.specifiedOverrides(); + specifiedAttributeOverrides = attributeOverrideContainer.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 - attributeResource.moveAnnotation(1, 0, JPA.ATTRIBUTE_OVERRIDES); + resourceField.moveAnnotation(1, 0, JPA.ATTRIBUTE_OVERRIDE); getJpaProject().synchronizeContextModel(); - specifiedAttributeOverrides = attributeOverrideContainer.specifiedOverrides(); + specifiedAttributeOverrides = attributeOverrideContainer.getSpecifiedOverrides().iterator(); assertEquals("FOO", specifiedAttributeOverrides.next().getName()); assertEquals("BAZ", specifiedAttributeOverrides.next().getName()); assertEquals("BAR", specifiedAttributeOverrides.next().getName()); assertFalse(specifiedAttributeOverrides.hasNext()); - attributeResource.removeAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + resourceField.removeAnnotation(0, JPA.ATTRIBUTE_OVERRIDE); getJpaProject().synchronizeContextModel(); - specifiedAttributeOverrides = attributeOverrideContainer.specifiedOverrides(); + specifiedAttributeOverrides = attributeOverrideContainer.getSpecifiedOverrides().iterator(); assertEquals("BAZ", specifiedAttributeOverrides.next().getName()); assertEquals("BAR", specifiedAttributeOverrides.next().getName()); assertFalse(specifiedAttributeOverrides.hasNext()); - attributeResource.removeAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + resourceField.removeAnnotation(0, JPA.ATTRIBUTE_OVERRIDE); getJpaProject().synchronizeContextModel(); - specifiedAttributeOverrides = attributeOverrideContainer.specifiedOverrides(); + specifiedAttributeOverrides = attributeOverrideContainer.getSpecifiedOverrides().iterator(); assertEquals("BAR", specifiedAttributeOverrides.next().getName()); assertFalse(specifiedAttributeOverrides.hasNext()); - attributeResource.removeAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + resourceField.removeAnnotation(0, JPA.ATTRIBUTE_OVERRIDE); getJpaProject().synchronizeContextModel(); - specifiedAttributeOverrides = attributeOverrideContainer.specifiedOverrides(); + specifiedAttributeOverrides = attributeOverrideContainer.getSpecifiedOverrides().iterator(); assertFalse(specifiedAttributeOverrides.hasNext()); } @@ -1164,14 +1164,13 @@ public class GenericJavaElementCollectionMapping2_0Tests extends Generic2_0Conte ElementCollectionMapping2_0 elementCollectionMapping = (ElementCollectionMapping2_0) getJavaPersistentType().getAttributeNamed("addresses").getMapping(); AttributeOverrideContainer attributeOverrideContainer = elementCollectionMapping.getValueAttributeOverrideContainer(); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - assertEquals("addresses", attributeResource.getName()); - assertNull(attributeResource.getAnnotation(AttributeOverrideAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(AttributeOverridesAnnotation.ANNOTATION_NAME)); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + assertEquals("addresses", resourceField.getName()); + assertNull(resourceField.getAnnotation(0, AttributeOverrideAnnotation.ANNOTATION_NAME)); - assertEquals(4, attributeOverrideContainer.virtualOverridesSize()); - ReadOnlyAttributeOverride defaultAttributeOverride = attributeOverrideContainer.virtualOverrides().next(); + assertEquals(4, attributeOverrideContainer.getVirtualOverridesSize()); + ReadOnlyAttributeOverride defaultAttributeOverride = attributeOverrideContainer.getVirtualOverrides().iterator().next(); assertEquals("city", defaultAttributeOverride.getName()); assertEquals("city", defaultAttributeOverride.getColumn().getName()); assertEquals(TYPE_NAME +"_addresses", defaultAttributeOverride.getColumn().getTable()); @@ -1185,7 +1184,7 @@ public class GenericJavaElementCollectionMapping2_0Tests extends Generic2_0Conte assertEquals(0, defaultAttributeOverride.getColumn().getScale()); - ListIterator classRefs = getPersistenceUnit().specifiedClassRefs(); + ListIterator classRefs = getPersistenceUnit().getSpecifiedClassRefs().iterator(); classRefs.next(); Embeddable embeddable = (Embeddable) classRefs.next().getJavaPersistentType().getMapping(); @@ -1201,12 +1200,11 @@ public class GenericJavaElementCollectionMapping2_0Tests extends Generic2_0Conte cityMapping.getColumn().setSpecifiedPrecision(Integer.valueOf(6)); cityMapping.getColumn().setSpecifiedScale(Integer.valueOf(7)); - assertEquals("addresses", attributeResource.getName()); - assertNull(attributeResource.getAnnotation(AttributeOverrideAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(AttributeOverridesAnnotation.ANNOTATION_NAME)); + assertEquals("addresses", resourceField.getName()); + assertNull(resourceField.getAnnotation(0, AttributeOverrideAnnotation.ANNOTATION_NAME)); - assertEquals(4, attributeOverrideContainer.virtualOverridesSize()); - defaultAttributeOverride = attributeOverrideContainer.virtualOverrides().next(); + assertEquals(4, attributeOverrideContainer.getVirtualOverridesSize()); + defaultAttributeOverride = attributeOverrideContainer.getVirtualOverrides().iterator().next(); assertEquals("city", defaultAttributeOverride.getName()); assertEquals("FOO", defaultAttributeOverride.getColumn().getName()); assertEquals("BAR", defaultAttributeOverride.getColumn().getTable()); @@ -1229,7 +1227,7 @@ public class GenericJavaElementCollectionMapping2_0Tests extends Generic2_0Conte cityMapping.getColumn().setSpecifiedLength(null); cityMapping.getColumn().setSpecifiedPrecision(null); cityMapping.getColumn().setSpecifiedScale(null); - defaultAttributeOverride = attributeOverrideContainer.virtualOverrides().next(); + defaultAttributeOverride = attributeOverrideContainer.getVirtualOverrides().iterator().next(); assertEquals("city", defaultAttributeOverride.getName()); assertEquals("city", defaultAttributeOverride.getColumn().getName()); assertEquals(TYPE_NAME +"_addresses", defaultAttributeOverride.getColumn().getTable()); @@ -1242,10 +1240,10 @@ public class GenericJavaElementCollectionMapping2_0Tests extends Generic2_0Conte assertEquals(0, defaultAttributeOverride.getColumn().getPrecision()); assertEquals(0, defaultAttributeOverride.getColumn().getScale()); - AttributeOverrideAnnotation annotation = (AttributeOverrideAnnotation) attributeResource.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + AttributeOverrideAnnotation annotation = (AttributeOverrideAnnotation) resourceField.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE); annotation.setName("city"); getJpaProject().synchronizeContextModel(); - assertEquals(3, attributeOverrideContainer.virtualOverridesSize()); + assertEquals(3, attributeOverrideContainer.getVirtualOverridesSize()); } public void testSpecifiedAttributeOverridesSize() throws Exception { @@ -1259,19 +1257,19 @@ public class GenericJavaElementCollectionMapping2_0Tests extends Generic2_0Conte ElementCollectionMapping2_0 elementCollectionMapping = (ElementCollectionMapping2_0) getJavaPersistentType().getAttributeNamed("addresses").getMapping(); AttributeOverrideContainer attributeOverrideContainer = elementCollectionMapping.getValueAttributeOverrideContainer(); - assertEquals(0, attributeOverrideContainer.specifiedOverridesSize()); + assertEquals(0, attributeOverrideContainer.getSpecifiedOverridesSize()); - 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 - AttributeOverrideAnnotation attributeOverride = (AttributeOverrideAnnotation) attributeResource.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + AttributeOverrideAnnotation attributeOverride = (AttributeOverrideAnnotation) resourceField.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE); attributeOverride.setName("FOO"); - attributeOverride = (AttributeOverrideAnnotation) attributeResource.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + attributeOverride = (AttributeOverrideAnnotation) resourceField.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE); attributeOverride.setName("BAR"); getJpaProject().synchronizeContextModel(); - assertEquals(2, attributeOverrideContainer.specifiedOverridesSize()); + assertEquals(2, attributeOverrideContainer.getSpecifiedOverridesSize()); } public void testAttributeOverridesSize() throws Exception { @@ -1285,24 +1283,24 @@ public class GenericJavaElementCollectionMapping2_0Tests extends Generic2_0Conte ElementCollectionMapping2_0 elementCollectionMapping = (ElementCollectionMapping2_0) getJavaPersistentType().getAttributeNamed("addresses").getMapping(); AttributeOverrideContainer attributeOverrideContainer = elementCollectionMapping.getValueAttributeOverrideContainer(); - assertEquals(4, attributeOverrideContainer.overridesSize()); + assertEquals(4, attributeOverrideContainer.getOverridesSize()); - 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 - AttributeOverrideAnnotation attributeOverride = (AttributeOverrideAnnotation) attributeResource.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + AttributeOverrideAnnotation attributeOverride = (AttributeOverrideAnnotation) resourceField.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE); attributeOverride.setName("FOO"); - attributeOverride = (AttributeOverrideAnnotation) attributeResource.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + attributeOverride = (AttributeOverrideAnnotation) resourceField.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE); attributeOverride.setName("BAR"); getJpaProject().synchronizeContextModel(); - assertEquals(6, attributeOverrideContainer.overridesSize()); + assertEquals(6, attributeOverrideContainer.getOverridesSize()); - attributeOverride = (AttributeOverrideAnnotation) attributeResource.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + attributeOverride = (AttributeOverrideAnnotation) resourceField.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE); attributeOverride.setName("city"); getJpaProject().synchronizeContextModel(); - assertEquals(6, attributeOverrideContainer.overridesSize()); + assertEquals(6, attributeOverrideContainer.getOverridesSize()); } public void testVirtualAttributeOverridesSize() throws Exception { @@ -1316,27 +1314,27 @@ public class GenericJavaElementCollectionMapping2_0Tests extends Generic2_0Conte ElementCollectionMapping2_0 elementCollectionMapping = (ElementCollectionMapping2_0) getJavaPersistentType().getAttributeNamed("addresses").getMapping(); AttributeOverrideContainer attributeOverrideContainer = elementCollectionMapping.getValueAttributeOverrideContainer(); - assertEquals(4, attributeOverrideContainer.virtualOverridesSize()); + assertEquals(4, attributeOverrideContainer.getVirtualOverridesSize()); - 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 - AttributeOverrideAnnotation attributeOverride = (AttributeOverrideAnnotation) attributeResource.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + AttributeOverrideAnnotation attributeOverride = (AttributeOverrideAnnotation) resourceField.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE); attributeOverride.setName("FOO"); getJpaProject().synchronizeContextModel(); - assertEquals(4, attributeOverrideContainer.virtualOverridesSize()); + assertEquals(4, attributeOverrideContainer.getVirtualOverridesSize()); - attributeOverride = (AttributeOverrideAnnotation) attributeResource.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + attributeOverride = (AttributeOverrideAnnotation) resourceField.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE); attributeOverride.setName("city"); getJpaProject().synchronizeContextModel(); - assertEquals(3, attributeOverrideContainer.virtualOverridesSize()); + assertEquals(3, attributeOverrideContainer.getVirtualOverridesSize()); - attributeOverride = (AttributeOverrideAnnotation) attributeResource.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + attributeOverride = (AttributeOverrideAnnotation) resourceField.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE); attributeOverride.setName("state.name"); getJpaProject().synchronizeContextModel(); - assertEquals(2, attributeOverrideContainer.virtualOverridesSize()); + assertEquals(2, attributeOverrideContainer.getVirtualOverridesSize()); } public void testAttributeOverrideSetVirtual() throws Exception { @@ -1350,35 +1348,35 @@ public class GenericJavaElementCollectionMapping2_0Tests extends Generic2_0Conte ElementCollectionMapping2_0 elementCollectionMapping = (ElementCollectionMapping2_0) getJavaPersistentType().getAttributeNamed("addresses").getMapping(); AttributeOverrideContainer attributeOverrideContainer = elementCollectionMapping.getValueAttributeOverrideContainer(); - attributeOverrideContainer.virtualOverrides().next().convertToSpecified(); - attributeOverrideContainer.virtualOverrides().next().convertToSpecified(); + attributeOverrideContainer.getVirtualOverrides().iterator().next().convertToSpecified(); + attributeOverrideContainer.getVirtualOverrides().iterator().next().convertToSpecified(); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - Iterator attributeOverrides = attributeResource.annotations(AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverridesAnnotation.ANNOTATION_NAME); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + Iterator attributeOverrides = resourceField.getAnnotations(JPA.ATTRIBUTE_OVERRIDE).iterator(); assertEquals("city", ((AttributeOverrideAnnotation) attributeOverrides.next()).getName()); assertEquals("state.name", ((AttributeOverrideAnnotation) attributeOverrides.next()).getName()); assertFalse(attributeOverrides.hasNext()); - attributeOverrideContainer.specifiedOverrides().next().convertToVirtual(); - attributeOverrides = attributeResource.annotations(AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverridesAnnotation.ANNOTATION_NAME); + attributeOverrideContainer.getSpecifiedOverrides().iterator().next().convertToVirtual(); + attributeOverrides = resourceField.getAnnotations(JPA.ATTRIBUTE_OVERRIDE).iterator(); assertEquals("state.name", ((AttributeOverrideAnnotation) attributeOverrides.next()).getName()); assertFalse(attributeOverrides.hasNext()); - assertEquals("city", attributeOverrideContainer.virtualOverrides().next().getName()); - assertEquals(3, attributeOverrideContainer.virtualOverridesSize()); + assertEquals("city", attributeOverrideContainer.getVirtualOverrides().iterator().next().getName()); + assertEquals(3, attributeOverrideContainer.getVirtualOverridesSize()); - attributeOverrideContainer.specifiedOverrides().next().convertToVirtual(); - attributeOverrides = attributeResource.annotations(AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverridesAnnotation.ANNOTATION_NAME); + attributeOverrideContainer.getSpecifiedOverrides().iterator().next().convertToVirtual(); + attributeOverrides = resourceField.getAnnotations(JPA.ATTRIBUTE_OVERRIDE).iterator(); assertFalse(attributeOverrides.hasNext()); - Iterator virtualAttributeOverrides = (Iterator) attributeOverrideContainer.virtualOverrides(); + Iterator virtualAttributeOverrides = attributeOverrideContainer.getVirtualOverrides().iterator(); assertEquals("city", virtualAttributeOverrides.next().getName()); assertEquals("state.name", virtualAttributeOverrides.next().getName()); assertEquals("state.abbr", virtualAttributeOverrides.next().getName()); assertEquals("zip", virtualAttributeOverrides.next().getName()); - assertEquals(4, attributeOverrideContainer.virtualOverridesSize()); + assertEquals(4, attributeOverrideContainer.getVirtualOverridesSize()); } public void testAttributeOverrideSetVirtual2() throws Exception { @@ -1392,14 +1390,14 @@ public class GenericJavaElementCollectionMapping2_0Tests extends Generic2_0Conte ElementCollectionMapping2_0 elementCollectionMapping = (ElementCollectionMapping2_0) getJavaPersistentType().getAttributeNamed("addresses").getMapping(); AttributeOverrideContainer attributeOverrideContainer = elementCollectionMapping.getValueAttributeOverrideContainer(); - ListIterator virtualAttributeOverrides = (ListIterator) attributeOverrideContainer.virtualOverrides(); + ListIterator virtualAttributeOverrides = attributeOverrideContainer.getVirtualOverrides().iterator(); virtualAttributeOverrides.next(); virtualAttributeOverrides.next().convertToSpecified(); - attributeOverrideContainer.virtualOverrides().next().convertToSpecified(); + attributeOverrideContainer.getVirtualOverrides().iterator().next().convertToSpecified(); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - Iterator attributeOverrides = attributeResource.annotations(AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverridesAnnotation.ANNOTATION_NAME); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + Iterator attributeOverrides = resourceField.getAnnotations(JPA.ATTRIBUTE_OVERRIDE).iterator(); assertEquals("state.name", ((AttributeOverrideAnnotation) attributeOverrides.next()).getName()); assertEquals("city", ((AttributeOverrideAnnotation) attributeOverrides.next()).getName()); @@ -1417,15 +1415,15 @@ public class GenericJavaElementCollectionMapping2_0Tests extends Generic2_0Conte ElementCollectionMapping2_0 elementCollectionMapping = (ElementCollectionMapping2_0) getJavaPersistentType().getAttributeNamed("addresses").getMapping(); AttributeOverrideContainer attributeOverrideContainer = elementCollectionMapping.getValueAttributeOverrideContainer(); - attributeOverrideContainer.virtualOverrides().next().convertToSpecified(); - attributeOverrideContainer.virtualOverrides().next().convertToSpecified(); + attributeOverrideContainer.getVirtualOverrides().iterator().next().convertToSpecified(); + attributeOverrideContainer.getVirtualOverrides().iterator().next().convertToSpecified(); - 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(); - attributeResource.moveAnnotation(1, 0, AttributeOverridesAnnotation.ANNOTATION_NAME); + resourceField.moveAnnotation(1, 0, AttributeOverrideAnnotation.ANNOTATION_NAME); - Iterator attributeOverrides = attributeResource.annotations(AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverridesAnnotation.ANNOTATION_NAME); + Iterator attributeOverrides = resourceField.getAnnotations(JPA.ATTRIBUTE_OVERRIDE).iterator(); assertEquals("state.name", ((AttributeOverrideAnnotation) attributeOverrides.next()).getName()); assertEquals("city", ((AttributeOverrideAnnotation) attributeOverrides.next()).getName()); @@ -1441,13 +1439,13 @@ public class GenericJavaElementCollectionMapping2_0Tests extends Generic2_0Conte addXmlClassRef(FULLY_QUALIFIED_EMBEDDABLE_TYPE_NAME); addXmlClassRef(PACKAGE_NAME + ".State"); - ListIterator specifiedClassRefs = getPersistenceUnit().specifiedClassRefs(); + ListIterator specifiedClassRefs = getPersistenceUnit().getSpecifiedClassRefs().iterator(); PersistentType persistentType = specifiedClassRefs.next().getJavaPersistentType(); ElementCollectionMapping2_0 elementCollectionMapping = (ElementCollectionMapping2_0) persistentType.getAttributeNamed("addresses").getMapping(); AttributeOverrideContainer attributeOverrideContainer = elementCollectionMapping.getValueAttributeOverrideContainer(); - assertEquals(4, attributeOverrideContainer.virtualOverridesSize()); - ListIterator virtualAttributeOverrides = (ListIterator) attributeOverrideContainer.virtualOverrides(); + assertEquals(4, attributeOverrideContainer.getVirtualOverridesSize()); + ListIterator virtualAttributeOverrides = attributeOverrideContainer.getVirtualOverrides().iterator(); ReadOnlyAttributeOverride virtualAttributeOverride = virtualAttributeOverrides.next(); assertEquals("city", virtualAttributeOverride.getName()); virtualAttributeOverride = virtualAttributeOverrides.next(); @@ -1462,8 +1460,8 @@ public class GenericJavaElementCollectionMapping2_0Tests extends Generic2_0Conte PersistentType addressPersistentType = specifiedClassRefs.next().getJavaPersistentType(); EmbeddedMapping nestedEmbeddedMapping = (EmbeddedMapping) addressPersistentType.getAttributeNamed("state").getMapping(); AttributeOverrideContainer nestedAttributeOverrideContainer = nestedEmbeddedMapping.getAttributeOverrideContainer(); - assertEquals(2, nestedAttributeOverrideContainer.virtualOverridesSize()); - virtualAttributeOverrides = (ListIterator) nestedAttributeOverrideContainer.virtualOverrides(); + assertEquals(2, nestedAttributeOverrideContainer.getVirtualOverridesSize()); + virtualAttributeOverrides = nestedAttributeOverrideContainer.getVirtualOverrides().iterator(); virtualAttributeOverride = virtualAttributeOverrides.next(); assertEquals("name", virtualAttributeOverride.getName()); virtualAttributeOverride = virtualAttributeOverrides.next(); @@ -1501,7 +1499,7 @@ public class GenericJavaElementCollectionMapping2_0Tests extends Generic2_0Conte createTestEntityWithValidGenericMapElementCollectionMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ElementCollectionMapping2_0 elementCollectionMapping = (ElementCollectionMapping2_0) persistentAttribute.getMapping(); assertNull(elementCollectionMapping.getMapKeyColumn().getSpecifiedName()); @@ -1511,9 +1509,9 @@ public class GenericJavaElementCollectionMapping2_0Tests extends Generic2_0Conte elementCollectionMapping.getCollectionTable().setSpecifiedName("MY_COLLECTION_TABLE"); assertEquals("MY_COLLECTION_TABLE", elementCollectionMapping.getMapKeyColumn().getTable()); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - MapKeyColumn2_0Annotation column = (MapKeyColumn2_0Annotation) attributeResource.addAnnotation(JPA2_0.MAP_KEY_COLUMN); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + MapKeyColumn2_0Annotation column = (MapKeyColumn2_0Annotation) resourceField.addAnnotation(JPA2_0.MAP_KEY_COLUMN); column.setName("foo"); getJpaProject().synchronizeContextModel(); @@ -1535,98 +1533,98 @@ public class GenericJavaElementCollectionMapping2_0Tests extends Generic2_0Conte JavaAttributeOverrideContainer attributeOverrideContainer = elementCollectionMapping.getValueAttributeOverrideContainer(); JavaAttributeOverrideContainer mapKeyAttributeOverrideContainer = elementCollectionMapping.getMapKeyAttributeOverrideContainer(); - ListIterator specifiedAttributeOverrides = attributeOverrideContainer.specifiedOverrides(); + ListIterator specifiedAttributeOverrides = attributeOverrideContainer.getSpecifiedOverrides().iterator(); assertFalse(specifiedAttributeOverrides.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 - AttributeOverrideAnnotation attributeOverride = (AttributeOverrideAnnotation) attributeResource.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + AttributeOverrideAnnotation attributeOverride = (AttributeOverrideAnnotation) resourceField.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE); attributeOverride.setName("FOO"); getJpaProject().synchronizeContextModel(); - specifiedAttributeOverrides = attributeOverrideContainer.specifiedOverrides(); + specifiedAttributeOverrides = attributeOverrideContainer.getSpecifiedOverrides().iterator(); assertEquals("FOO", specifiedAttributeOverrides.next().getName()); assertFalse(specifiedAttributeOverrides.hasNext()); - attributeOverride = (AttributeOverrideAnnotation) attributeResource.addAnnotation(1, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + attributeOverride = (AttributeOverrideAnnotation) resourceField.addAnnotation(1, JPA.ATTRIBUTE_OVERRIDE); attributeOverride.setName("value.BAR"); getJpaProject().synchronizeContextModel(); - specifiedAttributeOverrides = attributeOverrideContainer.specifiedOverrides(); + specifiedAttributeOverrides = attributeOverrideContainer.getSpecifiedOverrides().iterator(); assertEquals("FOO", specifiedAttributeOverrides.next().getName()); assertEquals("BAR", specifiedAttributeOverrides.next().getName()); assertFalse(specifiedAttributeOverrides.hasNext()); - attributeOverride = (AttributeOverrideAnnotation) attributeResource.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + attributeOverride = (AttributeOverrideAnnotation) resourceField.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE); attributeOverride.setName("key.BAZ"); getJpaProject().synchronizeContextModel(); - specifiedAttributeOverrides = attributeOverrideContainer.specifiedOverrides(); + specifiedAttributeOverrides = attributeOverrideContainer.getSpecifiedOverrides().iterator(); assertEquals("FOO", specifiedAttributeOverrides.next().getName()); assertEquals("BAR", specifiedAttributeOverrides.next().getName()); assertFalse(specifiedAttributeOverrides.hasNext()); - ListIterator specifiedMapKeyAttributeOverrides = mapKeyAttributeOverrideContainer.specifiedOverrides(); + ListIterator specifiedMapKeyAttributeOverrides = mapKeyAttributeOverrideContainer.getSpecifiedOverrides().iterator(); assertEquals("BAZ", specifiedMapKeyAttributeOverrides.next().getName()); assertFalse(specifiedMapKeyAttributeOverrides.hasNext()); - attributeOverride = (AttributeOverrideAnnotation) attributeResource.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + attributeOverride = (AttributeOverrideAnnotation) resourceField.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE); attributeOverride.setName("key.BLAH"); getJpaProject().synchronizeContextModel(); - specifiedAttributeOverrides = attributeOverrideContainer.specifiedOverrides(); + specifiedAttributeOverrides = attributeOverrideContainer.getSpecifiedOverrides().iterator(); assertEquals("FOO", specifiedAttributeOverrides.next().getName()); assertEquals("BAR", specifiedAttributeOverrides.next().getName()); assertFalse(specifiedAttributeOverrides.hasNext()); - specifiedMapKeyAttributeOverrides = mapKeyAttributeOverrideContainer.specifiedOverrides(); + specifiedMapKeyAttributeOverrides = mapKeyAttributeOverrideContainer.getSpecifiedOverrides().iterator(); assertEquals("BLAH", specifiedMapKeyAttributeOverrides.next().getName()); assertEquals("BAZ", specifiedMapKeyAttributeOverrides.next().getName()); assertFalse(specifiedMapKeyAttributeOverrides.hasNext()); //move an annotation to the resource model and verify the context model is updated - attributeResource.moveAnnotation(1, 0, JPA.ATTRIBUTE_OVERRIDES); + resourceField.moveAnnotation(1, 0, JPA.ATTRIBUTE_OVERRIDE); getJpaProject().synchronizeContextModel(); - specifiedAttributeOverrides = attributeOverrideContainer.specifiedOverrides(); + specifiedAttributeOverrides = attributeOverrideContainer.getSpecifiedOverrides().iterator(); assertEquals("FOO", specifiedAttributeOverrides.next().getName()); assertEquals("BAR", specifiedAttributeOverrides.next().getName()); assertFalse(specifiedAttributeOverrides.hasNext()); - specifiedMapKeyAttributeOverrides = mapKeyAttributeOverrideContainer.specifiedOverrides(); + specifiedMapKeyAttributeOverrides = mapKeyAttributeOverrideContainer.getSpecifiedOverrides().iterator(); assertEquals("BAZ", specifiedMapKeyAttributeOverrides.next().getName()); assertEquals("BLAH", specifiedMapKeyAttributeOverrides.next().getName()); assertFalse(specifiedMapKeyAttributeOverrides.hasNext()); - attributeResource.removeAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + resourceField.removeAnnotation(0, JPA.ATTRIBUTE_OVERRIDE); getJpaProject().synchronizeContextModel(); - specifiedAttributeOverrides = attributeOverrideContainer.specifiedOverrides(); + specifiedAttributeOverrides = attributeOverrideContainer.getSpecifiedOverrides().iterator(); assertEquals("FOO", specifiedAttributeOverrides.next().getName()); assertEquals("BAR", specifiedAttributeOverrides.next().getName()); assertFalse(specifiedAttributeOverrides.hasNext()); - specifiedMapKeyAttributeOverrides = mapKeyAttributeOverrideContainer.specifiedOverrides(); + specifiedMapKeyAttributeOverrides = mapKeyAttributeOverrideContainer.getSpecifiedOverrides().iterator(); assertEquals("BLAH", specifiedMapKeyAttributeOverrides.next().getName()); assertFalse(specifiedMapKeyAttributeOverrides.hasNext()); - attributeResource.removeAnnotation(1, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + resourceField.removeAnnotation(1, JPA.ATTRIBUTE_OVERRIDE); getJpaProject().synchronizeContextModel(); - specifiedAttributeOverrides = attributeOverrideContainer.specifiedOverrides(); + specifiedAttributeOverrides = attributeOverrideContainer.getSpecifiedOverrides().iterator(); assertEquals("BAR", specifiedAttributeOverrides.next().getName()); assertFalse(specifiedAttributeOverrides.hasNext()); - specifiedMapKeyAttributeOverrides = mapKeyAttributeOverrideContainer.specifiedOverrides(); + specifiedMapKeyAttributeOverrides = mapKeyAttributeOverrideContainer.getSpecifiedOverrides().iterator(); assertEquals("BLAH", specifiedMapKeyAttributeOverrides.next().getName()); assertFalse(specifiedMapKeyAttributeOverrides.hasNext()); - attributeResource.removeAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + resourceField.removeAnnotation(0, JPA.ATTRIBUTE_OVERRIDE); getJpaProject().synchronizeContextModel(); - specifiedAttributeOverrides = attributeOverrideContainer.specifiedOverrides(); + specifiedAttributeOverrides = attributeOverrideContainer.getSpecifiedOverrides().iterator(); assertEquals("BAR", specifiedAttributeOverrides.next().getName()); assertFalse(specifiedAttributeOverrides.hasNext()); - specifiedMapKeyAttributeOverrides = mapKeyAttributeOverrideContainer.specifiedOverrides(); + specifiedMapKeyAttributeOverrides = mapKeyAttributeOverrideContainer.getSpecifiedOverrides().iterator(); assertFalse(specifiedMapKeyAttributeOverrides.hasNext()); - attributeResource.removeAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + resourceField.removeAnnotation(0, JPA.ATTRIBUTE_OVERRIDE); getJpaProject().synchronizeContextModel(); - specifiedAttributeOverrides = attributeOverrideContainer.specifiedOverrides(); + specifiedAttributeOverrides = attributeOverrideContainer.getSpecifiedOverrides().iterator(); assertFalse(specifiedAttributeOverrides.hasNext()); - specifiedMapKeyAttributeOverrides = mapKeyAttributeOverrideContainer.specifiedOverrides(); + specifiedMapKeyAttributeOverrides = mapKeyAttributeOverrideContainer.getSpecifiedOverrides().iterator(); assertFalse(specifiedMapKeyAttributeOverrides.hasNext()); } @@ -1645,14 +1643,13 @@ public class GenericJavaElementCollectionMapping2_0Tests extends Generic2_0Conte AttributeOverrideContainer attributeOverrideContainer = elementCollectionMapping.getValueAttributeOverrideContainer(); AttributeOverrideContainer mapKeyAttributeOverrideContainer = elementCollectionMapping.getMapKeyAttributeOverrideContainer(); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - assertEquals("parcels", attributeResource.getName()); - assertNull(attributeResource.getAnnotation(AttributeOverrideAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(AttributeOverridesAnnotation.ANNOTATION_NAME)); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + assertEquals("parcels", resourceField.getName()); + assertNull(resourceField.getAnnotation(0, AttributeOverrideAnnotation.ANNOTATION_NAME)); - assertEquals(4, mapKeyAttributeOverrideContainer.virtualOverridesSize()); - ReadOnlyAttributeOverride defaultAttributeOverride = mapKeyAttributeOverrideContainer.virtualOverrides().next(); + assertEquals(4, mapKeyAttributeOverrideContainer.getVirtualOverridesSize()); + ReadOnlyAttributeOverride defaultAttributeOverride = mapKeyAttributeOverrideContainer.getVirtualOverrides().iterator().next(); assertEquals("city", defaultAttributeOverride.getName()); assertEquals("city", defaultAttributeOverride.getColumn().getName()); assertEquals(TYPE_NAME +"_parcels", defaultAttributeOverride.getColumn().getTable()); @@ -1666,7 +1663,7 @@ public class GenericJavaElementCollectionMapping2_0Tests extends Generic2_0Conte assertEquals(0, defaultAttributeOverride.getColumn().getScale()); - ListIterator classRefs = getPersistenceUnit().specifiedClassRefs(); + ListIterator classRefs = getPersistenceUnit().getSpecifiedClassRefs().iterator(); classRefs.next(); Embeddable addressEmbeddable = (Embeddable) classRefs.next().getJavaPersistentType().getMapping(); @@ -1682,12 +1679,11 @@ public class GenericJavaElementCollectionMapping2_0Tests extends Generic2_0Conte cityMapping.getColumn().setSpecifiedPrecision(Integer.valueOf(6)); cityMapping.getColumn().setSpecifiedScale(Integer.valueOf(7)); - assertEquals("parcels", attributeResource.getName()); - assertNull(attributeResource.getAnnotation(AttributeOverrideAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(AttributeOverridesAnnotation.ANNOTATION_NAME)); + assertEquals("parcels", resourceField.getName()); + assertNull(resourceField.getAnnotation(0, AttributeOverrideAnnotation.ANNOTATION_NAME)); - assertEquals(4, mapKeyAttributeOverrideContainer.virtualOverridesSize()); - defaultAttributeOverride = mapKeyAttributeOverrideContainer.virtualOverrides().next(); + assertEquals(4, mapKeyAttributeOverrideContainer.getVirtualOverridesSize()); + defaultAttributeOverride = mapKeyAttributeOverrideContainer.getVirtualOverrides().iterator().next(); assertEquals("city", defaultAttributeOverride.getName()); assertEquals("FOO", defaultAttributeOverride.getColumn().getName()); assertEquals("BAR", defaultAttributeOverride.getColumn().getTable()); @@ -1710,7 +1706,7 @@ public class GenericJavaElementCollectionMapping2_0Tests extends Generic2_0Conte cityMapping.getColumn().setSpecifiedLength(null); cityMapping.getColumn().setSpecifiedPrecision(null); cityMapping.getColumn().setSpecifiedScale(null); - defaultAttributeOverride = mapKeyAttributeOverrideContainer.virtualOverrides().next(); + defaultAttributeOverride = mapKeyAttributeOverrideContainer.getVirtualOverrides().iterator().next(); assertEquals("city", defaultAttributeOverride.getName()); assertEquals("city", defaultAttributeOverride.getColumn().getName()); assertEquals(TYPE_NAME +"_parcels", defaultAttributeOverride.getColumn().getTable()); @@ -1723,15 +1719,15 @@ public class GenericJavaElementCollectionMapping2_0Tests extends Generic2_0Conte assertEquals(0, defaultAttributeOverride.getColumn().getPrecision()); assertEquals(0, defaultAttributeOverride.getColumn().getScale()); - AttributeOverrideAnnotation annotation = (AttributeOverrideAnnotation) attributeResource.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + AttributeOverrideAnnotation annotation = (AttributeOverrideAnnotation) resourceField.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE); annotation.setName("key.city"); getJpaProject().synchronizeContextModel(); - assertEquals(3, mapKeyAttributeOverrideContainer.virtualOverridesSize()); + assertEquals(3, mapKeyAttributeOverrideContainer.getVirtualOverridesSize()); - assertEquals(3, attributeOverrideContainer.virtualOverridesSize()); - defaultAttributeOverride = attributeOverrideContainer.virtualOverrides().next(); + assertEquals(3, attributeOverrideContainer.getVirtualOverridesSize()); + defaultAttributeOverride = attributeOverrideContainer.getVirtualOverrides().iterator().next(); assertEquals("parcelNumber", defaultAttributeOverride.getName()); assertEquals("parcelNumber", defaultAttributeOverride.getColumn().getName()); assertEquals(TYPE_NAME +"_parcels", defaultAttributeOverride.getColumn().getTable()); @@ -1745,7 +1741,7 @@ public class GenericJavaElementCollectionMapping2_0Tests extends Generic2_0Conte assertEquals(0, defaultAttributeOverride.getColumn().getScale()); - classRefs = getPersistenceUnit().specifiedClassRefs(); + classRefs = getPersistenceUnit().getSpecifiedClassRefs().iterator(); classRefs.next(); classRefs.next(); Embeddable propertyInfoEmbeddable = (Embeddable) classRefs.next().getJavaPersistentType().getMapping(); @@ -1762,10 +1758,10 @@ public class GenericJavaElementCollectionMapping2_0Tests extends Generic2_0Conte parcelNumberMapping.getColumn().setSpecifiedPrecision(Integer.valueOf(6)); parcelNumberMapping.getColumn().setSpecifiedScale(Integer.valueOf(7)); - assertEquals("parcels", attributeResource.getName()); + assertEquals("parcels", resourceField.getName()); - assertEquals(3, attributeOverrideContainer.virtualOverridesSize()); - defaultAttributeOverride = attributeOverrideContainer.virtualOverrides().next(); + assertEquals(3, attributeOverrideContainer.getVirtualOverridesSize()); + defaultAttributeOverride = attributeOverrideContainer.getVirtualOverrides().iterator().next(); assertEquals("parcelNumber", defaultAttributeOverride.getName()); assertEquals("FOO1", defaultAttributeOverride.getColumn().getName()); assertEquals("BAR1", defaultAttributeOverride.getColumn().getTable()); @@ -1788,7 +1784,7 @@ public class GenericJavaElementCollectionMapping2_0Tests extends Generic2_0Conte parcelNumberMapping.getColumn().setSpecifiedLength(null); parcelNumberMapping.getColumn().setSpecifiedPrecision(null); parcelNumberMapping.getColumn().setSpecifiedScale(null); - defaultAttributeOverride = attributeOverrideContainer.virtualOverrides().next(); + defaultAttributeOverride = attributeOverrideContainer.getVirtualOverrides().iterator().next(); assertEquals("parcelNumber", defaultAttributeOverride.getName()); assertEquals("parcelNumber", defaultAttributeOverride.getColumn().getName()); assertEquals(TYPE_NAME +"_parcels", defaultAttributeOverride.getColumn().getTable()); @@ -1801,10 +1797,10 @@ public class GenericJavaElementCollectionMapping2_0Tests extends Generic2_0Conte assertEquals(0, defaultAttributeOverride.getColumn().getPrecision()); assertEquals(0, defaultAttributeOverride.getColumn().getScale()); - annotation = (AttributeOverrideAnnotation) attributeResource.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + annotation = (AttributeOverrideAnnotation) resourceField.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE); annotation.setName("value.parcelNumber"); getJpaProject().synchronizeContextModel(); - assertEquals(2, attributeOverrideContainer.virtualOverridesSize()); + assertEquals(2, attributeOverrideContainer.getVirtualOverridesSize()); } public void testMapKeyValueSpecifiedAttributeOverridesSize() throws Exception { @@ -1821,23 +1817,23 @@ public class GenericJavaElementCollectionMapping2_0Tests extends Generic2_0Conte ElementCollectionMapping2_0 elementCollectionMapping = (ElementCollectionMapping2_0) getJavaPersistentType().getAttributeNamed("parcels").getMapping(); AttributeOverrideContainer valueAttributeOverrideContainer = elementCollectionMapping.getValueAttributeOverrideContainer(); AttributeOverrideContainer mapKeyAttributeOverrideContainer = elementCollectionMapping.getMapKeyAttributeOverrideContainer(); - assertEquals(0, valueAttributeOverrideContainer.specifiedOverridesSize()); - assertEquals(0, mapKeyAttributeOverrideContainer.specifiedOverridesSize()); + assertEquals(0, valueAttributeOverrideContainer.getSpecifiedOverridesSize()); + assertEquals(0, mapKeyAttributeOverrideContainer.getSpecifiedOverridesSize()); - 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 - AttributeOverrideAnnotation attributeOverride = (AttributeOverrideAnnotation) attributeResource.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + AttributeOverrideAnnotation attributeOverride = (AttributeOverrideAnnotation) resourceField.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE); attributeOverride.setName("FOO"); - attributeOverride = (AttributeOverrideAnnotation) attributeResource.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + attributeOverride = (AttributeOverrideAnnotation) resourceField.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE); attributeOverride.setName("key.BAR"); - attributeOverride = (AttributeOverrideAnnotation) attributeResource.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + attributeOverride = (AttributeOverrideAnnotation) resourceField.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE); attributeOverride.setName("value.FOO2"); getJpaProject().synchronizeContextModel(); - assertEquals(2, valueAttributeOverrideContainer.specifiedOverridesSize()); - assertEquals(1, mapKeyAttributeOverrideContainer.specifiedOverridesSize()); + assertEquals(2, valueAttributeOverrideContainer.getSpecifiedOverridesSize()); + assertEquals(1, mapKeyAttributeOverrideContainer.getSpecifiedOverridesSize()); } public void testMapKeyValueAttributeOverridesSize() throws Exception { @@ -1854,29 +1850,29 @@ public class GenericJavaElementCollectionMapping2_0Tests extends Generic2_0Conte ElementCollectionMapping2_0 elementCollectionMapping = (ElementCollectionMapping2_0) getJavaPersistentType().getAttributeNamed("parcels").getMapping(); AttributeOverrideContainer valueAttributeOverrideContainer = elementCollectionMapping.getValueAttributeOverrideContainer(); AttributeOverrideContainer mapKeyAttributeOverrideContainer = elementCollectionMapping.getMapKeyAttributeOverrideContainer(); - assertEquals(4, mapKeyAttributeOverrideContainer.overridesSize()); - assertEquals(3, valueAttributeOverrideContainer.overridesSize()); + assertEquals(4, mapKeyAttributeOverrideContainer.getOverridesSize()); + assertEquals(3, valueAttributeOverrideContainer.getOverridesSize()); - 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 - AttributeOverrideAnnotation attributeOverride = (AttributeOverrideAnnotation) attributeResource.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + AttributeOverrideAnnotation attributeOverride = (AttributeOverrideAnnotation) resourceField.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE); attributeOverride.setName("FOO"); - attributeOverride = (AttributeOverrideAnnotation) attributeResource.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + attributeOverride = (AttributeOverrideAnnotation) resourceField.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE); attributeOverride.setName("key.BAR"); - attributeOverride = (AttributeOverrideAnnotation) attributeResource.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + attributeOverride = (AttributeOverrideAnnotation) resourceField.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE); attributeOverride.setName("value.FOO2"); getJpaProject().synchronizeContextModel(); - assertEquals(5, mapKeyAttributeOverrideContainer.overridesSize()); - assertEquals(5, valueAttributeOverrideContainer.overridesSize()); + assertEquals(5, mapKeyAttributeOverrideContainer.getOverridesSize()); + assertEquals(5, valueAttributeOverrideContainer.getOverridesSize()); - attributeOverride = (AttributeOverrideAnnotation) attributeResource.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + attributeOverride = (AttributeOverrideAnnotation) resourceField.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE); attributeOverride.setName("city"); getJpaProject().synchronizeContextModel(); - assertEquals(5, mapKeyAttributeOverrideContainer.overridesSize()); - assertEquals(6, valueAttributeOverrideContainer.overridesSize()); + assertEquals(5, mapKeyAttributeOverrideContainer.getOverridesSize()); + assertEquals(6, valueAttributeOverrideContainer.getOverridesSize()); } public void testMapKeyValueVirtualAttributeOverridesSize() throws Exception { @@ -1893,38 +1889,38 @@ public class GenericJavaElementCollectionMapping2_0Tests extends Generic2_0Conte ElementCollectionMapping2_0 elementCollectionMapping = (ElementCollectionMapping2_0) getJavaPersistentType().getAttributeNamed("parcels").getMapping(); AttributeOverrideContainer valueAttributeOverrideContainer = elementCollectionMapping.getValueAttributeOverrideContainer(); AttributeOverrideContainer mapKeyAttributeOverrideContainer = elementCollectionMapping.getMapKeyAttributeOverrideContainer(); - assertEquals(4, mapKeyAttributeOverrideContainer.virtualOverridesSize()); - assertEquals(3, valueAttributeOverrideContainer.virtualOverridesSize()); + assertEquals(4, mapKeyAttributeOverrideContainer.getVirtualOverridesSize()); + assertEquals(3, valueAttributeOverrideContainer.getVirtualOverridesSize()); - 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 - AttributeOverrideAnnotation attributeOverride = (AttributeOverrideAnnotation) attributeResource.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + AttributeOverrideAnnotation attributeOverride = (AttributeOverrideAnnotation) resourceField.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE); attributeOverride.setName("FOO"); - attributeOverride = (AttributeOverrideAnnotation) attributeResource.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + attributeOverride = (AttributeOverrideAnnotation) resourceField.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE); attributeOverride.setName("key.BAR"); getJpaProject().synchronizeContextModel(); - assertEquals(4, mapKeyAttributeOverrideContainer.virtualOverridesSize()); - assertEquals(3, valueAttributeOverrideContainer.virtualOverridesSize()); + assertEquals(4, mapKeyAttributeOverrideContainer.getVirtualOverridesSize()); + assertEquals(3, valueAttributeOverrideContainer.getVirtualOverridesSize()); - attributeOverride = (AttributeOverrideAnnotation) attributeResource.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + attributeOverride = (AttributeOverrideAnnotation) resourceField.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE); attributeOverride.setName("key.city"); - attributeOverride = (AttributeOverrideAnnotation) attributeResource.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + attributeOverride = (AttributeOverrideAnnotation) resourceField.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE); attributeOverride.setName("value.parcelNumber"); getJpaProject().synchronizeContextModel(); - assertEquals(3, mapKeyAttributeOverrideContainer.virtualOverridesSize()); - assertEquals(2, valueAttributeOverrideContainer.virtualOverridesSize()); + assertEquals(3, mapKeyAttributeOverrideContainer.getVirtualOverridesSize()); + assertEquals(2, valueAttributeOverrideContainer.getVirtualOverridesSize()); - attributeOverride = (AttributeOverrideAnnotation) attributeResource.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + attributeOverride = (AttributeOverrideAnnotation) resourceField.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE); attributeOverride.setName("key.state.name"); - attributeOverride = (AttributeOverrideAnnotation) attributeResource.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + attributeOverride = (AttributeOverrideAnnotation) resourceField.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE); attributeOverride.setName("size"); getJpaProject().synchronizeContextModel(); - assertEquals(2, mapKeyAttributeOverrideContainer.virtualOverridesSize()); - assertEquals(1, valueAttributeOverrideContainer.virtualOverridesSize()); + assertEquals(2, mapKeyAttributeOverrideContainer.getVirtualOverridesSize()); + assertEquals(1, valueAttributeOverrideContainer.getVirtualOverridesSize()); } public void testMapKeyValueAttributeOverrideSetVirtual() throws Exception { @@ -1941,14 +1937,14 @@ public class GenericJavaElementCollectionMapping2_0Tests extends Generic2_0Conte ElementCollectionMapping2_0 elementCollectionMapping = (ElementCollectionMapping2_0) getJavaPersistentType().getAttributeNamed("parcels").getMapping(); AttributeOverrideContainer valueOverrideContainer = elementCollectionMapping.getValueAttributeOverrideContainer(); AttributeOverrideContainer mapKeyOverrideContainer = elementCollectionMapping.getMapKeyAttributeOverrideContainer(); - valueOverrideContainer.virtualOverrides().next().convertToSpecified(); - mapKeyOverrideContainer.virtualOverrides().next().convertToSpecified(); - valueOverrideContainer.virtualOverrides().next().convertToSpecified(); - mapKeyOverrideContainer.virtualOverrides().next().convertToSpecified(); + valueOverrideContainer.getVirtualOverrides().iterator().next().convertToSpecified(); + mapKeyOverrideContainer.getVirtualOverrides().iterator().next().convertToSpecified(); + valueOverrideContainer.getVirtualOverrides().iterator().next().convertToSpecified(); + mapKeyOverrideContainer.getVirtualOverrides().iterator().next().convertToSpecified(); - JavaResourcePersistentType resourceType = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute resourceAttribute = resourceType.persistableAttributes().next(); - Iterator overrideAnnotations = resourceAttribute.annotations(AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverridesAnnotation.ANNOTATION_NAME); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + Iterator overrideAnnotations = resourceField.getAnnotations(JPA.ATTRIBUTE_OVERRIDE).iterator(); assertEquals("value.parcelNumber", ((AttributeOverrideAnnotation) overrideAnnotations.next()).getName()); assertEquals("key.city", ((AttributeOverrideAnnotation) overrideAnnotations.next()).getName()); @@ -1956,35 +1952,35 @@ public class GenericJavaElementCollectionMapping2_0Tests extends Generic2_0Conte assertEquals("key.state.name", ((AttributeOverrideAnnotation) overrideAnnotations.next()).getName()); assertFalse(overrideAnnotations.hasNext()); - valueOverrideContainer.specifiedOverrides().next().convertToVirtual(); - mapKeyOverrideContainer.specifiedOverrides().next().convertToVirtual(); - overrideAnnotations = resourceAttribute.annotations(AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverridesAnnotation.ANNOTATION_NAME); + valueOverrideContainer.getSpecifiedOverrides().iterator().next().convertToVirtual(); + mapKeyOverrideContainer.getSpecifiedOverrides().iterator().next().convertToVirtual(); + overrideAnnotations = resourceField.getAnnotations(JPA.ATTRIBUTE_OVERRIDE).iterator(); assertEquals("value.size", ((AttributeOverrideAnnotation) overrideAnnotations.next()).getName()); assertEquals("key.state.name", ((AttributeOverrideAnnotation) overrideAnnotations.next()).getName()); assertFalse(overrideAnnotations.hasNext()); - assertEquals("parcelNumber", valueOverrideContainer.virtualOverrides().next().getName()); - assertEquals(2, valueOverrideContainer.virtualOverridesSize()); - assertEquals("city", mapKeyOverrideContainer.virtualOverrides().next().getName()); - assertEquals(3, mapKeyOverrideContainer.virtualOverridesSize()); + assertEquals("parcelNumber", valueOverrideContainer.getVirtualOverrides().iterator().next().getName()); + assertEquals(2, valueOverrideContainer.getVirtualOverridesSize()); + assertEquals("city", mapKeyOverrideContainer.getVirtualOverrides().iterator().next().getName()); + assertEquals(3, mapKeyOverrideContainer.getVirtualOverridesSize()); - valueOverrideContainer.specifiedOverrides().next().convertToVirtual(); - mapKeyOverrideContainer.specifiedOverrides().next().convertToVirtual(); - overrideAnnotations = resourceAttribute.annotations(AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverridesAnnotation.ANNOTATION_NAME); + valueOverrideContainer.getSpecifiedOverrides().iterator().next().convertToVirtual(); + mapKeyOverrideContainer.getSpecifiedOverrides().iterator().next().convertToVirtual(); + overrideAnnotations = resourceField.getAnnotations(JPA.ATTRIBUTE_OVERRIDE).iterator(); assertFalse(overrideAnnotations.hasNext()); - Iterator virtualAttributeOverrides = (ListIterator) valueOverrideContainer.virtualOverrides(); + Iterator virtualAttributeOverrides = valueOverrideContainer.getVirtualOverrides().iterator(); assertEquals("parcelNumber", virtualAttributeOverrides.next().getName()); assertEquals("size", virtualAttributeOverrides.next().getName()); assertEquals("tax", virtualAttributeOverrides.next().getName()); - assertEquals(3, valueOverrideContainer.virtualOverridesSize()); + assertEquals(3, valueOverrideContainer.getVirtualOverridesSize()); - virtualAttributeOverrides = (ListIterator) mapKeyOverrideContainer.virtualOverrides(); + virtualAttributeOverrides = mapKeyOverrideContainer.getVirtualOverrides().iterator(); assertEquals("city", virtualAttributeOverrides.next().getName()); assertEquals("state.name", virtualAttributeOverrides.next().getName()); assertEquals("state.abbr", virtualAttributeOverrides.next().getName()); assertEquals("zip", virtualAttributeOverrides.next().getName()); - assertEquals(4, mapKeyOverrideContainer.virtualOverridesSize()); + assertEquals(4, mapKeyOverrideContainer.getVirtualOverridesSize()); } @@ -2002,29 +1998,29 @@ public class GenericJavaElementCollectionMapping2_0Tests extends Generic2_0Conte ElementCollectionMapping2_0 elementCollectionMapping = (ElementCollectionMapping2_0) getJavaPersistentType().getAttributeNamed("parcels").getMapping(); AttributeOverrideContainer valueAttributeOverrideContainer = elementCollectionMapping.getValueAttributeOverrideContainer(); AttributeOverrideContainer mapKeyAttributeOverrideContainer = elementCollectionMapping.getMapKeyAttributeOverrideContainer(); - valueAttributeOverrideContainer.virtualOverrides().next().convertToSpecified(); - valueAttributeOverrideContainer.virtualOverrides().next().convertToSpecified(); - mapKeyAttributeOverrideContainer.virtualOverrides().next().convertToSpecified(); - mapKeyAttributeOverrideContainer.virtualOverrides().next().convertToSpecified(); + valueAttributeOverrideContainer.getVirtualOverrides().iterator().next().convertToSpecified(); + valueAttributeOverrideContainer.getVirtualOverrides().iterator().next().convertToSpecified(); + mapKeyAttributeOverrideContainer.getVirtualOverrides().iterator().next().convertToSpecified(); + mapKeyAttributeOverrideContainer.getVirtualOverrides().iterator().next().convertToSpecified(); - ListIterator specifiedOverrides = (ListIterator) valueAttributeOverrideContainer.specifiedOverrides(); + ListIterator specifiedOverrides = valueAttributeOverrideContainer.getSpecifiedOverrides().iterator(); assertEquals("parcelNumber", specifiedOverrides.next().getName()); assertEquals("size", specifiedOverrides.next().getName()); assertFalse(specifiedOverrides.hasNext()); - specifiedOverrides = (ListIterator) mapKeyAttributeOverrideContainer.specifiedOverrides(); + specifiedOverrides = mapKeyAttributeOverrideContainer.getSpecifiedOverrides().iterator(); assertEquals("city", specifiedOverrides.next().getName()); assertEquals("state.name", specifiedOverrides.next().getName()); assertFalse(specifiedOverrides.hasNext()); - JavaResourcePersistentType resourceType = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute resourceAttribute = resourceType.persistableAttributes().next(); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); - resourceAttribute.moveAnnotation(1, 0, AttributeOverridesAnnotation.ANNOTATION_NAME); + resourceField.moveAnnotation(1, 0, AttributeOverrideAnnotation.ANNOTATION_NAME); this.getJpaProject().synchronizeContextModel(); getJpaProject().synchronizeContextModel(); - Iterator overrideAnnotations = resourceAttribute.annotations(AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverridesAnnotation.ANNOTATION_NAME); + Iterator overrideAnnotations = resourceField.getAnnotations(JPA.ATTRIBUTE_OVERRIDE).iterator(); assertEquals("value.size", ((AttributeOverrideAnnotation) overrideAnnotations.next()).getName()); assertEquals("value.parcelNumber", ((AttributeOverrideAnnotation) overrideAnnotations.next()).getName()); @@ -2032,22 +2028,22 @@ public class GenericJavaElementCollectionMapping2_0Tests extends Generic2_0Conte assertEquals("key.state.name", ((AttributeOverrideAnnotation) overrideAnnotations.next()).getName()); assertFalse(overrideAnnotations.hasNext()); - specifiedOverrides = (ListIterator) valueAttributeOverrideContainer.specifiedOverrides(); + specifiedOverrides = valueAttributeOverrideContainer.getSpecifiedOverrides().iterator(); assertEquals("size", specifiedOverrides.next().getName()); assertEquals("parcelNumber", specifiedOverrides.next().getName()); assertFalse(specifiedOverrides.hasNext()); - specifiedOverrides = (ListIterator) mapKeyAttributeOverrideContainer.specifiedOverrides(); + specifiedOverrides = mapKeyAttributeOverrideContainer.getSpecifiedOverrides().iterator(); assertEquals("city", specifiedOverrides.next().getName()); assertEquals("state.name", specifiedOverrides.next().getName()); assertFalse(specifiedOverrides.hasNext()); - resourceAttribute.moveAnnotation(3, 2, AttributeOverridesAnnotation.ANNOTATION_NAME); + resourceField.moveAnnotation(3, 2, AttributeOverrideAnnotation.ANNOTATION_NAME); this.getJpaProject().synchronizeContextModel(); getJpaProject().synchronizeContextModel(); - overrideAnnotations = resourceAttribute.annotations(AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverridesAnnotation.ANNOTATION_NAME); + overrideAnnotations = resourceField.getAnnotations(JPA.ATTRIBUTE_OVERRIDE).iterator(); assertEquals("value.size", ((AttributeOverrideAnnotation) overrideAnnotations.next()).getName()); assertEquals("value.parcelNumber", ((AttributeOverrideAnnotation) overrideAnnotations.next()).getName()); @@ -2055,12 +2051,12 @@ public class GenericJavaElementCollectionMapping2_0Tests extends Generic2_0Conte assertEquals("key.city", ((AttributeOverrideAnnotation) overrideAnnotations.next()).getName()); assertFalse(overrideAnnotations.hasNext()); - specifiedOverrides = (ListIterator) valueAttributeOverrideContainer.specifiedOverrides(); + specifiedOverrides = valueAttributeOverrideContainer.getSpecifiedOverrides().iterator(); assertEquals("size", specifiedOverrides.next().getName()); assertEquals("parcelNumber", specifiedOverrides.next().getName()); assertFalse(specifiedOverrides.hasNext()); - specifiedOverrides = (ListIterator) mapKeyAttributeOverrideContainer.specifiedOverrides(); + specifiedOverrides = mapKeyAttributeOverrideContainer.getSpecifiedOverrides().iterator(); assertEquals("state.name", specifiedOverrides.next().getName()); assertEquals("city", specifiedOverrides.next().getName()); assertFalse(specifiedOverrides.hasNext()); diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/java/GenericJavaEmbeddedMapping2_0Tests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/java/GenericJavaEmbeddedMapping2_0Tests.java index 6574a8278c..352f35bd7e 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/java/GenericJavaEmbeddedMapping2_0Tests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/java/GenericJavaEmbeddedMapping2_0Tests.java @@ -12,6 +12,10 @@ package org.eclipse.jpt.jpa.core.tests.internal.jpa2.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; @@ -54,19 +58,14 @@ import org.eclipse.jpt.jpa.core.internal.jpa1.context.java.GenericJavaNullAttrib import org.eclipse.jpt.jpa.core.jpa2.context.VirtualOverrideRelationship2_0; import org.eclipse.jpt.jpa.core.jpa2.context.java.JavaEmbeddedMapping2_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.BasicAnnotation; 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.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.TransientAnnotation; @@ -273,11 +272,11 @@ public class GenericJavaEmbeddedMapping2_0Tests extends Generic2_0ContextModelTe 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(EmbeddedAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getAnnotation(BasicAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(AttributeOverrideAnnotation.ANNOTATION_NAME)); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + assertNull(resourceField.getAnnotation(EmbeddedAnnotation.ANNOTATION_NAME)); + assertNotNull(resourceField.getAnnotation(BasicAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(0, AttributeOverrideAnnotation.ANNOTATION_NAME)); } public void testMorphToDefault() throws Exception { @@ -288,17 +287,17 @@ public class GenericJavaEmbeddedMapping2_0Tests extends Generic2_0ContextModelTe PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributeNamed("myEmbedded"); JavaEmbeddedMapping embeddedMapping = (JavaEmbeddedMapping) persistentAttribute.getMapping(); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - attributeResource.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + resourceField.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE); assertFalse(embeddedMapping.isDefault()); persistentAttribute.setMappingKey(MappingKeys.NULL_ATTRIBUTE_MAPPING_KEY); - assertTrue(((JavaEmbeddedMapping) persistentAttribute.getMapping()).getAttributeOverrideContainer().overrides().hasNext()); + assertTrue(((JavaEmbeddedMapping) persistentAttribute.getMapping()).getAttributeOverrideContainer().getOverrides().iterator().hasNext()); assertTrue(persistentAttribute.getMapping().isDefault()); - assertNull(attributeResource.getAnnotation(EmbeddedAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getAnnotation(AttributeOverrideAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(EmbeddedAnnotation.ANNOTATION_NAME)); + assertNotNull(resourceField.getAnnotation(0, AttributeOverrideAnnotation.ANNOTATION_NAME)); } public void testDefaultEmbeddedMapping() throws Exception { @@ -397,17 +396,17 @@ public class GenericJavaEmbeddedMapping2_0Tests extends Generic2_0ContextModelTe PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributeNamed("myEmbedded"); JavaEmbeddedMapping embeddedMapping = (JavaEmbeddedMapping) persistentAttribute.getMapping(); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - attributeResource.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + resourceField.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE); assertFalse(embeddedMapping.isDefault()); persistentAttribute.setMappingKey(MappingKeys.VERSION_ATTRIBUTE_MAPPING_KEY); assertTrue(persistentAttribute.getMapping() instanceof VersionMapping); - assertNull(attributeResource.getAnnotation(EmbeddedAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getAnnotation(VersionAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(AttributeOverrideAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(EmbeddedAnnotation.ANNOTATION_NAME)); + assertNotNull(resourceField.getAnnotation(VersionAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(0, AttributeOverrideAnnotation.ANNOTATION_NAME)); } public void testMorphToTransientMapping() throws Exception { @@ -417,17 +416,17 @@ public class GenericJavaEmbeddedMapping2_0Tests extends Generic2_0ContextModelTe PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributeNamed("myEmbedded"); JavaEmbeddedMapping embeddedMapping = (JavaEmbeddedMapping) persistentAttribute.getMapping(); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - attributeResource.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + resourceField.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE); assertFalse(embeddedMapping.isDefault()); persistentAttribute.setMappingKey(MappingKeys.TRANSIENT_ATTRIBUTE_MAPPING_KEY); assertTrue(persistentAttribute.getMapping() instanceof TransientMapping); - assertNull(attributeResource.getAnnotation(EmbeddedAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getAnnotation(TransientAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(AttributeOverrideAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(EmbeddedAnnotation.ANNOTATION_NAME)); + assertNotNull(resourceField.getAnnotation(TransientAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(0, AttributeOverrideAnnotation.ANNOTATION_NAME)); } public void testMorphToIdMapping() throws Exception { @@ -437,17 +436,17 @@ public class GenericJavaEmbeddedMapping2_0Tests extends Generic2_0ContextModelTe PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributeNamed("myEmbedded"); JavaEmbeddedMapping embeddedMapping = (JavaEmbeddedMapping) persistentAttribute.getMapping(); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - attributeResource.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + resourceField.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE); assertFalse(embeddedMapping.isDefault()); persistentAttribute.setMappingKey(MappingKeys.ID_ATTRIBUTE_MAPPING_KEY); assertTrue(persistentAttribute.getMapping() instanceof IdMapping); - assertNull(attributeResource.getAnnotation(EmbeddedAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getAnnotation(IdAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(AttributeOverrideAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(EmbeddedAnnotation.ANNOTATION_NAME)); + assertNotNull(resourceField.getAnnotation(IdAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(0, AttributeOverrideAnnotation.ANNOTATION_NAME)); } public void testMorphToEmbeddedIdMapping() throws Exception { @@ -457,17 +456,17 @@ public class GenericJavaEmbeddedMapping2_0Tests extends Generic2_0ContextModelTe PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributeNamed("myEmbedded"); JavaEmbeddedMapping embeddedMapping = (JavaEmbeddedMapping) persistentAttribute.getMapping(); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - attributeResource.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + resourceField.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE); assertFalse(embeddedMapping.isDefault()); persistentAttribute.setMappingKey(MappingKeys.EMBEDDED_ID_ATTRIBUTE_MAPPING_KEY); assertTrue(persistentAttribute.getMapping() instanceof EmbeddedIdMapping); - assertNull(attributeResource.getAnnotation(EmbeddedAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getAnnotation(EmbeddedIdAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getAnnotation(AttributeOverrideAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(EmbeddedAnnotation.ANNOTATION_NAME)); + assertNotNull(resourceField.getAnnotation(EmbeddedIdAnnotation.ANNOTATION_NAME)); + assertNotNull(resourceField.getAnnotation(0, AttributeOverrideAnnotation.ANNOTATION_NAME)); } public void testMorphToOneToOneMapping() throws Exception { @@ -477,17 +476,17 @@ public class GenericJavaEmbeddedMapping2_0Tests extends Generic2_0ContextModelTe PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributeNamed("myEmbedded"); JavaEmbeddedMapping embeddedMapping = (JavaEmbeddedMapping) persistentAttribute.getMapping(); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - attributeResource.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + resourceField.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE); assertFalse(embeddedMapping.isDefault()); persistentAttribute.setMappingKey(MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY); assertTrue(persistentAttribute.getMapping() instanceof OneToOneMapping); - assertNull(attributeResource.getAnnotation(EmbeddedAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getAnnotation(OneToOneAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(AttributeOverrideAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(EmbeddedAnnotation.ANNOTATION_NAME)); + assertNotNull(resourceField.getAnnotation(OneToOneAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(0, AttributeOverrideAnnotation.ANNOTATION_NAME)); } public void testMorphToOneToManyMapping() throws Exception { @@ -497,17 +496,17 @@ public class GenericJavaEmbeddedMapping2_0Tests extends Generic2_0ContextModelTe PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributeNamed("myEmbedded"); JavaEmbeddedMapping embeddedMapping = (JavaEmbeddedMapping) persistentAttribute.getMapping(); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - attributeResource.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + resourceField.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE); assertFalse(embeddedMapping.isDefault()); persistentAttribute.setMappingKey(MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY); assertTrue(persistentAttribute.getMapping() instanceof OneToManyMapping); - assertNull(attributeResource.getAnnotation(EmbeddedAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getAnnotation(OneToManyAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getAnnotation(AttributeOverrideAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(EmbeddedAnnotation.ANNOTATION_NAME)); + assertNotNull(resourceField.getAnnotation(OneToManyAnnotation.ANNOTATION_NAME)); + assertNotNull(resourceField.getAnnotation(0, AttributeOverrideAnnotation.ANNOTATION_NAME)); } public void testMorphToManyToOneMapping() throws Exception { @@ -517,17 +516,17 @@ public class GenericJavaEmbeddedMapping2_0Tests extends Generic2_0ContextModelTe PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributeNamed("myEmbedded"); JavaEmbeddedMapping embeddedMapping = (JavaEmbeddedMapping) persistentAttribute.getMapping(); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - attributeResource.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + resourceField.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE); assertFalse(embeddedMapping.isDefault()); persistentAttribute.setMappingKey(MappingKeys.MANY_TO_ONE_ATTRIBUTE_MAPPING_KEY); assertTrue(persistentAttribute.getMapping() instanceof ManyToOneMapping); - assertNull(attributeResource.getAnnotation(EmbeddedAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getAnnotation(ManyToOneAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(AttributeOverrideAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(EmbeddedAnnotation.ANNOTATION_NAME)); + assertNotNull(resourceField.getAnnotation(ManyToOneAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(0, AttributeOverrideAnnotation.ANNOTATION_NAME)); } public void testMorphToManyToManyMapping() throws Exception { @@ -537,17 +536,17 @@ public class GenericJavaEmbeddedMapping2_0Tests extends Generic2_0ContextModelTe PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributeNamed("myEmbedded"); JavaEmbeddedMapping embeddedMapping = (JavaEmbeddedMapping) persistentAttribute.getMapping(); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - attributeResource.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + resourceField.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE); assertFalse(embeddedMapping.isDefault()); persistentAttribute.setMappingKey(MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); assertTrue(persistentAttribute.getMapping() instanceof ManyToManyMapping); - assertNull(attributeResource.getAnnotation(EmbeddedAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getAnnotation(ManyToManyAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getAnnotation(AttributeOverrideAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(EmbeddedAnnotation.ANNOTATION_NAME)); + assertNotNull(resourceField.getAnnotation(ManyToManyAnnotation.ANNOTATION_NAME)); + assertNotNull(resourceField.getAnnotation(0, AttributeOverrideAnnotation.ANNOTATION_NAME)); } public void testSpecifiedAttributeOverrides() throws Exception { @@ -559,65 +558,65 @@ public class GenericJavaEmbeddedMapping2_0Tests extends Generic2_0ContextModelTe JavaEmbeddedMapping embeddedMapping = (JavaEmbeddedMapping) getJavaPersistentType().getAttributeNamed("myEmbedded").getMapping(); JavaAttributeOverrideContainer attributeOverrideContainer = embeddedMapping.getAttributeOverrideContainer(); - ListIterator specifiedAttributeOverrides = attributeOverrideContainer.specifiedOverrides(); + ListIterator specifiedAttributeOverrides = attributeOverrideContainer.getSpecifiedOverrides().iterator(); assertFalse(specifiedAttributeOverrides.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 - AttributeOverrideAnnotation attributeOverride = (AttributeOverrideAnnotation) attributeResource.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + AttributeOverrideAnnotation attributeOverride = (AttributeOverrideAnnotation) resourceField.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE); attributeOverride.setName("FOO"); getJpaProject().synchronizeContextModel(); - specifiedAttributeOverrides = attributeOverrideContainer.specifiedOverrides(); + specifiedAttributeOverrides = attributeOverrideContainer.getSpecifiedOverrides().iterator(); assertEquals("FOO", specifiedAttributeOverrides.next().getName()); assertFalse(specifiedAttributeOverrides.hasNext()); - attributeOverride = (AttributeOverrideAnnotation) attributeResource.addAnnotation(1, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + attributeOverride = (AttributeOverrideAnnotation) resourceField.addAnnotation(1, JPA.ATTRIBUTE_OVERRIDE); attributeOverride.setName("BAR"); getJpaProject().synchronizeContextModel(); - specifiedAttributeOverrides = attributeOverrideContainer.specifiedOverrides(); + specifiedAttributeOverrides = attributeOverrideContainer.getSpecifiedOverrides().iterator(); assertEquals("FOO", specifiedAttributeOverrides.next().getName()); assertEquals("BAR", specifiedAttributeOverrides.next().getName()); assertFalse(specifiedAttributeOverrides.hasNext()); - attributeOverride = (AttributeOverrideAnnotation) attributeResource.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + attributeOverride = (AttributeOverrideAnnotation) resourceField.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE); attributeOverride.setName("BAZ"); getJpaProject().synchronizeContextModel(); - specifiedAttributeOverrides = attributeOverrideContainer.specifiedOverrides(); + specifiedAttributeOverrides = attributeOverrideContainer.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 - attributeResource.moveAnnotation(1, 0, JPA.ATTRIBUTE_OVERRIDES); + resourceField.moveAnnotation(1, 0, JPA.ATTRIBUTE_OVERRIDE); getJpaProject().synchronizeContextModel(); - specifiedAttributeOverrides = attributeOverrideContainer.specifiedOverrides(); + specifiedAttributeOverrides = attributeOverrideContainer.getSpecifiedOverrides().iterator(); assertEquals("FOO", specifiedAttributeOverrides.next().getName()); assertEquals("BAZ", specifiedAttributeOverrides.next().getName()); assertEquals("BAR", specifiedAttributeOverrides.next().getName()); assertFalse(specifiedAttributeOverrides.hasNext()); - attributeResource.removeAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + resourceField.removeAnnotation(0, JPA.ATTRIBUTE_OVERRIDE); getJpaProject().synchronizeContextModel(); - specifiedAttributeOverrides = attributeOverrideContainer.specifiedOverrides(); + specifiedAttributeOverrides = attributeOverrideContainer.getSpecifiedOverrides().iterator(); assertEquals("BAZ", specifiedAttributeOverrides.next().getName()); assertEquals("BAR", specifiedAttributeOverrides.next().getName()); assertFalse(specifiedAttributeOverrides.hasNext()); - attributeResource.removeAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + resourceField.removeAnnotation(0, JPA.ATTRIBUTE_OVERRIDE); getJpaProject().synchronizeContextModel(); - specifiedAttributeOverrides = attributeOverrideContainer.specifiedOverrides(); + specifiedAttributeOverrides = attributeOverrideContainer.getSpecifiedOverrides().iterator(); assertEquals("BAR", specifiedAttributeOverrides.next().getName()); assertFalse(specifiedAttributeOverrides.hasNext()); - attributeResource.removeAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + resourceField.removeAnnotation(0, JPA.ATTRIBUTE_OVERRIDE); getJpaProject().synchronizeContextModel(); - specifiedAttributeOverrides = attributeOverrideContainer.specifiedOverrides(); + specifiedAttributeOverrides = attributeOverrideContainer.getSpecifiedOverrides().iterator(); assertFalse(specifiedAttributeOverrides.hasNext()); } @@ -630,14 +629,13 @@ public class GenericJavaEmbeddedMapping2_0Tests extends Generic2_0ContextModelTe JavaEmbeddedMapping embeddedMapping = (JavaEmbeddedMapping) getJavaPersistentType().getAttributeNamed("myEmbedded").getMapping(); JavaAttributeOverrideContainer attributeOverrideContainer = embeddedMapping.getAttributeOverrideContainer(); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - assertEquals("myEmbedded", attributeResource.getName()); - assertNull(attributeResource.getAnnotation(AttributeOverrideAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(AttributeOverridesAnnotation.ANNOTATION_NAME)); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + assertEquals("myEmbedded", resourceField.getName()); + assertNull(resourceField.getAnnotation(0, AttributeOverrideAnnotation.ANNOTATION_NAME)); - assertEquals(2, attributeOverrideContainer.virtualOverridesSize()); - ReadOnlyAttributeOverride defaultAttributeOverride = attributeOverrideContainer.virtualOverrides().next(); + assertEquals(2, attributeOverrideContainer.getVirtualOverridesSize()); + ReadOnlyAttributeOverride defaultAttributeOverride = attributeOverrideContainer.getVirtualOverrides().iterator().next(); assertEquals("city", defaultAttributeOverride.getName()); assertEquals("city", defaultAttributeOverride.getColumn().getName()); assertEquals(TYPE_NAME, defaultAttributeOverride.getColumn().getTable()); @@ -651,7 +649,7 @@ public class GenericJavaEmbeddedMapping2_0Tests extends Generic2_0ContextModelTe assertEquals(0, defaultAttributeOverride.getColumn().getScale()); - ListIterator classRefs = getPersistenceUnit().specifiedClassRefs(); + ListIterator classRefs = getPersistenceUnit().getSpecifiedClassRefs().iterator(); classRefs.next(); Embeddable embeddable = (Embeddable) classRefs.next().getJavaPersistentType().getMapping(); @@ -667,12 +665,11 @@ public class GenericJavaEmbeddedMapping2_0Tests extends Generic2_0ContextModelTe cityMapping.getColumn().setSpecifiedPrecision(Integer.valueOf(6)); cityMapping.getColumn().setSpecifiedScale(Integer.valueOf(7)); - assertEquals("myEmbedded", attributeResource.getName()); - assertNull(attributeResource.getAnnotation(AttributeOverrideAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(AttributeOverridesAnnotation.ANNOTATION_NAME)); + assertEquals("myEmbedded", resourceField.getName()); + assertNull(resourceField.getAnnotation(0, AttributeOverrideAnnotation.ANNOTATION_NAME)); - assertEquals(2, attributeOverrideContainer.virtualOverridesSize()); - defaultAttributeOverride = attributeOverrideContainer.virtualOverrides().next(); + assertEquals(2, attributeOverrideContainer.getVirtualOverridesSize()); + defaultAttributeOverride = attributeOverrideContainer.getVirtualOverrides().iterator().next(); assertEquals("city", defaultAttributeOverride.getName()); assertEquals("FOO", defaultAttributeOverride.getColumn().getName()); assertEquals("BAR", defaultAttributeOverride.getColumn().getTable()); @@ -695,7 +692,7 @@ public class GenericJavaEmbeddedMapping2_0Tests extends Generic2_0ContextModelTe cityMapping.getColumn().setSpecifiedLength(null); cityMapping.getColumn().setSpecifiedPrecision(null); cityMapping.getColumn().setSpecifiedScale(null); - defaultAttributeOverride = attributeOverrideContainer.virtualOverrides().next(); + defaultAttributeOverride = attributeOverrideContainer.getVirtualOverrides().iterator().next(); assertEquals("city", defaultAttributeOverride.getName()); assertEquals("city", defaultAttributeOverride.getColumn().getName()); assertEquals(TYPE_NAME, defaultAttributeOverride.getColumn().getTable()); @@ -708,10 +705,10 @@ public class GenericJavaEmbeddedMapping2_0Tests extends Generic2_0ContextModelTe assertEquals(0, defaultAttributeOverride.getColumn().getPrecision()); assertEquals(0, defaultAttributeOverride.getColumn().getScale()); - AttributeOverrideAnnotation annotation = (AttributeOverrideAnnotation) attributeResource.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + AttributeOverrideAnnotation annotation = (AttributeOverrideAnnotation) resourceField.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE); annotation.setName("city"); getJpaProject().synchronizeContextModel(); - assertEquals(1, attributeOverrideContainer.virtualOverridesSize()); + assertEquals(1, attributeOverrideContainer.getVirtualOverridesSize()); } public void testSpecifiedAttributeOverridesSize() throws Exception { @@ -722,19 +719,19 @@ public class GenericJavaEmbeddedMapping2_0Tests extends Generic2_0ContextModelTe JavaEmbeddedMapping embeddedMapping = (JavaEmbeddedMapping) getJavaPersistentType().getAttributeNamed("myEmbedded").getMapping(); JavaAttributeOverrideContainer attributeOverrideContainer = embeddedMapping.getAttributeOverrideContainer(); - assertEquals(0, attributeOverrideContainer.specifiedOverridesSize()); + assertEquals(0, attributeOverrideContainer.getSpecifiedOverridesSize()); - 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 - AttributeOverrideAnnotation attributeOverride = (AttributeOverrideAnnotation) attributeResource.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + AttributeOverrideAnnotation attributeOverride = (AttributeOverrideAnnotation) resourceField.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE); attributeOverride.setName("FOO"); - attributeOverride = (AttributeOverrideAnnotation) attributeResource.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + attributeOverride = (AttributeOverrideAnnotation) resourceField.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE); attributeOverride.setName("BAR"); getJpaProject().synchronizeContextModel(); - assertEquals(2, attributeOverrideContainer.specifiedOverridesSize()); + assertEquals(2, attributeOverrideContainer.getSpecifiedOverridesSize()); } public void testAttributeOverridesSize() throws Exception { @@ -745,24 +742,24 @@ public class GenericJavaEmbeddedMapping2_0Tests extends Generic2_0ContextModelTe JavaEmbeddedMapping embeddedMapping = (JavaEmbeddedMapping) getJavaPersistentType().getAttributeNamed("myEmbedded").getMapping(); JavaAttributeOverrideContainer attributeOverrideContainer = embeddedMapping.getAttributeOverrideContainer(); - assertEquals(2, attributeOverrideContainer.overridesSize()); + assertEquals(2, attributeOverrideContainer.getOverridesSize()); - 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 - AttributeOverrideAnnotation attributeOverride = (AttributeOverrideAnnotation) attributeResource.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + AttributeOverrideAnnotation attributeOverride = (AttributeOverrideAnnotation) resourceField.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE); attributeOverride.setName("FOO"); - attributeOverride = (AttributeOverrideAnnotation) attributeResource.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + attributeOverride = (AttributeOverrideAnnotation) resourceField.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE); attributeOverride.setName("BAR"); getJpaProject().synchronizeContextModel(); - assertEquals(4, attributeOverrideContainer.overridesSize()); + assertEquals(4, attributeOverrideContainer.getOverridesSize()); - attributeOverride = (AttributeOverrideAnnotation) attributeResource.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + attributeOverride = (AttributeOverrideAnnotation) resourceField.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE); attributeOverride.setName("city"); getJpaProject().synchronizeContextModel(); - assertEquals(4, attributeOverrideContainer.overridesSize()); + assertEquals(4, attributeOverrideContainer.getOverridesSize()); } public void testVirtualAttributeOverridesSize() throws Exception { @@ -773,27 +770,27 @@ public class GenericJavaEmbeddedMapping2_0Tests extends Generic2_0ContextModelTe JavaEmbeddedMapping embeddedMapping = (JavaEmbeddedMapping) getJavaPersistentType().getAttributeNamed("myEmbedded").getMapping(); JavaAttributeOverrideContainer attributeOverrideContainer = embeddedMapping.getAttributeOverrideContainer(); - assertEquals(2, attributeOverrideContainer.virtualOverridesSize()); + assertEquals(2, attributeOverrideContainer.getVirtualOverridesSize()); - 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 - AttributeOverrideAnnotation attributeOverride = (AttributeOverrideAnnotation) attributeResource.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + AttributeOverrideAnnotation attributeOverride = (AttributeOverrideAnnotation) resourceField.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE); attributeOverride.setName("FOO"); getJpaProject().synchronizeContextModel(); - assertEquals(2, attributeOverrideContainer.virtualOverridesSize()); + assertEquals(2, attributeOverrideContainer.getVirtualOverridesSize()); - attributeOverride = (AttributeOverrideAnnotation) attributeResource.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + attributeOverride = (AttributeOverrideAnnotation) resourceField.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE); attributeOverride.setName("city"); getJpaProject().synchronizeContextModel(); - assertEquals(1, attributeOverrideContainer.virtualOverridesSize()); + assertEquals(1, attributeOverrideContainer.getVirtualOverridesSize()); - attributeOverride = (AttributeOverrideAnnotation) attributeResource.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + attributeOverride = (AttributeOverrideAnnotation) resourceField.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE); attributeOverride.setName("state"); getJpaProject().synchronizeContextModel(); - assertEquals(0, attributeOverrideContainer.virtualOverridesSize()); + assertEquals(0, attributeOverrideContainer.getVirtualOverridesSize()); } public void testAttributeOverrideSetVirtual() throws Exception { @@ -804,33 +801,33 @@ public class GenericJavaEmbeddedMapping2_0Tests extends Generic2_0ContextModelTe JavaEmbeddedMapping embeddedMapping = (JavaEmbeddedMapping) getJavaPersistentType().getAttributeNamed("myEmbedded").getMapping(); JavaAttributeOverrideContainer attributeOverrideContainer = embeddedMapping.getAttributeOverrideContainer(); - attributeOverrideContainer.virtualOverrides().next().convertToSpecified(); - attributeOverrideContainer.virtualOverrides().next().convertToSpecified(); + attributeOverrideContainer.getVirtualOverrides().iterator().next().convertToSpecified(); + attributeOverrideContainer.getVirtualOverrides().iterator().next().convertToSpecified(); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - Iterator attributeOverrides = attributeResource.annotations(AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverridesAnnotation.ANNOTATION_NAME); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + Iterator attributeOverrides = resourceField.getAnnotations(JPA.ATTRIBUTE_OVERRIDE).iterator(); assertEquals("city", ((AttributeOverrideAnnotation) attributeOverrides.next()).getName()); assertEquals("state", ((AttributeOverrideAnnotation) attributeOverrides.next()).getName()); assertFalse(attributeOverrides.hasNext()); - attributeOverrideContainer.specifiedOverrides().next().convertToVirtual(); - attributeOverrides = attributeResource.annotations(AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverridesAnnotation.ANNOTATION_NAME); + attributeOverrideContainer.getSpecifiedOverrides().iterator().next().convertToVirtual(); + attributeOverrides = resourceField.getAnnotations(JPA.ATTRIBUTE_OVERRIDE).iterator(); assertEquals("state", ((AttributeOverrideAnnotation) attributeOverrides.next()).getName()); assertFalse(attributeOverrides.hasNext()); - assertEquals("city", attributeOverrideContainer.virtualOverrides().next().getName()); - assertEquals(1, attributeOverrideContainer.virtualOverridesSize()); + assertEquals("city", attributeOverrideContainer.getVirtualOverrides().iterator().next().getName()); + assertEquals(1, attributeOverrideContainer.getVirtualOverridesSize()); - attributeOverrideContainer.specifiedOverrides().next().convertToVirtual(); - attributeOverrides = attributeResource.annotations(AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverridesAnnotation.ANNOTATION_NAME); + attributeOverrideContainer.getSpecifiedOverrides().iterator().next().convertToVirtual(); + attributeOverrides = resourceField.getAnnotations(JPA.ATTRIBUTE_OVERRIDE).iterator(); assertFalse(attributeOverrides.hasNext()); - Iterator virtualAttributeOverrides = attributeOverrideContainer.virtualOverrides(); + Iterator virtualAttributeOverrides = attributeOverrideContainer.getVirtualOverrides().iterator(); assertEquals("city", virtualAttributeOverrides.next().getName()); assertEquals("state", virtualAttributeOverrides.next().getName()); - assertEquals(2, attributeOverrideContainer.virtualOverridesSize()); + assertEquals(2, attributeOverrideContainer.getVirtualOverridesSize()); } public void testAttributeOverrideSetVirtual2() throws Exception { @@ -841,14 +838,14 @@ public class GenericJavaEmbeddedMapping2_0Tests extends Generic2_0ContextModelTe JavaEmbeddedMapping embeddedMapping = (JavaEmbeddedMapping) getJavaPersistentType().getAttributeNamed("myEmbedded").getMapping(); JavaAttributeOverrideContainer attributeOverrideContainer = embeddedMapping.getAttributeOverrideContainer(); - ListIterator virtualAttributeOverrides = attributeOverrideContainer.virtualOverrides(); + ListIterator virtualAttributeOverrides = attributeOverrideContainer.getVirtualOverrides().iterator(); virtualAttributeOverrides.next(); virtualAttributeOverrides.next().convertToSpecified(); - attributeOverrideContainer.virtualOverrides().next().convertToSpecified(); + attributeOverrideContainer.getVirtualOverrides().iterator().next().convertToSpecified(); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - Iterator attributeOverrides = attributeResource.annotations(AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverridesAnnotation.ANNOTATION_NAME); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + Iterator attributeOverrides = resourceField.getAnnotations(JPA.ATTRIBUTE_OVERRIDE).iterator(); assertEquals("state", ((AttributeOverrideAnnotation) attributeOverrides.next()).getName()); assertEquals("city", ((AttributeOverrideAnnotation) attributeOverrides.next()).getName()); @@ -863,15 +860,15 @@ public class GenericJavaEmbeddedMapping2_0Tests extends Generic2_0ContextModelTe JavaEmbeddedMapping embeddedMapping = (JavaEmbeddedMapping) getJavaPersistentType().getAttributeNamed("myEmbedded").getMapping(); JavaAttributeOverrideContainer attributeOverrideContainer = embeddedMapping.getAttributeOverrideContainer(); - attributeOverrideContainer.virtualOverrides().next().convertToSpecified(); - attributeOverrideContainer.virtualOverrides().next().convertToSpecified(); + attributeOverrideContainer.getVirtualOverrides().iterator().next().convertToSpecified(); + attributeOverrideContainer.getVirtualOverrides().iterator().next().convertToSpecified(); - 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(); - attributeResource.moveAnnotation(1, 0, AttributeOverridesAnnotation.ANNOTATION_NAME); + resourceField.moveAnnotation(1, 0, JPA.ATTRIBUTE_OVERRIDE); - Iterator attributeOverrides = attributeResource.annotations(AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverridesAnnotation.ANNOTATION_NAME); + Iterator attributeOverrides = resourceField.getAnnotations(JPA.ATTRIBUTE_OVERRIDE).iterator(); assertEquals("state", ((AttributeOverrideAnnotation) attributeOverrides.next()).getName()); assertEquals("city", ((AttributeOverrideAnnotation) attributeOverrides.next()).getName()); @@ -888,64 +885,64 @@ public class GenericJavaEmbeddedMapping2_0Tests extends Generic2_0ContextModelTe addXmlClassRef(PACKAGE_NAME + ".Address"); JavaEmbeddedMapping2_0 embeddedMapping = (JavaEmbeddedMapping2_0) getJavaPersistentType().getAttributeNamed("myEmbedded").getMapping(); JavaAssociationOverrideContainer overrideContainer = embeddedMapping.getAssociationOverrideContainer(); - ListIterator specifiedAssociationOverrides = overrideContainer.specifiedOverrides(); + ListIterator specifiedAssociationOverrides = overrideContainer.getSpecifiedOverrides().iterator(); assertFalse(specifiedAssociationOverrides.hasNext()); - JavaResourcePersistentAttribute resourceAttribute = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME).persistableAttributes().next(); + JavaResourceField resourceField = ((JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE)).getFields().iterator().next(); //add an annotation to the resource model and verify the context model is updated - AssociationOverrideAnnotation associationOverride = (AssociationOverrideAnnotation) resourceAttribute.addAnnotation(0, JPA.ASSOCIATION_OVERRIDE, JPA.ASSOCIATION_OVERRIDES); + AssociationOverrideAnnotation associationOverride = (AssociationOverrideAnnotation) resourceField.addAnnotation(0, JPA.ASSOCIATION_OVERRIDE); associationOverride.setName("FOO"); getJpaProject().synchronizeContextModel(); - specifiedAssociationOverrides = overrideContainer.specifiedOverrides(); + specifiedAssociationOverrides = overrideContainer.getSpecifiedOverrides().iterator(); assertEquals("FOO", specifiedAssociationOverrides.next().getName()); assertFalse(specifiedAssociationOverrides.hasNext()); - associationOverride = (AssociationOverrideAnnotation) resourceAttribute.addAnnotation(1, JPA.ASSOCIATION_OVERRIDE, JPA.ASSOCIATION_OVERRIDES); + associationOverride = (AssociationOverrideAnnotation) resourceField.addAnnotation(1, JPA.ASSOCIATION_OVERRIDE); associationOverride.setName("BAR"); getJpaProject().synchronizeContextModel(); - specifiedAssociationOverrides = overrideContainer.specifiedOverrides(); + specifiedAssociationOverrides = overrideContainer.getSpecifiedOverrides().iterator(); assertEquals("FOO", specifiedAssociationOverrides.next().getName()); assertEquals("BAR", specifiedAssociationOverrides.next().getName()); assertFalse(specifiedAssociationOverrides.hasNext()); - associationOverride = (AssociationOverrideAnnotation) resourceAttribute.addAnnotation(0, JPA.ASSOCIATION_OVERRIDE, JPA.ASSOCIATION_OVERRIDES); + associationOverride = (AssociationOverrideAnnotation) resourceField.addAnnotation(0, JPA.ASSOCIATION_OVERRIDE); associationOverride.setName("BAZ"); getJpaProject().synchronizeContextModel(); - specifiedAssociationOverrides = 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 - resourceAttribute.moveAnnotation(1, 0, JPA.ASSOCIATION_OVERRIDES); + resourceField.moveAnnotation(1, 0, JPA.ASSOCIATION_OVERRIDE); getJpaProject().synchronizeContextModel(); - specifiedAssociationOverrides = overrideContainer.specifiedOverrides(); + specifiedAssociationOverrides = overrideContainer.getSpecifiedOverrides().iterator(); assertEquals("FOO", specifiedAssociationOverrides.next().getName()); assertEquals("BAZ", specifiedAssociationOverrides.next().getName()); assertEquals("BAR", specifiedAssociationOverrides.next().getName()); assertFalse(specifiedAssociationOverrides.hasNext()); - resourceAttribute.removeAnnotation(0, JPA.ASSOCIATION_OVERRIDE, JPA.ASSOCIATION_OVERRIDES); + resourceField.removeAnnotation(0, JPA.ASSOCIATION_OVERRIDE); getJpaProject().synchronizeContextModel(); - specifiedAssociationOverrides = overrideContainer.specifiedOverrides(); + specifiedAssociationOverrides = overrideContainer.getSpecifiedOverrides().iterator(); assertEquals("BAZ", specifiedAssociationOverrides.next().getName()); assertEquals("BAR", specifiedAssociationOverrides.next().getName()); assertFalse(specifiedAssociationOverrides.hasNext()); - resourceAttribute.removeAnnotation(0, JPA.ASSOCIATION_OVERRIDE, JPA.ASSOCIATION_OVERRIDES); + resourceField.removeAnnotation(0, JPA.ASSOCIATION_OVERRIDE); getJpaProject().synchronizeContextModel(); - specifiedAssociationOverrides = overrideContainer.specifiedOverrides(); + specifiedAssociationOverrides = overrideContainer.getSpecifiedOverrides().iterator(); assertEquals("BAR", specifiedAssociationOverrides.next().getName()); assertFalse(specifiedAssociationOverrides.hasNext()); - resourceAttribute.removeAnnotation(0, JPA.ASSOCIATION_OVERRIDE, JPA.ASSOCIATION_OVERRIDES); + resourceField.removeAnnotation(0, JPA.ASSOCIATION_OVERRIDE); getJpaProject().synchronizeContextModel(); - specifiedAssociationOverrides = overrideContainer.specifiedOverrides(); + specifiedAssociationOverrides = overrideContainer.getSpecifiedOverrides().iterator(); assertFalse(specifiedAssociationOverrides.hasNext()); } @@ -959,16 +956,15 @@ public class GenericJavaEmbeddedMapping2_0Tests extends Generic2_0ContextModelTe JavaEmbeddedMapping2_0 embeddedMapping = (JavaEmbeddedMapping2_0) getJavaPersistentType().getAttributeNamed("myEmbedded").getMapping(); JavaAssociationOverrideContainer overrideContainer = embeddedMapping.getAssociationOverrideContainer(); - JavaResourcePersistentAttribute resourceAttribute = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME).persistableAttributes().next(); - assertNull(resourceAttribute.getAnnotation(AssociationOverrideAnnotation.ANNOTATION_NAME)); - assertNull(resourceAttribute.getAnnotation(AssociationOverridesAnnotation.ANNOTATION_NAME)); + JavaResourceField resourceField = ((JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE)).getFields().iterator().next(); + assertNull(resourceField.getAnnotation(0, AssociationOverrideAnnotation.ANNOTATION_NAME)); - assertEquals(2, overrideContainer.virtualOverridesSize()); - VirtualAssociationOverride virtualAssociationOverride = overrideContainer.virtualOverrides().next(); + assertEquals(2, overrideContainer.getVirtualOverridesSize()); + VirtualAssociationOverride virtualAssociationOverride = overrideContainer.getVirtualOverrides().iterator().next(); VirtualJoinColumnRelationshipStrategy joiningStrategy = ((VirtualJoinColumnRelationship) virtualAssociationOverride.getRelationship()).getJoinColumnStrategy(); assertEquals("address", virtualAssociationOverride.getName()); - assertEquals(1, joiningStrategy.joinColumnsSize()); - VirtualJoinColumn virtualJoinColumn = joiningStrategy.joinColumns().next(); + assertEquals(1, joiningStrategy.getJoinColumnsSize()); + VirtualJoinColumn virtualJoinColumn = joiningStrategy.getJoinColumns().iterator().next(); assertEquals("address_id", virtualJoinColumn.getName()); assertEquals("id", virtualJoinColumn.getReferencedColumnName()); assertEquals(TYPE_NAME, virtualJoinColumn.getTable()); @@ -978,7 +974,7 @@ public class GenericJavaEmbeddedMapping2_0Tests extends Generic2_0ContextModelTe assertEquals(false, virtualJoinColumn.isUnique()); assertEquals(true, virtualJoinColumn.isNullable()); - ListIterator classRefs = getPersistenceUnit().specifiedClassRefs(); + ListIterator classRefs = getPersistenceUnit().getSpecifiedClassRefs().iterator(); classRefs.next(); JavaPersistentType javaEmbeddable = classRefs.next().getJavaPersistentType(); OneToOneMapping oneToOneMapping = (OneToOneMapping) javaEmbeddable.getAttributeNamed("address").getMapping(); @@ -992,16 +988,15 @@ public class GenericJavaEmbeddedMapping2_0Tests extends Generic2_0ContextModelTe joinColumn.setSpecifiedUnique(Boolean.TRUE); joinColumn.setSpecifiedNullable(Boolean.FALSE); - assertNull(resourceAttribute.getAnnotation(AssociationOverrideAnnotation.ANNOTATION_NAME)); - assertNull(resourceAttribute.getAnnotation(AssociationOverridesAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(0, AssociationOverrideAnnotation.ANNOTATION_NAME)); - assertEquals(2, overrideContainer.virtualOverridesSize()); - virtualAssociationOverride = overrideContainer.virtualOverrides().next(); + assertEquals(2, overrideContainer.getVirtualOverridesSize()); + virtualAssociationOverride = overrideContainer.getVirtualOverrides().iterator().next(); joiningStrategy = ((VirtualJoinColumnRelationship) virtualAssociationOverride.getRelationship()).getJoinColumnStrategy(); assertEquals("address", virtualAssociationOverride.getName()); - assertEquals(1, joiningStrategy.joinColumnsSize()); - virtualAssociationOverride = overrideContainer.virtualOverrides().next(); - virtualJoinColumn = joiningStrategy.joinColumns().next(); + assertEquals(1, joiningStrategy.getJoinColumnsSize()); + virtualAssociationOverride = overrideContainer.getVirtualOverrides().iterator().next(); + virtualJoinColumn = joiningStrategy.getJoinColumns().iterator().next(); assertEquals("MY_JOIN_COLUMN", virtualJoinColumn.getName()); assertEquals("MY_REFERENCE_COLUMN", virtualJoinColumn.getReferencedColumnName()); assertEquals("BAR", virtualJoinColumn.getTable()); @@ -1011,17 +1006,16 @@ public class GenericJavaEmbeddedMapping2_0Tests extends Generic2_0ContextModelTe assertEquals(true, virtualJoinColumn.isUnique()); assertEquals(false, virtualJoinColumn.isNullable()); - assertEquals("MY_JOIN_COLUMN", joiningStrategy.joinColumns().next().getName()); + assertEquals("MY_JOIN_COLUMN", joiningStrategy.getJoinColumns().iterator().next().getName()); - assertNull(resourceAttribute.getAnnotation(AssociationOverrideAnnotation.ANNOTATION_NAME)); - assertNull(resourceAttribute.getAnnotation(AssociationOverridesAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(0, AssociationOverrideAnnotation.ANNOTATION_NAME)); - virtualAssociationOverride = overrideContainer.virtualOverrides().next(); + virtualAssociationOverride = overrideContainer.getVirtualOverrides().iterator().next(); assertEquals("address", virtualAssociationOverride.getName()); virtualAssociationOverride.convertToSpecified(); - assertEquals(1, overrideContainer.virtualOverridesSize()); + assertEquals(1, overrideContainer.getVirtualOverridesSize()); } public void testSpecifiedAssociationOverridesSize() throws Exception { @@ -1033,18 +1027,18 @@ public class GenericJavaEmbeddedMapping2_0Tests extends Generic2_0ContextModelTe addXmlClassRef(PACKAGE_NAME + ".Address"); JavaEmbeddedMapping2_0 embeddedMapping = (JavaEmbeddedMapping2_0) getJavaPersistentType().getAttributeNamed("myEmbedded").getMapping(); JavaAssociationOverrideContainer overrideContainer = embeddedMapping.getAssociationOverrideContainer(); - JavaResourcePersistentAttribute resourceAttribute = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME).persistableAttributes().next(); + JavaResourceField resourceField = ((JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE)).getFields().iterator().next(); - assertEquals(0, overrideContainer.specifiedOverridesSize()); + assertEquals(0, overrideContainer.getSpecifiedOverridesSize()); //add an annotation to the resource model and verify the context model is updated - AssociationOverrideAnnotation associationOverride = (AssociationOverrideAnnotation) resourceAttribute.addAnnotation(0, JPA.ASSOCIATION_OVERRIDE, JPA.ASSOCIATION_OVERRIDES); + AssociationOverrideAnnotation associationOverride = (AssociationOverrideAnnotation) resourceField.addAnnotation(0, JPA.ASSOCIATION_OVERRIDE); associationOverride.setName("FOO"); - associationOverride = (AssociationOverrideAnnotation) resourceAttribute.addAnnotation(0, JPA.ASSOCIATION_OVERRIDE, JPA.ASSOCIATION_OVERRIDES); + associationOverride = (AssociationOverrideAnnotation) resourceField.addAnnotation(0, JPA.ASSOCIATION_OVERRIDE); associationOverride.setName("BAR"); getJpaProject().synchronizeContextModel(); - assertEquals(2, overrideContainer.specifiedOverridesSize()); + assertEquals(2, overrideContainer.getSpecifiedOverridesSize()); } public void testVirtualAssociationOverridesSize() throws Exception { @@ -1057,13 +1051,13 @@ public class GenericJavaEmbeddedMapping2_0Tests extends Generic2_0ContextModelTe JavaEmbeddedMapping2_0 embeddedMapping = (JavaEmbeddedMapping2_0) getJavaPersistentType().getAttributeNamed("myEmbedded").getMapping(); JavaAssociationOverrideContainer overrideContainer = embeddedMapping.getAssociationOverrideContainer(); - assertEquals(2, overrideContainer.virtualOverridesSize()); + 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 { @@ -1076,20 +1070,20 @@ public class GenericJavaEmbeddedMapping2_0Tests extends Generic2_0ContextModelTe JavaEmbeddedMapping2_0 embeddedMapping = (JavaEmbeddedMapping2_0) getJavaPersistentType().getAttributeNamed("myEmbedded").getMapping(); JavaAssociationOverrideContainer overrideContainer = embeddedMapping.getAssociationOverrideContainer(); - assertEquals(2, overrideContainer.overridesSize()); + assertEquals(2, overrideContainer.getOverridesSize()); - overrideContainer.virtualOverrides().next().convertToSpecified(); - assertEquals(2, overrideContainer.overridesSize()); + overrideContainer.getVirtualOverrides().iterator().next().convertToSpecified(); + assertEquals(2, overrideContainer.getOverridesSize()); - overrideContainer.virtualOverrides().next().convertToSpecified(); - assertEquals(2, overrideContainer.overridesSize()); + overrideContainer.getVirtualOverrides().iterator().next().convertToSpecified(); + assertEquals(2, overrideContainer.getOverridesSize()); - JavaResourcePersistentAttribute resourceAttribute = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME).persistableAttributes().next(); - AssociationOverrideAnnotation annotation = (AssociationOverrideAnnotation) resourceAttribute.addAnnotation(0, JPA.ASSOCIATION_OVERRIDE, JPA.ASSOCIATION_OVERRIDES); + JavaResourceField resourceField = ((JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE)).getFields().iterator().next(); + AssociationOverrideAnnotation annotation = (AssociationOverrideAnnotation) resourceField.addAnnotation(0, JPA.ASSOCIATION_OVERRIDE); annotation.setName("bar"); getJpaProject().synchronizeContextModel(); - assertEquals(3, overrideContainer.overridesSize()); + assertEquals(3, overrideContainer.getOverridesSize()); } public void testAssociationOverrideSetVirtual() throws Exception { @@ -1102,11 +1096,11 @@ public class GenericJavaEmbeddedMapping2_0Tests extends Generic2_0ContextModelTe JavaEmbeddedMapping2_0 embeddedMapping = (JavaEmbeddedMapping2_0) getJavaPersistentType().getAttributeNamed("myEmbedded").getMapping(); JavaAssociationOverrideContainer overrideContainer = embeddedMapping.getAssociationOverrideContainer(); - overrideContainer.virtualOverrides().next().convertToSpecified(); - overrideContainer.virtualOverrides().next().convertToSpecified(); + overrideContainer.getVirtualOverrides().iterator().next().convertToSpecified(); + overrideContainer.getVirtualOverrides().iterator().next().convertToSpecified(); - JavaResourcePersistentAttribute resourceAttribute = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME).persistableAttributes().next(); - Iterator associationOverrides = resourceAttribute.annotations(AssociationOverrideAnnotation.ANNOTATION_NAME, AssociationOverridesAnnotation.ANNOTATION_NAME); + JavaResourceField resourceField = ((JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE)).getFields().iterator().next(); + Iterator associationOverrides = resourceField.getAnnotations(JPA.ASSOCIATION_OVERRIDE).iterator(); assertEquals("address", ((AssociationOverrideAnnotation) associationOverrides.next()).getName()); assertEquals("addresses", ((AssociationOverrideAnnotation) associationOverrides.next()).getName()); @@ -1123,13 +1117,13 @@ public class GenericJavaEmbeddedMapping2_0Tests extends Generic2_0ContextModelTe JavaEmbeddedMapping2_0 embeddedMapping = (JavaEmbeddedMapping2_0) getJavaPersistentType().getAttributeNamed("myEmbedded").getMapping(); JavaAssociationOverrideContainer overrideContainer = embeddedMapping.getAssociationOverrideContainer(); - ListIterator virtualAssociationOverrides = overrideContainer.virtualOverrides(); + ListIterator virtualAssociationOverrides = overrideContainer.getVirtualOverrides().iterator(); virtualAssociationOverrides.next(); virtualAssociationOverrides.next().convertToSpecified(); - overrideContainer.virtualOverrides().next().convertToSpecified(); + overrideContainer.getVirtualOverrides().iterator().next().convertToSpecified(); - JavaResourcePersistentAttribute resourceAttribute = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME).persistableAttributes().next(); - Iterator associationOverrides = resourceAttribute.annotations(AssociationOverrideAnnotation.ANNOTATION_NAME, AssociationOverridesAnnotation.ANNOTATION_NAME); + JavaResourceField resourceField = ((JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE)).getFields().iterator().next(); + Iterator associationOverrides = resourceField.getAnnotations(JPA.ASSOCIATION_OVERRIDE).iterator(); assertEquals("addresses", ((AssociationOverrideAnnotation) associationOverrides.next()).getName()); assertEquals("address", ((AssociationOverrideAnnotation) associationOverrides.next()).getName()); @@ -1146,30 +1140,30 @@ public class GenericJavaEmbeddedMapping2_0Tests extends Generic2_0ContextModelTe JavaEmbeddedMapping2_0 embeddedMapping = (JavaEmbeddedMapping2_0) getJavaPersistentType().getAttributeNamed("myEmbedded").getMapping(); JavaAssociationOverrideContainer overrideContainer = embeddedMapping.getAssociationOverrideContainer(); - overrideContainer.virtualOverrides().next().convertToSpecified(); - overrideContainer.virtualOverrides().next().convertToSpecified(); + overrideContainer.getVirtualOverrides().iterator().next().convertToSpecified(); + overrideContainer.getVirtualOverrides().iterator().next().convertToSpecified(); - JavaResourcePersistentAttribute resourceAttribute = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME).persistableAttributes().next(); - assertEquals(2, CollectionTools.size(resourceAttribute.annotations(AssociationOverrideAnnotation.ANNOTATION_NAME, AssociationOverridesAnnotation.ANNOTATION_NAME))); + JavaResourceField resourceField = ((JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE)).getFields().iterator().next(); + assertEquals(2, CollectionTools.size(resourceField.getAnnotations(JPA.ASSOCIATION_OVERRIDE).iterator())); - overrideContainer.specifiedOverrides().next().convertToVirtual(); + overrideContainer.getSpecifiedOverrides().iterator().next().convertToVirtual(); - Iterator associationOverrideResources = resourceAttribute.annotations(AssociationOverrideAnnotation.ANNOTATION_NAME, AssociationOverridesAnnotation.ANNOTATION_NAME); + Iterator associationOverrideResources = resourceField.getAnnotations(JPA.ASSOCIATION_OVERRIDE).iterator(); assertEquals("addresses", ((AssociationOverrideAnnotation) associationOverrideResources.next()).getName()); assertFalse(associationOverrideResources.hasNext()); - Iterator associationOverrides = overrideContainer.specifiedOverrides(); + Iterator associationOverrides = overrideContainer.getSpecifiedOverrides().iterator(); assertEquals("addresses", associationOverrides.next().getName()); assertFalse(associationOverrides.hasNext()); - overrideContainer.specifiedOverrides().next().convertToVirtual(); - associationOverrideResources = resourceAttribute.annotations(AssociationOverrideAnnotation.ANNOTATION_NAME, AssociationOverridesAnnotation.ANNOTATION_NAME); + overrideContainer.getSpecifiedOverrides().iterator().next().convertToVirtual(); + associationOverrideResources = resourceField.getAnnotations(JPA.ASSOCIATION_OVERRIDE).iterator(); assertFalse(associationOverrideResources.hasNext()); - associationOverrides = overrideContainer.specifiedOverrides(); + associationOverrides = overrideContainer.getSpecifiedOverrides().iterator(); assertFalse(associationOverrides.hasNext()); - assertNull(resourceAttribute.getAnnotation(AssociationOverridesAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(0, AssociationOverrideAnnotation.ANNOTATION_NAME)); } public void testMoveSpecifiedAssociationOverride() throws Exception { @@ -1182,32 +1176,32 @@ public class GenericJavaEmbeddedMapping2_0Tests extends Generic2_0ContextModelTe JavaEmbeddedMapping2_0 embeddedMapping = (JavaEmbeddedMapping2_0) getJavaPersistentType().getAttributeNamed("myEmbedded").getMapping(); JavaAssociationOverrideContainer overrideContainer = embeddedMapping.getAssociationOverrideContainer(); - overrideContainer.virtualOverrides().next().convertToSpecified(); - overrideContainer.virtualOverrides().next().convertToSpecified(); + overrideContainer.getVirtualOverrides().iterator().next().convertToSpecified(); + overrideContainer.getVirtualOverrides().iterator().next().convertToSpecified(); - JavaResourcePersistentAttribute resourceAttribute = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME).persistableAttributes().next(); + JavaResourceField resourceField = ((JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE)).getFields().iterator().next(); - Iterator javaAssociationOverrides = resourceAttribute.annotations(AssociationOverrideAnnotation.ANNOTATION_NAME, AssociationOverridesAnnotation.ANNOTATION_NAME); + Iterator javaAssociationOverrides = resourceField.getAnnotations(JPA.ASSOCIATION_OVERRIDE).iterator(); assertEquals(2, CollectionTools.size(javaAssociationOverrides)); overrideContainer.moveSpecifiedOverride(1, 0); - ListIterator associationOverrides = overrideContainer.specifiedOverrides(); + ListIterator associationOverrides = overrideContainer.getSpecifiedOverrides().iterator(); assertEquals("addresses", associationOverrides.next().getName()); assertEquals("address", associationOverrides.next().getName()); - javaAssociationOverrides = resourceAttribute.annotations(AssociationOverrideAnnotation.ANNOTATION_NAME, AssociationOverridesAnnotation.ANNOTATION_NAME); + javaAssociationOverrides = resourceField.getAnnotations(JPA.ASSOCIATION_OVERRIDE).iterator(); assertEquals("addresses", ((AssociationOverrideAnnotation) javaAssociationOverrides.next()).getName()); assertEquals("address", ((AssociationOverrideAnnotation) javaAssociationOverrides.next()).getName()); overrideContainer.moveSpecifiedOverride(0, 1); - associationOverrides = overrideContainer.specifiedOverrides(); + associationOverrides = overrideContainer.getSpecifiedOverrides().iterator(); assertEquals("address", associationOverrides.next().getName()); assertEquals("addresses", associationOverrides.next().getName()); - javaAssociationOverrides = resourceAttribute.annotations(AssociationOverrideAnnotation.ANNOTATION_NAME, AssociationOverridesAnnotation.ANNOTATION_NAME); + javaAssociationOverrides = resourceField.getAnnotations(JPA.ASSOCIATION_OVERRIDE).iterator(); assertEquals("address", ((AssociationOverrideAnnotation) javaAssociationOverrides.next()).getName()); assertEquals("addresses", ((AssociationOverrideAnnotation) javaAssociationOverrides.next()).getName()); } @@ -1222,51 +1216,51 @@ public class GenericJavaEmbeddedMapping2_0Tests extends Generic2_0ContextModelTe JavaEmbeddedMapping2_0 embeddedMapping = (JavaEmbeddedMapping2_0) getJavaPersistentType().getAttributeNamed("myEmbedded").getMapping(); JavaAssociationOverrideContainer overrideContainer = embeddedMapping.getAssociationOverrideContainer(); - JavaResourcePersistentAttribute resourceAttribute = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME).persistableAttributes().next(); + JavaResourceField resourceField = ((JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE)).getFields().iterator().next(); - ((AssociationOverrideAnnotation) resourceAttribute.addAnnotation(0, AssociationOverrideAnnotation.ANNOTATION_NAME, AssociationOverridesAnnotation.ANNOTATION_NAME)).setName("FOO"); - ((AssociationOverrideAnnotation) resourceAttribute.addAnnotation(1, AssociationOverrideAnnotation.ANNOTATION_NAME, AssociationOverridesAnnotation.ANNOTATION_NAME)).setName("BAR"); - ((AssociationOverrideAnnotation) resourceAttribute.addAnnotation(2, AssociationOverrideAnnotation.ANNOTATION_NAME, AssociationOverridesAnnotation.ANNOTATION_NAME)).setName("BAZ"); + ((AssociationOverrideAnnotation) resourceField.addAnnotation(0, JPA.ASSOCIATION_OVERRIDE)).setName("FOO"); + ((AssociationOverrideAnnotation) resourceField.addAnnotation(1, JPA.ASSOCIATION_OVERRIDE)).setName("BAR"); + ((AssociationOverrideAnnotation) resourceField.addAnnotation(2, JPA.ASSOCIATION_OVERRIDE)).setName("BAZ"); getJpaProject().synchronizeContextModel(); - ListIterator associationOverrides = overrideContainer.specifiedOverrides(); + ListIterator associationOverrides = overrideContainer.getSpecifiedOverrides().iterator(); assertEquals("FOO", associationOverrides.next().getName()); assertEquals("BAR", associationOverrides.next().getName()); assertEquals("BAZ", associationOverrides.next().getName()); assertFalse(associationOverrides.hasNext()); - resourceAttribute.moveAnnotation(2, 0, AssociationOverridesAnnotation.ANNOTATION_NAME); + resourceField.moveAnnotation(2, 0, JPA.ASSOCIATION_OVERRIDE); getJpaProject().synchronizeContextModel(); - associationOverrides = overrideContainer.specifiedOverrides(); + associationOverrides = overrideContainer.getSpecifiedOverrides().iterator(); assertEquals("BAR", associationOverrides.next().getName()); assertEquals("BAZ", associationOverrides.next().getName()); assertEquals("FOO", associationOverrides.next().getName()); assertFalse(associationOverrides.hasNext()); - resourceAttribute.moveAnnotation(0, 1, AssociationOverridesAnnotation.ANNOTATION_NAME); + resourceField.moveAnnotation(0, 1, JPA.ASSOCIATION_OVERRIDE); getJpaProject().synchronizeContextModel(); - associationOverrides = overrideContainer.specifiedOverrides(); + associationOverrides = overrideContainer.getSpecifiedOverrides().iterator(); assertEquals("BAZ", associationOverrides.next().getName()); assertEquals("BAR", associationOverrides.next().getName()); assertEquals("FOO", associationOverrides.next().getName()); assertFalse(associationOverrides.hasNext()); - resourceAttribute.removeAnnotation(1, AssociationOverrideAnnotation.ANNOTATION_NAME, AssociationOverridesAnnotation.ANNOTATION_NAME); + resourceField.removeAnnotation(1, JPA.ASSOCIATION_OVERRIDE); getJpaProject().synchronizeContextModel(); - associationOverrides = overrideContainer.specifiedOverrides(); + associationOverrides = overrideContainer.getSpecifiedOverrides().iterator(); assertEquals("BAZ", associationOverrides.next().getName()); assertEquals("FOO", associationOverrides.next().getName()); assertFalse(associationOverrides.hasNext()); - resourceAttribute.removeAnnotation(1, AssociationOverrideAnnotation.ANNOTATION_NAME, AssociationOverridesAnnotation.ANNOTATION_NAME); + resourceField.removeAnnotation(1, JPA.ASSOCIATION_OVERRIDE); getJpaProject().synchronizeContextModel(); - associationOverrides = overrideContainer.specifiedOverrides(); + associationOverrides = overrideContainer.getSpecifiedOverrides().iterator(); assertEquals("BAZ", associationOverrides.next().getName()); assertFalse(associationOverrides.hasNext()); - resourceAttribute.removeAnnotation(0, AssociationOverrideAnnotation.ANNOTATION_NAME, AssociationOverridesAnnotation.ANNOTATION_NAME); + resourceField.removeAnnotation(0, JPA.ASSOCIATION_OVERRIDE); getJpaProject().synchronizeContextModel(); - associationOverrides = overrideContainer.specifiedOverrides(); + associationOverrides = overrideContainer.getSpecifiedOverrides().iterator(); assertFalse(associationOverrides.hasNext()); } @@ -1280,7 +1274,7 @@ public class GenericJavaEmbeddedMapping2_0Tests extends Generic2_0ContextModelTe JavaEmbeddedMapping2_0 embeddedMapping = (JavaEmbeddedMapping2_0) getJavaPersistentType().getAttributeNamed("myEmbedded").getMapping(); JavaAssociationOverrideContainer overrideContainer = embeddedMapping.getAssociationOverrideContainer(); - ListIterator virtualAssociationOverrides = overrideContainer.virtualOverrides(); + ListIterator virtualAssociationOverrides = overrideContainer.getVirtualOverrides().iterator(); ReadOnlyAssociationOverride virtualAssociationOverride = virtualAssociationOverrides.next(); assertEquals("address", virtualAssociationOverride.getName()); assertTrue(virtualAssociationOverride.isVirtual()); @@ -1290,12 +1284,12 @@ public class GenericJavaEmbeddedMapping2_0Tests extends Generic2_0ContextModelTe 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 = overrideContainer.virtualOverrides(); + virtualAssociationOverrides = overrideContainer.getVirtualOverrides().iterator(); virtualAssociationOverride = virtualAssociationOverrides.next(); assertEquals("addresses", virtualAssociationOverride.getName()); assertTrue(virtualAssociationOverride.isVirtual()); @@ -1313,18 +1307,17 @@ public class GenericJavaEmbeddedMapping2_0Tests extends Generic2_0ContextModelTe JavaEmbeddedMapping2_0 embeddedMapping = (JavaEmbeddedMapping2_0) getJavaPersistentType().getAttributeNamed("myEmbedded").getMapping(); JavaAssociationOverrideContainer overrideContainer = embeddedMapping.getAssociationOverrideContainer(); - JavaResourcePersistentAttribute resourceAttribute = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME).persistableAttributes().next(); - assertNull(resourceAttribute.getAnnotation(AssociationOverrideAnnotation.ANNOTATION_NAME)); - assertNull(resourceAttribute.getAnnotation(AssociationOverridesAnnotation.ANNOTATION_NAME)); + JavaResourceField resourceField = ((JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE)).getFields().iterator().next(); + assertNull(resourceField.getAnnotation(0, AssociationOverrideAnnotation.ANNOTATION_NAME)); - assertEquals(2, overrideContainer.virtualOverridesSize()); - VirtualAssociationOverride virtualAssociationOverride = CollectionTools.get(overrideContainer.virtualOverrides(), 1); + assertEquals(2, overrideContainer.getVirtualOverridesSize()); + VirtualAssociationOverride virtualAssociationOverride = CollectionTools.get(overrideContainer.getVirtualOverrides(), 1); VirtualJoinTableRelationshipStrategy joiningStrategy = ((VirtualOverrideRelationship2_0) virtualAssociationOverride.getRelationship()).getJoinTableStrategy(); VirtualJoinTable joinTable = joiningStrategy.getJoinTable(); assertEquals("addresses", virtualAssociationOverride.getName()); assertEquals("AnnotationTestType_Address", joinTable.getName()); - assertEquals(1, joinTable.joinColumnsSize()); - VirtualJoinColumn virtualJoinColumn = joinTable.joinColumns().next(); + assertEquals(1, joinTable.getJoinColumnsSize()); + VirtualJoinColumn virtualJoinColumn = joinTable.getJoinColumns().iterator().next(); assertEquals("AnnotationTestType_id", virtualJoinColumn.getName()); assertEquals("id", virtualJoinColumn.getReferencedColumnName()); assertEquals("AnnotationTestType_Address", virtualJoinColumn.getTable()); @@ -1334,8 +1327,8 @@ public class GenericJavaEmbeddedMapping2_0Tests extends Generic2_0ContextModelTe assertEquals(false, virtualJoinColumn.isUnique()); assertEquals(true, virtualJoinColumn.isNullable()); - assertEquals(1, joinTable.inverseJoinColumnsSize()); - VirtualJoinColumn virtualInverseJoinColumn = joinTable.inverseJoinColumns().next(); + assertEquals(1, joinTable.getInverseJoinColumnsSize()); + VirtualJoinColumn virtualInverseJoinColumn = joinTable.getInverseJoinColumns().iterator().next(); assertEquals("addresses_id", virtualInverseJoinColumn.getName()); assertEquals("id", virtualInverseJoinColumn.getReferencedColumnName()); assertEquals("AnnotationTestType_Address", virtualInverseJoinColumn.getTable()); @@ -1345,7 +1338,7 @@ public class GenericJavaEmbeddedMapping2_0Tests extends Generic2_0ContextModelTe assertEquals(false, virtualInverseJoinColumn.isUnique()); assertEquals(true, virtualInverseJoinColumn.isNullable()); - ListIterator classRefs = getPersistenceUnit().specifiedClassRefs(); + ListIterator classRefs = getPersistenceUnit().getSpecifiedClassRefs().iterator(); classRefs.next(); JavaPersistentType javaEmbeddable = classRefs.next().getJavaPersistentType(); OneToManyMapping oneToManyMapping = (OneToManyMapping) javaEmbeddable.getAttributeNamed("addresses").getMapping(); @@ -1371,16 +1364,15 @@ public class GenericJavaEmbeddedMapping2_0Tests extends Generic2_0ContextModelTe inverseJoinColumn.setSpecifiedUnique(Boolean.TRUE); inverseJoinColumn.setSpecifiedNullable(Boolean.FALSE); - assertNull(resourceAttribute.getAnnotation(AssociationOverrideAnnotation.ANNOTATION_NAME)); - assertNull(resourceAttribute.getAnnotation(AssociationOverridesAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(0, AssociationOverrideAnnotation.ANNOTATION_NAME)); - assertEquals(2, overrideContainer.virtualOverridesSize()); - virtualAssociationOverride = CollectionTools.get(overrideContainer.virtualOverrides(), 1); + assertEquals(2, overrideContainer.getVirtualOverridesSize()); + virtualAssociationOverride = CollectionTools.get(overrideContainer.getVirtualOverrides(), 1); joiningStrategy = ((VirtualOverrideRelationship2_0) virtualAssociationOverride.getRelationship()).getJoinTableStrategy(); joinTable = joiningStrategy.getJoinTable(); assertEquals("addresses", virtualAssociationOverride.getName()); - assertEquals(1, joinTable.joinColumnsSize()); - virtualJoinColumn = joinTable.joinColumns().next(); + assertEquals(1, joinTable.getJoinColumnsSize()); + virtualJoinColumn = joinTable.getJoinColumns().iterator().next(); assertEquals("MY_JOIN_COLUMN", virtualJoinColumn.getName()); assertEquals("MY_REFERENCE_COLUMN", virtualJoinColumn.getReferencedColumnName()); assertEquals("BAR", virtualJoinColumn.getTable()); @@ -1390,8 +1382,8 @@ public class GenericJavaEmbeddedMapping2_0Tests extends Generic2_0ContextModelTe assertEquals(true, virtualJoinColumn.isUnique()); assertEquals(false, virtualJoinColumn.isNullable()); - assertEquals(1, joinTable.inverseJoinColumnsSize()); - virtualInverseJoinColumn = joinTable.inverseJoinColumns().next(); + assertEquals(1, joinTable.getInverseJoinColumnsSize()); + virtualInverseJoinColumn = joinTable.getInverseJoinColumns().iterator().next(); assertEquals("MY_INVERSE_JOIN_COLUMN", virtualInverseJoinColumn.getName()); assertEquals("MY_INVERSE_REFERENCE_COLUMN", virtualInverseJoinColumn.getReferencedColumnName()); assertEquals("INVERSE_BAR", virtualInverseJoinColumn.getTable()); @@ -1402,14 +1394,13 @@ public class GenericJavaEmbeddedMapping2_0Tests extends Generic2_0ContextModelTe assertEquals(false, virtualInverseJoinColumn.isNullable()); - assertNull(resourceAttribute.getAnnotation(AssociationOverrideAnnotation.ANNOTATION_NAME)); - assertNull(resourceAttribute.getAnnotation(AssociationOverridesAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(0, AssociationOverrideAnnotation.ANNOTATION_NAME)); - virtualAssociationOverride = overrideContainer.virtualOverrides().next(); + virtualAssociationOverride = overrideContainer.getVirtualOverrides().iterator().next(); assertEquals("address", virtualAssociationOverride.getName()); virtualAssociationOverride.convertToSpecified(); - assertEquals(1, overrideContainer.virtualOverridesSize()); + assertEquals(1, overrideContainer.getVirtualOverridesSize()); } public void testNestedVirtualAttributeOverrides() throws Exception { @@ -1420,13 +1411,13 @@ public class GenericJavaEmbeddedMapping2_0Tests extends Generic2_0ContextModelTe addXmlClassRef(PACKAGE_NAME + ".Customer"); addXmlClassRef(PACKAGE_NAME + ".Address"); addXmlClassRef(PACKAGE_NAME + ".ZipCode"); - ListIterator specifiedClassRefs = getPersistenceUnit().specifiedClassRefs(); + ListIterator specifiedClassRefs = getPersistenceUnit().getSpecifiedClassRefs().iterator(); PersistentType customerPersistentType = specifiedClassRefs.next().getJavaPersistentType(); JavaEmbeddedMapping embeddedMapping = (JavaEmbeddedMapping) customerPersistentType.getAttributeNamed("address").getMapping(); JavaAttributeOverrideContainer attributeOverrideContainer = embeddedMapping.getAttributeOverrideContainer(); - assertEquals(5, attributeOverrideContainer.virtualOverridesSize()); - ListIterator virtualAttributeOverrides = attributeOverrideContainer.virtualOverrides(); + assertEquals(5, attributeOverrideContainer.getVirtualOverridesSize()); + ListIterator virtualAttributeOverrides = attributeOverrideContainer.getVirtualOverrides().iterator(); VirtualAttributeOverride virtualAttributeOverride = virtualAttributeOverrides.next(); assertEquals("street", virtualAttributeOverride.getName()); virtualAttributeOverride = virtualAttributeOverrides.next(); @@ -1454,8 +1445,8 @@ public class GenericJavaEmbeddedMapping2_0Tests extends Generic2_0ContextModelTe PersistentType addressPersistentType = specifiedClassRefs.next().getJavaPersistentType(); JavaEmbeddedMapping nestedEmbeddedMapping = (JavaEmbeddedMapping) addressPersistentType.getAttributeNamed("zipCode").getMapping(); JavaAttributeOverrideContainer nestedAttributeOverrideContainer = nestedEmbeddedMapping.getAttributeOverrideContainer(); - assertEquals(2, nestedAttributeOverrideContainer.virtualOverridesSize()); - virtualAttributeOverrides = nestedAttributeOverrideContainer.virtualOverrides(); + assertEquals(2, nestedAttributeOverrideContainer.getVirtualOverridesSize()); + virtualAttributeOverrides = nestedAttributeOverrideContainer.getVirtualOverrides().iterator(); virtualAttributeOverride = virtualAttributeOverrides.next(); assertEquals("zip", virtualAttributeOverride.getName()); virtualAttributeOverride = virtualAttributeOverrides.next(); diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/java/GenericJavaEntity2_0Tests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/java/GenericJavaEntity2_0Tests.java index 70f92216b6..cb9421d7a5 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/java/GenericJavaEntity2_0Tests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/java/GenericJavaEntity2_0Tests.java @@ -12,6 +12,9 @@ package org.eclipse.jpt.jpa.core.tests.internal.jpa2.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.utility.internal.CollectionTools; import org.eclipse.jpt.common.utility.internal.iterators.ArrayIterator; @@ -30,7 +33,8 @@ 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.JavaAttributeOverride; +import org.eclipse.jpt.jpa.core.context.java.JavaAssociationOverrideContainer; +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.JavaNamedQuery; import org.eclipse.jpt.jpa.core.context.java.JavaVirtualAssociationOverride; @@ -49,14 +53,9 @@ 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.jpa2.resource.java.NamedQuery2_0Annotation; 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.NamedQueriesAnnotation; import org.eclipse.jpt.jpa.core.resource.java.NamedQueryAnnotation; -import org.eclipse.jpt.jpa.core.resource.java.NestableAnnotation; import org.eclipse.jpt.jpa.core.tests.internal.jpa2.context.Generic2_0ContextModelTestCase; @SuppressWarnings("nls") @@ -355,15 +354,13 @@ public class GenericJavaEntity2_0Tests extends Generic2_0ContextModelTestCase this.addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); JavaEntity entity = this.getJavaEntity(); - JavaResourcePersistentType typeResource = this.getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); NamedQuery2_0 namedQuery1 = (NamedQuery2_0) entity.getQueryContainer().addNamedQuery(0); namedQuery1.setName("FOO"); namedQuery1.setSpecifiedLockMode(LockModeType2_0.OPTIMISTIC); - Iterator javaNamedQueries = typeResource.annotations( - NamedQueryAnnotation.ANNOTATION_NAME, - NamedQueriesAnnotation.ANNOTATION_NAME); + Iterator javaNamedQueries = resourceType.getAnnotations(JPA.NAMED_QUERY).iterator(); NamedQuery2_0Annotation queryAnnotation = (NamedQuery2_0Annotation) javaNamedQueries.next(); assertEquals("FOO", queryAnnotation.getName()); assertEquals(LockModeType2_0.OPTIMISTIC, this.lockModeOf(queryAnnotation)); @@ -372,7 +369,7 @@ public class GenericJavaEntity2_0Tests extends Generic2_0ContextModelTestCase namedQuery2.setName("BAR"); namedQuery2.setSpecifiedLockMode(LockModeType2_0.READ); - javaNamedQueries = typeResource.annotations(NamedQueryAnnotation.ANNOTATION_NAME, NamedQueriesAnnotation.ANNOTATION_NAME); + javaNamedQueries = resourceType.getAnnotations(JPA.NAMED_QUERY).iterator(); queryAnnotation = (NamedQuery2_0Annotation) javaNamedQueries.next(); assertEquals("BAR", queryAnnotation.getName()); assertEquals(LockModeType2_0.READ, this.lockModeOf(queryAnnotation)); @@ -382,19 +379,19 @@ public class GenericJavaEntity2_0Tests extends Generic2_0ContextModelTestCase namedQuery3.setName("BAZ"); namedQuery3.setSpecifiedLockMode(LockModeType2_0.WRITE); - javaNamedQueries = typeResource.annotations(NamedQueryAnnotation.ANNOTATION_NAME, NamedQueriesAnnotation.ANNOTATION_NAME); + javaNamedQueries = resourceType.getAnnotations(JPA.NAMED_QUERY).iterator(); assertEquals("BAR", ((NamedQuery2_0Annotation) javaNamedQueries.next()).getName()); queryAnnotation = (NamedQuery2_0Annotation) javaNamedQueries.next(); assertEquals("BAZ", queryAnnotation.getName()); assertEquals(LockModeType2_0.WRITE, this.lockModeOf(queryAnnotation)); assertEquals("FOO", ((NamedQuery2_0Annotation) javaNamedQueries.next()).getName()); - ListIterator namedQueries = entity.getQueryContainer().namedQueries(); + ListIterator namedQueries = entity.getQueryContainer().getNamedQueries().iterator(); assertEquals(namedQuery2, namedQueries.next()); assertEquals(namedQuery3, namedQueries.next()); assertEquals(namedQuery1, namedQueries.next()); - namedQueries = entity.getQueryContainer().namedQueries(); + namedQueries = entity.getQueryContainer().getNamedQueries().iterator(); assertEquals("BAR", namedQueries.next().getName()); assertEquals("BAZ", namedQueries.next().getName()); assertEquals("FOO", namedQueries.next().getName()); @@ -407,7 +404,7 @@ public class GenericJavaEntity2_0Tests extends Generic2_0ContextModelTestCase addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); JavaEntity entity = getJavaEntity(); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); entity.getQueryContainer().addNamedQuery(0).setName("FOO"); NamedQuery2_0 namedQuery1 = (NamedQuery2_0) entity.getQueryContainer().addNamedQuery(1); @@ -418,13 +415,13 @@ public class GenericJavaEntity2_0Tests extends Generic2_0ContextModelTestCase namedQuery2.setName("BAZ"); namedQuery2.setSpecifiedLockMode(LockModeType2_0.OPTIMISTIC); - Iterator javaNamedQueries = typeResource.annotations(NamedQueryAnnotation.ANNOTATION_NAME, NamedQueriesAnnotation.ANNOTATION_NAME); + Iterator javaNamedQueries = resourceType.getAnnotations(JPA.NAMED_QUERY).iterator(); assertEquals(3, CollectionTools.size(javaNamedQueries)); entity.getQueryContainer().removeNamedQuery(0); - javaNamedQueries = typeResource.annotations(NamedQueryAnnotation.ANNOTATION_NAME, NamedQueriesAnnotation.ANNOTATION_NAME); + javaNamedQueries = resourceType.getAnnotations(JPA.NAMED_QUERY).iterator(); assertEquals(2, CollectionTools.size(javaNamedQueries)); - javaNamedQueries = typeResource.annotations(NamedQueryAnnotation.ANNOTATION_NAME, NamedQueriesAnnotation.ANNOTATION_NAME); + javaNamedQueries = resourceType.getAnnotations(JPA.NAMED_QUERY).iterator(); NamedQuery2_0Annotation annotation1 = (NamedQuery2_0Annotation) javaNamedQueries.next(); assertEquals("BAR", annotation1.getName()); assertEquals(LockModeType2_0.READ, this.lockModeOf(annotation1)); @@ -434,15 +431,15 @@ public class GenericJavaEntity2_0Tests extends Generic2_0ContextModelTestCase assertEquals(LockModeType2_0.OPTIMISTIC, this.lockModeOf(annotation2)); entity.getQueryContainer().removeNamedQuery(0); - javaNamedQueries = typeResource.annotations(NamedQueryAnnotation.ANNOTATION_NAME, NamedQueriesAnnotation.ANNOTATION_NAME); + javaNamedQueries = resourceType.getAnnotations(JPA.NAMED_QUERY).iterator(); assertEquals(1, CollectionTools.size(javaNamedQueries)); - javaNamedQueries = typeResource.annotations(NamedQueryAnnotation.ANNOTATION_NAME, NamedQueriesAnnotation.ANNOTATION_NAME); + javaNamedQueries = resourceType.getAnnotations(JPA.NAMED_QUERY).iterator(); annotation2 = (NamedQuery2_0Annotation) javaNamedQueries.next(); assertEquals("BAZ", annotation2.getName()); assertEquals(LockModeType2_0.OPTIMISTIC, this.lockModeOf(annotation2)); entity.getQueryContainer().removeNamedQuery(0); - javaNamedQueries = typeResource.annotations(NamedQueryAnnotation.ANNOTATION_NAME, NamedQueriesAnnotation.ANNOTATION_NAME); + javaNamedQueries = resourceType.getAnnotations(JPA.NAMED_QUERY).iterator(); assertEquals(0, CollectionTools.size(javaNamedQueries)); } @@ -451,7 +448,7 @@ public class GenericJavaEntity2_0Tests extends Generic2_0ContextModelTestCase addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); JavaEntity entity = getJavaEntity(); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); entity.getQueryContainer().addNamedQuery(0).setName("FOO"); NamedQuery2_0 namedQuery1 = (NamedQuery2_0) entity.getQueryContainer().addNamedQuery(1); @@ -459,19 +456,19 @@ public class GenericJavaEntity2_0Tests extends Generic2_0ContextModelTestCase namedQuery1.setSpecifiedLockMode(LockModeType2_0.OPTIMISTIC); entity.getQueryContainer().addNamedQuery(2).setName("BAZ"); - Iterator javaNamedQueries = typeResource.annotations(NamedQueryAnnotation.ANNOTATION_NAME, NamedQueriesAnnotation.ANNOTATION_NAME); + Iterator javaNamedQueries = resourceType.getAnnotations(JPA.NAMED_QUERY).iterator(); assertEquals(3, CollectionTools.size(javaNamedQueries)); entity.getQueryContainer().moveNamedQuery(2, 0); - ListIterator namedQueries = entity.getQueryContainer().namedQueries(); + ListIterator namedQueries = entity.getQueryContainer().getNamedQueries().iterator(); namedQuery1 = (NamedQuery2_0) namedQueries.next(); assertEquals("BAR", namedQuery1.getName()); assertEquals(LockModeType2_0.OPTIMISTIC, namedQuery1.getLockMode()); assertEquals("BAZ", namedQueries.next().getName()); assertEquals("FOO", namedQueries.next().getName()); - javaNamedQueries = typeResource.annotations(NamedQueryAnnotation.ANNOTATION_NAME, NamedQueriesAnnotation.ANNOTATION_NAME); + javaNamedQueries = resourceType.getAnnotations(JPA.NAMED_QUERY).iterator(); NamedQuery2_0Annotation annotation1 = (NamedQuery2_0Annotation) javaNamedQueries.next(); assertEquals("BAR", annotation1.getName()); assertEquals(LockModeType2_0.OPTIMISTIC, this.lockModeOf(annotation1)); @@ -480,14 +477,14 @@ public class GenericJavaEntity2_0Tests extends Generic2_0ContextModelTestCase entity.getQueryContainer().moveNamedQuery(0, 1); - namedQueries = entity.getQueryContainer().namedQueries(); + namedQueries = entity.getQueryContainer().getNamedQueries().iterator(); assertEquals("BAZ", namedQueries.next().getName()); namedQuery1 = (NamedQuery2_0) namedQueries.next(); assertEquals("BAR", namedQuery1.getName()); assertEquals(LockModeType2_0.OPTIMISTIC, namedQuery1.getLockMode()); assertEquals("FOO", namedQueries.next().getName()); - javaNamedQueries = typeResource.annotations(NamedQueryAnnotation.ANNOTATION_NAME, NamedQueriesAnnotation.ANNOTATION_NAME); + javaNamedQueries = resourceType.getAnnotations(JPA.NAMED_QUERY).iterator(); assertEquals("BAZ", ((NamedQuery2_0Annotation) javaNamedQueries.next()).getName()); annotation1 = (NamedQuery2_0Annotation) javaNamedQueries.next(); assertEquals("BAR", annotation1.getName()); @@ -500,29 +497,29 @@ public class GenericJavaEntity2_0Tests extends Generic2_0ContextModelTestCase addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); JavaEntity entity = getJavaEntity(); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); - assertEquals(0, entity.getPersistenceUnit().queriesSize()); + assertEquals(0, entity.getPersistenceUnit().getQueriesSize()); - ((NamedQuery2_0Annotation) typeResource.addAnnotation(0, NamedQueryAnnotation.ANNOTATION_NAME, NamedQueriesAnnotation.ANNOTATION_NAME)).setName("FOO"); - ((NamedQuery2_0Annotation) typeResource.addAnnotation(1, NamedQueryAnnotation.ANNOTATION_NAME, NamedQueriesAnnotation.ANNOTATION_NAME)).setName("BAR"); - NamedQuery2_0Annotation annotation1 = (NamedQuery2_0Annotation) typeResource.addAnnotation(1, NamedQueryAnnotation.ANNOTATION_NAME, NamedQueriesAnnotation.ANNOTATION_NAME); + ((NamedQuery2_0Annotation) resourceType.addAnnotation(0, JPA.NAMED_QUERY)).setName("FOO"); + ((NamedQuery2_0Annotation) resourceType.addAnnotation(1, JPA.NAMED_QUERY)).setName("BAR"); + NamedQuery2_0Annotation annotation1 = (NamedQuery2_0Annotation) resourceType.addAnnotation(1, JPA.NAMED_QUERY); annotation1.setName("BAZ"); annotation1.setLockMode(org.eclipse.jpt.jpa.core.jpa2.resource.java.LockModeType_2_0.OPTIMISTIC); getJpaProject().synchronizeContextModel(); - ListIterator namedQueries = entity.getQueryContainer().namedQueries(); + ListIterator namedQueries = entity.getQueryContainer().getNamedQueries().iterator(); assertEquals("FOO", namedQueries.next().getName()); NamedQuery2_0 namedQuery1 = (NamedQuery2_0) namedQueries.next(); assertEquals("BAZ", namedQuery1.getName()); assertEquals(LockModeType2_0.OPTIMISTIC, namedQuery1.getLockMode()); assertEquals("BAR", namedQueries.next().getName()); assertFalse(namedQueries.hasNext()); - assertEquals(3, entity.getPersistenceUnit().queriesSize()); + assertEquals(3, entity.getPersistenceUnit().getQueriesSize()); - typeResource.moveAnnotation(2, 0, NamedQueriesAnnotation.ANNOTATION_NAME); + resourceType.moveAnnotation(2, 0, NamedQueryAnnotation.ANNOTATION_NAME); getJpaProject().synchronizeContextModel(); - namedQueries = entity.getQueryContainer().namedQueries(); + namedQueries = entity.getQueryContainer().getNamedQueries().iterator(); namedQuery1 = (NamedQuery2_0) namedQueries.next(); assertEquals("BAZ", namedQuery1.getName()); assertEquals(LockModeType2_0.OPTIMISTIC, namedQuery1.getLockMode()); @@ -530,9 +527,9 @@ public class GenericJavaEntity2_0Tests extends Generic2_0ContextModelTestCase assertEquals("FOO", namedQueries.next().getName()); assertFalse(namedQueries.hasNext()); - typeResource.moveAnnotation(0, 1, NamedQueriesAnnotation.ANNOTATION_NAME); + resourceType.moveAnnotation(0, 1, NamedQueryAnnotation.ANNOTATION_NAME); getJpaProject().synchronizeContextModel(); - namedQueries = entity.getQueryContainer().namedQueries(); + namedQueries = entity.getQueryContainer().getNamedQueries().iterator(); assertEquals("BAR", namedQueries.next().getName()); namedQuery1 = (NamedQuery2_0) namedQueries.next(); assertEquals("BAZ", namedQuery1.getName()); @@ -540,26 +537,26 @@ public class GenericJavaEntity2_0Tests extends Generic2_0ContextModelTestCase assertEquals("FOO", namedQueries.next().getName()); assertFalse(namedQueries.hasNext()); - typeResource.removeAnnotation(1, NamedQueryAnnotation.ANNOTATION_NAME, NamedQueriesAnnotation.ANNOTATION_NAME); + resourceType.removeAnnotation(1, JPA.NAMED_QUERY); getJpaProject().synchronizeContextModel(); - namedQueries = entity.getQueryContainer().namedQueries(); + namedQueries = entity.getQueryContainer().getNamedQueries().iterator(); assertEquals("BAR", namedQueries.next().getName()); assertEquals("FOO", namedQueries.next().getName()); assertFalse(namedQueries.hasNext()); - assertEquals(2, entity.getPersistenceUnit().queriesSize()); + assertEquals(2, entity.getPersistenceUnit().getQueriesSize()); - typeResource.removeAnnotation(1, NamedQueryAnnotation.ANNOTATION_NAME, NamedQueriesAnnotation.ANNOTATION_NAME); + resourceType.removeAnnotation(1, JPA.NAMED_QUERY); getJpaProject().synchronizeContextModel(); - namedQueries = entity.getQueryContainer().namedQueries(); + namedQueries = entity.getQueryContainer().getNamedQueries().iterator(); assertEquals("BAR", namedQueries.next().getName()); assertFalse(namedQueries.hasNext()); - assertEquals(1, entity.getPersistenceUnit().queriesSize()); + assertEquals(1, entity.getPersistenceUnit().getQueriesSize()); - typeResource.removeAnnotation(0, NamedQueryAnnotation.ANNOTATION_NAME, NamedQueriesAnnotation.ANNOTATION_NAME); + resourceType.removeAnnotation(0, JPA.NAMED_QUERY); getJpaProject().synchronizeContextModel(); - namedQueries = entity.getQueryContainer().namedQueries(); + namedQueries = entity.getQueryContainer().getNamedQueries().iterator(); assertFalse(namedQueries.hasNext()); - assertEquals(0, entity.getPersistenceUnit().queriesSize()); + assertEquals(0, entity.getPersistenceUnit().getQueriesSize()); } public void testNamedQueries2_0Size() throws Exception { @@ -567,16 +564,16 @@ public class GenericJavaEntity2_0Tests extends Generic2_0ContextModelTestCase addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); JavaEntity entity = getJavaEntity(); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); - assertEquals(0, entity.getQueryContainer().namedQueriesSize()); + assertEquals(0, entity.getQueryContainer().getNamedQueriesSize()); - ((NamedQuery2_0Annotation) typeResource.addAnnotation(0, NamedQueryAnnotation.ANNOTATION_NAME, NamedQueriesAnnotation.ANNOTATION_NAME)).setName("FOO"); - ((NamedQuery2_0Annotation) typeResource.addAnnotation(1, NamedQueryAnnotation.ANNOTATION_NAME, NamedQueriesAnnotation.ANNOTATION_NAME)).setName("BAR"); - ((NamedQuery2_0Annotation) typeResource.addAnnotation(2, NamedQueryAnnotation.ANNOTATION_NAME, NamedQueriesAnnotation.ANNOTATION_NAME)).setName("BAZ"); + ((NamedQuery2_0Annotation) resourceType.addAnnotation(0, JPA.NAMED_QUERY)).setName("FOO"); + ((NamedQuery2_0Annotation) resourceType.addAnnotation(1, JPA.NAMED_QUERY)).setName("BAR"); + ((NamedQuery2_0Annotation) resourceType.addAnnotation(2, JPA.NAMED_QUERY)).setName("BAZ"); this.getJpaProject().synchronizeContextModel(); - assertEquals(3, entity.getQueryContainer().namedQueriesSize()); + assertEquals(3, entity.getQueryContainer().getNamedQueriesSize()); } public void testAttributeMappingKeyAllowed() throws Exception { @@ -655,7 +652,7 @@ public class GenericJavaEntity2_0Tests extends Generic2_0ContextModelTestCase assertFalse(overridableAttributes.hasNext()); - ListIterator classRefs = getPersistenceUnit().specifiedClassRefs(); + ListIterator classRefs = getPersistenceUnit().getSpecifiedClassRefs().iterator(); classRefs.next(); JavaEntity abstractEntity = (JavaEntity) classRefs.next().getJavaPersistentType().getMapping(); overridableAttributes = abstractEntity.allOverridableAttributeNames(); @@ -679,7 +676,7 @@ public class GenericJavaEntity2_0Tests extends Generic2_0ContextModelTestCase assertFalse(overridableAssociations.hasNext()); - ListIterator classRefs = getPersistenceUnit().specifiedClassRefs(); + ListIterator classRefs = getPersistenceUnit().getSpecifiedClassRefs().iterator(); classRefs.next(); JavaEntity abstractEntity = (JavaEntity) classRefs.next().getJavaPersistentType().getMapping(); overridableAssociations = abstractEntity.allOverridableAssociationNames(); @@ -721,64 +718,64 @@ public class GenericJavaEntity2_0Tests extends Generic2_0ContextModelTestCase addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); AttributeOverrideContainer overrideContainer = getJavaEntity().getAttributeOverrideContainer(); - ListIterator specifiedAttributeOverrides = (ListIterator) overrideContainer.specifiedOverrides(); + ListIterator 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) 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) 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) 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) 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) 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) 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) overrideContainer.specifiedOverrides(); + specifiedAttributeOverrides = overrideContainer.getSpecifiedOverrides().iterator(); assertFalse(specifiedAttributeOverrides.hasNext()); } @@ -789,18 +786,17 @@ public class GenericJavaEntity2_0Tests extends Generic2_0ContextModelTestCase addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); addXmlClassRef(FULLY_QUALIFIED_SUB_TYPE_NAME); - ListIterator classRefs = getPersistenceUnit().specifiedClassRefs(); + ListIterator 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()); @@ -812,29 +808,27 @@ public class GenericJavaEntity2_0Tests extends Generic2_0ContextModelTestCase 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 testVirtualAttributeOverridesEntityHierachy() throws Exception { @@ -844,18 +838,17 @@ public class GenericJavaEntity2_0Tests extends Generic2_0ContextModelTestCase addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); addXmlClassRef(FULLY_QUALIFIED_SUB_TYPE_NAME); - ListIterator classRefs = getPersistenceUnit().specifiedClassRefs(); + ListIterator 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()); @@ -867,29 +860,27 @@ public class GenericJavaEntity2_0Tests extends Generic2_0ContextModelTestCase 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 { @@ -897,18 +888,18 @@ public class GenericJavaEntity2_0Tests extends Generic2_0ContextModelTestCase 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 testVirtualAttributeOverridesSize() throws Exception { @@ -919,16 +910,16 @@ public class GenericJavaEntity2_0Tests extends Generic2_0ContextModelTestCase 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 { @@ -939,20 +930,20 @@ public class GenericJavaEntity2_0Tests extends Generic2_0ContextModelTestCase 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 { @@ -963,11 +954,11 @@ public class GenericJavaEntity2_0Tests extends Generic2_0ContextModelTestCase 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 attributeOverrides = typeResource.annotations(AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverridesAnnotation.ANNOTATION_NAME); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_SUB_TYPE_NAME, Kind.TYPE); + Iterator attributeOverrides = resourceType.getAnnotations(JPA.ATTRIBUTE_OVERRIDE).iterator(); assertEquals("id", ((AttributeOverrideAnnotation) attributeOverrides.next()).getName()); assertEquals("name", ((AttributeOverrideAnnotation) attributeOverrides.next()).getName()); @@ -982,13 +973,13 @@ public class GenericJavaEntity2_0Tests extends Generic2_0ContextModelTestCase addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); AttributeOverrideContainer overrideContainer = getJavaEntity().getAttributeOverrideContainer(); - ListIterator virtualAttributeOverrides = (ListIterator) overrideContainer.virtualOverrides(); + ListIterator 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 attributeOverrides = typeResource.annotations(AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverridesAnnotation.ANNOTATION_NAME); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_SUB_TYPE_NAME, Kind.TYPE); + Iterator attributeOverrides = resourceType.getAnnotations(JPA.ATTRIBUTE_OVERRIDE).iterator(); assertEquals("name", ((AttributeOverrideAnnotation) attributeOverrides.next()).getName()); assertEquals("id", ((AttributeOverrideAnnotation) attributeOverrides.next()).getName()); @@ -1003,43 +994,43 @@ public class GenericJavaEntity2_0Tests extends Generic2_0ContextModelTestCase 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); - 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, CollectionTools.size(resourceType.getAnnotations(JPA.ATTRIBUTE_OVERRIDE).iterator())); - overrideContainer.specifiedOverrides().next().convertToVirtual(); + overrideContainer.getSpecifiedOverrides().iterator().next().convertToVirtual(); - Iterator attributeOverrideResources = typeResource.annotations(AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverridesAnnotation.ANNOTATION_NAME); + Iterator attributeOverrideResources = resourceType.getAnnotations(JPA.ATTRIBUTE_OVERRIDE).iterator(); assertEquals("name", ((AttributeOverrideAnnotation) attributeOverrideResources.next()).getName()); assertEquals("foo", ((AttributeOverrideAnnotation) attributeOverrideResources.next()).getName()); assertFalse(attributeOverrideResources.hasNext()); - Iterator attributeOverrides = (Iterator) overrideContainer.specifiedOverrides(); + Iterator 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(JPA.ATTRIBUTE_OVERRIDE).iterator(); assertEquals("foo", ((AttributeOverrideAnnotation) attributeOverrideResources.next()).getName()); assertFalse(attributeOverrideResources.hasNext()); - attributeOverrides = (Iterator) 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(JPA.ATTRIBUTE_OVERRIDE).iterator(); assertFalse(attributeOverrideResources.hasNext()); - attributeOverrides = (Iterator) 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 { @@ -1050,36 +1041,36 @@ public class GenericJavaEntity2_0Tests extends Generic2_0ContextModelTestCase 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 javaAttributeOverrides = typeResource.annotations(AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverridesAnnotation.ANNOTATION_NAME); + Iterator javaAttributeOverrides = resourceType.getAnnotations(JPA.ATTRIBUTE_OVERRIDE).iterator(); assertEquals(3, CollectionTools.size(javaAttributeOverrides)); overrideContainer.moveSpecifiedOverride(2, 0); - ListIterator attributeOverrides = (ListIterator) overrideContainer.specifiedOverrides(); + ListIterator 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(JPA.ATTRIBUTE_OVERRIDE).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) 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(JPA.ATTRIBUTE_OVERRIDE).iterator(); assertEquals("foo", ((AttributeOverrideAnnotation) javaAttributeOverrides.next()).getName()); assertEquals("name", ((AttributeOverrideAnnotation) javaAttributeOverrides.next()).getName()); assertEquals("id", ((AttributeOverrideAnnotation) javaAttributeOverrides.next()).getName()); @@ -1090,51 +1081,51 @@ public class GenericJavaEntity2_0Tests extends Generic2_0ContextModelTestCase 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, JPA.ATTRIBUTE_OVERRIDE)).setName("FOO"); + ((AttributeOverrideAnnotation) resourceType.addAnnotation(1, JPA.ATTRIBUTE_OVERRIDE)).setName("BAR"); + ((AttributeOverrideAnnotation) resourceType.addAnnotation(2, JPA.ATTRIBUTE_OVERRIDE)).setName("BAZ"); getJpaProject().synchronizeContextModel(); - ListIterator attributeOverrides = (ListIterator) overrideContainer.specifiedOverrides(); + ListIterator 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) 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) 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, JPA.ATTRIBUTE_OVERRIDE); getJpaProject().synchronizeContextModel(); - attributeOverrides = (ListIterator) 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, JPA.ATTRIBUTE_OVERRIDE); getJpaProject().synchronizeContextModel(); - attributeOverrides = (ListIterator) 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, JPA.ATTRIBUTE_OVERRIDE); getJpaProject().synchronizeContextModel(); - attributeOverrides = (ListIterator) overrideContainer.specifiedOverrides(); + attributeOverrides = overrideContainer.getSpecifiedOverrides().iterator(); assertFalse(attributeOverrides.hasNext()); } @@ -1143,9 +1134,9 @@ public class GenericJavaEntity2_0Tests extends Generic2_0ContextModelTestCase createTestSubType(); addXmlClassRef(PACKAGE_NAME + ".AnnotationTestTypeChild"); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - AttributeOverrideContainer overrideContainer = getJavaEntity().getAttributeOverrideContainer(); + JavaAttributeOverrideContainer overrideContainer = getJavaEntity().getAttributeOverrideContainer(); - ListIterator virtualAttributeOverrides = (ListIterator) overrideContainer.virtualOverrides(); + ListIterator virtualAttributeOverrides = overrideContainer.getVirtualOverrides().iterator(); JavaVirtualAttributeOverride virtualAttributeOverride = virtualAttributeOverrides.next(); assertEquals("id", virtualAttributeOverride.getName()); assertTrue(virtualAttributeOverride.isVirtual()); @@ -1159,12 +1150,12 @@ public class GenericJavaEntity2_0Tests extends Generic2_0ContextModelTestCase 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) overrideContainer.virtualOverrides(); + virtualAttributeOverrides = overrideContainer.getVirtualOverrides().iterator(); virtualAttributeOverride = virtualAttributeOverrides.next(); assertEquals("name", virtualAttributeOverride.getName()); assertTrue(virtualAttributeOverride.isVirtual()); @@ -1226,64 +1217,64 @@ public class GenericJavaEntity2_0Tests extends Generic2_0ContextModelTestCase addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); AssociationOverrideContainer overrideContainer = getJavaEntity().getAssociationOverrideContainer(); - ListIterator specifiedAssociationOverrides = (ListIterator) overrideContainer.specifiedOverrides(); + ListIterator 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) 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) 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) 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) 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) 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) 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) overrideContainer.specifiedOverrides(); + specifiedAssociationOverrides = overrideContainer.getSpecifiedOverrides().iterator(); assertFalse(specifiedAssociationOverrides.hasNext()); } @@ -1294,18 +1285,17 @@ public class GenericJavaEntity2_0Tests extends Generic2_0ContextModelTestCase addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); addXmlClassRef(FULLY_QUALIFIED_SUB_TYPE_NAME); - ListIterator classRefs = getPersistenceUnit().specifiedClassRefs(); + ListIterator 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()); @@ -1314,25 +1304,23 @@ public class GenericJavaEntity2_0Tests extends Generic2_0ContextModelTestCase //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()); @@ -1351,9 +1339,9 @@ public class GenericJavaEntity2_0Tests extends Generic2_0ContextModelTestCase //// 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(); @@ -1365,9 +1353,9 @@ public class GenericJavaEntity2_0Tests extends Generic2_0ContextModelTestCase //// 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()); @@ -1384,19 +1372,19 @@ public class GenericJavaEntity2_0Tests extends Generic2_0ContextModelTestCase 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(); getJpaProject().synchronizeContextModel(); - assertEquals(2, overrideContainer.specifiedOverridesSize()); + assertEquals(2, overrideContainer.getSpecifiedOverridesSize()); } public void testVirtualAssociationOverridesSize() throws Exception { @@ -1407,19 +1395,19 @@ public class GenericJavaEntity2_0Tests extends Generic2_0ContextModelTestCase 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 { @@ -1430,20 +1418,20 @@ public class GenericJavaEntity2_0Tests extends Generic2_0ContextModelTestCase 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 { @@ -1454,11 +1442,11 @@ public class GenericJavaEntity2_0Tests extends Generic2_0ContextModelTestCase 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 associationOverrides = typeResource.annotations(AssociationOverrideAnnotation.ANNOTATION_NAME, AssociationOverridesAnnotation.ANNOTATION_NAME); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_SUB_TYPE_NAME, Kind.TYPE); + Iterator associationOverrides = resourceType.getAnnotations(JPA.ASSOCIATION_OVERRIDE).iterator(); assertEquals("address", ((AssociationOverrideAnnotation) associationOverrides.next()).getName()); assertEquals("address2", ((AssociationOverrideAnnotation) associationOverrides.next()).getName()); @@ -1473,13 +1461,13 @@ public class GenericJavaEntity2_0Tests extends Generic2_0ContextModelTestCase addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); AssociationOverrideContainer overrideContainer = getJavaEntity().getAssociationOverrideContainer(); - ListIterator virtualAssociationOverrides = (ListIterator) overrideContainer.virtualOverrides(); + ListIterator 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 associationOverrides = typeResource.annotations(AssociationOverrideAnnotation.ANNOTATION_NAME, AssociationOverridesAnnotation.ANNOTATION_NAME); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_SUB_TYPE_NAME, Kind.TYPE); + Iterator associationOverrides = resourceType.getAnnotations(JPA.ASSOCIATION_OVERRIDE).iterator(); assertEquals("address2", ((AssociationOverrideAnnotation) associationOverrides.next()).getName()); assertEquals("address", ((AssociationOverrideAnnotation) associationOverrides.next()).getName()); @@ -1494,30 +1482,30 @@ public class GenericJavaEntity2_0Tests extends Generic2_0ContextModelTestCase 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); - 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, CollectionTools.size(resourceType.getAnnotations(JPA.ASSOCIATION_OVERRIDE).iterator())); - overrideContainer.specifiedOverrides().next().convertToVirtual(); + overrideContainer.getSpecifiedOverrides().iterator().next().convertToVirtual(); - Iterator associationOverrideResources = typeResource.annotations(AssociationOverrideAnnotation.ANNOTATION_NAME, AssociationOverridesAnnotation.ANNOTATION_NAME); + Iterator associationOverrideResources = resourceType.getAnnotations(JPA.ASSOCIATION_OVERRIDE).iterator(); assertEquals("address2", ((AssociationOverrideAnnotation) associationOverrideResources.next()).getName()); assertFalse(associationOverrideResources.hasNext()); - Iterator associationOverrides = (Iterator) overrideContainer.specifiedOverrides(); + Iterator 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(JPA.ASSOCIATION_OVERRIDE).iterator(); assertFalse(associationOverrideResources.hasNext()); - associationOverrides = (Iterator) 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 { @@ -1528,32 +1516,32 @@ public class GenericJavaEntity2_0Tests extends Generic2_0ContextModelTestCase 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); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_SUB_TYPE_NAME, Kind.TYPE); - Iterator javaAssociationOverrides = typeResource.annotations(AssociationOverrideAnnotation.ANNOTATION_NAME, AssociationOverridesAnnotation.ANNOTATION_NAME); + Iterator javaAssociationOverrides = resourceType.getAnnotations(JPA.ASSOCIATION_OVERRIDE).iterator(); assertEquals(2, CollectionTools.size(javaAssociationOverrides)); overrideContainer.moveSpecifiedOverride(1, 0); - Iterator associationOverrides = (Iterator) overrideContainer.specifiedOverrides(); + Iterator 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(JPA.ASSOCIATION_OVERRIDE).iterator(); assertEquals("address2", ((AssociationOverrideAnnotation) javaAssociationOverrides.next()).getName()); assertEquals("address", ((AssociationOverrideAnnotation) javaAssociationOverrides.next()).getName()); overrideContainer.moveSpecifiedOverride(0, 1); - associationOverrides = (Iterator) 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(JPA.ASSOCIATION_OVERRIDE).iterator(); assertEquals("address", ((AssociationOverrideAnnotation) javaAssociationOverrides.next()).getName()); assertEquals("address2", ((AssociationOverrideAnnotation) javaAssociationOverrides.next()).getName()); } @@ -1563,51 +1551,51 @@ public class GenericJavaEntity2_0Tests extends Generic2_0ContextModelTestCase addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); AssociationOverrideContainer overrideContainer = getJavaEntity().getAssociationOverrideContainer(); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); + 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, JPA.ASSOCIATION_OVERRIDE)).setName("FOO"); + ((AssociationOverrideAnnotation) resourceType.addAnnotation(1, JPA.ASSOCIATION_OVERRIDE)).setName("BAR"); + ((AssociationOverrideAnnotation) resourceType.addAnnotation(2, JPA.ASSOCIATION_OVERRIDE)).setName("BAZ"); getJpaProject().synchronizeContextModel(); - ListIterator associationOverrides = (ListIterator) overrideContainer.specifiedOverrides(); + ListIterator 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 = (ListIterator) 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 = (ListIterator) 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, JPA.ASSOCIATION_OVERRIDE); getJpaProject().synchronizeContextModel(); - associationOverrides = (ListIterator) 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, JPA.ASSOCIATION_OVERRIDE); getJpaProject().synchronizeContextModel(); - associationOverrides = (ListIterator) 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, JPA.ASSOCIATION_OVERRIDE); getJpaProject().synchronizeContextModel(); - associationOverrides = (ListIterator) overrideContainer.specifiedOverrides(); + associationOverrides = overrideContainer.getSpecifiedOverrides().iterator(); assertFalse(associationOverrides.hasNext()); } @@ -1616,9 +1604,9 @@ public class GenericJavaEntity2_0Tests extends Generic2_0ContextModelTestCase createTestSubType(); addXmlClassRef(PACKAGE_NAME + ".AnnotationTestTypeChild"); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - AssociationOverrideContainer overrideContainer = getJavaEntity().getAssociationOverrideContainer(); + JavaAssociationOverrideContainer overrideContainer = getJavaEntity().getAssociationOverrideContainer(); - ListIterator virtualAssociationOverrides = (ListIterator) overrideContainer.virtualOverrides(); + ListIterator virtualAssociationOverrides = overrideContainer.getVirtualOverrides().iterator(); JavaVirtualAssociationOverride virtualAssociationOverride = virtualAssociationOverrides.next(); assertEquals("address", virtualAssociationOverride.getName()); assertTrue(virtualAssociationOverride.isVirtual()); @@ -1636,12 +1624,12 @@ public class GenericJavaEntity2_0Tests extends Generic2_0ContextModelTestCase 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) overrideContainer.virtualOverrides(); + virtualAssociationOverrides = overrideContainer.getVirtualOverrides().iterator(); virtualAssociationOverride = virtualAssociationOverrides.next(); assertEquals("address2", virtualAssociationOverride.getName()); assertTrue(virtualAssociationOverride.isVirtual()); @@ -1666,7 +1654,7 @@ public class GenericJavaEntity2_0Tests extends Generic2_0ContextModelTestCase addXmlClassRef(PACKAGE_NAME + ".LongTimeCustomer"); addXmlClassRef(PACKAGE_NAME + ".Address"); addXmlClassRef(PACKAGE_NAME + ".ZipCode"); - ListIterator specifiedClassRefs = getPersistenceUnit().specifiedClassRefs(); + ListIterator specifiedClassRefs = getPersistenceUnit().getSpecifiedClassRefs().iterator(); specifiedClassRefs.next(); PersistentType longTimeCustomerPersistentType = specifiedClassRefs.next().getJavaPersistentType(); PersistentType addressPersistentType = specifiedClassRefs.next().getJavaPersistentType(); @@ -1674,8 +1662,8 @@ public class GenericJavaEntity2_0Tests extends Generic2_0ContextModelTestCase AttributeOverrideContainer attributeOverrideContainer = ((Entity) longTimeCustomerPersistentType.getMapping()).getAttributeOverrideContainer(); - assertEquals(6, attributeOverrideContainer.virtualOverridesSize()); - ListIterator virtualAttributeOverrides = (ListIterator) attributeOverrideContainer.virtualOverrides(); + assertEquals(6, attributeOverrideContainer.getVirtualOverridesSize()); + ListIterator virtualAttributeOverrides = attributeOverrideContainer.getVirtualOverrides().iterator(); VirtualAttributeOverride virtualAttributeOverride = virtualAttributeOverrides.next(); assertEquals("id", virtualAttributeOverride.getName()); virtualAttributeOverride = virtualAttributeOverrides.next(); @@ -1778,7 +1766,7 @@ public class GenericJavaEntity2_0Tests extends Generic2_0ContextModelTestCase addXmlClassRef(PACKAGE_NAME + ".LongTimeCustomer"); addXmlClassRef(PACKAGE_NAME + ".Address"); addXmlClassRef(PACKAGE_NAME + ".ZipCode"); - ListIterator specifiedClassRefs = getPersistenceUnit().specifiedClassRefs(); + ListIterator specifiedClassRefs = getPersistenceUnit().getSpecifiedClassRefs().iterator(); specifiedClassRefs.next(); PersistentType longTimeCustomerPersistentType = specifiedClassRefs.next().getJavaPersistentType(); PersistentType addressPersistentType = specifiedClassRefs.next().getJavaPersistentType(); @@ -1786,8 +1774,8 @@ public class GenericJavaEntity2_0Tests extends Generic2_0ContextModelTestCase AttributeOverrideContainer attributeOverrideContainer = ((Entity) longTimeCustomerPersistentType.getMapping()).getAttributeOverrideContainer(); - assertEquals(6, attributeOverrideContainer.virtualOverridesSize()); - ListIterator virtualAttributeOverrides = (ListIterator) attributeOverrideContainer.virtualOverrides(); + assertEquals(6, attributeOverrideContainer.getVirtualOverridesSize()); + ListIterator virtualAttributeOverrides = attributeOverrideContainer.getVirtualOverrides().iterator(); VirtualAttributeOverride virtualAttributeOverride = virtualAttributeOverrides.next(); assertEquals("id", virtualAttributeOverride.getName()); virtualAttributeOverride = virtualAttributeOverrides.next(); @@ -1890,14 +1878,14 @@ public class GenericJavaEntity2_0Tests extends Generic2_0ContextModelTestCase addXmlClassRef(PACKAGE_NAME + ".LongTimeCustomer"); addXmlClassRef(PACKAGE_NAME + ".Address"); addXmlClassRef(PACKAGE_NAME + ".ZipCode"); - ListIterator specifiedClassRefs = getPersistenceUnit().specifiedClassRefs(); + ListIterator specifiedClassRefs = getPersistenceUnit().getSpecifiedClassRefs().iterator(); specifiedClassRefs.next(); PersistentType longTimeCustomerPersistentType = specifiedClassRefs.next().getJavaPersistentType(); AssociationOverrideContainer associationOverrideContainer = ((Entity) longTimeCustomerPersistentType.getMapping()).getAssociationOverrideContainer(); - assertEquals(1, associationOverrideContainer.virtualOverridesSize()); - ListIterator virtualAssociationOverrides = (ListIterator) associationOverrideContainer.virtualOverrides(); + assertEquals(1, associationOverrideContainer.getVirtualOverridesSize()); + ListIterator virtualAssociationOverrides = associationOverrideContainer.getVirtualOverrides().iterator(); VirtualAssociationOverride virtualAssociationOverride = virtualAssociationOverrides.next(); assertEquals("address.state", virtualAssociationOverride.getName()); } @@ -1912,14 +1900,14 @@ public class GenericJavaEntity2_0Tests extends Generic2_0ContextModelTestCase addXmlClassRef(PACKAGE_NAME + ".LongTimeCustomer"); addXmlClassRef(PACKAGE_NAME + ".Address"); addXmlClassRef(PACKAGE_NAME + ".ZipCode"); - ListIterator specifiedClassRefs = getPersistenceUnit().specifiedClassRefs(); + ListIterator specifiedClassRefs = getPersistenceUnit().getSpecifiedClassRefs().iterator(); specifiedClassRefs.next(); PersistentType longTimeCustomerPersistentType = specifiedClassRefs.next().getJavaPersistentType(); AssociationOverrideContainer associationOverrideContainer = ((Entity) longTimeCustomerPersistentType.getMapping()).getAssociationOverrideContainer(); - assertEquals(1, associationOverrideContainer.virtualOverridesSize()); - ListIterator virtualAssociationOverrides = (ListIterator) associationOverrideContainer.virtualOverrides(); + assertEquals(1, associationOverrideContainer.getVirtualOverridesSize()); + ListIterator virtualAssociationOverrides = associationOverrideContainer.getVirtualOverrides().iterator(); VirtualAssociationOverride virtualAssociationOverride = virtualAssociationOverrides.next(); assertEquals("address.state", virtualAssociationOverride.getName()); } @@ -1929,24 +1917,24 @@ public class GenericJavaEntity2_0Tests extends Generic2_0ContextModelTestCase 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); @@ -1957,13 +1945,13 @@ public class GenericJavaEntity2_0Tests extends Generic2_0ContextModelTestCase 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); @@ -1986,9 +1974,9 @@ public class GenericJavaEntity2_0Tests extends Generic2_0ContextModelTestCase assertEquals(null, cacheableAnnotation.getValue()); assertSourceContains("@Cacheable", cu); - getJavaPersistentType().getResourcePersistentType().removeAnnotation(JPA2_0.CACHEABLE); + getJavaPersistentType().getJavaResourceType().removeAnnotation(JPA2_0.CACHEABLE); getJpaProject().synchronizeContextModel(); - 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); @@ -2051,19 +2039,19 @@ public class GenericJavaEntity2_0Tests extends Generic2_0ContextModelTestCase createTestEntityWithAssociationOverride(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - JavaAssociationOverride associationOverride = getJavaEntity().getAssociationOverrideContainer().specifiedOverrides().next(); + JavaAssociationOverride associationOverride = getJavaEntity().getAssociationOverrideContainer().getSpecifiedOverrides().iterator().next(); assertEquals("a", associationOverride.getName()); - AssociationOverride2_0Annotation annotation = (AssociationOverride2_0Annotation) getJavaPersistentType().getResourcePersistentType().getAnnotation(JPA.ASSOCIATION_OVERRIDE); + AssociationOverride2_0Annotation annotation = (AssociationOverride2_0Annotation) getJavaPersistentType().getJavaResourceType().getAnnotation(0, JPA.ASSOCIATION_OVERRIDE); annotation.getJoinTable().setName("FOO"); annotation.getJoinTable().addInverseJoinColumn(0).setName("BAR"); getJpaProject().synchronizeContextModel(); - associationOverride = getJavaEntity().getAssociationOverrideContainer().specifiedOverrides().next(); + associationOverride = getJavaEntity().getAssociationOverrideContainer().getSpecifiedOverrides().iterator().next(); assertEquals("a", associationOverride.getName()); JoinTable joinTable = ((JavaOverrideRelationship2_0) associationOverride.getRelationship()).getJoinTableStrategy().getJoinTable(); assertEquals("FOO", joinTable.getSpecifiedName()); - assertEquals("BAR", joinTable.inverseJoinColumns().next().getName()); + assertEquals("BAR", joinTable.getInverseJoinColumns().iterator().next().getName()); } } diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/java/GenericJavaManyToManyMapping2_0Tests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/java/GenericJavaManyToManyMapping2_0Tests.java index c2198f05d1..8d41c5b462 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/java/GenericJavaManyToManyMapping2_0Tests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/java/GenericJavaManyToManyMapping2_0Tests.java @@ -12,6 +12,10 @@ package org.eclipse.jpt.jpa.core.tests.internal.jpa2.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.iterators.ArrayIterator; import org.eclipse.jpt.jpa.core.context.AttributeMapping; @@ -36,12 +40,8 @@ import org.eclipse.jpt.jpa.core.jpa2.resource.java.JPA2_0; import org.eclipse.jpt.jpa.core.jpa2.resource.java.MapKeyClass2_0Annotation; import org.eclipse.jpt.jpa.core.jpa2.resource.java.MapKeyColumn2_0Annotation; 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.JavaResourcePersistentAttribute; -import org.eclipse.jpt.jpa.core.resource.java.JavaResourcePersistentType; import org.eclipse.jpt.jpa.core.resource.java.MapKeyAnnotation; -import org.eclipse.jpt.jpa.core.resource.java.NestableAnnotation; import org.eclipse.jpt.jpa.core.tests.internal.jpa2.context.Generic2_0ContextModelTestCase; @SuppressWarnings("nls") @@ -323,7 +323,7 @@ public class GenericJavaManyToManyMapping2_0Tests addXmlClassRef(PACKAGE_NAME + ".Address"); addXmlClassRef(PACKAGE_NAME + ".State"); - PersistentAttribute persistentAttribute = (getJavaPersistentType()).attributes().next(); + PersistentAttribute persistentAttribute = (getJavaPersistentType()).getAttributes().iterator().next(); ManyToManyMapping manyToManyMapping = (ManyToManyMapping) persistentAttribute.getMapping(); Iterator attributeNames = @@ -366,7 +366,7 @@ public class GenericJavaManyToManyMapping2_0Tests addXmlClassRef(PACKAGE_NAME + ".Address"); addXmlClassRef(PACKAGE_NAME + ".State"); - PersistentAttribute persistentAttribute = (getJavaPersistentType()).attributes().next(); + PersistentAttribute persistentAttribute = (getJavaPersistentType()).getAttributes().iterator().next(); ManyToManyMapping manyToManyMapping = (ManyToManyMapping) persistentAttribute.getMapping(); Iterator attributeNames = @@ -403,19 +403,19 @@ public class GenericJavaManyToManyMapping2_0Tests createTestEntityWithValidManyToManyMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToManyMapping manyToManyMapping = (ManyToManyMapping) persistentAttribute.getMapping(); - 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(); assertNull(manyToManyMapping.getSpecifiedMapKey()); - assertNull(attributeResource.getAnnotation(MapKeyAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(MapKeyAnnotation.ANNOTATION_NAME)); //set mapKey in the resource model, verify context model does not change - attributeResource.addAnnotation(MapKeyAnnotation.ANNOTATION_NAME); + resourceField.addAnnotation(MapKeyAnnotation.ANNOTATION_NAME); assertNull(manyToManyMapping.getSpecifiedMapKey()); - MapKeyAnnotation mapKey = (MapKeyAnnotation) attributeResource.getAnnotation(MapKeyAnnotation.ANNOTATION_NAME); + MapKeyAnnotation mapKey = (MapKeyAnnotation) resourceField.getAnnotation(MapKeyAnnotation.ANNOTATION_NAME); assertNotNull(mapKey); //set mapKey name in the resource model, verify context model updated @@ -433,36 +433,36 @@ public class GenericJavaManyToManyMapping2_0Tests assertNull(mapKey.getName()); mapKey.setName("myMapKey"); - attributeResource.removeAnnotation(MapKeyAnnotation.ANNOTATION_NAME); + resourceField.removeAnnotation(MapKeyAnnotation.ANNOTATION_NAME); getJpaProject().synchronizeContextModel(); assertNull(manyToManyMapping.getSpecifiedMapKey()); - assertNull(attributeResource.getAnnotation(MapKeyAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(MapKeyAnnotation.ANNOTATION_NAME)); } public void testModifyMapKey() throws Exception { createTestEntityWithValidManyToManyMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToManyMapping manyToManyMapping = (ManyToManyMapping) persistentAttribute.getMapping(); - 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(); assertNull(manyToManyMapping.getSpecifiedMapKey()); - assertNull(attributeResource.getAnnotation(MapKeyAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(MapKeyAnnotation.ANNOTATION_NAME)); //set mapKey in the context model, verify resource model updated manyToManyMapping.setSpecifiedMapKey("myMapKey"); - MapKeyAnnotation mapKey = (MapKeyAnnotation) attributeResource.getAnnotation(MapKeyAnnotation.ANNOTATION_NAME); + MapKeyAnnotation mapKey = (MapKeyAnnotation) resourceField.getAnnotation(MapKeyAnnotation.ANNOTATION_NAME); assertEquals("myMapKey", manyToManyMapping.getSpecifiedMapKey()); assertEquals("myMapKey", mapKey.getName()); //set mapKey to null in the context model manyToManyMapping.setSpecifiedMapKey(null); assertNull(manyToManyMapping.getSpecifiedMapKey()); - mapKey = (MapKeyAnnotation) attributeResource.getAnnotation(MapKeyAnnotation.ANNOTATION_NAME); + mapKey = (MapKeyAnnotation) resourceField.getAnnotation(MapKeyAnnotation.ANNOTATION_NAME); assertNull(mapKey.getName()); } @@ -474,7 +474,7 @@ public class GenericJavaManyToManyMapping2_0Tests addXmlClassRef(PACKAGE_NAME + ".Address"); addXmlClassRef(PACKAGE_NAME + ".State"); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToManyMapping manyToManyMapping2_0 = (ManyToManyMapping) persistentAttribute.getMapping(); Iterator mapKeyNames = @@ -497,7 +497,7 @@ public class GenericJavaManyToManyMapping2_0Tests addXmlClassRef(PACKAGE_NAME + ".Address"); addXmlClassRef(PACKAGE_NAME + ".State"); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToManyMapping manyToManyMapping2_0 = (ManyToManyMapping) persistentAttribute.getMapping(); Iterator mapKeyNames = manyToManyMapping2_0.candidateMapKeyNames(); @@ -523,19 +523,19 @@ public class GenericJavaManyToManyMapping2_0Tests createTestEntityWithValidManyToManyMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToManyMapping2_0 manyToManyMapping = (ManyToManyMapping2_0) persistentAttribute.getMapping(); - 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(); assertNull(manyToManyMapping.getSpecifiedMapKeyClass()); - assertNull(attributeResource.getAnnotation(MapKeyClass2_0Annotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(MapKeyClass2_0Annotation.ANNOTATION_NAME)); //set mapKey in the resource model, verify context model does not change - attributeResource.addAnnotation(MapKeyClass2_0Annotation.ANNOTATION_NAME); + resourceField.addAnnotation(MapKeyClass2_0Annotation.ANNOTATION_NAME); assertNull(manyToManyMapping.getSpecifiedMapKeyClass()); - MapKeyClass2_0Annotation mapKeyClassAnnotation = (MapKeyClass2_0Annotation) attributeResource.getAnnotation(MapKeyClass2_0Annotation.ANNOTATION_NAME); + MapKeyClass2_0Annotation mapKeyClassAnnotation = (MapKeyClass2_0Annotation) resourceField.getAnnotation(MapKeyClass2_0Annotation.ANNOTATION_NAME); assertNotNull(mapKeyClassAnnotation); //set mapKey name in the resource model, verify context model updated @@ -551,35 +551,35 @@ public class GenericJavaManyToManyMapping2_0Tests assertNull(mapKeyClassAnnotation.getValue()); mapKeyClassAnnotation.setValue("myMapKeyClass"); - attributeResource.removeAnnotation(MapKeyClass2_0Annotation.ANNOTATION_NAME); + resourceField.removeAnnotation(MapKeyClass2_0Annotation.ANNOTATION_NAME); getJpaProject().synchronizeContextModel(); assertNull(manyToManyMapping.getSpecifiedMapKeyClass()); - assertNull(attributeResource.getAnnotation(MapKeyClass2_0Annotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(MapKeyClass2_0Annotation.ANNOTATION_NAME)); } public void testModifyMapKeyClass() throws Exception { createTestEntityWithValidManyToManyMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToManyMapping2_0 manyToManyMapping = (ManyToManyMapping2_0) persistentAttribute.getMapping(); - 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(); assertNull(manyToManyMapping.getSpecifiedMapKeyClass()); - assertNull(attributeResource.getAnnotation(MapKeyClass2_0Annotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(MapKeyClass2_0Annotation.ANNOTATION_NAME)); //set mapKey in the context model, verify resource model updated manyToManyMapping.setSpecifiedMapKeyClass("String"); - MapKeyClass2_0Annotation mapKeyClass = (MapKeyClass2_0Annotation) attributeResource.getAnnotation(MapKeyClass2_0Annotation.ANNOTATION_NAME); + MapKeyClass2_0Annotation mapKeyClass = (MapKeyClass2_0Annotation) resourceField.getAnnotation(MapKeyClass2_0Annotation.ANNOTATION_NAME); assertEquals("String", manyToManyMapping.getSpecifiedMapKeyClass()); assertEquals("String", mapKeyClass.getValue()); //set mapKey to null in the context model manyToManyMapping.setSpecifiedMapKeyClass(null); assertNull(manyToManyMapping.getSpecifiedMapKeyClass()); - assertNull(attributeResource.getAnnotation(MapKeyClass2_0Annotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(MapKeyClass2_0Annotation.ANNOTATION_NAME)); } public void testDefaultMapKeyClass() throws Exception { @@ -588,7 +588,7 @@ public class GenericJavaManyToManyMapping2_0Tests createTestEmbeddableState(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToManyMapping2_0 manyToManyMapping = (ManyToManyMapping2_0) persistentAttribute.getMapping(); assertEquals("java.lang.Integer", manyToManyMapping.getDefaultMapKeyClass()); @@ -602,7 +602,7 @@ public class GenericJavaManyToManyMapping2_0Tests createTestEntityWithValidManyToManyMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToManyMapping2_0 manyToManyMapping = (ManyToManyMapping2_0) persistentAttribute.getMapping(); assertNull(manyToManyMapping.getDefaultMapKeyClass()); @@ -612,7 +612,7 @@ public class GenericJavaManyToManyMapping2_0Tests createTestEntityWithValidGenericMapManyToManyMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToManyMapping2_0 manyToManyMapping = (ManyToManyMapping2_0) persistentAttribute.getMapping(); assertEquals("java.lang.Integer", manyToManyMapping.getMapKeyClass()); @@ -752,7 +752,7 @@ public class GenericJavaManyToManyMapping2_0Tests addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); addXmlClassRef(PACKAGE_NAME + ".Address"); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToManyMapping2_0 manyToManyMapping = (ManyToManyMapping2_0) persistentAttribute.getMapping(); assertNull(manyToManyMapping.getMapKeyColumn().getSpecifiedName()); @@ -762,9 +762,9 @@ public class GenericJavaManyToManyMapping2_0Tests manyToManyMapping.getRelationship().getJoinTableStrategy().getJoinTable().setSpecifiedName("MY_PRIMARY_TABLE"); assertEquals("MY_PRIMARY_TABLE", manyToManyMapping.getMapKeyColumn().getTable()); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - MapKeyColumn2_0Annotation column = (MapKeyColumn2_0Annotation) attributeResource.addAnnotation(JPA2_0.MAP_KEY_COLUMN); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + MapKeyColumn2_0Annotation column = (MapKeyColumn2_0Annotation) resourceField.addAnnotation(JPA2_0.MAP_KEY_COLUMN); column.setName("foo"); getJpaProject().synchronizeContextModel(); @@ -779,7 +779,7 @@ public class GenericJavaManyToManyMapping2_0Tests addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); addXmlClassRef(PACKAGE_NAME + ".Address"); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToManyMapping2_0 manyToManyMapping = (ManyToManyMapping2_0) persistentAttribute.getMapping(); manyToManyMapping.getRelationship().setStrategyToMappedBy(); manyToManyMapping.getRelationship().getMappedByStrategy().setMappedByAttribute("employees"); @@ -793,9 +793,9 @@ public class GenericJavaManyToManyMapping2_0Tests ((JoinTableRelationshipStrategy) owningManyToManyMapping.getRelationship().getStrategy()).getJoinTable().setSpecifiedName("MY_JOIN_TABLE"); assertEquals("MY_JOIN_TABLE", manyToManyMapping.getMapKeyColumn().getTable()); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - MapKeyColumn2_0Annotation column = (MapKeyColumn2_0Annotation) attributeResource.addAnnotation(JPA2_0.MAP_KEY_COLUMN); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + MapKeyColumn2_0Annotation column = (MapKeyColumn2_0Annotation) resourceField.addAnnotation(JPA2_0.MAP_KEY_COLUMN); column.setName("foo"); getJpaProject().synchronizeContextModel(); @@ -810,7 +810,7 @@ public class GenericJavaManyToManyMapping2_0Tests addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); addXmlClassRef(PACKAGE_NAME + ".Address"); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToManyMapping2_0 manyToManyMapping = (ManyToManyMapping2_0) persistentAttribute.getMapping(); assertNull(manyToManyMapping.getMapKeyColumn().getSpecifiedName()); @@ -820,9 +820,9 @@ public class GenericJavaManyToManyMapping2_0Tests manyToManyMapping.getRelationship().getJoinTableStrategy().getJoinTable().setSpecifiedName("MY_JOIN_TABLE"); assertEquals("MY_JOIN_TABLE", manyToManyMapping.getMapKeyColumn().getTable()); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - MapKeyColumn2_0Annotation column = (MapKeyColumn2_0Annotation) attributeResource.addAnnotation(JPA2_0.MAP_KEY_COLUMN); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + MapKeyColumn2_0Annotation column = (MapKeyColumn2_0Annotation) resourceField.addAnnotation(JPA2_0.MAP_KEY_COLUMN); column.setName("foo"); getJpaProject().synchronizeContextModel(); @@ -846,42 +846,42 @@ public class GenericJavaManyToManyMapping2_0Tests JavaManyToManyMapping2_0 manyToManyMapping = (JavaManyToManyMapping2_0) getJavaPersistentType().getAttributeNamed("parcels").getMapping(); JavaAttributeOverrideContainer mapKeyAttributeOverrideContainer = manyToManyMapping.getMapKeyAttributeOverrideContainer(); - ListIterator specifiedMapKeyAttributeOverrides = mapKeyAttributeOverrideContainer.specifiedOverrides(); + ListIterator specifiedMapKeyAttributeOverrides = mapKeyAttributeOverrideContainer.getSpecifiedOverrides().iterator(); assertFalse(specifiedMapKeyAttributeOverrides.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 - AttributeOverrideAnnotation attributeOverride = (AttributeOverrideAnnotation) attributeResource.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + AttributeOverrideAnnotation attributeOverride = (AttributeOverrideAnnotation) resourceField.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE); attributeOverride.setName("FOO"); getJpaProject().synchronizeContextModel(); - specifiedMapKeyAttributeOverrides = mapKeyAttributeOverrideContainer.specifiedOverrides(); + specifiedMapKeyAttributeOverrides = mapKeyAttributeOverrideContainer.getSpecifiedOverrides().iterator(); assertEquals("FOO", specifiedMapKeyAttributeOverrides.next().getName()); assertFalse(specifiedMapKeyAttributeOverrides.hasNext()); - attributeOverride = (AttributeOverrideAnnotation) attributeResource.addAnnotation(1, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + attributeOverride = (AttributeOverrideAnnotation) resourceField.addAnnotation(1, JPA.ATTRIBUTE_OVERRIDE); attributeOverride.setName("value.BAR"); getJpaProject().synchronizeContextModel(); - specifiedMapKeyAttributeOverrides = mapKeyAttributeOverrideContainer.specifiedOverrides(); + specifiedMapKeyAttributeOverrides = mapKeyAttributeOverrideContainer.getSpecifiedOverrides().iterator(); assertEquals("FOO", specifiedMapKeyAttributeOverrides.next().getName()); assertEquals("value.BAR", specifiedMapKeyAttributeOverrides.next().getName()); assertFalse(specifiedMapKeyAttributeOverrides.hasNext()); - attributeOverride = (AttributeOverrideAnnotation) attributeResource.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + attributeOverride = (AttributeOverrideAnnotation) resourceField.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE); attributeOverride.setName("key.BAZ"); getJpaProject().synchronizeContextModel(); - specifiedMapKeyAttributeOverrides = mapKeyAttributeOverrideContainer.specifiedOverrides(); + specifiedMapKeyAttributeOverrides = mapKeyAttributeOverrideContainer.getSpecifiedOverrides().iterator(); assertEquals("BAZ", specifiedMapKeyAttributeOverrides.next().getName()); assertEquals("FOO", specifiedMapKeyAttributeOverrides.next().getName()); assertEquals("value.BAR", specifiedMapKeyAttributeOverrides.next().getName()); assertFalse(specifiedMapKeyAttributeOverrides.hasNext()); - attributeOverride = (AttributeOverrideAnnotation) attributeResource.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + attributeOverride = (AttributeOverrideAnnotation) resourceField.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE); attributeOverride.setName("key.BLAH"); getJpaProject().synchronizeContextModel(); - specifiedMapKeyAttributeOverrides = mapKeyAttributeOverrideContainer.specifiedOverrides(); + specifiedMapKeyAttributeOverrides = mapKeyAttributeOverrideContainer.getSpecifiedOverrides().iterator(); assertEquals("BLAH", specifiedMapKeyAttributeOverrides.next().getName()); assertEquals("BAZ", specifiedMapKeyAttributeOverrides.next().getName()); assertEquals("FOO", specifiedMapKeyAttributeOverrides.next().getName()); @@ -889,40 +889,40 @@ public class GenericJavaManyToManyMapping2_0Tests assertFalse(specifiedMapKeyAttributeOverrides.hasNext()); //move an annotation to the resource model and verify the context model is updated - attributeResource.moveAnnotation(1, 0, JPA.ATTRIBUTE_OVERRIDES); + resourceField.moveAnnotation(1, 0, JPA.ATTRIBUTE_OVERRIDE); getJpaProject().synchronizeContextModel(); - specifiedMapKeyAttributeOverrides = mapKeyAttributeOverrideContainer.specifiedOverrides(); + specifiedMapKeyAttributeOverrides = mapKeyAttributeOverrideContainer.getSpecifiedOverrides().iterator(); assertEquals("BAZ", specifiedMapKeyAttributeOverrides.next().getName()); assertEquals("BLAH", specifiedMapKeyAttributeOverrides.next().getName()); assertEquals("FOO", specifiedMapKeyAttributeOverrides.next().getName()); assertEquals("value.BAR", specifiedMapKeyAttributeOverrides.next().getName()); assertFalse(specifiedMapKeyAttributeOverrides.hasNext()); - attributeResource.removeAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + resourceField.removeAnnotation(0, JPA.ATTRIBUTE_OVERRIDE); getJpaProject().synchronizeContextModel(); - specifiedMapKeyAttributeOverrides = mapKeyAttributeOverrideContainer.specifiedOverrides(); + specifiedMapKeyAttributeOverrides = mapKeyAttributeOverrideContainer.getSpecifiedOverrides().iterator(); assertEquals("BLAH", specifiedMapKeyAttributeOverrides.next().getName()); assertEquals("FOO", specifiedMapKeyAttributeOverrides.next().getName()); assertEquals("value.BAR", specifiedMapKeyAttributeOverrides.next().getName()); assertFalse(specifiedMapKeyAttributeOverrides.hasNext()); - attributeResource.removeAnnotation(1, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + resourceField.removeAnnotation(1, JPA.ATTRIBUTE_OVERRIDE); getJpaProject().synchronizeContextModel(); - specifiedMapKeyAttributeOverrides = mapKeyAttributeOverrideContainer.specifiedOverrides(); + specifiedMapKeyAttributeOverrides = mapKeyAttributeOverrideContainer.getSpecifiedOverrides().iterator(); assertEquals("BLAH", specifiedMapKeyAttributeOverrides.next().getName()); assertEquals("value.BAR", specifiedMapKeyAttributeOverrides.next().getName()); assertFalse(specifiedMapKeyAttributeOverrides.hasNext()); - attributeResource.removeAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + resourceField.removeAnnotation(0, JPA.ATTRIBUTE_OVERRIDE); getJpaProject().synchronizeContextModel(); - specifiedMapKeyAttributeOverrides = mapKeyAttributeOverrideContainer.specifiedOverrides(); + specifiedMapKeyAttributeOverrides = mapKeyAttributeOverrideContainer.getSpecifiedOverrides().iterator(); assertEquals("value.BAR", specifiedMapKeyAttributeOverrides.next().getName()); assertFalse(specifiedMapKeyAttributeOverrides.hasNext()); - attributeResource.removeAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + resourceField.removeAnnotation(0, JPA.ATTRIBUTE_OVERRIDE); getJpaProject().synchronizeContextModel(); - specifiedMapKeyAttributeOverrides = mapKeyAttributeOverrideContainer.specifiedOverrides(); + specifiedMapKeyAttributeOverrides = mapKeyAttributeOverrideContainer.getSpecifiedOverrides().iterator(); assertFalse(specifiedMapKeyAttributeOverrides.hasNext()); } @@ -940,14 +940,13 @@ public class GenericJavaManyToManyMapping2_0Tests JavaManyToManyMapping2_0 manyToManyMapping = (JavaManyToManyMapping2_0) getJavaPersistentType().getAttributeNamed("parcels").getMapping(); JavaAttributeOverrideContainer mapKeyAttributeOverrideContainer = manyToManyMapping.getMapKeyAttributeOverrideContainer(); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - assertEquals("parcels", attributeResource.getName()); - assertNull(attributeResource.getAnnotation(AttributeOverrideAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(AttributeOverridesAnnotation.ANNOTATION_NAME)); - - assertEquals(4, mapKeyAttributeOverrideContainer.virtualOverridesSize()); - ReadOnlyAttributeOverride defaultAttributeOverride = mapKeyAttributeOverrideContainer.virtualOverrides().next(); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + assertEquals("parcels", resourceField.getName()); + assertNull(resourceField.getAnnotation(0, AttributeOverrideAnnotation.ANNOTATION_NAME)); + + assertEquals(4, mapKeyAttributeOverrideContainer.getVirtualOverridesSize()); + ReadOnlyAttributeOverride defaultAttributeOverride = mapKeyAttributeOverrideContainer.getVirtualOverrides().iterator().next(); assertEquals("city", defaultAttributeOverride.getName()); assertEquals("city", defaultAttributeOverride.getColumn().getName()); assertEquals(TYPE_NAME +"_PropertyInfo", defaultAttributeOverride.getColumn().getTable()); @@ -961,7 +960,7 @@ public class GenericJavaManyToManyMapping2_0Tests assertEquals(0, defaultAttributeOverride.getColumn().getScale()); - ListIterator classRefs = getPersistenceUnit().specifiedClassRefs(); + ListIterator classRefs = getPersistenceUnit().getSpecifiedClassRefs().iterator(); classRefs.next(); Embeddable addressEmbeddable = (Embeddable) classRefs.next().getJavaPersistentType().getMapping(); @@ -977,12 +976,11 @@ public class GenericJavaManyToManyMapping2_0Tests cityMapping.getColumn().setSpecifiedPrecision(Integer.valueOf(6)); cityMapping.getColumn().setSpecifiedScale(Integer.valueOf(7)); - assertEquals("parcels", attributeResource.getName()); - assertNull(attributeResource.getAnnotation(AttributeOverrideAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(AttributeOverridesAnnotation.ANNOTATION_NAME)); + assertEquals("parcels", resourceField.getName()); + assertNull(resourceField.getAnnotation(0, AttributeOverrideAnnotation.ANNOTATION_NAME)); - assertEquals(4, mapKeyAttributeOverrideContainer.virtualOverridesSize()); - defaultAttributeOverride = mapKeyAttributeOverrideContainer.virtualOverrides().next(); + assertEquals(4, mapKeyAttributeOverrideContainer.getVirtualOverridesSize()); + defaultAttributeOverride = mapKeyAttributeOverrideContainer.getVirtualOverrides().iterator().next(); assertEquals("city", defaultAttributeOverride.getName()); assertEquals("FOO", defaultAttributeOverride.getColumn().getName()); assertEquals("BAR", defaultAttributeOverride.getColumn().getTable()); @@ -1005,7 +1003,7 @@ public class GenericJavaManyToManyMapping2_0Tests cityMapping.getColumn().setSpecifiedLength(null); cityMapping.getColumn().setSpecifiedPrecision(null); cityMapping.getColumn().setSpecifiedScale(null); - defaultAttributeOverride = mapKeyAttributeOverrideContainer.virtualOverrides().next(); + defaultAttributeOverride = mapKeyAttributeOverrideContainer.getVirtualOverrides().iterator().next(); assertEquals("city", defaultAttributeOverride.getName()); assertEquals("city", defaultAttributeOverride.getColumn().getName()); assertEquals(TYPE_NAME +"_PropertyInfo", defaultAttributeOverride.getColumn().getTable()); @@ -1018,10 +1016,10 @@ public class GenericJavaManyToManyMapping2_0Tests assertEquals(0, defaultAttributeOverride.getColumn().getPrecision()); assertEquals(0, defaultAttributeOverride.getColumn().getScale()); - AttributeOverrideAnnotation annotation = (AttributeOverrideAnnotation) attributeResource.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + AttributeOverrideAnnotation annotation = (AttributeOverrideAnnotation) resourceField.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE); annotation.setName("key.city"); getJpaProject().synchronizeContextModel(); - assertEquals(3, mapKeyAttributeOverrideContainer.virtualOverridesSize()); + assertEquals(3, mapKeyAttributeOverrideContainer.getVirtualOverridesSize()); } public void testMapKeyValueSpecifiedAttributeOverridesSize() throws Exception { @@ -1037,21 +1035,21 @@ public class GenericJavaManyToManyMapping2_0Tests JavaManyToManyMapping2_0 manyToManyMapping = (JavaManyToManyMapping2_0) getJavaPersistentType().getAttributeNamed("parcels").getMapping(); JavaAttributeOverrideContainer mapKeyAttributeOverrideContainer = manyToManyMapping.getMapKeyAttributeOverrideContainer(); - assertEquals(0, mapKeyAttributeOverrideContainer.specifiedOverridesSize()); + assertEquals(0, mapKeyAttributeOverrideContainer.getSpecifiedOverridesSize()); - 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 - AttributeOverrideAnnotation attributeOverride = (AttributeOverrideAnnotation) attributeResource.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + AttributeOverrideAnnotation attributeOverride = (AttributeOverrideAnnotation) resourceField.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE); attributeOverride.setName("FOO"); - attributeOverride = (AttributeOverrideAnnotation) attributeResource.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + attributeOverride = (AttributeOverrideAnnotation) resourceField.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE); attributeOverride.setName("key.BAR"); - attributeOverride = (AttributeOverrideAnnotation) attributeResource.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + attributeOverride = (AttributeOverrideAnnotation) resourceField.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE); attributeOverride.setName("value.FOO2"); getJpaProject().synchronizeContextModel(); - assertEquals(3, mapKeyAttributeOverrideContainer.specifiedOverridesSize()); + assertEquals(3, mapKeyAttributeOverrideContainer.getSpecifiedOverridesSize()); } public void testMapKeyValueAttributeOverridesSize() throws Exception { @@ -1067,31 +1065,31 @@ public class GenericJavaManyToManyMapping2_0Tests JavaManyToManyMapping2_0 manyToManyMapping = (JavaManyToManyMapping2_0) getJavaPersistentType().getAttributeNamed("parcels").getMapping(); JavaAttributeOverrideContainer mapKeyAttributeOverrideContainer = manyToManyMapping.getMapKeyAttributeOverrideContainer(); - assertEquals(4, mapKeyAttributeOverrideContainer.overridesSize()); + assertEquals(4, mapKeyAttributeOverrideContainer.getOverridesSize()); - 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 - AttributeOverrideAnnotation attributeOverride = (AttributeOverrideAnnotation) attributeResource.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + AttributeOverrideAnnotation attributeOverride = (AttributeOverrideAnnotation) resourceField.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE); attributeOverride.setName("FOO"); - attributeOverride = (AttributeOverrideAnnotation) attributeResource.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + attributeOverride = (AttributeOverrideAnnotation) resourceField.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE); attributeOverride.setName("key.BAR"); - attributeOverride = (AttributeOverrideAnnotation) attributeResource.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + attributeOverride = (AttributeOverrideAnnotation) resourceField.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE); attributeOverride.setName("value.FOO2"); getJpaProject().synchronizeContextModel(); - assertEquals(7, mapKeyAttributeOverrideContainer.overridesSize()); + assertEquals(7, mapKeyAttributeOverrideContainer.getOverridesSize()); - attributeOverride = (AttributeOverrideAnnotation) attributeResource.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + attributeOverride = (AttributeOverrideAnnotation) resourceField.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE); attributeOverride.setName("city"); getJpaProject().synchronizeContextModel(); - assertEquals(7, mapKeyAttributeOverrideContainer.overridesSize()); + assertEquals(7, mapKeyAttributeOverrideContainer.getOverridesSize()); - attributeOverride = (AttributeOverrideAnnotation) attributeResource.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + attributeOverride = (AttributeOverrideAnnotation) resourceField.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE); attributeOverride.setName("key.state.foo"); getJpaProject().synchronizeContextModel(); - assertEquals(7, mapKeyAttributeOverrideContainer.overridesSize()); + assertEquals(7, mapKeyAttributeOverrideContainer.getOverridesSize()); } public void testMapKeyValueVirtualAttributeOverridesSize() throws Exception { @@ -1107,32 +1105,32 @@ public class GenericJavaManyToManyMapping2_0Tests JavaManyToManyMapping2_0 manyToManyMapping = (JavaManyToManyMapping2_0) getJavaPersistentType().getAttributeNamed("parcels").getMapping(); JavaAttributeOverrideContainer mapKeyAttributeOverrideContainer = manyToManyMapping.getMapKeyAttributeOverrideContainer(); - assertEquals(4, mapKeyAttributeOverrideContainer.virtualOverridesSize()); + assertEquals(4, mapKeyAttributeOverrideContainer.getVirtualOverridesSize()); - 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 - AttributeOverrideAnnotation attributeOverride = (AttributeOverrideAnnotation) attributeResource.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + AttributeOverrideAnnotation attributeOverride = (AttributeOverrideAnnotation) resourceField.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE); attributeOverride.setName("FOO"); - attributeOverride = (AttributeOverrideAnnotation) attributeResource.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + attributeOverride = (AttributeOverrideAnnotation) resourceField.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE); attributeOverride.setName("key.BAR"); getJpaProject().synchronizeContextModel(); - assertEquals(4, mapKeyAttributeOverrideContainer.virtualOverridesSize()); + assertEquals(4, mapKeyAttributeOverrideContainer.getVirtualOverridesSize()); - attributeOverride = (AttributeOverrideAnnotation) attributeResource.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + attributeOverride = (AttributeOverrideAnnotation) resourceField.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE); attributeOverride.setName("key.city"); getJpaProject().synchronizeContextModel(); - assertEquals(3, mapKeyAttributeOverrideContainer.virtualOverridesSize()); + assertEquals(3, mapKeyAttributeOverrideContainer.getVirtualOverridesSize()); - attributeOverride = (AttributeOverrideAnnotation) attributeResource.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + attributeOverride = (AttributeOverrideAnnotation) resourceField.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE); attributeOverride.setName("key.state.foo"); - attributeOverride = (AttributeOverrideAnnotation) attributeResource.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + attributeOverride = (AttributeOverrideAnnotation) resourceField.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE); attributeOverride.setName("size"); getJpaProject().synchronizeContextModel(); - assertEquals(2, mapKeyAttributeOverrideContainer.virtualOverridesSize()); + assertEquals(2, mapKeyAttributeOverrideContainer.getVirtualOverridesSize()); } public void testMapKeyValueAttributeOverrideSetVirtual() throws Exception { @@ -1148,32 +1146,32 @@ public class GenericJavaManyToManyMapping2_0Tests JavaManyToManyMapping2_0 manyToManyMapping = (JavaManyToManyMapping2_0) getJavaPersistentType().getAttributeNamed("parcels").getMapping(); JavaAttributeOverrideContainer mapKeyAttributeOverrideContainer = manyToManyMapping.getMapKeyAttributeOverrideContainer(); - mapKeyAttributeOverrideContainer.virtualOverrides().next().convertToSpecified(); - mapKeyAttributeOverrideContainer.virtualOverrides().next().convertToSpecified(); + mapKeyAttributeOverrideContainer.getVirtualOverrides().iterator().next().convertToSpecified(); + mapKeyAttributeOverrideContainer.getVirtualOverrides().iterator().next().convertToSpecified(); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - Iterator attributeOverrides = attributeResource.annotations(AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverridesAnnotation.ANNOTATION_NAME); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + Iterator attributeOverrides = resourceField.getAnnotations(JPA.ATTRIBUTE_OVERRIDE).iterator(); assertEquals("key.city", ((AttributeOverrideAnnotation) attributeOverrides.next()).getName()); assertEquals("key.state.foo", ((AttributeOverrideAnnotation) attributeOverrides.next()).getName()); assertFalse(attributeOverrides.hasNext()); - mapKeyAttributeOverrideContainer.specifiedOverrides().next().convertToVirtual(); - attributeOverrides = attributeResource.annotations(AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverridesAnnotation.ANNOTATION_NAME); + mapKeyAttributeOverrideContainer.getSpecifiedOverrides().iterator().next().convertToVirtual(); + attributeOverrides = resourceField.getAnnotations(JPA.ATTRIBUTE_OVERRIDE).iterator(); assertEquals("key.state.foo", ((AttributeOverrideAnnotation) attributeOverrides.next()).getName()); assertFalse(attributeOverrides.hasNext()); - mapKeyAttributeOverrideContainer.specifiedOverrides().next().convertToVirtual(); - attributeOverrides = attributeResource.annotations(AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverridesAnnotation.ANNOTATION_NAME); + mapKeyAttributeOverrideContainer.getSpecifiedOverrides().iterator().next().convertToVirtual(); + attributeOverrides = resourceField.getAnnotations(JPA.ATTRIBUTE_OVERRIDE).iterator(); assertFalse(attributeOverrides.hasNext()); - Iterator virtualAttributeOverrides = mapKeyAttributeOverrideContainer.virtualOverrides(); + Iterator virtualAttributeOverrides = mapKeyAttributeOverrideContainer.getVirtualOverrides().iterator(); assertEquals("city", virtualAttributeOverrides.next().getName()); assertEquals("state.foo", virtualAttributeOverrides.next().getName()); assertEquals("state.address", virtualAttributeOverrides.next().getName()); assertEquals("zip", virtualAttributeOverrides.next().getName()); - assertEquals(4, mapKeyAttributeOverrideContainer.virtualOverridesSize()); + assertEquals(4, mapKeyAttributeOverrideContainer.getVirtualOverridesSize()); } @@ -1190,27 +1188,27 @@ public class GenericJavaManyToManyMapping2_0Tests JavaManyToManyMapping2_0 manyToManyMapping = (JavaManyToManyMapping2_0) getJavaPersistentType().getAttributeNamed("parcels").getMapping(); JavaAttributeOverrideContainer mapKeyAttributeOverrideContainer = manyToManyMapping.getMapKeyAttributeOverrideContainer(); - mapKeyAttributeOverrideContainer.virtualOverrides().next().convertToSpecified(); - mapKeyAttributeOverrideContainer.virtualOverrides().next().convertToSpecified(); + mapKeyAttributeOverrideContainer.getVirtualOverrides().iterator().next().convertToSpecified(); + mapKeyAttributeOverrideContainer.getVirtualOverrides().iterator().next().convertToSpecified(); - ListIterator specifiedOverrides = mapKeyAttributeOverrideContainer.specifiedOverrides(); + ListIterator specifiedOverrides = mapKeyAttributeOverrideContainer.getSpecifiedOverrides().iterator(); assertEquals("city", specifiedOverrides.next().getName()); assertEquals("state.foo", specifiedOverrides.next().getName()); assertFalse(specifiedOverrides.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(); - attributeResource.moveAnnotation(1, 0, AttributeOverridesAnnotation.ANNOTATION_NAME); + resourceField.moveAnnotation(1, 0, AttributeOverrideAnnotation.ANNOTATION_NAME); getJpaProject().synchronizeContextModel(); - Iterator attributeOverrides = attributeResource.annotations(AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverridesAnnotation.ANNOTATION_NAME); + Iterator attributeOverrides = resourceField.getAnnotations(JPA.ATTRIBUTE_OVERRIDE).iterator(); assertEquals("key.state.foo", ((AttributeOverrideAnnotation) attributeOverrides.next()).getName()); assertEquals("key.city", ((AttributeOverrideAnnotation) attributeOverrides.next()).getName()); assertFalse(attributeOverrides.hasNext()); - specifiedOverrides = mapKeyAttributeOverrideContainer.specifiedOverrides(); + specifiedOverrides = mapKeyAttributeOverrideContainer.getSpecifiedOverrides().iterator(); assertEquals("state.foo", specifiedOverrides.next().getName()); assertEquals("city", specifiedOverrides.next().getName()); assertFalse(specifiedOverrides.hasNext()); diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/java/GenericJavaManyToOneMapping2_0Tests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/java/GenericJavaManyToOneMapping2_0Tests.java index 5d2e2199f1..89fbbd6135 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/java/GenericJavaManyToOneMapping2_0Tests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/java/GenericJavaManyToOneMapping2_0Tests.java @@ -11,7 +11,9 @@ package org.eclipse.jpt.jpa.core.tests.internal.jpa2.context.java; import java.util.Iterator; import org.eclipse.jdt.core.ICompilationUnit; -import org.eclipse.jpt.common.utility.internal.CollectionTools; +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.JavaResourceAnnotatedElement.Kind; import org.eclipse.jpt.common.utility.internal.iterators.ArrayIterator; import org.eclipse.jpt.jpa.core.MappingKeys; import org.eclipse.jpt.jpa.core.context.PersistentAttribute; @@ -29,8 +31,6 @@ import org.eclipse.jpt.jpa.core.jpa2.context.java.JavaOneToOneMapping2_0; import org.eclipse.jpt.jpa.core.jpa2.resource.java.JPA2_0; import org.eclipse.jpt.jpa.core.jpa2.resource.java.MapsId2_0Annotation; 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.tests.internal.jpa2.context.Generic2_0ContextModelTestCase; @SuppressWarnings("nls") @@ -101,7 +101,7 @@ public class GenericJavaManyToOneMapping2_0Tests } }); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - for (OrmReadOnlyPersistentAttribute each : CollectionTools.iterable(ormPersistentType.attributes())) { + for (OrmReadOnlyPersistentAttribute each : ormPersistentType.getAttributes()) { each.convertToSpecified(); } } @@ -109,64 +109,58 @@ public class GenericJavaManyToOneMapping2_0Tests public void testUpdateId() throws Exception { createTestEntityWithIdDerivedIdentity(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentType resourceType = - getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute resourceAttribute = resourceType.persistableAttributes().next(); + JavaResourceField resourceField = ((JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE)).getFields().iterator().next(); JavaPersistentType contextType = getJavaPersistentType(); JavaPersistentAttribute contextAttribute = contextType.getAttributeNamed("manyToOne"); JavaManyToOneMapping2_0 contextMapping = (JavaManyToOneMapping2_0) contextAttribute.getMapping(); - assertNotNull(resourceAttribute.getAnnotation(JPA.ID)); + assertNotNull(resourceField.getAnnotation(JPA.ID)); assertTrue(contextMapping.getDerivedIdentity().getIdDerivedIdentityStrategy().getValue()); - resourceAttribute.removeAnnotation(JPA.ID); + resourceField.removeAnnotation(JPA.ID); getJpaProject().synchronizeContextModel(); - assertNull(resourceAttribute.getAnnotation(JPA.ID)); + assertNull(resourceField.getAnnotation(JPA.ID)); assertFalse(contextMapping.getDerivedIdentity().getIdDerivedIdentityStrategy().getValue()); - resourceAttribute.addAnnotation(JPA.ID); + resourceField.addAnnotation(JPA.ID); getJpaProject().synchronizeContextModel(); - assertNotNull(resourceAttribute.getAnnotation(JPA.ID)); + assertNotNull(resourceField.getAnnotation(JPA.ID)); assertTrue(contextMapping.getDerivedIdentity().getIdDerivedIdentityStrategy().getValue()); } public void testSetId() throws Exception { createTestEntityWithIdDerivedIdentity(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentType resourceType = - getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute resourceAttribute = resourceType.persistableAttributes().next(); + JavaResourceField resourceField = ((JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE)).getFields().iterator().next(); JavaPersistentType contextType = getJavaPersistentType(); JavaPersistentAttribute contextAttribute = contextType.getAttributeNamed("manyToOne"); JavaManyToOneMapping2_0 contextMapping = (JavaManyToOneMapping2_0) contextAttribute.getMapping(); - assertNotNull(resourceAttribute.getAnnotation(JPA.ID)); + assertNotNull(resourceField.getAnnotation(JPA.ID)); assertTrue(contextMapping.getDerivedIdentity().getIdDerivedIdentityStrategy().getValue()); contextMapping.getDerivedIdentity().getIdDerivedIdentityStrategy().setValue(false); - assertNull(resourceAttribute.getAnnotation(JPA.ID)); + assertNull(resourceField.getAnnotation(JPA.ID)); assertFalse(contextMapping.getDerivedIdentity().getIdDerivedIdentityStrategy().getValue()); contextMapping.getDerivedIdentity().getIdDerivedIdentityStrategy().setValue(true); - assertNotNull(resourceAttribute.getAnnotation(JPA.ID)); + assertNotNull(resourceField.getAnnotation(JPA.ID)); assertTrue(contextMapping.getDerivedIdentity().getIdDerivedIdentityStrategy().getValue()); } public void testUpdateMapsId() throws Exception { createTestEntityWithMapsIdDerivedIdentity(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentType resourceType = - getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute resourceAttribute = resourceType.persistableAttributes().next(); + JavaResourceField resourceField = ((JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE)).getFields().iterator().next(); JavaPersistentType contextType = getJavaPersistentType(); JavaPersistentAttribute contextAttribute = contextType.getAttributeNamed("manyToOne"); JavaManyToOneMapping2_0 contextMapping = (JavaManyToOneMapping2_0) contextAttribute.getMapping(); - assertNotNull(resourceAttribute.getAnnotation(JPA2_0.MAPS_ID)); + assertNotNull(resourceField.getAnnotation(JPA2_0.MAPS_ID)); assertNull(contextMapping.getDerivedIdentity().getMapsIdDerivedIdentityStrategy().getSpecifiedIdAttributeName()); MapsId2_0Annotation annotation = - (MapsId2_0Annotation) resourceAttribute.getAnnotation(JPA2_0.MAPS_ID); + (MapsId2_0Annotation) resourceField.getAnnotation(JPA2_0.MAPS_ID); annotation.setValue("foo"); getJpaProject().synchronizeContextModel(); assertEquals("foo", annotation.getValue()); @@ -177,28 +171,26 @@ public class GenericJavaManyToOneMapping2_0Tests assertEquals("bar", annotation.getValue()); assertEquals("bar", contextMapping.getDerivedIdentity().getMapsIdDerivedIdentityStrategy().getSpecifiedIdAttributeName()); - resourceAttribute.removeAnnotation(JPA2_0.MAPS_ID); + resourceField.removeAnnotation(JPA2_0.MAPS_ID); getJpaProject().synchronizeContextModel(); - assertNull(resourceAttribute.getAnnotation(JPA2_0.MAPS_ID)); + assertNull(resourceField.getAnnotation(JPA2_0.MAPS_ID)); assertNull(contextMapping.getDerivedIdentity().getMapsIdDerivedIdentityStrategy().getSpecifiedIdAttributeName()); } public void testSetMapsId() throws Exception { createTestEntityWithMapsIdDerivedIdentity(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentType resourceType = - getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute resourceAttribute = resourceType.persistableAttributes().next(); + JavaResourceField resourceField = ((JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE)).getFields().iterator().next(); JavaPersistentType contextType = getJavaPersistentType(); JavaPersistentAttribute contextAttribute = contextType.getAttributeNamed("manyToOne"); JavaManyToOneMapping2_0 contextMapping = (JavaManyToOneMapping2_0) contextAttribute.getMapping(); - assertNotNull(resourceAttribute.getAnnotation(JPA2_0.MAPS_ID)); + assertNotNull(resourceField.getAnnotation(JPA2_0.MAPS_ID)); assertNull(contextMapping.getDerivedIdentity().getMapsIdDerivedIdentityStrategy().getSpecifiedIdAttributeName()); contextMapping.getDerivedIdentity().getMapsIdDerivedIdentityStrategy().setSpecifiedIdAttributeName("foo"); MapsId2_0Annotation annotation = - (MapsId2_0Annotation) resourceAttribute.getAnnotation(JPA2_0.MAPS_ID); + (MapsId2_0Annotation) resourceField.getAnnotation(JPA2_0.MAPS_ID); assertNotNull(annotation); assertEquals("foo", annotation.getValue()); assertEquals("foo", contextMapping.getDerivedIdentity().getMapsIdDerivedIdentityStrategy().getSpecifiedIdAttributeName()); @@ -208,47 +200,45 @@ public class GenericJavaManyToOneMapping2_0Tests assertEquals("bar", contextMapping.getDerivedIdentity().getMapsIdDerivedIdentityStrategy().getSpecifiedIdAttributeName()); contextMapping.getDerivedIdentity().getMapsIdDerivedIdentityStrategy().setSpecifiedIdAttributeName(null); - assertNotNull(resourceAttribute.getAnnotation(JPA2_0.MAPS_ID)); + assertNotNull(resourceField.getAnnotation(JPA2_0.MAPS_ID)); assertNull(contextMapping.getDerivedIdentity().getMapsIdDerivedIdentityStrategy().getSpecifiedIdAttributeName()); } public void testUpdatePredominantDerivedIdentityStrategy() throws Exception { createTestEntityWithIdDerivedIdentity(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentType resourceType = - getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute resourceAttribute = resourceType.persistableAttributes().next(); + JavaResourceField resourceField = ((JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE)).getFields().iterator().next(); JavaPersistentType contextType = getJavaPersistentType(); JavaPersistentAttribute contextAttribute = contextType.getAttributeNamed("manyToOne"); JavaManyToOneMapping2_0 contextMapping = (JavaManyToOneMapping2_0) contextAttribute.getMapping(); JavaDerivedIdentity2_0 derivedIdentity = contextMapping.getDerivedIdentity(); - assertNull(resourceAttribute.getAnnotation(JPA2_0.MAPS_ID)); - assertNotNull(resourceAttribute.getAnnotation(JPA.ID)); + assertNull(resourceField.getAnnotation(JPA2_0.MAPS_ID)); + assertNotNull(resourceField.getAnnotation(JPA.ID)); assertFalse(derivedIdentity.usesMapsIdDerivedIdentityStrategy()); assertTrue(derivedIdentity.usesIdDerivedIdentityStrategy()); assertFalse(derivedIdentity.usesNullDerivedIdentityStrategy()); - resourceAttribute.addAnnotation(JPA2_0.MAPS_ID); + resourceField.addAnnotation(JPA2_0.MAPS_ID); getJpaProject().synchronizeContextModel(); - assertNotNull(resourceAttribute.getAnnotation(JPA2_0.MAPS_ID)); - assertNotNull(resourceAttribute.getAnnotation(JPA.ID)); + assertNotNull(resourceField.getAnnotation(JPA2_0.MAPS_ID)); + assertNotNull(resourceField.getAnnotation(JPA.ID)); assertTrue(derivedIdentity.usesMapsIdDerivedIdentityStrategy()); assertFalse(derivedIdentity.usesIdDerivedIdentityStrategy()); assertFalse(derivedIdentity.usesNullDerivedIdentityStrategy()); - resourceAttribute.removeAnnotation(JPA.ID); + resourceField.removeAnnotation(JPA.ID); getJpaProject().synchronizeContextModel(); - assertNotNull(resourceAttribute.getAnnotation(JPA2_0.MAPS_ID)); - assertNull(resourceAttribute.getAnnotation(JPA.ID)); + assertNotNull(resourceField.getAnnotation(JPA2_0.MAPS_ID)); + assertNull(resourceField.getAnnotation(JPA.ID)); assertTrue(derivedIdentity.usesMapsIdDerivedIdentityStrategy()); assertFalse(derivedIdentity.usesIdDerivedIdentityStrategy()); assertFalse(derivedIdentity.usesNullDerivedIdentityStrategy()); - resourceAttribute.removeAnnotation(JPA2_0.MAPS_ID); + resourceField.removeAnnotation(JPA2_0.MAPS_ID); getJpaProject().synchronizeContextModel(); - assertNull(resourceAttribute.getAnnotation(JPA2_0.MAPS_ID)); - assertNull(resourceAttribute.getAnnotation(JPA.ID)); + assertNull(resourceField.getAnnotation(JPA2_0.MAPS_ID)); + assertNull(resourceField.getAnnotation(JPA.ID)); assertFalse(derivedIdentity.usesMapsIdDerivedIdentityStrategy()); assertFalse(derivedIdentity.usesIdDerivedIdentityStrategy()); assertTrue(derivedIdentity.usesNullDerivedIdentityStrategy()); @@ -257,37 +247,35 @@ public class GenericJavaManyToOneMapping2_0Tests public void testSetPredominantDerivedIdentityStrategy() throws Exception { createTestEntityWithIdDerivedIdentity(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentType resourceType = - getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute resourceAttribute = resourceType.persistableAttributes().next(); + JavaResourceField resourceField = ((JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE)).getFields().iterator().next(); JavaPersistentType contextType = getJavaPersistentType(); JavaPersistentAttribute contextAttribute = contextType.getAttributeNamed("manyToOne"); JavaManyToOneMapping2_0 contextMapping = (JavaManyToOneMapping2_0) contextAttribute.getMapping(); JavaDerivedIdentity2_0 derivedIdentity = contextMapping.getDerivedIdentity(); - assertNull(resourceAttribute.getAnnotation(JPA2_0.MAPS_ID)); - assertNotNull(resourceAttribute.getAnnotation(JPA.ID)); + assertNull(resourceField.getAnnotation(JPA2_0.MAPS_ID)); + assertNotNull(resourceField.getAnnotation(JPA.ID)); assertFalse(derivedIdentity.usesMapsIdDerivedIdentityStrategy()); assertTrue(derivedIdentity.usesIdDerivedIdentityStrategy()); assertFalse(derivedIdentity.usesNullDerivedIdentityStrategy()); derivedIdentity.setMapsIdDerivedIdentityStrategy(); - assertNotNull(resourceAttribute.getAnnotation(JPA2_0.MAPS_ID)); - assertNull(resourceAttribute.getAnnotation(JPA.ID)); + assertNotNull(resourceField.getAnnotation(JPA2_0.MAPS_ID)); + assertNull(resourceField.getAnnotation(JPA.ID)); assertTrue(derivedIdentity.usesMapsIdDerivedIdentityStrategy()); assertFalse(derivedIdentity.usesIdDerivedIdentityStrategy()); assertFalse(derivedIdentity.usesNullDerivedIdentityStrategy()); derivedIdentity.setNullDerivedIdentityStrategy(); - assertNull(resourceAttribute.getAnnotation(JPA2_0.MAPS_ID)); - assertNull(resourceAttribute.getAnnotation(JPA.ID)); + assertNull(resourceField.getAnnotation(JPA2_0.MAPS_ID)); + assertNull(resourceField.getAnnotation(JPA.ID)); assertFalse(derivedIdentity.usesMapsIdDerivedIdentityStrategy()); assertFalse(derivedIdentity.usesIdDerivedIdentityStrategy()); assertTrue(derivedIdentity.usesNullDerivedIdentityStrategy()); derivedIdentity.setIdDerivedIdentityStrategy(); - assertNull(resourceAttribute.getAnnotation(JPA2_0.MAPS_ID)); - assertNotNull(resourceAttribute.getAnnotation(JPA.ID)); + assertNull(resourceField.getAnnotation(JPA2_0.MAPS_ID)); + assertNotNull(resourceField.getAnnotation(JPA.ID)); assertFalse(derivedIdentity.usesMapsIdDerivedIdentityStrategy()); assertTrue(derivedIdentity.usesIdDerivedIdentityStrategy()); assertFalse(derivedIdentity.usesNullDerivedIdentityStrategy()); @@ -296,48 +284,46 @@ public class GenericJavaManyToOneMapping2_0Tests public void testMorphMapping() throws Exception { createTestEntityWithIdDerivedIdentity(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentType resourceType = - getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute resourceAttribute = resourceType.persistableAttributes().next(); + JavaResourceField resourceField = ((JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE)).getFields().iterator().next(); JavaPersistentType contextType = getJavaPersistentType(); JavaPersistentAttribute contextAttribute = contextType.getAttributeNamed("manyToOne"); - assertNotNull(resourceAttribute.getAnnotation(JPA.ID)); + assertNotNull(resourceField.getAnnotation(JPA.ID)); assertTrue(((JavaManyToOneMapping2_0) contextAttribute.getMapping()). getDerivedIdentity().getIdDerivedIdentityStrategy().getValue()); - assertNull(resourceAttribute.getAnnotation(JPA2_0.MAPS_ID)); + assertNull(resourceField.getAnnotation(JPA2_0.MAPS_ID)); assertNull(((JavaManyToOneMapping2_0) contextAttribute.getMapping()). getDerivedIdentity().getMapsIdDerivedIdentityStrategy().getSpecifiedIdAttributeName()); contextAttribute.setMappingKey(MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY); - assertNotNull(resourceAttribute.getAnnotation(JPA.ID)); + assertNotNull(resourceField.getAnnotation(JPA.ID)); assertTrue(((JavaOneToOneMapping2_0) contextAttribute.getMapping()). getDerivedIdentity().getIdDerivedIdentityStrategy().getValue()); - assertNull(resourceAttribute.getAnnotation(JPA2_0.MAPS_ID)); + assertNull(resourceField.getAnnotation(JPA2_0.MAPS_ID)); assertNull(((JavaOneToOneMapping2_0) contextAttribute.getMapping()). getDerivedIdentity().getMapsIdDerivedIdentityStrategy().getSpecifiedIdAttributeName()); contextAttribute.setMappingKey(MappingKeys.MANY_TO_ONE_ATTRIBUTE_MAPPING_KEY); - assertNotNull(resourceAttribute.getAnnotation(JPA.ID)); + assertNotNull(resourceField.getAnnotation(JPA.ID)); assertTrue(((JavaManyToOneMapping2_0) contextAttribute.getMapping()). getDerivedIdentity().getIdDerivedIdentityStrategy().getValue()); - assertNull(resourceAttribute.getAnnotation(JPA2_0.MAPS_ID)); + assertNull(resourceField.getAnnotation(JPA2_0.MAPS_ID)); assertNull(((JavaManyToOneMapping2_0) contextAttribute.getMapping()). getDerivedIdentity().getMapsIdDerivedIdentityStrategy().getSpecifiedIdAttributeName()); contextAttribute.setMappingKey(MappingKeys.ID_ATTRIBUTE_MAPPING_KEY); - assertNotNull(resourceAttribute.getAnnotation(JPA.ID)); - assertNull(resourceAttribute.getAnnotation(JPA2_0.MAPS_ID)); + assertNotNull(resourceField.getAnnotation(JPA.ID)); + assertNull(resourceField.getAnnotation(JPA2_0.MAPS_ID)); assertTrue(contextAttribute.getMapping() instanceof JavaIdMapping); contextAttribute.setMappingKey(MappingKeys.MANY_TO_ONE_ATTRIBUTE_MAPPING_KEY); - assertNotNull(resourceAttribute.getAnnotation(JPA.ID)); - assertNull(resourceAttribute.getAnnotation(JPA2_0.MAPS_ID)); + assertNotNull(resourceField.getAnnotation(JPA.ID)); + assertNull(resourceField.getAnnotation(JPA2_0.MAPS_ID)); assertTrue(contextAttribute.getMapping() instanceof JavaManyToOneMapping2_0); contextAttribute.setMappingKey(MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY); - assertNull(resourceAttribute.getAnnotation(JPA.ID)); - assertNull(resourceAttribute.getAnnotation(JPA2_0.MAPS_ID)); + assertNull(resourceField.getAnnotation(JPA.ID)); + assertNull(resourceField.getAnnotation(JPA2_0.MAPS_ID)); assertTrue(contextAttribute.getMapping() instanceof JavaBasicMapping); } @@ -345,31 +331,31 @@ public class GenericJavaManyToOneMapping2_0Tests createTestEntityWithManyToOneMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute resourceAttribute = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME).persistableAttributes().next(); - PersistentAttribute contextAttribute = getJavaPersistentType().attributes().next(); + JavaResourceField resourceField = ((JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE)).getFields().iterator().next(); + PersistentAttribute contextAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToOneMapping2_0 mapping = (ManyToOneMapping2_0) contextAttribute.getMapping(); ManyToOneRelationship2_0 rel = (ManyToOneRelationship2_0) mapping.getRelationship(); - assertNull(resourceAttribute.getAnnotation(JPA.JOIN_COLUMN)); - assertNull(resourceAttribute.getAnnotation(JPA.JOIN_TABLE)); + assertNull(resourceField.getAnnotation(0, JPA.JOIN_COLUMN)); + assertNull(resourceField.getAnnotation(JPA.JOIN_TABLE)); assertTrue(rel.strategyIsJoinColumn()); assertFalse(rel.strategyIsJoinTable()); rel.setStrategyToJoinColumn(); - assertNull(resourceAttribute.getAnnotation(JPA.JOIN_COLUMN)); - assertNull(resourceAttribute.getAnnotation(JPA.JOIN_TABLE)); + assertNull(resourceField.getAnnotation(0, JPA.JOIN_COLUMN)); + assertNull(resourceField.getAnnotation(JPA.JOIN_TABLE)); assertTrue(rel.strategyIsJoinColumn()); assertFalse(rel.strategyIsJoinTable()); rel.setStrategyToJoinTable(); - assertNull(resourceAttribute.getAnnotation(JPA.JOIN_COLUMN)); - assertNotNull(resourceAttribute.getAnnotation(JPA.JOIN_TABLE)); + assertNull(resourceField.getAnnotation(0, JPA.JOIN_COLUMN)); + assertNotNull(resourceField.getAnnotation(JPA.JOIN_TABLE)); assertFalse(rel.strategyIsJoinColumn()); assertTrue(rel.strategyIsJoinTable()); rel.setStrategyToJoinColumn(); - assertNull(resourceAttribute.getAnnotation(JPA.JOIN_COLUMN)); - assertNull(resourceAttribute.getAnnotation(JPA.JOIN_TABLE)); + assertNull(resourceField.getAnnotation(0, JPA.JOIN_COLUMN)); + assertNull(resourceField.getAnnotation(JPA.JOIN_TABLE)); assertTrue(rel.strategyIsJoinColumn()); assertFalse(rel.strategyIsJoinTable()); } @@ -378,41 +364,41 @@ public class GenericJavaManyToOneMapping2_0Tests createTestEntityWithManyToOneMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute resourceAttribute = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME).persistableAttributes().next(); - PersistentAttribute contextAttribute = getJavaPersistentType().attributes().next(); + JavaResourceField resourceField = ((JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE)).getFields().iterator().next(); + PersistentAttribute contextAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToOneMapping2_0 mapping = (ManyToOneMapping2_0) contextAttribute.getMapping(); ManyToOneRelationship2_0 rel = (ManyToOneRelationship2_0) mapping.getRelationship(); - assertNull(resourceAttribute.getAnnotation(JPA.JOIN_COLUMN)); - assertNull(resourceAttribute.getAnnotation(JPA.JOIN_TABLE)); + assertNull(resourceField.getAnnotation(0, JPA.JOIN_COLUMN)); + assertNull(resourceField.getAnnotation(JPA.JOIN_TABLE)); assertTrue(rel.strategyIsJoinColumn()); assertFalse(rel.strategyIsJoinTable()); - resourceAttribute.addAnnotation(JPA.JOIN_COLUMN); + resourceField.addAnnotation(0, JPA.JOIN_COLUMN); getJpaProject().synchronizeContextModel(); - assertNotNull(resourceAttribute.getAnnotation(JPA.JOIN_COLUMN)); - assertNull(resourceAttribute.getAnnotation(JPA.JOIN_TABLE)); + assertNotNull(resourceField.getAnnotation(0, JPA.JOIN_COLUMN)); + assertNull(resourceField.getAnnotation(JPA.JOIN_TABLE)); assertTrue(rel.strategyIsJoinColumn()); assertFalse(rel.strategyIsJoinTable()); - resourceAttribute.addAnnotation(JPA.JOIN_TABLE); + resourceField.addAnnotation(JPA.JOIN_TABLE); getJpaProject().synchronizeContextModel(); - assertNotNull(resourceAttribute.getAnnotation(JPA.JOIN_COLUMN)); - assertNotNull(resourceAttribute.getAnnotation(JPA.JOIN_TABLE)); + assertNotNull(resourceField.getAnnotation(0, JPA.JOIN_COLUMN)); + assertNotNull(resourceField.getAnnotation(JPA.JOIN_TABLE)); assertFalse(rel.strategyIsJoinColumn()); assertTrue(rel.strategyIsJoinTable()); - resourceAttribute.removeAnnotation(JPA.JOIN_COLUMN); + resourceField.removeAnnotation(0, JPA.JOIN_COLUMN); getJpaProject().synchronizeContextModel(); - assertNull(resourceAttribute.getAnnotation(JPA.JOIN_COLUMN)); - assertNotNull(resourceAttribute.getAnnotation(JPA.JOIN_TABLE)); + assertNull(resourceField.getAnnotation(0, JPA.JOIN_COLUMN)); + assertNotNull(resourceField.getAnnotation(JPA.JOIN_TABLE)); assertFalse(rel.strategyIsJoinColumn()); assertTrue(rel.strategyIsJoinTable()); - resourceAttribute.removeAnnotation(JPA.JOIN_TABLE); + resourceField.removeAnnotation(JPA.JOIN_TABLE); getJpaProject().synchronizeContextModel(); - assertNull(resourceAttribute.getAnnotation(JPA.JOIN_COLUMN)); - assertNull(resourceAttribute.getAnnotation(JPA.JOIN_TABLE)); + assertNull(resourceField.getAnnotation(0, JPA.JOIN_COLUMN)); + assertNull(resourceField.getAnnotation(JPA.JOIN_TABLE)); assertTrue(rel.strategyIsJoinColumn()); assertFalse(rel.strategyIsJoinTable()); } diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/java/GenericJavaOneToManyMapping2_0Tests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/java/GenericJavaOneToManyMapping2_0Tests.java index 8a3a31be01..ffd10f4096 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/java/GenericJavaOneToManyMapping2_0Tests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/java/GenericJavaOneToManyMapping2_0Tests.java @@ -12,6 +12,10 @@ package org.eclipse.jpt.jpa.core.tests.internal.jpa2.context.java; import java.util.Iterator; import java.util.ListIterator; import org.eclipse.jdt.core.ICompilationUnit; +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.JavaResourceAnnotatedElement.Kind; +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.iterables.EmptyIterable; import org.eclipse.jpt.common.utility.internal.iterators.ArrayIterator; @@ -41,12 +45,8 @@ import org.eclipse.jpt.jpa.core.jpa2.resource.java.MapKeyClass2_0Annotation; import org.eclipse.jpt.jpa.core.jpa2.resource.java.MapKeyColumn2_0Annotation; import org.eclipse.jpt.jpa.core.jpa2.resource.java.OneToMany2_0Annotation; 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.JavaResourcePersistentAttribute; -import org.eclipse.jpt.jpa.core.resource.java.JavaResourcePersistentType; import org.eclipse.jpt.jpa.core.resource.java.MapKeyAnnotation; -import org.eclipse.jpt.jpa.core.resource.java.NestableAnnotation; import org.eclipse.jpt.jpa.core.resource.java.OneToManyAnnotation; import org.eclipse.jpt.jpa.core.tests.internal.jpa2.context.Generic2_0ContextModelTestCase; @@ -348,7 +348,7 @@ public class GenericJavaOneToManyMapping2_0Tests addXmlClassRef(PACKAGE_NAME + ".Address"); addXmlClassRef(PACKAGE_NAME + ".State"); - PersistentAttribute persistentAttribute = (getJavaPersistentType()).attributes().next(); + PersistentAttribute persistentAttribute = (getJavaPersistentType()).getAttributes().iterator().next(); OneToManyMapping oneToManyMapping = (OneToManyMapping) persistentAttribute.getMapping(); Iterator attributeNames = @@ -391,7 +391,7 @@ public class GenericJavaOneToManyMapping2_0Tests addXmlClassRef(PACKAGE_NAME + ".Address"); addXmlClassRef(PACKAGE_NAME + ".State"); - PersistentAttribute persistentAttribute = (getJavaPersistentType()).attributes().next(); + PersistentAttribute persistentAttribute = (getJavaPersistentType()).getAttributes().iterator().next(); OneToManyMapping oneToManyMapping = (OneToManyMapping) persistentAttribute.getMapping(); Iterator attributeNames = @@ -432,7 +432,7 @@ public class GenericJavaOneToManyMapping2_0Tests this.createTestEntityWithValidOneToManyMapping(); this.addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToManyMapping2_0 oneToManyMapping = (OneToManyMapping2_0) persistentAttribute.getMapping(); assertEquals(false, this.getOrphanRemovalOf(oneToManyMapping).isDefaultOrphanRemoval()); } @@ -441,7 +441,7 @@ public class GenericJavaOneToManyMapping2_0Tests this.createTestEntityWithValidOneToManyMapping(); this.addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToManyMapping2_0 oneToManyMapping = (OneToManyMapping2_0) persistentAttribute.getMapping(); assertEquals(false, this.getOrphanRemovalOf(oneToManyMapping).isDefaultOrphanRemoval()); } @@ -450,7 +450,7 @@ public class GenericJavaOneToManyMapping2_0Tests this.createTestEntityWithValidOneToManyMapping(); this.addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToManyMapping2_0 oneToManyMapping = (OneToManyMapping2_0) persistentAttribute.getMapping(); JavaOrphanRemovable2_0 mappingsOrphanRemoval = this.getOrphanRemovalOf(oneToManyMapping); @@ -464,15 +464,14 @@ public class GenericJavaOneToManyMapping2_0Tests this.createTestEntityWithValidOneToManyMapping(); this.addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToManyMapping2_0 oneToManyMapping = (OneToManyMapping2_0) persistentAttribute.getMapping(); JavaOrphanRemovable2_0 mappingsOrphanRemoval = this.getOrphanRemovalOf(oneToManyMapping); assertNull(mappingsOrphanRemoval.getSpecifiedOrphanRemoval()); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - OneToMany2_0Annotation oneToMany = (OneToMany2_0Annotation) attributeResource.getAnnotation(JPA.ONE_TO_MANY); + JavaResourceField resourceField = ((JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE)).getFields().iterator().next(); + OneToMany2_0Annotation oneToMany = (OneToMany2_0Annotation) resourceField.getAnnotation(JPA.ONE_TO_MANY); oneToMany.setOrphanRemoval(Boolean.FALSE); getJpaProject().synchronizeContextModel(); @@ -483,7 +482,7 @@ public class GenericJavaOneToManyMapping2_0Tests this.createTestEntityWithValidOneToManyMappingOrphanRemovalSpecified(); this.addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToManyMapping2_0 oneToManyMapping = (OneToManyMapping2_0) persistentAttribute.getMapping(); JavaOrphanRemovable2_0 mappingsOrphanRemoval = this.getOrphanRemovalOf(oneToManyMapping); @@ -494,37 +493,35 @@ public class GenericJavaOneToManyMapping2_0Tests this.createTestEntityWithValidOneToManyMapping(); this.addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToManyMapping2_0 oneToManyMapping = (OneToManyMapping2_0) persistentAttribute.getMapping(); JavaOrphanRemovable2_0 mappingsOrphanRemoval = this.getOrphanRemovalOf(oneToManyMapping); assertNull(mappingsOrphanRemoval.getSpecifiedOrphanRemoval()); mappingsOrphanRemoval.setSpecifiedOrphanRemoval(Boolean.TRUE); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - OneToMany2_0Annotation oneToMany = (OneToMany2_0Annotation) attributeResource.getAnnotation(JPA.ONE_TO_MANY); + JavaResourceField resourceField = ((JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE)).getFields().iterator().next(); + OneToMany2_0Annotation oneToMany = (OneToMany2_0Annotation) resourceField.getAnnotation(JPA.ONE_TO_MANY); assertEquals(Boolean.TRUE, oneToMany.getOrphanRemoval()); mappingsOrphanRemoval.setSpecifiedOrphanRemoval(null); - assertNotNull(attributeResource.getAnnotation(JPA.ONE_TO_MANY)); // .getElement); + assertNotNull(resourceField.getAnnotation(JPA.ONE_TO_MANY)); // .getElement); } public void testSetSpecifiedOrphanRemoval2() throws Exception { this.createTestEntityWithValidOneToManyMapping(); this.addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToManyMapping2_0 oneToManyMapping = (OneToManyMapping2_0) persistentAttribute.getMapping(); JavaOrphanRemovable2_0 mappingsOrphanRemoval = this.getOrphanRemovalOf(oneToManyMapping); assertNull(mappingsOrphanRemoval.getSpecifiedOrphanRemoval()); mappingsOrphanRemoval.setSpecifiedOrphanRemoval(Boolean.TRUE); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - OneToMany2_0Annotation oneToMany = (OneToMany2_0Annotation) attributeResource.getAnnotation(JPA.ONE_TO_MANY); + JavaResourceField resourceField = ((JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE)).getFields().iterator().next(); + OneToMany2_0Annotation oneToMany = (OneToMany2_0Annotation) resourceField.getAnnotation(JPA.ONE_TO_MANY); assertEquals(Boolean.TRUE, oneToMany.getOrphanRemoval()); @@ -532,7 +529,7 @@ public class GenericJavaOneToManyMapping2_0Tests assertEquals(Boolean.TRUE, mappingsOrphanRemoval.getSpecifiedOrphanRemoval()); mappingsOrphanRemoval.setSpecifiedOrphanRemoval(null); - assertNotNull(attributeResource.getAnnotation(JPA.ONE_TO_MANY)); + assertNotNull(resourceField.getAnnotation(JPA.ONE_TO_MANY)); oneToManyMapping = (OneToManyMapping2_0) persistentAttribute.getMapping(); } @@ -541,15 +538,14 @@ public class GenericJavaOneToManyMapping2_0Tests this.createTestEntityWithValidOneToManyMapping(); this.addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToManyMapping2_0 oneToManyMapping = (OneToManyMapping2_0) persistentAttribute.getMapping(); JavaOrphanRemovable2_0 mappingsOrphanRemoval = this.getOrphanRemovalOf(oneToManyMapping); assertNull(mappingsOrphanRemoval.getSpecifiedOrphanRemoval()); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - OneToMany2_0Annotation oneToMany = (OneToMany2_0Annotation) attributeResource.getAnnotation(JPA.ONE_TO_MANY); + JavaResourceField resourceField = ((JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE)).getFields().iterator().next(); + OneToMany2_0Annotation oneToMany = (OneToMany2_0Annotation) resourceField.getAnnotation(JPA.ONE_TO_MANY); oneToMany.setOrphanRemoval(Boolean.FALSE); getJpaProject().synchronizeContextModel(); @@ -561,7 +557,7 @@ public class GenericJavaOneToManyMapping2_0Tests assertSame(oneToManyMapping, persistentAttribute.getMapping()); oneToMany.setOrphanRemoval(Boolean.FALSE); - attributeResource.setPrimaryAnnotation(null, EmptyIterable.instance()); + resourceField.setPrimaryAnnotation(null, EmptyIterable.instance()); getJpaProject().synchronizeContextModel(); assertTrue(persistentAttribute.getMapping().isDefault()); @@ -571,19 +567,18 @@ public class GenericJavaOneToManyMapping2_0Tests createTestEntityWithValidOneToManyMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToManyMapping2_0 oneToManyMapping = (OneToManyMapping2_0) persistentAttribute.getMapping(); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); + JavaResourceField resourceField = ((JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE)).getFields().iterator().next(); assertNull(oneToManyMapping.getSpecifiedMapKey()); - assertNull(attributeResource.getAnnotation(MapKeyAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(MapKeyAnnotation.ANNOTATION_NAME)); //set mapKey in the resource model, verify context model does not change - attributeResource.addAnnotation(MapKeyAnnotation.ANNOTATION_NAME); + resourceField.addAnnotation(MapKeyAnnotation.ANNOTATION_NAME); assertNull(oneToManyMapping.getSpecifiedMapKey()); - MapKeyAnnotation mapKey = (MapKeyAnnotation) attributeResource.getAnnotation(MapKeyAnnotation.ANNOTATION_NAME); + MapKeyAnnotation mapKey = (MapKeyAnnotation) resourceField.getAnnotation(MapKeyAnnotation.ANNOTATION_NAME); assertNotNull(mapKey); //set mapKey name in the resource model, verify context model updated @@ -600,36 +595,35 @@ public class GenericJavaOneToManyMapping2_0Tests assertNull(mapKey.getName()); mapKey.setName("myMapKey"); - attributeResource.removeAnnotation(MapKeyAnnotation.ANNOTATION_NAME); + resourceField.removeAnnotation(MapKeyAnnotation.ANNOTATION_NAME); getJpaProject().synchronizeContextModel(); assertNull(oneToManyMapping.getSpecifiedMapKey()); - assertNull(attributeResource.getAnnotation(MapKeyAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(MapKeyAnnotation.ANNOTATION_NAME)); } public void testModifyMapKey() throws Exception { createTestEntityWithValidOneToManyMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToManyMapping2_0 oneToManyMapping = (OneToManyMapping2_0) persistentAttribute.getMapping(); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); + JavaResourceField resourceField = ((JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE)).getFields().iterator().next(); assertNull(oneToManyMapping.getSpecifiedMapKey()); - assertNull(attributeResource.getAnnotation(MapKeyAnnotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(MapKeyAnnotation.ANNOTATION_NAME)); //set mapKey in the context model, verify resource model updated oneToManyMapping.setSpecifiedMapKey("myMapKey"); - MapKeyAnnotation mapKeyAnnotation = (MapKeyAnnotation) attributeResource.getAnnotation(MapKeyAnnotation.ANNOTATION_NAME); + MapKeyAnnotation mapKeyAnnotation = (MapKeyAnnotation) resourceField.getAnnotation(MapKeyAnnotation.ANNOTATION_NAME); assertEquals("myMapKey", oneToManyMapping.getSpecifiedMapKey()); assertEquals("myMapKey", mapKeyAnnotation.getName()); //set mapKey to null in the context model oneToManyMapping.setSpecifiedMapKey(null); assertNull(oneToManyMapping.getSpecifiedMapKey()); - mapKeyAnnotation = (MapKeyAnnotation) attributeResource.getAnnotation(MapKeyAnnotation.ANNOTATION_NAME); + mapKeyAnnotation = (MapKeyAnnotation) resourceField.getAnnotation(MapKeyAnnotation.ANNOTATION_NAME); assertNull(mapKeyAnnotation.getName()); } @@ -641,7 +635,7 @@ public class GenericJavaOneToManyMapping2_0Tests addXmlClassRef(PACKAGE_NAME + ".Address"); addXmlClassRef(PACKAGE_NAME + ".State"); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToManyMapping2_0 oneToManyMapping2_0 = (OneToManyMapping2_0) persistentAttribute.getMapping(); Iterator mapKeyNames = @@ -664,7 +658,7 @@ public class GenericJavaOneToManyMapping2_0Tests addXmlClassRef(PACKAGE_NAME + ".Address"); addXmlClassRef(PACKAGE_NAME + ".State"); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToManyMapping2_0 oneToManyMapping2_0 = (OneToManyMapping2_0) persistentAttribute.getMapping(); Iterator mapKeyNames = oneToManyMapping2_0.candidateMapKeyNames(); @@ -690,19 +684,18 @@ public class GenericJavaOneToManyMapping2_0Tests createTestEntityWithValidOneToManyMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToManyMapping2_0 oneToManyMapping = (OneToManyMapping2_0) persistentAttribute.getMapping(); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); + JavaResourceField resourceField = ((JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE)).getFields().iterator().next(); assertNull(oneToManyMapping.getSpecifiedMapKeyClass()); - assertNull(attributeResource.getAnnotation(MapKeyClass2_0Annotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(MapKeyClass2_0Annotation.ANNOTATION_NAME)); //set mapKey in the resource model, verify context model does not change - attributeResource.addAnnotation(MapKeyClass2_0Annotation.ANNOTATION_NAME); + resourceField.addAnnotation(MapKeyClass2_0Annotation.ANNOTATION_NAME); assertNull(oneToManyMapping.getSpecifiedMapKeyClass()); - MapKeyClass2_0Annotation mapKeyClassAnnotation = (MapKeyClass2_0Annotation) attributeResource.getAnnotation(MapKeyClass2_0Annotation.ANNOTATION_NAME); + MapKeyClass2_0Annotation mapKeyClassAnnotation = (MapKeyClass2_0Annotation) resourceField.getAnnotation(MapKeyClass2_0Annotation.ANNOTATION_NAME); assertNotNull(mapKeyClassAnnotation); //set mapKey name in the resource model, verify context model updated @@ -718,35 +711,34 @@ public class GenericJavaOneToManyMapping2_0Tests assertNull(mapKeyClassAnnotation.getValue()); mapKeyClassAnnotation.setValue("myMapKeyClass"); - attributeResource.removeAnnotation(MapKeyClass2_0Annotation.ANNOTATION_NAME); + resourceField.removeAnnotation(MapKeyClass2_0Annotation.ANNOTATION_NAME); getJpaProject().synchronizeContextModel(); assertNull(oneToManyMapping.getSpecifiedMapKeyClass()); - assertNull(attributeResource.getAnnotation(MapKeyClass2_0Annotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(MapKeyClass2_0Annotation.ANNOTATION_NAME)); } public void testModifyMapKeyClass() throws Exception { createTestEntityWithValidOneToManyMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToManyMapping2_0 oneToManyMapping = (OneToManyMapping2_0) persistentAttribute.getMapping(); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); + JavaResourceField resourceField = ((JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE)).getFields().iterator().next(); assertNull(oneToManyMapping.getSpecifiedMapKeyClass()); - assertNull(attributeResource.getAnnotation(MapKeyClass2_0Annotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(MapKeyClass2_0Annotation.ANNOTATION_NAME)); //set mapKey in the context model, verify resource model updated oneToManyMapping.setSpecifiedMapKeyClass("String"); - MapKeyClass2_0Annotation mapKeyClass = (MapKeyClass2_0Annotation) attributeResource.getAnnotation(MapKeyClass2_0Annotation.ANNOTATION_NAME); + MapKeyClass2_0Annotation mapKeyClass = (MapKeyClass2_0Annotation) resourceField.getAnnotation(MapKeyClass2_0Annotation.ANNOTATION_NAME); assertEquals("String", oneToManyMapping.getSpecifiedMapKeyClass()); assertEquals("String", mapKeyClass.getValue()); //set mapKey to null in the context model oneToManyMapping.setSpecifiedMapKeyClass(null); assertNull(oneToManyMapping.getSpecifiedMapKeyClass()); - assertNull(attributeResource.getAnnotation(MapKeyClass2_0Annotation.ANNOTATION_NAME)); + assertNull(resourceField.getAnnotation(MapKeyClass2_0Annotation.ANNOTATION_NAME)); } public void testDefaultMapKeyClass() throws Exception { @@ -755,7 +747,7 @@ public class GenericJavaOneToManyMapping2_0Tests createTestEmbeddableState(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToManyMapping2_0 oneToManyMapping = (OneToManyMapping2_0) persistentAttribute.getMapping(); assertEquals("java.lang.Integer", oneToManyMapping.getDefaultMapKeyClass()); @@ -769,7 +761,7 @@ public class GenericJavaOneToManyMapping2_0Tests createTestEntityWithValidOneToManyMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToManyMapping2_0 oneToManyMapping = (OneToManyMapping2_0) persistentAttribute.getMapping(); assertNull(oneToManyMapping.getDefaultMapKeyClass()); @@ -779,7 +771,7 @@ public class GenericJavaOneToManyMapping2_0Tests createTestEntityWithValidGenericMapOneToManyMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToManyMapping2_0 oneToManyMapping = (OneToManyMapping2_0) persistentAttribute.getMapping(); assertEquals("java.lang.Integer", oneToManyMapping.getMapKeyClass()); @@ -896,7 +888,7 @@ public class GenericJavaOneToManyMapping2_0Tests addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); addXmlClassRef(PACKAGE_NAME + ".Address"); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToManyMapping2_0 oneToManyMapping = (OneToManyMapping2_0) persistentAttribute.getMapping(); oneToManyMapping.getRelationship().setStrategyToMappedBy(); oneToManyMapping.getRelationship().getMappedByStrategy().setMappedByAttribute("employee"); @@ -909,9 +901,8 @@ public class GenericJavaOneToManyMapping2_0Tests addressEntity.getTable().setSpecifiedName("MY_PRIMARY_TABLE"); assertEquals("MY_PRIMARY_TABLE", oneToManyMapping.getMapKeyColumn().getTable()); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - MapKeyColumn2_0Annotation column = (MapKeyColumn2_0Annotation) attributeResource.addAnnotation(JPA2_0.MAP_KEY_COLUMN); + JavaResourceField resourceField = ((JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE)).getFields().iterator().next(); + MapKeyColumn2_0Annotation column = (MapKeyColumn2_0Annotation) resourceField.addAnnotation(JPA2_0.MAP_KEY_COLUMN); column.setName("foo"); getJpaProject().synchronizeContextModel(); @@ -926,7 +917,7 @@ public class GenericJavaOneToManyMapping2_0Tests addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); addXmlClassRef(PACKAGE_NAME + ".Address"); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToManyMapping2_0 oneToManyMapping = (OneToManyMapping2_0) persistentAttribute.getMapping(); assertNull(oneToManyMapping.getMapKeyColumn().getSpecifiedName()); @@ -936,9 +927,8 @@ public class GenericJavaOneToManyMapping2_0Tests oneToManyMapping.getRelationship().getJoinTableStrategy().getJoinTable().setSpecifiedName("MY_PRIMARY_TABLE"); assertEquals("MY_PRIMARY_TABLE", oneToManyMapping.getMapKeyColumn().getTable()); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - MapKeyColumn2_0Annotation column = (MapKeyColumn2_0Annotation) attributeResource.addAnnotation(JPA2_0.MAP_KEY_COLUMN); + JavaResourceField resourceField = ((JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE)).getFields().iterator().next(); + MapKeyColumn2_0Annotation column = (MapKeyColumn2_0Annotation) resourceField.addAnnotation(JPA2_0.MAP_KEY_COLUMN); column.setName("foo"); getJpaProject().synchronizeContextModel(); @@ -953,11 +943,11 @@ public class GenericJavaOneToManyMapping2_0Tests addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); addXmlClassRef(PACKAGE_NAME + ".Address"); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToManyMapping2_0 oneToManyMapping = (OneToManyMapping2_0) persistentAttribute.getMapping(); ((JoinColumnRelationship) oneToManyMapping.getRelationship()).setStrategyToJoinColumn(); - JoinColumn joinColumn = ((JoinColumnRelationship) oneToManyMapping.getRelationship()).getJoinColumnStrategy().specifiedJoinColumns().next(); + JoinColumn joinColumn = ((JoinColumnRelationship) oneToManyMapping.getRelationship()).getJoinColumnStrategy().getSpecifiedJoinColumns().iterator().next(); assertEquals("addresses_id", joinColumn.getDefaultName()); assertEquals("Address", joinColumn.getDefaultTable());//target table name @@ -979,7 +969,7 @@ public class GenericJavaOneToManyMapping2_0Tests addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); addXmlClassRef(PACKAGE_NAME + ".Address"); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToManyMapping2_0 oneToManyMapping = (OneToManyMapping2_0) persistentAttribute.getMapping(); ((JoinColumnRelationship) oneToManyMapping.getRelationship()).setStrategyToJoinColumn(); @@ -991,9 +981,8 @@ public class GenericJavaOneToManyMapping2_0Tests addressEntity.getTable().setSpecifiedName("ADDRESS_PRIMARY_TABLE"); assertEquals("ADDRESS_PRIMARY_TABLE", oneToManyMapping.getMapKeyColumn().getTable()); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - MapKeyColumn2_0Annotation column = (MapKeyColumn2_0Annotation) attributeResource.addAnnotation(JPA2_0.MAP_KEY_COLUMN); + JavaResourceField resourceField = ((JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE)).getFields().iterator().next(); + MapKeyColumn2_0Annotation column = (MapKeyColumn2_0Annotation) resourceField.addAnnotation(JPA2_0.MAP_KEY_COLUMN); column.setName("foo"); getJpaProject().synchronizeContextModel(); @@ -1010,7 +999,7 @@ public class GenericJavaOneToManyMapping2_0Tests addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); addXmlClassRef(PACKAGE_NAME + ".Address"); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToManyMapping2_0 oneToManyMapping = (OneToManyMapping2_0) persistentAttribute.getMapping(); ((JoinColumnRelationship) oneToManyMapping.getRelationship()).setStrategyToJoinColumn(); ((Orderable2_0) oneToManyMapping.getOrderable()).setOrderColumnOrdering(true); @@ -1030,38 +1019,38 @@ public class GenericJavaOneToManyMapping2_0Tests createTestEntityWithValidOneToManyMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute resourceAttribute = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME).persistableAttributes().next(); - OneToManyAnnotation annotation = (OneToManyAnnotation) resourceAttribute.getAnnotation(JPA.ONE_TO_MANY); - PersistentAttribute contextAttribute = getJavaPersistentType().attributes().next(); + JavaResourceField resourceField = ((JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE)).getFields().iterator().next(); + OneToManyAnnotation annotation = (OneToManyAnnotation) resourceField.getAnnotation(JPA.ONE_TO_MANY); + PersistentAttribute contextAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToManyMapping2_0 mapping = (OneToManyMapping2_0) contextAttribute.getMapping(); OneToManyRelationship2_0 rel = (OneToManyRelationship2_0) mapping.getRelationship(); - assertNull(resourceAttribute.getAnnotation(JPA.JOIN_COLUMN)); - assertNull(resourceAttribute.getAnnotation(JPA.JOIN_TABLE)); + assertNull(resourceField.getAnnotation(0, JPA.JOIN_COLUMN)); + assertNull(resourceField.getAnnotation(JPA.JOIN_TABLE)); assertNull(annotation.getMappedBy()); assertFalse(rel.strategyIsJoinColumn()); assertTrue(rel.strategyIsJoinTable()); assertFalse(rel.strategyIsMappedBy()); rel.setStrategyToJoinColumn(); - assertNotNull(resourceAttribute.getAnnotation(JPA.JOIN_COLUMN)); - assertNull(resourceAttribute.getAnnotation(JPA.JOIN_TABLE)); + assertNotNull(resourceField.getAnnotation(0, JPA.JOIN_COLUMN)); + assertNull(resourceField.getAnnotation(JPA.JOIN_TABLE)); assertNull(annotation.getMappedBy()); assertTrue(rel.strategyIsJoinColumn()); assertFalse(rel.strategyIsJoinTable()); assertFalse(rel.strategyIsMappedBy()); rel.setStrategyToMappedBy(); - assertNull(resourceAttribute.getAnnotation(JPA.JOIN_COLUMN)); - assertNull(resourceAttribute.getAnnotation(JPA.JOIN_TABLE)); + assertNull(resourceField.getAnnotation(0, JPA.JOIN_COLUMN)); + assertNull(resourceField.getAnnotation(JPA.JOIN_TABLE)); assertNotNull(annotation.getMappedBy()); assertFalse(rel.strategyIsJoinColumn()); assertFalse(rel.strategyIsJoinTable()); assertTrue(rel.strategyIsMappedBy()); rel.setStrategyToJoinTable(); - assertNull(resourceAttribute.getAnnotation(JPA.JOIN_COLUMN)); - assertNull(resourceAttribute.getAnnotation(JPA.JOIN_TABLE)); + assertNull(resourceField.getAnnotation(0, JPA.JOIN_COLUMN)); + assertNull(resourceField.getAnnotation(JPA.JOIN_TABLE)); assertNull(annotation.getMappedBy()); assertFalse(rel.strategyIsJoinColumn()); assertTrue(rel.strategyIsJoinTable()); @@ -1072,14 +1061,14 @@ public class GenericJavaOneToManyMapping2_0Tests createTestEntityWithValidOneToManyMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute resourceAttribute = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME).persistableAttributes().next(); - OneToManyAnnotation annotation = (OneToManyAnnotation) resourceAttribute.getAnnotation(JPA.ONE_TO_MANY); - PersistentAttribute contextAttribute = getJavaPersistentType().attributes().next(); + JavaResourceField resourceField = ((JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE)).getFields().iterator().next(); + OneToManyAnnotation annotation = (OneToManyAnnotation) resourceField.getAnnotation(JPA.ONE_TO_MANY); + PersistentAttribute contextAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToManyMapping2_0 mapping = (OneToManyMapping2_0) contextAttribute.getMapping(); OneToManyRelationship2_0 rel = (OneToManyRelationship2_0) mapping.getRelationship(); - assertNull(resourceAttribute.getAnnotation(JPA.JOIN_COLUMN)); - assertNull(resourceAttribute.getAnnotation(JPA.JOIN_TABLE)); + assertNull(resourceField.getAnnotation(0, JPA.JOIN_COLUMN)); + assertNull(resourceField.getAnnotation(JPA.JOIN_TABLE)); assertNull(annotation.getMappedBy()); assertFalse(rel.strategyIsJoinColumn()); assertTrue(rel.strategyIsJoinTable()); @@ -1087,26 +1076,26 @@ public class GenericJavaOneToManyMapping2_0Tests annotation.setMappedBy("foo"); getJpaProject().synchronizeContextModel(); - assertNull(resourceAttribute.getAnnotation(JPA.JOIN_COLUMN)); - assertNull(resourceAttribute.getAnnotation(JPA.JOIN_TABLE)); + assertNull(resourceField.getAnnotation(0, JPA.JOIN_COLUMN)); + assertNull(resourceField.getAnnotation(JPA.JOIN_TABLE)); assertNotNull(annotation.getMappedBy()); assertFalse(rel.strategyIsJoinColumn()); assertFalse(rel.strategyIsJoinTable()); assertTrue(rel.strategyIsMappedBy()); - resourceAttribute.addAnnotation(JPA.JOIN_TABLE); + resourceField.addAnnotation(JPA.JOIN_TABLE); getJpaProject().synchronizeContextModel(); - assertNull(resourceAttribute.getAnnotation(JPA.JOIN_COLUMN)); - assertNotNull(resourceAttribute.getAnnotation(JPA.JOIN_TABLE)); + assertNull(resourceField.getAnnotation(0, JPA.JOIN_COLUMN)); + assertNotNull(resourceField.getAnnotation(JPA.JOIN_TABLE)); assertNotNull(annotation.getMappedBy()); assertFalse(rel.strategyIsJoinColumn()); assertFalse(rel.strategyIsJoinTable()); 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.JOIN_TABLE)); + assertNotNull(resourceField.getAnnotation(0, JPA.JOIN_COLUMN)); + assertNotNull(resourceField.getAnnotation(JPA.JOIN_TABLE)); assertNotNull(annotation.getMappedBy()); assertFalse(rel.strategyIsJoinColumn()); assertFalse(rel.strategyIsJoinTable()); @@ -1114,26 +1103,26 @@ public class GenericJavaOneToManyMapping2_0Tests annotation.setMappedBy(null); getJpaProject().synchronizeContextModel(); - assertNotNull(resourceAttribute.getAnnotation(JPA.JOIN_COLUMN)); - assertNotNull(resourceAttribute.getAnnotation(JPA.JOIN_TABLE)); + assertNotNull(resourceField.getAnnotation(0, JPA.JOIN_COLUMN)); + assertNotNull(resourceField.getAnnotation(JPA.JOIN_TABLE)); assertNull(annotation.getMappedBy()); assertTrue(rel.strategyIsJoinColumn()); assertFalse(rel.strategyIsJoinTable()); assertFalse(rel.strategyIsMappedBy()); - resourceAttribute.removeAnnotation(JPA.JOIN_TABLE); + resourceField.removeAnnotation(JPA.JOIN_TABLE); getJpaProject().synchronizeContextModel(); - assertNotNull(resourceAttribute.getAnnotation(JPA.JOIN_COLUMN)); - assertNull(resourceAttribute.getAnnotation(JPA.JOIN_TABLE)); + assertNotNull(resourceField.getAnnotation(0, JPA.JOIN_COLUMN)); + assertNull(resourceField.getAnnotation(JPA.JOIN_TABLE)); assertNull(annotation.getMappedBy()); assertTrue(rel.strategyIsJoinColumn()); assertFalse(rel.strategyIsJoinTable()); 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.JOIN_TABLE)); + assertNull(resourceField.getAnnotation(0, JPA.JOIN_COLUMN)); + assertNull(resourceField.getAnnotation(JPA.JOIN_TABLE)); assertNull(annotation.getMappedBy()); assertFalse(rel.strategyIsJoinColumn()); assertTrue(rel.strategyIsJoinTable()); @@ -1154,42 +1143,41 @@ public class GenericJavaOneToManyMapping2_0Tests JavaOneToManyMapping2_0 oneToManyMapping = (JavaOneToManyMapping2_0) getJavaPersistentType().getAttributeNamed("parcels").getMapping(); JavaAttributeOverrideContainer mapKeyAttributeOverrideContainer = oneToManyMapping.getMapKeyAttributeOverrideContainer(); - ListIterator specifiedMapKeyAttributeOverrides = mapKeyAttributeOverrideContainer.specifiedOverrides(); + ListIterator specifiedMapKeyAttributeOverrides = mapKeyAttributeOverrideContainer.getSpecifiedOverrides().iterator(); assertFalse(specifiedMapKeyAttributeOverrides.hasNext()); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); + JavaResourceField resourceField = ((JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE)).getFields().iterator().next(); //add an annotation to the resource model and verify the context model is updated - AttributeOverrideAnnotation attributeOverride = (AttributeOverrideAnnotation) attributeResource.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + AttributeOverrideAnnotation attributeOverride = (AttributeOverrideAnnotation) resourceField.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE); attributeOverride.setName("FOO"); getJpaProject().synchronizeContextModel(); - specifiedMapKeyAttributeOverrides = mapKeyAttributeOverrideContainer.specifiedOverrides(); + specifiedMapKeyAttributeOverrides = mapKeyAttributeOverrideContainer.getSpecifiedOverrides().iterator(); assertEquals("FOO", specifiedMapKeyAttributeOverrides.next().getName()); assertFalse(specifiedMapKeyAttributeOverrides.hasNext()); - attributeOverride = (AttributeOverrideAnnotation) attributeResource.addAnnotation(1, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + attributeOverride = (AttributeOverrideAnnotation) resourceField.addAnnotation(1, JPA.ATTRIBUTE_OVERRIDE); attributeOverride.setName("value.BAR"); getJpaProject().synchronizeContextModel(); - specifiedMapKeyAttributeOverrides = mapKeyAttributeOverrideContainer.specifiedOverrides(); + specifiedMapKeyAttributeOverrides = mapKeyAttributeOverrideContainer.getSpecifiedOverrides().iterator(); assertEquals("FOO", specifiedMapKeyAttributeOverrides.next().getName()); assertEquals("value.BAR", specifiedMapKeyAttributeOverrides.next().getName()); assertFalse(specifiedMapKeyAttributeOverrides.hasNext()); - attributeOverride = (AttributeOverrideAnnotation) attributeResource.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + attributeOverride = (AttributeOverrideAnnotation) resourceField.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE); attributeOverride.setName("key.BAZ"); getJpaProject().synchronizeContextModel(); - specifiedMapKeyAttributeOverrides = mapKeyAttributeOverrideContainer.specifiedOverrides(); + specifiedMapKeyAttributeOverrides = mapKeyAttributeOverrideContainer.getSpecifiedOverrides().iterator(); assertEquals("BAZ", specifiedMapKeyAttributeOverrides.next().getName()); assertEquals("FOO", specifiedMapKeyAttributeOverrides.next().getName()); assertEquals("value.BAR", specifiedMapKeyAttributeOverrides.next().getName()); assertFalse(specifiedMapKeyAttributeOverrides.hasNext()); - attributeOverride = (AttributeOverrideAnnotation) attributeResource.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + attributeOverride = (AttributeOverrideAnnotation) resourceField.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE); attributeOverride.setName("key.BLAH"); getJpaProject().synchronizeContextModel(); - specifiedMapKeyAttributeOverrides = mapKeyAttributeOverrideContainer.specifiedOverrides(); + specifiedMapKeyAttributeOverrides = mapKeyAttributeOverrideContainer.getSpecifiedOverrides().iterator(); assertEquals("BLAH", specifiedMapKeyAttributeOverrides.next().getName()); assertEquals("BAZ", specifiedMapKeyAttributeOverrides.next().getName()); assertEquals("FOO", specifiedMapKeyAttributeOverrides.next().getName()); @@ -1197,40 +1185,40 @@ public class GenericJavaOneToManyMapping2_0Tests assertFalse(specifiedMapKeyAttributeOverrides.hasNext()); //move an annotation to the resource model and verify the context model is updated - attributeResource.moveAnnotation(1, 0, JPA.ATTRIBUTE_OVERRIDES); + resourceField.moveAnnotation(1, 0, JPA.ATTRIBUTE_OVERRIDE); getJpaProject().synchronizeContextModel(); - specifiedMapKeyAttributeOverrides = mapKeyAttributeOverrideContainer.specifiedOverrides(); + specifiedMapKeyAttributeOverrides = mapKeyAttributeOverrideContainer.getSpecifiedOverrides().iterator(); assertEquals("BAZ", specifiedMapKeyAttributeOverrides.next().getName()); assertEquals("BLAH", specifiedMapKeyAttributeOverrides.next().getName()); assertEquals("FOO", specifiedMapKeyAttributeOverrides.next().getName()); assertEquals("value.BAR", specifiedMapKeyAttributeOverrides.next().getName()); assertFalse(specifiedMapKeyAttributeOverrides.hasNext()); - attributeResource.removeAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + resourceField.removeAnnotation(0, JPA.ATTRIBUTE_OVERRIDE); getJpaProject().synchronizeContextModel(); - specifiedMapKeyAttributeOverrides = mapKeyAttributeOverrideContainer.specifiedOverrides(); + specifiedMapKeyAttributeOverrides = mapKeyAttributeOverrideContainer.getSpecifiedOverrides().iterator(); assertEquals("BLAH", specifiedMapKeyAttributeOverrides.next().getName()); assertEquals("FOO", specifiedMapKeyAttributeOverrides.next().getName()); assertEquals("value.BAR", specifiedMapKeyAttributeOverrides.next().getName()); assertFalse(specifiedMapKeyAttributeOverrides.hasNext()); - attributeResource.removeAnnotation(1, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + resourceField.removeAnnotation(1, JPA.ATTRIBUTE_OVERRIDE); getJpaProject().synchronizeContextModel(); - specifiedMapKeyAttributeOverrides = mapKeyAttributeOverrideContainer.specifiedOverrides(); + specifiedMapKeyAttributeOverrides = mapKeyAttributeOverrideContainer.getSpecifiedOverrides().iterator(); assertEquals("BLAH", specifiedMapKeyAttributeOverrides.next().getName()); assertEquals("value.BAR", specifiedMapKeyAttributeOverrides.next().getName()); assertFalse(specifiedMapKeyAttributeOverrides.hasNext()); - attributeResource.removeAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + resourceField.removeAnnotation(0, JPA.ATTRIBUTE_OVERRIDE); getJpaProject().synchronizeContextModel(); - specifiedMapKeyAttributeOverrides = mapKeyAttributeOverrideContainer.specifiedOverrides(); + specifiedMapKeyAttributeOverrides = mapKeyAttributeOverrideContainer.getSpecifiedOverrides().iterator(); assertEquals("value.BAR", specifiedMapKeyAttributeOverrides.next().getName()); assertFalse(specifiedMapKeyAttributeOverrides.hasNext()); - attributeResource.removeAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + resourceField.removeAnnotation(0, JPA.ATTRIBUTE_OVERRIDE); getJpaProject().synchronizeContextModel(); - specifiedMapKeyAttributeOverrides = mapKeyAttributeOverrideContainer.specifiedOverrides(); + specifiedMapKeyAttributeOverrides = mapKeyAttributeOverrideContainer.getSpecifiedOverrides().iterator(); assertFalse(specifiedMapKeyAttributeOverrides.hasNext()); } @@ -1248,14 +1236,12 @@ public class GenericJavaOneToManyMapping2_0Tests JavaOneToManyMapping2_0 oneToManyMapping = (JavaOneToManyMapping2_0) getJavaPersistentType().getAttributeNamed("parcels").getMapping(); JavaAttributeOverrideContainer mapKeyAttributeOverrideContainer = oneToManyMapping.getMapKeyAttributeOverrideContainer(); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - assertEquals("parcels", attributeResource.getName()); - assertNull(attributeResource.getAnnotation(AttributeOverrideAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(AttributeOverridesAnnotation.ANNOTATION_NAME)); + JavaResourceField resourceField = ((JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE)).getFields().iterator().next(); + assertEquals("parcels", resourceField.getName()); + assertNull(resourceField.getAnnotation(0, AttributeOverrideAnnotation.ANNOTATION_NAME)); - assertEquals(4, mapKeyAttributeOverrideContainer.virtualOverridesSize()); - ReadOnlyAttributeOverride defaultAttributeOverride = mapKeyAttributeOverrideContainer.virtualOverrides().next(); + assertEquals(4, mapKeyAttributeOverrideContainer.getVirtualOverridesSize()); + ReadOnlyAttributeOverride defaultAttributeOverride = mapKeyAttributeOverrideContainer.getVirtualOverrides().iterator().next(); assertEquals("city", defaultAttributeOverride.getName()); assertEquals("city", defaultAttributeOverride.getColumn().getName()); assertEquals(TYPE_NAME +"_PropertyInfo", defaultAttributeOverride.getColumn().getTable()); @@ -1269,7 +1255,7 @@ public class GenericJavaOneToManyMapping2_0Tests assertEquals(0, defaultAttributeOverride.getColumn().getScale()); - ListIterator classRefs = getPersistenceUnit().specifiedClassRefs(); + ListIterator classRefs = getPersistenceUnit().getSpecifiedClassRefs().iterator(); classRefs.next(); Embeddable addressEmbeddable = (Embeddable) classRefs.next().getJavaPersistentType().getMapping(); @@ -1285,12 +1271,11 @@ public class GenericJavaOneToManyMapping2_0Tests cityMapping.getColumn().setSpecifiedPrecision(Integer.valueOf(6)); cityMapping.getColumn().setSpecifiedScale(Integer.valueOf(7)); - assertEquals("parcels", attributeResource.getName()); - assertNull(attributeResource.getAnnotation(AttributeOverrideAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(AttributeOverridesAnnotation.ANNOTATION_NAME)); + assertEquals("parcels", resourceField.getName()); + assertNull(resourceField.getAnnotation(0, AttributeOverrideAnnotation.ANNOTATION_NAME)); - assertEquals(4, mapKeyAttributeOverrideContainer.virtualOverridesSize()); - defaultAttributeOverride = mapKeyAttributeOverrideContainer.virtualOverrides().next(); + assertEquals(4, mapKeyAttributeOverrideContainer.getVirtualOverridesSize()); + defaultAttributeOverride = mapKeyAttributeOverrideContainer.getVirtualOverrides().iterator().next(); assertEquals("city", defaultAttributeOverride.getName()); assertEquals("FOO", defaultAttributeOverride.getColumn().getName()); assertEquals("BAR", defaultAttributeOverride.getColumn().getTable()); @@ -1313,7 +1298,7 @@ public class GenericJavaOneToManyMapping2_0Tests cityMapping.getColumn().setSpecifiedLength(null); cityMapping.getColumn().setSpecifiedPrecision(null); cityMapping.getColumn().setSpecifiedScale(null); - defaultAttributeOverride = mapKeyAttributeOverrideContainer.virtualOverrides().next(); + defaultAttributeOverride = mapKeyAttributeOverrideContainer.getVirtualOverrides().iterator().next(); assertEquals("city", defaultAttributeOverride.getName()); assertEquals("city", defaultAttributeOverride.getColumn().getName()); assertEquals(TYPE_NAME +"_PropertyInfo", defaultAttributeOverride.getColumn().getTable()); @@ -1326,10 +1311,10 @@ public class GenericJavaOneToManyMapping2_0Tests assertEquals(0, defaultAttributeOverride.getColumn().getPrecision()); assertEquals(0, defaultAttributeOverride.getColumn().getScale()); - AttributeOverrideAnnotation annotation = (AttributeOverrideAnnotation) attributeResource.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + AttributeOverrideAnnotation annotation = (AttributeOverrideAnnotation) resourceField.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE); annotation.setName("key.city"); getJpaProject().synchronizeContextModel(); - assertEquals(3, mapKeyAttributeOverrideContainer.virtualOverridesSize()); + assertEquals(3, mapKeyAttributeOverrideContainer.getVirtualOverridesSize()); } public void testMapKeyValueSpecifiedAttributeOverridesSize() throws Exception { @@ -1345,21 +1330,20 @@ public class GenericJavaOneToManyMapping2_0Tests JavaOneToManyMapping2_0 oneToManyMapping = (JavaOneToManyMapping2_0) getJavaPersistentType().getAttributeNamed("parcels").getMapping(); JavaAttributeOverrideContainer mapKeyAttributeOverrideContainer = oneToManyMapping.getMapKeyAttributeOverrideContainer(); - assertEquals(0, mapKeyAttributeOverrideContainer.specifiedOverridesSize()); + assertEquals(0, mapKeyAttributeOverrideContainer.getSpecifiedOverridesSize()); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); + JavaResourceField resourceField = ((JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE)).getFields().iterator().next(); //add an annotation to the resource model and verify the context model is updated - AttributeOverrideAnnotation attributeOverride = (AttributeOverrideAnnotation) attributeResource.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + AttributeOverrideAnnotation attributeOverride = (AttributeOverrideAnnotation) resourceField.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE); attributeOverride.setName("FOO"); - attributeOverride = (AttributeOverrideAnnotation) attributeResource.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + attributeOverride = (AttributeOverrideAnnotation) resourceField.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE); attributeOverride.setName("key.BAR"); - attributeOverride = (AttributeOverrideAnnotation) attributeResource.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + attributeOverride = (AttributeOverrideAnnotation) resourceField.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE); attributeOverride.setName("value.FOO2"); getJpaProject().synchronizeContextModel(); - assertEquals(3, mapKeyAttributeOverrideContainer.specifiedOverridesSize()); + assertEquals(3, mapKeyAttributeOverrideContainer.getSpecifiedOverridesSize()); } public void testMapKeyValueAttributeOverridesSize() throws Exception { @@ -1375,31 +1359,30 @@ public class GenericJavaOneToManyMapping2_0Tests JavaOneToManyMapping2_0 oneToManyMapping = (JavaOneToManyMapping2_0) getJavaPersistentType().getAttributeNamed("parcels").getMapping(); JavaAttributeOverrideContainer mapKeyAttributeOverrideContainer = oneToManyMapping.getMapKeyAttributeOverrideContainer(); - assertEquals(4, mapKeyAttributeOverrideContainer.overridesSize()); + assertEquals(4, mapKeyAttributeOverrideContainer.getOverridesSize()); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); + JavaResourceField resourceField = ((JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE)).getFields().iterator().next(); //add an annotation to the resource model and verify the context model is updated - AttributeOverrideAnnotation attributeOverride = (AttributeOverrideAnnotation) attributeResource.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + AttributeOverrideAnnotation attributeOverride = (AttributeOverrideAnnotation) resourceField.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE); attributeOverride.setName("FOO"); - attributeOverride = (AttributeOverrideAnnotation) attributeResource.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + attributeOverride = (AttributeOverrideAnnotation) resourceField.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE); attributeOverride.setName("key.BAR"); - attributeOverride = (AttributeOverrideAnnotation) attributeResource.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + attributeOverride = (AttributeOverrideAnnotation) resourceField.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE); attributeOverride.setName("value.FOO2"); getJpaProject().synchronizeContextModel(); - assertEquals(7, mapKeyAttributeOverrideContainer.overridesSize()); + assertEquals(7, mapKeyAttributeOverrideContainer.getOverridesSize()); - attributeOverride = (AttributeOverrideAnnotation) attributeResource.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + attributeOverride = (AttributeOverrideAnnotation) resourceField.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE); attributeOverride.setName("city"); getJpaProject().synchronizeContextModel(); - assertEquals(7, mapKeyAttributeOverrideContainer.overridesSize()); + assertEquals(7, mapKeyAttributeOverrideContainer.getOverridesSize()); - attributeOverride = (AttributeOverrideAnnotation) attributeResource.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + attributeOverride = (AttributeOverrideAnnotation) resourceField.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE); attributeOverride.setName("key.state.foo"); getJpaProject().synchronizeContextModel(); - assertEquals(7, mapKeyAttributeOverrideContainer.overridesSize()); + assertEquals(7, mapKeyAttributeOverrideContainer.getOverridesSize()); } public void testMapKeyValueVirtualAttributeOverridesSize() throws Exception { @@ -1415,32 +1398,31 @@ public class GenericJavaOneToManyMapping2_0Tests JavaOneToManyMapping2_0 oneToManyMapping = (JavaOneToManyMapping2_0) getJavaPersistentType().getAttributeNamed("parcels").getMapping(); JavaAttributeOverrideContainer mapKeyAttributeOverrideContainer = oneToManyMapping.getMapKeyAttributeOverrideContainer(); - assertEquals(4, mapKeyAttributeOverrideContainer.virtualOverridesSize()); + assertEquals(4, mapKeyAttributeOverrideContainer.getVirtualOverridesSize()); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); + JavaResourceField resourceField = ((JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE)).getFields().iterator().next(); //add an annotation to the resource model and verify the context model is updated - AttributeOverrideAnnotation attributeOverride = (AttributeOverrideAnnotation) attributeResource.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + AttributeOverrideAnnotation attributeOverride = (AttributeOverrideAnnotation) resourceField.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE); attributeOverride.setName("FOO"); - attributeOverride = (AttributeOverrideAnnotation) attributeResource.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + attributeOverride = (AttributeOverrideAnnotation) resourceField.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE); attributeOverride.setName("key.BAR"); getJpaProject().synchronizeContextModel(); - assertEquals(4, mapKeyAttributeOverrideContainer.virtualOverridesSize()); + assertEquals(4, mapKeyAttributeOverrideContainer.getVirtualOverridesSize()); - attributeOverride = (AttributeOverrideAnnotation) attributeResource.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + attributeOverride = (AttributeOverrideAnnotation) resourceField.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE); attributeOverride.setName("key.city"); getJpaProject().synchronizeContextModel(); - assertEquals(3, mapKeyAttributeOverrideContainer.virtualOverridesSize()); + assertEquals(3, mapKeyAttributeOverrideContainer.getVirtualOverridesSize()); - attributeOverride = (AttributeOverrideAnnotation) attributeResource.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + attributeOverride = (AttributeOverrideAnnotation) resourceField.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE); attributeOverride.setName("key.state.foo"); - attributeOverride = (AttributeOverrideAnnotation) attributeResource.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + attributeOverride = (AttributeOverrideAnnotation) resourceField.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE); attributeOverride.setName("size"); getJpaProject().synchronizeContextModel(); - assertEquals(2, mapKeyAttributeOverrideContainer.virtualOverridesSize()); + assertEquals(2, mapKeyAttributeOverrideContainer.getVirtualOverridesSize()); } public void testMapKeyValueAttributeOverrideSetVirtual() throws Exception { @@ -1456,32 +1438,31 @@ public class GenericJavaOneToManyMapping2_0Tests JavaOneToManyMapping2_0 oneToManyMapping = (JavaOneToManyMapping2_0) getJavaPersistentType().getAttributeNamed("parcels").getMapping(); JavaAttributeOverrideContainer mapKeyAttributeOverrideContainer = oneToManyMapping.getMapKeyAttributeOverrideContainer(); - mapKeyAttributeOverrideContainer.virtualOverrides().next().convertToSpecified(); - mapKeyAttributeOverrideContainer.virtualOverrides().next().convertToSpecified(); + mapKeyAttributeOverrideContainer.getVirtualOverrides().iterator().next().convertToSpecified(); + mapKeyAttributeOverrideContainer.getVirtualOverrides().iterator().next().convertToSpecified(); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - Iterator attributeOverrides = attributeResource.annotations(AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverridesAnnotation.ANNOTATION_NAME); + JavaResourceField resourceField = ((JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE)).getFields().iterator().next(); + Iterator attributeOverrides = resourceField.getAnnotations(JPA.ATTRIBUTE_OVERRIDE).iterator(); assertEquals("key.city", ((AttributeOverrideAnnotation) attributeOverrides.next()).getName()); assertEquals("key.state.foo", ((AttributeOverrideAnnotation) attributeOverrides.next()).getName()); assertFalse(attributeOverrides.hasNext()); - mapKeyAttributeOverrideContainer.specifiedOverrides().next().convertToVirtual(); - attributeOverrides = attributeResource.annotations(AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverridesAnnotation.ANNOTATION_NAME); + mapKeyAttributeOverrideContainer.getSpecifiedOverrides().iterator().next().convertToVirtual(); + attributeOverrides = resourceField.getAnnotations(JPA.ATTRIBUTE_OVERRIDE).iterator(); assertEquals("key.state.foo", ((AttributeOverrideAnnotation) attributeOverrides.next()).getName()); assertFalse(attributeOverrides.hasNext()); - mapKeyAttributeOverrideContainer.specifiedOverrides().next().convertToVirtual(); - attributeOverrides = attributeResource.annotations(AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverridesAnnotation.ANNOTATION_NAME); + mapKeyAttributeOverrideContainer.getSpecifiedOverrides().iterator().next().convertToVirtual(); + attributeOverrides = resourceField.getAnnotations(JPA.ATTRIBUTE_OVERRIDE).iterator(); assertFalse(attributeOverrides.hasNext()); - Iterator virtualAttributeOverrides = mapKeyAttributeOverrideContainer.virtualOverrides(); + Iterator virtualAttributeOverrides = mapKeyAttributeOverrideContainer.getVirtualOverrides().iterator(); assertEquals("city", virtualAttributeOverrides.next().getName()); assertEquals("state.foo", virtualAttributeOverrides.next().getName()); assertEquals("state.address", virtualAttributeOverrides.next().getName()); assertEquals("zip", virtualAttributeOverrides.next().getName()); - assertEquals(4, mapKeyAttributeOverrideContainer.virtualOverridesSize()); + assertEquals(4, mapKeyAttributeOverrideContainer.getVirtualOverridesSize()); } @@ -1498,27 +1479,26 @@ public class GenericJavaOneToManyMapping2_0Tests JavaOneToManyMapping2_0 oneToManyMapping = (JavaOneToManyMapping2_0) getJavaPersistentType().getAttributeNamed("parcels").getMapping(); JavaAttributeOverrideContainer mapKeyAttributeOverrideContainer = oneToManyMapping.getMapKeyAttributeOverrideContainer(); - mapKeyAttributeOverrideContainer.virtualOverrides().next().convertToSpecified(); - mapKeyAttributeOverrideContainer.virtualOverrides().next().convertToSpecified(); + mapKeyAttributeOverrideContainer.getVirtualOverrides().iterator().next().convertToSpecified(); + mapKeyAttributeOverrideContainer.getVirtualOverrides().iterator().next().convertToSpecified(); - ListIterator specifiedOverrides = mapKeyAttributeOverrideContainer.specifiedOverrides(); + ListIterator specifiedOverrides = mapKeyAttributeOverrideContainer.getSpecifiedOverrides().iterator(); assertEquals("city", specifiedOverrides.next().getName()); assertEquals("state.foo", specifiedOverrides.next().getName()); assertFalse(specifiedOverrides.hasNext()); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); + JavaResourceField resourceField = ((JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE)).getFields().iterator().next(); - attributeResource.moveAnnotation(1, 0, AttributeOverridesAnnotation.ANNOTATION_NAME); + resourceField.moveAnnotation(1, 0, AttributeOverrideAnnotation.ANNOTATION_NAME); getJpaProject().synchronizeContextModel(); - Iterator attributeOverrides = attributeResource.annotations(AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverridesAnnotation.ANNOTATION_NAME); + Iterator attributeOverrides = resourceField.getAnnotations(JPA.ATTRIBUTE_OVERRIDE).iterator(); assertEquals("key.state.foo", ((AttributeOverrideAnnotation) attributeOverrides.next()).getName()); assertEquals("key.city", ((AttributeOverrideAnnotation) attributeOverrides.next()).getName()); assertFalse(attributeOverrides.hasNext()); - specifiedOverrides = mapKeyAttributeOverrideContainer.specifiedOverrides(); + specifiedOverrides = mapKeyAttributeOverrideContainer.getSpecifiedOverrides().iterator(); assertEquals("state.foo", specifiedOverrides.next().getName()); assertEquals("city", specifiedOverrides.next().getName()); assertFalse(specifiedOverrides.hasNext()); diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/java/GenericJavaOneToOneMapping2_0Tests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/java/GenericJavaOneToOneMapping2_0Tests.java index a3d11e5196..db8302401e 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/java/GenericJavaOneToOneMapping2_0Tests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/java/GenericJavaOneToOneMapping2_0Tests.java @@ -11,8 +11,10 @@ package org.eclipse.jpt.jpa.core.tests.internal.jpa2.context.java; import java.util.Iterator; import org.eclipse.jdt.core.ICompilationUnit; +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.JavaResourceAnnotatedElement.Kind; 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.iterables.EmptyIterable; import org.eclipse.jpt.common.utility.internal.iterators.ArrayIterator; import org.eclipse.jpt.jpa.core.MappingKeys; @@ -34,8 +36,6 @@ import org.eclipse.jpt.jpa.core.jpa2.resource.java.JPA2_0; import org.eclipse.jpt.jpa.core.jpa2.resource.java.MapsId2_0Annotation; import org.eclipse.jpt.jpa.core.jpa2.resource.java.OneToOne2_0Annotation; 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.OneToOneAnnotation; import org.eclipse.jpt.jpa.core.tests.internal.jpa2.context.Generic2_0ContextModelTestCase; @@ -115,7 +115,7 @@ public class GenericJavaOneToOneMapping2_0Tests } }); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - for (OrmReadOnlyPersistentAttribute each : CollectionTools.iterable(ormPersistentType.attributes())) { + for (OrmReadOnlyPersistentAttribute each : ormPersistentType.getAttributes()) { each.convertToSpecified(); } } @@ -268,64 +268,58 @@ public class GenericJavaOneToOneMapping2_0Tests public void testUpdateId() throws Exception { createTestEntityWithIdDerivedIdentity(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentType resourceType = - getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute resourceAttribute = resourceType.persistableAttributes().next(); + JavaResourceField resourceField = ((JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE)).getFields().iterator().next(); JavaPersistentType contextType = getJavaPersistentType(); JavaPersistentAttribute contextAttribute = contextType.getAttributeNamed("oneToOne"); JavaOneToOneMapping2_0 contextMapping = (JavaOneToOneMapping2_0) contextAttribute.getMapping(); - assertNotNull(resourceAttribute.getAnnotation(JPA.ID)); + assertNotNull(resourceField.getAnnotation(JPA.ID)); assertTrue(contextMapping.getDerivedIdentity().getIdDerivedIdentityStrategy().getValue()); - resourceAttribute.removeAnnotation(JPA.ID); + resourceField.removeAnnotation(JPA.ID); getJpaProject().synchronizeContextModel(); - assertNull(resourceAttribute.getAnnotation(JPA.ID)); + assertNull(resourceField.getAnnotation(JPA.ID)); assertFalse(contextMapping.getDerivedIdentity().getIdDerivedIdentityStrategy().getValue()); - resourceAttribute.addAnnotation(JPA.ID); + resourceField.addAnnotation(JPA.ID); getJpaProject().synchronizeContextModel(); - assertNotNull(resourceAttribute.getAnnotation(JPA.ID)); + assertNotNull(resourceField.getAnnotation(JPA.ID)); assertTrue(contextMapping.getDerivedIdentity().getIdDerivedIdentityStrategy().getValue()); } public void testSetId() throws Exception { createTestEntityWithIdDerivedIdentity(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentType resourceType = - getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute resourceAttribute = resourceType.persistableAttributes().next(); + JavaResourceField resourceField = ((JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE)).getFields().iterator().next(); JavaPersistentType contextType = getJavaPersistentType(); JavaPersistentAttribute contextAttribute = contextType.getAttributeNamed("oneToOne"); JavaOneToOneMapping2_0 contextMapping = (JavaOneToOneMapping2_0) contextAttribute.getMapping(); - assertNotNull(resourceAttribute.getAnnotation(JPA.ID)); + assertNotNull(resourceField.getAnnotation(JPA.ID)); assertTrue(contextMapping.getDerivedIdentity().getIdDerivedIdentityStrategy().getValue()); contextMapping.getDerivedIdentity().getIdDerivedIdentityStrategy().setValue(false); - assertNull(resourceAttribute.getAnnotation(JPA.ID)); + assertNull(resourceField.getAnnotation(JPA.ID)); assertFalse(contextMapping.getDerivedIdentity().getIdDerivedIdentityStrategy().getValue()); contextMapping.getDerivedIdentity().getIdDerivedIdentityStrategy().setValue(true); - assertNotNull(resourceAttribute.getAnnotation(JPA.ID)); + assertNotNull(resourceField.getAnnotation(JPA.ID)); assertTrue(contextMapping.getDerivedIdentity().getIdDerivedIdentityStrategy().getValue()); } public void testUpdateMapsId() throws Exception { createTestEntityWithMapsIdDerivedIdentity(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentType resourceType = - getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute resourceAttribute = resourceType.persistableAttributes().next(); + JavaResourceField resourceField = ((JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE)).getFields().iterator().next(); JavaPersistentType contextType = getJavaPersistentType(); JavaPersistentAttribute contextAttribute = contextType.getAttributeNamed("oneToOne"); JavaOneToOneMapping2_0 contextMapping = (JavaOneToOneMapping2_0) contextAttribute.getMapping(); - assertNotNull(resourceAttribute.getAnnotation(JPA2_0.MAPS_ID)); + assertNotNull(resourceField.getAnnotation(JPA2_0.MAPS_ID)); assertNull(contextMapping.getDerivedIdentity().getMapsIdDerivedIdentityStrategy().getSpecifiedIdAttributeName()); MapsId2_0Annotation annotation = - (MapsId2_0Annotation) resourceAttribute.getAnnotation(JPA2_0.MAPS_ID); + (MapsId2_0Annotation) resourceField.getAnnotation(JPA2_0.MAPS_ID); annotation.setValue("foo"); getJpaProject().synchronizeContextModel(); assertEquals("foo", annotation.getValue()); @@ -336,28 +330,26 @@ public class GenericJavaOneToOneMapping2_0Tests assertEquals("bar", annotation.getValue()); assertEquals("bar", contextMapping.getDerivedIdentity().getMapsIdDerivedIdentityStrategy().getSpecifiedIdAttributeName()); - resourceAttribute.removeAnnotation(JPA2_0.MAPS_ID); + resourceField.removeAnnotation(JPA2_0.MAPS_ID); getJpaProject().synchronizeContextModel(); - assertNull(resourceAttribute.getAnnotation(JPA2_0.MAPS_ID)); + assertNull(resourceField.getAnnotation(JPA2_0.MAPS_ID)); assertNull(contextMapping.getDerivedIdentity().getMapsIdDerivedIdentityStrategy().getSpecifiedIdAttributeName()); } public void testSetMapsId() throws Exception { createTestEntityWithMapsIdDerivedIdentity(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentType resourceType = - getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute resourceAttribute = resourceType.persistableAttributes().next(); + JavaResourceField resourceField = ((JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE)).getFields().iterator().next(); JavaPersistentType contextType = getJavaPersistentType(); JavaPersistentAttribute contextAttribute = contextType.getAttributeNamed("oneToOne"); JavaOneToOneMapping2_0 contextMapping = (JavaOneToOneMapping2_0) contextAttribute.getMapping(); - assertNotNull(resourceAttribute.getAnnotation(JPA2_0.MAPS_ID)); + assertNotNull(resourceField.getAnnotation(JPA2_0.MAPS_ID)); assertNull(contextMapping.getDerivedIdentity().getMapsIdDerivedIdentityStrategy().getSpecifiedIdAttributeName()); contextMapping.getDerivedIdentity().getMapsIdDerivedIdentityStrategy().setSpecifiedIdAttributeName("foo"); MapsId2_0Annotation annotation = - (MapsId2_0Annotation) resourceAttribute.getAnnotation(JPA2_0.MAPS_ID); + (MapsId2_0Annotation) resourceField.getAnnotation(JPA2_0.MAPS_ID); assertNotNull(annotation); assertEquals("foo", annotation.getValue()); assertEquals("foo", contextMapping.getDerivedIdentity().getMapsIdDerivedIdentityStrategy().getSpecifiedIdAttributeName()); @@ -367,47 +359,45 @@ public class GenericJavaOneToOneMapping2_0Tests assertEquals("bar", contextMapping.getDerivedIdentity().getMapsIdDerivedIdentityStrategy().getSpecifiedIdAttributeName()); contextMapping.getDerivedIdentity().getMapsIdDerivedIdentityStrategy().setSpecifiedIdAttributeName(null); - assertNotNull(resourceAttribute.getAnnotation(JPA2_0.MAPS_ID)); + assertNotNull(resourceField.getAnnotation(JPA2_0.MAPS_ID)); assertNull(contextMapping.getDerivedIdentity().getMapsIdDerivedIdentityStrategy().getSpecifiedIdAttributeName()); } public void testUpdatePredominantDerivedIdentityStrategy() throws Exception { createTestEntityWithMapsIdDerivedIdentity(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentType resourceType = - getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute resourceAttribute = resourceType.persistableAttributes().next(); + JavaResourceField resourceField = ((JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE)).getFields().iterator().next(); JavaPersistentType contextType = getJavaPersistentType(); JavaPersistentAttribute contextAttribute = contextType.getAttributeNamed("oneToOne"); JavaOneToOneMapping2_0 contextMapping = (JavaOneToOneMapping2_0) contextAttribute.getMapping(); JavaDerivedIdentity2_0 derivedIdentity = contextMapping.getDerivedIdentity(); - assertNotNull(resourceAttribute.getAnnotation(JPA2_0.MAPS_ID)); - assertNull(resourceAttribute.getAnnotation(JPA.ID)); + assertNotNull(resourceField.getAnnotation(JPA2_0.MAPS_ID)); + assertNull(resourceField.getAnnotation(JPA.ID)); assertTrue(derivedIdentity.usesMapsIdDerivedIdentityStrategy()); assertFalse(derivedIdentity.usesIdDerivedIdentityStrategy()); assertFalse(derivedIdentity.usesNullDerivedIdentityStrategy()); - resourceAttribute.addAnnotation(JPA.ID); + resourceField.addAnnotation(JPA.ID); getJpaProject().synchronizeContextModel(); - assertNotNull(resourceAttribute.getAnnotation(JPA2_0.MAPS_ID)); - assertNotNull(resourceAttribute.getAnnotation(JPA.ID)); + assertNotNull(resourceField.getAnnotation(JPA2_0.MAPS_ID)); + assertNotNull(resourceField.getAnnotation(JPA.ID)); assertTrue(derivedIdentity.usesMapsIdDerivedIdentityStrategy()); assertFalse(derivedIdentity.usesIdDerivedIdentityStrategy()); assertFalse(derivedIdentity.usesNullDerivedIdentityStrategy()); - resourceAttribute.removeAnnotation(JPA2_0.MAPS_ID); + resourceField.removeAnnotation(JPA2_0.MAPS_ID); getJpaProject().synchronizeContextModel(); - assertNull(resourceAttribute.getAnnotation(JPA2_0.MAPS_ID)); - assertNotNull(resourceAttribute.getAnnotation(JPA.ID)); + assertNull(resourceField.getAnnotation(JPA2_0.MAPS_ID)); + assertNotNull(resourceField.getAnnotation(JPA.ID)); assertFalse(derivedIdentity.usesMapsIdDerivedIdentityStrategy()); assertTrue(derivedIdentity.usesIdDerivedIdentityStrategy()); assertFalse(derivedIdentity.usesNullDerivedIdentityStrategy()); - resourceAttribute.removeAnnotation(JPA.ID); + resourceField.removeAnnotation(JPA.ID); getJpaProject().synchronizeContextModel(); - assertNull(resourceAttribute.getAnnotation(JPA2_0.MAPS_ID)); - assertNull(resourceAttribute.getAnnotation(JPA.ID)); + assertNull(resourceField.getAnnotation(JPA2_0.MAPS_ID)); + assertNull(resourceField.getAnnotation(JPA.ID)); assertFalse(derivedIdentity.usesMapsIdDerivedIdentityStrategy()); assertFalse(derivedIdentity.usesIdDerivedIdentityStrategy()); assertTrue(derivedIdentity.usesNullDerivedIdentityStrategy()); @@ -416,37 +406,35 @@ public class GenericJavaOneToOneMapping2_0Tests public void testSetPredominantDerivedIdentityStrategy() throws Exception { createTestEntityWithMapsIdDerivedIdentity(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentType resourceType = - getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute resourceAttribute = resourceType.persistableAttributes().next(); + JavaResourceField resourceField = ((JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE)).getFields().iterator().next(); JavaPersistentType contextType = getJavaPersistentType(); JavaPersistentAttribute contextAttribute = contextType.getAttributeNamed("oneToOne"); JavaOneToOneMapping2_0 contextMapping = (JavaOneToOneMapping2_0) contextAttribute.getMapping(); JavaDerivedIdentity2_0 derivedIdentity = contextMapping.getDerivedIdentity(); - assertNotNull(resourceAttribute.getAnnotation(JPA2_0.MAPS_ID)); - assertNull(resourceAttribute.getAnnotation(JPA.ID)); + assertNotNull(resourceField.getAnnotation(JPA2_0.MAPS_ID)); + assertNull(resourceField.getAnnotation(JPA.ID)); assertTrue(derivedIdentity.usesMapsIdDerivedIdentityStrategy()); assertFalse(derivedIdentity.usesIdDerivedIdentityStrategy()); assertFalse(derivedIdentity.usesNullDerivedIdentityStrategy()); derivedIdentity.setIdDerivedIdentityStrategy(); - assertNull(resourceAttribute.getAnnotation(JPA2_0.MAPS_ID)); - assertNotNull(resourceAttribute.getAnnotation(JPA.ID)); + assertNull(resourceField.getAnnotation(JPA2_0.MAPS_ID)); + assertNotNull(resourceField.getAnnotation(JPA.ID)); assertFalse(derivedIdentity.usesMapsIdDerivedIdentityStrategy()); assertTrue(derivedIdentity.usesIdDerivedIdentityStrategy()); assertFalse(derivedIdentity.usesNullDerivedIdentityStrategy()); derivedIdentity.setNullDerivedIdentityStrategy(); - assertNull(resourceAttribute.getAnnotation(JPA2_0.MAPS_ID)); - assertNull(resourceAttribute.getAnnotation(JPA.ID)); + assertNull(resourceField.getAnnotation(JPA2_0.MAPS_ID)); + assertNull(resourceField.getAnnotation(JPA.ID)); assertFalse(derivedIdentity.usesMapsIdDerivedIdentityStrategy()); assertFalse(derivedIdentity.usesIdDerivedIdentityStrategy()); assertTrue(derivedIdentity.usesNullDerivedIdentityStrategy()); derivedIdentity.setMapsIdDerivedIdentityStrategy(); - assertNotNull(resourceAttribute.getAnnotation(JPA2_0.MAPS_ID)); - assertNull(resourceAttribute.getAnnotation(JPA.ID)); + assertNotNull(resourceField.getAnnotation(JPA2_0.MAPS_ID)); + assertNull(resourceField.getAnnotation(JPA.ID)); assertTrue(derivedIdentity.usesMapsIdDerivedIdentityStrategy()); assertFalse(derivedIdentity.usesIdDerivedIdentityStrategy()); assertFalse(derivedIdentity.usesNullDerivedIdentityStrategy()); @@ -455,36 +443,34 @@ public class GenericJavaOneToOneMapping2_0Tests public void testMorphMapping() throws Exception { createTestEntityWithMapsIdDerivedIdentity(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentType resourceType = - getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute resourceAttribute = resourceType.persistableAttributes().next(); + JavaResourceField resourceField = ((JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE)).getFields().iterator().next(); JavaPersistentType contextType = getJavaPersistentType(); JavaPersistentAttribute contextAttribute = contextType.getAttributeNamed("oneToOne"); - ((MapsId2_0Annotation) resourceAttribute.getAnnotation(JPA2_0.MAPS_ID)).setValue("foo"); + ((MapsId2_0Annotation) resourceField.getAnnotation(JPA2_0.MAPS_ID)).setValue("foo"); getJpaProject().synchronizeContextModel(); - assertNull(resourceAttribute.getAnnotation(JPA.ID)); + assertNull(resourceField.getAnnotation(JPA.ID)); assertFalse(((JavaOneToOneMapping2_0) contextAttribute.getMapping()). getDerivedIdentity().getIdDerivedIdentityStrategy().getValue()); - assertNotNull(resourceAttribute.getAnnotation(JPA2_0.MAPS_ID)); - assertEquals("foo", ((MapsId2_0Annotation) resourceAttribute.getAnnotation(JPA2_0.MAPS_ID)).getValue()); + assertNotNull(resourceField.getAnnotation(JPA2_0.MAPS_ID)); + assertEquals("foo", ((MapsId2_0Annotation) resourceField.getAnnotation(JPA2_0.MAPS_ID)).getValue()); assertEquals("foo", ((JavaOneToOneMapping2_0) contextAttribute.getMapping()). getDerivedIdentity().getMapsIdDerivedIdentityStrategy().getSpecifiedIdAttributeName()); contextAttribute.setMappingKey(MappingKeys.MANY_TO_ONE_ATTRIBUTE_MAPPING_KEY); assertFalse(((JavaManyToOneMapping2_0) contextAttribute.getMapping()). getDerivedIdentity().getIdDerivedIdentityStrategy().getValue()); - assertNotNull(resourceAttribute.getAnnotation(JPA2_0.MAPS_ID)); - assertEquals("foo", ((MapsId2_0Annotation) resourceAttribute.getAnnotation(JPA2_0.MAPS_ID)).getValue()); + assertNotNull(resourceField.getAnnotation(JPA2_0.MAPS_ID)); + assertEquals("foo", ((MapsId2_0Annotation) resourceField.getAnnotation(JPA2_0.MAPS_ID)).getValue()); assertEquals("foo", ((JavaManyToOneMapping2_0) contextAttribute.getMapping()). getDerivedIdentity().getMapsIdDerivedIdentityStrategy().getSpecifiedIdAttributeName()); contextAttribute.setMappingKey(MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY); assertFalse(((JavaOneToOneMapping2_0) contextAttribute.getMapping()). getDerivedIdentity().getIdDerivedIdentityStrategy().getValue()); - assertNotNull(resourceAttribute.getAnnotation(JPA2_0.MAPS_ID)); - assertEquals("foo", ((MapsId2_0Annotation) resourceAttribute.getAnnotation(JPA2_0.MAPS_ID)).getValue()); + assertNotNull(resourceField.getAnnotation(JPA2_0.MAPS_ID)); + assertEquals("foo", ((MapsId2_0Annotation) resourceField.getAnnotation(JPA2_0.MAPS_ID)).getValue()); assertEquals("foo", ((JavaOneToOneMapping2_0) contextAttribute.getMapping()). getDerivedIdentity().getMapsIdDerivedIdentityStrategy().getSpecifiedIdAttributeName()); } @@ -497,7 +483,7 @@ public class GenericJavaOneToOneMapping2_0Tests 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 attributeNames = @@ -538,7 +524,7 @@ public class GenericJavaOneToOneMapping2_0Tests 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 attributeNames = @@ -579,7 +565,7 @@ public class GenericJavaOneToOneMapping2_0Tests this.createTestEntity(); this.addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToOneMapping2_0 oneToOneMapping = (OneToOneMapping2_0) persistentAttribute.getMapping(); assertEquals(false, this.getOrphanRemovalOf(oneToOneMapping).isDefaultOrphanRemoval()); } @@ -588,7 +574,7 @@ public class GenericJavaOneToOneMapping2_0Tests this.createTestEntity(); this.addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToOneMapping2_0 oneToOneMapping = (OneToOneMapping2_0) persistentAttribute.getMapping(); assertEquals(false, this.getOrphanRemovalOf(oneToOneMapping).isDefaultOrphanRemoval()); } @@ -597,7 +583,7 @@ public class GenericJavaOneToOneMapping2_0Tests this.createTestEntity(); this.addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToOneMapping2_0 oneToOneMapping = (OneToOneMapping2_0) persistentAttribute.getMapping(); JavaOrphanRemovable2_0 mappingsOrphanRemoval = this.getOrphanRemovalOf(oneToOneMapping); @@ -611,15 +597,14 @@ public class GenericJavaOneToOneMapping2_0Tests this.createTestEntity(); this.addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToOneMapping2_0 oneToOneMapping = (OneToOneMapping2_0) persistentAttribute.getMapping(); JavaOrphanRemovable2_0 mappingsOrphanRemoval = this.getOrphanRemovalOf(oneToOneMapping); assertNull(mappingsOrphanRemoval.getSpecifiedOrphanRemoval()); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - OneToOne2_0Annotation oneToOne = (OneToOne2_0Annotation) attributeResource.getAnnotation(JPA.ONE_TO_ONE); + JavaResourceField resourceField = ((JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE)).getFields().iterator().next(); + OneToOne2_0Annotation oneToOne = (OneToOne2_0Annotation) resourceField.getAnnotation(JPA.ONE_TO_ONE); oneToOne.setOrphanRemoval(Boolean.FALSE); getJpaProject().synchronizeContextModel(); @@ -630,7 +615,7 @@ public class GenericJavaOneToOneMapping2_0Tests this.createTestEntityWithValidOneToOneMappingOrphanRemovalSpecified(); this.addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToOneMapping2_0 oneToOneMapping = (OneToOneMapping2_0) persistentAttribute.getMapping(); assertEquals(Boolean.FALSE, this.getOrphanRemovalOf(oneToOneMapping).getSpecifiedOrphanRemoval()); @@ -640,7 +625,7 @@ public class GenericJavaOneToOneMapping2_0Tests this.createTestEntity(); this.addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToOneMapping2_0 oneToOneMapping = (OneToOneMapping2_0) persistentAttribute.getMapping(); JavaOrphanRemovable2_0 mappingsOrphanRemoval = this.getOrphanRemovalOf(oneToOneMapping); @@ -648,21 +633,20 @@ public class GenericJavaOneToOneMapping2_0Tests mappingsOrphanRemoval.setSpecifiedOrphanRemoval(Boolean.TRUE); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - OneToOne2_0Annotation oneToOne = (OneToOne2_0Annotation) attributeResource.getAnnotation(JPA.ONE_TO_ONE); + JavaResourceField resourceField = ((JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE)).getFields().iterator().next(); + OneToOne2_0Annotation oneToOne = (OneToOne2_0Annotation) resourceField.getAnnotation(JPA.ONE_TO_ONE); assertEquals(Boolean.TRUE, oneToOne.getOrphanRemoval()); mappingsOrphanRemoval.setSpecifiedOrphanRemoval(null); - assertNotNull(attributeResource.getAnnotation(JPA.ONE_TO_ONE)); // .getElement); + assertNotNull(resourceField.getAnnotation(JPA.ONE_TO_ONE)); // .getElement); } public void testSetSpecifiedOrphanRemoval2() throws Exception { this.createTestEntity(); this.addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToOneMapping2_0 oneToOneMapping = (OneToOneMapping2_0) persistentAttribute.getMapping(); JavaOrphanRemovable2_0 mappingsOrphanRemoval = this.getOrphanRemovalOf(oneToOneMapping); @@ -670,9 +654,8 @@ public class GenericJavaOneToOneMapping2_0Tests mappingsOrphanRemoval.setSpecifiedOrphanRemoval(Boolean.TRUE); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - OneToOne2_0Annotation oneToOne = (OneToOne2_0Annotation) attributeResource.getAnnotation(JPA.ONE_TO_ONE); + JavaResourceField resourceField = ((JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE)).getFields().iterator().next(); + OneToOne2_0Annotation oneToOne = (OneToOne2_0Annotation) resourceField.getAnnotation(JPA.ONE_TO_ONE); assertEquals(Boolean.TRUE, oneToOne.getOrphanRemoval()); @@ -681,22 +664,21 @@ public class GenericJavaOneToOneMapping2_0Tests assertEquals(Boolean.TRUE, mappingsOrphanRemoval.getSpecifiedOrphanRemoval()); mappingsOrphanRemoval.setSpecifiedOrphanRemoval(null); - assertNotNull(attributeResource.getAnnotation(JPA.ONE_TO_ONE)); + assertNotNull(resourceField.getAnnotation(JPA.ONE_TO_ONE)); } public void testGetSpecifiedOrphanRemovalUpdatesFromResourceModelChange() throws Exception { this.createTestEntity(); this.addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); + PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToOneMapping2_0 oneToOneMapping = (OneToOneMapping2_0) persistentAttribute.getMapping(); JavaOrphanRemovable2_0 mappingsOrphanRemoval = this.getOrphanRemovalOf(oneToOneMapping); assertNull(mappingsOrphanRemoval.getSpecifiedOrphanRemoval()); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - OneToOne2_0Annotation oneToOne = (OneToOne2_0Annotation) attributeResource.getAnnotation(JPA.ONE_TO_ONE); + JavaResourceField resourceField = ((JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE)).getFields().iterator().next(); + OneToOne2_0Annotation oneToOne = (OneToOne2_0Annotation) resourceField.getAnnotation(JPA.ONE_TO_ONE); oneToOne.setOrphanRemoval(Boolean.FALSE); getJpaProject().synchronizeContextModel(); @@ -708,7 +690,7 @@ public class GenericJavaOneToOneMapping2_0Tests assertSame(oneToOneMapping, persistentAttribute.getMapping()); oneToOne.setOrphanRemoval(Boolean.FALSE); - attributeResource.setPrimaryAnnotation(null, EmptyIterable.instance()); + resourceField.setPrimaryAnnotation(null, EmptyIterable.instance()); getJpaProject().synchronizeContextModel(); assertTrue(persistentAttribute.getMapping().isDefault()); @@ -718,56 +700,56 @@ public class GenericJavaOneToOneMapping2_0Tests createTestEntityWithValidOneToOneMapping(); 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(); + JavaResourceField resourceField = ((JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE)).getFields().iterator().next(); + OneToOneAnnotation annotation = (OneToOneAnnotation) resourceField.getAnnotation(JPA.ONE_TO_ONE); + PersistentAttribute contextAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToOneMapping2_0 mapping = (OneToOneMapping2_0) contextAttribute.getMapping(); OneToOneRelationship2_0 rel = (OneToOneRelationship2_0) 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()); - assertNull(resourceAttribute.getAnnotation(JPA.JOIN_TABLE)); + assertNull(resourceField.getAnnotation(JPA.JOIN_TABLE)); assertTrue(rel.strategyIsJoinColumn()); assertFalse(rel.strategyIsPrimaryKeyJoinColumn()); assertFalse(rel.strategyIsMappedBy()); assertFalse(rel.strategyIsJoinTable()); 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()); - assertNull(resourceAttribute.getAnnotation(JPA.JOIN_TABLE)); + assertNull(resourceField.getAnnotation(JPA.JOIN_TABLE)); assertFalse(rel.strategyIsJoinColumn()); assertTrue(rel.strategyIsPrimaryKeyJoinColumn()); assertFalse(rel.strategyIsMappedBy()); assertFalse(rel.strategyIsJoinTable()); 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()); - assertNull(resourceAttribute.getAnnotation(JPA.JOIN_TABLE)); + assertNull(resourceField.getAnnotation(JPA.JOIN_TABLE)); assertFalse(rel.strategyIsJoinColumn()); assertFalse(rel.strategyIsPrimaryKeyJoinColumn()); assertTrue(rel.strategyIsMappedBy()); assertFalse(rel.strategyIsJoinTable()); rel.setStrategyToJoinTable(); - 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()); - assertNotNull(resourceAttribute.getAnnotation(JPA.JOIN_TABLE)); + assertNotNull(resourceField.getAnnotation(JPA.JOIN_TABLE)); assertFalse(rel.strategyIsJoinColumn()); assertFalse(rel.strategyIsPrimaryKeyJoinColumn()); assertFalse(rel.strategyIsMappedBy()); assertTrue(rel.strategyIsJoinTable()); 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()); - assertNull(resourceAttribute.getAnnotation(JPA.JOIN_TABLE)); + assertNull(resourceField.getAnnotation(JPA.JOIN_TABLE)); assertTrue(rel.strategyIsJoinColumn()); assertFalse(rel.strategyIsPrimaryKeyJoinColumn()); assertFalse(rel.strategyIsMappedBy()); @@ -778,27 +760,27 @@ public class GenericJavaOneToOneMapping2_0Tests createTestEntityWithValidOneToOneMapping(); 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(); + JavaResourceField resourceField = ((JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE)).getFields().iterator().next(); + OneToOneAnnotation annotation = (OneToOneAnnotation) resourceField.getAnnotation(JPA.ONE_TO_ONE); + PersistentAttribute contextAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToOneMapping2_0 mapping = (OneToOneMapping2_0) contextAttribute.getMapping(); OneToOneRelationship2_0 rel = (OneToOneRelationship2_0) 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()); - assertNull(resourceAttribute.getAnnotation(JPA.JOIN_TABLE)); + assertNull(resourceField.getAnnotation(JPA.JOIN_TABLE)); assertTrue(rel.strategyIsJoinColumn()); assertFalse(rel.strategyIsPrimaryKeyJoinColumn()); assertFalse(rel.strategyIsMappedBy()); assertFalse(rel.strategyIsJoinTable()); - 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()); - assertNull(resourceAttribute.getAnnotation(JPA.JOIN_TABLE)); + assertNull(resourceField.getAnnotation(JPA.JOIN_TABLE)); assertFalse(rel.strategyIsJoinColumn()); assertTrue(rel.strategyIsPrimaryKeyJoinColumn()); assertFalse(rel.strategyIsMappedBy()); @@ -806,43 +788,43 @@ public class GenericJavaOneToOneMapping2_0Tests 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()); - assertNull(resourceAttribute.getAnnotation(JPA.JOIN_TABLE)); + assertNull(resourceField.getAnnotation(JPA.JOIN_TABLE)); assertFalse(rel.strategyIsJoinColumn()); assertFalse(rel.strategyIsPrimaryKeyJoinColumn()); assertTrue(rel.strategyIsMappedBy()); assertFalse(rel.strategyIsJoinTable()); - 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()); - assertNull(resourceAttribute.getAnnotation(JPA.JOIN_TABLE)); + assertNull(resourceField.getAnnotation(JPA.JOIN_TABLE)); assertFalse(rel.strategyIsJoinColumn()); assertFalse(rel.strategyIsPrimaryKeyJoinColumn()); assertTrue(rel.strategyIsMappedBy()); assertFalse(rel.strategyIsJoinTable()); - resourceAttribute.addAnnotation(JPA.JOIN_TABLE); + resourceField.addAnnotation(JPA.JOIN_TABLE); 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()); - assertNotNull(resourceAttribute.getAnnotation(JPA.JOIN_TABLE)); + assertNotNull(resourceField.getAnnotation(JPA.JOIN_TABLE)); assertFalse(rel.strategyIsJoinColumn()); assertFalse(rel.strategyIsPrimaryKeyJoinColumn()); assertTrue(rel.strategyIsMappedBy()); assertFalse(rel.strategyIsJoinTable()); - 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()); - assertNotNull(resourceAttribute.getAnnotation(JPA.JOIN_TABLE)); + assertNotNull(resourceField.getAnnotation(JPA.JOIN_TABLE)); assertFalse(rel.strategyIsJoinColumn()); assertFalse(rel.strategyIsPrimaryKeyJoinColumn()); assertTrue(rel.strategyIsMappedBy()); @@ -850,32 +832,32 @@ public class GenericJavaOneToOneMapping2_0Tests 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()); - assertNotNull(resourceAttribute.getAnnotation(JPA.JOIN_TABLE)); + assertNotNull(resourceField.getAnnotation(JPA.JOIN_TABLE)); assertFalse(rel.strategyIsJoinColumn()); assertFalse(rel.strategyIsPrimaryKeyJoinColumn()); assertFalse(rel.strategyIsMappedBy()); assertTrue(rel.strategyIsJoinTable()); - 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()); - assertNotNull(resourceAttribute.getAnnotation(JPA.JOIN_TABLE)); + assertNotNull(resourceField.getAnnotation(JPA.JOIN_TABLE)); assertFalse(rel.strategyIsJoinColumn()); assertFalse(rel.strategyIsPrimaryKeyJoinColumn()); assertFalse(rel.strategyIsMappedBy()); assertTrue(rel.strategyIsJoinTable()); - resourceAttribute.removeAnnotation(JPA.JOIN_TABLE); + resourceField.removeAnnotation(JPA.JOIN_TABLE); 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()); - assertNull(resourceAttribute.getAnnotation(JPA.JOIN_TABLE)); + assertNull(resourceField.getAnnotation(JPA.JOIN_TABLE)); assertTrue(rel.strategyIsJoinColumn()); assertFalse(rel.strategyIsPrimaryKeyJoinColumn()); assertFalse(rel.strategyIsMappedBy()); diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/java/GenericJavaPersistentAttribute2_0Tests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/java/GenericJavaPersistentAttribute2_0Tests.java index 3e24ec618e..024ecacb5f 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/java/GenericJavaPersistentAttribute2_0Tests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/java/GenericJavaPersistentAttribute2_0Tests.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. @@ -133,29 +133,29 @@ public class GenericJavaPersistentAttribute2_0Tests extends Generic2_0ContextMod JavaPersistentAttribute id = getJavaPersistentType().getAttributeNamed("id"); assertEquals(id.getMappingKey(), MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY); - id.getResourcePersistentAttribute().addAnnotation(JPA.ID); + id.getResourceAttribute().addAnnotation(JPA.ID); getJpaProject().synchronizeContextModel(); assertEquals(id.getMappingKey(), MappingKeys.ID_ATTRIBUTE_MAPPING_KEY); - id.getResourcePersistentAttribute().addAnnotation(JPA.ONE_TO_ONE); + id.getResourceAttribute().addAnnotation(JPA.ONE_TO_ONE); getJpaProject().synchronizeContextModel(); assertEquals(id.getMappingKey(), MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY); - assertNotNull(id.getResourcePersistentAttribute().getAnnotation(JPA.ID)); + assertNotNull(id.getResourceAttribute().getAnnotation(JPA.ID)); - id.getResourcePersistentAttribute().removeAnnotation(JPA.ONE_TO_ONE); + id.getResourceAttribute().removeAnnotation(JPA.ONE_TO_ONE); getJpaProject().synchronizeContextModel(); assertEquals(id.getMappingKey(), MappingKeys.ID_ATTRIBUTE_MAPPING_KEY); - id.getResourcePersistentAttribute().addAnnotation(JPA.MANY_TO_ONE); + id.getResourceAttribute().addAnnotation(JPA.MANY_TO_ONE); getJpaProject().synchronizeContextModel(); assertEquals(id.getMappingKey(), MappingKeys.MANY_TO_ONE_ATTRIBUTE_MAPPING_KEY); - assertNotNull(id.getResourcePersistentAttribute().getAnnotation(JPA.ID)); + assertNotNull(id.getResourceAttribute().getAnnotation(JPA.ID)); - id.getResourcePersistentAttribute().removeAnnotation(JPA.MANY_TO_ONE); + id.getResourceAttribute().removeAnnotation(JPA.MANY_TO_ONE); getJpaProject().synchronizeContextModel(); assertEquals(id.getMappingKey(), MappingKeys.ID_ATTRIBUTE_MAPPING_KEY); - id.getResourcePersistentAttribute().setPrimaryAnnotation(null, EmptyIterable.instance()); + id.getResourceAttribute().setPrimaryAnnotation(null, EmptyIterable.instance()); getJpaProject().synchronizeContextModel(); assertEquals(id.getMappingKey(), MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY); } diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/java/GenericJavaPersistentType2_0Tests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/java/GenericJavaPersistentType2_0Tests.java index d7da65fbb7..bdb121fe8b 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/java/GenericJavaPersistentType2_0Tests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/java/GenericJavaPersistentType2_0Tests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009 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. @@ -13,6 +13,8 @@ import java.util.Iterator; import java.util.ListIterator; import org.eclipse.jdt.core.ICompilationUnit; import org.eclipse.jdt.core.IField; +import org.eclipse.jpt.common.core.resource.java.JavaResourceType; +import org.eclipse.jpt.common.core.resource.java.JavaResourceAnnotatedElement.Kind; import org.eclipse.jpt.common.core.tests.internal.projects.TestJavaProject.SourceWriter; import org.eclipse.jpt.common.utility.internal.iterables.EmptyIterable; import org.eclipse.jpt.common.utility.internal.iterators.ArrayIterator; @@ -24,11 +26,12 @@ import org.eclipse.jpt.jpa.core.context.java.JavaPersistentAttribute; import org.eclipse.jpt.jpa.core.context.java.JavaPersistentType; import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentType; import org.eclipse.jpt.jpa.core.context.persistence.ClassRef; +import org.eclipse.jpt.jpa.core.internal.context.java.FieldAccessor; +import org.eclipse.jpt.jpa.core.internal.context.java.PropertyAccessor; import org.eclipse.jpt.jpa.core.jpa2.resource.java.JPA2_0; import org.eclipse.jpt.jpa.core.resource.java.EmbeddableAnnotation; import org.eclipse.jpt.jpa.core.resource.java.EntityAnnotation; 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.TransientAnnotation; import org.eclipse.jpt.jpa.core.tests.internal.jpa2.context.Generic2_0ContextModelTestCase; @@ -291,16 +294,16 @@ public class GenericJavaPersistentType2_0Tests extends Generic2_0ContextModelTes assertEquals(AccessType.PROPERTY, getJavaPersistentType().getAccess()); - Iterator attributes = getJavaPersistentType().attributes(); + Iterator attributes = getJavaPersistentType().getAttributes().iterator(); JavaPersistentAttribute javaPersistentAttribute = attributes.next(); - assertEquals("id", javaPersistentAttribute.getName()); - assertEquals(AccessType.PROPERTY, javaPersistentAttribute.getAccess()); - assertEquals(MappingKeys.ID_ATTRIBUTE_MAPPING_KEY, javaPersistentAttribute.getMappingKey()); - - javaPersistentAttribute = attributes.next(); assertEquals("name", javaPersistentAttribute.getName()); assertEquals(AccessType.FIELD, javaPersistentAttribute.getAccess()); assertEquals(MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY, javaPersistentAttribute.getMapping().getKey()); + + javaPersistentAttribute = attributes.next(); + assertEquals("id", javaPersistentAttribute.getName()); + assertEquals(AccessType.PROPERTY, javaPersistentAttribute.getAccess()); + assertEquals(MappingKeys.ID_ATTRIBUTE_MAPPING_KEY, javaPersistentAttribute.getMappingKey()); assertFalse(attributes.hasNext()); } @@ -311,7 +314,7 @@ public class GenericJavaPersistentType2_0Tests extends Generic2_0ContextModelTes assertEquals(AccessType.FIELD, getJavaPersistentType().getAccess()); - Iterator attributes = getJavaPersistentType().attributes(); + Iterator attributes = getJavaPersistentType().getAttributes().iterator(); JavaPersistentAttribute javaPersistentAttribute = attributes.next(); assertEquals("id", javaPersistentAttribute.getName()); assertEquals(AccessType.FIELD, javaPersistentAttribute.getAccess()); @@ -329,9 +332,9 @@ public class GenericJavaPersistentType2_0Tests extends Generic2_0ContextModelTes assertFalse(attributes.hasNext()); - attributes = getJavaPersistentType().attributes(); - attributes.next().getResourcePersistentAttribute().setPrimaryAnnotation(TransientAnnotation.ANNOTATION_NAME, EmptyIterable.instance()); - attributes = getJavaPersistentType().attributes(); + attributes = getJavaPersistentType().getAttributes().iterator(); + attributes.next().getResourceAttribute().setPrimaryAnnotation(TransientAnnotation.ANNOTATION_NAME, EmptyIterable.instance()); + attributes = getJavaPersistentType().getAttributes().iterator(); javaPersistentAttribute = attributes.next(); javaPersistentAttribute = attributes.next(); @@ -353,7 +356,7 @@ public class GenericJavaPersistentType2_0Tests extends Generic2_0ContextModelTes addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); addXmlClassRef(PACKAGE_NAME + ".AnnotationTestTypeChild"); - ListIterator classRefs = getPersistenceUnit().specifiedClassRefs(); + ListIterator classRefs = getPersistenceUnit().getSpecifiedClassRefs().iterator(); classRefs.next(); ClassRef classRef = classRefs.next(); @@ -370,7 +373,7 @@ public class GenericJavaPersistentType2_0Tests extends Generic2_0ContextModelTes addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); addXmlClassRef(PACKAGE_NAME + ".AnnotationTestTypeChild"); - ListIterator classRefs = getPersistenceUnit().specifiedClassRefs(); + ListIterator classRefs = getPersistenceUnit().getSpecifiedClassRefs().iterator(); classRefs.next(); ClassRef classRef = classRefs.next(); @@ -387,7 +390,7 @@ public class GenericJavaPersistentType2_0Tests extends Generic2_0ContextModelTes addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); addXmlClassRef(PACKAGE_NAME + ".AnnotationTestTypeChild"); - ListIterator classRefs = getPersistenceUnit().specifiedClassRefs(); + ListIterator classRefs = getPersistenceUnit().getSpecifiedClassRefs().iterator(); classRefs.next(); ClassRef classRef = classRefs.next(); @@ -404,7 +407,7 @@ public class GenericJavaPersistentType2_0Tests extends Generic2_0ContextModelTes addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); addXmlClassRef(PACKAGE_NAME + ".AnnotationTestTypeChild"); - ListIterator classRefs = getPersistenceUnit().specifiedClassRefs(); + ListIterator classRefs = getPersistenceUnit().getSpecifiedClassRefs().iterator(); classRefs.next(); ClassRef classRef = classRefs.next(); JavaPersistentType javaPersistentType = classRef.getJavaPersistentType(); @@ -423,7 +426,7 @@ public class GenericJavaPersistentType2_0Tests extends Generic2_0ContextModelTes addXmlClassRef(PACKAGE_NAME + ".AnnotationTestTypeChild"); getEntityMappings().getPersistenceUnitMetadata().getPersistenceUnitDefaults().setAccess(AccessType.FIELD); - ListIterator classRefs = getPersistenceUnit().specifiedClassRefs(); + ListIterator classRefs = getPersistenceUnit().getSpecifiedClassRefs().iterator(); classRefs.next(); ClassRef classRef = classRefs.next(); JavaPersistentType javaPersistentType = classRef.getJavaPersistentType(); @@ -537,7 +540,7 @@ public class GenericJavaPersistentType2_0Tests extends Generic2_0ContextModelTes addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); addXmlClassRef(PACKAGE_NAME + ".AnnotationTestTypeChild"); - ListIterator classRefs = getPersistenceUnit().specifiedClassRefs(); + ListIterator classRefs = getPersistenceUnit().getSpecifiedClassRefs().iterator(); ClassRef classRef = classRefs.next(); JavaPersistentType rootJavaPersistentType = classRef.getJavaPersistentType(); @@ -556,7 +559,7 @@ public class GenericJavaPersistentType2_0Tests extends Generic2_0ContextModelTes //as the superPersistentType because of impliedClassRefs and changes for bug 190317 addXmlClassRef(PACKAGE_NAME + ".AnnotationTestTypeChild"); - ListIterator classRefs = getPersistenceUnit().specifiedClassRefs(); + ListIterator classRefs = getPersistenceUnit().getSpecifiedClassRefs().iterator(); JavaPersistentType javaPersistentType = classRefs.next().getJavaPersistentType(); assertNotNull(javaPersistentType.getSuperPersistentType()); @@ -571,7 +574,7 @@ public class GenericJavaPersistentType2_0Tests extends Generic2_0ContextModelTes addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); addXmlClassRef(PACKAGE_NAME + ".AnnotationTestTypeChild2"); - ListIterator classRefs = getPersistenceUnit().specifiedClassRefs(); + ListIterator classRefs = getPersistenceUnit().getSpecifiedClassRefs().iterator(); ClassRef classRef = classRefs.next(); JavaPersistentType rootJavaPersistentType = classRef.getJavaPersistentType(); @@ -590,7 +593,7 @@ public class GenericJavaPersistentType2_0Tests extends Generic2_0ContextModelTes addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); addXmlClassRef(PACKAGE_NAME + ".AnnotationTestTypeChild2"); - ListIterator classRefs = getPersistenceUnit().specifiedClassRefs(); + ListIterator classRefs = getPersistenceUnit().getSpecifiedClassRefs().iterator(); JavaPersistentType rootJavaPersistentType = classRefs.next().getJavaPersistentType(); JavaPersistentType childJavaPersistentType = classRefs.next().getJavaPersistentType(); @@ -608,7 +611,7 @@ public class GenericJavaPersistentType2_0Tests extends Generic2_0ContextModelTes addXmlClassRef(PACKAGE_NAME + ".AnnotationTestTypeChild2"); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ListIterator classRefs = getPersistenceUnit().specifiedClassRefs(); + ListIterator classRefs = getPersistenceUnit().getSpecifiedClassRefs().iterator(); JavaPersistentType childJavaPersistentType = classRefs.next().getJavaPersistentType(); JavaPersistentType rootJavaPersistentType = classRefs.next().getJavaPersistentType(); @@ -654,8 +657,8 @@ public class GenericJavaPersistentType2_0Tests extends Generic2_0ContextModelTes getJavaPersistentType().setMappingKey(MappingKeys.ENTITY_TYPE_MAPPING_KEY); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - assertNotNull(typeResource.getAnnotation(EntityAnnotation.ANNOTATION_NAME)); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + assertNotNull(resourceType.getAnnotation(EntityAnnotation.ANNOTATION_NAME)); assertEquals(MappingKeys.ENTITY_TYPE_MAPPING_KEY, getJavaPersistentType().getMappingKey()); } @@ -668,8 +671,8 @@ public class GenericJavaPersistentType2_0Tests extends Generic2_0ContextModelTes getJavaPersistentType().setMappingKey(MappingKeys.EMBEDDABLE_TYPE_MAPPING_KEY); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - assertNotNull(typeResource.getAnnotation(EmbeddableAnnotation.ANNOTATION_NAME)); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + assertNotNull(resourceType.getAnnotation(EmbeddableAnnotation.ANNOTATION_NAME)); assertEquals(MappingKeys.EMBEDDABLE_TYPE_MAPPING_KEY, getJavaPersistentType().getMappingKey()); } @@ -682,8 +685,8 @@ public class GenericJavaPersistentType2_0Tests extends Generic2_0ContextModelTes getJavaPersistentType().setMappingKey(MappingKeys.NULL_TYPE_MAPPING_KEY); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - assertNull(typeResource.getAnnotation(EntityAnnotation.ANNOTATION_NAME)); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + assertNull(resourceType.getAnnotation(EntityAnnotation.ANNOTATION_NAME)); assertEquals(MappingKeys.NULL_TYPE_MAPPING_KEY, getJavaPersistentType().getMappingKey()); } @@ -694,8 +697,8 @@ public class GenericJavaPersistentType2_0Tests extends Generic2_0ContextModelTes assertEquals(MappingKeys.ENTITY_TYPE_MAPPING_KEY, getJavaPersistentType().getMappingKey()); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - typeResource.setPrimaryAnnotation(EmbeddableAnnotation.ANNOTATION_NAME, EmptyIterable.instance()); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + resourceType.setPrimaryAnnotation(EmbeddableAnnotation.ANNOTATION_NAME, EmptyIterable.instance()); this.getJpaProject().synchronizeContextModel(); assertEquals(MappingKeys.EMBEDDABLE_TYPE_MAPPING_KEY, getJavaPersistentType().getMappingKey()); } @@ -706,8 +709,8 @@ public class GenericJavaPersistentType2_0Tests extends Generic2_0ContextModelTes assertEquals(MappingKeys.NULL_TYPE_MAPPING_KEY, getJavaPersistentType().getMappingKey()); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - typeResource.setPrimaryAnnotation(EntityAnnotation.ANNOTATION_NAME, EmptyIterable.instance()); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + resourceType.setPrimaryAnnotation(EntityAnnotation.ANNOTATION_NAME, EmptyIterable.instance()); this.getJpaProject().synchronizeContextModel(); assertEquals(MappingKeys.ENTITY_TYPE_MAPPING_KEY, getJavaPersistentType().getMappingKey()); } @@ -725,7 +728,7 @@ public class GenericJavaPersistentType2_0Tests extends Generic2_0ContextModelTes public void testAttributes() throws Exception { createTestEntityAnnotatedMethod(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - Iterator attributes = getJavaPersistentType().attributes(); + Iterator attributes = getJavaPersistentType().getAttributes().iterator(); assertEquals("id", attributes.next().getName()); assertFalse(attributes.hasNext()); @@ -735,10 +738,17 @@ public class GenericJavaPersistentType2_0Tests extends Generic2_0ContextModelTes createTestEntityAnnotatedFieldAndMethod(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - Iterator attributes = getJavaPersistentType().attributes(); + Iterator attributes = getJavaPersistentType().getAttributes().iterator(); - assertEquals("id", attributes.next().getName()); - assertEquals("name", attributes.next().getName()); + JavaPersistentAttribute attribute = attributes.next(); + assertEquals("id", attribute.getName()); + assertTrue(attribute.getAccessor() instanceof FieldAccessor); + attribute = attributes.next(); + assertEquals("name", attribute.getName()); + assertTrue(attribute.getAccessor() instanceof FieldAccessor); + attribute = attributes.next(); + assertEquals("id", attribute.getName()); + assertTrue(attribute.getAccessor() instanceof PropertyAccessor); assertFalse(attributes.hasNext()); } @@ -746,14 +756,14 @@ public class GenericJavaPersistentType2_0Tests extends Generic2_0ContextModelTes createTestEntityAnnotatedMethod(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - assertEquals(1, getJavaPersistentType().attributesSize()); + assertEquals(1, getJavaPersistentType().getAttributesSize()); } public void testAttributesSize2() throws Exception { createTestEntityAnnotatedFieldAndMethod(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - assertEquals(2, getJavaPersistentType().attributesSize()); + assertEquals(3, getJavaPersistentType().getAttributesSize()); } public void testAttributeNamed() throws Exception { @@ -782,7 +792,7 @@ public class GenericJavaPersistentType2_0Tests extends Generic2_0ContextModelTes ICompilationUnit testType = createTestEntityAnnotatedField(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - Iterator attributes = getJavaPersistentType().attributes(); + Iterator attributes = getJavaPersistentType().getAttributes().iterator(); JavaPersistentAttribute idAttribute = attributes.next(); JavaPersistentAttribute nameAttribute = attributes.next(); @@ -793,7 +803,7 @@ public class GenericJavaPersistentType2_0Tests extends Generic2_0ContextModelTes IField idField = testType.findPrimaryType().getField("id"); idField.rename("id2", false, null); - attributes = getJavaPersistentType().attributes(); + attributes = getJavaPersistentType().getAttributes().iterator(); JavaPersistentAttribute nameAttribute2 = attributes.next(); JavaPersistentAttribute id2Attribute = attributes.next(); diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/java/GenericJavaSequenceGenerator2_0Tests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/java/GenericJavaSequenceGenerator2_0Tests.java index b303b1a4ba..2632244b86 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/java/GenericJavaSequenceGenerator2_0Tests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/java/GenericJavaSequenceGenerator2_0Tests.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. @@ -11,6 +11,9 @@ package org.eclipse.jpt.jpa.core.tests.internal.jpa2.context.java; import java.util.Iterator; import org.eclipse.jdt.core.ICompilationUnit; +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.JavaResourceAnnotatedElement.Kind; import org.eclipse.jpt.common.utility.internal.iterators.ArrayIterator; import org.eclipse.jpt.jpa.core.JptJpaCorePlugin; import org.eclipse.jpt.jpa.core.MappingKeys; @@ -20,8 +23,6 @@ import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentType; import org.eclipse.jpt.jpa.core.jpa2.context.SequenceGenerator2_0; import org.eclipse.jpt.jpa.core.jpa2.resource.java.SequenceGenerator2_0Annotation; 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.persistence.PersistenceFactory; import org.eclipse.jpt.jpa.core.resource.persistence.XmlMappingFileRef; import org.eclipse.jpt.jpa.core.tests.internal.jpa2.context.Generic2_0ContextModelTestCase; @@ -48,9 +49,8 @@ public class GenericJavaSequenceGenerator2_0Tests extends Generic2_0ContextModel SequenceGenerator2_0 sequenceGenerator = (SequenceGenerator2_0) idMapping.getGeneratorContainer().getSequenceGenerator(); assertNull(sequenceGenerator.getCatalog()); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - SequenceGenerator2_0Annotation annotation = (SequenceGenerator2_0Annotation) attributeResource.getAnnotation(JPA.SEQUENCE_GENERATOR); + JavaResourceField resourceField = ((JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE)).getFields().iterator().next(); + SequenceGenerator2_0Annotation annotation = (SequenceGenerator2_0Annotation) resourceField.getAnnotation(JPA.SEQUENCE_GENERATOR); annotation.setCatalog("testCatalog"); getJpaProject().synchronizeContextModel(); @@ -83,9 +83,8 @@ public class GenericJavaSequenceGenerator2_0Tests extends Generic2_0ContextModel sequenceGenerator.setSpecifiedCatalog("testCatalog"); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - SequenceGenerator2_0Annotation annotation = (SequenceGenerator2_0Annotation) attributeResource.getAnnotation(JPA.SEQUENCE_GENERATOR); + JavaResourceField resourceField = ((JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE)).getFields().iterator().next(); + SequenceGenerator2_0Annotation annotation = (SequenceGenerator2_0Annotation) resourceField.getAnnotation(JPA.SEQUENCE_GENERATOR); assertEquals("testCatalog", annotation.getCatalog()); sequenceGenerator.setSpecifiedCatalog(null); @@ -102,9 +101,8 @@ public class GenericJavaSequenceGenerator2_0Tests extends Generic2_0ContextModel SequenceGenerator2_0 sequenceGenerator = (SequenceGenerator2_0) idMapping.getGeneratorContainer().getSequenceGenerator(); assertNull(sequenceGenerator.getSchema()); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - SequenceGenerator2_0Annotation annotation = (SequenceGenerator2_0Annotation) attributeResource.getAnnotation(JPA.SEQUENCE_GENERATOR); + JavaResourceField resourceField = ((JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE)).getFields().iterator().next(); + SequenceGenerator2_0Annotation annotation = (SequenceGenerator2_0Annotation) resourceField.getAnnotation(JPA.SEQUENCE_GENERATOR); annotation.setSchema("testSchema"); getJpaProject().synchronizeContextModel(); @@ -168,9 +166,8 @@ public class GenericJavaSequenceGenerator2_0Tests extends Generic2_0ContextModel sequenceGenerator.setSpecifiedSchema("testSchema"); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - SequenceGenerator2_0Annotation annotation = (SequenceGenerator2_0Annotation) attributeResource.getAnnotation(JPA.SEQUENCE_GENERATOR); + JavaResourceField resourceField = ((JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE)).getFields().iterator().next(); + SequenceGenerator2_0Annotation annotation = (SequenceGenerator2_0Annotation) resourceField.getAnnotation(JPA.SEQUENCE_GENERATOR); assertEquals("testSchema", annotation.getSchema()); sequenceGenerator.setSpecifiedSchema(null); diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/orm/GenericOrmAssociationOverride2_0Tests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/orm/GenericOrmAssociationOverride2_0Tests.java index d3ecca1115..3f9f71532c 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/orm/GenericOrmAssociationOverride2_0Tests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/orm/GenericOrmAssociationOverride2_0Tests.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. @@ -122,7 +122,7 @@ public class GenericOrmAssociationOverride2_0Tests extends Generic2_0ContextMode OrmEntity ormEntity = (OrmEntity) ormPersistentType.getMapping(); OrmAssociationOverrideContainer overrideContainer = ormEntity.getAssociationOverrideContainer(); - ListIterator virtualAssociationOverrides = overrideContainer.virtualOverrides(); + ListIterator virtualAssociationOverrides = overrideContainer.getVirtualOverrides().iterator(); OrmVirtualAssociationOverride ormVirtualAssociationOverride = virtualAssociationOverrides.next(); assertEquals("address", ormVirtualAssociationOverride.getName()); @@ -130,11 +130,11 @@ public class GenericOrmAssociationOverride2_0Tests extends Generic2_0ContextMode XmlEntity entityResource = getXmlEntityMappings().getEntities().get(0); XmlAssociationOverride xmlAssociationOverride = entityResource.getAssociationOverrides().get(0); - OrmAssociationOverride ormAssociationOverride = overrideContainer.specifiedOverrides().next(); + OrmAssociationOverride ormAssociationOverride = overrideContainer.getSpecifiedOverrides().iterator().next(); assertEquals("address", ormAssociationOverride.getName()); assertEquals("address", xmlAssociationOverride.getName()); - assertTrue(overrideContainer.overrides().hasNext()); + assertTrue(overrideContainer.getOverrides().iterator().hasNext()); assertFalse(entityResource.getAssociationOverrides().isEmpty()); //set name in the resource model, verify context model updated @@ -152,7 +152,7 @@ public class GenericOrmAssociationOverride2_0Tests extends Generic2_0ContextMode assertEquals("FOO", xmlAssociationOverride.getName()); entityResource.getAssociationOverrides().remove(0); - assertFalse(overrideContainer.specifiedOverrides().hasNext()); + assertFalse(overrideContainer.getSpecifiedOverrides().iterator().hasNext()); assertTrue(entityResource.getAssociationOverrides().isEmpty()); } @@ -164,7 +164,7 @@ public class GenericOrmAssociationOverride2_0Tests extends Generic2_0ContextMode OrmEntity ormEntity = (OrmEntity) ormPersistentType.getMapping(); OrmAssociationOverrideContainer overrideContainer = ormEntity.getAssociationOverrideContainer(); - ListIterator virtualAssociationOverrides = overrideContainer.virtualOverrides(); + ListIterator virtualAssociationOverrides = overrideContainer.getVirtualOverrides().iterator(); OrmVirtualAssociationOverride virtualAssociationOverride = virtualAssociationOverrides.next(); assertEquals("address", virtualAssociationOverride.getName()); @@ -172,11 +172,11 @@ public class GenericOrmAssociationOverride2_0Tests extends Generic2_0ContextMode XmlEntity entityResource = getXmlEntityMappings().getEntities().get(0); XmlAssociationOverride xmlAssociationOverride = entityResource.getAssociationOverrides().get(0); - AssociationOverride specifiedAssociationOverride = overrideContainer.specifiedOverrides().next(); + AssociationOverride specifiedAssociationOverride = overrideContainer.getSpecifiedOverrides().iterator().next(); assertEquals("address", specifiedAssociationOverride.getName()); assertEquals("address", xmlAssociationOverride.getName()); - assertTrue(overrideContainer.overrides().hasNext()); + assertTrue(overrideContainer.getOverrides().iterator().hasNext()); assertFalse(entityResource.getAssociationOverrides().isEmpty()); //set name in the context model, verify resource model modified @@ -199,7 +199,7 @@ public class GenericOrmAssociationOverride2_0Tests extends Generic2_0ContextMode OrmEntity ormEntity = (OrmEntity) ormPersistentType.getMapping(); OrmAssociationOverrideContainer overrideContainer = ormEntity.getAssociationOverrideContainer(); - ListIterator virtualAssociationOverrides = overrideContainer.virtualOverrides(); + ListIterator virtualAssociationOverrides = overrideContainer.getVirtualOverrides().iterator(); OrmVirtualAssociationOverride ormAssociationOverride = virtualAssociationOverrides.next(); assertEquals("address", ormAssociationOverride.getName()); @@ -229,12 +229,12 @@ public class GenericOrmAssociationOverride2_0Tests extends Generic2_0ContextMode assertEquals("BAZ", xmlAssociationOverride.getJoinColumns().get(1).getName()); assertEquals("FOO", xmlAssociationOverride.getJoinColumns().get(2).getName()); - ListIterator joinColumns = joiningStrategy.specifiedJoinColumns(); + ListIterator joinColumns = joiningStrategy.getSpecifiedJoinColumns().iterator(); assertEquals(joinColumn2, joinColumns.next()); assertEquals(joinColumn3, joinColumns.next()); assertEquals(joinColumn, joinColumns.next()); - joinColumns = joiningStrategy.specifiedJoinColumns(); + joinColumns = joiningStrategy.getSpecifiedJoinColumns().iterator(); assertEquals("BAR", joinColumns.next().getName()); assertEquals("BAZ", joinColumns.next().getName()); assertEquals("FOO", joinColumns.next().getName()); @@ -248,7 +248,7 @@ public class GenericOrmAssociationOverride2_0Tests extends Generic2_0ContextMode OrmEntity ormEntity = (OrmEntity) ormPersistentType.getMapping(); OrmAssociationOverrideContainer overrideContainer = ormEntity.getAssociationOverrideContainer(); - ListIterator virtualAssociationOverrides = overrideContainer.virtualOverrides(); + ListIterator virtualAssociationOverrides = overrideContainer.getVirtualOverrides().iterator(); OrmVirtualAssociationOverride ormAssociationOverride = virtualAssociationOverrides.next(); assertEquals("address", ormAssociationOverride.getName()); @@ -291,7 +291,7 @@ public class GenericOrmAssociationOverride2_0Tests extends Generic2_0ContextMode OrmEntity ormEntity = (OrmEntity) ormPersistentType.getMapping(); OrmAssociationOverrideContainer overrideContainer = ormEntity.getAssociationOverrideContainer(); - ListIterator virtualAssociationOverrides = overrideContainer.virtualOverrides(); + ListIterator virtualAssociationOverrides = overrideContainer.getVirtualOverrides().iterator(); OrmVirtualAssociationOverride ormAssociationOverride = virtualAssociationOverrides.next(); assertEquals("address", ormAssociationOverride.getName()); @@ -309,7 +309,7 @@ public class GenericOrmAssociationOverride2_0Tests extends Generic2_0ContextMode joiningStrategy.moveSpecifiedJoinColumn(2, 0); - ListIterator joinColumns = joiningStrategy.specifiedJoinColumns(); + ListIterator joinColumns = joiningStrategy.getSpecifiedJoinColumns().iterator(); assertEquals("BAR", joinColumns.next().getName()); assertEquals("BAZ", joinColumns.next().getName()); assertEquals("FOO", joinColumns.next().getName()); @@ -320,7 +320,7 @@ public class GenericOrmAssociationOverride2_0Tests extends Generic2_0ContextMode joiningStrategy.moveSpecifiedJoinColumn(0, 1); - joinColumns = joiningStrategy.specifiedJoinColumns(); + joinColumns = joiningStrategy.getSpecifiedJoinColumns().iterator(); assertEquals("BAZ", joinColumns.next().getName()); assertEquals("BAR", joinColumns.next().getName()); assertEquals("FOO", joinColumns.next().getName()); @@ -338,7 +338,7 @@ public class GenericOrmAssociationOverride2_0Tests extends Generic2_0ContextMode OrmEntity ormEntity = (OrmEntity) ormPersistentType.getMapping(); OrmAssociationOverrideContainer overrideContainer = ormEntity.getAssociationOverrideContainer(); - ListIterator virtualAssociationOverrides = overrideContainer.virtualOverrides(); + ListIterator virtualAssociationOverrides = overrideContainer.getVirtualOverrides().iterator(); OrmVirtualAssociationOverride ormAssociationOverride = virtualAssociationOverrides.next(); assertEquals("address", ormAssociationOverride.getName()); @@ -348,7 +348,7 @@ public class GenericOrmAssociationOverride2_0Tests extends Generic2_0ContextMode XmlEntity entityResource = getXmlEntityMappings().getEntities().get(0); XmlAssociationOverride xmlAssociationOverride = entityResource.getAssociationOverrides().get(0); - ListIterator joinColumns = joiningStrategy.specifiedJoinColumns(); + ListIterator joinColumns = joiningStrategy.getSpecifiedJoinColumns().iterator(); JoinColumn joinColumn = joinColumns.next(); assertEquals("address_id", joinColumn.getSpecifiedName()); assertEquals("id", joinColumn.getSpecifiedReferencedColumnName()); @@ -361,7 +361,7 @@ public class GenericOrmAssociationOverride2_0Tests extends Generic2_0ContextMode xmlAssociationOverride.getJoinColumns().get(1).setName("BAR"); xmlAssociationOverride.getJoinColumns().get(2).setName("BAZ"); - joinColumns = joiningStrategy.specifiedJoinColumns(); + joinColumns = joiningStrategy.getSpecifiedJoinColumns().iterator(); assertEquals("FOO", joinColumns.next().getName()); assertEquals("BAR", joinColumns.next().getName()); assertEquals("BAZ", joinColumns.next().getName()); @@ -369,7 +369,7 @@ public class GenericOrmAssociationOverride2_0Tests extends Generic2_0ContextMode assertFalse(joinColumns.hasNext()); xmlAssociationOverride.getJoinColumns().move(2, 0); - joinColumns = joiningStrategy.specifiedJoinColumns(); + joinColumns = joiningStrategy.getSpecifiedJoinColumns().iterator(); assertEquals("BAR", joinColumns.next().getName()); assertEquals("BAZ", joinColumns.next().getName()); assertEquals("FOO", joinColumns.next().getName()); @@ -377,7 +377,7 @@ public class GenericOrmAssociationOverride2_0Tests extends Generic2_0ContextMode assertFalse(joinColumns.hasNext()); xmlAssociationOverride.getJoinColumns().move(0, 1); - joinColumns = joiningStrategy.specifiedJoinColumns(); + joinColumns = joiningStrategy.getSpecifiedJoinColumns().iterator(); assertEquals("BAZ", joinColumns.next().getName()); assertEquals("BAR", joinColumns.next().getName()); assertEquals("FOO", joinColumns.next().getName()); @@ -385,24 +385,24 @@ public class GenericOrmAssociationOverride2_0Tests extends Generic2_0ContextMode assertFalse(joinColumns.hasNext()); xmlAssociationOverride.getJoinColumns().remove(1); - joinColumns = joiningStrategy.specifiedJoinColumns(); + joinColumns = joiningStrategy.getSpecifiedJoinColumns().iterator(); assertEquals("BAZ", joinColumns.next().getName()); assertEquals("FOO", joinColumns.next().getName()); assertEquals("address_id", joinColumns.next().getName()); assertFalse(joinColumns.hasNext()); xmlAssociationOverride.getJoinColumns().remove(1); - joinColumns = joiningStrategy.specifiedJoinColumns(); + joinColumns = joiningStrategy.getSpecifiedJoinColumns().iterator(); assertEquals("BAZ", joinColumns.next().getName()); assertEquals("address_id", joinColumns.next().getName()); assertFalse(joinColumns.hasNext()); xmlAssociationOverride.getJoinColumns().remove(0); - joinColumns = joiningStrategy.specifiedJoinColumns(); + joinColumns = joiningStrategy.getSpecifiedJoinColumns().iterator(); assertEquals("address_id", joinColumns.next().getName()); xmlAssociationOverride.getJoinColumns().remove(0); - assertFalse(joiningStrategy.specifiedJoinColumns().hasNext()); + assertFalse(joiningStrategy.getSpecifiedJoinColumns().iterator().hasNext()); } public void testIsVirtual() throws Exception { @@ -414,9 +414,9 @@ public class GenericOrmAssociationOverride2_0Tests extends Generic2_0ContextMode OrmAssociationOverrideContainer overrideContainer = ormEntity.getAssociationOverrideContainer(); assertEquals("AnnotationTestTypeChild", ormEntity.getName()); - assertEquals(1, overrideContainer.virtualOverridesSize()); + assertEquals(1, overrideContainer.getVirtualOverridesSize()); - ReadOnlyAssociationOverride associationOverride = overrideContainer.virtualOverrides().next(); + ReadOnlyAssociationOverride associationOverride = overrideContainer.getVirtualOverrides().iterator().next(); assertTrue(associationOverride.isVirtual()); } @@ -429,7 +429,7 @@ public class GenericOrmAssociationOverride2_0Tests extends Generic2_0ContextMode OrmEntity ormEntity = (OrmEntity) ormPersistentType.getMapping(); OrmAssociationOverrideContainer overrideContainer = ormEntity.getAssociationOverrideContainer(); - OrmVirtualAssociationOverride virtualOverride = overrideContainer.virtualOverrides().next(); + OrmVirtualAssociationOverride virtualOverride = overrideContainer.getVirtualOverrides().iterator().next(); OrmAssociationOverride associationOverride = virtualOverride.convertToSpecified(); ((OverrideRelationship2_0) associationOverride.getRelationship()).setStrategyToJoinTable(); JoinTableRelationshipStrategy joiningStrategy = ((OverrideRelationship2_0) associationOverride.getRelationship()).getJoinTableStrategy(); @@ -452,7 +452,7 @@ public class GenericOrmAssociationOverride2_0Tests extends Generic2_0ContextMode OrmEntity ormEntity = (OrmEntity) ormPersistentType.getMapping(); OrmAssociationOverrideContainer overrideContainer = ormEntity.getAssociationOverrideContainer(); - OrmVirtualAssociationOverride virtualOverride = overrideContainer.virtualOverrides().next(); + OrmVirtualAssociationOverride virtualOverride = overrideContainer.getVirtualOverrides().iterator().next(); OrmAssociationOverride associationOverride = virtualOverride.convertToSpecified(); ((OrmOverrideRelationship2_0) associationOverride.getRelationship()).setStrategyToJoinTable(); OrmJoinTableRelationshipStrategy joiningStrategy = ((OrmOverrideRelationship2_0) associationOverride.getRelationship()).getJoinTableStrategy(); @@ -471,39 +471,39 @@ public class GenericOrmAssociationOverride2_0Tests extends Generic2_0ContextMode xmlAssociationOverride.getJoinTable().getJoinColumns().get(1).setName("BAR"); xmlAssociationOverride.getJoinTable().getJoinColumns().get(2).setName("BAZ"); - ListIterator joinColumns = joiningStrategy.getJoinTable().specifiedJoinColumns(); + ListIterator joinColumns = joiningStrategy.getJoinTable().getSpecifiedJoinColumns().iterator(); assertEquals("FOO", joinColumns.next().getName()); assertEquals("BAR", joinColumns.next().getName()); assertEquals("BAZ", joinColumns.next().getName()); assertFalse(joinColumns.hasNext()); xmlAssociationOverride.getJoinTable().getJoinColumns().move(2, 0); - joinColumns = joiningStrategy.getJoinTable().specifiedJoinColumns(); + joinColumns = joiningStrategy.getJoinTable().getSpecifiedJoinColumns().iterator(); assertEquals("BAR", joinColumns.next().getName()); assertEquals("BAZ", joinColumns.next().getName()); assertEquals("FOO", joinColumns.next().getName()); assertFalse(joinColumns.hasNext()); xmlAssociationOverride.getJoinTable().getJoinColumns().move(0, 1); - joinColumns = joiningStrategy.getJoinTable().specifiedJoinColumns(); + joinColumns = joiningStrategy.getJoinTable().getSpecifiedJoinColumns().iterator(); assertEquals("BAZ", joinColumns.next().getName()); assertEquals("BAR", joinColumns.next().getName()); assertEquals("FOO", joinColumns.next().getName()); assertFalse(joinColumns.hasNext()); xmlAssociationOverride.getJoinTable().getJoinColumns().remove(1); - joinColumns = joiningStrategy.getJoinTable().specifiedJoinColumns(); + joinColumns = joiningStrategy.getJoinTable().getSpecifiedJoinColumns().iterator(); assertEquals("BAZ", joinColumns.next().getName()); assertEquals("FOO", joinColumns.next().getName()); assertFalse(joinColumns.hasNext()); xmlAssociationOverride.getJoinTable().getJoinColumns().remove(1); - joinColumns = joiningStrategy.getJoinTable().specifiedJoinColumns(); + joinColumns = joiningStrategy.getJoinTable().getSpecifiedJoinColumns().iterator(); assertEquals("BAZ", joinColumns.next().getName()); assertFalse(joinColumns.hasNext()); xmlAssociationOverride.getJoinTable().getJoinColumns().remove(0); - assertFalse(joiningStrategy.getJoinTable().specifiedJoinColumns().hasNext()); + assertFalse(joiningStrategy.getJoinTable().getSpecifiedJoinColumns().iterator().hasNext()); } public void testDefaultJoinTableName() throws Exception { @@ -514,7 +514,7 @@ public class GenericOrmAssociationOverride2_0Tests extends Generic2_0ContextMode OrmEntity ormEntity = (OrmEntity) ormPersistentType.getMapping(); OrmAssociationOverrideContainer overrideContainer = ormEntity.getAssociationOverrideContainer(); - ReadOnlyAssociationOverride associationOverride = overrideContainer.virtualOverrides().next(); + ReadOnlyAssociationOverride associationOverride = overrideContainer.getVirtualOverrides().iterator().next(); VirtualJoinTableRelationshipStrategy joiningStrategy = ((VirtualOverrideRelationship2_0) associationOverride.getRelationship()).getJoinTableStrategy(); VirtualJoinTable joinTable = joiningStrategy.getJoinTable(); diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/orm/GenericOrmCollectionTable2_0Tests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/orm/GenericOrmCollectionTable2_0Tests.java index 91c19b70ca..f80cb1439a 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/orm/GenericOrmCollectionTable2_0Tests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/orm/GenericOrmCollectionTable2_0Tests.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. @@ -145,7 +145,7 @@ public class GenericOrmCollectionTable2_0Tests extends Generic2_0ContextModelTes assertEquals(TYPE_NAME + "_projects", virtualCollectionTable.getName()); assertNull(virtualCollectionTable.getSpecifiedCatalog()); assertNull(virtualCollectionTable.getSpecifiedSchema()); - assertEquals(0, virtualCollectionTable.specifiedJoinColumnsSize()); + assertEquals(0, virtualCollectionTable.getSpecifiedJoinColumnsSize()); JoinColumn virtualJoinColumn = virtualCollectionTable.getDefaultJoinColumn(); assertEquals(TYPE_NAME + "_id", virtualJoinColumn.getDefaultName()); assertEquals("id", virtualJoinColumn.getDefaultReferencedColumnName()); @@ -163,8 +163,8 @@ public class GenericOrmCollectionTable2_0Tests extends Generic2_0ContextModelTes assertEquals("FOO", virtualCollectionTable.getSpecifiedName()); assertEquals("CATALOG", virtualCollectionTable.getSpecifiedCatalog()); assertEquals("SCHEMA", virtualCollectionTable.getSpecifiedSchema()); - assertEquals(1, virtualCollectionTable.specifiedJoinColumnsSize()); - virtualJoinColumn = virtualCollectionTable.specifiedJoinColumns().next(); + assertEquals(1, virtualCollectionTable.getSpecifiedJoinColumnsSize()); + virtualJoinColumn = virtualCollectionTable.getSpecifiedJoinColumns().iterator().next(); assertEquals("NAME", virtualJoinColumn.getSpecifiedName()); assertEquals("REFERENCED_NAME", virtualJoinColumn.getSpecifiedReferencedColumnName()); } @@ -345,12 +345,12 @@ public class GenericOrmCollectionTable2_0Tests extends Generic2_0ContextModelTes assertEquals("BAZ", resourceCollectionTable.getJoinColumns().get(1).getName()); assertEquals("FOO", resourceCollectionTable.getJoinColumns().get(2).getName()); - ListIterator joinColumns = ormCollectionTable.specifiedJoinColumns(); + ListIterator joinColumns = ormCollectionTable.getSpecifiedJoinColumns().iterator(); assertEquals(joinColumn2, joinColumns.next()); assertEquals(joinColumn3, joinColumns.next()); assertEquals(joinColumn, joinColumns.next()); - joinColumns = ormCollectionTable.specifiedJoinColumns(); + joinColumns = ormCollectionTable.getSpecifiedJoinColumns().iterator(); assertEquals("BAR", joinColumns.next().getName()); assertEquals("BAZ", joinColumns.next().getName()); assertEquals("FOO", joinColumns.next().getName()); @@ -401,7 +401,7 @@ public class GenericOrmCollectionTable2_0Tests extends Generic2_0ContextModelTes ormCollectionTable.moveSpecifiedJoinColumn(2, 0); - ListIterator joinColumns = ormCollectionTable.specifiedJoinColumns(); + ListIterator joinColumns = ormCollectionTable.getSpecifiedJoinColumns().iterator(); assertEquals("BAR", joinColumns.next().getName()); assertEquals("BAZ", joinColumns.next().getName()); assertEquals("FOO", joinColumns.next().getName()); @@ -412,7 +412,7 @@ public class GenericOrmCollectionTable2_0Tests extends Generic2_0ContextModelTes ormCollectionTable.moveSpecifiedJoinColumn(0, 1); - joinColumns = ormCollectionTable.specifiedJoinColumns(); + joinColumns = ormCollectionTable.getSpecifiedJoinColumns().iterator(); assertEquals("BAZ", joinColumns.next().getName()); assertEquals("BAR", joinColumns.next().getName()); assertEquals("FOO", joinColumns.next().getName()); @@ -441,39 +441,39 @@ public class GenericOrmCollectionTable2_0Tests extends Generic2_0ContextModelTes resourceCollectionTable.getJoinColumns().get(1).setName("BAR"); resourceCollectionTable.getJoinColumns().get(2).setName("BAZ"); - ListIterator joinColumns = ormCollectionTable.specifiedJoinColumns(); + ListIterator joinColumns = ormCollectionTable.getSpecifiedJoinColumns().iterator(); assertEquals("FOO", joinColumns.next().getName()); assertEquals("BAR", joinColumns.next().getName()); assertEquals("BAZ", joinColumns.next().getName()); assertFalse(joinColumns.hasNext()); resourceCollectionTable.getJoinColumns().move(2, 0); - joinColumns = ormCollectionTable.specifiedJoinColumns(); + joinColumns = ormCollectionTable.getSpecifiedJoinColumns().iterator(); assertEquals("BAR", joinColumns.next().getName()); assertEquals("BAZ", joinColumns.next().getName()); assertEquals("FOO", joinColumns.next().getName()); assertFalse(joinColumns.hasNext()); resourceCollectionTable.getJoinColumns().move(0, 1); - joinColumns = ormCollectionTable.specifiedJoinColumns(); + joinColumns = ormCollectionTable.getSpecifiedJoinColumns().iterator(); assertEquals("BAZ", joinColumns.next().getName()); assertEquals("BAR", joinColumns.next().getName()); assertEquals("FOO", joinColumns.next().getName()); assertFalse(joinColumns.hasNext()); resourceCollectionTable.getJoinColumns().remove(1); - joinColumns = ormCollectionTable.specifiedJoinColumns(); + joinColumns = ormCollectionTable.getSpecifiedJoinColumns().iterator(); assertEquals("BAZ", joinColumns.next().getName()); assertEquals("FOO", joinColumns.next().getName()); assertFalse(joinColumns.hasNext()); resourceCollectionTable.getJoinColumns().remove(1); - joinColumns = ormCollectionTable.specifiedJoinColumns(); + joinColumns = ormCollectionTable.getSpecifiedJoinColumns().iterator(); assertEquals("BAZ", joinColumns.next().getName()); assertFalse(joinColumns.hasNext()); resourceCollectionTable.getJoinColumns().remove(0); - assertFalse(ormCollectionTable.specifiedJoinColumns().hasNext()); + assertFalse(ormCollectionTable.getSpecifiedJoinColumns().iterator().hasNext()); } public void testUniqueConstraints() throws Exception { @@ -486,7 +486,7 @@ public class GenericOrmCollectionTable2_0Tests extends Generic2_0ContextModelTes resourceElementCollection.setCollectionTable(OrmFactory.eINSTANCE.createXmlCollectionTable()); XmlCollectionTable resourceCollectionTable = resourceElementCollection.getCollectionTable(); - ListIterator uniqueConstraints = ormCollectionTable.uniqueConstraints(); + ListIterator uniqueConstraints = ormCollectionTable.getUniqueConstraints().iterator(); assertFalse(uniqueConstraints.hasNext()); XmlUniqueConstraint uniqueConstraintResource = OrmFactory.eINSTANCE.createXmlUniqueConstraint(); @@ -497,7 +497,7 @@ public class GenericOrmCollectionTable2_0Tests extends Generic2_0ContextModelTes resourceCollectionTable.getUniqueConstraints().add(0, uniqueConstraintResource); uniqueConstraintResource.getColumnNames().add(0, "bar"); - uniqueConstraints = ormCollectionTable.uniqueConstraints(); + uniqueConstraints = ormCollectionTable.getUniqueConstraints().iterator(); assertTrue(uniqueConstraints.hasNext()); assertEquals("bar", uniqueConstraints.next().getColumnNames().iterator().next()); assertEquals("foo", uniqueConstraints.next().getColumnNames().iterator().next()); @@ -514,7 +514,7 @@ public class GenericOrmCollectionTable2_0Tests extends Generic2_0ContextModelTes resourceElementCollection.setCollectionTable(OrmFactory.eINSTANCE.createXmlCollectionTable()); XmlCollectionTable resourceCollectionTable = resourceElementCollection.getCollectionTable(); - assertEquals(0, ormCollectionTable.uniqueConstraintsSize()); + assertEquals(0, ormCollectionTable.getUniqueConstraintsSize()); XmlUniqueConstraint uniqueConstraintResource = OrmFactory.eINSTANCE.createXmlUniqueConstraint(); resourceCollectionTable.getUniqueConstraints().add(0, uniqueConstraintResource); @@ -524,7 +524,7 @@ public class GenericOrmCollectionTable2_0Tests extends Generic2_0ContextModelTes resourceCollectionTable.getUniqueConstraints().add(1, uniqueConstraintResource); uniqueConstraintResource.getColumnNames().add(0, "bar"); - assertEquals(2, ormCollectionTable.uniqueConstraintsSize()); + assertEquals(2, ormCollectionTable.getUniqueConstraintsSize()); } public void testAddUniqueConstraint() throws Exception { @@ -594,7 +594,7 @@ public class GenericOrmCollectionTable2_0Tests extends Generic2_0ContextModelTes assertEquals("BAZ", uniqueConstraintResources.next().getColumnNames().get(0)); assertFalse(uniqueConstraintResources.hasNext()); - Iterator uniqueConstraints = ormCollectionTable.uniqueConstraints(); + Iterator uniqueConstraints = ormCollectionTable.getUniqueConstraints().iterator(); assertEquals("FOO", uniqueConstraints.next().getColumnNames().iterator().next()); assertEquals("BAZ", uniqueConstraints.next().getColumnNames().iterator().next()); assertFalse(uniqueConstraints.hasNext()); @@ -605,7 +605,7 @@ public class GenericOrmCollectionTable2_0Tests extends Generic2_0ContextModelTes assertEquals("FOO", uniqueConstraintResources.next().getColumnNames().get(0)); assertFalse(uniqueConstraintResources.hasNext()); - uniqueConstraints = ormCollectionTable.uniqueConstraints(); + uniqueConstraints = ormCollectionTable.getUniqueConstraints().iterator(); assertEquals("FOO", uniqueConstraints.next().getColumnNames().iterator().next()); assertFalse(uniqueConstraints.hasNext()); @@ -613,7 +613,7 @@ public class GenericOrmCollectionTable2_0Tests extends Generic2_0ContextModelTes ormCollectionTable.removeUniqueConstraint(0); uniqueConstraintResources = resourceCollectionTable.getUniqueConstraints().listIterator(); assertFalse(uniqueConstraintResources.hasNext()); - uniqueConstraints = ormCollectionTable.uniqueConstraints(); + uniqueConstraints = ormCollectionTable.getUniqueConstraints().iterator(); assertFalse(uniqueConstraints.hasNext()); } @@ -635,7 +635,7 @@ public class GenericOrmCollectionTable2_0Tests extends Generic2_0ContextModelTes ormCollectionTable.moveUniqueConstraint(2, 0); - ListIterator uniqueConstraints = ormCollectionTable.uniqueConstraints(); + ListIterator uniqueConstraints = ormCollectionTable.getUniqueConstraints().iterator(); assertEquals("BAR", uniqueConstraints.next().getColumnNames().iterator().next()); assertEquals("BAZ", uniqueConstraints.next().getColumnNames().iterator().next()); assertEquals("FOO", uniqueConstraints.next().getColumnNames().iterator().next()); @@ -647,7 +647,7 @@ public class GenericOrmCollectionTable2_0Tests extends Generic2_0ContextModelTes ormCollectionTable.moveUniqueConstraint(0, 1); - uniqueConstraints = ormCollectionTable.uniqueConstraints(); + uniqueConstraints = ormCollectionTable.getUniqueConstraints().iterator(); assertEquals("BAZ", uniqueConstraints.next().getColumnNames().iterator().next()); assertEquals("BAR", uniqueConstraints.next().getColumnNames().iterator().next()); assertEquals("FOO", uniqueConstraints.next().getColumnNames().iterator().next()); @@ -681,39 +681,39 @@ public class GenericOrmCollectionTable2_0Tests extends Generic2_0ContextModelTes uniqueConstraintResource.getColumnNames().add(0, "BAZ"); - ListIterator uniqueConstraints = ormCollectionTable.uniqueConstraints(); + ListIterator uniqueConstraints = ormCollectionTable.getUniqueConstraints().iterator(); assertEquals("FOO", uniqueConstraints.next().getColumnNames().iterator().next()); assertEquals("BAR", uniqueConstraints.next().getColumnNames().iterator().next()); assertEquals("BAZ", uniqueConstraints.next().getColumnNames().iterator().next()); assertFalse(uniqueConstraints.hasNext()); resourceCollectionTable.getUniqueConstraints().move(2, 0); - uniqueConstraints = ormCollectionTable.uniqueConstraints(); + uniqueConstraints = ormCollectionTable.getUniqueConstraints().iterator(); assertEquals("BAR", uniqueConstraints.next().getColumnNames().iterator().next()); assertEquals("BAZ", uniqueConstraints.next().getColumnNames().iterator().next()); assertEquals("FOO", uniqueConstraints.next().getColumnNames().iterator().next()); assertFalse(uniqueConstraints.hasNext()); resourceCollectionTable.getUniqueConstraints().move(0, 1); - uniqueConstraints = ormCollectionTable.uniqueConstraints(); + uniqueConstraints = ormCollectionTable.getUniqueConstraints().iterator(); assertEquals("BAZ", uniqueConstraints.next().getColumnNames().iterator().next()); assertEquals("BAR", uniqueConstraints.next().getColumnNames().iterator().next()); assertEquals("FOO", uniqueConstraints.next().getColumnNames().iterator().next()); assertFalse(uniqueConstraints.hasNext()); resourceCollectionTable.getUniqueConstraints().remove(1); - uniqueConstraints = ormCollectionTable.uniqueConstraints(); + uniqueConstraints = ormCollectionTable.getUniqueConstraints().iterator(); assertEquals("BAZ", uniqueConstraints.next().getColumnNames().iterator().next()); assertEquals("FOO", uniqueConstraints.next().getColumnNames().iterator().next()); assertFalse(uniqueConstraints.hasNext()); resourceCollectionTable.getUniqueConstraints().remove(1); - uniqueConstraints = ormCollectionTable.uniqueConstraints(); + uniqueConstraints = ormCollectionTable.getUniqueConstraints().iterator(); assertEquals("BAZ", uniqueConstraints.next().getColumnNames().iterator().next()); assertFalse(uniqueConstraints.hasNext()); resourceCollectionTable.getUniqueConstraints().remove(0); - uniqueConstraints = ormCollectionTable.uniqueConstraints(); + uniqueConstraints = ormCollectionTable.getUniqueConstraints().iterator(); assertFalse(uniqueConstraints.hasNext()); } @@ -721,23 +721,23 @@ public class GenericOrmCollectionTable2_0Tests extends Generic2_0ContextModelTes createTestEntityWithValidElementCollection(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmReadOnlyPersistentAttribute virtualAttribute = ormPersistentType.attributes().next(); + OrmReadOnlyPersistentAttribute virtualAttribute = ormPersistentType.getAttributes().iterator().next(); assertTrue(virtualAttribute.isVirtual()); ElementCollectionMapping2_0 virtualElementCollectionMapping = (ElementCollectionMapping2_0) virtualAttribute.getMapping(); CollectionTable2_0 virtualCollectionTable = virtualElementCollectionMapping.getCollectionTable(); - ListIterator uniqueConstraints = (ListIterator) virtualCollectionTable.uniqueConstraints(); + ListIterator uniqueConstraints = virtualCollectionTable.getUniqueConstraints().iterator(); assertFalse(uniqueConstraints.hasNext()); - JavaElementCollectionMapping2_0 javaElementCollectionMapping2_0 = (JavaElementCollectionMapping2_0) ormPersistentType.getJavaPersistentType().attributes().next().getMapping(); + JavaElementCollectionMapping2_0 javaElementCollectionMapping2_0 = (JavaElementCollectionMapping2_0) ormPersistentType.getJavaPersistentType().getAttributes().iterator().next().getMapping(); JavaCollectionTable2_0 javaCollectionTable = javaElementCollectionMapping2_0.getCollectionTable(); javaCollectionTable.addUniqueConstraint(0).addColumnName(0, "FOO"); javaCollectionTable.addUniqueConstraint(1).addColumnName(0, "BAR"); javaCollectionTable.addUniqueConstraint(2).addColumnName(0, "BAZ"); - uniqueConstraints = (ListIterator) virtualCollectionTable.uniqueConstraints(); + uniqueConstraints = virtualCollectionTable.getUniqueConstraints().iterator(); assertTrue(uniqueConstraints.hasNext()); assertEquals("FOO", uniqueConstraints.next().getColumnNames().iterator().next()); assertEquals("BAR", uniqueConstraints.next().getColumnNames().iterator().next()); @@ -746,8 +746,8 @@ public class GenericOrmCollectionTable2_0Tests extends Generic2_0ContextModelTes virtualAttribute.convertToSpecified(); - virtualElementCollectionMapping = (OrmElementCollectionMapping2_0) ormPersistentType.attributes().next().getMapping(); - assertEquals(0, virtualElementCollectionMapping.getCollectionTable().uniqueConstraintsSize()); + virtualElementCollectionMapping = (OrmElementCollectionMapping2_0) ormPersistentType.getAttributes().iterator().next().getMapping(); + assertEquals(0, virtualElementCollectionMapping.getCollectionTable().getUniqueConstraintsSize()); } } \ No newline at end of file diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/orm/GenericOrmElementCollectionMapping2_0Tests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/orm/GenericOrmElementCollectionMapping2_0Tests.java index 529b6def23..e844327d1c 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/orm/GenericOrmElementCollectionMapping2_0Tests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/orm/GenericOrmElementCollectionMapping2_0Tests.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. @@ -30,6 +30,7 @@ import org.eclipse.jpt.jpa.core.context.ReadOnlyAttributeOverride; import org.eclipse.jpt.jpa.core.context.ReadOnlyColumn; import org.eclipse.jpt.jpa.core.context.TransientMapping; import org.eclipse.jpt.jpa.core.context.VersionMapping; +import org.eclipse.jpt.jpa.core.context.VirtualAttributeOverride; import org.eclipse.jpt.jpa.core.context.java.JavaBasicMapping; import org.eclipse.jpt.jpa.core.context.orm.OrmAttributeOverride; import org.eclipse.jpt.jpa.core.context.orm.OrmAttributeOverrideContainer; @@ -39,7 +40,6 @@ import org.eclipse.jpt.jpa.core.context.orm.OrmOneToManyMapping; import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentAttribute; import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentType; import org.eclipse.jpt.jpa.core.context.orm.OrmReadOnlyPersistentAttribute; -import org.eclipse.jpt.jpa.core.context.orm.OrmVirtualAttributeOverride; import org.eclipse.jpt.jpa.core.jpa2.MappingKeys2_0; import org.eclipse.jpt.jpa.core.jpa2.context.ElementCollectionMapping2_0; import org.eclipse.jpt.jpa.core.jpa2.context.OrderColumn2_0; @@ -335,9 +335,9 @@ public class GenericOrmElementCollectionMapping2_0Tests extends Generic2_0Contex OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); getEntityMappings().addPersistentType(MappingKeys.EMBEDDABLE_TYPE_MAPPING_KEY, PACKAGE_NAME + ".Address"); ormPersistentType.addSpecifiedAttribute(MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY, "foo"); - assertEquals(3, ormPersistentType.virtualAttributesSize()); + assertEquals(3, ormPersistentType.getVirtualAttributesSize()); - OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.specifiedAttributes().next(); + OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.getSpecifiedAttributes().iterator().next(); OrmElementCollectionMapping2_0 ormElementCollectionMapping = (OrmElementCollectionMapping2_0) ormPersistentAttribute.getMapping(); assertEquals("foo", ormElementCollectionMapping.getName()); @@ -353,8 +353,8 @@ public class GenericOrmElementCollectionMapping2_0Tests extends Generic2_0Contex OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); getEntityMappings().addPersistentType(MappingKeys.EMBEDDABLE_TYPE_MAPPING_KEY, PACKAGE_NAME + ".Address"); - assertEquals(3, ormPersistentType.virtualAttributesSize()); - OrmReadOnlyPersistentAttribute ormPersistentAttribute = ormPersistentType.virtualAttributes().next(); + assertEquals(3, ormPersistentType.getVirtualAttributesSize()); + OrmReadOnlyPersistentAttribute ormPersistentAttribute = ormPersistentType.getVirtualAttributes().iterator().next(); ElementCollectionMapping2_0 virtualElementCollectionMapping = (ElementCollectionMapping2_0) ormPersistentAttribute.getMapping(); assertEquals("address", virtualElementCollectionMapping.getName()); @@ -377,13 +377,13 @@ public class GenericOrmElementCollectionMapping2_0Tests extends Generic2_0Contex OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); getEntityMappings().addPersistentType(MappingKeys.EMBEDDABLE_TYPE_MAPPING_KEY, PACKAGE_NAME + ".Address"); ormPersistentType.getMapping().setSpecifiedMetadataComplete(Boolean.TRUE); - assertEquals(3, ormPersistentType.virtualAttributesSize()); + assertEquals(3, ormPersistentType.getVirtualAttributesSize()); OrmReadOnlyPersistentAttribute ormPersistentAttribute = ormPersistentType.getAttributeNamed("address"); assertEquals(MappingKeys.NULL_ATTRIBUTE_MAPPING_KEY, ormPersistentAttribute.getMappingKey()); ormPersistentAttribute.convertToSpecified(MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY); - ormPersistentAttribute = ormPersistentType.specifiedAttributes().next(); + ormPersistentAttribute = ormPersistentType.getSpecifiedAttributes().iterator().next(); OrmElementCollectionMapping2_0 ormElementCollectionMapping = (OrmElementCollectionMapping2_0) ormPersistentAttribute.getMapping(); assertEquals("address", ormElementCollectionMapping.getName()); @@ -398,9 +398,9 @@ public class GenericOrmElementCollectionMapping2_0Tests extends Generic2_0Contex getEntityMappings().addPersistentType(MappingKeys.EMBEDDABLE_TYPE_MAPPING_KEY, PACKAGE_NAME + ".Address"); ormPersistentType.addSpecifiedAttribute(MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY, "address"); - assertEquals(2, ormPersistentType.virtualAttributesSize()); + assertEquals(2, ormPersistentType.getVirtualAttributesSize()); - OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.specifiedAttributes().next(); + OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.getSpecifiedAttributes().iterator().next(); OrmElementCollectionMapping2_0 ormElementCollectionMapping = (OrmElementCollectionMapping2_0) ormPersistentAttribute.getMapping(); assertEquals("address", ormElementCollectionMapping.getName()); @@ -419,8 +419,8 @@ public class GenericOrmElementCollectionMapping2_0Tests extends Generic2_0Contex assertFalse(elementCollectionMapping.isDefault()); ormPersistentAttribute.setMappingKey(MappingKeys.ID_ATTRIBUTE_MAPPING_KEY); - assertEquals(1, ormPersistentType.specifiedAttributesSize()); - assertEquals(ormPersistentAttribute, ormPersistentType.specifiedAttributes().next()); + assertEquals(1, ormPersistentType.getSpecifiedAttributesSize()); + assertEquals(ormPersistentAttribute, ormPersistentType.getSpecifiedAttributes().iterator().next()); assertTrue(ormPersistentAttribute.getMapping() instanceof IdMapping); assertEquals("oneToOne", ormPersistentAttribute.getMapping().getName()); } @@ -435,8 +435,8 @@ public class GenericOrmElementCollectionMapping2_0Tests extends Generic2_0Contex assertFalse(elementCollectionMapping.isDefault()); ormPersistentAttribute.setMappingKey(MappingKeys.VERSION_ATTRIBUTE_MAPPING_KEY); - assertEquals(1, ormPersistentType.specifiedAttributesSize()); - assertEquals(ormPersistentAttribute, ormPersistentType.specifiedAttributes().next()); + assertEquals(1, ormPersistentType.getSpecifiedAttributesSize()); + assertEquals(ormPersistentAttribute, ormPersistentType.getSpecifiedAttributes().iterator().next()); assertTrue(ormPersistentAttribute.getMapping() instanceof VersionMapping); assertEquals("oneToOne", ormPersistentAttribute.getMapping().getName()); } @@ -451,8 +451,8 @@ public class GenericOrmElementCollectionMapping2_0Tests extends Generic2_0Contex assertFalse(elementCollectionMapping.isDefault()); ormPersistentAttribute.setMappingKey(MappingKeys.TRANSIENT_ATTRIBUTE_MAPPING_KEY); - assertEquals(1, ormPersistentType.specifiedAttributesSize()); - assertEquals(ormPersistentAttribute, ormPersistentType.specifiedAttributes().next()); + assertEquals(1, ormPersistentType.getSpecifiedAttributesSize()); + assertEquals(ormPersistentAttribute, ormPersistentType.getSpecifiedAttributes().iterator().next()); assertTrue(ormPersistentAttribute.getMapping() instanceof TransientMapping); assertEquals("oneToOne", ormPersistentAttribute.getMapping().getName()); } @@ -467,8 +467,8 @@ public class GenericOrmElementCollectionMapping2_0Tests extends Generic2_0Contex assertFalse(elementCollectionMapping.isDefault()); ormPersistentAttribute.setMappingKey(MappingKeys.EMBEDDED_ATTRIBUTE_MAPPING_KEY); - assertEquals(1, ormPersistentType.specifiedAttributesSize()); - assertEquals(ormPersistentAttribute, ormPersistentType.specifiedAttributes().next()); + assertEquals(1, ormPersistentType.getSpecifiedAttributesSize()); + assertEquals(ormPersistentAttribute, ormPersistentType.getSpecifiedAttributes().iterator().next()); assertTrue(ormPersistentAttribute.getMapping() instanceof EmbeddedMapping); assertEquals("oneToOne", ormPersistentAttribute.getMapping().getName()); } @@ -483,8 +483,8 @@ public class GenericOrmElementCollectionMapping2_0Tests extends Generic2_0Contex assertFalse(elementCollectionMapping.isDefault()); ormPersistentAttribute.setMappingKey(MappingKeys.EMBEDDED_ID_ATTRIBUTE_MAPPING_KEY); - assertEquals(1, ormPersistentType.specifiedAttributesSize()); - assertEquals(ormPersistentAttribute, ormPersistentType.specifiedAttributes().next()); + assertEquals(1, ormPersistentType.getSpecifiedAttributesSize()); + assertEquals(ormPersistentAttribute, ormPersistentType.getSpecifiedAttributes().iterator().next()); assertTrue(ormPersistentAttribute.getMapping() instanceof EmbeddedIdMapping); assertEquals("oneToOne", ormPersistentAttribute.getMapping().getName()); } @@ -499,8 +499,8 @@ public class GenericOrmElementCollectionMapping2_0Tests extends Generic2_0Contex assertFalse(elementCollectionMapping.isDefault()); ormPersistentAttribute.setMappingKey(MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); - assertEquals(1, ormPersistentType.specifiedAttributesSize()); - assertEquals(ormPersistentAttribute, ormPersistentType.specifiedAttributes().next()); + assertEquals(1, ormPersistentType.getSpecifiedAttributesSize()); + assertEquals(ormPersistentAttribute, ormPersistentType.getSpecifiedAttributes().iterator().next()); assertTrue(ormPersistentAttribute.getMapping() instanceof ManyToManyMapping); assertEquals("oneToOne", ormPersistentAttribute.getMapping().getName()); // assertEquals(FetchType.EAGER, ((ManyToManyMapping) ormPersistentAttribute.getMapping()).getSpecifiedFetch()); @@ -516,8 +516,8 @@ public class GenericOrmElementCollectionMapping2_0Tests extends Generic2_0Contex assertFalse(elementCollectionMapping.isDefault()); ormPersistentAttribute.setMappingKey(MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY); - assertEquals(1, ormPersistentType.specifiedAttributesSize()); - assertEquals(ormPersistentAttribute, ormPersistentType.specifiedAttributes().next()); + assertEquals(1, ormPersistentType.getSpecifiedAttributesSize()); + assertEquals(ormPersistentAttribute, ormPersistentType.getSpecifiedAttributes().iterator().next()); assertTrue(ormPersistentAttribute.getMapping() instanceof OneToManyMapping); assertEquals("oneToOne", ormPersistentAttribute.getMapping().getName()); // assertEquals(FetchType.EAGER, ((OneToManyMapping) ormPersistentAttribute.getMapping()).getSpecifiedFetch()); @@ -533,8 +533,8 @@ public class GenericOrmElementCollectionMapping2_0Tests extends Generic2_0Contex assertFalse(elementCollectionMapping.isDefault()); ormPersistentAttribute.setMappingKey(MappingKeys.MANY_TO_ONE_ATTRIBUTE_MAPPING_KEY); - assertEquals(1, ormPersistentType.specifiedAttributesSize()); - assertEquals(ormPersistentAttribute, ormPersistentType.specifiedAttributes().next()); + assertEquals(1, ormPersistentType.getSpecifiedAttributesSize()); + assertEquals(ormPersistentAttribute, ormPersistentType.getSpecifiedAttributes().iterator().next()); assertTrue(ormPersistentAttribute.getMapping() instanceof ManyToOneMapping); assertEquals("oneToOne", ormPersistentAttribute.getMapping().getName()); // assertEquals(FetchType.EAGER, ((ManyToOneMapping) ormPersistentAttribute.getMapping()).getSpecifiedFetch()); @@ -550,8 +550,8 @@ public class GenericOrmElementCollectionMapping2_0Tests extends Generic2_0Contex assertFalse(elementCollectionMapping.isDefault()); ormPersistentAttribute.setMappingKey(MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY); - assertEquals(1, ormPersistentType.specifiedAttributesSize()); - assertEquals(ormPersistentAttribute, ormPersistentType.specifiedAttributes().next()); + assertEquals(1, ormPersistentType.getSpecifiedAttributesSize()); + assertEquals(ormPersistentAttribute, ormPersistentType.getSpecifiedAttributes().iterator().next()); assertTrue(ormPersistentAttribute.getMapping() instanceof BasicMapping); assertEquals("oneToOne", ormPersistentAttribute.getMapping().getName()); //TODO assertEquals(FetchType.EAGER, ((IBasicMapping) ormPersistentAttribute.getMapping()).getSpecifiedFetch()); @@ -1052,9 +1052,9 @@ public class GenericOrmElementCollectionMapping2_0Tests extends Generic2_0Contex assertEquals(true, ormColumn.isDefaultUpdatable()); assertEquals(true, ormColumn.isDefaultNullable()); assertEquals(false, ormColumn.isDefaultUnique()); - assertEquals(Column.DEFAULT_LENGTH, ormColumn.getDefaultLength()); - assertEquals(Column.DEFAULT_PRECISION, ormColumn.getDefaultPrecision()); - assertEquals(Column.DEFAULT_SCALE, ormColumn.getDefaultScale()); + assertEquals(ReadOnlyColumn.DEFAULT_LENGTH, ormColumn.getDefaultLength()); + assertEquals(ReadOnlyColumn.DEFAULT_PRECISION, ormColumn.getDefaultPrecision()); + assertEquals(ReadOnlyColumn.DEFAULT_SCALE, ormColumn.getDefaultScale()); assertNull(ormColumn.getSpecifiedName()); assertNull(ormColumn.getSpecifiedTable()); assertNull(ormColumn.getColumnDefinition()); @@ -1073,7 +1073,7 @@ public class GenericOrmElementCollectionMapping2_0Tests extends Generic2_0Contex OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); //virtual attribute in orm.xml, java attribute has no Column annotation - OrmReadOnlyPersistentAttribute addressesPersistentAttribute = ormPersistentType.virtualAttributes().next(); + OrmReadOnlyPersistentAttribute addressesPersistentAttribute = ormPersistentType.getVirtualAttributes().iterator().next(); ElementCollectionMapping2_0 addressesVirtualMapping = (ElementCollectionMapping2_0) addressesPersistentAttribute.getMapping(); Column virtualColumn = addressesVirtualMapping.getValueColumn(); @@ -1116,7 +1116,7 @@ public class GenericOrmElementCollectionMapping2_0Tests extends Generic2_0Contex assertEquals(3, elementCollectionResource.getAttributeOverrides().size()); attributeOverrideContainer.moveSpecifiedOverride(2, 0); - ListIterator attributeOverrides = attributeOverrideContainer.specifiedOverrides(); + ListIterator attributeOverrides = attributeOverrideContainer.getSpecifiedOverrides().iterator(); assertEquals("BAR", attributeOverrides.next().getName()); assertEquals("BAZ", attributeOverrides.next().getName()); assertEquals("FOO", attributeOverrides.next().getName()); @@ -1127,7 +1127,7 @@ public class GenericOrmElementCollectionMapping2_0Tests extends Generic2_0Contex attributeOverrideContainer.moveSpecifiedOverride(0, 1); - attributeOverrides = attributeOverrideContainer.specifiedOverrides(); + attributeOverrides = attributeOverrideContainer.getSpecifiedOverrides().iterator(); assertEquals("BAZ", attributeOverrides.next().getName()); assertEquals("BAR", attributeOverrides.next().getName()); assertEquals("FOO", attributeOverrides.next().getName()); @@ -1152,39 +1152,39 @@ public class GenericOrmElementCollectionMapping2_0Tests extends Generic2_0Contex elementCollectionResource.getAttributeOverrides().get(1).setName("BAR"); elementCollectionResource.getAttributeOverrides().get(2).setName("BAZ"); - ListIterator attributeOverrides = attributeOverrideContainer.specifiedOverrides(); + ListIterator attributeOverrides = attributeOverrideContainer.getSpecifiedOverrides().iterator(); assertEquals("FOO", attributeOverrides.next().getName()); assertEquals("BAR", attributeOverrides.next().getName()); assertEquals("BAZ", attributeOverrides.next().getName()); assertFalse(attributeOverrides.hasNext()); elementCollectionResource.getAttributeOverrides().move(2, 0); - attributeOverrides = attributeOverrideContainer.specifiedOverrides(); + attributeOverrides = attributeOverrideContainer.getSpecifiedOverrides().iterator(); assertEquals("BAR", attributeOverrides.next().getName()); assertEquals("BAZ", attributeOverrides.next().getName()); assertEquals("FOO", attributeOverrides.next().getName()); assertFalse(attributeOverrides.hasNext()); elementCollectionResource.getAttributeOverrides().move(0, 1); - attributeOverrides = attributeOverrideContainer.specifiedOverrides(); + attributeOverrides = attributeOverrideContainer.getSpecifiedOverrides().iterator(); assertEquals("BAZ", attributeOverrides.next().getName()); assertEquals("BAR", attributeOverrides.next().getName()); assertEquals("FOO", attributeOverrides.next().getName()); assertFalse(attributeOverrides.hasNext()); elementCollectionResource.getAttributeOverrides().remove(1); - attributeOverrides = attributeOverrideContainer.specifiedOverrides(); + attributeOverrides = attributeOverrideContainer.getSpecifiedOverrides().iterator(); assertEquals("BAZ", attributeOverrides.next().getName()); assertEquals("FOO", attributeOverrides.next().getName()); assertFalse(attributeOverrides.hasNext()); elementCollectionResource.getAttributeOverrides().remove(1); - attributeOverrides = attributeOverrideContainer.specifiedOverrides(); + attributeOverrides = attributeOverrideContainer.getSpecifiedOverrides().iterator(); assertEquals("BAZ", attributeOverrides.next().getName()); assertFalse(attributeOverrides.hasNext()); elementCollectionResource.getAttributeOverrides().remove(0); - assertFalse(attributeOverrideContainer.specifiedOverrides().hasNext()); + assertFalse(attributeOverrideContainer.getSpecifiedOverrides().iterator().hasNext()); } public void testElementCollectionMappingNoUnderylingJavaAttribute() throws Exception { @@ -1194,17 +1194,17 @@ public class GenericOrmElementCollectionMapping2_0Tests extends Generic2_0Contex OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); getEntityMappings().addPersistentType(MappingKeys.EMBEDDABLE_TYPE_MAPPING_KEY, PACKAGE_NAME + ".Address"); ormPersistentType.addSpecifiedAttribute(MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY, "foo"); - assertEquals(3, ormPersistentType.virtualAttributesSize()); + assertEquals(3, ormPersistentType.getVirtualAttributesSize()); - OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.specifiedAttributes().next(); + OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.getSpecifiedAttributes().iterator().next(); OrmElementCollectionMapping2_0 ormElementCollectionMapping = (OrmElementCollectionMapping2_0) ormPersistentAttribute.getMapping(); OrmAttributeOverrideContainer attributeOverrideContainer = ormElementCollectionMapping.getValueAttributeOverrideContainer(); assertEquals("foo", ormElementCollectionMapping.getName()); - assertFalse(attributeOverrideContainer.specifiedOverrides().hasNext()); - assertFalse(attributeOverrideContainer.virtualOverrides().hasNext()); + assertFalse(attributeOverrideContainer.getSpecifiedOverrides().iterator().hasNext()); + assertFalse(attributeOverrideContainer.getVirtualOverrides().iterator().hasNext()); } public void testVirtualAttributeOverrides() throws Exception { @@ -1220,13 +1220,13 @@ public class GenericOrmElementCollectionMapping2_0Tests extends Generic2_0Contex OrmReadOnlyPersistentAttribute ormPersistentAttribute = persistentType.getAttributeNamed("addresses"); ElementCollectionMapping2_0 elementCollectionMapping = (ElementCollectionMapping2_0) ormPersistentAttribute.getMapping(); AttributeOverrideContainer attributeOverrideContainer = elementCollectionMapping.getValueAttributeOverrideContainer(); - assertEquals(4, attributeOverrideContainer.overridesSize()); - assertEquals(3, attributeOverrideContainer.virtualOverridesSize()); - assertEquals(1, attributeOverrideContainer.specifiedOverridesSize()); - ListIterator specifiedAttributeOverrides = (ListIterator) attributeOverrideContainer.specifiedOverrides(); + assertEquals(4, attributeOverrideContainer.getOverridesSize()); + assertEquals(3, attributeOverrideContainer.getVirtualOverridesSize()); + assertEquals(1, attributeOverrideContainer.getSpecifiedOverridesSize()); + ListIterator specifiedAttributeOverrides = attributeOverrideContainer.getSpecifiedOverrides().iterator(); ReadOnlyAttributeOverride attributeOverride = specifiedAttributeOverrides.next(); assertEquals("city", attributeOverride.getName()); - ListIterator virtualOverrides = (ListIterator) attributeOverrideContainer.virtualOverrides(); + ListIterator virtualOverrides = attributeOverrideContainer.getVirtualOverrides().iterator(); attributeOverride = virtualOverrides.next(); assertEquals("state.name", attributeOverride.getName()); attributeOverride = virtualOverrides.next(); @@ -1235,7 +1235,7 @@ public class GenericOrmElementCollectionMapping2_0Tests extends Generic2_0Contex assertEquals("zip", attributeOverride.getName()); JavaElementCollectionMapping2_0 javaElementCollectionMapping = (JavaElementCollectionMapping2_0) ormPersistentAttribute.getJavaPersistentAttribute().getMapping(); - Column javaAttributeOverrideColumn = javaElementCollectionMapping.getValueAttributeOverrideContainer().specifiedOverrides().next().getColumn(); + Column javaAttributeOverrideColumn = javaElementCollectionMapping.getValueAttributeOverrideContainer().getSpecifiedOverrides().iterator().next().getColumn(); javaAttributeOverrideColumn.setSpecifiedName("FOO_COLUMN"); javaAttributeOverrideColumn.setSpecifiedTable("FOO_TABLE"); @@ -1250,10 +1250,10 @@ public class GenericOrmElementCollectionMapping2_0Tests extends Generic2_0Contex JavaBasicMapping javaBasicMapping = (JavaBasicMapping) persistentType3.getJavaPersistentType().getAttributeNamed("name").getMapping(); javaBasicMapping.getColumn().setSpecifiedName("MY_STATE_COLUMN"); - assertEquals(4, attributeOverrideContainer.overridesSize()); - assertEquals(3, attributeOverrideContainer.virtualOverridesSize()); - assertEquals(1, attributeOverrideContainer.specifiedOverridesSize()); - specifiedAttributeOverrides = (ListIterator) attributeOverrideContainer.specifiedOverrides(); + assertEquals(4, attributeOverrideContainer.getOverridesSize()); + assertEquals(3, attributeOverrideContainer.getVirtualOverridesSize()); + assertEquals(1, attributeOverrideContainer.getSpecifiedOverridesSize()); + specifiedAttributeOverrides = attributeOverrideContainer.getSpecifiedOverrides().iterator(); attributeOverride = specifiedAttributeOverrides.next(); assertEquals("city", attributeOverride.getName()); assertEquals("FOO_COLUMN", attributeOverride.getColumn().getSpecifiedName()); @@ -1267,7 +1267,7 @@ public class GenericOrmElementCollectionMapping2_0Tests extends Generic2_0Contex assertEquals(6, attributeOverride.getColumn().getPrecision()); assertEquals(7, attributeOverride.getColumn().getScale()); - virtualOverrides = (ListIterator) attributeOverrideContainer.virtualOverrides(); + virtualOverrides = attributeOverrideContainer.getVirtualOverrides().iterator(); attributeOverride = virtualOverrides.next(); assertEquals("state.name", attributeOverride.getName()); assertEquals("MY_STATE_COLUMN", attributeOverride.getColumn().getSpecifiedName()); @@ -1282,11 +1282,11 @@ public class GenericOrmElementCollectionMapping2_0Tests extends Generic2_0Contex persistentType.getAttributeNamed("addresses").convertToSpecified(); elementCollectionMapping = (OrmElementCollectionMapping2_0) persistentType.getAttributeNamed("addresses").getMapping(); attributeOverrideContainer = elementCollectionMapping.getValueAttributeOverrideContainer(); - assertEquals(4, attributeOverrideContainer.overridesSize()); - assertEquals(4, attributeOverrideContainer.virtualOverridesSize()); - assertEquals(0, attributeOverrideContainer.specifiedOverridesSize()); - ListIterator virtualAttributeOverrides = (ListIterator) attributeOverrideContainer.virtualOverrides(); - OrmVirtualAttributeOverride virtualOverride = virtualAttributeOverrides.next(); + assertEquals(4, attributeOverrideContainer.getOverridesSize()); + assertEquals(4, attributeOverrideContainer.getVirtualOverridesSize()); + assertEquals(0, attributeOverrideContainer.getSpecifiedOverridesSize()); + ListIterator virtualAttributeOverrides = attributeOverrideContainer.getVirtualOverrides().iterator(); + VirtualAttributeOverride virtualOverride = virtualAttributeOverrides.next(); assertEquals("city", virtualOverride.getName()); virtualOverride = virtualAttributeOverrides.next(); assertEquals("state.name", virtualOverride.getName()); @@ -1307,13 +1307,13 @@ public class GenericOrmElementCollectionMapping2_0Tests extends Generic2_0Contex assertEquals("zip", virtualOverride.getName()); //set one of the virtual attribute overrides to specified, verify others are still virtual - attributeOverrideContainer.virtualOverrides().next().convertToSpecified(); + attributeOverrideContainer.getVirtualOverrides().iterator().next().convertToSpecified(); - assertEquals(4, attributeOverrideContainer.overridesSize()); - assertEquals(1, attributeOverrideContainer.specifiedOverridesSize()); - assertEquals(3, attributeOverrideContainer.virtualOverridesSize()); - assertEquals("city", attributeOverrideContainer.specifiedOverrides().next().getName()); - virtualAttributeOverrides = (ListIterator) attributeOverrideContainer.virtualOverrides(); + assertEquals(4, attributeOverrideContainer.getOverridesSize()); + assertEquals(1, attributeOverrideContainer.getSpecifiedOverridesSize()); + assertEquals(3, attributeOverrideContainer.getVirtualOverridesSize()); + assertEquals("city", attributeOverrideContainer.getSpecifiedOverrides().iterator().next().getName()); + virtualAttributeOverrides = attributeOverrideContainer.getVirtualOverrides().iterator(); virtualOverride = virtualAttributeOverrides.next(); assertEquals("state.name", virtualOverride.getName()); virtualOverride = virtualAttributeOverrides.next(); @@ -1403,9 +1403,9 @@ public class GenericOrmElementCollectionMapping2_0Tests extends Generic2_0Contex assertEquals(true, ormColumn.isDefaultUpdatable()); assertEquals(true, ormColumn.isDefaultNullable()); assertEquals(false, ormColumn.isDefaultUnique()); - assertEquals(Column.DEFAULT_LENGTH, ormColumn.getDefaultLength()); - assertEquals(Column.DEFAULT_PRECISION, ormColumn.getDefaultPrecision()); - assertEquals(Column.DEFAULT_SCALE, ormColumn.getDefaultScale()); + assertEquals(ReadOnlyColumn.DEFAULT_LENGTH, ormColumn.getDefaultLength()); + assertEquals(ReadOnlyColumn.DEFAULT_PRECISION, ormColumn.getDefaultPrecision()); + assertEquals(ReadOnlyColumn.DEFAULT_SCALE, ormColumn.getDefaultScale()); assertNull(ormColumn.getSpecifiedName()); assertNull(ormColumn.getSpecifiedTable()); assertNull(ormColumn.getColumnDefinition()); @@ -1424,7 +1424,7 @@ public class GenericOrmElementCollectionMapping2_0Tests extends Generic2_0Contex OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); //virtual attribute in orm.xml, java attribute has no Column annotation - OrmReadOnlyPersistentAttribute addressesPersistentAttribute = ormPersistentType.virtualAttributes().next(); + OrmReadOnlyPersistentAttribute addressesPersistentAttribute = ormPersistentType.getVirtualAttributes().iterator().next(); ElementCollectionMapping2_0 addressesVirtualMapping = (ElementCollectionMapping2_0) addressesPersistentAttribute.getMapping(); Column virtualColumn = addressesVirtualMapping.getMapKeyColumn(); diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/orm/GenericOrmEmbeddedMapping2_0Tests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/orm/GenericOrmEmbeddedMapping2_0Tests.java index d75aa34c30..25cb494d9c 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/orm/GenericOrmEmbeddedMapping2_0Tests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/orm/GenericOrmEmbeddedMapping2_0Tests.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. @@ -469,7 +469,7 @@ public class GenericOrmEmbeddedMapping2_0Tests extends Generic2_0ContextModelTes assertEquals(3, embeddedResource.getAttributeOverrides().size()); attributeOverrideContainer.moveSpecifiedOverride(2, 0); - ListIterator attributeOverrides = attributeOverrideContainer.specifiedOverrides(); + ListIterator attributeOverrides = attributeOverrideContainer.getSpecifiedOverrides().iterator(); assertEquals("BAR", attributeOverrides.next().getName()); assertEquals("BAZ", attributeOverrides.next().getName()); assertEquals("FOO", attributeOverrides.next().getName()); @@ -480,7 +480,7 @@ public class GenericOrmEmbeddedMapping2_0Tests extends Generic2_0ContextModelTes attributeOverrideContainer.moveSpecifiedOverride(0, 1); - attributeOverrides = attributeOverrideContainer.specifiedOverrides(); + attributeOverrides = attributeOverrideContainer.getSpecifiedOverrides().iterator(); assertEquals("BAZ", attributeOverrides.next().getName()); assertEquals("BAR", attributeOverrides.next().getName()); assertEquals("FOO", attributeOverrides.next().getName()); @@ -505,39 +505,39 @@ public class GenericOrmEmbeddedMapping2_0Tests extends Generic2_0ContextModelTes embeddedResource.getAttributeOverrides().get(1).setName("BAR"); embeddedResource.getAttributeOverrides().get(2).setName("BAZ"); - ListIterator attributeOverrides = attributeOverrideContainer.specifiedOverrides(); + ListIterator attributeOverrides = attributeOverrideContainer.getSpecifiedOverrides().iterator(); assertEquals("FOO", attributeOverrides.next().getName()); assertEquals("BAR", attributeOverrides.next().getName()); assertEquals("BAZ", attributeOverrides.next().getName()); assertFalse(attributeOverrides.hasNext()); embeddedResource.getAttributeOverrides().move(2, 0); - attributeOverrides = attributeOverrideContainer.specifiedOverrides(); + attributeOverrides = attributeOverrideContainer.getSpecifiedOverrides().iterator(); assertEquals("BAR", attributeOverrides.next().getName()); assertEquals("BAZ", attributeOverrides.next().getName()); assertEquals("FOO", attributeOverrides.next().getName()); assertFalse(attributeOverrides.hasNext()); embeddedResource.getAttributeOverrides().move(0, 1); - attributeOverrides = attributeOverrideContainer.specifiedOverrides(); + attributeOverrides = attributeOverrideContainer.getSpecifiedOverrides().iterator(); assertEquals("BAZ", attributeOverrides.next().getName()); assertEquals("BAR", attributeOverrides.next().getName()); assertEquals("FOO", attributeOverrides.next().getName()); assertFalse(attributeOverrides.hasNext()); embeddedResource.getAttributeOverrides().remove(1); - attributeOverrides = attributeOverrideContainer.specifiedOverrides(); + attributeOverrides = attributeOverrideContainer.getSpecifiedOverrides().iterator(); assertEquals("BAZ", attributeOverrides.next().getName()); assertEquals("FOO", attributeOverrides.next().getName()); assertFalse(attributeOverrides.hasNext()); embeddedResource.getAttributeOverrides().remove(1); - attributeOverrides = attributeOverrideContainer.specifiedOverrides(); + attributeOverrides = attributeOverrideContainer.getSpecifiedOverrides().iterator(); assertEquals("BAZ", attributeOverrides.next().getName()); assertFalse(attributeOverrides.hasNext()); embeddedResource.getAttributeOverrides().remove(0); - assertFalse(attributeOverrideContainer.specifiedOverrides().hasNext()); + assertFalse(attributeOverrideContainer.getSpecifiedOverrides().iterator().hasNext()); } @@ -548,17 +548,17 @@ public class GenericOrmEmbeddedMapping2_0Tests extends Generic2_0ContextModelTes OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); getEntityMappings().addPersistentType(MappingKeys.EMBEDDABLE_TYPE_MAPPING_KEY, PACKAGE_NAME + ".Address"); ormPersistentType.addSpecifiedAttribute(MappingKeys.EMBEDDED_ATTRIBUTE_MAPPING_KEY, "foo"); - assertEquals(3, ormPersistentType.virtualAttributesSize()); + assertEquals(3, ormPersistentType.getVirtualAttributesSize()); - OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.specifiedAttributes().next(); + OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.getSpecifiedAttributes().iterator().next(); OrmEmbeddedMapping ormEmbeddedMapping = (OrmEmbeddedMapping) ormPersistentAttribute.getMapping(); OrmAttributeOverrideContainer attributeOverrideContainer = ormEmbeddedMapping.getAttributeOverrideContainer(); assertEquals("foo", ormEmbeddedMapping.getName()); - assertFalse(attributeOverrideContainer.specifiedOverrides().hasNext()); - assertFalse(attributeOverrideContainer.virtualOverrides().hasNext()); + assertFalse(attributeOverrideContainer.getSpecifiedOverrides().iterator().hasNext()); + assertFalse(attributeOverrideContainer.getVirtualOverrides().iterator().hasNext()); } public void testVirtualAttributeOverrides() throws Exception { @@ -571,13 +571,13 @@ public class GenericOrmEmbeddedMapping2_0Tests extends Generic2_0ContextModelTes OrmReadOnlyPersistentAttribute ormPersistentAttribute = persistentType.getAttributeNamed("address"); EmbeddedMapping embeddedMapping = (EmbeddedMapping) ormPersistentAttribute.getMapping(); AttributeOverrideContainer attributeOverrideContainer = embeddedMapping.getAttributeOverrideContainer(); - assertEquals(4, attributeOverrideContainer.overridesSize()); - assertEquals(3, attributeOverrideContainer.virtualOverridesSize()); - assertEquals(1, attributeOverrideContainer.specifiedOverridesSize()); - ListIterator specifiedAttributeOverrides = (ListIterator) attributeOverrideContainer.specifiedOverrides(); + assertEquals(4, attributeOverrideContainer.getOverridesSize()); + assertEquals(3, attributeOverrideContainer.getVirtualOverridesSize()); + assertEquals(1, attributeOverrideContainer.getSpecifiedOverridesSize()); + ListIterator specifiedAttributeOverrides = attributeOverrideContainer.getSpecifiedOverrides().iterator(); ReadOnlyAttributeOverride attributeOverride = specifiedAttributeOverrides.next(); assertEquals("city", attributeOverride.getName()); - ListIterator virtualAttributeOverrides = (ListIterator) attributeOverrideContainer.virtualOverrides(); + ListIterator virtualAttributeOverrides = attributeOverrideContainer.getVirtualOverrides().iterator(); attributeOverride = virtualAttributeOverrides.next(); assertEquals("id", attributeOverride.getName()); attributeOverride = virtualAttributeOverrides.next(); @@ -586,7 +586,7 @@ public class GenericOrmEmbeddedMapping2_0Tests extends Generic2_0ContextModelTes assertEquals("zip", attributeOverride.getName()); JavaEmbeddedMapping javaEmbeddedMapping = (JavaEmbeddedMapping) ormPersistentAttribute.getJavaPersistentAttribute().getMapping(); - Column javaAttributeOverrideColumn = javaEmbeddedMapping.getAttributeOverrideContainer().specifiedOverrides().next().getColumn(); + Column javaAttributeOverrideColumn = javaEmbeddedMapping.getAttributeOverrideContainer().getSpecifiedOverrides().iterator().next().getColumn(); javaAttributeOverrideColumn.setSpecifiedName("FOO_COLUMN"); javaAttributeOverrideColumn.setSpecifiedTable("FOO_TABLE"); @@ -601,10 +601,10 @@ public class GenericOrmEmbeddedMapping2_0Tests extends Generic2_0ContextModelTes JavaBasicMapping javaBasicMapping = (JavaBasicMapping) persistentType2.getJavaPersistentType().getAttributeNamed("state").getMapping(); javaBasicMapping.getColumn().setSpecifiedName("MY_STATE_COLUMN"); - assertEquals(4, attributeOverrideContainer.overridesSize()); - assertEquals(3, attributeOverrideContainer.virtualOverridesSize()); - assertEquals(1, attributeOverrideContainer.specifiedOverridesSize()); - specifiedAttributeOverrides = (ListIterator) attributeOverrideContainer.specifiedOverrides(); + assertEquals(4, attributeOverrideContainer.getOverridesSize()); + assertEquals(3, attributeOverrideContainer.getVirtualOverridesSize()); + assertEquals(1, attributeOverrideContainer.getSpecifiedOverridesSize()); + specifiedAttributeOverrides = attributeOverrideContainer.getSpecifiedOverrides().iterator(); attributeOverride = specifiedAttributeOverrides.next(); assertEquals("city", attributeOverride.getName()); assertEquals("FOO_COLUMN", attributeOverride.getColumn().getSpecifiedName()); @@ -618,7 +618,7 @@ public class GenericOrmEmbeddedMapping2_0Tests extends Generic2_0ContextModelTes assertEquals(6, attributeOverride.getColumn().getPrecision()); assertEquals(7, attributeOverride.getColumn().getScale()); - virtualAttributeOverrides = (ListIterator) attributeOverrideContainer.virtualOverrides(); + virtualAttributeOverrides = attributeOverrideContainer.getVirtualOverrides().iterator(); attributeOverride = virtualAttributeOverrides.next(); assertEquals("id", attributeOverride.getName()); attributeOverride = virtualAttributeOverrides.next(); @@ -633,10 +633,10 @@ public class GenericOrmEmbeddedMapping2_0Tests extends Generic2_0ContextModelTes persistentType.getAttributeNamed("address").convertToSpecified(); embeddedMapping = (OrmEmbeddedMapping) persistentType.getAttributeNamed("address").getMapping(); attributeOverrideContainer = embeddedMapping.getAttributeOverrideContainer(); - assertEquals(4, attributeOverrideContainer.overridesSize()); - assertEquals(4, attributeOverrideContainer.virtualOverridesSize()); - assertEquals(0, attributeOverrideContainer.specifiedOverridesSize()); - virtualAttributeOverrides = (ListIterator) attributeOverrideContainer.virtualOverrides(); + assertEquals(4, attributeOverrideContainer.getOverridesSize()); + assertEquals(4, attributeOverrideContainer.getVirtualOverridesSize()); + assertEquals(0, attributeOverrideContainer.getSpecifiedOverridesSize()); + virtualAttributeOverrides = attributeOverrideContainer.getVirtualOverrides().iterator(); ReadOnlyAttributeOverride virtualOverride = virtualAttributeOverrides.next(); assertEquals("id", virtualOverride.getName()); virtualOverride = virtualAttributeOverrides.next(); @@ -659,13 +659,13 @@ public class GenericOrmEmbeddedMapping2_0Tests extends Generic2_0ContextModelTes assertEquals("zip", virtualOverride.getName()); //set one of the virtual attribute overrides to specified, verify others are still virtual - attributeOverrideContainer.virtualOverrides().next().convertToSpecified(); + attributeOverrideContainer.getVirtualOverrides().iterator().next().convertToSpecified(); - assertEquals(4, attributeOverrideContainer.overridesSize()); - assertEquals(1, attributeOverrideContainer.specifiedOverridesSize()); - assertEquals(3, attributeOverrideContainer.virtualOverridesSize()); - assertEquals("id", attributeOverrideContainer.specifiedOverrides().next().getName()); - virtualAttributeOverrides = (ListIterator) attributeOverrideContainer.virtualOverrides(); + assertEquals(4, attributeOverrideContainer.getOverridesSize()); + assertEquals(1, attributeOverrideContainer.getSpecifiedOverridesSize()); + assertEquals(3, attributeOverrideContainer.getVirtualOverridesSize()); + assertEquals("id", attributeOverrideContainer.getSpecifiedOverrides().iterator().next().getName()); + virtualAttributeOverrides = attributeOverrideContainer.getVirtualOverrides().iterator(); virtualOverride = virtualAttributeOverrides.next(); assertEquals("city", virtualOverride.getName()); virtualOverride = virtualAttributeOverrides.next(); @@ -681,23 +681,23 @@ public class GenericOrmEmbeddedMapping2_0Tests extends Generic2_0ContextModelTes OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); getEntityMappings().addPersistentType(MappingKeys.EMBEDDABLE_TYPE_MAPPING_KEY, PACKAGE_NAME + ".Address"); - assertEquals(3, ormPersistentType.virtualAttributesSize()); - OrmReadOnlyPersistentAttribute ormPersistentAttribute = ormPersistentType.virtualAttributes().next(); + assertEquals(3, ormPersistentType.getVirtualAttributesSize()); + OrmReadOnlyPersistentAttribute ormPersistentAttribute = ormPersistentType.getVirtualAttributes().iterator().next(); EmbeddedMapping virtualEmbeddedMapping = (EmbeddedMapping) ormPersistentAttribute.getMapping(); AttributeOverrideContainer attributeOverrideContainer = virtualEmbeddedMapping.getAttributeOverrideContainer(); assertEquals("address", virtualEmbeddedMapping.getName()); - assertEquals(1, attributeOverrideContainer.specifiedOverridesSize()); - assertEquals(3, attributeOverrideContainer.virtualOverridesSize()); - ListIterator specifiedAttributeOverrides = (ListIterator) attributeOverrideContainer.specifiedOverrides(); + assertEquals(1, attributeOverrideContainer.getSpecifiedOverridesSize()); + assertEquals(3, attributeOverrideContainer.getVirtualOverridesSize()); + ListIterator specifiedAttributeOverrides = attributeOverrideContainer.getSpecifiedOverrides().iterator(); ReadOnlyAttributeOverride override = specifiedAttributeOverrides.next(); assertEquals(ATTRIBUTE_OVERRIDE_NAME, override.getName()); ReadOnlyColumn column = override.getColumn(); assertEquals(ATTRIBUTE_OVERRIDE_COLUMN_NAME, column.getSpecifiedName()); - ListIterator virtualAttributeOverrides = (ListIterator) attributeOverrideContainer.virtualOverrides(); + ListIterator virtualAttributeOverrides = attributeOverrideContainer.getVirtualOverrides().iterator(); override = virtualAttributeOverrides.next(); assertEquals("id", override.getName()); column = override.getColumn(); @@ -722,8 +722,8 @@ public class GenericOrmEmbeddedMapping2_0Tests extends Generic2_0ContextModelTes OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); getEntityMappings().addPersistentType(MappingKeys.EMBEDDABLE_TYPE_MAPPING_KEY, PACKAGE_NAME + ".Address"); ormPersistentType.getMapping().setSpecifiedMetadataComplete(Boolean.TRUE); - assertEquals(3, ormPersistentType.virtualAttributesSize()); - OrmReadOnlyPersistentAttribute ormPersistentAttribute = ormPersistentType.virtualAttributes().next(); + assertEquals(3, ormPersistentType.getVirtualAttributesSize()); + OrmReadOnlyPersistentAttribute ormPersistentAttribute = ormPersistentType.getVirtualAttributes().iterator().next(); EmbeddedMapping virtualEmbeddedMapping = (EmbeddedMapping) ormPersistentAttribute.getMapping(); assertEquals("address", virtualEmbeddedMapping.getName()); @@ -771,14 +771,14 @@ public class GenericOrmEmbeddedMapping2_0Tests extends Generic2_0ContextModelTes getEntityMappings().addPersistentType(MappingKeys.EMBEDDABLE_TYPE_MAPPING_KEY, PACKAGE_NAME + ".Address"); ormPersistentType.addSpecifiedAttribute(MappingKeys.EMBEDDED_ATTRIBUTE_MAPPING_KEY, "address"); - assertEquals(2, ormPersistentType.virtualAttributesSize()); + assertEquals(2, ormPersistentType.getVirtualAttributesSize()); - OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.specifiedAttributes().next(); + OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.getSpecifiedAttributes().iterator().next(); OrmEmbeddedMapping ormEmbeddedMapping = (OrmEmbeddedMapping) ormPersistentAttribute.getMapping(); assertEquals("address", ormEmbeddedMapping.getName()); - assertEquals(0, ormEmbeddedMapping.getAttributeOverrideContainer().specifiedOverridesSize()); + assertEquals(0, ormEmbeddedMapping.getAttributeOverrideContainer().getSpecifiedOverridesSize()); //TODO // assertEquals(4, CollectionTools.size(ormEmbeddedMapping.defaultAttributeOverrides())); // ListIterator ormAttributeOverrides = ormEmbeddedMapping.defaultAttributeOverrides(); @@ -823,14 +823,14 @@ public class GenericOrmEmbeddedMapping2_0Tests extends Generic2_0ContextModelTes assertFalse(embeddedMapping.isDefault()); XmlEmbedded embeddedResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getEmbeddeds().get(0); embeddedResource.getAttributeOverrides().add(OrmFactory.eINSTANCE.createXmlAttributeOverride()); - AttributeOverride attributeOverride = embeddedMapping.getAttributeOverrideContainer().specifiedOverrides().next(); + AttributeOverride attributeOverride = embeddedMapping.getAttributeOverrideContainer().getSpecifiedOverrides().iterator().next(); attributeOverride.setName("override"); attributeOverride.getColumn().setSpecifiedName("OVERRIDE_COLUMN"); assertFalse(embeddedMapping.isDefault()); ormPersistentAttribute.setMappingKey(MappingKeys.ID_ATTRIBUTE_MAPPING_KEY); - assertEquals(1, ormPersistentType.specifiedAttributesSize()); - assertEquals(ormPersistentAttribute, ormPersistentType.specifiedAttributes().next()); + assertEquals(1, ormPersistentType.getSpecifiedAttributesSize()); + assertEquals(ormPersistentAttribute, ormPersistentType.getSpecifiedAttributes().iterator().next()); assertTrue(ormPersistentAttribute.getMapping() instanceof IdMapping); assertEquals("embedded", ormPersistentAttribute.getMapping().getName()); } @@ -844,14 +844,14 @@ public class GenericOrmEmbeddedMapping2_0Tests extends Generic2_0ContextModelTes assertFalse(embeddedMapping.isDefault()); XmlEmbedded embeddedResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getEmbeddeds().get(0); embeddedResource.getAttributeOverrides().add(OrmFactory.eINSTANCE.createXmlAttributeOverride()); - AttributeOverride attributeOverride = embeddedMapping.getAttributeOverrideContainer().specifiedOverrides().next(); + AttributeOverride attributeOverride = embeddedMapping.getAttributeOverrideContainer().getSpecifiedOverrides().iterator().next(); attributeOverride.setName("override"); attributeOverride.getColumn().setSpecifiedName("OVERRIDE_COLUMN"); assertFalse(embeddedMapping.isDefault()); ormPersistentAttribute.setMappingKey(MappingKeys.VERSION_ATTRIBUTE_MAPPING_KEY); - assertEquals(1, ormPersistentType.specifiedAttributesSize()); - assertEquals(ormPersistentAttribute, ormPersistentType.specifiedAttributes().next()); + assertEquals(1, ormPersistentType.getSpecifiedAttributesSize()); + assertEquals(ormPersistentAttribute, ormPersistentType.getSpecifiedAttributes().iterator().next()); assertTrue(ormPersistentAttribute.getMapping() instanceof VersionMapping); assertEquals("embedded", ormPersistentAttribute.getMapping().getName()); } @@ -865,14 +865,14 @@ public class GenericOrmEmbeddedMapping2_0Tests extends Generic2_0ContextModelTes assertFalse(embeddedMapping.isDefault()); XmlEmbedded embeddedResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getEmbeddeds().get(0); embeddedResource.getAttributeOverrides().add(OrmFactory.eINSTANCE.createXmlAttributeOverride()); - AttributeOverride attributeOverride = embeddedMapping.getAttributeOverrideContainer().specifiedOverrides().next(); + AttributeOverride attributeOverride = embeddedMapping.getAttributeOverrideContainer().getSpecifiedOverrides().iterator().next(); attributeOverride.setName("override"); attributeOverride.getColumn().setSpecifiedName("OVERRIDE_COLUMN"); assertFalse(embeddedMapping.isDefault()); ormPersistentAttribute.setMappingKey(MappingKeys.TRANSIENT_ATTRIBUTE_MAPPING_KEY); - assertEquals(1, ormPersistentType.specifiedAttributesSize()); - assertEquals(ormPersistentAttribute, ormPersistentType.specifiedAttributes().next()); + assertEquals(1, ormPersistentType.getSpecifiedAttributesSize()); + assertEquals(ormPersistentAttribute, ormPersistentType.getSpecifiedAttributes().iterator().next()); assertTrue(ormPersistentAttribute.getMapping() instanceof TransientMapping); assertEquals("embedded", ormPersistentAttribute.getMapping().getName()); } @@ -886,14 +886,14 @@ public class GenericOrmEmbeddedMapping2_0Tests extends Generic2_0ContextModelTes assertFalse(embeddedMapping.isDefault()); XmlEmbedded embeddedResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getEmbeddeds().get(0); embeddedResource.getAttributeOverrides().add(OrmFactory.eINSTANCE.createXmlAttributeOverride()); - AttributeOverride attributeOverride = embeddedMapping.getAttributeOverrideContainer().specifiedOverrides().next(); + AttributeOverride attributeOverride = embeddedMapping.getAttributeOverrideContainer().getSpecifiedOverrides().iterator().next(); attributeOverride.setName("override"); attributeOverride.getColumn().setSpecifiedName("OVERRIDE_COLUMN"); assertFalse(embeddedMapping.isDefault()); ormPersistentAttribute.setMappingKey(MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY); - assertEquals(1, ormPersistentType.specifiedAttributesSize()); - assertEquals(ormPersistentAttribute, ormPersistentType.specifiedAttributes().next()); + assertEquals(1, ormPersistentType.getSpecifiedAttributesSize()); + assertEquals(ormPersistentAttribute, ormPersistentType.getSpecifiedAttributes().iterator().next()); assertTrue(ormPersistentAttribute.getMapping() instanceof BasicMapping); assertEquals("embedded", ormPersistentAttribute.getMapping().getName()); } @@ -907,17 +907,17 @@ public class GenericOrmEmbeddedMapping2_0Tests extends Generic2_0ContextModelTes assertFalse(embeddedMapping.isDefault()); XmlEmbedded embeddedResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getEmbeddeds().get(0); embeddedResource.getAttributeOverrides().add(OrmFactory.eINSTANCE.createXmlAttributeOverride()); - AttributeOverride attributeOverride = embeddedMapping.getAttributeOverrideContainer().specifiedOverrides().next(); + AttributeOverride attributeOverride = embeddedMapping.getAttributeOverrideContainer().getSpecifiedOverrides().iterator().next(); attributeOverride.setName("override"); attributeOverride.getColumn().setSpecifiedName("OVERRIDE_COLUMN"); assertFalse(embeddedMapping.isDefault()); ormPersistentAttribute.setMappingKey(MappingKeys.EMBEDDED_ID_ATTRIBUTE_MAPPING_KEY); assertTrue(ormPersistentAttribute.getMapping() instanceof EmbeddedIdMapping); - assertEquals(1, ormPersistentType.specifiedAttributesSize()); - assertEquals(ormPersistentAttribute, ormPersistentType.specifiedAttributes().next()); + assertEquals(1, ormPersistentType.getSpecifiedAttributesSize()); + assertEquals(ormPersistentAttribute, ormPersistentType.getSpecifiedAttributes().iterator().next()); assertEquals("embedded", ormPersistentAttribute.getMapping().getName()); - attributeOverride = ((EmbeddedIdMapping) ormPersistentAttribute.getMapping()).getAttributeOverrideContainer().specifiedOverrides().next(); + attributeOverride = ((EmbeddedIdMapping) ormPersistentAttribute.getMapping()).getAttributeOverrideContainer().getSpecifiedOverrides().iterator().next(); assertEquals("override", attributeOverride.getName()); assertEquals("OVERRIDE_COLUMN", attributeOverride.getColumn().getSpecifiedName()); } @@ -931,14 +931,14 @@ public class GenericOrmEmbeddedMapping2_0Tests extends Generic2_0ContextModelTes assertFalse(embeddedMapping.isDefault()); XmlEmbedded embeddedResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getEmbeddeds().get(0); embeddedResource.getAttributeOverrides().add(OrmFactory.eINSTANCE.createXmlAttributeOverride()); - AttributeOverride attributeOverride = embeddedMapping.getAttributeOverrideContainer().specifiedOverrides().next(); + AttributeOverride attributeOverride = embeddedMapping.getAttributeOverrideContainer().getSpecifiedOverrides().iterator().next(); attributeOverride.setName("override"); attributeOverride.getColumn().setSpecifiedName("OVERRIDE_COLUMN"); assertFalse(embeddedMapping.isDefault()); ormPersistentAttribute.setMappingKey(MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY); - assertEquals(1, ormPersistentType.specifiedAttributesSize()); - assertEquals(ormPersistentAttribute, ormPersistentType.specifiedAttributes().next()); + assertEquals(1, ormPersistentType.getSpecifiedAttributesSize()); + assertEquals(ormPersistentAttribute, ormPersistentType.getSpecifiedAttributes().iterator().next()); assertTrue(ormPersistentAttribute.getMapping() instanceof OneToOneMapping); assertEquals("embedded", ormPersistentAttribute.getMapping().getName()); } @@ -952,14 +952,14 @@ public class GenericOrmEmbeddedMapping2_0Tests extends Generic2_0ContextModelTes assertFalse(embeddedMapping.isDefault()); XmlEmbedded embeddedResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getEmbeddeds().get(0); embeddedResource.getAttributeOverrides().add(OrmFactory.eINSTANCE.createXmlAttributeOverride()); - AttributeOverride attributeOverride = embeddedMapping.getAttributeOverrideContainer().specifiedOverrides().next(); + AttributeOverride attributeOverride = embeddedMapping.getAttributeOverrideContainer().getSpecifiedOverrides().iterator().next(); attributeOverride.setName("override"); attributeOverride.getColumn().setSpecifiedName("OVERRIDE_COLUMN"); assertFalse(embeddedMapping.isDefault()); ormPersistentAttribute.setMappingKey(MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY); - assertEquals(1, ormPersistentType.specifiedAttributesSize()); - assertEquals(ormPersistentAttribute, ormPersistentType.specifiedAttributes().next()); + assertEquals(1, ormPersistentType.getSpecifiedAttributesSize()); + assertEquals(ormPersistentAttribute, ormPersistentType.getSpecifiedAttributes().iterator().next()); assertTrue(ormPersistentAttribute.getMapping() instanceof OneToManyMapping); assertEquals("embedded", ormPersistentAttribute.getMapping().getName()); } @@ -973,14 +973,14 @@ public class GenericOrmEmbeddedMapping2_0Tests extends Generic2_0ContextModelTes assertFalse(embeddedMapping.isDefault()); XmlEmbedded embeddedResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getEmbeddeds().get(0); embeddedResource.getAttributeOverrides().add(OrmFactory.eINSTANCE.createXmlAttributeOverride()); - AttributeOverride attributeOverride = embeddedMapping.getAttributeOverrideContainer().specifiedOverrides().next(); + AttributeOverride attributeOverride = embeddedMapping.getAttributeOverrideContainer().getSpecifiedOverrides().iterator().next(); attributeOverride.setName("override"); attributeOverride.getColumn().setSpecifiedName("OVERRIDE_COLUMN"); assertFalse(embeddedMapping.isDefault()); ormPersistentAttribute.setMappingKey(MappingKeys.MANY_TO_ONE_ATTRIBUTE_MAPPING_KEY); - assertEquals(1, ormPersistentType.specifiedAttributesSize()); - assertEquals(ormPersistentAttribute, ormPersistentType.specifiedAttributes().next()); + assertEquals(1, ormPersistentType.getSpecifiedAttributesSize()); + assertEquals(ormPersistentAttribute, ormPersistentType.getSpecifiedAttributes().iterator().next()); assertTrue(ormPersistentAttribute.getMapping() instanceof ManyToOneMapping); assertEquals("embedded", ormPersistentAttribute.getMapping().getName()); } @@ -994,7 +994,7 @@ public class GenericOrmEmbeddedMapping2_0Tests extends Generic2_0ContextModelTes assertFalse(embeddedMapping.isDefault()); XmlEmbedded embeddedResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getEmbeddeds().get(0); embeddedResource.getAttributeOverrides().add(OrmFactory.eINSTANCE.createXmlAttributeOverride()); - AttributeOverride attributeOverride = embeddedMapping.getAttributeOverrideContainer().specifiedOverrides().next(); + AttributeOverride attributeOverride = embeddedMapping.getAttributeOverrideContainer().getSpecifiedOverrides().iterator().next(); attributeOverride.setName("override"); attributeOverride.getColumn().setSpecifiedName("OVERRIDE_COLUMN"); assertFalse(embeddedMapping.isDefault()); @@ -1017,7 +1017,7 @@ public class GenericOrmEmbeddedMapping2_0Tests extends Generic2_0ContextModelTes OrmEmbeddedMapping2_0 embeddedMapping = (OrmEmbeddedMapping2_0) ormPersistentAttribute.getMapping(); OrmAssociationOverrideContainer overrideContainer = embeddedMapping.getAssociationOverrideContainer(); - ListIterator specifiedAssociationOverrides = overrideContainer.specifiedOverrides(); + ListIterator specifiedAssociationOverrides = overrideContainer.getSpecifiedOverrides().iterator(); assertFalse(specifiedAssociationOverrides.hasNext()); @@ -1027,14 +1027,14 @@ public class GenericOrmEmbeddedMapping2_0Tests extends Generic2_0ContextModelTes XmlAssociationOverride associationOverride = OrmFactory.eINSTANCE.createXmlAssociationOverride(); embeddedResource.getAssociationOverrides().add(associationOverride); associationOverride.setName("FOO"); - specifiedAssociationOverrides = overrideContainer.specifiedOverrides(); + specifiedAssociationOverrides = overrideContainer.getSpecifiedOverrides().iterator(); assertEquals("FOO", specifiedAssociationOverrides.next().getName()); assertFalse(specifiedAssociationOverrides.hasNext()); associationOverride = OrmFactory.eINSTANCE.createXmlAssociationOverride(); embeddedResource.getAssociationOverrides().add(1, associationOverride); associationOverride.setName("BAR"); - specifiedAssociationOverrides = overrideContainer.specifiedOverrides(); + specifiedAssociationOverrides = overrideContainer.getSpecifiedOverrides().iterator(); assertEquals("FOO", specifiedAssociationOverrides.next().getName()); assertEquals("BAR", specifiedAssociationOverrides.next().getName()); assertFalse(specifiedAssociationOverrides.hasNext()); @@ -1043,7 +1043,7 @@ public class GenericOrmEmbeddedMapping2_0Tests extends Generic2_0ContextModelTes associationOverride = OrmFactory.eINSTANCE.createXmlAssociationOverride(); embeddedResource.getAssociationOverrides().add(0, associationOverride); associationOverride.setName("BAZ"); - specifiedAssociationOverrides = overrideContainer.specifiedOverrides(); + specifiedAssociationOverrides = overrideContainer.getSpecifiedOverrides().iterator(); assertEquals("BAZ", specifiedAssociationOverrides.next().getName()); assertEquals("FOO", specifiedAssociationOverrides.next().getName()); assertEquals("BAR", specifiedAssociationOverrides.next().getName()); @@ -1051,26 +1051,26 @@ public class GenericOrmEmbeddedMapping2_0Tests extends Generic2_0ContextModelTes //move an annotation to the resource model and verify the context model is updated embeddedResource.getAssociationOverrides().move(1, 0); - specifiedAssociationOverrides = overrideContainer.specifiedOverrides(); + specifiedAssociationOverrides = overrideContainer.getSpecifiedOverrides().iterator(); assertEquals("FOO", specifiedAssociationOverrides.next().getName()); assertEquals("BAZ", specifiedAssociationOverrides.next().getName()); assertEquals("BAR", specifiedAssociationOverrides.next().getName()); assertFalse(specifiedAssociationOverrides.hasNext()); embeddedResource.getAssociationOverrides().remove(0); - specifiedAssociationOverrides = overrideContainer.specifiedOverrides(); + specifiedAssociationOverrides = overrideContainer.getSpecifiedOverrides().iterator(); assertEquals("BAZ", specifiedAssociationOverrides.next().getName()); assertEquals("BAR", specifiedAssociationOverrides.next().getName()); assertFalse(specifiedAssociationOverrides.hasNext()); embeddedResource.getAssociationOverrides().remove(0); - specifiedAssociationOverrides = overrideContainer.specifiedOverrides(); + specifiedAssociationOverrides = overrideContainer.getSpecifiedOverrides().iterator(); assertEquals("BAR", specifiedAssociationOverrides.next().getName()); assertFalse(specifiedAssociationOverrides.hasNext()); embeddedResource.getAssociationOverrides().remove(0); - specifiedAssociationOverrides = overrideContainer.specifiedOverrides(); + specifiedAssociationOverrides = overrideContainer.getSpecifiedOverrides().iterator(); assertFalse(specifiedAssociationOverrides.hasNext()); } @@ -1086,12 +1086,12 @@ public class GenericOrmEmbeddedMapping2_0Tests extends Generic2_0ContextModelTes OrmEmbeddedMapping2_0 embeddedMapping = (OrmEmbeddedMapping2_0) ormPersistentAttribute.getMapping(); AssociationOverrideContainer overrideContainer = embeddedMapping.getAssociationOverrideContainer(); - assertEquals(2, overrideContainer.virtualOverridesSize()); - VirtualAssociationOverride virtualAssociationOverride = overrideContainer.virtualOverrides().next(); + assertEquals(2, overrideContainer.getVirtualOverridesSize()); + VirtualAssociationOverride virtualAssociationOverride = overrideContainer.getVirtualOverrides().iterator().next(); VirtualJoinColumnRelationshipStrategy joiningStrategy = ((VirtualJoinColumnRelationship) virtualAssociationOverride.getRelationship()).getJoinColumnStrategy(); assertEquals("address", virtualAssociationOverride.getName()); - assertEquals(1, joiningStrategy.joinColumnsSize()); - VirtualJoinColumn virtualJoinColumn = joiningStrategy.joinColumns().next(); + assertEquals(1, joiningStrategy.getJoinColumnsSize()); + VirtualJoinColumn virtualJoinColumn = joiningStrategy.getJoinColumns().iterator().next(); assertEquals("address_id", virtualJoinColumn.getName()); assertEquals("id", virtualJoinColumn.getReferencedColumnName()); assertEquals(TYPE_NAME, virtualJoinColumn.getTable()); @@ -1102,7 +1102,7 @@ public class GenericOrmEmbeddedMapping2_0Tests extends Generic2_0ContextModelTes assertEquals(true, virtualJoinColumn.isNullable()); - JavaPersistentType javaEmbeddable = getPersistenceUnit().specifiedClassRefs().next().getJavaPersistentType(); + JavaPersistentType javaEmbeddable = getPersistenceUnit().getSpecifiedClassRefs().iterator().next().getJavaPersistentType(); OneToOneMapping oneToOneMapping = (OneToOneMapping) javaEmbeddable.getAttributeNamed("address").getMapping(); JoinColumn joinColumn = oneToOneMapping.getRelationship().getJoinColumnStrategy().addSpecifiedJoinColumn(0); joinColumn.setSpecifiedName("MY_JOIN_COLUMN"); @@ -1114,13 +1114,13 @@ public class GenericOrmEmbeddedMapping2_0Tests extends Generic2_0ContextModelTes joinColumn.setSpecifiedUnique(Boolean.TRUE); joinColumn.setSpecifiedNullable(Boolean.FALSE); - assertEquals(2, overrideContainer.virtualOverridesSize()); - virtualAssociationOverride = overrideContainer.virtualOverrides().next(); + assertEquals(2, overrideContainer.getVirtualOverridesSize()); + virtualAssociationOverride = overrideContainer.getVirtualOverrides().iterator().next(); joiningStrategy = ((VirtualJoinColumnRelationship) virtualAssociationOverride.getRelationship()).getJoinColumnStrategy(); assertEquals("address", virtualAssociationOverride.getName()); - assertEquals(1, joiningStrategy.joinColumnsSize()); - virtualAssociationOverride = overrideContainer.virtualOverrides().next(); - virtualJoinColumn = joiningStrategy.joinColumns().next(); + assertEquals(1, joiningStrategy.getJoinColumnsSize()); + virtualAssociationOverride = overrideContainer.getVirtualOverrides().iterator().next(); + virtualJoinColumn = joiningStrategy.getJoinColumns().iterator().next(); assertEquals("MY_JOIN_COLUMN", virtualJoinColumn.getName()); assertEquals("MY_REFERENCE_COLUMN", virtualJoinColumn.getReferencedColumnName()); assertEquals("BAR", virtualJoinColumn.getTable()); @@ -1130,14 +1130,14 @@ public class GenericOrmEmbeddedMapping2_0Tests extends Generic2_0ContextModelTes assertEquals(true, virtualJoinColumn.isUnique()); assertEquals(false, virtualJoinColumn.isNullable()); - assertEquals("MY_JOIN_COLUMN", joiningStrategy.joinColumns().next().getName()); + assertEquals("MY_JOIN_COLUMN", joiningStrategy.getJoinColumns().iterator().next().getName()); - virtualAssociationOverride = overrideContainer.virtualOverrides().next(); + virtualAssociationOverride = overrideContainer.getVirtualOverrides().iterator().next(); assertEquals("address", virtualAssociationOverride.getName()); virtualAssociationOverride.convertToSpecified(); - assertEquals(1, overrideContainer.virtualOverridesSize()); + assertEquals(1, overrideContainer.getVirtualOverridesSize()); } public void testSpecifiedAssociationOverridesSize() throws Exception { @@ -1153,7 +1153,7 @@ public class GenericOrmEmbeddedMapping2_0Tests extends Generic2_0ContextModelTes XmlEmbedded embeddedResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getEmbeddeds().get(0); - assertEquals(0, overrideContainer.specifiedOverridesSize()); + assertEquals(0, overrideContainer.getSpecifiedOverridesSize()); //add an annotation to the resource model and verify the context model is updated XmlAssociationOverride associationOverride = OrmFactory.eINSTANCE.createXmlAssociationOverride(); @@ -1163,7 +1163,7 @@ public class GenericOrmEmbeddedMapping2_0Tests extends Generic2_0ContextModelTes embeddedResource.getAssociationOverrides().add(0, associationOverride); associationOverride.setName("BAR"); - assertEquals(2, overrideContainer.specifiedOverridesSize()); + assertEquals(2, overrideContainer.getSpecifiedOverridesSize()); } public void testVirtualAssociationOverridesSize() throws Exception { @@ -1177,13 +1177,13 @@ public class GenericOrmEmbeddedMapping2_0Tests extends Generic2_0ContextModelTes OrmEmbeddedMapping2_0 embeddedMapping = (OrmEmbeddedMapping2_0) ormPersistentAttribute.getMapping(); AssociationOverrideContainer overrideContainer = embeddedMapping.getAssociationOverrideContainer(); - assertEquals(2, overrideContainer.virtualOverridesSize()); + 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 { @@ -1197,13 +1197,13 @@ public class GenericOrmEmbeddedMapping2_0Tests extends Generic2_0ContextModelTes OrmEmbeddedMapping2_0 embeddedMapping = (OrmEmbeddedMapping2_0) ormPersistentAttribute.getMapping(); AssociationOverrideContainer overrideContainer = embeddedMapping.getAssociationOverrideContainer(); - assertEquals(2, overrideContainer.overridesSize()); + assertEquals(2, overrideContainer.getOverridesSize()); - overrideContainer.virtualOverrides().next().convertToSpecified(); - assertEquals(2, overrideContainer.overridesSize()); + overrideContainer.getVirtualOverrides().iterator().next().convertToSpecified(); + assertEquals(2, overrideContainer.getOverridesSize()); - overrideContainer.virtualOverrides().next().convertToSpecified(); - assertEquals(2, overrideContainer.overridesSize()); + overrideContainer.getVirtualOverrides().iterator().next().convertToSpecified(); + assertEquals(2, overrideContainer.getOverridesSize()); XmlEmbedded embeddedResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getEmbeddeds().get(0); @@ -1211,7 +1211,7 @@ public class GenericOrmEmbeddedMapping2_0Tests extends Generic2_0ContextModelTes XmlAssociationOverride associationOverride = OrmFactory.eINSTANCE.createXmlAssociationOverride(); embeddedResource.getAssociationOverrides().add(associationOverride); associationOverride.setName("bar"); - assertEquals(3, overrideContainer.overridesSize()); + assertEquals(3, overrideContainer.getOverridesSize()); } public void testAssociationOverrideSetVirtual() throws Exception { @@ -1225,8 +1225,8 @@ public class GenericOrmEmbeddedMapping2_0Tests extends Generic2_0ContextModelTes OrmEmbeddedMapping2_0 embeddedMapping = (OrmEmbeddedMapping2_0) ormPersistentAttribute.getMapping(); AssociationOverrideContainer overrideContainer = embeddedMapping.getAssociationOverrideContainer(); - overrideContainer.virtualOverrides().next().convertToSpecified(); - overrideContainer.virtualOverrides().next().convertToSpecified(); + overrideContainer.getVirtualOverrides().iterator().next().convertToSpecified(); + overrideContainer.getVirtualOverrides().iterator().next().convertToSpecified(); XmlEmbedded embeddedResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getEmbeddeds().get(0); @@ -1244,12 +1244,12 @@ public class GenericOrmEmbeddedMapping2_0Tests extends Generic2_0ContextModelTes OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.addSpecifiedAttribute(MappingKeys.EMBEDDED_ATTRIBUTE_MAPPING_KEY, "myEmbedded"); OrmEmbeddedMapping2_0 embeddedMapping = (OrmEmbeddedMapping2_0) ormPersistentAttribute.getMapping(); - AssociationOverrideContainer overrideContainer = embeddedMapping.getAssociationOverrideContainer(); + OrmAssociationOverrideContainer overrideContainer = embeddedMapping.getAssociationOverrideContainer(); - ListIterator virtualAssociationOverrides = (ListIterator) overrideContainer.virtualOverrides(); + ListIterator virtualAssociationOverrides = overrideContainer.getVirtualOverrides().iterator(); virtualAssociationOverrides.next(); virtualAssociationOverrides.next().convertToSpecified(); - overrideContainer.virtualOverrides().next().convertToSpecified(); + overrideContainer.getVirtualOverrides().iterator().next().convertToSpecified(); XmlEmbedded embeddedResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getEmbeddeds().get(0); @@ -1267,27 +1267,27 @@ public class GenericOrmEmbeddedMapping2_0Tests extends Generic2_0ContextModelTes OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.addSpecifiedAttribute(MappingKeys.EMBEDDED_ATTRIBUTE_MAPPING_KEY, "myEmbedded"); OrmEmbeddedMapping2_0 embeddedMapping = (OrmEmbeddedMapping2_0) ormPersistentAttribute.getMapping(); - AssociationOverrideContainer overrideContainer = embeddedMapping.getAssociationOverrideContainer(); + OrmAssociationOverrideContainer overrideContainer = embeddedMapping.getAssociationOverrideContainer(); - overrideContainer.virtualOverrides().next().convertToSpecified(); - overrideContainer.virtualOverrides().next().convertToSpecified(); + overrideContainer.getVirtualOverrides().iterator().next().convertToSpecified(); + overrideContainer.getVirtualOverrides().iterator().next().convertToSpecified(); XmlEmbedded embeddedResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getEmbeddeds().get(0); assertEquals(2, embeddedResource.getAssociationOverrides().size()); - overrideContainer.specifiedOverrides().next().convertToVirtual(); + overrideContainer.getSpecifiedOverrides().iterator().next().convertToVirtual(); assertEquals("addresses", embeddedResource.getAssociationOverrides().get(0).getName()); assertEquals(1, embeddedResource.getAssociationOverrides().size()); - Iterator associationOverrides = (Iterator) overrideContainer.specifiedOverrides(); + Iterator associationOverrides = overrideContainer.getSpecifiedOverrides().iterator(); assertEquals("addresses", associationOverrides.next().getName()); assertFalse(associationOverrides.hasNext()); - overrideContainer.specifiedOverrides().next().convertToVirtual(); + overrideContainer.getSpecifiedOverrides().iterator().next().convertToVirtual(); assertEquals(0, embeddedResource.getAssociationOverrides().size()); - associationOverrides = (Iterator) overrideContainer.specifiedOverrides(); + associationOverrides = overrideContainer.getSpecifiedOverrides().iterator(); assertFalse(associationOverrides.hasNext()); } @@ -1303,8 +1303,8 @@ public class GenericOrmEmbeddedMapping2_0Tests extends Generic2_0ContextModelTes OrmEmbeddedMapping2_0 embeddedMapping = (OrmEmbeddedMapping2_0) ormPersistentAttribute.getMapping(); AssociationOverrideContainer overrideContainer = embeddedMapping.getAssociationOverrideContainer(); - overrideContainer.virtualOverrides().next().convertToSpecified(); - overrideContainer.virtualOverrides().next().convertToSpecified(); + overrideContainer.getVirtualOverrides().iterator().next().convertToSpecified(); + overrideContainer.getVirtualOverrides().iterator().next().convertToSpecified(); XmlEmbedded embeddedResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getEmbeddeds().get(0); @@ -1312,7 +1312,7 @@ public class GenericOrmEmbeddedMapping2_0Tests extends Generic2_0ContextModelTes overrideContainer.moveSpecifiedOverride(1, 0); - ListIterator associationOverrides = (ListIterator) overrideContainer.specifiedOverrides(); + ListIterator associationOverrides = overrideContainer.getSpecifiedOverrides().iterator(); assertEquals("addresses", associationOverrides.next().getName()); assertEquals("address", associationOverrides.next().getName()); @@ -1321,7 +1321,7 @@ public class GenericOrmEmbeddedMapping2_0Tests extends Generic2_0ContextModelTes overrideContainer.moveSpecifiedOverride(0, 1); - associationOverrides = (ListIterator) overrideContainer.specifiedOverrides(); + associationOverrides = overrideContainer.getSpecifiedOverrides().iterator(); assertEquals("address", associationOverrides.next().getName()); assertEquals("addresses", associationOverrides.next().getName()); @@ -1352,39 +1352,39 @@ public class GenericOrmEmbeddedMapping2_0Tests extends Generic2_0ContextModelTes embeddedResource.getAssociationOverrides().add(2, associationOverride); associationOverride.setName("BAZ"); - ListIterator associationOverrides = (ListIterator) overrideContainer.specifiedOverrides(); + ListIterator associationOverrides = overrideContainer.getSpecifiedOverrides().iterator(); assertEquals("FOO", associationOverrides.next().getName()); assertEquals("BAR", associationOverrides.next().getName()); assertEquals("BAZ", associationOverrides.next().getName()); assertFalse(associationOverrides.hasNext()); embeddedResource.getAssociationOverrides().move(2, 0); - associationOverrides = (ListIterator) overrideContainer.specifiedOverrides(); + associationOverrides = overrideContainer.getSpecifiedOverrides().iterator(); assertEquals("BAR", associationOverrides.next().getName()); assertEquals("BAZ", associationOverrides.next().getName()); assertEquals("FOO", associationOverrides.next().getName()); assertFalse(associationOverrides.hasNext()); embeddedResource.getAssociationOverrides().move(0, 1); - associationOverrides = (ListIterator) overrideContainer.specifiedOverrides(); + associationOverrides = overrideContainer.getSpecifiedOverrides().iterator(); assertEquals("BAZ", associationOverrides.next().getName()); assertEquals("BAR", associationOverrides.next().getName()); assertEquals("FOO", associationOverrides.next().getName()); assertFalse(associationOverrides.hasNext()); embeddedResource.getAssociationOverrides().remove(1); - associationOverrides = (ListIterator) overrideContainer.specifiedOverrides(); + associationOverrides = overrideContainer.getSpecifiedOverrides().iterator(); assertEquals("BAZ", associationOverrides.next().getName()); assertEquals("FOO", associationOverrides.next().getName()); assertFalse(associationOverrides.hasNext()); embeddedResource.getAssociationOverrides().remove(1); - associationOverrides = (ListIterator) overrideContainer.specifiedOverrides(); + associationOverrides = overrideContainer.getSpecifiedOverrides().iterator(); assertEquals("BAZ", associationOverrides.next().getName()); assertFalse(associationOverrides.hasNext()); embeddedResource.getAssociationOverrides().remove(0); - associationOverrides = (ListIterator) overrideContainer.specifiedOverrides(); + associationOverrides = overrideContainer.getSpecifiedOverrides().iterator(); assertFalse(associationOverrides.hasNext()); } @@ -1397,9 +1397,9 @@ public class GenericOrmEmbeddedMapping2_0Tests extends Generic2_0ContextModelTes OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.addSpecifiedAttribute(MappingKeys.EMBEDDED_ATTRIBUTE_MAPPING_KEY, "myEmbedded"); OrmEmbeddedMapping2_0 embeddedMapping = (OrmEmbeddedMapping2_0) ormPersistentAttribute.getMapping(); - AssociationOverrideContainer overrideContainer = embeddedMapping.getAssociationOverrideContainer(); + OrmAssociationOverrideContainer overrideContainer = embeddedMapping.getAssociationOverrideContainer(); - ListIterator virtualAssociationOverrides = (ListIterator) overrideContainer.virtualOverrides(); + ListIterator virtualAssociationOverrides = overrideContainer.getVirtualOverrides().iterator(); VirtualAssociationOverride virtualAssociationOverride = virtualAssociationOverrides.next(); assertEquals("address", virtualAssociationOverride.getName()); assertTrue(virtualAssociationOverride.isVirtual()); @@ -1409,12 +1409,12 @@ public class GenericOrmEmbeddedMapping2_0Tests extends Generic2_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) overrideContainer.virtualOverrides(); + virtualAssociationOverrides = overrideContainer.getVirtualOverrides().iterator(); virtualAssociationOverride = virtualAssociationOverrides.next(); assertEquals("addresses", virtualAssociationOverride.getName()); assertTrue(virtualAssociationOverride.isVirtual()); @@ -1432,14 +1432,14 @@ public class GenericOrmEmbeddedMapping2_0Tests extends Generic2_0ContextModelTes OrmEmbeddedMapping2_0 embeddedMapping = (OrmEmbeddedMapping2_0) ormPersistentAttribute.getMapping(); AssociationOverrideContainer overrideContainer = embeddedMapping.getAssociationOverrideContainer(); - assertEquals(2, overrideContainer.virtualOverridesSize()); - VirtualAssociationOverride virtualAssociationOverride = CollectionTools.get(overrideContainer.virtualOverrides(), 1); + assertEquals(2, overrideContainer.getVirtualOverridesSize()); + VirtualAssociationOverride virtualAssociationOverride = CollectionTools.get(overrideContainer.getVirtualOverrides(), 1); VirtualJoinTableRelationshipStrategy joiningStrategy = ((VirtualOverrideRelationship2_0) virtualAssociationOverride.getRelationship()).getJoinTableStrategy(); ReadOnlyJoinTable joinTable = joiningStrategy.getJoinTable(); assertEquals("addresses", virtualAssociationOverride.getName()); assertEquals("AnnotationTestType_Address", joinTable.getName()); - assertEquals(1, joinTable.joinColumnsSize()); - ReadOnlyJoinColumn virtualJoinColumn = joinTable.joinColumns().next(); + assertEquals(1, joinTable.getJoinColumnsSize()); + ReadOnlyJoinColumn virtualJoinColumn = joinTable.getJoinColumns().iterator().next(); assertEquals("AnnotationTestType_id", virtualJoinColumn.getName()); assertEquals("id", virtualJoinColumn.getReferencedColumnName()); assertEquals("AnnotationTestType_Address", virtualJoinColumn.getTable()); @@ -1449,8 +1449,8 @@ public class GenericOrmEmbeddedMapping2_0Tests extends Generic2_0ContextModelTes assertEquals(false, virtualJoinColumn.isUnique()); assertEquals(true, virtualJoinColumn.isNullable()); - assertEquals(1, joinTable.inverseJoinColumnsSize()); - ReadOnlyJoinColumn virtualInverseJoinColumn = joinTable.inverseJoinColumns().next(); + assertEquals(1, joinTable.getInverseJoinColumnsSize()); + ReadOnlyJoinColumn virtualInverseJoinColumn = joinTable.getInverseJoinColumns().iterator().next(); assertEquals("addresses_id", virtualInverseJoinColumn.getName()); assertEquals("id", virtualInverseJoinColumn.getReferencedColumnName()); assertEquals("AnnotationTestType_Address", virtualInverseJoinColumn.getTable()); @@ -1460,7 +1460,7 @@ public class GenericOrmEmbeddedMapping2_0Tests extends Generic2_0ContextModelTes assertEquals(false, virtualInverseJoinColumn.isUnique()); assertEquals(true, virtualInverseJoinColumn.isNullable()); - JavaPersistentType javaEmbeddable = getPersistenceUnit().specifiedClassRefs().next().getJavaPersistentType(); + JavaPersistentType javaEmbeddable = getPersistenceUnit().getSpecifiedClassRefs().iterator().next().getJavaPersistentType(); OneToManyMapping oneToManyMapping = (OneToManyMapping) javaEmbeddable.getAttributeNamed("addresses").getMapping(); JoinTableRelationshipStrategy joinTableStrategy = oneToManyMapping.getRelationship().getJoinTableStrategy(); joinTableStrategy.getJoinTable().setSpecifiedName("MY_JOIN_TABLE"); @@ -1484,13 +1484,13 @@ public class GenericOrmEmbeddedMapping2_0Tests extends Generic2_0ContextModelTes inverseJoinColumn.setSpecifiedUnique(Boolean.TRUE); inverseJoinColumn.setSpecifiedNullable(Boolean.FALSE); - assertEquals(2, overrideContainer.virtualOverridesSize()); - virtualAssociationOverride = CollectionTools.get(overrideContainer.virtualOverrides(), 1); + assertEquals(2, overrideContainer.getVirtualOverridesSize()); + virtualAssociationOverride = CollectionTools.get(overrideContainer.getVirtualOverrides(), 1); joiningStrategy = ((VirtualOverrideRelationship2_0) virtualAssociationOverride.getRelationship()).getJoinTableStrategy(); joinTable = joiningStrategy.getJoinTable(); assertEquals("addresses", virtualAssociationOverride.getName()); - assertEquals(1, joinTable.joinColumnsSize()); - virtualJoinColumn = joinTable.joinColumns().next(); + assertEquals(1, joinTable.getJoinColumnsSize()); + virtualJoinColumn = joinTable.getJoinColumns().iterator().next(); assertEquals("MY_JOIN_COLUMN", virtualJoinColumn.getName()); assertEquals("MY_REFERENCE_COLUMN", virtualJoinColumn.getReferencedColumnName()); assertEquals("BAR", virtualJoinColumn.getTable()); @@ -1500,8 +1500,8 @@ public class GenericOrmEmbeddedMapping2_0Tests extends Generic2_0ContextModelTes assertEquals(true, virtualJoinColumn.isUnique()); assertEquals(false, virtualJoinColumn.isNullable()); - assertEquals(1, joinTable.inverseJoinColumnsSize()); - virtualInverseJoinColumn = joinTable.inverseJoinColumns().next(); + assertEquals(1, joinTable.getInverseJoinColumnsSize()); + virtualInverseJoinColumn = joinTable.getInverseJoinColumns().iterator().next(); assertEquals("MY_INVERSE_JOIN_COLUMN", virtualInverseJoinColumn.getName()); assertEquals("MY_INVERSE_REFERENCE_COLUMN", virtualInverseJoinColumn.getReferencedColumnName()); assertEquals("INVERSE_BAR", virtualInverseJoinColumn.getTable()); @@ -1514,7 +1514,7 @@ public class GenericOrmEmbeddedMapping2_0Tests extends Generic2_0ContextModelTes //add the java association override and make sure the settings are not used in determining the association override defaults in the specified orm embedded mapping JavaEmbeddedMapping2_0 javaEmbeddedMapping = (JavaEmbeddedMapping2_0) ormPersistentType.getJavaPersistentType().getAttributeNamed("myEmbedded").getMapping(); - ListIterator javaAssociationOverrides = javaEmbeddedMapping.getAssociationOverrideContainer().overrides(); + ListIterator javaAssociationOverrides = javaEmbeddedMapping.getAssociationOverrideContainer().getOverrides().iterator(); javaAssociationOverrides.next(); JavaAssociationOverride javaAssociationOverride = ((JavaVirtualAssociationOverride) javaAssociationOverrides.next()).convertToSpecified(); assertEquals("addresses", javaAssociationOverride.getName()); @@ -1529,14 +1529,14 @@ public class GenericOrmEmbeddedMapping2_0Tests extends Generic2_0ContextModelTes - assertEquals(2, overrideContainer.virtualOverridesSize()); - virtualAssociationOverride = CollectionTools.get(overrideContainer.virtualOverrides(), 1); + assertEquals(2, overrideContainer.getVirtualOverridesSize()); + virtualAssociationOverride = CollectionTools.get(overrideContainer.getVirtualOverrides(), 1); joiningStrategy = ((VirtualOverrideRelationship2_0) virtualAssociationOverride.getRelationship()).getJoinTableStrategy(); joinTable = joiningStrategy.getJoinTable(); assertEquals("addresses", virtualAssociationOverride.getName()); assertEquals("MY_JOIN_TABLE", joinTable.getName()); - assertEquals(1, joinTable.joinColumnsSize()); - virtualJoinColumn = joinTable.joinColumns().next(); + assertEquals(1, joinTable.getJoinColumnsSize()); + virtualJoinColumn = joinTable.getJoinColumns().iterator().next(); assertEquals("MY_JOIN_COLUMN", virtualJoinColumn.getName()); assertEquals("MY_REFERENCE_COLUMN", virtualJoinColumn.getReferencedColumnName()); @@ -1547,8 +1547,8 @@ public class GenericOrmEmbeddedMapping2_0Tests extends Generic2_0ContextModelTes assertEquals(true, virtualJoinColumn.isUnique()); assertEquals(false, virtualJoinColumn.isNullable()); - assertEquals(1, joinTable.inverseJoinColumnsSize()); - virtualInverseJoinColumn = joinTable.inverseJoinColumns().next(); + assertEquals(1, joinTable.getInverseJoinColumnsSize()); + virtualInverseJoinColumn = joinTable.getInverseJoinColumns().iterator().next(); assertEquals("MY_INVERSE_JOIN_COLUMN", virtualInverseJoinColumn.getName()); assertEquals("MY_INVERSE_REFERENCE_COLUMN", virtualInverseJoinColumn.getReferencedColumnName()); assertEquals("INVERSE_BAR", virtualInverseJoinColumn.getTable()); @@ -1559,23 +1559,23 @@ public class GenericOrmEmbeddedMapping2_0Tests extends Generic2_0ContextModelTes assertEquals(false, virtualInverseJoinColumn.isNullable()); - virtualAssociationOverride = overrideContainer.virtualOverrides().next(); + virtualAssociationOverride = overrideContainer.getVirtualOverrides().iterator().next(); assertEquals("address", virtualAssociationOverride.getName()); virtualAssociationOverride.convertToSpecified(); - assertEquals(1, overrideContainer.virtualOverridesSize()); + assertEquals(1, overrideContainer.getVirtualOverridesSize()); ormPersistentAttribute.convertToVirtual(); EmbeddedMapping2_0 virtualEmbeddedMapping = (EmbeddedMapping2_0) ormPersistentType.getAttributeNamed("myEmbedded").getMapping(); overrideContainer = virtualEmbeddedMapping.getAssociationOverrideContainer(); - AssociationOverride associationOverride = overrideContainer.specifiedOverrides().next(); + AssociationOverride associationOverride = overrideContainer.getSpecifiedOverrides().iterator().next(); assertEquals("addresses", associationOverride.getName()); ReadOnlyJoinTableRelationshipStrategy strategy = ((ReadOnlyOverrideRelationship2_0) associationOverride.getRelationship()).getJoinTableStrategy(); joinTable = strategy.getJoinTable(); assertEquals("JAVA_FOO", joinTable.getName()); - assertEquals(2, joinTable.joinColumnsSize()); - ListIterator joinColumns = (ListIterator) joinTable.joinColumns(); + assertEquals(2, joinTable.getJoinColumnsSize()); + ListIterator joinColumns = joinTable.getJoinColumns().iterator(); virtualJoinColumn = joinColumns.next(); assertEquals("JAVA_JOIN_COLUMN_NAME", virtualJoinColumn.getName()); assertEquals("JAVA_JOIN_COLUMN_REFERENCED_NAME", virtualJoinColumn.getReferencedColumnName()); @@ -1585,8 +1585,8 @@ public class GenericOrmEmbeddedMapping2_0Tests extends Generic2_0ContextModelTes assertEquals("MY_REFERENCE_COLUMN", virtualJoinColumn.getReferencedColumnName()); assertEquals("BAR", virtualJoinColumn.getTable()); - assertEquals(2, joinTable.inverseJoinColumnsSize()); - ListIterator inverseJoinColumns = (ListIterator) joinTable.inverseJoinColumns(); + assertEquals(2, joinTable.getInverseJoinColumnsSize()); + ListIterator inverseJoinColumns = joinTable.getInverseJoinColumns().iterator(); virtualInverseJoinColumn = inverseJoinColumns.next(); assertEquals("JAVA_INVERSE_JOIN_COLUMN_NAME", virtualInverseJoinColumn.getName()); assertEquals("JAVA_INVERSE_JOIN_COLUMN_REFERENCED_NAME", virtualInverseJoinColumn.getReferencedColumnName()); @@ -1610,8 +1610,8 @@ public class GenericOrmEmbeddedMapping2_0Tests extends Generic2_0ContextModelTes EmbeddedMapping embeddedMapping = (EmbeddedMapping) customerPersistentType.getAttributeNamed("address").getMapping(); AttributeOverrideContainer attributeOverrideContainer = embeddedMapping.getAttributeOverrideContainer(); - assertEquals(5, attributeOverrideContainer.virtualOverridesSize()); - ListIterator virtualAttributeOverrides = (ListIterator) attributeOverrideContainer.virtualOverrides(); + assertEquals(5, attributeOverrideContainer.getVirtualOverridesSize()); + ListIterator virtualAttributeOverrides = attributeOverrideContainer.getVirtualOverrides().iterator(); VirtualAttributeOverride virtualAttributeOverride = virtualAttributeOverrides.next(); assertEquals("street", virtualAttributeOverride.getName()); virtualAttributeOverride = virtualAttributeOverrides.next(); @@ -1639,8 +1639,8 @@ public class GenericOrmEmbeddedMapping2_0Tests extends Generic2_0ContextModelTes addressPersistentType.getAttributeNamed("zipCode").convertToSpecified(); EmbeddedMapping nestedEmbeddedMapping = (EmbeddedMapping) addressPersistentType.getAttributeNamed("zipCode").getMapping(); AttributeOverrideContainer nestedAttributeOverrideContainer = nestedEmbeddedMapping.getAttributeOverrideContainer(); - assertEquals(2, nestedAttributeOverrideContainer.virtualOverridesSize()); - virtualAttributeOverrides = (ListIterator) nestedAttributeOverrideContainer.virtualOverrides(); + assertEquals(2, nestedAttributeOverrideContainer.getVirtualOverridesSize()); + virtualAttributeOverrides = nestedAttributeOverrideContainer.getVirtualOverrides().iterator(); virtualAttributeOverride = virtualAttributeOverrides.next(); assertEquals("zip", virtualAttributeOverride.getName()); virtualAttributeOverride = virtualAttributeOverrides.next(); diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/orm/GenericOrmEntity2_0Tests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/orm/GenericOrmEntity2_0Tests.java index 9a9268ed11..7e997b5020 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/orm/GenericOrmEntity2_0Tests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/orm/GenericOrmEntity2_0Tests.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. @@ -361,12 +361,12 @@ public class GenericOrmEntity2_0Tests extends Generic2_0ContextModelTestCase assertEquals(LockModeType2_0.WRITE, this.lockModeOf(resourceQuery)); assertEquals("FOO", entityResource.getNamedQueries().get(2).getName()); - ListIterator namedQueries = ormEntity.getQueryContainer().namedQueries(); + ListIterator namedQueries = ormEntity.getQueryContainer().getNamedQueries().iterator(); assertEquals(namedQuery2, namedQueries.next()); assertEquals(namedQuery3, namedQueries.next()); assertEquals(namedQuery, namedQueries.next()); - namedQueries = ormEntity.getQueryContainer().namedQueries(); + namedQueries = ormEntity.getQueryContainer().getNamedQueries().iterator(); assertEquals("BAR", namedQueries.next().getName()); assertEquals("BAZ", namedQueries.next().getName()); assertEquals("FOO", namedQueries.next().getName()); @@ -424,7 +424,7 @@ public class GenericOrmEntity2_0Tests extends Generic2_0ContextModelTestCase ormEntity.getQueryContainer().moveNamedQuery(2, 0); - ListIterator namedQueries = ormEntity.getQueryContainer().namedQueries(); + ListIterator namedQueries = ormEntity.getQueryContainer().getNamedQueries().iterator(); namedQuery1 = (OrmNamedQuery2_0) namedQueries.next(); assertEquals("BAR", namedQuery1.getName()); assertEquals(LockModeType2_0.OPTIMISTIC, namedQuery1.getLockMode()); @@ -439,7 +439,7 @@ public class GenericOrmEntity2_0Tests extends Generic2_0ContextModelTestCase ormEntity.getQueryContainer().moveNamedQuery(0, 1); - namedQueries = ormEntity.getQueryContainer().namedQueries(); + namedQueries = ormEntity.getQueryContainer().getNamedQueries().iterator(); assertEquals("BAZ", namedQueries.next().getName()); namedQuery1 = (OrmNamedQuery2_0) namedQueries.next(); assertEquals("BAR", namedQuery1.getName()); @@ -457,7 +457,7 @@ public class GenericOrmEntity2_0Tests extends Generic2_0ContextModelTestCase OrmPersistentType persistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); OrmEntity ormEntity = (OrmEntity) persistentType.getMapping(); - assertEquals(0, ormEntity.getPersistenceUnit().queriesSize()); + assertEquals(0, ormEntity.getPersistenceUnit().getQueriesSize()); XmlEntity entityResource = getXmlEntityMappings().getEntities().get(0); entityResource.getNamedQueries().add(OrmFactory.eINSTANCE.createXmlNamedQuery()); @@ -469,17 +469,17 @@ public class GenericOrmEntity2_0Tests extends Generic2_0ContextModelTestCase xmlQuery.setName("BAZ"); xmlQuery.setLockMode(org.eclipse.jpt.jpa.core.resource.orm.v2_0.LockModeType_2_0.OPTIMISTIC); - ListIterator namedQueries = ormEntity.getQueryContainer().namedQueries(); + ListIterator namedQueries = ormEntity.getQueryContainer().getNamedQueries().iterator(); assertEquals("FOO", namedQueries.next().getName()); assertEquals("BAR", namedQueries.next().getName()); OrmNamedQuery2_0 namedQuery1 = (OrmNamedQuery2_0) namedQueries.next(); assertEquals("BAZ", namedQuery1.getName()); assertEquals(LockModeType2_0.OPTIMISTIC, namedQuery1.getLockMode()); assertFalse(namedQueries.hasNext()); - assertEquals(3, ormEntity.getPersistenceUnit().queriesSize()); + assertEquals(3, ormEntity.getPersistenceUnit().getQueriesSize()); entityResource.getNamedQueries().move(2, 0); - namedQueries = ormEntity.getQueryContainer().namedQueries(); + namedQueries = ormEntity.getQueryContainer().getNamedQueries().iterator(); assertEquals("BAR", namedQueries.next().getName()); namedQuery1 = (OrmNamedQuery2_0) namedQueries.next(); assertEquals("BAZ", namedQuery1.getName()); @@ -488,7 +488,7 @@ public class GenericOrmEntity2_0Tests extends Generic2_0ContextModelTestCase assertFalse(namedQueries.hasNext()); entityResource.getNamedQueries().move(0, 1); - namedQueries = ormEntity.getQueryContainer().namedQueries(); + namedQueries = ormEntity.getQueryContainer().getNamedQueries().iterator(); namedQuery1 = (OrmNamedQuery2_0) namedQueries.next(); assertEquals("BAZ", namedQuery1.getName()); assertEquals(LockModeType2_0.OPTIMISTIC, namedQuery1.getLockMode()); @@ -497,25 +497,25 @@ public class GenericOrmEntity2_0Tests extends Generic2_0ContextModelTestCase assertFalse(namedQueries.hasNext()); entityResource.getNamedQueries().remove(1); - namedQueries = ormEntity.getQueryContainer().namedQueries(); + namedQueries = ormEntity.getQueryContainer().getNamedQueries().iterator(); namedQuery1 = (OrmNamedQuery2_0) namedQueries.next(); assertEquals("BAZ", namedQuery1.getName()); assertEquals(LockModeType2_0.OPTIMISTIC, namedQuery1.getLockMode()); assertEquals("FOO", namedQueries.next().getName()); assertFalse(namedQueries.hasNext()); - assertEquals(2, ormEntity.getPersistenceUnit().queriesSize()); + assertEquals(2, ormEntity.getPersistenceUnit().getQueriesSize()); entityResource.getNamedQueries().remove(1); - namedQueries = ormEntity.getQueryContainer().namedQueries(); + namedQueries = ormEntity.getQueryContainer().getNamedQueries().iterator(); namedQuery1 = (OrmNamedQuery2_0) namedQueries.next(); assertEquals("BAZ", namedQuery1.getName()); assertEquals(LockModeType2_0.OPTIMISTIC, namedQuery1.getLockMode()); assertFalse(namedQueries.hasNext()); - assertEquals(1, ormEntity.getPersistenceUnit().queriesSize()); + assertEquals(1, ormEntity.getPersistenceUnit().getQueriesSize()); entityResource.getNamedQueries().remove(0); - assertFalse(ormEntity.getQueryContainer().namedQueries().hasNext()); - assertEquals(0, ormEntity.getPersistenceUnit().queriesSize()); + assertFalse(ormEntity.getQueryContainer().getNamedQueries().iterator().hasNext()); + assertEquals(0, ormEntity.getPersistenceUnit().getQueriesSize()); } @@ -662,7 +662,7 @@ public class GenericOrmEntity2_0Tests extends Generic2_0ContextModelTestCase OrmEntity entity = (OrmEntity) ormPersistentType.getMapping(); OrmAttributeOverrideContainer overrideContainer = entity.getAttributeOverrideContainer(); - ListIterator specifiedAttributeOverrides = overrideContainer.specifiedOverrides(); + ListIterator specifiedAttributeOverrides = overrideContainer.getSpecifiedOverrides().iterator(); assertFalse(specifiedAttributeOverrides.hasNext()); XmlEntity entityResource = getXmlEntityMappings().getEntities().get(0); @@ -670,13 +670,13 @@ public class GenericOrmEntity2_0Tests extends Generic2_0ContextModelTestCase //add an annotation to the resource model and verify the context model is updated entityResource.getAttributeOverrides().add(0, OrmFactory.eINSTANCE.createXmlAttributeOverride()); entityResource.getAttributeOverrides().get(0).setName("FOO"); - specifiedAttributeOverrides = overrideContainer.specifiedOverrides(); + specifiedAttributeOverrides = overrideContainer.getSpecifiedOverrides().iterator(); assertEquals("FOO", specifiedAttributeOverrides.next().getName()); assertFalse(specifiedAttributeOverrides.hasNext()); entityResource.getAttributeOverrides().add(1, OrmFactory.eINSTANCE.createXmlAttributeOverride()); entityResource.getAttributeOverrides().get(1).setName("BAR"); - specifiedAttributeOverrides = overrideContainer.specifiedOverrides(); + specifiedAttributeOverrides = overrideContainer.getSpecifiedOverrides().iterator(); assertEquals("FOO", specifiedAttributeOverrides.next().getName()); assertEquals("BAR", specifiedAttributeOverrides.next().getName()); assertFalse(specifiedAttributeOverrides.hasNext()); @@ -684,7 +684,7 @@ public class GenericOrmEntity2_0Tests extends Generic2_0ContextModelTestCase entityResource.getAttributeOverrides().add(0, OrmFactory.eINSTANCE.createXmlAttributeOverride()); entityResource.getAttributeOverrides().get(0).setName("BAZ"); - specifiedAttributeOverrides = overrideContainer.specifiedOverrides(); + specifiedAttributeOverrides = overrideContainer.getSpecifiedOverrides().iterator(); assertEquals("BAZ", specifiedAttributeOverrides.next().getName()); assertEquals("FOO", specifiedAttributeOverrides.next().getName()); assertEquals("BAR", specifiedAttributeOverrides.next().getName()); @@ -692,25 +692,25 @@ public class GenericOrmEntity2_0Tests extends Generic2_0ContextModelTestCase //move an annotation to the resource model and verify the context model is updated entityResource.getAttributeOverrides().move(1, 0); - specifiedAttributeOverrides = overrideContainer.specifiedOverrides(); + specifiedAttributeOverrides = overrideContainer.getSpecifiedOverrides().iterator(); assertEquals("FOO", specifiedAttributeOverrides.next().getName()); assertEquals("BAZ", specifiedAttributeOverrides.next().getName()); assertEquals("BAR", specifiedAttributeOverrides.next().getName()); assertFalse(specifiedAttributeOverrides.hasNext()); entityResource.getAttributeOverrides().remove(0); - specifiedAttributeOverrides = overrideContainer.specifiedOverrides(); + specifiedAttributeOverrides = overrideContainer.getSpecifiedOverrides().iterator(); assertEquals("BAZ", specifiedAttributeOverrides.next().getName()); assertEquals("BAR", specifiedAttributeOverrides.next().getName()); assertFalse(specifiedAttributeOverrides.hasNext()); entityResource.getAttributeOverrides().remove(0); - specifiedAttributeOverrides = overrideContainer.specifiedOverrides(); + specifiedAttributeOverrides = overrideContainer.getSpecifiedOverrides().iterator(); assertEquals("BAR", specifiedAttributeOverrides.next().getName()); assertFalse(specifiedAttributeOverrides.hasNext()); entityResource.getAttributeOverrides().remove(0); - specifiedAttributeOverrides = overrideContainer.specifiedOverrides(); + specifiedAttributeOverrides = overrideContainer.getSpecifiedOverrides().iterator(); assertFalse(specifiedAttributeOverrides.hasNext()); } @@ -725,8 +725,8 @@ public class GenericOrmEntity2_0Tests extends Generic2_0ContextModelTestCase XmlEntity entityResource = getXmlEntityMappings().getEntities().get(0); assertEquals(0, entityResource.getAttributeOverrides().size()); - 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()); @@ -741,8 +741,8 @@ public class GenericOrmEntity2_0Tests extends Generic2_0ContextModelTestCase assertEquals(0, entityResource.getAttributeOverrides().size()); - 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()); @@ -751,13 +751,13 @@ public class GenericOrmEntity2_0Tests extends Generic2_0ContextModelTestCase idMapping.getColumn().setSpecifiedTable(null); assertEquals(0, entityResource.getAttributeOverrides().size()); - 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 { @@ -771,8 +771,8 @@ public class GenericOrmEntity2_0Tests extends Generic2_0ContextModelTestCase XmlEntity entityResource = getXmlEntityMappings().getEntities().get(0); assertEquals(0, entityResource.getAttributeOverrides().size()); - 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()); @@ -787,8 +787,8 @@ public class GenericOrmEntity2_0Tests extends Generic2_0ContextModelTestCase assertEquals(0, entityResource.getAttributeOverrides().size()); - 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()); @@ -797,13 +797,13 @@ public class GenericOrmEntity2_0Tests extends Generic2_0ContextModelTestCase idMapping.getColumn().setSpecifiedTable(null); assertEquals(0, entityResource.getAttributeOverrides().size()); - 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 { @@ -812,7 +812,7 @@ public class GenericOrmEntity2_0Tests extends Generic2_0ContextModelTestCase OrmEntity ormEntity = (OrmEntity) ormPersistentType.getMapping(); AttributeOverrideContainer overrideContainer = ormEntity.getAttributeOverrideContainer(); - assertEquals(0, overrideContainer.specifiedOverridesSize()); + assertEquals(0, overrideContainer.getSpecifiedOverridesSize()); XmlEntity entityResource = getXmlEntityMappings().getEntities().get(0); @@ -822,7 +822,7 @@ public class GenericOrmEntity2_0Tests extends Generic2_0ContextModelTestCase entityResource.getAttributeOverrides().add(OrmFactory.eINSTANCE.createXmlAttributeOverride()); entityResource.getAttributeOverrides().get(0).setName("BAR"); - assertEquals(2, overrideContainer.specifiedOverridesSize()); + assertEquals(2, overrideContainer.getSpecifiedOverridesSize()); } public void testDefaultAttributeOverridesSize() throws Exception { @@ -834,16 +834,16 @@ public class GenericOrmEntity2_0Tests extends Generic2_0ContextModelTestCase OrmEntity ormEntity = (OrmEntity) ormPersistentType.getMapping(); AttributeOverrideContainer overrideContainer = ormEntity.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 { @@ -855,19 +855,19 @@ public class GenericOrmEntity2_0Tests extends Generic2_0ContextModelTestCase OrmEntity ormEntity = (OrmEntity) ormPersistentType.getMapping(); AttributeOverrideContainer overrideContainer = ormEntity.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()); XmlEntity entityResource = getXmlEntityMappings().getEntities().get(0); entityResource.getAttributeOverrides().add(0, OrmFactory.eINSTANCE.createXmlAttributeOverride()); entityResource.getAttributeOverrides().get(0).setName("bar"); - assertEquals(4, overrideContainer.overridesSize()); + assertEquals(4, overrideContainer.getOverridesSize()); } public void testAttributeOverrideSetVirtual() throws Exception { @@ -879,8 +879,8 @@ public class GenericOrmEntity2_0Tests extends Generic2_0ContextModelTestCase OrmEntity ormEntity = (OrmEntity) ormPersistentType.getMapping(); AttributeOverrideContainer overrideContainer = ormEntity.getAttributeOverrideContainer(); - overrideContainer.virtualOverrides().next().convertToSpecified(); - overrideContainer.virtualOverrides().next().convertToSpecified(); + overrideContainer.getVirtualOverrides().iterator().next().convertToSpecified(); + overrideContainer.getVirtualOverrides().iterator().next().convertToSpecified(); XmlEntity entityResource = getXmlEntityMappings().getEntities().get(0); @@ -898,10 +898,10 @@ public class GenericOrmEntity2_0Tests extends Generic2_0ContextModelTestCase OrmEntity ormEntity = (OrmEntity) ormPersistentType.getMapping(); OrmAttributeOverrideContainer overrideContainer = ormEntity.getAttributeOverrideContainer(); - ListIterator virtualAttributeOverrides = overrideContainer.virtualOverrides(); + ListIterator virtualAttributeOverrides = overrideContainer.getVirtualOverrides().iterator(); virtualAttributeOverrides.next(); virtualAttributeOverrides.next().convertToSpecified(); - overrideContainer.virtualOverrides().next().convertToSpecified(); + overrideContainer.getVirtualOverrides().iterator().next().convertToSpecified(); XmlEntity entityResource = getXmlEntityMappings().getEntities().get(0); @@ -919,37 +919,37 @@ public class GenericOrmEntity2_0Tests extends Generic2_0ContextModelTestCase OrmEntity ormEntity = (OrmEntity) ormPersistentType.getMapping(); OrmAttributeOverrideContainer overrideContainer = ormEntity.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(); XmlEntity entityResource = getXmlEntityMappings().getEntities().get(0); assertEquals(3, entityResource.getAttributeOverrides().size()); - overrideContainer.specifiedOverrides().next().convertToVirtual(); + overrideContainer.getSpecifiedOverrides().iterator().next().convertToVirtual(); assertEquals("name", entityResource.getAttributeOverrides().get(0).getName()); assertEquals("foo", entityResource.getAttributeOverrides().get(1).getName()); assertEquals(2, entityResource.getAttributeOverrides().size()); - Iterator attributeOverrides = overrideContainer.specifiedOverrides(); + Iterator attributeOverrides = overrideContainer.getSpecifiedOverrides().iterator(); assertEquals("name", attributeOverrides.next().getName()); assertEquals("foo", attributeOverrides.next().getName()); assertFalse(attributeOverrides.hasNext()); - overrideContainer.specifiedOverrides().next().convertToVirtual(); + overrideContainer.getSpecifiedOverrides().iterator().next().convertToVirtual(); assertEquals("foo", entityResource.getAttributeOverrides().get(0).getName()); assertEquals(1, entityResource.getAttributeOverrides().size()); - attributeOverrides = overrideContainer.specifiedOverrides(); + attributeOverrides = overrideContainer.getSpecifiedOverrides().iterator(); assertEquals("foo", attributeOverrides.next().getName()); assertFalse(attributeOverrides.hasNext()); - overrideContainer.specifiedOverrides().next().convertToVirtual(); + overrideContainer.getSpecifiedOverrides().iterator().next().convertToVirtual(); assertEquals(0, entityResource.getAttributeOverrides().size()); - attributeOverrides = overrideContainer.specifiedOverrides(); + attributeOverrides = overrideContainer.getSpecifiedOverrides().iterator(); assertFalse(attributeOverrides.hasNext()); } @@ -962,9 +962,9 @@ public class GenericOrmEntity2_0Tests extends Generic2_0ContextModelTestCase OrmEntity ormEntity = (OrmEntity) ormPersistentType.getMapping(); OrmAttributeOverrideContainer overrideContainer = ormEntity.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(); XmlEntity entityResource = getXmlEntityMappings().getEntities().get(0); @@ -972,7 +972,7 @@ public class GenericOrmEntity2_0Tests extends Generic2_0ContextModelTestCase overrideContainer.moveSpecifiedOverride(2, 0); - ListIterator attributeOverrides = overrideContainer.specifiedOverrides(); + ListIterator attributeOverrides = overrideContainer.getSpecifiedOverrides().iterator(); assertEquals("name", attributeOverrides.next().getName()); assertEquals("foo", attributeOverrides.next().getName()); assertEquals("id", attributeOverrides.next().getName()); @@ -983,7 +983,7 @@ public class GenericOrmEntity2_0Tests extends Generic2_0ContextModelTestCase overrideContainer.moveSpecifiedOverride(0, 1); - attributeOverrides = overrideContainer.specifiedOverrides(); + attributeOverrides = overrideContainer.getSpecifiedOverrides().iterator(); assertEquals("foo", attributeOverrides.next().getName()); assertEquals("name", attributeOverrides.next().getName()); assertEquals("id", attributeOverrides.next().getName()); @@ -1008,39 +1008,39 @@ public class GenericOrmEntity2_0Tests extends Generic2_0ContextModelTestCase entityResource.getAttributeOverrides().add(2, OrmFactory.eINSTANCE.createXmlAttributeOverride()); entityResource.getAttributeOverrides().get(2).setName("BAZ"); - ListIterator attributeOverrides = overrideContainer.specifiedOverrides(); + ListIterator attributeOverrides = overrideContainer.getSpecifiedOverrides().iterator(); assertEquals("FOO", attributeOverrides.next().getName()); assertEquals("BAR", attributeOverrides.next().getName()); assertEquals("BAZ", attributeOverrides.next().getName()); assertFalse(attributeOverrides.hasNext()); entityResource.getAttributeOverrides().move(2, 0); - attributeOverrides = overrideContainer.specifiedOverrides(); + attributeOverrides = overrideContainer.getSpecifiedOverrides().iterator(); assertEquals("BAR", attributeOverrides.next().getName()); assertEquals("BAZ", attributeOverrides.next().getName()); assertEquals("FOO", attributeOverrides.next().getName()); assertFalse(attributeOverrides.hasNext()); entityResource.getAttributeOverrides().move(0, 1); - attributeOverrides = overrideContainer.specifiedOverrides(); + attributeOverrides = overrideContainer.getSpecifiedOverrides().iterator(); assertEquals("BAZ", attributeOverrides.next().getName()); assertEquals("BAR", attributeOverrides.next().getName()); assertEquals("FOO", attributeOverrides.next().getName()); assertFalse(attributeOverrides.hasNext()); entityResource.getAttributeOverrides().remove(1); - attributeOverrides = overrideContainer.specifiedOverrides(); + attributeOverrides = overrideContainer.getSpecifiedOverrides().iterator(); assertEquals("BAZ", attributeOverrides.next().getName()); assertEquals("FOO", attributeOverrides.next().getName()); assertFalse(attributeOverrides.hasNext()); entityResource.getAttributeOverrides().remove(1); - attributeOverrides = overrideContainer.specifiedOverrides(); + attributeOverrides = overrideContainer.getSpecifiedOverrides().iterator(); assertEquals("BAZ", attributeOverrides.next().getName()); assertFalse(attributeOverrides.hasNext()); entityResource.getAttributeOverrides().remove(0); - attributeOverrides = overrideContainer.specifiedOverrides(); + attributeOverrides = overrideContainer.getSpecifiedOverrides().iterator(); assertFalse(attributeOverrides.hasNext()); } @@ -1052,7 +1052,7 @@ public class GenericOrmEntity2_0Tests extends Generic2_0ContextModelTestCase OrmEntity ormEntity = (OrmEntity) ormPersistentType.getMapping(); OrmAttributeOverrideContainer overrideContainer = ormEntity.getAttributeOverrideContainer(); - ListIterator virtualAttributeOverrides = overrideContainer.virtualOverrides(); + ListIterator virtualAttributeOverrides = overrideContainer.getVirtualOverrides().iterator(); OrmVirtualAttributeOverride virtualAttributeOverride = virtualAttributeOverrides.next(); assertEquals("id", virtualAttributeOverride.getName()); assertTrue(virtualAttributeOverride.isVirtual()); @@ -1066,12 +1066,12 @@ public class GenericOrmEntity2_0Tests extends Generic2_0ContextModelTestCase 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 = overrideContainer.virtualOverrides(); + virtualAttributeOverrides = overrideContainer.getVirtualOverrides().iterator(); virtualAttributeOverride = virtualAttributeOverrides.next(); assertEquals("name", virtualAttributeOverride.getName()); assertTrue(virtualAttributeOverride.isVirtual()); @@ -1130,7 +1130,7 @@ public class GenericOrmEntity2_0Tests extends Generic2_0ContextModelTestCase OrmEntity ormEntity = (OrmEntity) ormPersistentType.getMapping(); OrmAssociationOverrideContainer overrideContainer = ormEntity.getAssociationOverrideContainer(); - ListIterator specifiedAssociationOverrides = overrideContainer.specifiedOverrides(); + ListIterator specifiedAssociationOverrides = overrideContainer.getSpecifiedOverrides().iterator(); assertFalse(specifiedAssociationOverrides.hasNext()); @@ -1140,14 +1140,14 @@ public class GenericOrmEntity2_0Tests extends Generic2_0ContextModelTestCase XmlAssociationOverride xmlAssociationOverride = OrmFactory.eINSTANCE.createXmlAssociationOverride(); entityResource.getAssociationOverrides().add(0, xmlAssociationOverride); xmlAssociationOverride.setName("FOO"); - specifiedAssociationOverrides = overrideContainer.specifiedOverrides(); + specifiedAssociationOverrides = overrideContainer.getSpecifiedOverrides().iterator(); assertEquals("FOO", specifiedAssociationOverrides.next().getName()); assertFalse(specifiedAssociationOverrides.hasNext()); xmlAssociationOverride = OrmFactory.eINSTANCE.createXmlAssociationOverride(); entityResource.getAssociationOverrides().add(1, xmlAssociationOverride); xmlAssociationOverride.setName("BAR"); - specifiedAssociationOverrides = overrideContainer.specifiedOverrides(); + specifiedAssociationOverrides = overrideContainer.getSpecifiedOverrides().iterator(); assertEquals("FOO", specifiedAssociationOverrides.next().getName()); assertEquals("BAR", specifiedAssociationOverrides.next().getName()); assertFalse(specifiedAssociationOverrides.hasNext()); @@ -1156,7 +1156,7 @@ public class GenericOrmEntity2_0Tests extends Generic2_0ContextModelTestCase xmlAssociationOverride = OrmFactory.eINSTANCE.createXmlAssociationOverride(); entityResource.getAssociationOverrides().add(0, xmlAssociationOverride); xmlAssociationOverride.setName("BAZ"); - specifiedAssociationOverrides = overrideContainer.specifiedOverrides(); + specifiedAssociationOverrides = overrideContainer.getSpecifiedOverrides().iterator(); assertEquals("BAZ", specifiedAssociationOverrides.next().getName()); assertEquals("FOO", specifiedAssociationOverrides.next().getName()); assertEquals("BAR", specifiedAssociationOverrides.next().getName()); @@ -1164,26 +1164,26 @@ public class GenericOrmEntity2_0Tests extends Generic2_0ContextModelTestCase //move an annotation to the resource model and verify the context model is updated entityResource.getAssociationOverrides().move(1, 0); - specifiedAssociationOverrides = overrideContainer.specifiedOverrides(); + specifiedAssociationOverrides = overrideContainer.getSpecifiedOverrides().iterator(); assertEquals("FOO", specifiedAssociationOverrides.next().getName()); assertEquals("BAZ", specifiedAssociationOverrides.next().getName()); assertEquals("BAR", specifiedAssociationOverrides.next().getName()); assertFalse(specifiedAssociationOverrides.hasNext()); entityResource.getAssociationOverrides().remove(0); - specifiedAssociationOverrides = overrideContainer.specifiedOverrides(); + specifiedAssociationOverrides = overrideContainer.getSpecifiedOverrides().iterator(); assertEquals("BAZ", specifiedAssociationOverrides.next().getName()); assertEquals("BAR", specifiedAssociationOverrides.next().getName()); assertFalse(specifiedAssociationOverrides.hasNext()); entityResource.getAssociationOverrides().remove(0); - specifiedAssociationOverrides = overrideContainer.specifiedOverrides(); + specifiedAssociationOverrides = overrideContainer.getSpecifiedOverrides().iterator(); assertEquals("BAR", specifiedAssociationOverrides.next().getName()); assertFalse(specifiedAssociationOverrides.hasNext()); entityResource.getAssociationOverrides().remove(0); - specifiedAssociationOverrides = overrideContainer.specifiedOverrides(); + specifiedAssociationOverrides = overrideContainer.getSpecifiedOverrides().iterator(); assertFalse(specifiedAssociationOverrides.hasNext()); } @@ -1199,8 +1199,8 @@ public class GenericOrmEntity2_0Tests extends Generic2_0ContextModelTestCase assertEquals(FULLY_QUALIFIED_SUB_TYPE_NAME, entityResource.getClassName()); assertTrue(entityResource.getAssociationOverrides().isEmpty()); - assertEquals(4, overrideContainer.virtualOverridesSize()); - VirtualAssociationOverride virtualAssociationOverride = overrideContainer.virtualOverrides().next(); + assertEquals(4, overrideContainer.getVirtualOverridesSize()); + VirtualAssociationOverride virtualAssociationOverride = overrideContainer.getVirtualOverrides().iterator().next(); assertEquals("address", virtualAssociationOverride.getName()); // @@ -1213,8 +1213,8 @@ public class GenericOrmEntity2_0Tests extends Generic2_0ContextModelTestCase // assertNull(typeResource.getAnnotation(AssociationOverrideAnnotation.ANNOTATION_NAME)); // assertNull(typeResource.getAnnotation(AssociationOverridesAnnotation.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); @@ -1223,11 +1223,11 @@ public class GenericOrmEntity2_0Tests extends Generic2_0ContextModelTestCase // assertNull(typeResource.getAnnotation(AssociationOverrideAnnotation.ANNOTATION_NAME)); // assertNull(typeResource.getAnnotation(AssociationOverridesAnnotation.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()); @@ -1282,7 +1282,7 @@ public class GenericOrmEntity2_0Tests extends Generic2_0ContextModelTestCase XmlEntity entityResource = getXmlEntityMappings().getEntities().get(0); - assertEquals(0, overrideContainer.specifiedOverridesSize()); + assertEquals(0, overrideContainer.getSpecifiedOverridesSize()); //add to the resource model and verify the context model is updated entityResource.getAssociationOverrides().add(OrmFactory.eINSTANCE.createXmlAssociationOverride()); @@ -1290,7 +1290,7 @@ public class GenericOrmEntity2_0Tests extends Generic2_0ContextModelTestCase entityResource.getAssociationOverrides().add(0, OrmFactory.eINSTANCE.createXmlAssociationOverride()); entityResource.getAssociationOverrides().get(0).setName("BAR"); - assertEquals(2, overrideContainer.specifiedOverridesSize()); + assertEquals(2, overrideContainer.getSpecifiedOverridesSize()); } public void testDefaultAssociationOverridesSize() throws Exception { @@ -1302,19 +1302,19 @@ public class GenericOrmEntity2_0Tests extends Generic2_0ContextModelTestCase OrmEntity ormEntity = (OrmEntity) ormPersistentType.getMapping(); AssociationOverrideContainer overrideContainer = ormEntity.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 { @@ -1326,19 +1326,19 @@ public class GenericOrmEntity2_0Tests extends Generic2_0ContextModelTestCase OrmEntity ormEntity = (OrmEntity) ormPersistentType.getMapping(); AssociationOverrideContainer overrideContainer = ormEntity.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()); XmlEntity entityResource = getXmlEntityMappings().getEntities().get(0); entityResource.getAssociationOverrides().add(0, OrmFactory.eINSTANCE.createXmlAssociationOverride()); entityResource.getAssociationOverrides().get(0).setName("bar"); - assertEquals(5, overrideContainer.overridesSize()); + assertEquals(5, overrideContainer.getOverridesSize()); } public void testAssociationOverrideSetVirtual() throws Exception { @@ -1350,8 +1350,8 @@ public class GenericOrmEntity2_0Tests extends Generic2_0ContextModelTestCase OrmEntity ormEntity = (OrmEntity) ormPersistentType.getMapping(); AssociationOverrideContainer overrideContainer = ormEntity.getAssociationOverrideContainer(); - overrideContainer.virtualOverrides().next().convertToSpecified(); - overrideContainer.virtualOverrides().next().convertToSpecified(); + overrideContainer.getVirtualOverrides().iterator().next().convertToSpecified(); + overrideContainer.getVirtualOverrides().iterator().next().convertToSpecified(); XmlEntity entityResource = getXmlEntityMappings().getEntities().get(0); @@ -1369,10 +1369,10 @@ public class GenericOrmEntity2_0Tests extends Generic2_0ContextModelTestCase OrmEntity ormEntity = (OrmEntity) ormPersistentType.getMapping(); OrmAssociationOverrideContainer overrideContainer = ormEntity.getAssociationOverrideContainer(); - ListIterator virtualAssociationOverrides = overrideContainer.virtualOverrides(); + ListIterator virtualAssociationOverrides = overrideContainer.getVirtualOverrides().iterator(); virtualAssociationOverrides.next(); virtualAssociationOverrides.next().convertToSpecified(); - overrideContainer.virtualOverrides().next().convertToSpecified(); + overrideContainer.getVirtualOverrides().iterator().next().convertToSpecified(); XmlEntity entityResource = getXmlEntityMappings().getEntities().get(0); @@ -1390,25 +1390,25 @@ public class GenericOrmEntity2_0Tests extends Generic2_0ContextModelTestCase OrmEntity ormEntity = (OrmEntity) ormPersistentType.getMapping(); OrmAssociationOverrideContainer overrideContainer = ormEntity.getAssociationOverrideContainer(); - overrideContainer.virtualOverrides().next().convertToSpecified(); - overrideContainer.virtualOverrides().next().convertToSpecified(); + overrideContainer.getVirtualOverrides().iterator().next().convertToSpecified(); + overrideContainer.getVirtualOverrides().iterator().next().convertToSpecified(); XmlEntity entityResource = getXmlEntityMappings().getEntities().get(0); assertEquals(2, entityResource.getAssociationOverrides().size()); - overrideContainer.specifiedOverrides().next().convertToVirtual(); + overrideContainer.getSpecifiedOverrides().iterator().next().convertToVirtual(); assertEquals("address2", entityResource.getAssociationOverrides().get(0).getName()); assertEquals(1, entityResource.getAssociationOverrides().size()); - Iterator associationOverrides = overrideContainer.specifiedOverrides(); + Iterator associationOverrides = overrideContainer.getSpecifiedOverrides().iterator(); assertEquals("address2", associationOverrides.next().getName()); assertFalse(associationOverrides.hasNext()); - overrideContainer.specifiedOverrides().next().convertToVirtual(); + overrideContainer.getSpecifiedOverrides().iterator().next().convertToVirtual(); assertEquals(0, entityResource.getAssociationOverrides().size()); - associationOverrides = overrideContainer.specifiedOverrides(); + associationOverrides = overrideContainer.getSpecifiedOverrides().iterator(); assertFalse(associationOverrides.hasNext()); } @@ -1421,15 +1421,15 @@ public class GenericOrmEntity2_0Tests extends Generic2_0ContextModelTestCase OrmEntity ormEntity = (OrmEntity) ormPersistentType.getMapping(); OrmAssociationOverrideContainer overrideContainer = ormEntity.getAssociationOverrideContainer(); - overrideContainer.virtualOverrides().next().convertToSpecified(); - overrideContainer.virtualOverrides().next().convertToSpecified(); + overrideContainer.getVirtualOverrides().iterator().next().convertToSpecified(); + overrideContainer.getVirtualOverrides().iterator().next().convertToSpecified(); XmlEntity entityResource = getXmlEntityMappings().getEntities().get(0); assertEquals(2, entityResource.getAssociationOverrides().size()); overrideContainer.moveSpecifiedOverride(1, 0); - ListIterator associationOverrides = overrideContainer.specifiedOverrides(); + ListIterator associationOverrides = overrideContainer.getSpecifiedOverrides().iterator(); assertEquals("address2", associationOverrides.next().getName()); assertEquals("address", associationOverrides.next().getName()); @@ -1438,7 +1438,7 @@ public class GenericOrmEntity2_0Tests extends Generic2_0ContextModelTestCase overrideContainer.moveSpecifiedOverride(0, 1); - associationOverrides = overrideContainer.specifiedOverrides(); + associationOverrides = overrideContainer.getSpecifiedOverrides().iterator(); assertEquals("address", associationOverrides.next().getName()); assertEquals("address2", associationOverrides.next().getName()); @@ -1463,39 +1463,39 @@ public class GenericOrmEntity2_0Tests extends Generic2_0ContextModelTestCase entityResource.getAssociationOverrides().add(2, OrmFactory.eINSTANCE.createXmlAssociationOverride()); entityResource.getAssociationOverrides().get(2).setName("BAZ"); - ListIterator associationOverrides = overrideContainer.specifiedOverrides(); + ListIterator associationOverrides = overrideContainer.getSpecifiedOverrides().iterator(); assertEquals("FOO", associationOverrides.next().getName()); assertEquals("BAR", associationOverrides.next().getName()); assertEquals("BAZ", associationOverrides.next().getName()); assertFalse(associationOverrides.hasNext()); entityResource.getAssociationOverrides().move(2, 0); - associationOverrides = overrideContainer.specifiedOverrides(); + associationOverrides = overrideContainer.getSpecifiedOverrides().iterator(); assertEquals("BAR", associationOverrides.next().getName()); assertEquals("BAZ", associationOverrides.next().getName()); assertEquals("FOO", associationOverrides.next().getName()); assertFalse(associationOverrides.hasNext()); entityResource.getAssociationOverrides().move(0, 1); - associationOverrides = overrideContainer.specifiedOverrides(); + associationOverrides = overrideContainer.getSpecifiedOverrides().iterator(); assertEquals("BAZ", associationOverrides.next().getName()); assertEquals("BAR", associationOverrides.next().getName()); assertEquals("FOO", associationOverrides.next().getName()); assertFalse(associationOverrides.hasNext()); entityResource.getAssociationOverrides().remove(1); - associationOverrides = overrideContainer.specifiedOverrides(); + associationOverrides = overrideContainer.getSpecifiedOverrides().iterator(); assertEquals("BAZ", associationOverrides.next().getName()); assertEquals("FOO", associationOverrides.next().getName()); assertFalse(associationOverrides.hasNext()); entityResource.getAssociationOverrides().remove(1); - associationOverrides = overrideContainer.specifiedOverrides(); + associationOverrides = overrideContainer.getSpecifiedOverrides().iterator(); assertEquals("BAZ", associationOverrides.next().getName()); assertFalse(associationOverrides.hasNext()); entityResource.getAssociationOverrides().remove(0); - associationOverrides = overrideContainer.specifiedOverrides(); + associationOverrides = overrideContainer.getSpecifiedOverrides().iterator(); assertFalse(associationOverrides.hasNext()); } @@ -1508,7 +1508,7 @@ public class GenericOrmEntity2_0Tests extends Generic2_0ContextModelTestCase OrmEntity ormEntity = (OrmEntity) ormPersistentType.getMapping(); OrmAssociationOverrideContainer overrideContainer = ormEntity.getAssociationOverrideContainer(); - ListIterator virtualAssociationOverrides = overrideContainer.virtualOverrides(); + ListIterator virtualAssociationOverrides = overrideContainer.getVirtualOverrides().iterator(); OrmVirtualAssociationOverride virtualAssociationOverride = virtualAssociationOverrides.next(); assertEquals("address", virtualAssociationOverride.getName()); assertTrue(virtualAssociationOverride.isVirtual()); @@ -1526,12 +1526,12 @@ public class GenericOrmEntity2_0Tests extends Generic2_0ContextModelTestCase 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 = overrideContainer.virtualOverrides(); + virtualAssociationOverrides = overrideContainer.getVirtualOverrides().iterator(); virtualAssociationOverride = virtualAssociationOverrides.next(); assertEquals("address2", virtualAssociationOverride.getName()); assertTrue(virtualAssociationOverride.isVirtual()); @@ -1558,8 +1558,8 @@ public class GenericOrmEntity2_0Tests extends Generic2_0ContextModelTestCase OrmAttributeOverrideContainer attributeOverrideContainer = ((OrmEntity) longTimeCustomerPersistentType.getMapping()).getAttributeOverrideContainer(); - assertEquals(6, attributeOverrideContainer.virtualOverridesSize()); - ListIterator virtualAttributeOverrides = attributeOverrideContainer.virtualOverrides(); + assertEquals(6, attributeOverrideContainer.getVirtualOverridesSize()); + ListIterator virtualAttributeOverrides = attributeOverrideContainer.getVirtualOverrides().iterator(); OrmVirtualAttributeOverride virtualAttributeOverride = virtualAttributeOverrides.next(); assertEquals("id", virtualAttributeOverride.getName()); virtualAttributeOverride = virtualAttributeOverrides.next(); @@ -1666,8 +1666,8 @@ public class GenericOrmEntity2_0Tests extends Generic2_0ContextModelTestCase OrmAttributeOverrideContainer attributeOverrideContainer = ((OrmEntity) longTimeCustomerPersistentType.getMapping()).getAttributeOverrideContainer(); - assertEquals(6, attributeOverrideContainer.virtualOverridesSize()); - ListIterator virtualAttributeOverrides = attributeOverrideContainer.virtualOverrides(); + assertEquals(6, attributeOverrideContainer.getVirtualOverridesSize()); + ListIterator virtualAttributeOverrides = attributeOverrideContainer.getVirtualOverrides().iterator(); OrmVirtualAttributeOverride virtualAttributeOverride = virtualAttributeOverrides.next(); assertEquals("id", virtualAttributeOverride.getName()); virtualAttributeOverride = virtualAttributeOverrides.next(); @@ -1775,8 +1775,8 @@ public class GenericOrmEntity2_0Tests extends Generic2_0ContextModelTestCase OrmAssociationOverrideContainer attributeOverrideContainer = ((OrmEntity) longTimeCustomerPersistentType.getMapping()).getAssociationOverrideContainer(); - assertEquals(1, attributeOverrideContainer.virtualOverridesSize()); - ListIterator virtualAssociationOverrides = attributeOverrideContainer.virtualOverrides(); + assertEquals(1, attributeOverrideContainer.getVirtualOverridesSize()); + ListIterator virtualAssociationOverrides = attributeOverrideContainer.getVirtualOverrides().iterator(); OrmVirtualAssociationOverride virtualAssociationOverride = virtualAssociationOverrides.next(); assertEquals("address.state", virtualAssociationOverride.getName()); } @@ -1794,8 +1794,8 @@ public class GenericOrmEntity2_0Tests extends Generic2_0ContextModelTestCase OrmAssociationOverrideContainer overrideContainer = ((OrmEntity) longTimeCustomerPersistentType.getMapping()).getAssociationOverrideContainer(); - assertEquals(1, overrideContainer.virtualOverridesSize()); - ListIterator virtualAssociationOverrides = overrideContainer.virtualOverrides(); + assertEquals(1, overrideContainer.getVirtualOverridesSize()); + ListIterator virtualAssociationOverrides = overrideContainer.getVirtualOverrides().iterator(); OrmVirtualAssociationOverride virtualAssociationOverride = virtualAssociationOverrides.next(); assertEquals("address.state", virtualAssociationOverride.getName()); } @@ -1953,7 +1953,7 @@ public class GenericOrmEntity2_0Tests extends Generic2_0ContextModelTestCase resourceEntity.getAssociationOverrides().add((XmlAssociationOverride) resourceAssociationOverride); ((XmlAssociationOverride) resourceAssociationOverride).setName("a"); - OrmAssociationOverride associationOverride = entity.getAssociationOverrideContainer().specifiedOverrides().next(); + OrmAssociationOverride associationOverride = entity.getAssociationOverrideContainer().getSpecifiedOverrides().iterator().next(); assertEquals("a", associationOverride.getName()); XmlJoinTable resourceJoinTable = OrmFactory.eINSTANCE.createXmlJoinTable(); @@ -1963,10 +1963,10 @@ public class GenericOrmEntity2_0Tests extends Generic2_0ContextModelTestCase resourceJoinTable.getInverseJoinColumns().add(resourceJoinColumn); resourceJoinColumn.setName("BAR"); - associationOverride = entity.getAssociationOverrideContainer().specifiedOverrides().next(); + associationOverride = entity.getAssociationOverrideContainer().getSpecifiedOverrides().iterator().next(); assertEquals("a", associationOverride.getName()); JoinTable joinTable = ((OrmOverrideRelationship2_0) associationOverride.getRelationship()).getJoinTableStrategy().getJoinTable(); assertEquals("FOO", joinTable.getSpecifiedName()); - assertEquals("BAR", joinTable.inverseJoinColumns().next().getName()); + assertEquals("BAR", joinTable.getInverseJoinColumns().iterator().next().getName()); } } diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/orm/GenericOrmManyToManyMapping2_0Tests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/orm/GenericOrmManyToManyMapping2_0Tests.java index fe633f9fdf..b11c5b1f9a 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/orm/GenericOrmManyToManyMapping2_0Tests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/orm/GenericOrmManyToManyMapping2_0Tests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009, 2010 Oracle. + * 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 @@ -246,7 +246,7 @@ public class GenericOrmManyToManyMapping2_0Tests addXmlClassRef(PACKAGE_NAME + ".Address"); addXmlClassRef(PACKAGE_NAME + ".State"); - ReadOnlyPersistentAttribute persistentAttribute = ormPersistentType.attributes().next(); + ReadOnlyPersistentAttribute persistentAttribute = ormPersistentType.getAttributes().iterator().next(); ManyToManyMapping manyToManyMapping = (ManyToManyMapping) persistentAttribute.getMapping(); Iterator attributeNames = @@ -292,7 +292,7 @@ public class GenericOrmManyToManyMapping2_0Tests addXmlClassRef(PACKAGE_NAME + ".Address"); addXmlClassRef(PACKAGE_NAME + ".State"); - ReadOnlyPersistentAttribute persistentAttribute = ormPersistentType.attributes().next(); + ReadOnlyPersistentAttribute persistentAttribute = ormPersistentType.getAttributes().iterator().next(); ManyToManyMapping manyToManyMapping = (ManyToManyMapping) persistentAttribute.getMapping(); Iterator attributeNames = @@ -828,9 +828,9 @@ public class GenericOrmManyToManyMapping2_0Tests assertEquals(true, ormColumn.isDefaultUpdatable()); assertEquals(true, ormColumn.isDefaultNullable()); assertEquals(false, ormColumn.isDefaultUnique()); - assertEquals(Column.DEFAULT_LENGTH, ormColumn.getDefaultLength()); - assertEquals(Column.DEFAULT_PRECISION, ormColumn.getDefaultPrecision()); - assertEquals(Column.DEFAULT_SCALE, ormColumn.getDefaultScale()); + assertEquals(ReadOnlyColumn.DEFAULT_LENGTH, ormColumn.getDefaultLength()); + assertEquals(ReadOnlyColumn.DEFAULT_PRECISION, ormColumn.getDefaultPrecision()); + assertEquals(ReadOnlyColumn.DEFAULT_SCALE, ormColumn.getDefaultScale()); assertNull(ormColumn.getSpecifiedName()); assertNull(ormColumn.getSpecifiedTable()); assertNull(ormColumn.getColumnDefinition()); @@ -851,7 +851,7 @@ public class GenericOrmManyToManyMapping2_0Tests getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, PACKAGE_NAME + ".Address"); //virtual attribute in orm.xml, java attribute has no Column annotation - OrmReadOnlyPersistentAttribute addressesPersistentAttribute = ormPersistentType.virtualAttributes().next(); + OrmReadOnlyPersistentAttribute addressesPersistentAttribute = ormPersistentType.getVirtualAttributes().iterator().next(); ManyToManyMapping2_0 addressesVirtualMapping = (ManyToManyMapping2_0) addressesPersistentAttribute.getMapping(); Column column = addressesVirtualMapping.getMapKeyColumn(); @@ -882,8 +882,8 @@ public class GenericOrmManyToManyMapping2_0Tests OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, PACKAGE_NAME + ".Address"); - assertEquals(3, ormPersistentType.virtualAttributesSize()); - OrmReadOnlyPersistentAttribute virtualAttribute = ormPersistentType.virtualAttributes().next(); + assertEquals(3, ormPersistentType.getVirtualAttributesSize()); + OrmReadOnlyPersistentAttribute virtualAttribute = ormPersistentType.getVirtualAttributes().iterator().next(); ManyToManyMapping virtualManyToManyMapping = (ManyToManyMapping) virtualAttribute.getMapping(); assertEquals("address", virtualManyToManyMapping.getName()); @@ -910,14 +910,14 @@ public class GenericOrmManyToManyMapping2_0Tests OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, PACKAGE_NAME + ".Address"); ormPersistentType.getMapping().setSpecifiedMetadataComplete(Boolean.TRUE); - assertEquals(3, ormPersistentType.virtualAttributesSize()); + assertEquals(3, ormPersistentType.getVirtualAttributesSize()); OrmReadOnlyPersistentAttribute virtualPersistentAttribute = ormPersistentType.getAttributeNamed("address"); assertEquals(MappingKeys.NULL_ATTRIBUTE_MAPPING_KEY, virtualPersistentAttribute.getMappingKey()); assertTrue(virtualPersistentAttribute.isVirtual()); virtualPersistentAttribute.convertToSpecified(MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); - OrmReadOnlyPersistentAttribute ormPersistentAttribute= ormPersistentType.specifiedAttributes().next(); + OrmReadOnlyPersistentAttribute ormPersistentAttribute= ormPersistentType.getSpecifiedAttributes().iterator().next(); OrmManyToManyMapping ormManyToManyMapping = (OrmManyToManyMapping) ormPersistentAttribute.getMapping(); assertEquals("address", ormManyToManyMapping.getName()); diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/orm/GenericOrmManyToOneMapping2_0Tests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/orm/GenericOrmManyToOneMapping2_0Tests.java index 26d026ccb0..d178847a00 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/orm/GenericOrmManyToOneMapping2_0Tests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/orm/GenericOrmManyToOneMapping2_0Tests.java @@ -12,7 +12,6 @@ package org.eclipse.jpt.jpa.core.tests.internal.jpa2.context.orm; import java.util.Iterator; import org.eclipse.jdt.core.ICompilationUnit; 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; import org.eclipse.jpt.jpa.core.MappingKeys; import org.eclipse.jpt.jpa.core.context.FetchType; @@ -76,7 +75,7 @@ public class GenericOrmManyToOneMapping2_0Tests } }); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - for (OrmReadOnlyPersistentAttribute each : CollectionTools.iterable(ormPersistentType.attributes())) { + for (OrmReadOnlyPersistentAttribute each : ormPersistentType.getAttributes()) { each.convertToSpecified(); } } @@ -101,7 +100,7 @@ public class GenericOrmManyToOneMapping2_0Tests } }); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - for (OrmReadOnlyPersistentAttribute each : CollectionTools.iterable(ormPersistentType.attributes())) { + for (OrmReadOnlyPersistentAttribute each : ormPersistentType.getAttributes()) { each.convertToSpecified(); } } @@ -145,7 +144,7 @@ public class GenericOrmManyToOneMapping2_0Tests } }); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - for (OrmReadOnlyPersistentAttribute each : CollectionTools.iterable(ormPersistentType.attributes())) { + for (OrmReadOnlyPersistentAttribute each : ormPersistentType.getAttributes()) { each.convertToSpecified(); } } @@ -443,8 +442,8 @@ public class GenericOrmManyToOneMapping2_0Tests assertEquals(TYPE_NAME + "_Address", virtualJoinTable.getName()); assertNull(virtualJoinTable.getSpecifiedCatalog()); assertNull(virtualJoinTable.getSpecifiedSchema()); - assertEquals(0, virtualJoinTable.specifiedJoinColumnsSize()); - assertEquals(0, virtualJoinTable.specifiedInverseJoinColumnsSize()); + assertEquals(0, virtualJoinTable.getSpecifiedJoinColumnsSize()); + assertEquals(0, virtualJoinTable.getSpecifiedInverseJoinColumnsSize()); JoinColumn virtualJoinColumn = virtualJoinTable.getDefaultJoinColumn(); assertEquals(TYPE_NAME + "_Address", virtualJoinColumn.getDefaultTable()); assertEquals(TYPE_NAME + "_id", virtualJoinColumn.getDefaultName()); @@ -468,12 +467,12 @@ public class GenericOrmManyToOneMapping2_0Tests assertEquals("FOO", virtualJoinTable.getSpecifiedName()); assertEquals("CATALOG", virtualJoinTable.getSpecifiedCatalog()); assertEquals("SCHEMA", virtualJoinTable.getSpecifiedSchema()); - assertEquals(1, virtualJoinTable.specifiedJoinColumnsSize()); - assertEquals(1, virtualJoinTable.specifiedInverseJoinColumnsSize()); - virtualJoinColumn = virtualJoinTable.specifiedJoinColumns().next(); + assertEquals(1, virtualJoinTable.getSpecifiedJoinColumnsSize()); + assertEquals(1, virtualJoinTable.getSpecifiedInverseJoinColumnsSize()); + virtualJoinColumn = virtualJoinTable.getSpecifiedJoinColumns().iterator().next(); assertEquals("NAME", virtualJoinColumn.getSpecifiedName()); assertEquals("REFERENCED_NAME", virtualJoinColumn.getSpecifiedReferencedColumnName()); - virtualInverseJoinColumn = virtualJoinTable.specifiedInverseJoinColumns().next(); + virtualInverseJoinColumn = virtualJoinTable.getSpecifiedInverseJoinColumns().iterator().next(); assertEquals("INVERSE_NAME", virtualInverseJoinColumn.getSpecifiedName()); assertEquals("INVERSE_REFERENCED_NAME", virtualInverseJoinColumn.getSpecifiedReferencedColumnName()); } @@ -613,8 +612,8 @@ public class GenericOrmManyToOneMapping2_0Tests OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, PACKAGE_NAME + ".Address"); - assertEquals(3, ormPersistentType.virtualAttributesSize()); - OrmReadOnlyPersistentAttribute virtualPersistentAttribute = ormPersistentType.virtualAttributes().next(); + assertEquals(3, ormPersistentType.getVirtualAttributesSize()); + OrmReadOnlyPersistentAttribute virtualPersistentAttribute = ormPersistentType.getVirtualAttributes().iterator().next(); ManyToOneMapping virtualManyToOneMapping = (ManyToOneMapping) virtualPersistentAttribute.getMapping(); assertEquals("address", virtualManyToOneMapping.getName()); @@ -622,7 +621,7 @@ public class GenericOrmManyToOneMapping2_0Tests assertEquals(Boolean.FALSE, virtualManyToOneMapping.getSpecifiedOptional()); assertEquals("Address", virtualManyToOneMapping.getSpecifiedTargetEntity()); - JoinColumn virtualJoinColumn = virtualManyToOneMapping.getRelationship().getJoinColumnStrategy().specifiedJoinColumns().next(); + JoinColumn virtualJoinColumn = virtualManyToOneMapping.getRelationship().getJoinColumnStrategy().getSpecifiedJoinColumns().iterator().next(); assertEquals("MY_COLUMN", virtualJoinColumn.getSpecifiedName()); assertEquals("MY_REFERENCED_COLUMN", virtualJoinColumn.getSpecifiedReferencedColumnName()); assertEquals(Boolean.TRUE, virtualJoinColumn.getSpecifiedUnique()); @@ -648,14 +647,14 @@ public class GenericOrmManyToOneMapping2_0Tests OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, PACKAGE_NAME + ".Address"); ormPersistentType.getMapping().setSpecifiedMetadataComplete(Boolean.TRUE); - assertEquals(3, ormPersistentType.virtualAttributesSize()); + assertEquals(3, ormPersistentType.getVirtualAttributesSize()); OrmReadOnlyPersistentAttribute virtualPersistentAttribute = ormPersistentType.getAttributeNamed("address"); assertEquals(MappingKeys.NULL_ATTRIBUTE_MAPPING_KEY, virtualPersistentAttribute.getMappingKey()); assertTrue(virtualPersistentAttribute.isVirtual()); virtualPersistentAttribute.convertToSpecified(MappingKeys.MANY_TO_ONE_ATTRIBUTE_MAPPING_KEY); - OrmPersistentAttribute ormPersistentAttribute= ormPersistentType.specifiedAttributes().next(); + OrmPersistentAttribute ormPersistentAttribute= ormPersistentType.getSpecifiedAttributes().iterator().next(); OrmManyToOneMapping ormManyToOneMapping = (OrmManyToOneMapping) ormPersistentAttribute.getMapping(); assertEquals("address", ormManyToOneMapping.getName()); diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/orm/GenericOrmOneToManyMapping2_0Tests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/orm/GenericOrmOneToManyMapping2_0Tests.java index 34cf0cde22..930930c1fa 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/orm/GenericOrmOneToManyMapping2_0Tests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/orm/GenericOrmOneToManyMapping2_0Tests.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. @@ -11,8 +11,10 @@ package org.eclipse.jpt.jpa.core.tests.internal.jpa2.context.orm; import java.util.Iterator; import org.eclipse.jdt.core.ICompilationUnit; +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.JavaResourceAnnotatedElement.Kind; 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; import org.eclipse.jpt.jpa.core.MappingKeys; import org.eclipse.jpt.jpa.core.context.AttributeMapping; @@ -44,8 +46,6 @@ import org.eclipse.jpt.jpa.core.jpa2.context.orm.OrmOrphanRemovalHolder2_0; import org.eclipse.jpt.jpa.core.jpa2.resource.java.JPA2_0; import org.eclipse.jpt.jpa.core.jpa2.resource.java.MapKeyColumn2_0Annotation; 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.orm.OrmFactory; import org.eclipse.jpt.jpa.core.resource.orm.XmlEntity; import org.eclipse.jpt.jpa.core.resource.orm.XmlOneToMany; @@ -151,7 +151,7 @@ public class GenericOrmOneToManyMapping2_0Tests } }); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - for (OrmReadOnlyPersistentAttribute each : CollectionTools.iterable(ormPersistentType.attributes())) { + for (OrmReadOnlyPersistentAttribute each : ormPersistentType.getAttributes()) { each.convertToSpecified(); } } @@ -282,7 +282,7 @@ public class GenericOrmOneToManyMapping2_0Tests addXmlClassRef(PACKAGE_NAME + ".Address"); addXmlClassRef(PACKAGE_NAME + ".State"); - ReadOnlyPersistentAttribute persistentAttribute = ormPersistentType.attributes().next(); + ReadOnlyPersistentAttribute persistentAttribute = ormPersistentType.getAttributes().iterator().next(); OneToManyMapping oneToManyMapping = (OneToManyMapping) persistentAttribute.getMapping(); Iterator attributeNames = @@ -328,7 +328,7 @@ public class GenericOrmOneToManyMapping2_0Tests addXmlClassRef(PACKAGE_NAME + ".Address"); addXmlClassRef(PACKAGE_NAME + ".State"); - ReadOnlyPersistentAttribute persistentAttribute = ormPersistentType.attributes().next(); + ReadOnlyPersistentAttribute persistentAttribute = ormPersistentType.getAttributes().iterator().next(); OneToManyMapping oneToManyMapping = (OneToManyMapping) persistentAttribute.getMapping(); Iterator attributeNames = @@ -874,7 +874,7 @@ public class GenericOrmOneToManyMapping2_0Tests getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, PACKAGE_NAME + ".Address"); //virtual attribute in orm.xml, java attribute has no Column annotation - OrmReadOnlyPersistentAttribute addressesPersistentAttribute = ormPersistentType.virtualAttributes().next(); + OrmReadOnlyPersistentAttribute addressesPersistentAttribute = ormPersistentType.getVirtualAttributes().iterator().next(); OneToManyMapping2_0 virtualAddressesMapping = (OneToManyMapping2_0) addressesPersistentAttribute.getMapping(); Column virtualColumn = virtualAddressesMapping.getMapKeyColumn(); @@ -1025,7 +1025,7 @@ public class GenericOrmOneToManyMapping2_0Tests OneToManyRelationship2_0 rr = (OneToManyRelationship2_0) javaOneToManyMapping.getRelationship(); rr.setStrategyToJoinColumn(); - JoinColumn joinColumn = rr.getJoinColumnStrategy().joinColumns().next(); + JoinColumn joinColumn = rr.getJoinColumnStrategy().getJoinColumns().iterator().next(); assertTrue(persistentAttribute.isVirtual()); assertEquals("addresses_id", joinColumn.getDefaultName()); assertEquals("Address", joinColumn.getDefaultTable());//target table name @@ -1043,7 +1043,7 @@ public class GenericOrmOneToManyMapping2_0Tests assertFalse(rr.strategyIsJoinColumn()); rr.setStrategyToJoinColumn(); - joinColumn = rr.getJoinColumnStrategy().specifiedJoinColumns().next(); + joinColumn = rr.getJoinColumnStrategy().getSpecifiedJoinColumns().iterator().next(); assertFalse(persistentAttribute.isVirtual()); assertEquals("addresses_id", joinColumn.getDefaultName()); assertEquals("ADDRESS_PRIMARY_TABLE", joinColumn.getDefaultTable());//target table name @@ -1081,9 +1081,9 @@ public class GenericOrmOneToManyMapping2_0Tests addressEntity.getTable().setSpecifiedName("ADDRESS_PRIMARY_TABLE"); assertEquals("ADDRESS_PRIMARY_TABLE", oneToManyMapping.getMapKeyColumn().getTable()); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - MapKeyColumn2_0Annotation column = (MapKeyColumn2_0Annotation) attributeResource.addAnnotation(JPA2_0.MAP_KEY_COLUMN); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + MapKeyColumn2_0Annotation column = (MapKeyColumn2_0Annotation) resourceField.addAnnotation(JPA2_0.MAP_KEY_COLUMN); column.setName("foo"); getJpaProject().synchronizeContextModel(); @@ -1168,8 +1168,8 @@ public class GenericOrmOneToManyMapping2_0Tests OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, PACKAGE_NAME + ".Address"); - assertEquals(3, ormPersistentType.virtualAttributesSize()); - OrmReadOnlyPersistentAttribute virtualPersistentAttribute = ormPersistentType.virtualAttributes().next(); + assertEquals(3, ormPersistentType.getVirtualAttributesSize()); + OrmReadOnlyPersistentAttribute virtualPersistentAttribute = ormPersistentType.getVirtualAttributes().iterator().next(); OneToManyMapping virtualOneToManyMapping = (OneToManyMapping) virtualPersistentAttribute.getMapping(); assertEquals("address", virtualOneToManyMapping.getName()); @@ -1199,14 +1199,14 @@ public class GenericOrmOneToManyMapping2_0Tests OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, PACKAGE_NAME + ".Address"); ormPersistentType.getMapping().setSpecifiedMetadataComplete(Boolean.TRUE); - assertEquals(3, ormPersistentType.virtualAttributesSize()); + assertEquals(3, ormPersistentType.getVirtualAttributesSize()); OrmReadOnlyPersistentAttribute virtualPersistentAttribute = ormPersistentType.getAttributeNamed("address"); assertEquals(MappingKeys.NULL_ATTRIBUTE_MAPPING_KEY, virtualPersistentAttribute.getMappingKey()); assertTrue(virtualPersistentAttribute.isVirtual()); virtualPersistentAttribute.convertToSpecified(MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY); - OrmReadOnlyPersistentAttribute ormPersistentAttribute = ormPersistentType.specifiedAttributes().next(); + OrmReadOnlyPersistentAttribute ormPersistentAttribute = ormPersistentType.getSpecifiedAttributes().iterator().next(); OrmOneToManyMapping ormOneToManyMapping = (OrmOneToManyMapping) ormPersistentAttribute.getMapping(); assertEquals("address", ormOneToManyMapping.getName()); diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/orm/GenericOrmOneToOneMapping2_0Tests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/orm/GenericOrmOneToOneMapping2_0Tests.java index 124609f7a8..ebb0febdf1 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/orm/GenericOrmOneToOneMapping2_0Tests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/orm/GenericOrmOneToOneMapping2_0Tests.java @@ -12,7 +12,6 @@ package org.eclipse.jpt.jpa.core.tests.internal.jpa2.context.orm; import java.util.Iterator; import org.eclipse.jdt.core.ICompilationUnit; 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; import org.eclipse.jpt.jpa.core.MappingKeys; import org.eclipse.jpt.jpa.core.context.AttributeMapping; @@ -80,7 +79,7 @@ public class GenericOrmOneToOneMapping2_0Tests } }); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - for (OrmReadOnlyPersistentAttribute each : CollectionTools.iterable(ormPersistentType.attributes())) { + for (OrmReadOnlyPersistentAttribute each : ormPersistentType.getAttributes()) { each.convertToSpecified(); } } @@ -105,7 +104,7 @@ public class GenericOrmOneToOneMapping2_0Tests } }); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - for (OrmReadOnlyPersistentAttribute each : CollectionTools.iterable(ormPersistentType.attributes())) { + for (OrmReadOnlyPersistentAttribute each : ormPersistentType.getAttributes()) { each.convertToSpecified(); } } @@ -241,7 +240,7 @@ public class GenericOrmOneToOneMapping2_0Tests } }); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - for (OrmReadOnlyPersistentAttribute each : CollectionTools.iterable(ormPersistentType.attributes())) { + for (OrmReadOnlyPersistentAttribute each : ormPersistentType.getAttributes()) { each.convertToSpecified(); } } @@ -500,7 +499,7 @@ public class GenericOrmOneToOneMapping2_0Tests addXmlClassRef(PACKAGE_NAME + ".Address"); addXmlClassRef(PACKAGE_NAME + ".State"); - ReadOnlyPersistentAttribute persistentAttribute = ormPersistentType.attributes().next(); + ReadOnlyPersistentAttribute persistentAttribute = ormPersistentType.getAttributes().iterator().next(); OneToOneMapping oneToOneMapping = (OneToOneMapping) persistentAttribute.getMapping(); Iterator attributeNames = @@ -546,7 +545,7 @@ public class GenericOrmOneToOneMapping2_0Tests addXmlClassRef(PACKAGE_NAME + ".Address"); addXmlClassRef(PACKAGE_NAME + ".State"); - ReadOnlyPersistentAttribute persistentAttribute = ormPersistentType.attributes().next(); + ReadOnlyPersistentAttribute persistentAttribute = ormPersistentType.getAttributes().iterator().next(); OneToOneMapping oneToOneMapping = (OneToOneMapping) persistentAttribute.getMapping(); Iterator attributeNames = oneToOneMapping.getRelationship().getMappedByStrategy().candidateMappedByAttributeNames(); @@ -642,8 +641,8 @@ public class GenericOrmOneToOneMapping2_0Tests assertEquals(TYPE_NAME + "_Address", virtualJoinTable.getDefaultName()); assertNull(virtualJoinTable.getSpecifiedCatalog()); assertNull(virtualJoinTable.getSpecifiedSchema()); - assertEquals(0, virtualJoinTable.specifiedJoinColumnsSize()); - assertEquals(0, virtualJoinTable.specifiedInverseJoinColumnsSize()); + assertEquals(0, virtualJoinTable.getSpecifiedJoinColumnsSize()); + assertEquals(0, virtualJoinTable.getSpecifiedInverseJoinColumnsSize()); JoinColumn ormJoinColumn = virtualJoinTable.getDefaultJoinColumn(); assertEquals(TYPE_NAME + "_Address", ormJoinColumn.getDefaultTable()); assertEquals(TYPE_NAME + "_id", ormJoinColumn.getDefaultName()); @@ -667,12 +666,12 @@ public class GenericOrmOneToOneMapping2_0Tests assertEquals("FOO", virtualJoinTable.getSpecifiedName()); assertEquals("CATALOG", virtualJoinTable.getSpecifiedCatalog()); assertEquals("SCHEMA", virtualJoinTable.getSpecifiedSchema()); - assertEquals(1, virtualJoinTable.specifiedJoinColumnsSize()); - assertEquals(1, virtualJoinTable.specifiedInverseJoinColumnsSize()); - ormJoinColumn = virtualJoinTable.specifiedJoinColumns().next(); + assertEquals(1, virtualJoinTable.getSpecifiedJoinColumnsSize()); + assertEquals(1, virtualJoinTable.getSpecifiedInverseJoinColumnsSize()); + ormJoinColumn = virtualJoinTable.getSpecifiedJoinColumns().iterator().next(); assertEquals("NAME", ormJoinColumn.getSpecifiedName()); assertEquals("REFERENCED_NAME", ormJoinColumn.getSpecifiedReferencedColumnName()); - inverseOrmJoinColumn = virtualJoinTable.specifiedInverseJoinColumns().next(); + inverseOrmJoinColumn = virtualJoinTable.getSpecifiedInverseJoinColumns().iterator().next(); assertEquals("INVERSE_NAME", inverseOrmJoinColumn.getSpecifiedName()); assertEquals("INVERSE_REFERENCED_NAME", inverseOrmJoinColumn.getSpecifiedReferencedColumnName()); } @@ -910,8 +909,8 @@ public class GenericOrmOneToOneMapping2_0Tests OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, PACKAGE_NAME + ".Address"); - assertEquals(3, ormPersistentType.virtualAttributesSize()); - OrmReadOnlyPersistentAttribute virtualPersistentAttribute = ormPersistentType.virtualAttributes().next(); + assertEquals(3, ormPersistentType.getVirtualAttributesSize()); + OrmReadOnlyPersistentAttribute virtualPersistentAttribute = ormPersistentType.getVirtualAttributes().iterator().next(); OneToOneMapping2_0 virtualOneToOneMapping = (OneToOneMapping2_0) virtualPersistentAttribute.getMapping(); assertEquals("address", virtualOneToOneMapping.getName()); @@ -922,7 +921,7 @@ public class GenericOrmOneToOneMapping2_0Tests getMappedByStrategy().getMappedByAttribute()); JoinColumn virtualJoinColumn = - virtualOneToOneMapping.getRelationship().getJoinColumnStrategy().specifiedJoinColumns().next(); + virtualOneToOneMapping.getRelationship().getJoinColumnStrategy().getSpecifiedJoinColumns().iterator().next(); assertEquals("MY_COLUMN", virtualJoinColumn.getSpecifiedName()); assertEquals("MY_REFERENCED_COLUMN", virtualJoinColumn.getSpecifiedReferencedColumnName()); assertEquals(Boolean.TRUE, virtualJoinColumn.getSpecifiedUnique()); @@ -950,14 +949,14 @@ public class GenericOrmOneToOneMapping2_0Tests OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, PACKAGE_NAME + ".Address"); ormPersistentType.getMapping().setSpecifiedMetadataComplete(Boolean.TRUE); - assertEquals(3, ormPersistentType.virtualAttributesSize()); + assertEquals(3, ormPersistentType.getVirtualAttributesSize()); OrmReadOnlyPersistentAttribute virtualPersistentAttribute = ormPersistentType.getAttributeNamed("address"); assertEquals(MappingKeys.NULL_ATTRIBUTE_MAPPING_KEY, virtualPersistentAttribute.getMappingKey()); assertTrue(virtualPersistentAttribute.isVirtual()); virtualPersistentAttribute.convertToSpecified(MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY); - OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.specifiedAttributes().next(); + OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.getSpecifiedAttributes().iterator().next(); OneToOneMapping2_0 ormOneToOneMapping = (OneToOneMapping2_0) ormPersistentAttribute.getMapping(); assertEquals("address", ormOneToOneMapping.getName()); diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/orm/GenericOrmPersistentAttribute2_0Tests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/orm/GenericOrmPersistentAttribute2_0Tests.java index 7c57bd160a..d0bf3e8f57 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/orm/GenericOrmPersistentAttribute2_0Tests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/orm/GenericOrmPersistentAttribute2_0Tests.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. @@ -10,7 +10,11 @@ package org.eclipse.jpt.jpa.core.tests.internal.jpa2.context.orm; import java.util.Iterator; +import java.util.ListIterator; import org.eclipse.jdt.core.ICompilationUnit; +import org.eclipse.jpt.common.core.resource.java.JavaResourceAttribute; +import org.eclipse.jpt.common.core.resource.java.JavaResourceAnnotatedElement.Kind; +import org.eclipse.jpt.common.utility.internal.CollectionTools; import org.eclipse.jpt.common.utility.internal.iterators.ArrayIterator; import org.eclipse.jpt.jpa.core.MappingKeys; import org.eclipse.jpt.jpa.core.context.AccessType; @@ -26,7 +30,6 @@ import org.eclipse.jpt.jpa.core.context.orm.OrmReadOnlyPersistentAttribute; import org.eclipse.jpt.jpa.core.internal.jpa1.context.java.GenericJavaNullAttributeMapping; import org.eclipse.jpt.jpa.core.jpa2.resource.java.JPA2_0; import org.eclipse.jpt.jpa.core.resource.java.JPA; -import org.eclipse.jpt.jpa.core.resource.java.JavaResourcePersistentAttribute; import org.eclipse.jpt.jpa.core.tests.internal.jpa2.context.Generic2_0ContextModelTestCase; @SuppressWarnings("nls") @@ -134,25 +137,25 @@ public class GenericOrmPersistentAttribute2_0Tests createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - assertEquals(2, ormPersistentType.virtualAttributesSize()); + assertEquals(2, ormPersistentType.getVirtualAttributesSize()); - OrmReadOnlyPersistentAttribute ormPersistentAttribute = ormPersistentType.virtualAttributes().next(); + OrmReadOnlyPersistentAttribute ormPersistentAttribute = ormPersistentType.getVirtualAttributes().iterator().next(); assertEquals("id", ormPersistentAttribute.getName()); assertTrue(ormPersistentAttribute.isVirtual()); ormPersistentAttribute.convertToSpecified(); - assertEquals(1, ormPersistentType.virtualAttributesSize()); - assertEquals(1, ormPersistentType.specifiedAttributesSize()); - OrmPersistentAttribute specifiedOrmPersistentAttribute = ormPersistentType.specifiedAttributes().next(); + assertEquals(1, ormPersistentType.getVirtualAttributesSize()); + assertEquals(1, ormPersistentType.getSpecifiedAttributesSize()); + OrmPersistentAttribute specifiedOrmPersistentAttribute = ormPersistentType.getSpecifiedAttributes().iterator().next(); assertEquals("id", specifiedOrmPersistentAttribute.getName()); assertFalse(specifiedOrmPersistentAttribute.isVirtual()); - ormPersistentAttribute = ormPersistentType.virtualAttributes().next(); + ormPersistentAttribute = ormPersistentType.getVirtualAttributes().iterator().next(); ormPersistentAttribute.convertToSpecified(); - assertEquals(0, ormPersistentType.virtualAttributesSize()); - assertEquals(2, ormPersistentType.specifiedAttributesSize()); - Iterator specifiedAttributes = ormPersistentType.specifiedAttributes(); + assertEquals(0, ormPersistentType.getVirtualAttributesSize()); + assertEquals(2, ormPersistentType.getSpecifiedAttributesSize()); + Iterator specifiedAttributes = ormPersistentType.getSpecifiedAttributes().iterator(); specifiedOrmPersistentAttribute = specifiedAttributes.next(); assertEquals("id", specifiedOrmPersistentAttribute.getName()); assertFalse(specifiedOrmPersistentAttribute.isVirtual()); @@ -166,32 +169,32 @@ public class GenericOrmPersistentAttribute2_0Tests createTestEntityAnnotatedFieldPropertySpecified(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - assertEquals(2, ormPersistentType.virtualAttributesSize()); + assertEquals(2, ormPersistentType.getVirtualAttributesSize()); - OrmReadOnlyPersistentAttribute ormPersistentAttribute = ormPersistentType.virtualAttributes().next(); + OrmReadOnlyPersistentAttribute ormPersistentAttribute = CollectionTools.get(ormPersistentType.getVirtualAttributes(), 1); assertEquals("id", ormPersistentAttribute.getName()); assertTrue(ormPersistentAttribute.isVirtual()); assertEquals(AccessType.PROPERTY, ormPersistentAttribute.getAccess()); assertEquals(null, ormPersistentAttribute.getJavaPersistentAttribute().getSpecifiedAccess()); ormPersistentAttribute.convertToSpecified(); - assertEquals(1, ormPersistentType.virtualAttributesSize()); - assertEquals(1, ormPersistentType.specifiedAttributesSize()); - OrmPersistentAttribute specifiedOrmPersistentAttribute = ormPersistentType.specifiedAttributes().next(); + assertEquals(1, ormPersistentType.getVirtualAttributesSize()); + assertEquals(1, ormPersistentType.getSpecifiedAttributesSize()); + OrmPersistentAttribute specifiedOrmPersistentAttribute = ormPersistentType.getSpecifiedAttributes().iterator().next(); assertEquals("id", specifiedOrmPersistentAttribute.getName()); assertEquals(null, specifiedOrmPersistentAttribute.getSpecifiedAccess()); assertEquals(AccessType.PROPERTY, specifiedOrmPersistentAttribute.getAccess()); assertFalse(specifiedOrmPersistentAttribute.isVirtual()); - ormPersistentAttribute = ormPersistentType.virtualAttributes().next(); + ormPersistentAttribute = ormPersistentType.getVirtualAttributes().iterator().next(); assertEquals("name", ormPersistentAttribute.getName()); assertTrue(ormPersistentAttribute.isVirtual()); assertEquals(AccessType.FIELD, ormPersistentAttribute.getAccess()); ormPersistentAttribute.convertToSpecified(); - assertEquals(0, ormPersistentType.virtualAttributesSize()); - assertEquals(2, ormPersistentType.specifiedAttributesSize()); - Iterator specifiedAttributes = ormPersistentType.specifiedAttributes(); + assertEquals(0, ormPersistentType.getVirtualAttributesSize()); + assertEquals(2, ormPersistentType.getSpecifiedAttributesSize()); + Iterator specifiedAttributes = ormPersistentType.getSpecifiedAttributes().iterator(); specifiedOrmPersistentAttribute = specifiedAttributes.next(); assertEquals("id", specifiedOrmPersistentAttribute.getName()); assertFalse(specifiedOrmPersistentAttribute.isVirtual()); @@ -208,7 +211,7 @@ public class GenericOrmPersistentAttribute2_0Tests createTestTypeNullAttributeMapping(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - assertEquals(3, ormPersistentType.virtualAttributesSize()); + assertEquals(3, ormPersistentType.getVirtualAttributesSize()); //take a virtual mapping with a mapping type and make it specified OrmReadOnlyPersistentAttribute ormPersistentAttribute = ormPersistentType.getAttributeNamed("address"); @@ -217,20 +220,20 @@ public class GenericOrmPersistentAttribute2_0Tests assertTrue(ormPersistentAttribute.getMapping() instanceof GenericJavaNullAttributeMapping); ormPersistentAttribute.convertToSpecified(MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY); - assertEquals(2, ormPersistentType.virtualAttributesSize()); - assertEquals(1, ormPersistentType.specifiedAttributesSize()); - OrmPersistentAttribute specifiedOrmPersistentAttribute = ormPersistentType.specifiedAttributes().next(); + assertEquals(2, ormPersistentType.getVirtualAttributesSize()); + assertEquals(1, ormPersistentType.getSpecifiedAttributesSize()); + OrmPersistentAttribute specifiedOrmPersistentAttribute = ormPersistentType.getSpecifiedAttributes().iterator().next(); assertEquals("address", specifiedOrmPersistentAttribute.getName()); assertFalse(specifiedOrmPersistentAttribute.isVirtual()); assertTrue(specifiedOrmPersistentAttribute.getMapping() instanceof OrmOneToOneMapping); - ormPersistentAttribute = ormPersistentType.virtualAttributes().next(); + ormPersistentAttribute = ormPersistentType.getVirtualAttributes().iterator().next(); ormPersistentAttribute.convertToSpecified(MappingKeys.ID_ATTRIBUTE_MAPPING_KEY); - assertEquals(1, ormPersistentType.virtualAttributesSize()); - assertEquals(2, ormPersistentType.specifiedAttributesSize()); - Iterator specifiedAttributes = ormPersistentType.specifiedAttributes(); + assertEquals(1, ormPersistentType.getVirtualAttributesSize()); + assertEquals(2, ormPersistentType.getSpecifiedAttributesSize()); + Iterator specifiedAttributes = ormPersistentType.getSpecifiedAttributes().iterator(); specifiedOrmPersistentAttribute = specifiedAttributes.next(); assertEquals("id", specifiedOrmPersistentAttribute.getName()); @@ -246,27 +249,27 @@ public class GenericOrmPersistentAttribute2_0Tests createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - assertEquals(2, ormPersistentType.virtualAttributesSize()); + assertEquals(2, ormPersistentType.getVirtualAttributesSize()); - ormPersistentType.virtualAttributes().next().convertToSpecified(); - ormPersistentType.virtualAttributes().next().convertToSpecified(); + ormPersistentType.getVirtualAttributes().iterator().next().convertToSpecified(); + ormPersistentType.getVirtualAttributes().iterator().next().convertToSpecified(); - assertEquals(0, ormPersistentType.virtualAttributesSize()); - assertEquals(2, ormPersistentType.specifiedAttributesSize()); - OrmPersistentAttribute specifiedOrmPersistentAttribute = ormPersistentType.specifiedAttributes().next(); + assertEquals(0, ormPersistentType.getVirtualAttributesSize()); + assertEquals(2, ormPersistentType.getSpecifiedAttributesSize()); + OrmPersistentAttribute specifiedOrmPersistentAttribute = ormPersistentType.getSpecifiedAttributes().iterator().next(); assertEquals("id", specifiedOrmPersistentAttribute.getName()); assertFalse(specifiedOrmPersistentAttribute.isVirtual()); specifiedOrmPersistentAttribute.convertToVirtual(); - assertEquals(1, ormPersistentType.virtualAttributesSize()); - assertEquals(1, ormPersistentType.specifiedAttributesSize()); + assertEquals(1, ormPersistentType.getVirtualAttributesSize()); + assertEquals(1, ormPersistentType.getSpecifiedAttributesSize()); - specifiedOrmPersistentAttribute = ormPersistentType.specifiedAttributes().next(); + specifiedOrmPersistentAttribute = ormPersistentType.getSpecifiedAttributes().iterator().next(); specifiedOrmPersistentAttribute.convertToVirtual(); - assertEquals(2, ormPersistentType.virtualAttributesSize()); - assertEquals(0, ormPersistentType.specifiedAttributesSize()); + assertEquals(2, ormPersistentType.getVirtualAttributesSize()); + assertEquals(0, ormPersistentType.getSpecifiedAttributesSize()); - Iterator virtualAttributes = ormPersistentType.virtualAttributes(); + Iterator virtualAttributes = ormPersistentType.getVirtualAttributes().iterator(); OrmReadOnlyPersistentAttribute virtualAttribute = virtualAttributes.next(); assertEquals("id", virtualAttribute.getName()); virtualAttribute = virtualAttributes.next(); @@ -277,24 +280,24 @@ public class GenericOrmPersistentAttribute2_0Tests createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - assertEquals(2, ormPersistentType.virtualAttributesSize()); + assertEquals(2, ormPersistentType.getVirtualAttributesSize()); - ormPersistentType.virtualAttributes().next().convertToSpecified(); - ormPersistentType.virtualAttributes().next().convertToSpecified(); + ormPersistentType.getVirtualAttributes().iterator().next().convertToSpecified(); + ormPersistentType.getVirtualAttributes().iterator().next().convertToSpecified(); - ormPersistentType.specifiedAttributes().next().getMapping().setName("noJavaAttribute"); - assertEquals(1, ormPersistentType.virtualAttributesSize()); - assertEquals(2, ormPersistentType.specifiedAttributesSize()); + ormPersistentType.getSpecifiedAttributes().iterator().next().getMapping().setName("noJavaAttribute"); + assertEquals(1, ormPersistentType.getVirtualAttributesSize()); + assertEquals(2, ormPersistentType.getSpecifiedAttributesSize()); - OrmPersistentAttribute specifiedOrmPersistentAttribute = ormPersistentType.specifiedAttributes().next(); + OrmPersistentAttribute specifiedOrmPersistentAttribute = ormPersistentType.getSpecifiedAttributes().iterator().next(); specifiedOrmPersistentAttribute.convertToVirtual(); - assertEquals(1, ormPersistentType.virtualAttributesSize()); - assertEquals(1, ormPersistentType.specifiedAttributesSize()); + assertEquals(1, ormPersistentType.getVirtualAttributesSize()); + assertEquals(1, ormPersistentType.getSpecifiedAttributesSize()); - assertEquals("id", ormPersistentType.virtualAttributes().next().getName()); - assertEquals("name", ormPersistentType.specifiedAttributes().next().getName()); + assertEquals("id", ormPersistentType.getVirtualAttributes().iterator().next().getName()); + assertEquals("name", ormPersistentType.getSpecifiedAttributes().iterator().next().getName()); } public void testVirtualMappingTypeWhenMetadataComplete() throws Exception { @@ -342,10 +345,10 @@ public class GenericOrmPersistentAttribute2_0Tests //virtual orm attribute, access type matches java : FIELD, name matches java assertTrue(ormPersistentAttribute.isVirtual()); assertNotSame(javaPersistentAttribute, ormPersistentAttribute.getJavaPersistentAttribute()); - JavaResourcePersistentAttribute javaResourcePersistentAttribute = ormPersistentAttribute.getJavaPersistentAttribute().getResourcePersistentAttribute(); - assertTrue(javaResourcePersistentAttribute.isField()); - assertEquals("id", javaResourcePersistentAttribute.getName()); - assertEquals(javaPersistentType.getResourcePersistentType().persistableFields().next(), javaResourcePersistentAttribute); + JavaResourceAttribute javaResourceAttribute = ormPersistentAttribute.getJavaPersistentAttribute().getResourceAttribute(); + assertTrue(javaResourceAttribute.getKind() == Kind.FIELD); + assertEquals("id", javaResourceAttribute.getName()); + assertEquals(javaPersistentType.getJavaResourceType().getFields().iterator().next(), javaResourceAttribute); //specified orm attribute, access type matches java : FIELD, name matches java @@ -357,17 +360,24 @@ public class GenericOrmPersistentAttribute2_0Tests //virtual orm attribute, java access type FIELD, orm access type PROPERTY, name matches java - //verify the property java resource persistent attribute is used in orm. + //verify both the property java resource attribute and the field java resource attribute are used in orm + //because the field is annotated and property is specified ((OrmPersistentAttribute) ormPersistentAttribute).convertToVirtual(); ormPersistentAttribute = ormPersistentType.getAttributeNamed("id"); ormPersistentType.setSpecifiedAccess(AccessType.PROPERTY); - assertNotSame(ormPersistentAttribute, ormPersistentType.getAttributeNamed("id")); - ormPersistentAttribute = ormPersistentType.getAttributeNamed("id"); + ListIterator attributes = ormPersistentType.getAttributes().iterator(); + OrmReadOnlyPersistentAttribute idFieldAttribute = attributes.next(); + OrmReadOnlyPersistentAttribute idPropertyAttribute = attributes.next(); + assertEquals(ormPersistentAttribute, idFieldAttribute); + assertNotSame(ormPersistentAttribute, idPropertyAttribute); + ormPersistentAttribute = idPropertyAttribute; assertNotSame(javaPersistentAttribute, ormPersistentAttribute.getJavaPersistentAttribute()); - javaResourcePersistentAttribute = ormPersistentAttribute.getJavaPersistentAttribute().getResourcePersistentAttribute(); - assertTrue(javaResourcePersistentAttribute.isProperty()); - assertEquals("id", javaResourcePersistentAttribute.getName()); - assertEquals(javaPersistentType.getResourcePersistentType().persistableProperties().next(), javaResourcePersistentAttribute); + assertEquals(AccessType.FIELD, javaPersistentAttribute.getAccess()); + assertEquals(AccessType.PROPERTY, ormPersistentAttribute.getJavaPersistentAttribute().getAccess()); + assertEquals(AccessType.FIELD, idFieldAttribute.getJavaPersistentAttribute().getAccess()); + javaResourceAttribute = ormPersistentAttribute.getJavaPersistentAttribute().getResourceAttribute(); + assertEquals("id", javaResourceAttribute.getName()); + assertEquals(javaPersistentType.getJavaResourceType().getMethods().iterator().next(), javaResourceAttribute); ormPersistentType.setSpecifiedAccess(null);//default access will be field @@ -393,32 +403,37 @@ public class GenericOrmPersistentAttribute2_0Tests ormPersistentType.setSpecifiedAccess(AccessType.PROPERTY); JavaPersistentType javaPersistentType = ormPersistentType.getJavaPersistentType(); - OrmReadOnlyPersistentAttribute ormPersistentAttribute = ormPersistentType.getAttributeNamed("id"); + ListIterator attributes = ormPersistentType.getAttributes().iterator(); + OrmReadOnlyPersistentAttribute ormFieldAttribute = attributes.next(); + OrmReadOnlyPersistentAttribute ormPropertyAttribute = attributes.next(); JavaPersistentAttribute javaPersistentAttribute = javaPersistentType.getAttributeNamed("id"); - assertEquals(AccessType.PROPERTY, ormPersistentAttribute.getAccess()); + assertEquals(AccessType.FIELD, ormFieldAttribute.getAccess()); + assertEquals(AccessType.PROPERTY, ormPropertyAttribute.getAccess()); assertEquals(AccessType.FIELD, javaPersistentAttribute.getOwningPersistentType().getAccess()); - assertTrue(ormPersistentAttribute.isVirtual()); - assertNotSame(javaPersistentAttribute, ormPersistentAttribute.getJavaPersistentAttribute()); - assertEquals(MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY, ormPersistentAttribute.getMappingKey()); + assertTrue(ormFieldAttribute.isVirtual()); + assertTrue(ormPropertyAttribute.isVirtual()); + assertNotSame(javaPersistentAttribute, ormPropertyAttribute.getJavaPersistentAttribute()); + assertEquals(MappingKeys.ID_ATTRIBUTE_MAPPING_KEY, ormFieldAttribute.getMappingKey()); + assertEquals(MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY, ormPropertyAttribute.getMappingKey()); assertEquals(MappingKeys.ID_ATTRIBUTE_MAPPING_KEY, javaPersistentAttribute.getMappingKey()); - ormPersistentAttribute.convertToSpecified(); - ormPersistentAttribute = ormPersistentType.getAttributeNamed("id"); - assertFalse(ormPersistentAttribute.isVirtual()); - assertEquals(AccessType.PROPERTY, ormPersistentAttribute.getAccess()); - assertNotSame(javaPersistentAttribute, ormPersistentAttribute.getJavaPersistentAttribute()); - assertTrue(ormPersistentAttribute.getJavaPersistentAttribute().getResourcePersistentAttribute().isProperty()); - assertTrue(javaPersistentAttribute.getResourcePersistentAttribute().isField()); - - ((OrmPersistentAttribute) ormPersistentAttribute).setSpecifiedAccess(AccessType.FIELD); - ormPersistentAttribute = ormPersistentType.getAttributeNamed("id"); - assertFalse(ormPersistentAttribute.isVirtual()); - assertEquals(AccessType.FIELD, ormPersistentAttribute.getAccess()); - assertEquals(javaPersistentAttribute, ormPersistentAttribute.getJavaPersistentAttribute()); - assertTrue(ormPersistentAttribute.getJavaPersistentAttribute().getResourcePersistentAttribute().isField()); - assertTrue(javaPersistentAttribute.getResourcePersistentAttribute().isField()); + ormPropertyAttribute.convertToSpecified(); + ormPropertyAttribute = ormPersistentType.getAttributeNamed("id"); + assertFalse(ormPropertyAttribute.isVirtual()); + assertEquals(AccessType.PROPERTY, ormPropertyAttribute.getAccess()); + assertNotSame(javaPersistentAttribute, ormPropertyAttribute.getJavaPersistentAttribute()); + assertTrue(ormPropertyAttribute.getJavaPersistentAttribute().getResourceAttribute().getKind() == Kind.METHOD); + assertTrue(javaPersistentAttribute.getResourceAttribute().getKind() == Kind.FIELD); + + ((OrmPersistentAttribute) ormPropertyAttribute).setSpecifiedAccess(AccessType.FIELD); + ormPropertyAttribute = ormPersistentType.getAttributeNamed("id"); + assertFalse(ormPropertyAttribute.isVirtual()); + assertEquals(AccessType.FIELD, ormPropertyAttribute.getAccess()); + assertEquals(javaPersistentAttribute, ormPropertyAttribute.getJavaPersistentAttribute()); + assertTrue(ormPropertyAttribute.getJavaPersistentAttribute().getResourceAttribute().getKind() == Kind.FIELD); + assertTrue(javaPersistentAttribute.getResourceAttribute().getKind() == Kind.FIELD); } public void testGetAccess() throws Exception { @@ -431,18 +446,18 @@ public class GenericOrmPersistentAttribute2_0Tests assertTrue(ormPersistentAttribute.isVirtual()); assertEquals(AccessType.FIELD, ormPersistentAttribute.getAccess()); - assertTrue(ormPersistentAttribute.getJavaPersistentAttribute().getResourcePersistentAttribute().isField()); + assertTrue(ormPersistentAttribute.getJavaPersistentAttribute().getResourceAttribute().getKind() == Kind.FIELD); assertEquals(AccessType.FIELD, javaPersistentAttribute.getAccess()); - assertTrue(javaPersistentAttribute.getResourcePersistentAttribute().isField()); + assertTrue(javaPersistentAttribute.getResourceAttribute().getKind() == Kind.FIELD); ormPersistentAttribute.convertToSpecified(); ormPersistentAttribute = ormPersistentType.getAttributeNamed("id"); assertFalse(ormPersistentAttribute.isVirtual()); assertEquals(AccessType.FIELD, ormPersistentAttribute.getAccess()); - assertTrue(ormPersistentAttribute.getJavaPersistentAttribute().getResourcePersistentAttribute().isField()); + assertTrue(ormPersistentAttribute.getJavaPersistentAttribute().getResourceAttribute().getKind() == Kind.FIELD); assertEquals(AccessType.FIELD, javaPersistentAttribute.getAccess()); - assertTrue(javaPersistentAttribute.getResourcePersistentAttribute().isField()); + assertTrue(javaPersistentAttribute.getResourceAttribute().getKind() == Kind.FIELD); ormPersistentType.getMapping().setSpecifiedMetadataComplete(Boolean.TRUE); @@ -451,7 +466,7 @@ public class GenericOrmPersistentAttribute2_0Tests assertEquals(javaPersistentAttribute, ormPersistentAttribute.getJavaPersistentAttribute()); assertEquals(AccessType.FIELD, ormPersistentAttribute.getJavaPersistentAttribute().getAccess()); assertEquals(AccessType.FIELD, javaPersistentAttribute.getAccess()); - assertTrue(javaPersistentAttribute.getResourcePersistentAttribute().isField()); + assertTrue(javaPersistentAttribute.getResourceAttribute().getKind() == Kind.FIELD); } public void testGetAccessPropertyInJava() throws Exception { @@ -464,18 +479,18 @@ public class GenericOrmPersistentAttribute2_0Tests assertTrue(ormPersistentAttribute.isVirtual()); assertEquals(AccessType.PROPERTY, ormPersistentAttribute.getAccess()); - assertTrue(ormPersistentAttribute.getJavaPersistentAttribute().getResourcePersistentAttribute().isProperty()); + assertTrue(ormPersistentAttribute.getJavaPersistentAttribute().getResourceAttribute().getKind() == Kind.METHOD); assertEquals(AccessType.PROPERTY, javaPersistentAttribute.getAccess()); - assertTrue(javaPersistentAttribute.getResourcePersistentAttribute().isProperty()); + assertTrue(javaPersistentAttribute.getResourceAttribute().getKind() == Kind.METHOD); ormPersistentAttribute.convertToSpecified(); ormPersistentAttribute = ormPersistentType.getAttributeNamed("id"); assertFalse(ormPersistentAttribute.isVirtual()); assertEquals(AccessType.PROPERTY, ormPersistentAttribute.getAccess()); - assertTrue(ormPersistentAttribute.getJavaPersistentAttribute().getResourcePersistentAttribute().isProperty()); + assertTrue(ormPersistentAttribute.getJavaPersistentAttribute().getResourceAttribute().getKind() == Kind.METHOD); assertEquals(AccessType.PROPERTY, javaPersistentAttribute.getAccess()); - assertTrue(javaPersistentAttribute.getResourcePersistentAttribute().isProperty()); + assertTrue(javaPersistentAttribute.getResourceAttribute().getKind() == Kind.METHOD); ormPersistentType.getMapping().setSpecifiedMetadataComplete(Boolean.TRUE); @@ -484,7 +499,7 @@ public class GenericOrmPersistentAttribute2_0Tests assertNotSame(javaPersistentAttribute, ormPersistentAttribute.getJavaPersistentAttribute()); assertEquals(AccessType.FIELD, ormPersistentAttribute.getJavaPersistentAttribute().getAccess()); assertEquals(AccessType.PROPERTY, javaPersistentAttribute.getAccess()); - assertTrue(javaPersistentAttribute.getResourcePersistentAttribute().isProperty()); + assertTrue(javaPersistentAttribute.getResourceAttribute().getKind() == Kind.METHOD); } public void testGetAccessPropertyInJava2() throws Exception { @@ -497,9 +512,9 @@ public class GenericOrmPersistentAttribute2_0Tests assertTrue(ormPersistentAttribute.isVirtual()); assertEquals(AccessType.PROPERTY, ormPersistentAttribute.getAccess()); - assertTrue(ormPersistentAttribute.getJavaPersistentAttribute().getResourcePersistentAttribute().isProperty()); + assertTrue(ormPersistentAttribute.getJavaPersistentAttribute().getResourceAttribute().getKind() == Kind.METHOD); assertEquals(AccessType.PROPERTY, javaPersistentAttribute.getAccess()); - assertTrue(javaPersistentAttribute.getResourcePersistentAttribute().isProperty()); + assertTrue(javaPersistentAttribute.getResourceAttribute().getKind() == Kind.METHOD); OrmReadOnlyPersistentAttribute nameOrmPersistentAttribute = ormPersistentType.getAttributeNamed("name"); @@ -507,27 +522,27 @@ public class GenericOrmPersistentAttribute2_0Tests assertTrue(nameOrmPersistentAttribute.isVirtual()); assertEquals(AccessType.FIELD, nameOrmPersistentAttribute.getAccess()); - assertTrue(nameOrmPersistentAttribute.getJavaPersistentAttribute().getResourcePersistentAttribute().isField()); + assertTrue(nameOrmPersistentAttribute.getJavaPersistentAttribute().getResourceAttribute().getKind() == Kind.FIELD); assertEquals(AccessType.FIELD, nameJavaPersistentAttribute.getAccess()); - assertTrue(nameJavaPersistentAttribute.getResourcePersistentAttribute().isField()); + assertTrue(nameJavaPersistentAttribute.getResourceAttribute().getKind() == Kind.FIELD); ormPersistentAttribute.convertToSpecified(); ormPersistentAttribute = ormPersistentType.getAttributeNamed("id"); assertFalse(ormPersistentAttribute.isVirtual()); assertEquals(AccessType.PROPERTY, ormPersistentAttribute.getAccess()); - assertTrue(ormPersistentAttribute.getJavaPersistentAttribute().getResourcePersistentAttribute().isProperty()); + assertTrue(ormPersistentAttribute.getJavaPersistentAttribute().getResourceAttribute().getKind() == Kind.METHOD); assertEquals(AccessType.PROPERTY, javaPersistentAttribute.getAccess()); - assertTrue(javaPersistentAttribute.getResourcePersistentAttribute().isProperty()); + assertTrue(javaPersistentAttribute.getResourceAttribute().getKind() == Kind.METHOD); nameOrmPersistentAttribute.convertToSpecified(); nameOrmPersistentAttribute = ormPersistentType.getAttributeNamed("name"); assertFalse(nameOrmPersistentAttribute.isVirtual()); assertEquals(AccessType.FIELD, nameOrmPersistentAttribute.getAccess()); assertEquals(AccessType.FIELD, nameOrmPersistentAttribute.getJavaPersistentAttribute().getAccess()); - assertTrue(nameOrmPersistentAttribute.getJavaPersistentAttribute().getResourcePersistentAttribute().isField()); + assertTrue(nameOrmPersistentAttribute.getJavaPersistentAttribute().getResourceAttribute().getKind() == Kind.FIELD); assertEquals(AccessType.FIELD, nameJavaPersistentAttribute.getAccess()); - assertTrue(nameJavaPersistentAttribute.getResourcePersistentAttribute().isField()); + assertTrue(nameJavaPersistentAttribute.getResourceAttribute().getKind() == Kind.FIELD); assertEquals(nameJavaPersistentAttribute, nameOrmPersistentAttribute.getJavaPersistentAttribute()); ormPersistentType.getMapping().setSpecifiedMetadataComplete(Boolean.TRUE); @@ -536,14 +551,14 @@ public class GenericOrmPersistentAttribute2_0Tests assertNotSame(javaPersistentAttribute, ormPersistentAttribute.getJavaPersistentAttribute()); assertEquals(AccessType.FIELD, ormPersistentAttribute.getJavaPersistentAttribute().getAccess()); assertEquals(AccessType.PROPERTY, javaPersistentAttribute.getAccess()); - assertTrue(javaPersistentAttribute.getResourcePersistentAttribute().isProperty()); + assertTrue(javaPersistentAttribute.getResourceAttribute().getKind() == Kind.METHOD); assertFalse(nameOrmPersistentAttribute.isVirtual()); assertEquals(AccessType.FIELD, nameOrmPersistentAttribute.getAccess()); assertNotSame(javaPersistentAttribute, nameOrmPersistentAttribute.getJavaPersistentAttribute()); assertEquals(AccessType.FIELD, nameOrmPersistentAttribute.getJavaPersistentAttribute().getAccess()); assertEquals(AccessType.FIELD, nameJavaPersistentAttribute.getAccess()); - assertTrue(nameJavaPersistentAttribute.getResourcePersistentAttribute().isField()); + assertTrue(nameJavaPersistentAttribute.getResourceAttribute().getKind() == Kind.FIELD); } diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/orm/GenericOrmPersistentType2_0Tests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/orm/GenericOrmPersistentType2_0Tests.java index e20acb3035..a32aa28c65 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/orm/GenericOrmPersistentType2_0Tests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/orm/GenericOrmPersistentType2_0Tests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009 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. @@ -155,27 +155,27 @@ public class GenericOrmPersistentType2_0Tests createTestEntityAnnotatedFieldPropertySpecified(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - Iterator virtualAttributes = ormPersistentType.virtualAttributes(); + Iterator virtualAttributes = ormPersistentType.getVirtualAttributes().iterator(); OrmReadOnlyPersistentAttribute ormPersistentAttribute = virtualAttributes.next(); - assertEquals("id", ormPersistentAttribute.getName()); - assertEquals(AccessType.PROPERTY, ormPersistentAttribute.getAccess()); + assertEquals("name", ormPersistentAttribute.getName()); + assertEquals(AccessType.FIELD, ormPersistentAttribute.getAccess()); ormPersistentAttribute = virtualAttributes.next(); - assertEquals("name", ormPersistentAttribute.getName()); - assertEquals(AccessType.FIELD, ormPersistentAttribute.getAccess()); + assertEquals("id", ormPersistentAttribute.getName()); + assertEquals(AccessType.PROPERTY, ormPersistentAttribute.getAccess()); assertFalse(virtualAttributes.hasNext()); ormPersistentType.getMapping().setSpecifiedMetadataComplete(Boolean.TRUE); - virtualAttributes = ormPersistentType.virtualAttributes(); + virtualAttributes = ormPersistentType.getVirtualAttributes().iterator(); ormPersistentAttribute = virtualAttributes.next(); - assertEquals("id", ormPersistentAttribute.getName()); + assertEquals("name", ormPersistentAttribute.getName()); assertEquals(AccessType.FIELD, ormPersistentAttribute.getAccess()); ormPersistentAttribute = virtualAttributes.next(); - assertEquals("name", ormPersistentAttribute.getName()); + assertEquals("id", ormPersistentAttribute.getName()); assertEquals(AccessType.FIELD, ormPersistentAttribute.getAccess()); assertFalse(virtualAttributes.hasNext()); @@ -185,7 +185,7 @@ public class GenericOrmPersistentType2_0Tests createTestEntityPropertySpecified(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - Iterator virtualAttributes = ormPersistentType.virtualAttributes(); + Iterator virtualAttributes = ormPersistentType.getVirtualAttributes().iterator(); OrmReadOnlyPersistentAttribute ormPersistentAttribute = virtualAttributes.next(); assertEquals("id", ormPersistentAttribute.getName()); assertEquals(AccessType.PROPERTY, ormPersistentAttribute.getAccess()); @@ -193,7 +193,7 @@ public class GenericOrmPersistentType2_0Tests assertFalse(virtualAttributes.hasNext()); ormPersistentType.getMapping().setSpecifiedMetadataComplete(Boolean.TRUE); - virtualAttributes = ormPersistentType.virtualAttributes(); + virtualAttributes = ormPersistentType.getVirtualAttributes().iterator(); ormPersistentAttribute = virtualAttributes.next(); assertEquals("id", ormPersistentAttribute.getName()); assertEquals(AccessType.FIELD, ormPersistentAttribute.getAccess()); @@ -206,7 +206,7 @@ public class GenericOrmPersistentType2_0Tests assertFalse(virtualAttributes.hasNext()); ormPersistentType.getMapping().setSpecifiedMetadataComplete(Boolean.FALSE); - virtualAttributes = ormPersistentType.virtualAttributes(); + virtualAttributes = ormPersistentType.getVirtualAttributes().iterator(); ormPersistentAttribute = virtualAttributes.next(); assertEquals("id", ormPersistentAttribute.getName()); assertEquals(AccessType.PROPERTY, ormPersistentAttribute.getAccess()); @@ -218,7 +218,7 @@ public class GenericOrmPersistentType2_0Tests createTestEntityFieldSpecifiedPropertyAnnotated(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - Iterator virtualAttributes = ormPersistentType.virtualAttributes(); + Iterator virtualAttributes = ormPersistentType.getVirtualAttributes().iterator(); OrmReadOnlyPersistentAttribute virtualAttribute = virtualAttributes.next(); assertEquals("id", virtualAttribute.getName()); assertEquals(AccessType.FIELD, virtualAttribute.getAccess()); @@ -236,25 +236,27 @@ public class GenericOrmPersistentType2_0Tests virtualAttribute.convertToSpecified(); - virtualAttributes = ormPersistentType.virtualAttributes(); + virtualAttributes = ormPersistentType.getVirtualAttributes().iterator(); virtualAttribute = virtualAttributes.next(); - assertEquals("id", virtualAttribute.getName()); + assertEquals("name", virtualAttribute.getName()); assertEquals(AccessType.FIELD, virtualAttribute.getAccess()); virtualAttribute = virtualAttributes.next(); - assertEquals("name", virtualAttribute.getName()); + assertEquals("id", virtualAttribute.getName()); assertEquals(AccessType.FIELD, virtualAttribute.getAccess()); assertFalse(virtualAttributes.hasNext()); - OrmPersistentAttribute specifiedAttribute = ormPersistentType.specifiedAttributes().next(); + OrmPersistentAttribute specifiedAttribute = ormPersistentType.getSpecifiedAttributes().iterator().next(); assertEquals("id", specifiedAttribute.getName()); assertEquals(AccessType.PROPERTY, specifiedAttribute.getSpecifiedAccess()); - ormPersistentType.virtualAttributes().next().convertToSpecified(); - virtualAttributes = ormPersistentType.virtualAttributes(); + virtualAttributes = ormPersistentType.getVirtualAttributes().iterator(); + virtualAttributes.next(); + virtualAttributes.next().convertToSpecified(); + virtualAttributes = ormPersistentType.getVirtualAttributes().iterator(); virtualAttribute = virtualAttributes.next(); assertEquals("name", virtualAttribute.getName()); assertEquals(AccessType.FIELD, virtualAttribute.getAccess()); diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/resource/java/Access2_0AnnotationTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/resource/java/Access2_0AnnotationTests.java index df125531a3..49e5095a15 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/resource/java/Access2_0AnnotationTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/resource/java/Access2_0AnnotationTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009 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. @@ -11,12 +11,14 @@ package org.eclipse.jpt.jpa.core.tests.internal.jpa2.resource.java; import java.util.Iterator; import org.eclipse.jdt.core.ICompilationUnit; +import org.eclipse.jpt.common.core.resource.java.JavaResourceField; +import org.eclipse.jpt.common.core.resource.java.JavaResourceMethod; +import org.eclipse.jpt.common.core.resource.java.JavaResourceType; +import org.eclipse.jpt.common.utility.internal.CollectionTools; import org.eclipse.jpt.common.utility.internal.iterators.ArrayIterator; import org.eclipse.jpt.jpa.core.jpa2.resource.java.Access2_0Annotation; import org.eclipse.jpt.jpa.core.jpa2.resource.java.JPA2_0; import org.eclipse.jpt.jpa.core.resource.java.AccessType; -import org.eclipse.jpt.jpa.core.resource.java.JavaResourcePersistentAttribute; -import org.eclipse.jpt.jpa.core.resource.java.JavaResourcePersistentType; @SuppressWarnings("nls") public class Access2_0AnnotationTests extends JavaResourceModel2_0TestCase { @@ -69,24 +71,24 @@ public class Access2_0AnnotationTests extends JavaResourceModel2_0TestCase { public void testGetAccessOnType() throws Exception { ICompilationUnit cu = this.createTestAccessOnType(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); + JavaResourceType resourceType = buildJavaResourceType(cu); - Access2_0Annotation access = (Access2_0Annotation) typeResource.getAnnotation(JPA2_0.ACCESS); + Access2_0Annotation access = (Access2_0Annotation) resourceType.getAnnotation(JPA2_0.ACCESS); assertNotNull(access); assertEquals(AccessType.PROPERTY, access.getValue()); } public void testSetAccessOnType() throws Exception { ICompilationUnit cu = this.createTestType(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); + JavaResourceType resourceType = buildJavaResourceType(cu); - Access2_0Annotation access = (Access2_0Annotation) typeResource.getAnnotation(JPA2_0.ACCESS); + Access2_0Annotation access = (Access2_0Annotation) resourceType.getAnnotation(JPA2_0.ACCESS); assertNull(access); - typeResource.addAnnotation(JPA2_0.ACCESS); + resourceType.addAnnotation(JPA2_0.ACCESS); assertSourceContains("@Access", cu); - access = (Access2_0Annotation) typeResource.getAnnotation(JPA2_0.ACCESS); + access = (Access2_0Annotation) resourceType.getAnnotation(JPA2_0.ACCESS); assertNotNull(access); access.setValue(AccessType.FIELD); @@ -103,26 +105,26 @@ public class Access2_0AnnotationTests extends JavaResourceModel2_0TestCase { public void testGetAccessOnField() throws Exception { ICompilationUnit cu = this.createTestAccessOnField(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableFields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - Access2_0Annotation access = (Access2_0Annotation) attributeResource.getAnnotation(JPA2_0.ACCESS); + Access2_0Annotation access = (Access2_0Annotation) resourceField.getAnnotation(JPA2_0.ACCESS); assertNotNull(access); assertEquals(AccessType.FIELD, access.getValue()); } public void testSetAccessOnField() throws Exception { ICompilationUnit cu = this.createTestType(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableFields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - Access2_0Annotation access = (Access2_0Annotation) attributeResource.getAnnotation(JPA2_0.ACCESS); + Access2_0Annotation access = (Access2_0Annotation) resourceField.getAnnotation(JPA2_0.ACCESS); assertNull(access); - attributeResource.addAnnotation(JPA2_0.ACCESS); + resourceField.addAnnotation(JPA2_0.ACCESS); assertSourceContains("@Access", cu); - access = (Access2_0Annotation) attributeResource.getAnnotation(JPA2_0.ACCESS); + access = (Access2_0Annotation) resourceField.getAnnotation(JPA2_0.ACCESS); assertNotNull(access); access.setValue(AccessType.FIELD); @@ -139,26 +141,26 @@ public class Access2_0AnnotationTests extends JavaResourceModel2_0TestCase { public void testGetAccessOnProperty() throws Exception { ICompilationUnit cu = this.createTestAccessOnProperty(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableProperties().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceMethod resourceMethod = CollectionTools.get(resourceType.getMethods(), 0); - Access2_0Annotation access = (Access2_0Annotation) attributeResource.getAnnotation(JPA2_0.ACCESS); + Access2_0Annotation access = (Access2_0Annotation) resourceMethod.getAnnotation(JPA2_0.ACCESS); assertNotNull(access); assertEquals(AccessType.PROPERTY, access.getValue()); } public void testSetAccessOnProperty() throws Exception { ICompilationUnit cu = this.createTestType(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableProperties().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceMethod resourceMethod = CollectionTools.get(resourceType.getMethods(), 0); - Access2_0Annotation access = (Access2_0Annotation) attributeResource.getAnnotation(JPA2_0.ACCESS); + Access2_0Annotation access = (Access2_0Annotation) resourceMethod.getAnnotation(JPA2_0.ACCESS); assertNull(access); - attributeResource.addAnnotation(JPA2_0.ACCESS); + resourceMethod.addAnnotation(JPA2_0.ACCESS); assertSourceContains("@Access", cu); - access = (Access2_0Annotation) attributeResource.getAnnotation(JPA2_0.ACCESS); + access = (Access2_0Annotation) resourceMethod.getAnnotation(JPA2_0.ACCESS); assertNotNull(access); access.setValue(AccessType.FIELD); diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/resource/java/AssociationOverride2_0Tests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/resource/java/AssociationOverride2_0Tests.java index 699d2e2f2e..c1b5eaca0c 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/resource/java/AssociationOverride2_0Tests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/resource/java/AssociationOverride2_0Tests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009 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. @@ -11,12 +11,13 @@ package org.eclipse.jpt.jpa.core.tests.internal.jpa2.resource.java; import java.util.Iterator; import org.eclipse.jdt.core.ICompilationUnit; +import org.eclipse.jpt.common.core.resource.java.JavaResourceField; +import org.eclipse.jpt.common.core.resource.java.JavaResourceMember; +import org.eclipse.jpt.common.core.resource.java.JavaResourceType; +import org.eclipse.jpt.common.utility.internal.CollectionTools; import org.eclipse.jpt.common.utility.internal.iterators.ArrayIterator; import org.eclipse.jpt.jpa.core.jpa2.resource.java.AssociationOverride2_0Annotation; -import org.eclipse.jpt.jpa.core.resource.java.AssociationOverrideAnnotation; 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.JoinTableAnnotation; @@ -149,11 +150,15 @@ public class AssociationOverride2_0Tests extends JavaResourceModel2_0TestCase { }); } + private AssociationOverride2_0Annotation associationOverrideAt(int index, JavaResourceMember resourceMember) { + return (AssociationOverride2_0Annotation) resourceMember.getAnnotation(index, JPA.ASSOCIATION_OVERRIDE); + } + public void testGetName() throws Exception { ICompilationUnit cu = this.createTestAssociationOverrideOnField(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - AssociationOverrideAnnotation associationOverride = (AssociationOverrideAnnotation) attributeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDE); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); + AssociationOverride2_0Annotation associationOverride = this.associationOverrideAt(0, resourceField); assertNotNull(associationOverride); assertEquals(ASSOCIATION_OVERRIDE_NAME, associationOverride.getName()); @@ -161,9 +166,9 @@ public class AssociationOverride2_0Tests extends JavaResourceModel2_0TestCase { public void testSetName() throws Exception { ICompilationUnit cu = this.createTestAssociationOverrideOnField(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - AssociationOverrideAnnotation associationOverride = (AssociationOverrideAnnotation) attributeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDE); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); + AssociationOverride2_0Annotation associationOverride = this.associationOverrideAt(0, resourceField); assertNotNull(associationOverride); assertEquals(ASSOCIATION_OVERRIDE_NAME, associationOverride.getName()); @@ -175,9 +180,9 @@ public class AssociationOverride2_0Tests extends JavaResourceModel2_0TestCase { public void testSetNameNull() throws Exception { ICompilationUnit cu = this.createTestAssociationOverrideOnField(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - AssociationOverrideAnnotation associationOverride = (AssociationOverrideAnnotation) attributeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDE); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); + AssociationOverride2_0Annotation associationOverride = this.associationOverrideAt(0, resourceField); assertEquals(ASSOCIATION_OVERRIDE_NAME, associationOverride.getName()); @@ -191,44 +196,44 @@ public class AssociationOverride2_0Tests extends JavaResourceModel2_0TestCase { public void testJoinColumns() throws Exception { ICompilationUnit cu = this.createTestAssociationOverrideOnField(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - AssociationOverrideAnnotation associationOverride = (AssociationOverrideAnnotation) attributeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDE); + AssociationOverride2_0Annotation associationOverride = this.associationOverrideAt(0, resourceField); - assertEquals(0, associationOverride.joinColumnsSize()); + assertEquals(0, associationOverride.getJoinColumnsSize()); } public void testJoinColumns2() throws Exception { ICompilationUnit cu = this.createTestAssociationOverrideOnField(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - AssociationOverrideAnnotation associationOverride = (AssociationOverrideAnnotation) attributeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDE); + AssociationOverride2_0Annotation associationOverride = this.associationOverrideAt(0, resourceField); associationOverride.addJoinColumn(0); associationOverride.addJoinColumn(1); - assertEquals(2, associationOverride.joinColumnsSize()); + assertEquals(2, associationOverride.getJoinColumnsSize()); } public void testJoinColumns3() throws Exception { ICompilationUnit cu = this.createTestAssociationOverrideWithJoinColumns(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - AssociationOverrideAnnotation associationOverride = (AssociationOverrideAnnotation) attributeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDE); + AssociationOverride2_0Annotation associationOverride = this.associationOverrideAt(0, resourceField); - assertEquals(2, associationOverride.joinColumnsSize()); + assertEquals(2, associationOverride.getJoinColumnsSize()); } public void testAddJoinColumn() throws Exception { ICompilationUnit cu = this.createTestAssociationOverrideOnField(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - AssociationOverrideAnnotation associationOverride = (AssociationOverrideAnnotation) attributeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDE); + AssociationOverride2_0Annotation associationOverride = this.associationOverrideAt(0, resourceField); associationOverride.addJoinColumn(0).setName("FOO"); associationOverride.addJoinColumn(1); @@ -243,13 +248,13 @@ public class AssociationOverride2_0Tests extends JavaResourceModel2_0TestCase { public void testRemoveJoinColumn() throws Exception { ICompilationUnit cu = this.createTestAssociationOverrideWithJoinColumns(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - AssociationOverrideAnnotation associationOverride = (AssociationOverrideAnnotation) attributeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDE); + AssociationOverride2_0Annotation associationOverride = this.associationOverrideAt(0, resourceField); associationOverride.addJoinColumn(0).setName("FOO"); - Iterator joinColumns = associationOverride.joinColumns(); + Iterator joinColumns = associationOverride.getJoinColumns().iterator(); assertEquals("FOO", joinColumns.next().getName()); assertEquals("BAR", joinColumns.next().getName()); assertNull(joinColumns.next().getName()); @@ -257,14 +262,14 @@ public class AssociationOverride2_0Tests extends JavaResourceModel2_0TestCase { assertSourceContains("@AssociationOverride(name = \"" + ASSOCIATION_OVERRIDE_NAME + "\", joinColumns = {@JoinColumn(name = \"FOO\"), @JoinColumn(name = \"BAR\"), @JoinColumn})", cu); associationOverride.removeJoinColumn(1); - joinColumns = associationOverride.joinColumns(); + joinColumns = associationOverride.getJoinColumns().iterator(); assertEquals("FOO", joinColumns.next().getName()); assertNull(joinColumns.next().getName()); assertEquals(false, joinColumns.hasNext()); assertSourceContains("@AssociationOverride(name = \"" + ASSOCIATION_OVERRIDE_NAME + "\", joinColumns = {@JoinColumn(name = \"FOO\"), @JoinColumn})", cu); associationOverride.removeJoinColumn(0); - joinColumns = associationOverride.joinColumns(); + joinColumns = associationOverride.getJoinColumns().iterator(); assertNull(joinColumns.next().getName()); assertEquals(false, joinColumns.hasNext()); assertSourceContains("@AssociationOverride(name = \"" + ASSOCIATION_OVERRIDE_NAME + "\", joinColumns = @JoinColumn)", cu); @@ -277,10 +282,10 @@ public class AssociationOverride2_0Tests extends JavaResourceModel2_0TestCase { public void testMoveJoinColumn() throws Exception { ICompilationUnit cu = this.createTestAssociationOverrideWithJoinColumns(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - AssociationOverrideAnnotation associationOverride = (AssociationOverrideAnnotation) attributeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDE); + AssociationOverride2_0Annotation associationOverride = this.associationOverrideAt(0, resourceField); JoinColumnAnnotation joinColumn = associationOverride.joinColumnAt(0); joinColumn.setReferencedColumnName("REF_NAME"); joinColumn.setUnique(Boolean.FALSE); @@ -297,16 +302,16 @@ public class AssociationOverride2_0Tests extends JavaResourceModel2_0TestCase { assertEquals("BAR", associationOverride.joinColumnAt(0).getName()); assertNull(associationOverride.joinColumnAt(1).getName()); assertEquals("FOO", associationOverride.joinColumnAt(2).getName()); - assertEquals(3, associationOverride.joinColumnsSize()); + assertEquals(3, associationOverride.getJoinColumnsSize()); assertSourceContains("@AssociationOverride(name = \"" + ASSOCIATION_OVERRIDE_NAME + "\", joinColumns = {@JoinColumn(name = \"BAR\", referencedColumnName = \"REF_NAME\", unique = false, nullable = false, insertable = false, updatable = false, columnDefinition = \"COLUMN_DEF\", table = \"TABLE\"), @JoinColumn, @JoinColumn(name = \"FOO\")})", cu); } public void testMoveJoinColumn2() throws Exception { ICompilationUnit cu = this.createTestAssociationOverrideWithJoinColumns(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - AssociationOverrideAnnotation associationOverride = (AssociationOverrideAnnotation) attributeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDE); + AssociationOverride2_0Annotation associationOverride = this.associationOverrideAt(0, resourceField); JoinColumnAnnotation joinColumn = associationOverride.joinColumnAt(0); joinColumn.setReferencedColumnName("REF_NAME"); @@ -324,20 +329,20 @@ public class AssociationOverride2_0Tests extends JavaResourceModel2_0TestCase { assertNull(associationOverride.joinColumnAt(0).getName()); assertEquals("FOO", associationOverride.joinColumnAt(1).getName()); assertEquals("BAR", associationOverride.joinColumnAt(2).getName()); - assertEquals(3, associationOverride.joinColumnsSize()); + assertEquals(3, associationOverride.getJoinColumnsSize()); assertSourceContains("@AssociationOverride(name = \"" + ASSOCIATION_OVERRIDE_NAME + "\", joinColumns = {@JoinColumn, @JoinColumn(name = \"FOO\"), @JoinColumn(name = \"BAR\", referencedColumnName = \"REF_NAME\", unique = false, nullable = false, insertable = false, updatable = false, columnDefinition = \"COLUMN_DEF\", table = \"TABLE\")})", cu); } public void testSetJoinColumnName() throws Exception { ICompilationUnit cu = this.createTestAssociationOverrideWithJoinColumns(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - AssociationOverrideAnnotation associationOverride = (AssociationOverrideAnnotation) attributeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDE); + AssociationOverride2_0Annotation associationOverride = this.associationOverrideAt(0, resourceField); - assertEquals(2, associationOverride.joinColumnsSize()); + assertEquals(2, associationOverride.getJoinColumnsSize()); - JoinColumnAnnotation joinColumn = associationOverride.joinColumns().next(); + JoinColumnAnnotation joinColumn = associationOverride.joinColumnAt(0); assertEquals("BAR", joinColumn.getName()); @@ -349,8 +354,8 @@ public class AssociationOverride2_0Tests extends JavaResourceModel2_0TestCase { public void testGetNullJoinTable() throws Exception { ICompilationUnit cu = this.createTestAssociationOverrideOnType(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - AssociationOverride2_0Annotation associationOverride = (AssociationOverride2_0Annotation) typeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDE); + JavaResourceType resourceType = buildJavaResourceType(cu); + AssociationOverride2_0Annotation associationOverride = this.associationOverrideAt(0, resourceType); JoinTableAnnotation joinTable = associationOverride.getJoinTable(); assertNotNull(associationOverride); assertNull(joinTable); @@ -358,16 +363,16 @@ public class AssociationOverride2_0Tests extends JavaResourceModel2_0TestCase { public void testJoinTableGetName() throws Exception { ICompilationUnit cu = this.createTestAssociationOverrideWithJoinTable(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - AssociationOverride2_0Annotation associationOverride = (AssociationOverride2_0Annotation) typeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDE); + JavaResourceType resourceType = buildJavaResourceType(cu); + AssociationOverride2_0Annotation associationOverride = this.associationOverrideAt(0, resourceType); JoinTableAnnotation joinTable = associationOverride.getJoinTable(); assertEquals(JOIN_TABLE_NAME, joinTable.getName()); } public void testJoinTableSetName() throws Exception { ICompilationUnit cu = this.createTestAssociationOverrideWithJoinTable(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - AssociationOverride2_0Annotation associationOverride = (AssociationOverride2_0Annotation) typeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDE); + JavaResourceType resourceType = buildJavaResourceType(cu); + AssociationOverride2_0Annotation associationOverride = this.associationOverrideAt(0, resourceType); JoinTableAnnotation joinTable = associationOverride.getJoinTable(); assertEquals(JOIN_TABLE_NAME, joinTable.getName()); @@ -382,8 +387,8 @@ public class AssociationOverride2_0Tests extends JavaResourceModel2_0TestCase { public void testAddJoinTable() throws Exception { ICompilationUnit cu = this.createTestAssociationOverrideOnType(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - AssociationOverride2_0Annotation associationOverride = (AssociationOverride2_0Annotation) typeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDE); + JavaResourceType resourceType = buildJavaResourceType(cu); + AssociationOverride2_0Annotation associationOverride = this.associationOverrideAt(0, resourceType); JoinTableAnnotation joinTable = associationOverride.getJoinTable(); assertNull(joinTable); @@ -395,17 +400,16 @@ public class AssociationOverride2_0Tests extends JavaResourceModel2_0TestCase { public void testRemoveJoinTable() throws Exception { ICompilationUnit cu = this.createTestAssociationOverrideOnType(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - AssociationOverride2_0Annotation associationOverride = (AssociationOverride2_0Annotation) typeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDE); + JavaResourceType resourceType = buildJavaResourceType(cu); + AssociationOverride2_0Annotation associationOverride = this.associationOverrideAt(0, resourceType); JoinTableAnnotation joinTable = associationOverride.getJoinTable(); assertNull(joinTable); } public void testJoinTableGetCatalog() throws Exception { ICompilationUnit cu = this.createTestAssociationOverrideJoinTableWithCatalog(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - - AssociationOverride2_0Annotation associationOverride = (AssociationOverride2_0Annotation) typeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDE); + JavaResourceType resourceType = buildJavaResourceType(cu); + AssociationOverride2_0Annotation associationOverride = this.associationOverrideAt(0, resourceType); JoinTableAnnotation table = associationOverride.getJoinTable(); assertNotNull(table); assertEquals(CATALOG_NAME, table.getCatalog()); @@ -413,9 +417,8 @@ public class AssociationOverride2_0Tests extends JavaResourceModel2_0TestCase { public void testJoinTableSetCatalog() throws Exception { ICompilationUnit cu = this.createTestAssociationOverrideWithJoinTable(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - - AssociationOverride2_0Annotation associationOverride = (AssociationOverride2_0Annotation) typeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDE); + JavaResourceType resourceType = buildJavaResourceType(cu); + AssociationOverride2_0Annotation associationOverride = this.associationOverrideAt(0, resourceType); JoinTableAnnotation table = associationOverride.getJoinTable(); assertNotNull(table); assertNull(table.getCatalog()); @@ -428,9 +431,8 @@ public class AssociationOverride2_0Tests extends JavaResourceModel2_0TestCase { public void testJoinTableSetCatalogNull() throws Exception { ICompilationUnit cu = this.createTestAssociationOverrideJoinTableWithCatalog(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - - AssociationOverride2_0Annotation associationOverride = (AssociationOverride2_0Annotation) typeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDE); + JavaResourceType resourceType = buildJavaResourceType(cu); + AssociationOverride2_0Annotation associationOverride = this.associationOverrideAt(0, resourceType); JoinTableAnnotation table = associationOverride.getJoinTable(); assertEquals(CATALOG_NAME, table.getCatalog()); @@ -442,9 +444,8 @@ public class AssociationOverride2_0Tests extends JavaResourceModel2_0TestCase { public void testJoinTableGetSchema() throws Exception { ICompilationUnit cu = this.createTestAssociationOverrideJoinTableWithSchema(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - - AssociationOverride2_0Annotation associationOverride = (AssociationOverride2_0Annotation) typeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDE); + JavaResourceType resourceType = buildJavaResourceType(cu); + AssociationOverride2_0Annotation associationOverride = this.associationOverrideAt(0, resourceType); JoinTableAnnotation table = associationOverride.getJoinTable(); assertNotNull(table); assertEquals(SCHEMA_NAME, table.getSchema()); @@ -452,9 +453,8 @@ public class AssociationOverride2_0Tests extends JavaResourceModel2_0TestCase { public void testJoinTableSetSchema() throws Exception { ICompilationUnit cu = this.createTestAssociationOverrideWithJoinTable(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - - AssociationOverride2_0Annotation associationOverride = (AssociationOverride2_0Annotation) typeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDE); + JavaResourceType resourceType = buildJavaResourceType(cu); + AssociationOverride2_0Annotation associationOverride = this.associationOverrideAt(0, resourceType); JoinTableAnnotation table = associationOverride.getJoinTable(); assertNotNull(table); assertNull(table.getSchema()); @@ -467,9 +467,8 @@ public class AssociationOverride2_0Tests extends JavaResourceModel2_0TestCase { public void testJoinTableSetSchemaNull() throws Exception { ICompilationUnit cu = this.createTestAssociationOverrideJoinTableWithSchema(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - - AssociationOverride2_0Annotation associationOverride = (AssociationOverride2_0Annotation) typeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDE); + JavaResourceType resourceType = buildJavaResourceType(cu); + AssociationOverride2_0Annotation associationOverride = this.associationOverrideAt(0, resourceType); JoinTableAnnotation table = associationOverride.getJoinTable(); assertEquals(SCHEMA_NAME, table.getSchema()); @@ -481,88 +480,82 @@ public class AssociationOverride2_0Tests extends JavaResourceModel2_0TestCase { public void testJoinTableUniqueConstraints() throws Exception { ICompilationUnit cu = this.createTestAssociationOverrideWithJoinTable(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - - AssociationOverride2_0Annotation associationOverride = (AssociationOverride2_0Annotation) typeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDE); + JavaResourceType resourceType = buildJavaResourceType(cu); + AssociationOverride2_0Annotation associationOverride = this.associationOverrideAt(0, resourceType); JoinTableAnnotation table = associationOverride.getJoinTable(); - assertEquals(0, table.uniqueConstraintsSize()); + assertEquals(0, table.getUniqueConstraintsSize()); } public void testJoinTableUniqueConstraints2() throws Exception { ICompilationUnit cu = this.createTestAssociationOverrideWithJoinTable(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - - AssociationOverride2_0Annotation associationOverride = (AssociationOverride2_0Annotation) typeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDE); + JavaResourceType resourceType = buildJavaResourceType(cu); + AssociationOverride2_0Annotation associationOverride = this.associationOverrideAt(0, resourceType); JoinTableAnnotation table = associationOverride.getJoinTable(); table.addUniqueConstraint(0); table.addUniqueConstraint(1); - assertEquals(2, table.uniqueConstraintsSize()); + assertEquals(2, table.getUniqueConstraintsSize()); } public void testJoinTableUniqueConstraints3() throws Exception { ICompilationUnit cu = this.createTestAssociationOverrideJoinTableWithUniqueConstraints(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - - AssociationOverride2_0Annotation associationOverride = (AssociationOverride2_0Annotation) typeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDE); + JavaResourceType resourceType = buildJavaResourceType(cu); + AssociationOverride2_0Annotation associationOverride = this.associationOverrideAt(0, resourceType); JoinTableAnnotation table = associationOverride.getJoinTable(); - assertEquals(3, table.uniqueConstraintsSize()); + assertEquals(3, table.getUniqueConstraintsSize()); } public void testJoinTableAddUniqueConstraint() throws Exception { ICompilationUnit cu = this.createTestAssociationOverrideWithJoinTable(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - - AssociationOverride2_0Annotation associationOverride = (AssociationOverride2_0Annotation) typeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDE); + JavaResourceType resourceType = buildJavaResourceType(cu); + AssociationOverride2_0Annotation associationOverride = this.associationOverrideAt(0, resourceType); JoinTableAnnotation table = associationOverride.getJoinTable(); table.addUniqueConstraint(0).addColumnName("FOO"); table.addUniqueConstraint(1); table.addUniqueConstraint(0).addColumnName("BAR"); - assertEquals("BAR", table.uniqueConstraintAt(0).columnNames().next()); - assertEquals("FOO", table.uniqueConstraintAt(1).columnNames().next()); - assertEquals(0, table.uniqueConstraintAt(2).columnNamesSize()); + assertEquals("BAR", table.uniqueConstraintAt(0).columnNameAt(0)); + assertEquals("FOO", table.uniqueConstraintAt(1).columnNameAt(0)); + assertEquals(0, table.uniqueConstraintAt(2).getColumnNamesSize()); assertSourceContains("@AssociationOverride(name = \"" + ASSOCIATION_OVERRIDE_NAME + "\", joinTable = @JoinTable(name = \"MY_JOIN_TABLE\", uniqueConstraints = {@UniqueConstraint(columnNames = \"BAR\"),@UniqueConstraint(columnNames = \"FOO\"), @UniqueConstraint}))", cu); } public void testJoinTableRemoveUniqueConstraint() throws Exception { ICompilationUnit cu = this.createTestAssociationOverrideJoinTableWithUniqueConstraints(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - - AssociationOverride2_0Annotation associationOverride = (AssociationOverride2_0Annotation) typeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDE); + JavaResourceType resourceType = buildJavaResourceType(cu); + AssociationOverride2_0Annotation associationOverride = this.associationOverrideAt(0, resourceType); JoinTableAnnotation table = associationOverride.getJoinTable(); - assertEquals("BAR", table.uniqueConstraintAt(0).columnNames().next()); - assertEquals("FOO", table.uniqueConstraintAt(1).columnNames().next()); - assertEquals("BAZ", table.uniqueConstraintAt(2).columnNames().next()); - assertEquals(3, table.uniqueConstraintsSize()); + assertEquals("BAR", table.uniqueConstraintAt(0).columnNameAt(0)); + assertEquals("FOO", table.uniqueConstraintAt(1).columnNameAt(0)); + assertEquals("BAZ", table.uniqueConstraintAt(2).columnNameAt(0)); + assertEquals(3, table.getUniqueConstraintsSize()); table.removeUniqueConstraint(1); - assertEquals("BAR", table.uniqueConstraintAt(0).columnNames().next()); - assertEquals("BAZ", table.uniqueConstraintAt(1).columnNames().next()); - assertEquals(2, table.uniqueConstraintsSize()); + assertEquals("BAR", table.uniqueConstraintAt(0).columnNameAt(0)); + assertEquals("BAZ", table.uniqueConstraintAt(1).columnNameAt(0)); + assertEquals(2, table.getUniqueConstraintsSize()); assertSourceContains("@AssociationOverride(name = \"" + ASSOCIATION_OVERRIDE_NAME + "\", joinTable = @JoinTable(uniqueConstraints = {@UniqueConstraint(columnNames = {\"BAR\"}), @UniqueConstraint(columnNames = {\"BAZ\"})}))", cu); table.removeUniqueConstraint(0); - assertEquals("BAZ", table.uniqueConstraintAt(0).columnNames().next()); - assertEquals(1, table.uniqueConstraintsSize()); + assertEquals("BAZ", table.uniqueConstraintAt(0).columnNameAt(0)); + assertEquals(1, table.getUniqueConstraintsSize()); assertSourceContains("@AssociationOverride(name = \"" + ASSOCIATION_OVERRIDE_NAME + "\", joinTable = @JoinTable(uniqueConstraints = @UniqueConstraint(columnNames = {\"BAZ\"})))", cu); table.removeUniqueConstraint(0); - assertEquals(0, table.uniqueConstraintsSize()); + assertEquals(0, table.getUniqueConstraintsSize()); assertSourceDoesNotContain("@JoinTable(", cu); } public void testJoinTableMoveUniqueConstraint() throws Exception { ICompilationUnit cu = this.createTestAssociationOverrideJoinTableWithUniqueConstraints(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - - AssociationOverride2_0Annotation associationOverride = (AssociationOverride2_0Annotation) typeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDE); + JavaResourceType resourceType = buildJavaResourceType(cu); + AssociationOverride2_0Annotation associationOverride = this.associationOverrideAt(0, resourceType); JoinTableAnnotation table = associationOverride.getJoinTable(); assertSourceContains("@AssociationOverride(name = \"" + ASSOCIATION_OVERRIDE_NAME + "\", joinTable = @JoinTable(uniqueConstraints = {@UniqueConstraint(columnNames = {\"BAR\"}), @UniqueConstraint(columnNames = {\"FOO\"}), @UniqueConstraint(columnNames = {\"BAZ\"})}))", cu); @@ -572,9 +565,8 @@ public class AssociationOverride2_0Tests extends JavaResourceModel2_0TestCase { public void testJoinTableMoveUniqueConstraint2() throws Exception { ICompilationUnit cu = this.createTestAssociationOverrideJoinTableWithUniqueConstraints(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - - AssociationOverride2_0Annotation associationOverride = (AssociationOverride2_0Annotation) typeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDE); + JavaResourceType resourceType = buildJavaResourceType(cu); + AssociationOverride2_0Annotation associationOverride = this.associationOverrideAt(0, resourceType); JoinTableAnnotation table = associationOverride.getJoinTable(); assertSourceContains("@AssociationOverride(name = \"" + ASSOCIATION_OVERRIDE_NAME + "\", joinTable = @JoinTable(uniqueConstraints = {@UniqueConstraint(columnNames = {\"BAR\"}), @UniqueConstraint(columnNames = {\"FOO\"}), @UniqueConstraint(columnNames = {\"BAZ\"})}))", cu); @@ -584,43 +576,39 @@ public class AssociationOverride2_0Tests extends JavaResourceModel2_0TestCase { public void testJoinTableJoinColumns() throws Exception { ICompilationUnit cu = this.createTestAssociationOverrideWithJoinTable(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - - AssociationOverride2_0Annotation associationOverride = (AssociationOverride2_0Annotation) typeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDE); + JavaResourceType resourceType = buildJavaResourceType(cu); + AssociationOverride2_0Annotation associationOverride = this.associationOverrideAt(0, resourceType); JoinTableAnnotation table = associationOverride.getJoinTable(); - assertEquals(0, table.joinColumnsSize()); + assertEquals(0, table.getJoinColumnsSize()); } public void testJoinTableJoinColumns2() throws Exception { ICompilationUnit cu = this.createTestAssociationOverrideWithJoinTable(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - - AssociationOverride2_0Annotation associationOverride = (AssociationOverride2_0Annotation) typeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDE); + JavaResourceType resourceType = buildJavaResourceType(cu); + AssociationOverride2_0Annotation associationOverride = this.associationOverrideAt(0, resourceType); JoinTableAnnotation table = associationOverride.getJoinTable(); table.addJoinColumn(0); table.addJoinColumn(1); - assertEquals(2, table.joinColumnsSize()); + assertEquals(2, table.getJoinColumnsSize()); } public void testJoinTableJoinColumns3() throws Exception { ICompilationUnit cu = this.createTestAssociationOverrideJoinTableWithJoinColumns(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - - AssociationOverride2_0Annotation associationOverride = (AssociationOverride2_0Annotation) typeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDE); + JavaResourceType resourceType = buildJavaResourceType(cu); + AssociationOverride2_0Annotation associationOverride = this.associationOverrideAt(0, resourceType); JoinTableAnnotation table = associationOverride.getJoinTable(); - assertEquals(2, table.joinColumnsSize()); + assertEquals(2, table.getJoinColumnsSize()); } public void testJoinTableAddJoinColumn() throws Exception { ICompilationUnit cu = this.createTestAssociationOverrideWithJoinTable(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - - AssociationOverride2_0Annotation associationOverride = (AssociationOverride2_0Annotation) typeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDE); + JavaResourceType resourceType = buildJavaResourceType(cu); + AssociationOverride2_0Annotation associationOverride = this.associationOverrideAt(0, resourceType); JoinTableAnnotation table = associationOverride.getJoinTable(); table.addJoinColumn(0).setName("FOO"); @@ -635,39 +623,37 @@ public class AssociationOverride2_0Tests extends JavaResourceModel2_0TestCase { public void testJoinTableRemoveJoinColumn() throws Exception { ICompilationUnit cu = this.createTestAssociationOverrideJoinTableWithJoinColumns(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - - AssociationOverride2_0Annotation associationOverride = (AssociationOverride2_0Annotation) typeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDE); + JavaResourceType resourceType = buildJavaResourceType(cu); + AssociationOverride2_0Annotation associationOverride = this.associationOverrideAt(0, resourceType); JoinTableAnnotation table = associationOverride.getJoinTable(); table.addJoinColumn(0).setName("FOO"); assertEquals("FOO", table.joinColumnAt(0).getName()); assertEquals("BAR", table.joinColumnAt(1).getName()); assertNull(table.joinColumnAt(2).getName()); - assertEquals(3, table.joinColumnsSize()); + assertEquals(3, table.getJoinColumnsSize()); table.removeJoinColumn(1); assertEquals("FOO", table.joinColumnAt(0).getName()); assertNull(table.joinColumnAt(1).getName()); - assertEquals(2, table.joinColumnsSize()); + assertEquals(2, table.getJoinColumnsSize()); assertSourceContains("@AssociationOverride(name = \"" + ASSOCIATION_OVERRIDE_NAME + "\", joinTable = @JoinTable(joinColumns = {@JoinColumn(name = \"FOO\"), @JoinColumn}))", cu); table.removeJoinColumn(0); assertNull(table.joinColumnAt(0).getName()); - assertEquals(1, table.joinColumnsSize()); + assertEquals(1, table.getJoinColumnsSize()); assertSourceContains("@AssociationOverride(name = \"" + ASSOCIATION_OVERRIDE_NAME + "\", joinTable = @JoinTable(joinColumns = @JoinColumn))", cu); table.removeJoinColumn(0); - assertEquals(0, table.joinColumnsSize()); + assertEquals(0, table.getJoinColumnsSize()); assertSourceDoesNotContain("@JoinTable(", cu); } public void testJoinTableMoveJoinColumn() throws Exception { ICompilationUnit cu = this.createTestAssociationOverrideJoinTableWithJoinColumns(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - - AssociationOverride2_0Annotation associationOverride = (AssociationOverride2_0Annotation) typeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDE); + JavaResourceType resourceType = buildJavaResourceType(cu); + AssociationOverride2_0Annotation associationOverride = this.associationOverrideAt(0, resourceType); JoinTableAnnotation table = associationOverride.getJoinTable(); JoinColumnAnnotation joinColumn = table.joinColumnAt(0); joinColumn.setReferencedColumnName("REF_NAME"); @@ -685,15 +671,14 @@ public class AssociationOverride2_0Tests extends JavaResourceModel2_0TestCase { assertEquals("BAR", table.joinColumnAt(0).getName()); assertNull(table.joinColumnAt(1).getName()); assertEquals("FOO", table.joinColumnAt(2).getName()); - assertEquals(3, table.joinColumnsSize()); + assertEquals(3, table.getJoinColumnsSize()); assertSourceContains("@AssociationOverride(name = \"" + ASSOCIATION_OVERRIDE_NAME + "\", joinTable = @JoinTable(joinColumns = {@JoinColumn(name = \"BAR\", referencedColumnName = \"REF_NAME\", unique = false, nullable = false, insertable = false, updatable = false, columnDefinition = \"COLUMN_DEF\", table = \"TABLE\"), @JoinColumn, @JoinColumn(name = \"FOO\")}))", cu); } public void testJoinTableMoveJoinColumn2() throws Exception { ICompilationUnit cu = this.createTestAssociationOverrideJoinTableWithJoinColumns(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - - AssociationOverride2_0Annotation associationOverride = (AssociationOverride2_0Annotation) typeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDE); + JavaResourceType resourceType = buildJavaResourceType(cu); + AssociationOverride2_0Annotation associationOverride = this.associationOverrideAt(0, resourceType); JoinTableAnnotation table = associationOverride.getJoinTable(); JoinColumnAnnotation joinColumn = table.joinColumnAt(0); @@ -714,20 +699,19 @@ public class AssociationOverride2_0Tests extends JavaResourceModel2_0TestCase { assertNull(table.joinColumnAt(0).getName()); assertEquals("FOO", table.joinColumnAt(1).getName()); assertEquals("BAR", table.joinColumnAt(2).getName()); - assertEquals(3, table.joinColumnsSize()); + assertEquals(3, table.getJoinColumnsSize()); assertSourceContains("@AssociationOverride(name = \"" + ASSOCIATION_OVERRIDE_NAME + "\", joinTable = @JoinTable(joinColumns = {@JoinColumn, @JoinColumn(name = \"FOO\"), @JoinColumn(name = \"BAR\", referencedColumnName = \"REF_NAME\", unique = false, nullable = false, insertable = false, updatable = false, columnDefinition = \"COLUMN_DEF\", table = \"TABLE\")}))", cu); } public void testJoinTableSetJoinColumnName() throws Exception { ICompilationUnit cu = this.createTestAssociationOverrideJoinTableWithJoinColumns(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - - AssociationOverride2_0Annotation associationOverride = (AssociationOverride2_0Annotation) typeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDE); + JavaResourceType resourceType = buildJavaResourceType(cu); + AssociationOverride2_0Annotation associationOverride = this.associationOverrideAt(0, resourceType); JoinTableAnnotation table = associationOverride.getJoinTable(); - assertEquals(2, table.joinColumnsSize()); + assertEquals(2, table.getJoinColumnsSize()); - JoinColumnAnnotation joinColumn = table.joinColumns().next(); + JoinColumnAnnotation joinColumn = table.joinColumnAt(0); assertEquals("BAR", joinColumn.getName()); @@ -739,43 +723,39 @@ public class AssociationOverride2_0Tests extends JavaResourceModel2_0TestCase { public void testJoinTableInverseJoinColumns() throws Exception { ICompilationUnit cu = this.createTestAssociationOverrideWithJoinTable(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - - AssociationOverride2_0Annotation associationOverride = (AssociationOverride2_0Annotation) typeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDE); + JavaResourceType resourceType = buildJavaResourceType(cu); + AssociationOverride2_0Annotation associationOverride = this.associationOverrideAt(0, resourceType); JoinTableAnnotation table = associationOverride.getJoinTable(); - assertEquals(0, table.inverseJoinColumnsSize()); + assertEquals(0, table.getInverseJoinColumnsSize()); } public void testInverseJoinColumns2() throws Exception { ICompilationUnit cu = this.createTestAssociationOverrideWithJoinTable(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - - AssociationOverride2_0Annotation associationOverride = (AssociationOverride2_0Annotation) typeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDE); + JavaResourceType resourceType = buildJavaResourceType(cu); + AssociationOverride2_0Annotation associationOverride = this.associationOverrideAt(0, resourceType); JoinTableAnnotation table = associationOverride.getJoinTable(); table.addInverseJoinColumn(0); table.addInverseJoinColumn(1); - assertEquals(2, table.inverseJoinColumnsSize()); + assertEquals(2, table.getInverseJoinColumnsSize()); } public void testJoinTableInverseJoinColumns3() throws Exception { ICompilationUnit cu = this.createTestAssociationOverrideJoinTableWithInverseJoinColumns(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - - AssociationOverride2_0Annotation associationOverride = (AssociationOverride2_0Annotation) typeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDE); + JavaResourceType resourceType = buildJavaResourceType(cu); + AssociationOverride2_0Annotation associationOverride = this.associationOverrideAt(0, resourceType); JoinTableAnnotation table = associationOverride.getJoinTable(); - assertEquals(2, table.inverseJoinColumnsSize()); + assertEquals(2, table.getInverseJoinColumnsSize()); } public void testAddInverseJoinColumn() throws Exception { ICompilationUnit cu = this.createTestAssociationOverrideWithJoinTable(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - - AssociationOverride2_0Annotation associationOverride = (AssociationOverride2_0Annotation) typeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDE); + JavaResourceType resourceType = buildJavaResourceType(cu); + AssociationOverride2_0Annotation associationOverride = this.associationOverrideAt(0, resourceType); JoinTableAnnotation table = associationOverride.getJoinTable(); table.addInverseJoinColumn(0).setName("FOO"); @@ -790,13 +770,12 @@ public class AssociationOverride2_0Tests extends JavaResourceModel2_0TestCase { public void testJoinTableRemoveInverseJoinColumn() throws Exception { ICompilationUnit cu = this.createTestAssociationOverrideJoinTableWithInverseJoinColumns(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - - AssociationOverride2_0Annotation associationOverride = (AssociationOverride2_0Annotation) typeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDE); + JavaResourceType resourceType = buildJavaResourceType(cu); + AssociationOverride2_0Annotation associationOverride = this.associationOverrideAt(0, resourceType); JoinTableAnnotation table = associationOverride.getJoinTable(); table.addInverseJoinColumn(2).setName("FOO"); - Iterator inverseJoinColumns = table.inverseJoinColumns(); + Iterator inverseJoinColumns = table.getInverseJoinColumns().iterator(); assertEquals("BAR", inverseJoinColumns.next().getName()); assertNull(inverseJoinColumns.next().getName()); assertEquals("FOO", inverseJoinColumns.next().getName()); @@ -804,14 +783,14 @@ public class AssociationOverride2_0Tests extends JavaResourceModel2_0TestCase { table.removeInverseJoinColumn(1); assertSourceContains("@AssociationOverride(name = \"" + ASSOCIATION_OVERRIDE_NAME + "\", joinTable = @JoinTable(inverseJoinColumns = {@JoinColumn(name = \"BAR\"), @JoinColumn(name = \"FOO\")}))", cu); - inverseJoinColumns = table.inverseJoinColumns(); + inverseJoinColumns = table.getInverseJoinColumns().iterator(); assertEquals("BAR", inverseJoinColumns.next().getName()); assertEquals("FOO", inverseJoinColumns.next().getName()); assertFalse(inverseJoinColumns.hasNext()); table.removeInverseJoinColumn(0); assertSourceContains("@AssociationOverride(name = \"" + ASSOCIATION_OVERRIDE_NAME + "\", joinTable = @JoinTable(inverseJoinColumns = @JoinColumn(name = \"FOO\")))", cu); - inverseJoinColumns = table.inverseJoinColumns(); + inverseJoinColumns = table.getInverseJoinColumns().iterator(); assertEquals("FOO", inverseJoinColumns.next().getName()); assertFalse(inverseJoinColumns.hasNext()); @@ -821,19 +800,18 @@ public class AssociationOverride2_0Tests extends JavaResourceModel2_0TestCase { public void testJoinTableMoveInverseJoinColumn() throws Exception { ICompilationUnit cu = this.createTestAssociationOverrideJoinTableWithInverseJoinColumns(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - - AssociationOverride2_0Annotation associationOverride = (AssociationOverride2_0Annotation) typeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDE); + JavaResourceType resourceType = buildJavaResourceType(cu); + AssociationOverride2_0Annotation associationOverride = this.associationOverrideAt(0, resourceType); JoinTableAnnotation table = associationOverride.getJoinTable(); table.addInverseJoinColumn(0).setName("FOO"); - Iterator inverseJoinColumns = table.inverseJoinColumns(); + Iterator inverseJoinColumns = table.getInverseJoinColumns().iterator(); assertEquals("FOO", inverseJoinColumns.next().getName()); assertEquals("BAR", inverseJoinColumns.next().getName()); assertNull(inverseJoinColumns.next().getName()); table.moveInverseJoinColumn(2, 0); - inverseJoinColumns = table.inverseJoinColumns(); + inverseJoinColumns = table.getInverseJoinColumns().iterator(); assertEquals("BAR", inverseJoinColumns.next().getName()); assertNull(inverseJoinColumns.next().getName()); assertEquals("FOO", inverseJoinColumns.next().getName()); @@ -843,19 +821,18 @@ public class AssociationOverride2_0Tests extends JavaResourceModel2_0TestCase { public void testJoinTableMoveInverseJoinColumn2() throws Exception { ICompilationUnit cu = this.createTestAssociationOverrideJoinTableWithInverseJoinColumns(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - - AssociationOverride2_0Annotation associationOverride = (AssociationOverride2_0Annotation) typeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDE); + JavaResourceType resourceType = buildJavaResourceType(cu); + AssociationOverride2_0Annotation associationOverride = this.associationOverrideAt(0, resourceType); JoinTableAnnotation table = associationOverride.getJoinTable(); table.addInverseJoinColumn(1).setName("FOO"); - Iterator inverseJoinColumns = table.inverseJoinColumns(); + Iterator inverseJoinColumns = table.getInverseJoinColumns().iterator(); assertEquals("BAR", inverseJoinColumns.next().getName()); assertEquals("FOO", inverseJoinColumns.next().getName()); assertNull(inverseJoinColumns.next().getName()); table.moveInverseJoinColumn(0, 2); - inverseJoinColumns = table.inverseJoinColumns(); + inverseJoinColumns = table.getInverseJoinColumns().iterator(); assertNull(inverseJoinColumns.next().getName()); assertEquals("BAR", inverseJoinColumns.next().getName()); assertEquals("FOO", inverseJoinColumns.next().getName()); @@ -865,14 +842,13 @@ public class AssociationOverride2_0Tests extends JavaResourceModel2_0TestCase { public void testJoinTableSetInverseJoinColumnName() throws Exception { ICompilationUnit cu = this.createTestAssociationOverrideJoinTableWithInverseJoinColumns(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - - AssociationOverride2_0Annotation associationOverride = (AssociationOverride2_0Annotation) typeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDE); + JavaResourceType resourceType = buildJavaResourceType(cu); + AssociationOverride2_0Annotation associationOverride = this.associationOverrideAt(0, resourceType); JoinTableAnnotation table = associationOverride.getJoinTable(); - assertEquals(2, table.inverseJoinColumnsSize()); + assertEquals(2, table.getInverseJoinColumnsSize()); - JoinColumnAnnotation joinColumn = table.inverseJoinColumns().next(); + JoinColumnAnnotation joinColumn = table.inverseJoinColumnAt(0); assertEquals("BAR", joinColumn.getName()); diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/resource/java/AssociationOverrides2_0Tests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/resource/java/AssociationOverrides2_0Tests.java index a7e5d7e2a3..4e0600d561 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/resource/java/AssociationOverrides2_0Tests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/resource/java/AssociationOverrides2_0Tests.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,17 +12,17 @@ package org.eclipse.jpt.jpa.core.tests.internal.jpa2.resource.java; import java.util.Iterator; import org.eclipse.jdt.core.ICompilationUnit; +import org.eclipse.jpt.common.core.resource.java.JavaResourceField; +import org.eclipse.jpt.common.core.resource.java.JavaResourceMember; +import org.eclipse.jpt.common.core.resource.java.JavaResourceType; +import org.eclipse.jpt.common.core.resource.java.NestableAnnotation; import org.eclipse.jpt.common.utility.internal.CollectionTools; import org.eclipse.jpt.common.utility.internal.iterators.ArrayIterator; import org.eclipse.jpt.jpa.core.jpa2.resource.java.AssociationOverride2_0Annotation; 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.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.JoinTableAnnotation; -import org.eclipse.jpt.jpa.core.resource.java.NestableAnnotation; @SuppressWarnings("nls") public class AssociationOverrides2_0Tests extends JavaResourceModel2_0TestCase { @@ -168,13 +168,16 @@ public class AssociationOverrides2_0Tests extends JavaResourceModel2_0TestCase { }); } + + private AssociationOverride2_0Annotation associationOverrideAt(int index, JavaResourceMember resourceMember) { + return (AssociationOverride2_0Annotation) resourceMember.getAnnotation(index, JPA.ASSOCIATION_OVERRIDE); + } public void testGetName() throws Exception { ICompilationUnit cu = this.createTestAssociationOverrideOnField(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - AssociationOverridesAnnotation associationOverrides = (AssociationOverridesAnnotation) attributeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDES); - AssociationOverrideAnnotation associationOverride = associationOverrides.getNestedAnnotations().iterator().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); + AssociationOverride2_0Annotation associationOverride = this.associationOverrideAt(0, resourceField); assertNotNull(associationOverride); assertEquals(ASSOCIATION_OVERRIDE_NAME, associationOverride.getName()); @@ -182,10 +185,9 @@ public class AssociationOverrides2_0Tests extends JavaResourceModel2_0TestCase { public void testSetName() throws Exception { ICompilationUnit cu = this.createTestAssociationOverrideOnField(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - AssociationOverridesAnnotation associationOverrides = (AssociationOverridesAnnotation) attributeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDES); - AssociationOverrideAnnotation associationOverride = associationOverrides.getNestedAnnotations().iterator().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); + AssociationOverride2_0Annotation associationOverride = this.associationOverrideAt(0, resourceField); assertNotNull(associationOverride); assertEquals(ASSOCIATION_OVERRIDE_NAME, associationOverride.getName()); @@ -197,10 +199,9 @@ public class AssociationOverrides2_0Tests extends JavaResourceModel2_0TestCase { public void testSetNameNull() throws Exception { ICompilationUnit cu = this.createTestAssociationOverrideOnField(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - AssociationOverridesAnnotation associationOverrides = (AssociationOverridesAnnotation) attributeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDES); - AssociationOverrideAnnotation associationOverride = associationOverrides.getNestedAnnotations().iterator().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); + AssociationOverride2_0Annotation associationOverride = this.associationOverrideAt(0, resourceField); assertEquals(ASSOCIATION_OVERRIDE_NAME, associationOverride.getName()); associationOverride.setName(null); @@ -213,97 +214,120 @@ public class AssociationOverrides2_0Tests extends JavaResourceModel2_0TestCase { public void testAddAssociationOverrideCopyExisting() throws Exception { ICompilationUnit cu = createTestAssociationOverride(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); + JavaResourceType resourceType = buildJavaResourceType(cu); + String expected1 = "@AssociationOverrides({"; + String expected2 = "@AssociationOverride(name = \"FOO\", joinColumns = @JoinColumn(name = \"FOO\", columnDefinition = \"BAR\", referencedColumnName = \"BAZ\")),"; + String expected3 = "@AssociationOverride(name = \"BAR\") })"; - AssociationOverrideAnnotation associationOverride = (AssociationOverrideAnnotation) typeResource.addAnnotation(1, JPA.ASSOCIATION_OVERRIDE, JPA.ASSOCIATION_OVERRIDES); + AssociationOverrideAnnotation associationOverride = (AssociationOverrideAnnotation) resourceType.addAnnotation(1, JPA.ASSOCIATION_OVERRIDE); associationOverride.setName("BAR"); - assertSourceContains("@AssociationOverrides({@AssociationOverride(name = \"FOO\", joinColumns = @JoinColumn(name = \"FOO\", columnDefinition = \"BAR\", referencedColumnName = \"BAZ\")),@AssociationOverride(name = \"BAR\")})", cu); + assertSourceContains(expected1, cu); + assertSourceContains(expected2, cu); + assertSourceContains(expected3, cu); - assertNull(typeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDE)); - assertNotNull(typeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDES)); - assertEquals(2, CollectionTools.size(typeResource.annotations(JPA.ASSOCIATION_OVERRIDE, JPA.ASSOCIATION_OVERRIDES))); + assertNull(resourceType.getAnnotation(JPA.ASSOCIATION_OVERRIDE)); + assertNotNull(resourceType.getAnnotation(JPA.ASSOCIATION_OVERRIDES)); + assertNotNull(resourceType.getAnnotation(0, JPA.ASSOCIATION_OVERRIDE)); + assertEquals(2, resourceType.getAnnotationsSize(JPA.ASSOCIATION_OVERRIDE)); } public void testAddAssociationOverrideToBeginningOfList() throws Exception { ICompilationUnit cu = createTestAssociationOverride(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); + JavaResourceType resourceType = buildJavaResourceType(cu); + String expected1 = "@AssociationOverrides({"; + String expected2 = "@AssociationOverride(name = \"FOO\", joinColumns = @JoinColumn(name = \"FOO\", columnDefinition = \"BAR\", referencedColumnName = \"BAZ\")),"; + String expected3 = "@AssociationOverride(name = \"BAR\") })"; - AssociationOverrideAnnotation associationOverride = (AssociationOverrideAnnotation) typeResource.addAnnotation(1, JPA.ASSOCIATION_OVERRIDE, JPA.ASSOCIATION_OVERRIDES); + AssociationOverrideAnnotation associationOverride = (AssociationOverrideAnnotation) resourceType.addAnnotation(1, JPA.ASSOCIATION_OVERRIDE); associationOverride.setName("BAR"); - assertSourceContains("@AssociationOverrides({@AssociationOverride(name = \"FOO\", joinColumns = @JoinColumn(name = \"FOO\", columnDefinition = \"BAR\", referencedColumnName = \"BAZ\")),@AssociationOverride(name = \"BAR\")})", cu); + assertSourceContains(expected1, cu); + assertSourceContains(expected2, cu); + assertSourceContains(expected3, cu); - associationOverride = (AssociationOverrideAnnotation) typeResource.addAnnotation(0, JPA.ASSOCIATION_OVERRIDE, JPA.ASSOCIATION_OVERRIDES); + expected2 = "@AssociationOverride(name = \"BAZ\"),"; + expected3 = "@AssociationOverride(name = \"FOO\", joinColumns = @JoinColumn(name = \"FOO\", columnDefinition = \"BAR\", referencedColumnName = \"BAZ\")), @AssociationOverride(name = \"BAR\") })"; + associationOverride = (AssociationOverrideAnnotation) resourceType.addAnnotation(0, JPA.ASSOCIATION_OVERRIDE); associationOverride.setName("BAZ"); - assertSourceContains("@AssociationOverrides({@AssociationOverride(name = \"BAZ\"),@AssociationOverride(name = \"FOO\", joinColumns = @JoinColumn(name = \"FOO\", columnDefinition = \"BAR\", referencedColumnName = \"BAZ\")), @AssociationOverride(name = \"BAR\")})", cu); - Iterator associationOverrides = typeResource.annotations(JPA.ASSOCIATION_OVERRIDE, JPA.ASSOCIATION_OVERRIDES); + Iterator associationOverrides = resourceType.getAnnotations(JPA.ASSOCIATION_OVERRIDE).iterator(); assertEquals("BAZ", ((AssociationOverrideAnnotation) associationOverrides.next()).getName()); assertEquals("FOO", ((AssociationOverrideAnnotation) associationOverrides.next()).getName()); assertEquals("BAR", ((AssociationOverrideAnnotation) associationOverrides.next()).getName()); + assertSourceContains(expected1, cu); + assertSourceContains(expected2, cu); + assertSourceContains(expected3, cu); - assertNull(typeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDE)); - assertNotNull(typeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDES)); - assertEquals(3, CollectionTools.size(typeResource.annotations(JPA.ASSOCIATION_OVERRIDE, JPA.ASSOCIATION_OVERRIDES))); + assertNull(resourceType.getAnnotation(JPA.ASSOCIATION_OVERRIDE)); + assertNotNull(resourceType.getAnnotation(JPA.ASSOCIATION_OVERRIDES)); + assertNotNull(resourceType.getAnnotation(0, JPA.ASSOCIATION_OVERRIDE)); + assertEquals(3, resourceType.getAnnotationsSize(JPA.ASSOCIATION_OVERRIDE)); } public void testRemoveAssociationOverrideCopyExisting() throws Exception { ICompilationUnit cu = createTestAssociationOverride(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); + JavaResourceType resourceType = buildJavaResourceType(cu); + String expected1 = "@AssociationOverrides({"; + String expected2 = "@AssociationOverride(name = \"FOO\", joinColumns = @JoinColumn(name = \"FOO\", columnDefinition = \"BAR\", referencedColumnName = \"BAZ\")),"; + String expected3 = "@AssociationOverride(name = \"BAR\") })"; - AssociationOverrideAnnotation associationOverride = (AssociationOverrideAnnotation) typeResource.addAnnotation(1, JPA.ASSOCIATION_OVERRIDE, JPA.ASSOCIATION_OVERRIDES); + AssociationOverrideAnnotation associationOverride = (AssociationOverrideAnnotation) resourceType.addAnnotation(1, JPA.ASSOCIATION_OVERRIDE); associationOverride.setName("BAR"); - assertSourceContains("@AssociationOverrides({@AssociationOverride(name = \"FOO\", joinColumns = @JoinColumn(name = \"FOO\", columnDefinition = \"BAR\", referencedColumnName = \"BAZ\")),@AssociationOverride(name = \"BAR\")})", cu); + assertSourceContains(expected1, cu); + assertSourceContains(expected2, cu); + assertSourceContains(expected3, cu); - typeResource.removeAnnotation(1, JPA.ASSOCIATION_OVERRIDE, JPA.ASSOCIATION_OVERRIDES); - assertSourceContains("@AssociationOverride(name = \"FOO\", joinColumns = @JoinColumn(name = \"FOO\", columnDefinition = \"BAR\", referencedColumnName = \"BAZ\"))", cu); + expected2 = "@AssociationOverride(name = \"FOO\", joinColumns = @JoinColumn(name = \"FOO\", columnDefinition = \"BAR\", referencedColumnName = \"BAZ\"))"; + resourceType.removeAnnotation(1, JPA.ASSOCIATION_OVERRIDE); + assertSourceContains(expected2, cu); + assertSourceDoesNotContain("@AssociationOverrides", cu); } public void testJoinColumns() throws Exception { ICompilationUnit cu = this.createTestAssociationOverrideOnField(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - AssociationOverrideAnnotation associationOverride = (AssociationOverrideAnnotation) attributeResource.annotations(JPA.ASSOCIATION_OVERRIDE, JPA.ASSOCIATION_OVERRIDES).next(); + AssociationOverride2_0Annotation associationOverride = associationOverrideAt(0, resourceField); - assertEquals(0, associationOverride.joinColumnsSize()); + assertEquals(0, associationOverride.getJoinColumnsSize()); } public void testJoinColumns2() throws Exception { ICompilationUnit cu = this.createTestAssociationOverrideOnField(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - AssociationOverrideAnnotation associationOverride = (AssociationOverrideAnnotation) attributeResource.annotations(JPA.ASSOCIATION_OVERRIDE, JPA.ASSOCIATION_OVERRIDES).next(); + AssociationOverride2_0Annotation associationOverride = associationOverrideAt(0, resourceField); associationOverride.addJoinColumn(0); associationOverride.addJoinColumn(1); - assertEquals(2, associationOverride.joinColumnsSize()); + assertEquals(2, associationOverride.getJoinColumnsSize()); } public void testJoinColumns3() throws Exception { ICompilationUnit cu = this.createTestAssociationOverrideWithJoinColumns(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - AssociationOverrideAnnotation associationOverride = (AssociationOverrideAnnotation) attributeResource.annotations(JPA.ASSOCIATION_OVERRIDE, JPA.ASSOCIATION_OVERRIDES).next(); + AssociationOverride2_0Annotation associationOverride = associationOverrideAt(0, resourceField); - assertEquals(2, associationOverride.joinColumnsSize()); + assertEquals(2, associationOverride.getJoinColumnsSize()); } public void testAddJoinColumn() throws Exception { ICompilationUnit cu = this.createTestAssociationOverrideOnField(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - AssociationOverrideAnnotation associationOverride = (AssociationOverrideAnnotation) attributeResource.annotations(JPA.ASSOCIATION_OVERRIDE, JPA.ASSOCIATION_OVERRIDES).next(); + AssociationOverride2_0Annotation associationOverride = associationOverrideAt(0, resourceField); associationOverride.addJoinColumn(0).setName("FOO"); associationOverride.addJoinColumn(1); associationOverride.addJoinColumn(0).setName("BAR"); - Iterator joinColumns = associationOverride.joinColumns(); + Iterator joinColumns = associationOverride.getJoinColumns().iterator(); assertEquals("BAR", joinColumns.next().getName()); assertEquals("FOO", joinColumns.next().getName()); assertNull(joinColumns.next().getName()); @@ -313,13 +337,13 @@ public class AssociationOverrides2_0Tests extends JavaResourceModel2_0TestCase { public void testRemoveJoinColumn() throws Exception { ICompilationUnit cu = this.createTestAssociationOverrideWithJoinColumns(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - AssociationOverrideAnnotation associationOverride = (AssociationOverrideAnnotation) attributeResource.annotations(JPA.ASSOCIATION_OVERRIDE, JPA.ASSOCIATION_OVERRIDES).next(); + AssociationOverride2_0Annotation associationOverride = associationOverrideAt(0, resourceField); associationOverride.addJoinColumn(0).setName("FOO"); - Iterator joinColumns = associationOverride.joinColumns(); + Iterator joinColumns = associationOverride.getJoinColumns().iterator(); assertEquals("FOO", joinColumns.next().getName()); assertEquals("BAR", joinColumns.next().getName()); assertNull(joinColumns.next().getName()); @@ -327,14 +351,14 @@ public class AssociationOverrides2_0Tests extends JavaResourceModel2_0TestCase { assertSourceContains("@AssociationOverrides(@AssociationOverride(name = \"" + ASSOCIATION_OVERRIDE_NAME + "\", joinColumns = {@JoinColumn(name = \"FOO\"), @JoinColumn(name = \"BAR\"), @JoinColumn}))", cu); associationOverride.removeJoinColumn(1); - joinColumns = associationOverride.joinColumns(); + joinColumns = associationOverride.getJoinColumns().iterator(); assertEquals("FOO", joinColumns.next().getName()); assertNull(joinColumns.next().getName()); assertEquals(false, joinColumns.hasNext()); assertSourceContains("@AssociationOverrides(@AssociationOverride(name = \"" + ASSOCIATION_OVERRIDE_NAME + "\", joinColumns = {@JoinColumn(name = \"FOO\"), @JoinColumn}))", cu); associationOverride.removeJoinColumn(0); - joinColumns = associationOverride.joinColumns(); + joinColumns = associationOverride.getJoinColumns().iterator(); assertNull(joinColumns.next().getName()); assertEquals(false, joinColumns.hasNext()); assertSourceContains("@AssociationOverrides(@AssociationOverride(name = \"" + ASSOCIATION_OVERRIDE_NAME + "\", joinColumns = @JoinColumn))", cu); @@ -347,10 +371,10 @@ public class AssociationOverrides2_0Tests extends JavaResourceModel2_0TestCase { public void testMoveJoinColumn() throws Exception { ICompilationUnit cu = this.createTestAssociationOverrideWithJoinColumns(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - AssociationOverrideAnnotation associationOverride = (AssociationOverrideAnnotation) attributeResource.annotations(JPA.ASSOCIATION_OVERRIDE, JPA.ASSOCIATION_OVERRIDES).next(); + AssociationOverride2_0Annotation associationOverride = associationOverrideAt(0, resourceField); JoinColumnAnnotation joinColumn = associationOverride.joinColumnAt(0); joinColumn.setReferencedColumnName("REF_NAME"); joinColumn.setUnique(Boolean.FALSE); @@ -366,16 +390,16 @@ public class AssociationOverrides2_0Tests extends JavaResourceModel2_0TestCase { assertEquals("BAR", associationOverride.joinColumnAt(0).getName()); assertNull(associationOverride.joinColumnAt(1).getName()); assertEquals("FOO", associationOverride.joinColumnAt(2).getName()); - assertEquals(3, associationOverride.joinColumnsSize()); + assertEquals(3, associationOverride.getJoinColumnsSize()); assertSourceContains("@AssociationOverrides(@AssociationOverride(name = \"" + ASSOCIATION_OVERRIDE_NAME + "\", joinColumns = {@JoinColumn(name = \"BAR\", referencedColumnName = \"REF_NAME\", unique = false, nullable = false, insertable = false, updatable = false, columnDefinition = \"COLUMN_DEF\", table = \"TABLE\"), @JoinColumn, @JoinColumn(name = \"FOO\")}))", cu); } public void testMoveJoinColumn2() throws Exception { ICompilationUnit cu = this.createTestAssociationOverrideWithJoinColumns(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - AssociationOverrideAnnotation associationOverride = (AssociationOverrideAnnotation) attributeResource.annotations(JPA.ASSOCIATION_OVERRIDE, JPA.ASSOCIATION_OVERRIDES).next(); + AssociationOverride2_0Annotation associationOverride = associationOverrideAt(0, resourceField); JoinColumnAnnotation joinColumn = associationOverride.joinColumnAt(0); joinColumn.setReferencedColumnName("REF_NAME"); @@ -392,20 +416,20 @@ public class AssociationOverrides2_0Tests extends JavaResourceModel2_0TestCase { assertNull(associationOverride.joinColumnAt(0).getName()); assertEquals("FOO", associationOverride.joinColumnAt(1).getName()); assertEquals("BAR", associationOverride.joinColumnAt(2).getName()); - assertEquals(3, associationOverride.joinColumnsSize()); + assertEquals(3, associationOverride.getJoinColumnsSize()); assertSourceContains("@AssociationOverrides(@AssociationOverride(name = \"" + ASSOCIATION_OVERRIDE_NAME + "\", joinColumns = {@JoinColumn, @JoinColumn(name = \"FOO\"), @JoinColumn(name = \"BAR\", referencedColumnName = \"REF_NAME\", unique = false, nullable = false, insertable = false, updatable = false, columnDefinition = \"COLUMN_DEF\", table = \"TABLE\")}))", cu); } public void testSetJoinColumnName() throws Exception { ICompilationUnit cu = this.createTestAssociationOverrideWithJoinColumns(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - AssociationOverrideAnnotation associationOverride = (AssociationOverrideAnnotation) attributeResource.annotations(JPA.ASSOCIATION_OVERRIDE, JPA.ASSOCIATION_OVERRIDES).next(); + AssociationOverride2_0Annotation associationOverride = associationOverrideAt(0, resourceField); - assertEquals(2, associationOverride.joinColumnsSize()); + assertEquals(2, associationOverride.getJoinColumnsSize()); - JoinColumnAnnotation joinColumn = associationOverride.joinColumns().next(); + JoinColumnAnnotation joinColumn = associationOverride.joinColumnAt(0); assertEquals("BAR", joinColumn.getName()); @@ -417,9 +441,8 @@ public class AssociationOverrides2_0Tests extends JavaResourceModel2_0TestCase { public void testGetNullJoinTable() throws Exception { ICompilationUnit cu = this.createTestAssociationOverrideOnType(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - AssociationOverridesAnnotation associationOverrides = (AssociationOverridesAnnotation) typeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDES); - AssociationOverride2_0Annotation associationOverride = (AssociationOverride2_0Annotation) associationOverrides.getNestedAnnotations().iterator().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + AssociationOverride2_0Annotation associationOverride = associationOverrideAt(0, resourceType); JoinTableAnnotation joinTable = associationOverride.getJoinTable(); assertNotNull(associationOverride); assertNull(joinTable); @@ -427,18 +450,16 @@ public class AssociationOverrides2_0Tests extends JavaResourceModel2_0TestCase { public void testJoinTableGetName() throws Exception { ICompilationUnit cu = this.createTestAssociationOverrideWithJoinTable(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - AssociationOverridesAnnotation associationOverrides = (AssociationOverridesAnnotation) typeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDES); - AssociationOverride2_0Annotation associationOverride = (AssociationOverride2_0Annotation) associationOverrides.getNestedAnnotations().iterator().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + AssociationOverride2_0Annotation associationOverride = associationOverrideAt(0, resourceType); JoinTableAnnotation joinTable = associationOverride.getJoinTable(); assertEquals(JOIN_TABLE_NAME, joinTable.getName()); } public void testJoinTableSetName() throws Exception { ICompilationUnit cu = this.createTestAssociationOverrideWithJoinTable(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - AssociationOverridesAnnotation associationOverrides = (AssociationOverridesAnnotation) typeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDES); - AssociationOverride2_0Annotation associationOverride = (AssociationOverride2_0Annotation) associationOverrides.getNestedAnnotations().iterator().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + AssociationOverride2_0Annotation associationOverride = associationOverrideAt(0, resourceType); JoinTableAnnotation joinTable = associationOverride.getJoinTable(); assertEquals(JOIN_TABLE_NAME, joinTable.getName()); @@ -453,9 +474,8 @@ public class AssociationOverrides2_0Tests extends JavaResourceModel2_0TestCase { public void testAddJoinTable() throws Exception { ICompilationUnit cu = this.createTestAssociationOverrideOnType(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - AssociationOverridesAnnotation associationOverrides = (AssociationOverridesAnnotation) typeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDES); - AssociationOverride2_0Annotation associationOverride = (AssociationOverride2_0Annotation) associationOverrides.getNestedAnnotations().iterator().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + AssociationOverride2_0Annotation associationOverride = associationOverrideAt(0, resourceType); JoinTableAnnotation joinTable = associationOverride.getJoinTable(); assertNull(joinTable); @@ -467,19 +487,16 @@ public class AssociationOverrides2_0Tests extends JavaResourceModel2_0TestCase { public void testRemoveJoinTable() throws Exception { ICompilationUnit cu = this.createTestAssociationOverrideOnType(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - AssociationOverridesAnnotation associationOverrides = (AssociationOverridesAnnotation) typeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDES); - AssociationOverride2_0Annotation associationOverride = (AssociationOverride2_0Annotation) associationOverrides.getNestedAnnotations().iterator().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + AssociationOverride2_0Annotation associationOverride = associationOverrideAt(0, resourceType); JoinTableAnnotation joinTable = associationOverride.getJoinTable(); assertNull(joinTable); } public void testJoinTableGetCatalog() throws Exception { ICompilationUnit cu = this.createTestAssociationOverrideJoinTableWithCatalog(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - - AssociationOverridesAnnotation associationOverrides = (AssociationOverridesAnnotation) typeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDES); - AssociationOverride2_0Annotation associationOverride = (AssociationOverride2_0Annotation) associationOverrides.getNestedAnnotations().iterator().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + AssociationOverride2_0Annotation associationOverride = associationOverrideAt(0, resourceType); JoinTableAnnotation table = associationOverride.getJoinTable(); assertNotNull(table); assertEquals(CATALOG_NAME, table.getCatalog()); @@ -487,10 +504,8 @@ public class AssociationOverrides2_0Tests extends JavaResourceModel2_0TestCase { public void testJoinTableSetCatalog() throws Exception { ICompilationUnit cu = this.createTestAssociationOverrideWithJoinTable(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - - AssociationOverridesAnnotation associationOverrides = (AssociationOverridesAnnotation) typeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDES); - AssociationOverride2_0Annotation associationOverride = (AssociationOverride2_0Annotation) associationOverrides.getNestedAnnotations().iterator().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + AssociationOverride2_0Annotation associationOverride = associationOverrideAt(0, resourceType); JoinTableAnnotation table = associationOverride.getJoinTable(); assertNotNull(table); assertNull(table.getCatalog()); @@ -503,10 +518,8 @@ public class AssociationOverrides2_0Tests extends JavaResourceModel2_0TestCase { public void testJoinTableSetCatalogNull() throws Exception { ICompilationUnit cu = this.createTestAssociationOverrideJoinTableWithCatalog(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - - AssociationOverridesAnnotation associationOverrides = (AssociationOverridesAnnotation) typeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDES); - AssociationOverride2_0Annotation associationOverride = (AssociationOverride2_0Annotation) associationOverrides.getNestedAnnotations().iterator().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + AssociationOverride2_0Annotation associationOverride = associationOverrideAt(0, resourceType); JoinTableAnnotation table = associationOverride.getJoinTable(); assertEquals(CATALOG_NAME, table.getCatalog()); @@ -518,10 +531,8 @@ public class AssociationOverrides2_0Tests extends JavaResourceModel2_0TestCase { public void testJoinTableGetSchema() throws Exception { ICompilationUnit cu = this.createTestAssociationOverrideJoinTableWithSchema(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - - AssociationOverridesAnnotation associationOverrides = (AssociationOverridesAnnotation) typeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDES); - AssociationOverride2_0Annotation associationOverride = (AssociationOverride2_0Annotation) associationOverrides.getNestedAnnotations().iterator().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + AssociationOverride2_0Annotation associationOverride = associationOverrideAt(0, resourceType); JoinTableAnnotation table = associationOverride.getJoinTable(); assertNotNull(table); assertEquals(SCHEMA_NAME, table.getSchema()); @@ -529,10 +540,8 @@ public class AssociationOverrides2_0Tests extends JavaResourceModel2_0TestCase { public void testJoinTableSetSchema() throws Exception { ICompilationUnit cu = this.createTestAssociationOverrideWithJoinTable(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - - AssociationOverridesAnnotation associationOverrides = (AssociationOverridesAnnotation) typeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDES); - AssociationOverride2_0Annotation associationOverride = (AssociationOverride2_0Annotation) associationOverrides.getNestedAnnotations().iterator().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + AssociationOverride2_0Annotation associationOverride = associationOverrideAt(0, resourceType); JoinTableAnnotation table = associationOverride.getJoinTable(); assertNotNull(table); assertNull(table.getSchema()); @@ -545,10 +554,8 @@ public class AssociationOverrides2_0Tests extends JavaResourceModel2_0TestCase { public void testJoinTableSetSchemaNull() throws Exception { ICompilationUnit cu = this.createTestAssociationOverrideJoinTableWithSchema(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - - AssociationOverridesAnnotation associationOverrides = (AssociationOverridesAnnotation) typeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDES); - AssociationOverride2_0Annotation associationOverride = (AssociationOverride2_0Annotation) associationOverrides.getNestedAnnotations().iterator().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + AssociationOverride2_0Annotation associationOverride = associationOverrideAt(0, resourceType); JoinTableAnnotation table = associationOverride.getJoinTable(); assertEquals(SCHEMA_NAME, table.getSchema()); @@ -560,94 +567,82 @@ public class AssociationOverrides2_0Tests extends JavaResourceModel2_0TestCase { public void testJoinTableUniqueConstraints() throws Exception { ICompilationUnit cu = this.createTestAssociationOverrideWithJoinTable(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - - AssociationOverridesAnnotation associationOverrides = (AssociationOverridesAnnotation) typeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDES); - AssociationOverride2_0Annotation associationOverride = (AssociationOverride2_0Annotation) associationOverrides.getNestedAnnotations().iterator().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + AssociationOverride2_0Annotation associationOverride = associationOverrideAt(0, resourceType); JoinTableAnnotation table = associationOverride.getJoinTable(); - assertEquals(0, table.uniqueConstraintsSize()); + assertEquals(0, table.getUniqueConstraintsSize()); } public void testJoinTableUniqueConstraints2() throws Exception { ICompilationUnit cu = this.createTestAssociationOverrideWithJoinTable(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - - AssociationOverridesAnnotation associationOverrides = (AssociationOverridesAnnotation) typeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDES); - AssociationOverride2_0Annotation associationOverride = (AssociationOverride2_0Annotation) associationOverrides.getNestedAnnotations().iterator().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + AssociationOverride2_0Annotation associationOverride = associationOverrideAt(0, resourceType); JoinTableAnnotation table = associationOverride.getJoinTable(); table.addUniqueConstraint(0); table.addUniqueConstraint(1); - assertEquals(2, table.uniqueConstraintsSize()); + assertEquals(2, table.getUniqueConstraintsSize()); } public void testJoinTableUniqueConstraints3() throws Exception { ICompilationUnit cu = this.createTestAssociationOverrideJoinTableWithUniqueConstraints(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - - AssociationOverridesAnnotation associationOverrides = (AssociationOverridesAnnotation) typeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDES); - AssociationOverride2_0Annotation associationOverride = (AssociationOverride2_0Annotation) associationOverrides.getNestedAnnotations().iterator().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + AssociationOverride2_0Annotation associationOverride = associationOverrideAt(0, resourceType); JoinTableAnnotation table = associationOverride.getJoinTable(); - assertEquals(3, table.uniqueConstraintsSize()); + assertEquals(3, table.getUniqueConstraintsSize()); } public void testJoinTableAddUniqueConstraint() throws Exception { ICompilationUnit cu = this.createTestAssociationOverrideWithJoinTable(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - - AssociationOverridesAnnotation associationOverrides = (AssociationOverridesAnnotation) typeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDES); - AssociationOverride2_0Annotation associationOverride = (AssociationOverride2_0Annotation) associationOverrides.getNestedAnnotations().iterator().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + AssociationOverride2_0Annotation associationOverride = associationOverrideAt(0, resourceType); JoinTableAnnotation table = associationOverride.getJoinTable(); table.addUniqueConstraint(0).addColumnName("FOO"); table.addUniqueConstraint(1); table.addUniqueConstraint(0).addColumnName("BAR"); - assertEquals("BAR", table.uniqueConstraintAt(0).columnNames().next()); - assertEquals("FOO", table.uniqueConstraintAt(1).columnNames().next()); - assertEquals(0, table.uniqueConstraintAt(2).columnNamesSize()); + assertEquals("BAR", table.uniqueConstraintAt(0).columnNameAt(0)); + assertEquals("FOO", table.uniqueConstraintAt(1).columnNameAt(0)); + assertEquals(0, table.uniqueConstraintAt(2).getColumnNamesSize()); assertSourceContains("@AssociationOverride(name = \"" + ASSOCIATION_OVERRIDE_NAME + "\", joinTable = @JoinTable(name = \"MY_JOIN_TABLE\", uniqueConstraints = {@UniqueConstraint(columnNames = \"BAR\"),@UniqueConstraint(columnNames = \"FOO\"), @UniqueConstraint}))", cu); } public void testJoinTableRemoveUniqueConstraint() throws Exception { ICompilationUnit cu = this.createTestAssociationOverrideJoinTableWithUniqueConstraints(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - - AssociationOverridesAnnotation associationOverrides = (AssociationOverridesAnnotation) typeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDES); - AssociationOverride2_0Annotation associationOverride = (AssociationOverride2_0Annotation) associationOverrides.getNestedAnnotations().iterator().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + AssociationOverride2_0Annotation associationOverride = associationOverrideAt(0, resourceType); JoinTableAnnotation table = associationOverride.getJoinTable(); - assertEquals("BAR", table.uniqueConstraintAt(0).columnNames().next()); - assertEquals("FOO", table.uniqueConstraintAt(1).columnNames().next()); - assertEquals("BAZ", table.uniqueConstraintAt(2).columnNames().next()); - assertEquals(3, table.uniqueConstraintsSize()); + assertEquals("BAR", table.uniqueConstraintAt(0).columnNameAt(0)); + assertEquals("FOO", table.uniqueConstraintAt(1).columnNameAt(0)); + assertEquals("BAZ", table.uniqueConstraintAt(2).columnNameAt(0)); + assertEquals(3, table.getUniqueConstraintsSize()); table.removeUniqueConstraint(1); - assertEquals("BAR", table.uniqueConstraintAt(0).columnNames().next()); - assertEquals("BAZ", table.uniqueConstraintAt(1).columnNames().next()); - assertEquals(2, table.uniqueConstraintsSize()); + assertEquals("BAR", table.uniqueConstraintAt(0).columnNameAt(0)); + assertEquals("BAZ", table.uniqueConstraintAt(1).columnNameAt(0)); + assertEquals(2, table.getUniqueConstraintsSize()); assertSourceContains("@AssociationOverride(name = \"" + ASSOCIATION_OVERRIDE_NAME + "\", joinTable = @JoinTable(uniqueConstraints = {@UniqueConstraint(columnNames = {\"BAR\"}), @UniqueConstraint(columnNames = {\"BAZ\"})}))", cu); table.removeUniqueConstraint(0); - assertEquals("BAZ", table.uniqueConstraintAt(0).columnNames().next()); - assertEquals(1, table.uniqueConstraintsSize()); + assertEquals("BAZ", table.uniqueConstraintAt(0).columnNameAt(0)); + assertEquals(1, table.getUniqueConstraintsSize()); assertSourceContains("@AssociationOverride(name = \"" + ASSOCIATION_OVERRIDE_NAME + "\", joinTable = @JoinTable(uniqueConstraints = @UniqueConstraint(columnNames = {\"BAZ\"})))", cu); table.removeUniqueConstraint(0); - assertEquals(0, table.uniqueConstraintsSize()); + assertEquals(0, table.getUniqueConstraintsSize()); assertSourceDoesNotContain("@JoinTable(", cu); } public void testJoinTableMoveUniqueConstraint() throws Exception { ICompilationUnit cu = this.createTestAssociationOverrideJoinTableWithUniqueConstraints(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - - AssociationOverridesAnnotation associationOverrides = (AssociationOverridesAnnotation) typeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDES); - AssociationOverride2_0Annotation associationOverride = (AssociationOverride2_0Annotation) associationOverrides.getNestedAnnotations().iterator().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + AssociationOverride2_0Annotation associationOverride = associationOverrideAt(0, resourceType); JoinTableAnnotation table = associationOverride.getJoinTable(); assertSourceContains("@AssociationOverride(name = \"" + ASSOCIATION_OVERRIDE_NAME + "\", joinTable = @JoinTable(uniqueConstraints = {@UniqueConstraint(columnNames = {\"BAR\"}), @UniqueConstraint(columnNames = {\"FOO\"}), @UniqueConstraint(columnNames = {\"BAZ\"})}))", cu); @@ -657,10 +652,8 @@ public class AssociationOverrides2_0Tests extends JavaResourceModel2_0TestCase { public void testJoinTableMoveUniqueConstraint2() throws Exception { ICompilationUnit cu = this.createTestAssociationOverrideJoinTableWithUniqueConstraints(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - - AssociationOverridesAnnotation associationOverrides = (AssociationOverridesAnnotation) typeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDES); - AssociationOverride2_0Annotation associationOverride = (AssociationOverride2_0Annotation) associationOverrides.getNestedAnnotations().iterator().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + AssociationOverride2_0Annotation associationOverride = associationOverrideAt(0, resourceType); JoinTableAnnotation table = associationOverride.getJoinTable(); assertSourceContains("@AssociationOverride(name = \"" + ASSOCIATION_OVERRIDE_NAME + "\", joinTable = @JoinTable(uniqueConstraints = {@UniqueConstraint(columnNames = {\"BAR\"}), @UniqueConstraint(columnNames = {\"FOO\"}), @UniqueConstraint(columnNames = {\"BAZ\"})}))", cu); @@ -670,47 +663,39 @@ public class AssociationOverrides2_0Tests extends JavaResourceModel2_0TestCase { public void testJoinTableJoinColumns() throws Exception { ICompilationUnit cu = this.createTestAssociationOverrideWithJoinTable(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - - AssociationOverridesAnnotation associationOverrides = (AssociationOverridesAnnotation) typeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDES); - AssociationOverride2_0Annotation associationOverride = (AssociationOverride2_0Annotation) associationOverrides.getNestedAnnotations().iterator().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + AssociationOverride2_0Annotation associationOverride = associationOverrideAt(0, resourceType); JoinTableAnnotation table = associationOverride.getJoinTable(); - assertEquals(0, table.joinColumnsSize()); + assertEquals(0, table.getJoinColumnsSize()); } public void testJoinTableJoinColumns2() throws Exception { ICompilationUnit cu = this.createTestAssociationOverrideWithJoinTable(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - - AssociationOverridesAnnotation associationOverrides = (AssociationOverridesAnnotation) typeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDES); - AssociationOverride2_0Annotation associationOverride = (AssociationOverride2_0Annotation) associationOverrides.getNestedAnnotations().iterator().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + AssociationOverride2_0Annotation associationOverride = associationOverrideAt(0, resourceType); JoinTableAnnotation table = associationOverride.getJoinTable(); table.addJoinColumn(0); table.addJoinColumn(1); - assertEquals(2, table.joinColumnsSize()); + assertEquals(2, table.getJoinColumnsSize()); } public void testJoinTableJoinColumns3() throws Exception { ICompilationUnit cu = this.createTestAssociationOverrideJoinTableWithJoinColumns(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - - AssociationOverridesAnnotation associationOverrides = (AssociationOverridesAnnotation) typeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDES); - AssociationOverride2_0Annotation associationOverride = (AssociationOverride2_0Annotation) associationOverrides.getNestedAnnotations().iterator().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + AssociationOverride2_0Annotation associationOverride = associationOverrideAt(0, resourceType); JoinTableAnnotation table = associationOverride.getJoinTable(); - assertEquals(2, table.joinColumnsSize()); + assertEquals(2, table.getJoinColumnsSize()); } public void testJoinTableAddJoinColumn() throws Exception { ICompilationUnit cu = this.createTestAssociationOverrideWithJoinTable(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - - AssociationOverridesAnnotation associationOverrides = (AssociationOverridesAnnotation) typeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDES); - AssociationOverride2_0Annotation associationOverride = (AssociationOverride2_0Annotation) associationOverrides.getNestedAnnotations().iterator().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + AssociationOverride2_0Annotation associationOverride = associationOverrideAt(0, resourceType); JoinTableAnnotation table = associationOverride.getJoinTable(); table.addJoinColumn(0).setName("FOO"); @@ -725,41 +710,37 @@ public class AssociationOverrides2_0Tests extends JavaResourceModel2_0TestCase { public void testJoinTableRemoveJoinColumn() throws Exception { ICompilationUnit cu = this.createTestAssociationOverrideJoinTableWithJoinColumns(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - - AssociationOverridesAnnotation associationOverrides = (AssociationOverridesAnnotation) typeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDES); - AssociationOverride2_0Annotation associationOverride = (AssociationOverride2_0Annotation) associationOverrides.getNestedAnnotations().iterator().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + AssociationOverride2_0Annotation associationOverride = associationOverrideAt(0, resourceType); JoinTableAnnotation table = associationOverride.getJoinTable(); table.addJoinColumn(0).setName("FOO"); assertEquals("FOO", table.joinColumnAt(0).getName()); assertEquals("BAR", table.joinColumnAt(1).getName()); assertNull(table.joinColumnAt(2).getName()); - assertEquals(3, table.joinColumnsSize()); + assertEquals(3, table.getJoinColumnsSize()); table.removeJoinColumn(1); assertEquals("FOO", table.joinColumnAt(0).getName()); assertNull(table.joinColumnAt(1).getName()); - assertEquals(2, table.joinColumnsSize()); + assertEquals(2, table.getJoinColumnsSize()); assertSourceContains("@AssociationOverride(name = \"" + ASSOCIATION_OVERRIDE_NAME + "\", joinTable = @JoinTable(joinColumns = {@JoinColumn(name = \"FOO\"), @JoinColumn}))", cu); table.removeJoinColumn(0); assertNull(table.joinColumnAt(0).getName()); - assertEquals(1, table.joinColumnsSize()); + assertEquals(1, table.getJoinColumnsSize()); assertSourceContains("@AssociationOverride(name = \"" + ASSOCIATION_OVERRIDE_NAME + "\", joinTable = @JoinTable(joinColumns = @JoinColumn))", cu); table.removeJoinColumn(0); - assertEquals(0, table.joinColumnsSize()); + assertEquals(0, table.getJoinColumnsSize()); assertSourceDoesNotContain("@JoinTable(", cu); } public void testJoinTableMoveJoinColumn() throws Exception { ICompilationUnit cu = this.createTestAssociationOverrideJoinTableWithJoinColumns(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - - AssociationOverridesAnnotation associationOverrides = (AssociationOverridesAnnotation) typeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDES); - AssociationOverride2_0Annotation associationOverride = (AssociationOverride2_0Annotation) associationOverrides.getNestedAnnotations().iterator().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + AssociationOverride2_0Annotation associationOverride = associationOverrideAt(0, resourceType); JoinTableAnnotation table = associationOverride.getJoinTable(); JoinColumnAnnotation joinColumn = table.joinColumnAt(0); joinColumn.setReferencedColumnName("REF_NAME"); @@ -777,16 +758,14 @@ public class AssociationOverrides2_0Tests extends JavaResourceModel2_0TestCase { assertEquals("BAR", table.joinColumnAt(0).getName()); assertNull(table.joinColumnAt(1).getName()); assertEquals("FOO", table.joinColumnAt(2).getName()); - assertEquals(3, table.joinColumnsSize()); + assertEquals(3, table.getJoinColumnsSize()); assertSourceContains("@AssociationOverride(name = \"" + ASSOCIATION_OVERRIDE_NAME + "\", joinTable = @JoinTable(joinColumns = {@JoinColumn(name = \"BAR\", referencedColumnName = \"REF_NAME\", unique = false, nullable = false, insertable = false, updatable = false, columnDefinition = \"COLUMN_DEF\", table = \"TABLE\"), @JoinColumn, @JoinColumn(name = \"FOO\")}))", cu); } public void testJoinTableMoveJoinColumn2() throws Exception { ICompilationUnit cu = this.createTestAssociationOverrideJoinTableWithJoinColumns(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - - AssociationOverridesAnnotation associationOverrides = (AssociationOverridesAnnotation) typeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDES); - AssociationOverride2_0Annotation associationOverride = (AssociationOverride2_0Annotation) associationOverrides.getNestedAnnotations().iterator().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + AssociationOverride2_0Annotation associationOverride = associationOverrideAt(0, resourceType); JoinTableAnnotation table = associationOverride.getJoinTable(); JoinColumnAnnotation joinColumn = table.joinColumnAt(0); @@ -807,21 +786,19 @@ public class AssociationOverrides2_0Tests extends JavaResourceModel2_0TestCase { assertNull(table.joinColumnAt(0).getName()); assertEquals("FOO", table.joinColumnAt(1).getName()); assertEquals("BAR", table.joinColumnAt(2).getName()); - assertEquals(3, table.joinColumnsSize()); + assertEquals(3, table.getJoinColumnsSize()); assertSourceContains("@AssociationOverride(name = \"" + ASSOCIATION_OVERRIDE_NAME + "\", joinTable = @JoinTable(joinColumns = {@JoinColumn, @JoinColumn(name = \"FOO\"), @JoinColumn(name = \"BAR\", referencedColumnName = \"REF_NAME\", unique = false, nullable = false, insertable = false, updatable = false, columnDefinition = \"COLUMN_DEF\", table = \"TABLE\")}))", cu); } public void testJoinTableSetJoinColumnName() throws Exception { ICompilationUnit cu = this.createTestAssociationOverrideJoinTableWithJoinColumns(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - - AssociationOverridesAnnotation associationOverrides = (AssociationOverridesAnnotation) typeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDES); - AssociationOverride2_0Annotation associationOverride = (AssociationOverride2_0Annotation) associationOverrides.getNestedAnnotations().iterator().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + AssociationOverride2_0Annotation associationOverride = associationOverrideAt(0, resourceType); JoinTableAnnotation table = associationOverride.getJoinTable(); - assertEquals(2, table.joinColumnsSize()); + assertEquals(2, table.getJoinColumnsSize()); - JoinColumnAnnotation joinColumn = table.joinColumns().next(); + JoinColumnAnnotation joinColumn = table.joinColumnAt(0); assertEquals("BAR", joinColumn.getName()); @@ -833,47 +810,39 @@ public class AssociationOverrides2_0Tests extends JavaResourceModel2_0TestCase { public void testJoinTableInverseJoinColumns() throws Exception { ICompilationUnit cu = this.createTestAssociationOverrideWithJoinTable(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - - AssociationOverridesAnnotation associationOverrides = (AssociationOverridesAnnotation) typeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDES); - AssociationOverride2_0Annotation associationOverride = (AssociationOverride2_0Annotation) associationOverrides.getNestedAnnotations().iterator().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + AssociationOverride2_0Annotation associationOverride = associationOverrideAt(0, resourceType); JoinTableAnnotation table = associationOverride.getJoinTable(); - assertEquals(0, table.inverseJoinColumnsSize()); + assertEquals(0, table.getInverseJoinColumnsSize()); } public void testInverseJoinColumns2() throws Exception { ICompilationUnit cu = this.createTestAssociationOverrideWithJoinTable(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - - AssociationOverridesAnnotation associationOverrides = (AssociationOverridesAnnotation) typeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDES); - AssociationOverride2_0Annotation associationOverride = (AssociationOverride2_0Annotation) associationOverrides.getNestedAnnotations().iterator().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + AssociationOverride2_0Annotation associationOverride = associationOverrideAt(0, resourceType); JoinTableAnnotation table = associationOverride.getJoinTable(); table.addInverseJoinColumn(0); table.addInverseJoinColumn(1); - assertEquals(2, table.inverseJoinColumnsSize()); + assertEquals(2, table.getInverseJoinColumnsSize()); } public void testJoinTableInverseJoinColumns3() throws Exception { ICompilationUnit cu = this.createTestAssociationOverrideJoinTableWithInverseJoinColumns(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - - AssociationOverridesAnnotation associationOverrides = (AssociationOverridesAnnotation) typeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDES); - AssociationOverride2_0Annotation associationOverride = (AssociationOverride2_0Annotation) associationOverrides.getNestedAnnotations().iterator().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + AssociationOverride2_0Annotation associationOverride = associationOverrideAt(0, resourceType); JoinTableAnnotation table = associationOverride.getJoinTable(); - assertEquals(2, table.inverseJoinColumnsSize()); + assertEquals(2, table.getInverseJoinColumnsSize()); } public void testAddInverseJoinColumn() throws Exception { ICompilationUnit cu = this.createTestAssociationOverrideWithJoinTable(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - - AssociationOverridesAnnotation associationOverrides = (AssociationOverridesAnnotation) typeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDES); - AssociationOverride2_0Annotation associationOverride = (AssociationOverride2_0Annotation) associationOverrides.getNestedAnnotations().iterator().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + AssociationOverride2_0Annotation associationOverride = associationOverrideAt(0, resourceType); JoinTableAnnotation table = associationOverride.getJoinTable(); table.addInverseJoinColumn(0).setName("FOO"); @@ -888,14 +857,12 @@ public class AssociationOverrides2_0Tests extends JavaResourceModel2_0TestCase { public void testJoinTableRemoveInverseJoinColumn() throws Exception { ICompilationUnit cu = this.createTestAssociationOverrideJoinTableWithInverseJoinColumns(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - - AssociationOverridesAnnotation associationOverrides = (AssociationOverridesAnnotation) typeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDES); - AssociationOverride2_0Annotation associationOverride = (AssociationOverride2_0Annotation) associationOverrides.getNestedAnnotations().iterator().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + AssociationOverride2_0Annotation associationOverride = associationOverrideAt(0, resourceType); JoinTableAnnotation table = associationOverride.getJoinTable(); table.addInverseJoinColumn(2).setName("FOO"); - Iterator inverseJoinColumns = table.inverseJoinColumns(); + Iterator inverseJoinColumns = table.getInverseJoinColumns().iterator(); assertEquals("BAR", inverseJoinColumns.next().getName()); assertNull(inverseJoinColumns.next().getName()); assertEquals("FOO", inverseJoinColumns.next().getName()); @@ -903,14 +870,14 @@ public class AssociationOverrides2_0Tests extends JavaResourceModel2_0TestCase { table.removeInverseJoinColumn(1); assertSourceContains("@AssociationOverride(name = \"" + ASSOCIATION_OVERRIDE_NAME + "\", joinTable = @JoinTable(inverseJoinColumns = {@JoinColumn(name = \"BAR\"), @JoinColumn(name = \"FOO\")}))", cu); - inverseJoinColumns = table.inverseJoinColumns(); + inverseJoinColumns = table.getInverseJoinColumns().iterator(); assertEquals("BAR", inverseJoinColumns.next().getName()); assertEquals("FOO", inverseJoinColumns.next().getName()); assertFalse(inverseJoinColumns.hasNext()); table.removeInverseJoinColumn(0); assertSourceContains("@AssociationOverride(name = \"" + ASSOCIATION_OVERRIDE_NAME + "\", joinTable = @JoinTable(inverseJoinColumns = @JoinColumn(name = \"FOO\")))", cu); - inverseJoinColumns = table.inverseJoinColumns(); + inverseJoinColumns = table.getInverseJoinColumns().iterator(); assertEquals("FOO", inverseJoinColumns.next().getName()); assertFalse(inverseJoinColumns.hasNext()); @@ -920,20 +887,18 @@ public class AssociationOverrides2_0Tests extends JavaResourceModel2_0TestCase { public void testJoinTableMoveInverseJoinColumn() throws Exception { ICompilationUnit cu = this.createTestAssociationOverrideJoinTableWithInverseJoinColumns(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - - AssociationOverridesAnnotation associationOverrides = (AssociationOverridesAnnotation) typeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDES); - AssociationOverride2_0Annotation associationOverride = (AssociationOverride2_0Annotation) associationOverrides.getNestedAnnotations().iterator().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + AssociationOverride2_0Annotation associationOverride = associationOverrideAt(0, resourceType); JoinTableAnnotation table = associationOverride.getJoinTable(); table.addInverseJoinColumn(0).setName("FOO"); - Iterator inverseJoinColumns = table.inverseJoinColumns(); + Iterator inverseJoinColumns = table.getInverseJoinColumns().iterator(); assertEquals("FOO", inverseJoinColumns.next().getName()); assertEquals("BAR", inverseJoinColumns.next().getName()); assertNull(inverseJoinColumns.next().getName()); table.moveInverseJoinColumn(2, 0); - inverseJoinColumns = table.inverseJoinColumns(); + inverseJoinColumns = table.getInverseJoinColumns().iterator(); assertEquals("BAR", inverseJoinColumns.next().getName()); assertNull(inverseJoinColumns.next().getName()); assertEquals("FOO", inverseJoinColumns.next().getName()); @@ -943,20 +908,18 @@ public class AssociationOverrides2_0Tests extends JavaResourceModel2_0TestCase { public void testJoinTableMoveInverseJoinColumn2() throws Exception { ICompilationUnit cu = this.createTestAssociationOverrideJoinTableWithInverseJoinColumns(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - - AssociationOverridesAnnotation associationOverrides = (AssociationOverridesAnnotation) typeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDES); - AssociationOverride2_0Annotation associationOverride = (AssociationOverride2_0Annotation) associationOverrides.getNestedAnnotations().iterator().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + AssociationOverride2_0Annotation associationOverride = associationOverrideAt(0, resourceType); JoinTableAnnotation table = associationOverride.getJoinTable(); table.addInverseJoinColumn(1).setName("FOO"); - Iterator inverseJoinColumns = table.inverseJoinColumns(); + Iterator inverseJoinColumns = table.getInverseJoinColumns().iterator(); assertEquals("BAR", inverseJoinColumns.next().getName()); assertEquals("FOO", inverseJoinColumns.next().getName()); assertNull(inverseJoinColumns.next().getName()); table.moveInverseJoinColumn(0, 2); - inverseJoinColumns = table.inverseJoinColumns(); + inverseJoinColumns = table.getInverseJoinColumns().iterator(); assertNull(inverseJoinColumns.next().getName()); assertEquals("BAR", inverseJoinColumns.next().getName()); assertEquals("FOO", inverseJoinColumns.next().getName()); @@ -966,15 +929,13 @@ public class AssociationOverrides2_0Tests extends JavaResourceModel2_0TestCase { public void testJoinTableSetInverseJoinColumnName() throws Exception { ICompilationUnit cu = this.createTestAssociationOverrideJoinTableWithInverseJoinColumns(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - - AssociationOverridesAnnotation associationOverrides = (AssociationOverridesAnnotation) typeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDES); - AssociationOverride2_0Annotation associationOverride = (AssociationOverride2_0Annotation) associationOverrides.getNestedAnnotations().iterator().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + AssociationOverride2_0Annotation associationOverride = associationOverrideAt(0, resourceType); JoinTableAnnotation table = associationOverride.getJoinTable(); - assertEquals(2, table.inverseJoinColumnsSize()); + assertEquals(2, table.getInverseJoinColumnsSize()); - JoinColumnAnnotation joinColumn = table.inverseJoinColumns().next(); + JoinColumnAnnotation joinColumn = table.inverseJoinColumnAt(0); assertEquals("BAR", joinColumn.getName()); diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/resource/java/Cacheable2_0AnnotationTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/resource/java/Cacheable2_0AnnotationTests.java index 23fe7cbe70..018be5caf0 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/resource/java/Cacheable2_0AnnotationTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/resource/java/Cacheable2_0AnnotationTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009 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. @@ -11,10 +11,10 @@ package org.eclipse.jpt.jpa.core.tests.internal.jpa2.resource.java; import java.util.Iterator; import org.eclipse.jdt.core.ICompilationUnit; +import org.eclipse.jpt.common.core.resource.java.JavaResourceType; import org.eclipse.jpt.common.utility.internal.iterators.ArrayIterator; 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.JavaResourcePersistentType; @SuppressWarnings("nls") public class Cacheable2_0AnnotationTests extends JavaResourceModel2_0TestCase { @@ -53,30 +53,30 @@ public class Cacheable2_0AnnotationTests extends JavaResourceModel2_0TestCase { public void testCacheableAnnotation() throws Exception { ICompilationUnit cu = this.createTestCacheable(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); + JavaResourceType resourceType = buildJavaResourceType(cu); - assertNotNull(typeResource.getAnnotation(JPA2_0.CACHEABLE)); + assertNotNull(resourceType.getAnnotation(JPA2_0.CACHEABLE)); - typeResource.removeAnnotation(JPA2_0.CACHEABLE); - assertNull(typeResource.getAnnotation(JPA2_0.CACHEABLE)); + resourceType.removeAnnotation(JPA2_0.CACHEABLE); + assertNull(resourceType.getAnnotation(JPA2_0.CACHEABLE)); - typeResource.addAnnotation(JPA2_0.CACHEABLE); - assertNotNull(typeResource.getAnnotation(JPA2_0.CACHEABLE)); + resourceType.addAnnotation(JPA2_0.CACHEABLE); + assertNotNull(resourceType.getAnnotation(JPA2_0.CACHEABLE)); } public void testGetValue() throws Exception { ICompilationUnit cu = this.createTestCacheableWithValue(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); + JavaResourceType resourceType = buildJavaResourceType(cu); - Cacheable2_0Annotation cacheableAnnotation = (Cacheable2_0Annotation) typeResource.getAnnotation(JPA2_0.CACHEABLE); + Cacheable2_0Annotation cacheableAnnotation = (Cacheable2_0Annotation) resourceType.getAnnotation(JPA2_0.CACHEABLE); assertEquals(Boolean.TRUE, cacheableAnnotation.getValue()); } public void testSetValue() throws Exception { ICompilationUnit cu = this.createTestCacheableWithValue(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); + JavaResourceType resourceType = buildJavaResourceType(cu); - Cacheable2_0Annotation cacheableAnnotation = (Cacheable2_0Annotation) typeResource.getAnnotation(JPA2_0.CACHEABLE); + Cacheable2_0Annotation cacheableAnnotation = (Cacheable2_0Annotation) resourceType.getAnnotation(JPA2_0.CACHEABLE); assertEquals(Boolean.TRUE, cacheableAnnotation.getValue()); cacheableAnnotation.setValue(Boolean.FALSE); @@ -91,9 +91,9 @@ public class Cacheable2_0AnnotationTests extends JavaResourceModel2_0TestCase { public void testSetValueNull() throws Exception { ICompilationUnit cu = this.createTestCacheableWithValue(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - - Cacheable2_0Annotation cacheableAnnotation = (Cacheable2_0Annotation) typeResource.getAnnotation(JPA2_0.CACHEABLE); + JavaResourceType resourceType = buildJavaResourceType(cu); + + Cacheable2_0Annotation cacheableAnnotation = (Cacheable2_0Annotation) resourceType.getAnnotation(JPA2_0.CACHEABLE); assertEquals(Boolean.TRUE, cacheableAnnotation.getValue()); cacheableAnnotation.setValue(null); diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/resource/java/CollectionTable2_0AnnotationTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/resource/java/CollectionTable2_0AnnotationTests.java index f226dfc74a..69cdd9cedb 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/resource/java/CollectionTable2_0AnnotationTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/resource/java/CollectionTable2_0AnnotationTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009 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. @@ -11,12 +11,13 @@ package org.eclipse.jpt.jpa.core.tests.internal.jpa2.resource.java; import java.util.Iterator; import org.eclipse.jdt.core.ICompilationUnit; +import org.eclipse.jpt.common.core.resource.java.JavaResourceField; +import org.eclipse.jpt.common.core.resource.java.JavaResourceType; +import org.eclipse.jpt.common.utility.internal.CollectionTools; import org.eclipse.jpt.common.utility.internal.iterators.ArrayIterator; import org.eclipse.jpt.jpa.core.jpa2.resource.java.CollectionTable2_0Annotation; import org.eclipse.jpt.jpa.core.jpa2.resource.java.JPA2_0; 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; @SuppressWarnings("nls") @@ -111,20 +112,20 @@ public class CollectionTable2_0AnnotationTests extends JavaResourceModel2_0TestC public void testGetName() throws Exception { ICompilationUnit cu = this.createTestCollectionTableWithName(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - CollectionTable2_0Annotation table = (CollectionTable2_0Annotation) attributeResource.getAnnotation(JPA2_0.COLLECTION_TABLE); + CollectionTable2_0Annotation table = (CollectionTable2_0Annotation) resourceField.getAnnotation(JPA2_0.COLLECTION_TABLE); assertNotNull(table); assertEquals(TABLE_NAME, table.getName()); } public void testGetNull() throws Exception { ICompilationUnit cu = this.createTestCollectionTable(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - CollectionTable2_0Annotation table = (CollectionTable2_0Annotation) attributeResource.getAnnotation(JPA2_0.COLLECTION_TABLE); + CollectionTable2_0Annotation table = (CollectionTable2_0Annotation) resourceField.getAnnotation(JPA2_0.COLLECTION_TABLE); assertNotNull(table); assertNull(table.getName()); assertNull(table.getCatalog()); @@ -133,10 +134,10 @@ public class CollectionTable2_0AnnotationTests extends JavaResourceModel2_0TestC public void testSetName() throws Exception { ICompilationUnit cu = this.createTestCollectionTable(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - CollectionTable2_0Annotation table = (CollectionTable2_0Annotation) attributeResource.getAnnotation(JPA2_0.COLLECTION_TABLE); + CollectionTable2_0Annotation table = (CollectionTable2_0Annotation) resourceField.getAnnotation(JPA2_0.COLLECTION_TABLE); assertNotNull(table); assertNull(table.getName()); @@ -148,10 +149,10 @@ public class CollectionTable2_0AnnotationTests extends JavaResourceModel2_0TestC public void testSetNameNull() throws Exception { ICompilationUnit cu = this.createTestCollectionTableWithName(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - CollectionTable2_0Annotation table = (CollectionTable2_0Annotation) attributeResource.getAnnotation(JPA2_0.COLLECTION_TABLE); + CollectionTable2_0Annotation table = (CollectionTable2_0Annotation) resourceField.getAnnotation(JPA2_0.COLLECTION_TABLE); assertEquals(TABLE_NAME, table.getName()); table.setName(null); @@ -162,20 +163,20 @@ public class CollectionTable2_0AnnotationTests extends JavaResourceModel2_0TestC public void testGetCatalog() throws Exception { ICompilationUnit cu = this.createTestCollectionTableWithCatalog(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - CollectionTable2_0Annotation table = (CollectionTable2_0Annotation) attributeResource.getAnnotation(JPA2_0.COLLECTION_TABLE); + CollectionTable2_0Annotation table = (CollectionTable2_0Annotation) resourceField.getAnnotation(JPA2_0.COLLECTION_TABLE); assertNotNull(table); assertEquals(CATALOG_NAME, table.getCatalog()); } public void testSetCatalog() throws Exception { ICompilationUnit cu = this.createTestCollectionTable(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - CollectionTable2_0Annotation table = (CollectionTable2_0Annotation) attributeResource.getAnnotation(JPA2_0.COLLECTION_TABLE); + CollectionTable2_0Annotation table = (CollectionTable2_0Annotation) resourceField.getAnnotation(JPA2_0.COLLECTION_TABLE); assertNotNull(table); assertNull(table.getCatalog()); @@ -187,10 +188,10 @@ public class CollectionTable2_0AnnotationTests extends JavaResourceModel2_0TestC public void testSetCatalogNull() throws Exception { ICompilationUnit cu = this.createTestCollectionTableWithCatalog(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - CollectionTable2_0Annotation table = (CollectionTable2_0Annotation) attributeResource.getAnnotation(JPA2_0.COLLECTION_TABLE); + CollectionTable2_0Annotation table = (CollectionTable2_0Annotation) resourceField.getAnnotation(JPA2_0.COLLECTION_TABLE); assertEquals(CATALOG_NAME, table.getCatalog()); table.setCatalog(null); @@ -201,20 +202,20 @@ public class CollectionTable2_0AnnotationTests extends JavaResourceModel2_0TestC public void testGetSchema() throws Exception { ICompilationUnit cu = this.createTestCollectionTableWithSchema(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - CollectionTable2_0Annotation table = (CollectionTable2_0Annotation) attributeResource.getAnnotation(JPA2_0.COLLECTION_TABLE); + CollectionTable2_0Annotation table = (CollectionTable2_0Annotation) resourceField.getAnnotation(JPA2_0.COLLECTION_TABLE); assertNotNull(table); assertEquals(SCHEMA_NAME, table.getSchema()); } public void testSetSchema() throws Exception { ICompilationUnit cu = this.createTestCollectionTable(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - CollectionTable2_0Annotation table = (CollectionTable2_0Annotation) attributeResource.getAnnotation(JPA2_0.COLLECTION_TABLE); + CollectionTable2_0Annotation table = (CollectionTable2_0Annotation) resourceField.getAnnotation(JPA2_0.COLLECTION_TABLE); assertNotNull(table); assertNull(table.getSchema()); @@ -226,10 +227,10 @@ public class CollectionTable2_0AnnotationTests extends JavaResourceModel2_0TestC public void testSetSchemaNull() throws Exception { ICompilationUnit cu = this.createTestCollectionTableWithSchema(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - CollectionTable2_0Annotation table = (CollectionTable2_0Annotation) attributeResource.getAnnotation(JPA2_0.COLLECTION_TABLE); + CollectionTable2_0Annotation table = (CollectionTable2_0Annotation) resourceField.getAnnotation(JPA2_0.COLLECTION_TABLE); assertEquals(SCHEMA_NAME, table.getSchema()); table.setSchema(null); @@ -240,89 +241,89 @@ public class CollectionTable2_0AnnotationTests extends JavaResourceModel2_0TestC public void testUniqueConstraints() throws Exception { ICompilationUnit cu = this.createTestCollectionTable(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - CollectionTable2_0Annotation table = (CollectionTable2_0Annotation) attributeResource.getAnnotation(JPA2_0.COLLECTION_TABLE); + CollectionTable2_0Annotation table = (CollectionTable2_0Annotation) resourceField.getAnnotation(JPA2_0.COLLECTION_TABLE); - assertEquals(0, table.uniqueConstraintsSize()); + assertEquals(0, table.getUniqueConstraintsSize()); } public void testUniqueConstraints2() throws Exception { ICompilationUnit cu = this.createTestCollectionTable(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - CollectionTable2_0Annotation table = (CollectionTable2_0Annotation) attributeResource.getAnnotation(JPA2_0.COLLECTION_TABLE); + CollectionTable2_0Annotation table = (CollectionTable2_0Annotation) resourceField.getAnnotation(JPA2_0.COLLECTION_TABLE); table.addUniqueConstraint(0); table.addUniqueConstraint(1); - assertEquals(2, table.uniqueConstraintsSize()); + assertEquals(2, table.getUniqueConstraintsSize()); } public void testUniqueConstraints3() throws Exception { ICompilationUnit cu = this.createTestCollectionTableWithUniqueConstraints(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - CollectionTable2_0Annotation table = (CollectionTable2_0Annotation) attributeResource.getAnnotation(JPA2_0.COLLECTION_TABLE); + CollectionTable2_0Annotation table = (CollectionTable2_0Annotation) resourceField.getAnnotation(JPA2_0.COLLECTION_TABLE); - assertEquals(3, table.uniqueConstraintsSize()); + assertEquals(3, table.getUniqueConstraintsSize()); } public void testAddUniqueConstraint() throws Exception { ICompilationUnit cu = this.createTestCollectionTable(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - CollectionTable2_0Annotation table = (CollectionTable2_0Annotation) attributeResource.getAnnotation(JPA2_0.COLLECTION_TABLE); + CollectionTable2_0Annotation table = (CollectionTable2_0Annotation) resourceField.getAnnotation(JPA2_0.COLLECTION_TABLE); table.addUniqueConstraint(0).addColumnName("FOO"); table.addUniqueConstraint(1); table.addUniqueConstraint(0).addColumnName("BAR"); - assertEquals("BAR", table.uniqueConstraintAt(0).columnNames().next()); - assertEquals("FOO", table.uniqueConstraintAt(1).columnNames().next()); - assertEquals(0, table.uniqueConstraintAt(2).columnNamesSize()); + assertEquals("BAR", table.uniqueConstraintAt(0).columnNameAt(0)); + assertEquals("FOO", table.uniqueConstraintAt(1).columnNameAt(0)); + assertEquals(0, table.uniqueConstraintAt(2).getColumnNamesSize()); assertSourceContains("@CollectionTable(uniqueConstraints = {@UniqueConstraint(columnNames = \"BAR\"),@UniqueConstraint(columnNames = \"FOO\"), @UniqueConstraint})", cu); } public void testRemoveUniqueConstraint() throws Exception { ICompilationUnit cu = this.createTestCollectionTableWithUniqueConstraints(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - CollectionTable2_0Annotation table = (CollectionTable2_0Annotation) attributeResource.getAnnotation(JPA2_0.COLLECTION_TABLE); - assertEquals("BAR", table.uniqueConstraintAt(0).columnNames().next()); - assertEquals("FOO", table.uniqueConstraintAt(1).columnNames().next()); - assertEquals("BAZ", table.uniqueConstraintAt(2).columnNames().next()); - assertEquals(3, table.uniqueConstraintsSize()); + CollectionTable2_0Annotation table = (CollectionTable2_0Annotation) resourceField.getAnnotation(JPA2_0.COLLECTION_TABLE); + assertEquals("BAR", table.uniqueConstraintAt(0).columnNameAt(0)); + assertEquals("FOO", table.uniqueConstraintAt(1).columnNameAt(0)); + assertEquals("BAZ", table.uniqueConstraintAt(2).columnNameAt(0)); + assertEquals(3, table.getUniqueConstraintsSize()); table.removeUniqueConstraint(1); - assertEquals("BAR", table.uniqueConstraintAt(0).columnNames().next()); - assertEquals("BAZ", table.uniqueConstraintAt(1).columnNames().next()); - assertEquals(2, table.uniqueConstraintsSize()); + assertEquals("BAR", table.uniqueConstraintAt(0).columnNameAt(0)); + assertEquals("BAZ", table.uniqueConstraintAt(1).columnNameAt(0)); + assertEquals(2, table.getUniqueConstraintsSize()); assertSourceContains("@CollectionTable(uniqueConstraints = {@UniqueConstraint(columnNames = {\"BAR\"}), @UniqueConstraint(columnNames = {\"BAZ\"})})", cu); table.removeUniqueConstraint(0); - assertEquals("BAZ", table.uniqueConstraintAt(0).columnNames().next()); - assertEquals(1, table.uniqueConstraintsSize()); + assertEquals("BAZ", table.uniqueConstraintAt(0).columnNameAt(0)); + assertEquals(1, table.getUniqueConstraintsSize()); assertSourceContains("@CollectionTable(uniqueConstraints = @UniqueConstraint(columnNames = {\"BAZ\"}))", cu); table.removeUniqueConstraint(0); - assertEquals(0, table.uniqueConstraintsSize()); + assertEquals(0, table.getUniqueConstraintsSize()); assertSourceDoesNotContain("@CollectionTable(", cu); } public void testMoveUniqueConstraint() throws Exception { ICompilationUnit cu = this.createTestCollectionTableWithUniqueConstraints(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - CollectionTable2_0Annotation table = (CollectionTable2_0Annotation) attributeResource.getAnnotation(JPA2_0.COLLECTION_TABLE); + CollectionTable2_0Annotation table = (CollectionTable2_0Annotation) resourceField.getAnnotation(JPA2_0.COLLECTION_TABLE); assertSourceContains("@CollectionTable(uniqueConstraints = {@UniqueConstraint(columnNames = {\"BAR\"}), @UniqueConstraint(columnNames = {\"FOO\"}), @UniqueConstraint(columnNames = {\"BAZ\"})})", cu); table.moveUniqueConstraint(2, 0); @@ -331,10 +332,10 @@ public class CollectionTable2_0AnnotationTests extends JavaResourceModel2_0TestC public void testMoveUniqueConstraint2() throws Exception { ICompilationUnit cu = this.createTestCollectionTableWithUniqueConstraints(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - CollectionTable2_0Annotation table = (CollectionTable2_0Annotation) attributeResource.getAnnotation(JPA2_0.COLLECTION_TABLE); + CollectionTable2_0Annotation table = (CollectionTable2_0Annotation) resourceField.getAnnotation(JPA2_0.COLLECTION_TABLE); assertSourceContains("@CollectionTable(uniqueConstraints = {@UniqueConstraint(columnNames = {\"BAR\"}), @UniqueConstraint(columnNames = {\"FOO\"}), @UniqueConstraint(columnNames = {\"BAZ\"})})", cu); table.moveUniqueConstraint(0, 2); @@ -343,44 +344,44 @@ public class CollectionTable2_0AnnotationTests extends JavaResourceModel2_0TestC public void testJoinColumns() throws Exception { ICompilationUnit cu = this.createTestCollectionTable(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - CollectionTable2_0Annotation table = (CollectionTable2_0Annotation) attributeResource.getAnnotation(JPA2_0.COLLECTION_TABLE); + CollectionTable2_0Annotation table = (CollectionTable2_0Annotation) resourceField.getAnnotation(JPA2_0.COLLECTION_TABLE); - assertEquals(0, table.joinColumnsSize()); + assertEquals(0, table.getJoinColumnsSize()); } public void testJoinColumns2() throws Exception { ICompilationUnit cu = this.createTestCollectionTable(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - CollectionTable2_0Annotation table = (CollectionTable2_0Annotation) attributeResource.getAnnotation(JPA2_0.COLLECTION_TABLE); + CollectionTable2_0Annotation table = (CollectionTable2_0Annotation) resourceField.getAnnotation(JPA2_0.COLLECTION_TABLE); table.addJoinColumn(0); table.addJoinColumn(1); - assertEquals(2, table.joinColumnsSize()); + assertEquals(2, table.getJoinColumnsSize()); } public void testJoinColumns3() throws Exception { ICompilationUnit cu = this.createTestCollectionTableWithJoinColumns(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - CollectionTable2_0Annotation table = (CollectionTable2_0Annotation) attributeResource.getAnnotation(JPA2_0.COLLECTION_TABLE); + CollectionTable2_0Annotation table = (CollectionTable2_0Annotation) resourceField.getAnnotation(JPA2_0.COLLECTION_TABLE); - assertEquals(2, table.joinColumnsSize()); + assertEquals(2, table.getJoinColumnsSize()); } public void testAddJoinColumn() throws Exception { ICompilationUnit cu = this.createTestCollectionTable(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - CollectionTable2_0Annotation table = (CollectionTable2_0Annotation) attributeResource.getAnnotation(JPA2_0.COLLECTION_TABLE); + CollectionTable2_0Annotation table = (CollectionTable2_0Annotation) resourceField.getAnnotation(JPA2_0.COLLECTION_TABLE); table.addJoinColumn(0).setName("FOO"); table.addJoinColumn(1); @@ -394,40 +395,40 @@ public class CollectionTable2_0AnnotationTests extends JavaResourceModel2_0TestC public void testRemoveJoinColumn() throws Exception { ICompilationUnit cu = this.createTestCollectionTableWithJoinColumns(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - CollectionTable2_0Annotation table = (CollectionTable2_0Annotation) attributeResource.getAnnotation(JPA2_0.COLLECTION_TABLE); + CollectionTable2_0Annotation table = (CollectionTable2_0Annotation) resourceField.getAnnotation(JPA2_0.COLLECTION_TABLE); table.addJoinColumn(0).setName("FOO"); assertEquals("FOO", table.joinColumnAt(0).getName()); assertEquals("BAR", table.joinColumnAt(1).getName()); assertNull(table.joinColumnAt(2).getName()); - assertEquals(3, table.joinColumnsSize()); + assertEquals(3, table.getJoinColumnsSize()); table.removeJoinColumn(1); assertEquals("FOO", table.joinColumnAt(0).getName()); assertNull(table.joinColumnAt(1).getName()); - assertEquals(2, table.joinColumnsSize()); + assertEquals(2, table.getJoinColumnsSize()); assertSourceContains("@CollectionTable(joinColumns = {@JoinColumn(name = \"FOO\"), @JoinColumn})", cu); table.removeJoinColumn(0); assertNull(table.joinColumnAt(0).getName()); - assertEquals(1, table.joinColumnsSize()); + assertEquals(1, table.getJoinColumnsSize()); assertSourceContains("@CollectionTable(joinColumns = @JoinColumn)", cu); table.removeJoinColumn(0); - assertEquals(0, table.joinColumnsSize()); + assertEquals(0, table.getJoinColumnsSize()); assertSourceDoesNotContain("@CollectionTable(", cu); } public void testMoveJoinColumn() throws Exception { ICompilationUnit cu = this.createTestCollectionTableWithJoinColumns(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - CollectionTable2_0Annotation table = (CollectionTable2_0Annotation) attributeResource.getAnnotation(JPA2_0.COLLECTION_TABLE); + CollectionTable2_0Annotation table = (CollectionTable2_0Annotation) resourceField.getAnnotation(JPA2_0.COLLECTION_TABLE); JoinColumnAnnotation joinColumn = table.joinColumnAt(0); joinColumn.setReferencedColumnName("REF_NAME"); joinColumn.setUnique(Boolean.FALSE); @@ -444,16 +445,16 @@ public class CollectionTable2_0AnnotationTests extends JavaResourceModel2_0TestC assertEquals("BAR", table.joinColumnAt(0).getName()); assertNull(table.joinColumnAt(1).getName()); assertEquals("FOO", table.joinColumnAt(2).getName()); - assertEquals(3, table.joinColumnsSize()); + assertEquals(3, table.getJoinColumnsSize()); assertSourceContains("@CollectionTable(joinColumns = {@JoinColumn(name = \"BAR\", referencedColumnName = \"REF_NAME\", unique = false, nullable = false, insertable = false, updatable = false, columnDefinition = \"COLUMN_DEF\", table = \"TABLE\"), @JoinColumn, @JoinColumn(name = \"FOO\")})", cu); } public void testMoveJoinColumn2() throws Exception { ICompilationUnit cu = this.createTestCollectionTableWithJoinColumns(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - CollectionTable2_0Annotation table = (CollectionTable2_0Annotation) attributeResource.getAnnotation(JPA2_0.COLLECTION_TABLE); + CollectionTable2_0Annotation table = (CollectionTable2_0Annotation) resourceField.getAnnotation(JPA2_0.COLLECTION_TABLE); JoinColumnAnnotation joinColumn = table.joinColumnAt(0); joinColumn.setReferencedColumnName("REF_NAME"); @@ -473,20 +474,20 @@ public class CollectionTable2_0AnnotationTests extends JavaResourceModel2_0TestC assertNull(table.joinColumnAt(0).getName()); assertEquals("FOO", table.joinColumnAt(1).getName()); assertEquals("BAR", table.joinColumnAt(2).getName()); - assertEquals(3, table.joinColumnsSize()); + assertEquals(3, table.getJoinColumnsSize()); assertSourceContains("@CollectionTable(joinColumns = {@JoinColumn, @JoinColumn(name = \"FOO\"), @JoinColumn(name = \"BAR\", referencedColumnName = \"REF_NAME\", unique = false, nullable = false, insertable = false, updatable = false, columnDefinition = \"COLUMN_DEF\", table = \"TABLE\")})", cu); } public void testSetJoinColumnName() throws Exception { ICompilationUnit cu = this.createTestCollectionTableWithJoinColumns(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - CollectionTable2_0Annotation table = (CollectionTable2_0Annotation) attributeResource.getAnnotation(JPA2_0.COLLECTION_TABLE); + CollectionTable2_0Annotation table = (CollectionTable2_0Annotation) resourceField.getAnnotation(JPA2_0.COLLECTION_TABLE); - assertEquals(2, table.joinColumnsSize()); + assertEquals(2, table.getJoinColumnsSize()); - JoinColumnAnnotation joinColumn = table.joinColumns().next(); + JoinColumnAnnotation joinColumn = table.joinColumnAt(0); assertEquals("BAR", joinColumn.getName()); diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/resource/java/ElementCollection2_0AnnotationTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/resource/java/ElementCollection2_0AnnotationTests.java index ca282b7002..92f96531e7 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/resource/java/ElementCollection2_0AnnotationTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/resource/java/ElementCollection2_0AnnotationTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009 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. @@ -11,13 +11,14 @@ package org.eclipse.jpt.jpa.core.tests.internal.jpa2.resource.java; import java.util.Iterator; import org.eclipse.jdt.core.ICompilationUnit; +import org.eclipse.jpt.common.core.resource.java.JavaResourceField; +import org.eclipse.jpt.common.core.resource.java.JavaResourceType; +import org.eclipse.jpt.common.utility.internal.CollectionTools; import org.eclipse.jpt.common.utility.internal.iterators.ArrayIterator; import org.eclipse.jpt.jpa.core.jpa2.resource.java.ElementCollection2_0Annotation; import org.eclipse.jpt.jpa.core.jpa2.resource.java.JPA2_0; import org.eclipse.jpt.jpa.core.resource.java.FetchType; 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; @SuppressWarnings("nls") public class ElementCollection2_0AnnotationTests extends JavaResourceModel2_0TestCase { @@ -67,28 +68,28 @@ public class ElementCollection2_0AnnotationTests extends JavaResourceModel2_0Tes public void testElementCollection() throws Exception { ICompilationUnit cu = this.createTestElementCollection(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - ElementCollection2_0Annotation elementCollection = (ElementCollection2_0Annotation) attributeResource.getAnnotation(JPA2_0.ELEMENT_COLLECTION); + ElementCollection2_0Annotation elementCollection = (ElementCollection2_0Annotation) resourceField.getAnnotation(JPA2_0.ELEMENT_COLLECTION); assertNotNull(elementCollection); } public void testGetFetch() throws Exception { ICompilationUnit cu = this.createTestElementCollectionWithFetch(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - ElementCollection2_0Annotation elementCollection = (ElementCollection2_0Annotation) attributeResource.getAnnotation(JPA2_0.ELEMENT_COLLECTION); + ElementCollection2_0Annotation elementCollection = (ElementCollection2_0Annotation) resourceField.getAnnotation(JPA2_0.ELEMENT_COLLECTION); assertEquals(FetchType.EAGER, elementCollection.getFetch()); } public void testSetFetch() throws Exception { ICompilationUnit cu = this.createTestElementCollectionWithFetch(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - ElementCollection2_0Annotation elementCollection = (ElementCollection2_0Annotation) attributeResource.getAnnotation(JPA2_0.ELEMENT_COLLECTION); + ElementCollection2_0Annotation elementCollection = (ElementCollection2_0Annotation) resourceField.getAnnotation(JPA2_0.ELEMENT_COLLECTION); assertEquals(FetchType.EAGER, elementCollection.getFetch()); elementCollection.setFetch(FetchType.LAZY); @@ -99,10 +100,10 @@ public class ElementCollection2_0AnnotationTests extends JavaResourceModel2_0Tes public void testSetFetchNull() throws Exception { ICompilationUnit cu = this.createTestElementCollectionWithFetch(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - ElementCollection2_0Annotation elementCollection = (ElementCollection2_0Annotation) attributeResource.getAnnotation(JPA2_0.ELEMENT_COLLECTION); + ElementCollection2_0Annotation elementCollection = (ElementCollection2_0Annotation) resourceField.getAnnotation(JPA2_0.ELEMENT_COLLECTION); assertEquals(FetchType.EAGER, elementCollection.getFetch()); elementCollection.setFetch(null); @@ -115,19 +116,19 @@ public class ElementCollection2_0AnnotationTests extends JavaResourceModel2_0Tes public void testGetTargetClass() throws Exception { ICompilationUnit cu = this.createTestElementCollectionWithTargetClass(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - ElementCollection2_0Annotation elementCollection = (ElementCollection2_0Annotation) attributeResource.getAnnotation(JPA2_0.ELEMENT_COLLECTION); + ElementCollection2_0Annotation elementCollection = (ElementCollection2_0Annotation) resourceField.getAnnotation(JPA2_0.ELEMENT_COLLECTION); assertEquals(TYPE_NAME, elementCollection.getTargetClass()); } public void testSetTargetClass() throws Exception { ICompilationUnit cu = this.createTestElementCollectionWithTargetClass(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - ElementCollection2_0Annotation elementCollection = (ElementCollection2_0Annotation) attributeResource.getAnnotation(JPA2_0.ELEMENT_COLLECTION); + ElementCollection2_0Annotation elementCollection = (ElementCollection2_0Annotation) resourceField.getAnnotation(JPA2_0.ELEMENT_COLLECTION); assertEquals(TYPE_NAME, elementCollection.getTargetClass()); elementCollection.setTargetClass("Foo"); @@ -137,10 +138,10 @@ public class ElementCollection2_0AnnotationTests extends JavaResourceModel2_0Tes public void testSetTargetClassNull() throws Exception { ICompilationUnit cu = this.createTestElementCollectionWithTargetClass(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - ElementCollection2_0Annotation elementCollection = (ElementCollection2_0Annotation) attributeResource.getAnnotation(JPA2_0.ELEMENT_COLLECTION); + ElementCollection2_0Annotation elementCollection = (ElementCollection2_0Annotation) resourceField.getAnnotation(JPA2_0.ELEMENT_COLLECTION); assertEquals(TYPE_NAME, elementCollection.getTargetClass()); elementCollection.setTargetClass(null); @@ -152,10 +153,10 @@ public class ElementCollection2_0AnnotationTests extends JavaResourceModel2_0Tes public void testGetFullyQualifiedTargetClass() throws Exception { ICompilationUnit cu = this.createTestElementCollectionWithTargetClass(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - ElementCollection2_0Annotation elementCollection = (ElementCollection2_0Annotation) attributeResource.getAnnotation(JPA2_0.ELEMENT_COLLECTION); + ElementCollection2_0Annotation elementCollection = (ElementCollection2_0Annotation) resourceField.getAnnotation(JPA2_0.ELEMENT_COLLECTION); assertEquals(FULLY_QUALIFIED_TYPE_NAME, elementCollection.getFullyQualifiedTargetClassName()); elementCollection.setTargetClass("Foo"); diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/resource/java/JavaResourceModel2_0TestCase.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/resource/java/JavaResourceModel2_0TestCase.java index 82c932f6f4..933d5c1f27 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/resource/java/JavaResourceModel2_0TestCase.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/resource/java/JavaResourceModel2_0TestCase.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009 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. @@ -9,8 +9,8 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.tests.internal.jpa2.resource.java; -import org.eclipse.jpt.jpa.core.JpaAnnotationProvider; -import org.eclipse.jpt.jpa.core.internal.GenericJpaAnnotationProvider; +import org.eclipse.jpt.common.core.AnnotationProvider; +import org.eclipse.jpt.jpa.core.internal.JpaAnnotationProvider; import org.eclipse.jpt.jpa.core.internal.jpa2.Generic2_0JpaAnnotationDefinitionProvider; import org.eclipse.jpt.jpa.core.tests.internal.resource.java.JpaJavaResourceModelTestCase; @@ -22,8 +22,8 @@ public class JavaResourceModel2_0TestCase extends JpaJavaResourceModelTestCase } @Override - protected JpaAnnotationProvider buildAnnotationProvider() { - return new GenericJpaAnnotationProvider( + protected AnnotationProvider buildAnnotationProvider() { + return new JpaAnnotationProvider( Generic2_0JpaAnnotationDefinitionProvider.instance()); } } diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/resource/java/ManyToMany2_0AnnotationTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/resource/java/ManyToMany2_0AnnotationTests.java index 9f0bdb80f6..58efc38818 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/resource/java/ManyToMany2_0AnnotationTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/resource/java/ManyToMany2_0AnnotationTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2010 Oracle. All rights reserved. + * Copyright (c) 2010, 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. @@ -11,12 +11,13 @@ package org.eclipse.jpt.jpa.core.tests.internal.jpa2.resource.java; import java.util.Iterator; import org.eclipse.jdt.core.ICompilationUnit; +import org.eclipse.jpt.common.core.resource.java.JavaResourceField; +import org.eclipse.jpt.common.core.resource.java.JavaResourceType; +import org.eclipse.jpt.common.utility.internal.CollectionTools; import org.eclipse.jpt.common.utility.internal.iterators.ArrayIterator; import org.eclipse.jpt.jpa.core.jpa2.resource.java.ManyToMany2_0Annotation; import org.eclipse.jpt.jpa.core.resource.java.FetchType; 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.ManyToManyAnnotation; @SuppressWarnings("nls") @@ -119,28 +120,28 @@ public class ManyToMany2_0AnnotationTests extends JavaResourceModel2_0TestCase { public void testManyToMany() throws Exception { ICompilationUnit cu = this.createTestManyToMany(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - ManyToManyAnnotation manyToMany = (ManyToManyAnnotation) attributeResource.getAnnotation(JPA.MANY_TO_MANY); + ManyToManyAnnotation manyToMany = (ManyToManyAnnotation) resourceField.getAnnotation(JPA.MANY_TO_MANY); assertNotNull(manyToMany); } public void testGetFetch() throws Exception { ICompilationUnit cu = this.createTestManyToManyWithFetch(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - ManyToManyAnnotation manyToMany = (ManyToManyAnnotation) attributeResource.getAnnotation(JPA.MANY_TO_MANY); + ManyToManyAnnotation manyToMany = (ManyToManyAnnotation) resourceField.getAnnotation(JPA.MANY_TO_MANY); assertEquals(FetchType.EAGER, manyToMany.getFetch()); } public void testSetFetch() throws Exception { ICompilationUnit cu = this.createTestManyToManyWithFetch(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - ManyToManyAnnotation manyToMany = (ManyToManyAnnotation) attributeResource.getAnnotation(JPA.MANY_TO_MANY); + ManyToManyAnnotation manyToMany = (ManyToManyAnnotation) resourceField.getAnnotation(JPA.MANY_TO_MANY); assertEquals(FetchType.EAGER, manyToMany.getFetch()); manyToMany.setFetch(FetchType.LAZY); @@ -151,10 +152,10 @@ public class ManyToMany2_0AnnotationTests extends JavaResourceModel2_0TestCase { public void testSetFetchNull() throws Exception { ICompilationUnit cu = this.createTestManyToManyWithFetch(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - ManyToManyAnnotation manyToMany = (ManyToManyAnnotation) attributeResource.getAnnotation(JPA.MANY_TO_MANY); + ManyToManyAnnotation manyToMany = (ManyToManyAnnotation) resourceField.getAnnotation(JPA.MANY_TO_MANY); assertEquals(FetchType.EAGER, manyToMany.getFetch()); manyToMany.setFetch(null); @@ -166,19 +167,19 @@ public class ManyToMany2_0AnnotationTests extends JavaResourceModel2_0TestCase { public void testGetTargetEntity() throws Exception { ICompilationUnit cu = this.createTestManyToManyWithTargetEntity(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - ManyToManyAnnotation manyToMany = (ManyToManyAnnotation) attributeResource.getAnnotation(JPA.MANY_TO_MANY); + ManyToManyAnnotation manyToMany = (ManyToManyAnnotation) resourceField.getAnnotation(JPA.MANY_TO_MANY); assertEquals(TYPE_NAME, manyToMany.getTargetEntity()); } public void testSetTargetEntity() throws Exception { ICompilationUnit cu = this.createTestManyToManyWithTargetEntity(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - ManyToManyAnnotation manyToMany = (ManyToManyAnnotation) attributeResource.getAnnotation(JPA.MANY_TO_MANY); + ManyToManyAnnotation manyToMany = (ManyToManyAnnotation) resourceField.getAnnotation(JPA.MANY_TO_MANY); assertEquals(TYPE_NAME, manyToMany.getTargetEntity()); manyToMany.setTargetEntity("Foo"); @@ -188,10 +189,10 @@ public class ManyToMany2_0AnnotationTests extends JavaResourceModel2_0TestCase { public void testSetTargetEntityNull() throws Exception { ICompilationUnit cu = this.createTestManyToManyWithTargetEntity(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - ManyToManyAnnotation manyToMany = (ManyToManyAnnotation) attributeResource.getAnnotation(JPA.MANY_TO_MANY); + ManyToManyAnnotation manyToMany = (ManyToManyAnnotation) resourceField.getAnnotation(JPA.MANY_TO_MANY); assertEquals(TYPE_NAME, manyToMany.getTargetEntity()); manyToMany.setTargetEntity(null); @@ -203,10 +204,10 @@ public class ManyToMany2_0AnnotationTests extends JavaResourceModel2_0TestCase { public void testGetFullyQualifiedTargetEntity() throws Exception { ICompilationUnit cu = this.createTestManyToManyWithTargetEntity(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - ManyToManyAnnotation manyToMany = (ManyToManyAnnotation) attributeResource.getAnnotation(JPA.MANY_TO_MANY); + ManyToManyAnnotation manyToMany = (ManyToManyAnnotation) resourceField.getAnnotation(JPA.MANY_TO_MANY); assertEquals(FULLY_QUALIFIED_TYPE_NAME, manyToMany.getFullyQualifiedTargetEntityClassName()); manyToMany.setTargetEntity("Foo"); @@ -220,28 +221,28 @@ public class ManyToMany2_0AnnotationTests extends JavaResourceModel2_0TestCase { public void testGetMappedBy() throws Exception { ICompilationUnit cu = this.createTestManyToManyWithMappedBy(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - ManyToManyAnnotation manyToMany = (ManyToManyAnnotation) attributeResource.getAnnotation(JPA.MANY_TO_MANY); + ManyToManyAnnotation manyToMany = (ManyToManyAnnotation) resourceField.getAnnotation(JPA.MANY_TO_MANY); assertEquals("foo", manyToMany.getMappedBy()); } public void testGetMappedByNull() throws Exception { ICompilationUnit cu = this.createTestManyToMany(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - ManyToManyAnnotation manyToMany = (ManyToManyAnnotation) attributeResource.getAnnotation(JPA.MANY_TO_MANY); + ManyToManyAnnotation manyToMany = (ManyToManyAnnotation) resourceField.getAnnotation(JPA.MANY_TO_MANY); assertEquals(null, manyToMany.getMappedBy()); } public void testSetMappedBy() throws Exception { ICompilationUnit cu = this.createTestManyToMany(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - ManyToManyAnnotation manyToMany = (ManyToManyAnnotation) attributeResource.getAnnotation(JPA.MANY_TO_MANY); + ManyToManyAnnotation manyToMany = (ManyToManyAnnotation) resourceField.getAnnotation(JPA.MANY_TO_MANY); assertNull(manyToMany.getMappedBy()); manyToMany.setMappedBy("bar"); assertEquals("bar", manyToMany.getMappedBy()); @@ -251,10 +252,10 @@ public class ManyToMany2_0AnnotationTests extends JavaResourceModel2_0TestCase { public void testSetMappedByNull() throws Exception { ICompilationUnit cu = this.createTestManyToManyWithMappedBy(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - ManyToManyAnnotation manyToMany = (ManyToManyAnnotation) attributeResource.getAnnotation(JPA.MANY_TO_MANY); + ManyToManyAnnotation manyToMany = (ManyToManyAnnotation) resourceField.getAnnotation(JPA.MANY_TO_MANY); assertEquals("foo", manyToMany.getMappedBy()); manyToMany.setMappedBy(null); @@ -266,10 +267,10 @@ public class ManyToMany2_0AnnotationTests extends JavaResourceModel2_0TestCase { public void testSetCascadeAll() throws Exception { ICompilationUnit cu = this.createTestManyToMany(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - ManyToManyAnnotation manyToMany = (ManyToManyAnnotation) attributeResource.getAnnotation(JPA.MANY_TO_MANY); + ManyToManyAnnotation manyToMany = (ManyToManyAnnotation) resourceField.getAnnotation(JPA.MANY_TO_MANY); assertFalse(manyToMany.isCascadeAll()); manyToMany.setCascadeAll(true); @@ -280,10 +281,10 @@ public class ManyToMany2_0AnnotationTests extends JavaResourceModel2_0TestCase { public void testSetCascadeMerge() throws Exception { ICompilationUnit cu = this.createTestManyToMany(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - ManyToManyAnnotation manyToMany = (ManyToManyAnnotation) attributeResource.getAnnotation(JPA.MANY_TO_MANY); + ManyToManyAnnotation manyToMany = (ManyToManyAnnotation) resourceField.getAnnotation(JPA.MANY_TO_MANY); assertFalse(manyToMany.isCascadeMerge()); manyToMany.setCascadeMerge(true); @@ -294,10 +295,10 @@ public class ManyToMany2_0AnnotationTests extends JavaResourceModel2_0TestCase { public void testSetCascadePersist() throws Exception { ICompilationUnit cu = this.createTestManyToMany(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - ManyToManyAnnotation manyToMany = (ManyToManyAnnotation) attributeResource.getAnnotation(JPA.MANY_TO_MANY); + ManyToManyAnnotation manyToMany = (ManyToManyAnnotation) resourceField.getAnnotation(JPA.MANY_TO_MANY); assertFalse(manyToMany.isCascadePersist()); manyToMany.setCascadePersist(true); @@ -308,10 +309,10 @@ public class ManyToMany2_0AnnotationTests extends JavaResourceModel2_0TestCase { public void testSetCascadeRemove() throws Exception { ICompilationUnit cu = this.createTestManyToMany(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - ManyToManyAnnotation manyToMany = (ManyToManyAnnotation) attributeResource.getAnnotation(JPA.MANY_TO_MANY); + ManyToManyAnnotation manyToMany = (ManyToManyAnnotation) resourceField.getAnnotation(JPA.MANY_TO_MANY); assertFalse(manyToMany.isCascadeRemove()); manyToMany.setCascadeRemove(true); @@ -322,10 +323,10 @@ public class ManyToMany2_0AnnotationTests extends JavaResourceModel2_0TestCase { public void testSetCascadeRefresh() throws Exception { ICompilationUnit cu = this.createTestManyToMany(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - ManyToManyAnnotation manyToMany = (ManyToManyAnnotation) attributeResource.getAnnotation(JPA.MANY_TO_MANY); + ManyToManyAnnotation manyToMany = (ManyToManyAnnotation) resourceField.getAnnotation(JPA.MANY_TO_MANY); assertFalse(manyToMany.isCascadeRefresh()); manyToMany.setCascadeRefresh(true); @@ -336,10 +337,10 @@ public class ManyToMany2_0AnnotationTests extends JavaResourceModel2_0TestCase { public void testSetCascadeDetach() throws Exception { ICompilationUnit cu = this.createTestManyToMany(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - ManyToMany2_0Annotation manyToMany = (ManyToMany2_0Annotation) attributeResource.getAnnotation(JPA.MANY_TO_MANY); + ManyToMany2_0Annotation manyToMany = (ManyToMany2_0Annotation) resourceField.getAnnotation(JPA.MANY_TO_MANY); assertFalse(manyToMany.isCascadeDetach()); manyToMany.setCascadeDetach(true); @@ -350,10 +351,10 @@ public class ManyToMany2_0AnnotationTests extends JavaResourceModel2_0TestCase { public void testCascadeMoreThanOnce() throws Exception { ICompilationUnit cu = this.createTestManyToManyWithCascade(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - ManyToManyAnnotation manyToMany = (ManyToManyAnnotation) attributeResource.getAnnotation(JPA.MANY_TO_MANY); + ManyToManyAnnotation manyToMany = (ManyToManyAnnotation) resourceField.getAnnotation(JPA.MANY_TO_MANY); assertTrue(manyToMany.isCascadeAll()); manyToMany.setCascadeAll(true); @@ -375,10 +376,10 @@ public class ManyToMany2_0AnnotationTests extends JavaResourceModel2_0TestCase { public void testDuplicateCascade() throws Exception { ICompilationUnit cu = this.createTestManyToManyWithDuplicateCascade(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - ManyToManyAnnotation manyToMany = (ManyToManyAnnotation) attributeResource.getAnnotation(JPA.MANY_TO_MANY); + ManyToManyAnnotation manyToMany = (ManyToManyAnnotation) resourceField.getAnnotation(JPA.MANY_TO_MANY); assertTrue(manyToMany.isCascadeMerge()); manyToMany.setCascadeMerge(false); //TODO should the resource model handle this and remove both MERGE @@ -393,10 +394,10 @@ public class ManyToMany2_0AnnotationTests extends JavaResourceModel2_0TestCase { public void testMultipleCascade() throws Exception { ICompilationUnit cu = this.createTestManyToManyWithMultipleCascade(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - ManyToManyAnnotation manyToMany = (ManyToManyAnnotation) attributeResource.getAnnotation(JPA.MANY_TO_MANY); + ManyToManyAnnotation manyToMany = (ManyToManyAnnotation) resourceField.getAnnotation(JPA.MANY_TO_MANY); assertTrue(manyToMany.isCascadeMerge()); assertTrue(manyToMany.isCascadeRemove()); diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/resource/java/ManyToOne2_0AnnotationTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/resource/java/ManyToOne2_0AnnotationTests.java index ea84288fa4..8120a1a7ce 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/resource/java/ManyToOne2_0AnnotationTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/resource/java/ManyToOne2_0AnnotationTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2010 Oracle. All rights reserved. + * Copyright (c) 2010, 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. @@ -11,12 +11,13 @@ package org.eclipse.jpt.jpa.core.tests.internal.jpa2.resource.java; import java.util.Iterator; import org.eclipse.jdt.core.ICompilationUnit; +import org.eclipse.jpt.common.core.resource.java.JavaResourceField; +import org.eclipse.jpt.common.core.resource.java.JavaResourceType; +import org.eclipse.jpt.common.utility.internal.CollectionTools; import org.eclipse.jpt.common.utility.internal.iterators.ArrayIterator; import org.eclipse.jpt.jpa.core.jpa2.resource.java.ManyToOne2_0Annotation; import org.eclipse.jpt.jpa.core.resource.java.FetchType; 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.ManyToOneAnnotation; @SuppressWarnings("nls") @@ -119,28 +120,28 @@ public class ManyToOne2_0AnnotationTests extends JavaResourceModel2_0TestCase { public void testManyToOne() throws Exception { ICompilationUnit cu = this.createTestManyToOne(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - ManyToOneAnnotation manyToOne = (ManyToOneAnnotation) attributeResource.getAnnotation(JPA.MANY_TO_ONE); + ManyToOneAnnotation manyToOne = (ManyToOneAnnotation) resourceField.getAnnotation(JPA.MANY_TO_ONE); assertNotNull(manyToOne); } public void testGetFetch() throws Exception { ICompilationUnit cu = this.createTestManyToOneWithFetch(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - ManyToOneAnnotation manyToOne = (ManyToOneAnnotation) attributeResource.getAnnotation(JPA.MANY_TO_ONE); + ManyToOneAnnotation manyToOne = (ManyToOneAnnotation) resourceField.getAnnotation(JPA.MANY_TO_ONE); assertEquals(FetchType.EAGER, manyToOne.getFetch()); } public void testSetFetch() throws Exception { ICompilationUnit cu = this.createTestManyToOneWithFetch(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - ManyToOneAnnotation manyToOne = (ManyToOneAnnotation) attributeResource.getAnnotation(JPA.MANY_TO_ONE); + ManyToOneAnnotation manyToOne = (ManyToOneAnnotation) resourceField.getAnnotation(JPA.MANY_TO_ONE); assertEquals(FetchType.EAGER, manyToOne.getFetch()); manyToOne.setFetch(FetchType.LAZY); @@ -151,10 +152,10 @@ public class ManyToOne2_0AnnotationTests extends JavaResourceModel2_0TestCase { public void testSetFetchNull() throws Exception { ICompilationUnit cu = this.createTestManyToOneWithFetch(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - ManyToOneAnnotation manyToOne = (ManyToOneAnnotation) attributeResource.getAnnotation(JPA.MANY_TO_ONE); + ManyToOneAnnotation manyToOne = (ManyToOneAnnotation) resourceField.getAnnotation(JPA.MANY_TO_ONE); assertEquals(FetchType.EAGER, manyToOne.getFetch()); manyToOne.setFetch(null); @@ -167,19 +168,19 @@ public class ManyToOne2_0AnnotationTests extends JavaResourceModel2_0TestCase { public void testGetTargetEntity() throws Exception { ICompilationUnit cu = this.createTestManyToOneWithTargetEntity(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - ManyToOneAnnotation manyToOne = (ManyToOneAnnotation) attributeResource.getAnnotation(JPA.MANY_TO_ONE); + ManyToOneAnnotation manyToOne = (ManyToOneAnnotation) resourceField.getAnnotation(JPA.MANY_TO_ONE); assertEquals(TYPE_NAME, manyToOne.getTargetEntity()); } public void testSetTargetEntity() throws Exception { ICompilationUnit cu = this.createTestManyToOneWithTargetEntity(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - ManyToOneAnnotation manyToOne = (ManyToOneAnnotation) attributeResource.getAnnotation(JPA.MANY_TO_ONE); + ManyToOneAnnotation manyToOne = (ManyToOneAnnotation) resourceField.getAnnotation(JPA.MANY_TO_ONE); assertEquals(TYPE_NAME, manyToOne.getTargetEntity()); manyToOne.setTargetEntity("Foo"); @@ -189,10 +190,10 @@ public class ManyToOne2_0AnnotationTests extends JavaResourceModel2_0TestCase { public void testSetTargetEntityNull() throws Exception { ICompilationUnit cu = this.createTestManyToOneWithTargetEntity(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - ManyToOneAnnotation manyToOne = (ManyToOneAnnotation) attributeResource.getAnnotation(JPA.MANY_TO_ONE); + ManyToOneAnnotation manyToOne = (ManyToOneAnnotation) resourceField.getAnnotation(JPA.MANY_TO_ONE); assertEquals(TYPE_NAME, manyToOne.getTargetEntity()); manyToOne.setTargetEntity(null); @@ -204,10 +205,10 @@ public class ManyToOne2_0AnnotationTests extends JavaResourceModel2_0TestCase { public void testGetFullyQualifiedTargetEntity() throws Exception { ICompilationUnit cu = this.createTestManyToOneWithTargetEntity(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - ManyToOneAnnotation manyToOne = (ManyToOneAnnotation) attributeResource.getAnnotation(JPA.MANY_TO_ONE); + ManyToOneAnnotation manyToOne = (ManyToOneAnnotation) resourceField.getAnnotation(JPA.MANY_TO_ONE); assertEquals(FULLY_QUALIFIED_TYPE_NAME, manyToOne.getFullyQualifiedTargetEntityClassName()); manyToOne.setTargetEntity("Foo"); @@ -221,19 +222,19 @@ public class ManyToOne2_0AnnotationTests extends JavaResourceModel2_0TestCase { public void testGetOptional() throws Exception { ICompilationUnit cu = this.createTestManyToOneWithOptional(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - ManyToOneAnnotation manyToOne = (ManyToOneAnnotation) attributeResource.getAnnotation(JPA.MANY_TO_ONE); + ManyToOneAnnotation manyToOne = (ManyToOneAnnotation) resourceField.getAnnotation(JPA.MANY_TO_ONE); assertEquals(Boolean.TRUE, manyToOne.getOptional()); } public void testSetOptional() throws Exception { ICompilationUnit cu = this.createTestManyToOneWithOptional(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - ManyToOneAnnotation manyToOne = (ManyToOneAnnotation) attributeResource.getAnnotation(JPA.MANY_TO_ONE); + ManyToOneAnnotation manyToOne = (ManyToOneAnnotation) resourceField.getAnnotation(JPA.MANY_TO_ONE); assertEquals(Boolean.TRUE, manyToOne.getOptional()); manyToOne.setOptional(Boolean.FALSE); @@ -244,10 +245,10 @@ public class ManyToOne2_0AnnotationTests extends JavaResourceModel2_0TestCase { public void testSetOptionalNull() throws Exception { ICompilationUnit cu = this.createTestManyToOneWithOptional(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - ManyToOneAnnotation manyToOne = (ManyToOneAnnotation) attributeResource.getAnnotation(JPA.MANY_TO_ONE); + ManyToOneAnnotation manyToOne = (ManyToOneAnnotation) resourceField.getAnnotation(JPA.MANY_TO_ONE); assertEquals(Boolean.TRUE, manyToOne.getOptional()); manyToOne.setOptional(null); @@ -259,10 +260,10 @@ public class ManyToOne2_0AnnotationTests extends JavaResourceModel2_0TestCase { public void testSetCascadeAll() throws Exception { ICompilationUnit cu = this.createTestManyToOne(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - ManyToOneAnnotation manyToOne = (ManyToOneAnnotation) attributeResource.getAnnotation(JPA.MANY_TO_ONE); + ManyToOneAnnotation manyToOne = (ManyToOneAnnotation) resourceField.getAnnotation(JPA.MANY_TO_ONE); assertFalse(manyToOne.isCascadeAll()); manyToOne.setCascadeAll(true); @@ -273,10 +274,10 @@ public class ManyToOne2_0AnnotationTests extends JavaResourceModel2_0TestCase { public void testSetCascadeMerge() throws Exception { ICompilationUnit cu = this.createTestManyToOne(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - ManyToOneAnnotation manyToOne = (ManyToOneAnnotation) attributeResource.getAnnotation(JPA.MANY_TO_ONE); + ManyToOneAnnotation manyToOne = (ManyToOneAnnotation) resourceField.getAnnotation(JPA.MANY_TO_ONE); assertFalse(manyToOne.isCascadeMerge()); manyToOne.setCascadeMerge(true); @@ -287,10 +288,10 @@ public class ManyToOne2_0AnnotationTests extends JavaResourceModel2_0TestCase { public void testSetCascadePersist() throws Exception { ICompilationUnit cu = this.createTestManyToOne(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - ManyToOneAnnotation manyToOne = (ManyToOneAnnotation) attributeResource.getAnnotation(JPA.MANY_TO_ONE); + ManyToOneAnnotation manyToOne = (ManyToOneAnnotation) resourceField.getAnnotation(JPA.MANY_TO_ONE); assertFalse(manyToOne.isCascadePersist()); manyToOne.setCascadePersist(true); @@ -301,10 +302,10 @@ public class ManyToOne2_0AnnotationTests extends JavaResourceModel2_0TestCase { public void testSetCascadeRemove() throws Exception { ICompilationUnit cu = this.createTestManyToOne(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - ManyToOneAnnotation manyToOne = (ManyToOneAnnotation) attributeResource.getAnnotation(JPA.MANY_TO_ONE); + ManyToOneAnnotation manyToOne = (ManyToOneAnnotation) resourceField.getAnnotation(JPA.MANY_TO_ONE); assertFalse(manyToOne.isCascadeRemove()); manyToOne.setCascadeRemove(true); @@ -315,10 +316,10 @@ public class ManyToOne2_0AnnotationTests extends JavaResourceModel2_0TestCase { public void testSetCascadeRefresh() throws Exception { ICompilationUnit cu = this.createTestManyToOne(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - ManyToOneAnnotation manyToOne = (ManyToOneAnnotation) attributeResource.getAnnotation(JPA.MANY_TO_ONE); + ManyToOneAnnotation manyToOne = (ManyToOneAnnotation) resourceField.getAnnotation(JPA.MANY_TO_ONE); assertFalse(manyToOne.isCascadeRefresh()); manyToOne.setCascadeRefresh(true); @@ -329,10 +330,10 @@ public class ManyToOne2_0AnnotationTests extends JavaResourceModel2_0TestCase { public void testSetCascadeDetach() throws Exception { ICompilationUnit cu = this.createTestManyToOne(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - ManyToOne2_0Annotation manyToOne = (ManyToOne2_0Annotation) attributeResource.getAnnotation(JPA.MANY_TO_ONE); + ManyToOne2_0Annotation manyToOne = (ManyToOne2_0Annotation) resourceField.getAnnotation(JPA.MANY_TO_ONE); assertFalse(manyToOne.isCascadeDetach()); manyToOne.setCascadeDetach(true); @@ -343,10 +344,10 @@ public class ManyToOne2_0AnnotationTests extends JavaResourceModel2_0TestCase { public void testCascadeMoreThanOnce() throws Exception { ICompilationUnit cu = this.createTestManyToOneWithCascade(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - ManyToOneAnnotation manyToOne = (ManyToOneAnnotation) attributeResource.getAnnotation(JPA.MANY_TO_ONE); + ManyToOneAnnotation manyToOne = (ManyToOneAnnotation) resourceField.getAnnotation(JPA.MANY_TO_ONE); assertTrue(manyToOne.isCascadeAll()); manyToOne.setCascadeAll(true); @@ -368,10 +369,10 @@ public class ManyToOne2_0AnnotationTests extends JavaResourceModel2_0TestCase { public void testDuplicateCascade() throws Exception { ICompilationUnit cu = this.createTestManyToOneWithDuplicateCascade(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - ManyToOneAnnotation manyToOne = (ManyToOneAnnotation) attributeResource.getAnnotation(JPA.MANY_TO_ONE); + ManyToOneAnnotation manyToOne = (ManyToOneAnnotation) resourceField.getAnnotation(JPA.MANY_TO_ONE); assertTrue(manyToOne.isCascadeMerge()); manyToOne.setCascadeMerge(false);//TODO should the resource model handle this and remove both MERGE @@ -386,10 +387,10 @@ public class ManyToOne2_0AnnotationTests extends JavaResourceModel2_0TestCase { public void testMultipleCascade() throws Exception { ICompilationUnit cu = this.createTestManyToOneWithMultipleCascade(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - ManyToOneAnnotation manyToOne = (ManyToOneAnnotation) attributeResource.getAnnotation(JPA.MANY_TO_ONE); + ManyToOneAnnotation manyToOne = (ManyToOneAnnotation) resourceField.getAnnotation(JPA.MANY_TO_ONE); assertTrue(manyToOne.isCascadeMerge()); assertTrue(manyToOne.isCascadeRemove()); diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/resource/java/MapKeyClass2_0AnnotationTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/resource/java/MapKeyClass2_0AnnotationTests.java index 1724e3f544..8d64639bdb 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/resource/java/MapKeyClass2_0AnnotationTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/resource/java/MapKeyClass2_0AnnotationTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009 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. @@ -11,11 +11,12 @@ package org.eclipse.jpt.jpa.core.tests.internal.jpa2.resource.java; import java.util.Iterator; import org.eclipse.jdt.core.ICompilationUnit; +import org.eclipse.jpt.common.core.resource.java.JavaResourceField; +import org.eclipse.jpt.common.core.resource.java.JavaResourceType; +import org.eclipse.jpt.common.utility.internal.CollectionTools; import org.eclipse.jpt.common.utility.internal.iterators.ArrayIterator; import org.eclipse.jpt.jpa.core.jpa2.resource.java.JPA2_0; import org.eclipse.jpt.jpa.core.jpa2.resource.java.MapKeyClass2_0Annotation; -import org.eclipse.jpt.jpa.core.resource.java.JavaResourcePersistentAttribute; -import org.eclipse.jpt.jpa.core.resource.java.JavaResourcePersistentType; @SuppressWarnings("nls") public class MapKeyClass2_0AnnotationTests extends JavaResourceModel2_0TestCase { @@ -54,29 +55,29 @@ public class MapKeyClass2_0AnnotationTests extends JavaResourceModel2_0TestCase public void testMapKeyClass() throws Exception { ICompilationUnit cu = this.createTestMapKeyClass(); - JavaResourcePersistentType resourceType = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute resourceAttribute = resourceType.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - MapKeyClass2_0Annotation mapKeyClass = (MapKeyClass2_0Annotation) resourceAttribute.getAnnotation(JPA2_0.MAP_KEY_CLASS); + MapKeyClass2_0Annotation mapKeyClass = (MapKeyClass2_0Annotation) resourceField.getAnnotation(JPA2_0.MAP_KEY_CLASS); assertNotNull(mapKeyClass); assertNull(mapKeyClass.getValue()); } public void testGetValue() throws Exception { ICompilationUnit cu = this.createTestMapKeyClassWithValue(); - JavaResourcePersistentType resourceType = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute resourceAttribute = resourceType.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - MapKeyClass2_0Annotation mapKeyClass = (MapKeyClass2_0Annotation) resourceAttribute.getAnnotation(JPA2_0.MAP_KEY_CLASS); + MapKeyClass2_0Annotation mapKeyClass = (MapKeyClass2_0Annotation) resourceField.getAnnotation(JPA2_0.MAP_KEY_CLASS); assertEquals(MAP_KEY_CLASS_VALUE, mapKeyClass.getValue()); } public void testSetValue() throws Exception { ICompilationUnit cu = this.createTestMapKeyClassWithValue(); - JavaResourcePersistentType resourceType = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute resourceAttribute = resourceType.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - MapKeyClass2_0Annotation mapKeyClass = (MapKeyClass2_0Annotation) resourceAttribute.getAnnotation(JPA2_0.MAP_KEY_CLASS); + MapKeyClass2_0Annotation mapKeyClass = (MapKeyClass2_0Annotation) resourceField.getAnnotation(JPA2_0.MAP_KEY_CLASS); assertEquals(MAP_KEY_CLASS_VALUE, mapKeyClass.getValue()); mapKeyClass.setValue("foo"); @@ -91,10 +92,10 @@ public class MapKeyClass2_0AnnotationTests extends JavaResourceModel2_0TestCase public void testGetFullyQualifiedClass() throws Exception { ICompilationUnit cu = this.createTestMapKeyClassWithValue(); - JavaResourcePersistentType resourceType = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute resourceAttribute = resourceType.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - MapKeyClass2_0Annotation mapKeyClass = (MapKeyClass2_0Annotation) resourceAttribute.getAnnotation(JPA2_0.MAP_KEY_CLASS); + MapKeyClass2_0Annotation mapKeyClass = (MapKeyClass2_0Annotation) resourceField.getAnnotation(JPA2_0.MAP_KEY_CLASS); assertNotNull(mapKeyClass.getValue()); assertEquals("MyClass", mapKeyClass.getFullyQualifiedClassName()); //bug 196200 changed this diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/resource/java/MapKeyColumn2_0AnnotationTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/resource/java/MapKeyColumn2_0AnnotationTests.java index dd249ca270..cf6cae8309 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/resource/java/MapKeyColumn2_0AnnotationTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/resource/java/MapKeyColumn2_0AnnotationTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009 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. @@ -11,11 +11,12 @@ package org.eclipse.jpt.jpa.core.tests.internal.jpa2.resource.java; import java.util.Iterator; import org.eclipse.jdt.core.ICompilationUnit; +import org.eclipse.jpt.common.core.resource.java.JavaResourceField; +import org.eclipse.jpt.common.core.resource.java.JavaResourceType; +import org.eclipse.jpt.common.utility.internal.CollectionTools; import org.eclipse.jpt.common.utility.internal.iterators.ArrayIterator; import org.eclipse.jpt.jpa.core.jpa2.resource.java.JPA2_0; import org.eclipse.jpt.jpa.core.jpa2.resource.java.MapKeyColumn2_0Annotation; -import org.eclipse.jpt.jpa.core.resource.java.JavaResourcePersistentAttribute; -import org.eclipse.jpt.jpa.core.resource.java.JavaResourcePersistentType; @SuppressWarnings("nls") public class MapKeyColumn2_0AnnotationTests extends JavaResourceModel2_0TestCase { @@ -108,18 +109,18 @@ public class MapKeyColumn2_0AnnotationTests extends JavaResourceModel2_0TestCase public void testGetName() throws Exception { ICompilationUnit cu = this.createTestColumnWithName(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - MapKeyColumn2_0Annotation column = (MapKeyColumn2_0Annotation) attributeResource.getAnnotation(JPA2_0.MAP_KEY_COLUMN); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); + MapKeyColumn2_0Annotation column = (MapKeyColumn2_0Annotation) resourceField.getAnnotation(JPA2_0.MAP_KEY_COLUMN); assertNotNull(column); assertEquals(COLUMN_NAME, column.getName()); } public void testGetNull() throws Exception { ICompilationUnit cu = this.createTestColumn(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - MapKeyColumn2_0Annotation column = (MapKeyColumn2_0Annotation) attributeResource.getAnnotation(JPA2_0.MAP_KEY_COLUMN); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); + MapKeyColumn2_0Annotation column = (MapKeyColumn2_0Annotation) resourceField.getAnnotation(JPA2_0.MAP_KEY_COLUMN); assertNotNull(column); assertNull(column.getName()); assertNull(column.getNullable()); @@ -132,9 +133,9 @@ public class MapKeyColumn2_0AnnotationTests extends JavaResourceModel2_0TestCase public void testSetName() throws Exception { ICompilationUnit cu = this.createTestColumn(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - MapKeyColumn2_0Annotation column = (MapKeyColumn2_0Annotation) attributeResource.getAnnotation(JPA2_0.MAP_KEY_COLUMN); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); + MapKeyColumn2_0Annotation column = (MapKeyColumn2_0Annotation) resourceField.getAnnotation(JPA2_0.MAP_KEY_COLUMN); assertNotNull(column); assertNull(column.getName()); @@ -147,9 +148,9 @@ public class MapKeyColumn2_0AnnotationTests extends JavaResourceModel2_0TestCase public void testSetNameNull() throws Exception { ICompilationUnit cu = this.createTestColumnWithName(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - MapKeyColumn2_0Annotation column = (MapKeyColumn2_0Annotation) attributeResource.getAnnotation(JPA2_0.MAP_KEY_COLUMN); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); + MapKeyColumn2_0Annotation column = (MapKeyColumn2_0Annotation) resourceField.getAnnotation(JPA2_0.MAP_KEY_COLUMN); assertEquals(COLUMN_NAME, column.getName()); @@ -161,17 +162,17 @@ public class MapKeyColumn2_0AnnotationTests extends JavaResourceModel2_0TestCase public void testGetTable() throws Exception { ICompilationUnit cu = this.createTestColumnWithTable(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - MapKeyColumn2_0Annotation column = (MapKeyColumn2_0Annotation) attributeResource.getAnnotation(JPA2_0.MAP_KEY_COLUMN); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); + MapKeyColumn2_0Annotation column = (MapKeyColumn2_0Annotation) resourceField.getAnnotation(JPA2_0.MAP_KEY_COLUMN); assertEquals(COLUMN_TABLE, column.getTable()); } public void testSetTable() throws Exception { ICompilationUnit cu = this.createTestColumn(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - MapKeyColumn2_0Annotation column = (MapKeyColumn2_0Annotation) attributeResource.getAnnotation(JPA2_0.MAP_KEY_COLUMN); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); + MapKeyColumn2_0Annotation column = (MapKeyColumn2_0Annotation) resourceField.getAnnotation(JPA2_0.MAP_KEY_COLUMN); assertNotNull(column); assertNull(column.getTable()); @@ -188,17 +189,17 @@ public class MapKeyColumn2_0AnnotationTests extends JavaResourceModel2_0TestCase public void testGetColumnDefinition() throws Exception { ICompilationUnit cu = this.createTestColumnWithColumnDefinition(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - MapKeyColumn2_0Annotation column = (MapKeyColumn2_0Annotation) attributeResource.getAnnotation(JPA2_0.MAP_KEY_COLUMN); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); + MapKeyColumn2_0Annotation column = (MapKeyColumn2_0Annotation) resourceField.getAnnotation(JPA2_0.MAP_KEY_COLUMN); assertEquals(COLUMN_COLUMN_DEFINITION, column.getColumnDefinition()); } public void testSetColumnDefinition() throws Exception { ICompilationUnit cu = this.createTestColumn(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - MapKeyColumn2_0Annotation column = (MapKeyColumn2_0Annotation) attributeResource.getAnnotation(JPA2_0.MAP_KEY_COLUMN); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); + MapKeyColumn2_0Annotation column = (MapKeyColumn2_0Annotation) resourceField.getAnnotation(JPA2_0.MAP_KEY_COLUMN); assertNotNull(column); assertNull(column.getColumnDefinition()); @@ -215,18 +216,18 @@ public class MapKeyColumn2_0AnnotationTests extends JavaResourceModel2_0TestCase public void testGetUnique() throws Exception { ICompilationUnit cu = this.createTestColumnWithBooleanElement("unique"); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - MapKeyColumn2_0Annotation column = (MapKeyColumn2_0Annotation) attributeResource.getAnnotation(JPA2_0.MAP_KEY_COLUMN); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); + MapKeyColumn2_0Annotation column = (MapKeyColumn2_0Annotation) resourceField.getAnnotation(JPA2_0.MAP_KEY_COLUMN); assertEquals(Boolean.TRUE, column.getUnique()); } public void testSetUnique() throws Exception { ICompilationUnit cu = this.createTestColumn(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - MapKeyColumn2_0Annotation column = (MapKeyColumn2_0Annotation) attributeResource.getAnnotation(JPA2_0.MAP_KEY_COLUMN); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); + MapKeyColumn2_0Annotation column = (MapKeyColumn2_0Annotation) resourceField.getAnnotation(JPA2_0.MAP_KEY_COLUMN); assertNotNull(column); assertNull(column.getUnique()); @@ -242,18 +243,18 @@ public class MapKeyColumn2_0AnnotationTests extends JavaResourceModel2_0TestCase public void testGetNullable() throws Exception { ICompilationUnit cu = this.createTestColumnWithBooleanElement("nullable"); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - MapKeyColumn2_0Annotation column = (MapKeyColumn2_0Annotation) attributeResource.getAnnotation(JPA2_0.MAP_KEY_COLUMN); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); + MapKeyColumn2_0Annotation column = (MapKeyColumn2_0Annotation) resourceField.getAnnotation(JPA2_0.MAP_KEY_COLUMN); assertEquals(Boolean.TRUE, column.getNullable()); } public void testSetNullable() throws Exception { ICompilationUnit cu = this.createTestColumn(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - MapKeyColumn2_0Annotation column = (MapKeyColumn2_0Annotation) attributeResource.getAnnotation(JPA2_0.MAP_KEY_COLUMN); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); + MapKeyColumn2_0Annotation column = (MapKeyColumn2_0Annotation) resourceField.getAnnotation(JPA2_0.MAP_KEY_COLUMN); assertNotNull(column); assertNull(column.getNullable()); @@ -269,18 +270,18 @@ public class MapKeyColumn2_0AnnotationTests extends JavaResourceModel2_0TestCase public void testGetInsertable() throws Exception { ICompilationUnit cu = this.createTestColumnWithBooleanElement("insertable"); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - MapKeyColumn2_0Annotation column = (MapKeyColumn2_0Annotation) attributeResource.getAnnotation(JPA2_0.MAP_KEY_COLUMN); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); + MapKeyColumn2_0Annotation column = (MapKeyColumn2_0Annotation) resourceField.getAnnotation(JPA2_0.MAP_KEY_COLUMN); assertEquals(Boolean.TRUE, column.getInsertable()); } public void testSetInsertable() throws Exception { ICompilationUnit cu = this.createTestColumn(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - MapKeyColumn2_0Annotation column = (MapKeyColumn2_0Annotation) attributeResource.getAnnotation(JPA2_0.MAP_KEY_COLUMN); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); + MapKeyColumn2_0Annotation column = (MapKeyColumn2_0Annotation) resourceField.getAnnotation(JPA2_0.MAP_KEY_COLUMN); assertNotNull(column); assertNull(column.getInsertable()); @@ -296,18 +297,18 @@ public class MapKeyColumn2_0AnnotationTests extends JavaResourceModel2_0TestCase public void testGetUpdatable() throws Exception { ICompilationUnit cu = this.createTestColumnWithBooleanElement("updatable"); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - MapKeyColumn2_0Annotation column = (MapKeyColumn2_0Annotation) attributeResource.getAnnotation(JPA2_0.MAP_KEY_COLUMN); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); + MapKeyColumn2_0Annotation column = (MapKeyColumn2_0Annotation) resourceField.getAnnotation(JPA2_0.MAP_KEY_COLUMN); assertEquals(Boolean.TRUE, column.getUpdatable()); } public void testSetUpdatable() throws Exception { ICompilationUnit cu = this.createTestColumn(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - MapKeyColumn2_0Annotation column = (MapKeyColumn2_0Annotation) attributeResource.getAnnotation(JPA2_0.MAP_KEY_COLUMN); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); + MapKeyColumn2_0Annotation column = (MapKeyColumn2_0Annotation) resourceField.getAnnotation(JPA2_0.MAP_KEY_COLUMN); assertNotNull(column); assertNull(column.getUpdatable()); @@ -323,18 +324,18 @@ public class MapKeyColumn2_0AnnotationTests extends JavaResourceModel2_0TestCase public void testGetLength() throws Exception { ICompilationUnit cu = this.createTestColumnWithIntElement("length"); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - MapKeyColumn2_0Annotation column = (MapKeyColumn2_0Annotation) attributeResource.getAnnotation(JPA2_0.MAP_KEY_COLUMN); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); + MapKeyColumn2_0Annotation column = (MapKeyColumn2_0Annotation) resourceField.getAnnotation(JPA2_0.MAP_KEY_COLUMN); assertEquals(Integer.valueOf(5), column.getLength()); } public void testSetLength() throws Exception { ICompilationUnit cu = this.createTestColumn(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - MapKeyColumn2_0Annotation column = (MapKeyColumn2_0Annotation) attributeResource.getAnnotation(JPA2_0.MAP_KEY_COLUMN); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); + MapKeyColumn2_0Annotation column = (MapKeyColumn2_0Annotation) resourceField.getAnnotation(JPA2_0.MAP_KEY_COLUMN); assertNotNull(column); assertNull(column.getLength()); @@ -350,18 +351,18 @@ public class MapKeyColumn2_0AnnotationTests extends JavaResourceModel2_0TestCase public void testGetPrecision() throws Exception { ICompilationUnit cu = this.createTestColumnWithIntElement("precision"); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - MapKeyColumn2_0Annotation column = (MapKeyColumn2_0Annotation) attributeResource.getAnnotation(JPA2_0.MAP_KEY_COLUMN); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); + MapKeyColumn2_0Annotation column = (MapKeyColumn2_0Annotation) resourceField.getAnnotation(JPA2_0.MAP_KEY_COLUMN); assertEquals(Integer.valueOf(5), column.getPrecision()); } public void testSetPrecision() throws Exception { ICompilationUnit cu = this.createTestColumn(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - MapKeyColumn2_0Annotation column = (MapKeyColumn2_0Annotation) attributeResource.getAnnotation(JPA2_0.MAP_KEY_COLUMN); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); + MapKeyColumn2_0Annotation column = (MapKeyColumn2_0Annotation) resourceField.getAnnotation(JPA2_0.MAP_KEY_COLUMN); assertNotNull(column); assertEquals(null, column.getPrecision()); @@ -377,18 +378,18 @@ public class MapKeyColumn2_0AnnotationTests extends JavaResourceModel2_0TestCase public void testGetScale() throws Exception { ICompilationUnit cu = this.createTestColumnWithIntElement("scale"); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - MapKeyColumn2_0Annotation column = (MapKeyColumn2_0Annotation) attributeResource.getAnnotation(JPA2_0.MAP_KEY_COLUMN); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); + MapKeyColumn2_0Annotation column = (MapKeyColumn2_0Annotation) resourceField.getAnnotation(JPA2_0.MAP_KEY_COLUMN); assertEquals(Integer.valueOf(5), column.getScale()); } public void testSetScale() throws Exception { ICompilationUnit cu = this.createTestColumn(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - MapKeyColumn2_0Annotation column = (MapKeyColumn2_0Annotation) attributeResource.getAnnotation(JPA2_0.MAP_KEY_COLUMN); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); + MapKeyColumn2_0Annotation column = (MapKeyColumn2_0Annotation) resourceField.getAnnotation(JPA2_0.MAP_KEY_COLUMN); assertNotNull(column); assertNull(column.getScale()); diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/resource/java/MapKeyEnumerated2_0AnnotationTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/resource/java/MapKeyEnumerated2_0AnnotationTests.java index 2debc87212..efd68d8ec6 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/resource/java/MapKeyEnumerated2_0AnnotationTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/resource/java/MapKeyEnumerated2_0AnnotationTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009 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. @@ -11,13 +11,15 @@ package org.eclipse.jpt.jpa.core.tests.internal.jpa2.resource.java; import java.util.Iterator; import org.eclipse.jdt.core.ICompilationUnit; +import org.eclipse.jpt.common.core.resource.java.JavaResourceField; +import org.eclipse.jpt.common.core.resource.java.JavaResourceType; +import org.eclipse.jpt.common.utility.internal.CollectionTools; import org.eclipse.jpt.common.utility.internal.iterators.ArrayIterator; import org.eclipse.jpt.jpa.core.jpa2.resource.java.JPA2_0; import org.eclipse.jpt.jpa.core.jpa2.resource.java.MapKeyEnumerated2_0Annotation; +import org.eclipse.jpt.jpa.core.jpa2.resource.java.MapKeyJoinColumn2_0Annotation; import org.eclipse.jpt.jpa.core.resource.java.EnumType; 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; @SuppressWarnings("nls") public class MapKeyEnumerated2_0AnnotationTests extends JavaResourceModel2_0TestCase { @@ -54,28 +56,28 @@ public class MapKeyEnumerated2_0AnnotationTests extends JavaResourceModel2_0Test public void testMapKeyEnumerated() throws Exception { ICompilationUnit cu = this.createTestMapKeyEnumerated(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - MapKeyEnumerated2_0Annotation enumerated = (MapKeyEnumerated2_0Annotation) attributeResource.getAnnotation(JPA2_0.MAP_KEY_ENUMERATED); + MapKeyEnumerated2_0Annotation enumerated = (MapKeyEnumerated2_0Annotation) resourceField.getAnnotation(JPA2_0.MAP_KEY_ENUMERATED); assertNotNull(enumerated); } public void testGetValue() throws Exception { ICompilationUnit cu = this.createTestMapKeyEnumeratedWithValue(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - MapKeyEnumerated2_0Annotation enumerated = (MapKeyEnumerated2_0Annotation) attributeResource.getAnnotation(JPA2_0.MAP_KEY_ENUMERATED); + MapKeyEnumerated2_0Annotation enumerated = (MapKeyEnumerated2_0Annotation) resourceField.getAnnotation(JPA2_0.MAP_KEY_ENUMERATED); assertEquals(EnumType.ORDINAL, enumerated.getValue()); } public void testSetValue() throws Exception { ICompilationUnit cu = this.createTestMapKeyEnumerated(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - MapKeyEnumerated2_0Annotation enumerated = (MapKeyEnumerated2_0Annotation) attributeResource.getAnnotation(JPA2_0.MAP_KEY_ENUMERATED); + MapKeyEnumerated2_0Annotation enumerated = (MapKeyEnumerated2_0Annotation) resourceField.getAnnotation(JPA2_0.MAP_KEY_ENUMERATED); enumerated.setValue(EnumType.STRING); diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/resource/java/MapKeyJoinColumn2_0AnnotationTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/resource/java/MapKeyJoinColumn2_0AnnotationTests.java index 7677975367..17b702d78d 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/resource/java/MapKeyJoinColumn2_0AnnotationTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/resource/java/MapKeyJoinColumn2_0AnnotationTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009 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. @@ -11,11 +11,13 @@ package org.eclipse.jpt.jpa.core.tests.internal.jpa2.resource.java; import java.util.Iterator; import org.eclipse.jdt.core.ICompilationUnit; +import org.eclipse.jpt.common.core.resource.java.JavaResourceField; +import org.eclipse.jpt.common.core.resource.java.JavaResourceMember; +import org.eclipse.jpt.common.core.resource.java.JavaResourceType; +import org.eclipse.jpt.common.utility.internal.CollectionTools; import org.eclipse.jpt.common.utility.internal.iterators.ArrayIterator; import org.eclipse.jpt.jpa.core.jpa2.resource.java.JPA2_0; import org.eclipse.jpt.jpa.core.jpa2.resource.java.MapKeyJoinColumn2_0Annotation; -import org.eclipse.jpt.jpa.core.resource.java.JavaResourcePersistentAttribute; -import org.eclipse.jpt.jpa.core.resource.java.JavaResourcePersistentType; @SuppressWarnings("nls") public class MapKeyJoinColumn2_0AnnotationTests extends JavaResourceModel2_0TestCase { @@ -106,21 +108,25 @@ public class MapKeyJoinColumn2_0AnnotationTests extends JavaResourceModel2_0Test } }); } + + private MapKeyJoinColumn2_0Annotation mapKeyJoinColumnAt(int index, JavaResourceMember resourceMember) { + return (MapKeyJoinColumn2_0Annotation) resourceMember.getAnnotation(index, JPA2_0.MAP_KEY_JOIN_COLUMN); + } public void testGetName() throws Exception { ICompilationUnit cu = this.createTestJoinColumnWithName(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - MapKeyJoinColumn2_0Annotation column = (MapKeyJoinColumn2_0Annotation) attributeResource.getAnnotation(JPA2_0.MAP_KEY_JOIN_COLUMN); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); + MapKeyJoinColumn2_0Annotation column = this.mapKeyJoinColumnAt(0, resourceField); assertNotNull(column); assertEquals(COLUMN_NAME, column.getName()); } public void testGetNull() throws Exception { ICompilationUnit cu = this.createTestJoinColumn(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - MapKeyJoinColumn2_0Annotation column = (MapKeyJoinColumn2_0Annotation) attributeResource.getAnnotation(JPA2_0.MAP_KEY_JOIN_COLUMN); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); + MapKeyJoinColumn2_0Annotation column = this.mapKeyJoinColumnAt(0, resourceField); assertNotNull(column); assertNull(column.getName()); assertNull(column.getNullable()); @@ -134,9 +140,9 @@ public class MapKeyJoinColumn2_0AnnotationTests extends JavaResourceModel2_0Test public void testSetName() throws Exception { ICompilationUnit cu = this.createTestJoinColumn(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - MapKeyJoinColumn2_0Annotation column = (MapKeyJoinColumn2_0Annotation) attributeResource.getAnnotation(JPA2_0.MAP_KEY_JOIN_COLUMN); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); + MapKeyJoinColumn2_0Annotation column = this.mapKeyJoinColumnAt(0, resourceField); assertNotNull(column); assertNull(column.getName()); @@ -149,9 +155,9 @@ public class MapKeyJoinColumn2_0AnnotationTests extends JavaResourceModel2_0Test public void testSetNameNull() throws Exception { ICompilationUnit cu = this.createTestJoinColumnWithName(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - MapKeyJoinColumn2_0Annotation column = (MapKeyJoinColumn2_0Annotation) attributeResource.getAnnotation(JPA2_0.MAP_KEY_JOIN_COLUMN); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); + MapKeyJoinColumn2_0Annotation column = this.mapKeyJoinColumnAt(0, resourceField); assertEquals(COLUMN_NAME, column.getName()); @@ -163,17 +169,17 @@ public class MapKeyJoinColumn2_0AnnotationTests extends JavaResourceModel2_0Test public void testGetTable() throws Exception { ICompilationUnit cu = this.createTestJoinColumnWithTable(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - MapKeyJoinColumn2_0Annotation column = (MapKeyJoinColumn2_0Annotation) attributeResource.getAnnotation(JPA2_0.MAP_KEY_JOIN_COLUMN); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); + MapKeyJoinColumn2_0Annotation column = this.mapKeyJoinColumnAt(0, resourceField); assertEquals(COLUMN_TABLE, column.getTable()); } public void testSetTable() throws Exception { ICompilationUnit cu = this.createTestJoinColumn(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - MapKeyJoinColumn2_0Annotation column = (MapKeyJoinColumn2_0Annotation) attributeResource.getAnnotation(JPA2_0.MAP_KEY_JOIN_COLUMN); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); + MapKeyJoinColumn2_0Annotation column = this.mapKeyJoinColumnAt(0, resourceField); assertNotNull(column); assertNull(column.getTable()); @@ -190,17 +196,17 @@ public class MapKeyJoinColumn2_0AnnotationTests extends JavaResourceModel2_0Test public void testGetReferencedColumnName() throws Exception { ICompilationUnit cu = this.createTestJoinColumnWithReferencedColumnName(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - MapKeyJoinColumn2_0Annotation column = (MapKeyJoinColumn2_0Annotation) attributeResource.getAnnotation(JPA2_0.MAP_KEY_JOIN_COLUMN); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); + MapKeyJoinColumn2_0Annotation column = this.mapKeyJoinColumnAt(0, resourceField); assertEquals(COLUMN_REFERENCED_COLUMN_NAME, column.getReferencedColumnName()); } public void testSetReferencedColumnName() throws Exception { ICompilationUnit cu = this.createTestJoinColumn(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - MapKeyJoinColumn2_0Annotation column = (MapKeyJoinColumn2_0Annotation) attributeResource.getAnnotation(JPA2_0.MAP_KEY_JOIN_COLUMN); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); + MapKeyJoinColumn2_0Annotation column = this.mapKeyJoinColumnAt(0, resourceField); assertNotNull(column); assertNull(column.getReferencedColumnName()); @@ -217,17 +223,17 @@ public class MapKeyJoinColumn2_0AnnotationTests extends JavaResourceModel2_0Test public void testGetColumnDefinition() throws Exception { ICompilationUnit cu = this.createTestJoinColumnWithColumnDefinition(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - MapKeyJoinColumn2_0Annotation column = (MapKeyJoinColumn2_0Annotation) attributeResource.getAnnotation(JPA2_0.MAP_KEY_JOIN_COLUMN); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); + MapKeyJoinColumn2_0Annotation column = this.mapKeyJoinColumnAt(0, resourceField); assertEquals(COLUMN_COLUMN_DEFINITION, column.getColumnDefinition()); } public void testSetColumnDefinition() throws Exception { ICompilationUnit cu = this.createTestJoinColumn(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - MapKeyJoinColumn2_0Annotation column = (MapKeyJoinColumn2_0Annotation) attributeResource.getAnnotation(JPA2_0.MAP_KEY_JOIN_COLUMN); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); + MapKeyJoinColumn2_0Annotation column = this.mapKeyJoinColumnAt(0, resourceField); assertNotNull(column); assertNull(column.getColumnDefinition()); @@ -244,18 +250,18 @@ public class MapKeyJoinColumn2_0AnnotationTests extends JavaResourceModel2_0Test public void testGetUnique() throws Exception { ICompilationUnit cu = this.createTestJoinColumnWithBooleanElement("unique"); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - MapKeyJoinColumn2_0Annotation column = (MapKeyJoinColumn2_0Annotation) attributeResource.getAnnotation(JPA2_0.MAP_KEY_JOIN_COLUMN); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); + MapKeyJoinColumn2_0Annotation column = this.mapKeyJoinColumnAt(0, resourceField); assertEquals(Boolean.TRUE, column.getUnique()); } public void testSetUnique() throws Exception { ICompilationUnit cu = this.createTestJoinColumn(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - MapKeyJoinColumn2_0Annotation column = (MapKeyJoinColumn2_0Annotation) attributeResource.getAnnotation(JPA2_0.MAP_KEY_JOIN_COLUMN); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); + MapKeyJoinColumn2_0Annotation column = this.mapKeyJoinColumnAt(0, resourceField); assertNotNull(column); assertNull(column.getUnique()); @@ -271,18 +277,18 @@ public class MapKeyJoinColumn2_0AnnotationTests extends JavaResourceModel2_0Test public void testGetNullable() throws Exception { ICompilationUnit cu = this.createTestJoinColumnWithBooleanElement("nullable"); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - MapKeyJoinColumn2_0Annotation column = (MapKeyJoinColumn2_0Annotation) attributeResource.getAnnotation(JPA2_0.MAP_KEY_JOIN_COLUMN); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); + MapKeyJoinColumn2_0Annotation column = this.mapKeyJoinColumnAt(0, resourceField); assertEquals(Boolean.TRUE, column.getNullable()); } public void testSetNullable() throws Exception { ICompilationUnit cu = this.createTestJoinColumn(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - MapKeyJoinColumn2_0Annotation column = (MapKeyJoinColumn2_0Annotation) attributeResource.getAnnotation(JPA2_0.MAP_KEY_JOIN_COLUMN); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); + MapKeyJoinColumn2_0Annotation column = this.mapKeyJoinColumnAt(0, resourceField); assertNotNull(column); assertNull(column.getNullable()); @@ -298,18 +304,18 @@ public class MapKeyJoinColumn2_0AnnotationTests extends JavaResourceModel2_0Test public void testGetInsertable() throws Exception { ICompilationUnit cu = this.createTestJoinColumnWithBooleanElement("insertable"); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - MapKeyJoinColumn2_0Annotation column = (MapKeyJoinColumn2_0Annotation) attributeResource.getAnnotation(JPA2_0.MAP_KEY_JOIN_COLUMN); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); + MapKeyJoinColumn2_0Annotation column = this.mapKeyJoinColumnAt(0, resourceField); assertEquals(Boolean.TRUE, column.getInsertable()); } public void testSetInsertable() throws Exception { ICompilationUnit cu = this.createTestJoinColumn(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - MapKeyJoinColumn2_0Annotation column = (MapKeyJoinColumn2_0Annotation) attributeResource.getAnnotation(JPA2_0.MAP_KEY_JOIN_COLUMN); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); + MapKeyJoinColumn2_0Annotation column = this.mapKeyJoinColumnAt(0, resourceField); assertNotNull(column); assertNull(column.getInsertable()); @@ -325,18 +331,18 @@ public class MapKeyJoinColumn2_0AnnotationTests extends JavaResourceModel2_0Test public void testGetUpdatable() throws Exception { ICompilationUnit cu = this.createTestJoinColumnWithBooleanElement("updatable"); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - MapKeyJoinColumn2_0Annotation column = (MapKeyJoinColumn2_0Annotation) attributeResource.getAnnotation(JPA2_0.MAP_KEY_JOIN_COLUMN); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); + MapKeyJoinColumn2_0Annotation column = this.mapKeyJoinColumnAt(0, resourceField); assertEquals(Boolean.TRUE, column.getUpdatable()); } public void testSetUpdatable() throws Exception { ICompilationUnit cu = this.createTestJoinColumn(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - MapKeyJoinColumn2_0Annotation column = (MapKeyJoinColumn2_0Annotation) attributeResource.getAnnotation(JPA2_0.MAP_KEY_JOIN_COLUMN); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); + MapKeyJoinColumn2_0Annotation column = this.mapKeyJoinColumnAt(0, resourceField); assertNotNull(column); assertNull(column.getUpdatable()); diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/resource/java/MapKeyJoinColumns2_0AnnotationTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/resource/java/MapKeyJoinColumns2_0AnnotationTests.java index cbbdbdc7d8..1a808db599 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/resource/java/MapKeyJoinColumns2_0AnnotationTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/resource/java/MapKeyJoinColumns2_0AnnotationTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009 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,13 +12,14 @@ package org.eclipse.jpt.jpa.core.tests.internal.jpa2.resource.java; import java.util.Iterator; import org.eclipse.jdt.core.ICompilationUnit; +import org.eclipse.jpt.common.core.resource.java.JavaResourceField; +import org.eclipse.jpt.common.core.resource.java.JavaResourceMember; +import org.eclipse.jpt.common.core.resource.java.JavaResourceType; +import org.eclipse.jpt.common.core.resource.java.NestableAnnotation; import org.eclipse.jpt.common.utility.internal.CollectionTools; import org.eclipse.jpt.common.utility.internal.iterators.ArrayIterator; import org.eclipse.jpt.jpa.core.jpa2.resource.java.JPA2_0; import org.eclipse.jpt.jpa.core.jpa2.resource.java.MapKeyJoinColumn2_0Annotation; -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.NestableAnnotation; @SuppressWarnings("nls") public class MapKeyJoinColumns2_0AnnotationTests extends JavaResourceModel2_0TestCase { @@ -123,20 +124,24 @@ public class MapKeyJoinColumns2_0AnnotationTests extends JavaResourceModel2_0Tes }); } + private MapKeyJoinColumn2_0Annotation mapKeyJoinColumnAt(int index, JavaResourceMember resourceMember) { + return (MapKeyJoinColumn2_0Annotation) resourceMember.getAnnotation(index, JPA2_0.MAP_KEY_JOIN_COLUMN); + } + public void testGetName() throws Exception { ICompilationUnit cu = this.createTestJoinColumnWithName(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - MapKeyJoinColumn2_0Annotation column = (MapKeyJoinColumn2_0Annotation) attributeResource.annotations(JPA2_0.MAP_KEY_JOIN_COLUMN, JPA2_0.MAP_KEY_JOIN_COLUMNS).next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); + MapKeyJoinColumn2_0Annotation column = this.mapKeyJoinColumnAt(0, resourceField); assertNotNull(column); assertEquals(COLUMN_NAME, column.getName()); } public void testGetNull() throws Exception { ICompilationUnit cu = this.createTestJoinColumns(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - MapKeyJoinColumn2_0Annotation column = (MapKeyJoinColumn2_0Annotation) attributeResource.annotations(JPA2_0.MAP_KEY_JOIN_COLUMN, JPA2_0.MAP_KEY_JOIN_COLUMNS).next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); + MapKeyJoinColumn2_0Annotation column = this.mapKeyJoinColumnAt(0, resourceField); assertNotNull(column); assertNull(column.getName()); assertNull(column.getNullable()); @@ -149,9 +154,9 @@ public class MapKeyJoinColumns2_0AnnotationTests extends JavaResourceModel2_0Tes public void testSetName() throws Exception { ICompilationUnit cu = this.createTestJoinColumns(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - MapKeyJoinColumn2_0Annotation column = (MapKeyJoinColumn2_0Annotation) attributeResource.annotations(JPA2_0.MAP_KEY_JOIN_COLUMN, JPA2_0.MAP_KEY_JOIN_COLUMNS).next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); + MapKeyJoinColumn2_0Annotation column = this.mapKeyJoinColumnAt(0, resourceField); assertNotNull(column); assertNull(column.getName()); @@ -164,9 +169,9 @@ public class MapKeyJoinColumns2_0AnnotationTests extends JavaResourceModel2_0Tes public void testSetNameNull() throws Exception { ICompilationUnit cu = this.createTestJoinColumnWithName(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - MapKeyJoinColumn2_0Annotation column = (MapKeyJoinColumn2_0Annotation) attributeResource.annotations(JPA2_0.MAP_KEY_JOIN_COLUMN, JPA2_0.MAP_KEY_JOIN_COLUMNS).next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); + MapKeyJoinColumn2_0Annotation column = this.mapKeyJoinColumnAt(0, resourceField); assertEquals(COLUMN_NAME, column.getName()); @@ -178,17 +183,17 @@ public class MapKeyJoinColumns2_0AnnotationTests extends JavaResourceModel2_0Tes public void testGetTable() throws Exception { ICompilationUnit cu = this.createTestJoinColumnWithTable(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - MapKeyJoinColumn2_0Annotation column = (MapKeyJoinColumn2_0Annotation) attributeResource.annotations(JPA2_0.MAP_KEY_JOIN_COLUMN, JPA2_0.MAP_KEY_JOIN_COLUMNS).next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); + MapKeyJoinColumn2_0Annotation column = this.mapKeyJoinColumnAt(0, resourceField); assertEquals(COLUMN_TABLE, column.getTable()); } public void testSetTable() throws Exception { ICompilationUnit cu = this.createTestJoinColumns(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - MapKeyJoinColumn2_0Annotation column = (MapKeyJoinColumn2_0Annotation) attributeResource.annotations(JPA2_0.MAP_KEY_JOIN_COLUMN, JPA2_0.MAP_KEY_JOIN_COLUMNS).next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); + MapKeyJoinColumn2_0Annotation column = this.mapKeyJoinColumnAt(0, resourceField); assertNotNull(column); assertNull(column.getTable()); @@ -205,17 +210,17 @@ public class MapKeyJoinColumns2_0AnnotationTests extends JavaResourceModel2_0Tes public void testGetReferencedColumnName() throws Exception { ICompilationUnit cu = this.createTestJoinColumnWithReferencedColumnName(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - MapKeyJoinColumn2_0Annotation column = (MapKeyJoinColumn2_0Annotation) attributeResource.annotations(JPA2_0.MAP_KEY_JOIN_COLUMN, JPA2_0.MAP_KEY_JOIN_COLUMNS).next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); + MapKeyJoinColumn2_0Annotation column = this.mapKeyJoinColumnAt(0, resourceField); assertEquals(COLUMN_REFERENCED_COLUMN_NAME, column.getReferencedColumnName()); } public void testSetReferencedColumnName() throws Exception { ICompilationUnit cu = this.createTestJoinColumns(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - MapKeyJoinColumn2_0Annotation column = (MapKeyJoinColumn2_0Annotation) attributeResource.annotations(JPA2_0.MAP_KEY_JOIN_COLUMN, JPA2_0.MAP_KEY_JOIN_COLUMNS).next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); + MapKeyJoinColumn2_0Annotation column = this.mapKeyJoinColumnAt(0, resourceField); assertNotNull(column); assertNull(column.getReferencedColumnName()); @@ -232,17 +237,17 @@ public class MapKeyJoinColumns2_0AnnotationTests extends JavaResourceModel2_0Tes public void testGetColumnDefinition() throws Exception { ICompilationUnit cu = this.createTestJoinColumnWithColumnDefinition(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - MapKeyJoinColumn2_0Annotation column = (MapKeyJoinColumn2_0Annotation) attributeResource.annotations(JPA2_0.MAP_KEY_JOIN_COLUMN, JPA2_0.MAP_KEY_JOIN_COLUMNS).next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); + MapKeyJoinColumn2_0Annotation column = this.mapKeyJoinColumnAt(0, resourceField); assertEquals(COLUMN_COLUMN_DEFINITION, column.getColumnDefinition()); } public void testSetColumnDefinition() throws Exception { ICompilationUnit cu = this.createTestJoinColumns(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - MapKeyJoinColumn2_0Annotation column = (MapKeyJoinColumn2_0Annotation) attributeResource.annotations(JPA2_0.MAP_KEY_JOIN_COLUMN, JPA2_0.MAP_KEY_JOIN_COLUMNS).next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); + MapKeyJoinColumn2_0Annotation column = this.mapKeyJoinColumnAt(0, resourceField); assertNotNull(column); assertNull(column.getColumnDefinition()); @@ -259,18 +264,18 @@ public class MapKeyJoinColumns2_0AnnotationTests extends JavaResourceModel2_0Tes public void testGetUnique() throws Exception { ICompilationUnit cu = this.createTestJoinColumnWithBooleanElement("unique"); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - MapKeyJoinColumn2_0Annotation column = (MapKeyJoinColumn2_0Annotation) attributeResource.annotations(JPA2_0.MAP_KEY_JOIN_COLUMN, JPA2_0.MAP_KEY_JOIN_COLUMNS).next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); + MapKeyJoinColumn2_0Annotation column = this.mapKeyJoinColumnAt(0, resourceField); assertTrue(column.getUnique().booleanValue()); } public void testSetUnique() throws Exception { ICompilationUnit cu = this.createTestJoinColumns(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - MapKeyJoinColumn2_0Annotation column = (MapKeyJoinColumn2_0Annotation) attributeResource.annotations(JPA2_0.MAP_KEY_JOIN_COLUMN, JPA2_0.MAP_KEY_JOIN_COLUMNS).next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); + MapKeyJoinColumn2_0Annotation column = this.mapKeyJoinColumnAt(0, resourceField); assertNotNull(column); assertNull(column.getUnique()); @@ -286,18 +291,18 @@ public class MapKeyJoinColumns2_0AnnotationTests extends JavaResourceModel2_0Tes public void testGetNullable() throws Exception { ICompilationUnit cu = this.createTestJoinColumnWithBooleanElement("nullable"); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - MapKeyJoinColumn2_0Annotation column = (MapKeyJoinColumn2_0Annotation) attributeResource.annotations(JPA2_0.MAP_KEY_JOIN_COLUMN, JPA2_0.MAP_KEY_JOIN_COLUMNS).next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); + MapKeyJoinColumn2_0Annotation column = this.mapKeyJoinColumnAt(0, resourceField); assertTrue(column.getNullable().booleanValue()); } public void testSetNullable() throws Exception { ICompilationUnit cu = this.createTestJoinColumns(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - MapKeyJoinColumn2_0Annotation column = (MapKeyJoinColumn2_0Annotation) attributeResource.annotations(JPA2_0.MAP_KEY_JOIN_COLUMN, JPA2_0.MAP_KEY_JOIN_COLUMNS).next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); + MapKeyJoinColumn2_0Annotation column = this.mapKeyJoinColumnAt(0, resourceField); assertNotNull(column); assertNull(column.getNullable()); @@ -313,18 +318,18 @@ public class MapKeyJoinColumns2_0AnnotationTests extends JavaResourceModel2_0Tes public void testGetInsertable() throws Exception { ICompilationUnit cu = this.createTestJoinColumnWithBooleanElement("insertable"); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - MapKeyJoinColumn2_0Annotation column = (MapKeyJoinColumn2_0Annotation) attributeResource.annotations(JPA2_0.MAP_KEY_JOIN_COLUMN, JPA2_0.MAP_KEY_JOIN_COLUMNS).next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); + MapKeyJoinColumn2_0Annotation column = this.mapKeyJoinColumnAt(0, resourceField); assertTrue(column.getInsertable().booleanValue()); } public void testSetInsertable() throws Exception { ICompilationUnit cu = this.createTestJoinColumns(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - MapKeyJoinColumn2_0Annotation column = (MapKeyJoinColumn2_0Annotation) attributeResource.annotations(JPA2_0.MAP_KEY_JOIN_COLUMN, JPA2_0.MAP_KEY_JOIN_COLUMNS).next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); + MapKeyJoinColumn2_0Annotation column = this.mapKeyJoinColumnAt(0, resourceField); assertNotNull(column); assertNull(column.getInsertable()); @@ -340,18 +345,18 @@ public class MapKeyJoinColumns2_0AnnotationTests extends JavaResourceModel2_0Tes public void testGetUpdatable() throws Exception { ICompilationUnit cu = this.createTestJoinColumnWithBooleanElement("updatable"); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - MapKeyJoinColumn2_0Annotation column = (MapKeyJoinColumn2_0Annotation) attributeResource.annotations(JPA2_0.MAP_KEY_JOIN_COLUMN, JPA2_0.MAP_KEY_JOIN_COLUMNS).next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); + MapKeyJoinColumn2_0Annotation column = this.mapKeyJoinColumnAt(0, resourceField); assertTrue(column.getUpdatable().booleanValue()); } public void testSetUpdatable() throws Exception { ICompilationUnit cu = this.createTestJoinColumns(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - MapKeyJoinColumn2_0Annotation column = (MapKeyJoinColumn2_0Annotation) attributeResource.annotations(JPA2_0.MAP_KEY_JOIN_COLUMN, JPA2_0.MAP_KEY_JOIN_COLUMNS).next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); + MapKeyJoinColumn2_0Annotation column = this.mapKeyJoinColumnAt(0, resourceField); assertNotNull(column); assertNull(column.getUpdatable()); @@ -368,53 +373,76 @@ public class MapKeyJoinColumns2_0AnnotationTests extends JavaResourceModel2_0Tes public void testAddJoinColumnCopyExisting() throws Exception { ICompilationUnit cu = createTestJoinColumn(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - MapKeyJoinColumn2_0Annotation joinColumn = (MapKeyJoinColumn2_0Annotation) attributeResource.addAnnotation(1, JPA2_0.MAP_KEY_JOIN_COLUMN, JPA2_0.MAP_KEY_JOIN_COLUMNS); + String expected1 = "@MapKeyJoinColumns({"; + String expected2 = "@MapKeyJoinColumn(name = \"BAR\", referencedColumnName = \"REF_NAME\", unique = false, nullable = false, insertable = false, updatable = false, columnDefinition = \"COLUMN_DEF\", table = \"TABLE\"),"; + String expected3 = "@MapKeyJoinColumn(name = \"FOO\") })"; + MapKeyJoinColumn2_0Annotation joinColumn = (MapKeyJoinColumn2_0Annotation) resourceField.addAnnotation(1, JPA2_0.MAP_KEY_JOIN_COLUMN); joinColumn.setName("FOO"); - assertSourceContains("@MapKeyJoinColumns({@MapKeyJoinColumn(name = \"BAR\", columnDefinition = \"COLUMN_DEF\", table = \"TABLE\", unique = false, nullable = false, insertable = false, updatable = false, referencedColumnName = \"REF_NAME\"),@MapKeyJoinColumn(name = \"FOO\")})", cu); + assertSourceContains(expected1, cu); + assertSourceContains(expected2, cu); + assertSourceContains(expected3, cu); - assertNull(attributeResource.getAnnotation(JPA2_0.MAP_KEY_JOIN_COLUMN)); - assertNotNull(attributeResource.getAnnotation(JPA2_0.MAP_KEY_JOIN_COLUMNS)); - assertEquals(2, CollectionTools.size(attributeResource.annotations(JPA2_0.MAP_KEY_JOIN_COLUMN, JPA2_0.MAP_KEY_JOIN_COLUMNS))); + assertNull(resourceField.getAnnotation(JPA2_0.MAP_KEY_JOIN_COLUMN)); + assertNotNull(resourceField.getAnnotation(JPA2_0.MAP_KEY_JOIN_COLUMNS)); + assertNotNull(resourceField.getAnnotation(0, JPA2_0.MAP_KEY_JOIN_COLUMN)); + assertEquals(2, resourceField.getAnnotationsSize(JPA2_0.MAP_KEY_JOIN_COLUMN)); } public void testAddJoinColumnToBeginningOfList() throws Exception { ICompilationUnit cu = createTestJoinColumn(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - MapKeyJoinColumn2_0Annotation joinColumn = (MapKeyJoinColumn2_0Annotation) attributeResource.addAnnotation(1, JPA2_0.MAP_KEY_JOIN_COLUMN, JPA2_0.MAP_KEY_JOIN_COLUMNS); + String expected1 = "@MapKeyJoinColumns({"; + String expected2 = "@MapKeyJoinColumn(name = \"BAR\", referencedColumnName = \"REF_NAME\", unique = false, nullable = false, insertable = false, updatable = false, columnDefinition = \"COLUMN_DEF\", table = \"TABLE\"),"; + String expected3 = "@MapKeyJoinColumn(name = \"FOO\") })"; + MapKeyJoinColumn2_0Annotation joinColumn = (MapKeyJoinColumn2_0Annotation) resourceField.addAnnotation(1, JPA2_0.MAP_KEY_JOIN_COLUMN); joinColumn.setName("FOO"); - assertSourceContains("@MapKeyJoinColumns({@MapKeyJoinColumn(name = \"BAR\", columnDefinition = \"COLUMN_DEF\", table = \"TABLE\", unique = false, nullable = false, insertable = false, updatable = false, referencedColumnName = \"REF_NAME\"),@MapKeyJoinColumn(name = \"FOO\")})", cu); + assertSourceContains(expected1, cu); + assertSourceContains(expected2, cu); + assertSourceContains(expected3, cu); - joinColumn = (MapKeyJoinColumn2_0Annotation) attributeResource.addAnnotation(0, JPA2_0.MAP_KEY_JOIN_COLUMN, JPA2_0.MAP_KEY_JOIN_COLUMNS); + expected2 = "@MapKeyJoinColumn(name = \"BAZ\"),"; + expected3 = "@MapKeyJoinColumn(name = \"BAR\", referencedColumnName = \"REF_NAME\", unique = false, nullable = false, insertable = false, updatable = false, columnDefinition = \"COLUMN_DEF\", table = \"TABLE\"), @MapKeyJoinColumn(name = \"FOO\") })"; + joinColumn = (MapKeyJoinColumn2_0Annotation) resourceField.addAnnotation(0, JPA2_0.MAP_KEY_JOIN_COLUMN); joinColumn.setName("BAZ"); - assertSourceContains("@MapKeyJoinColumns({@MapKeyJoinColumn(name = \"BAZ\"),@MapKeyJoinColumn(name = \"BAR\", columnDefinition = \"COLUMN_DEF\", table = \"TABLE\", unique = false, nullable = false, insertable = false, updatable = false, referencedColumnName = \"REF_NAME\"), @MapKeyJoinColumn(name = \"FOO\")})", cu); + assertSourceContains(expected1, cu); + assertSourceContains(expected2, cu); + assertSourceContains(expected3, cu); - Iterator joinColumns = attributeResource.annotations(JPA2_0.MAP_KEY_JOIN_COLUMN, JPA2_0.MAP_KEY_JOIN_COLUMNS); + Iterator joinColumns = resourceField.getAnnotations(JPA2_0.MAP_KEY_JOIN_COLUMN).iterator(); assertEquals("BAZ", ((MapKeyJoinColumn2_0Annotation) joinColumns.next()).getName()); assertEquals("BAR", ((MapKeyJoinColumn2_0Annotation) joinColumns.next()).getName()); assertEquals("FOO", ((MapKeyJoinColumn2_0Annotation) joinColumns.next()).getName()); - assertNull(attributeResource.getAnnotation(JPA2_0.MAP_KEY_JOIN_COLUMN)); - assertNotNull(attributeResource.getAnnotation(JPA2_0.MAP_KEY_JOIN_COLUMNS)); - assertEquals(3, CollectionTools.size(attributeResource.annotations(JPA2_0.MAP_KEY_JOIN_COLUMN, JPA2_0.MAP_KEY_JOIN_COLUMNS))); + assertNull(resourceField.getAnnotation(JPA2_0.MAP_KEY_JOIN_COLUMN)); + assertNotNull(resourceField.getAnnotation(JPA2_0.MAP_KEY_JOIN_COLUMNS)); + assertNotNull(resourceField.getAnnotation(0, JPA2_0.MAP_KEY_JOIN_COLUMN)); + assertEquals(3, resourceField.getAnnotationsSize(JPA2_0.MAP_KEY_JOIN_COLUMN)); } public void testRemoveJoinColumnCopyExisting() throws Exception { ICompilationUnit cu = createTestJoinColumn(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - MapKeyJoinColumn2_0Annotation joinColumn = (MapKeyJoinColumn2_0Annotation) attributeResource.addAnnotation(1, JPA2_0.MAP_KEY_JOIN_COLUMN, JPA2_0.MAP_KEY_JOIN_COLUMNS); + String expected1 = "@MapKeyJoinColumns({"; + String expected2 = "@MapKeyJoinColumn(name = \"BAR\", referencedColumnName = \"REF_NAME\", unique = false, nullable = false, insertable = false, updatable = false, columnDefinition = \"COLUMN_DEF\", table = \"TABLE\"),"; + String expected3 = "@MapKeyJoinColumn(name = \"FOO\") })"; + MapKeyJoinColumn2_0Annotation joinColumn = (MapKeyJoinColumn2_0Annotation) resourceField.addAnnotation(1, JPA2_0.MAP_KEY_JOIN_COLUMN); joinColumn.setName("FOO"); - assertSourceContains("@MapKeyJoinColumns({@MapKeyJoinColumn(name = \"BAR\", columnDefinition = \"COLUMN_DEF\", table = \"TABLE\", unique = false, nullable = false, insertable = false, updatable = false, referencedColumnName = \"REF_NAME\"),@MapKeyJoinColumn(name = \"FOO\")})", cu); + assertSourceContains(expected1, cu); + assertSourceContains(expected2, cu); + assertSourceContains(expected3, cu); - attributeResource.removeAnnotation(1, JPA2_0.MAP_KEY_JOIN_COLUMN, JPA2_0.MAP_KEY_JOIN_COLUMNS); - assertSourceContains("@MapKeyJoinColumn(name = \"BAR\", columnDefinition = \"COLUMN_DEF\", table = \"TABLE\", unique = false, nullable = false, insertable = false, updatable = false, referencedColumnName = \"REF_NAME\")", cu); + expected2 = "@MapKeyJoinColumn(name = \"BAR\", referencedColumnName = \"REF_NAME\", unique = false, nullable = false, insertable = false, updatable = false, columnDefinition = \"COLUMN_DEF\", table = \"TABLE\")"; + resourceField.removeAnnotation(1, JPA2_0.MAP_KEY_JOIN_COLUMN); + assertSourceContains(expected2, cu); + assertSourceDoesNotContain("@MapKeyJoinColumns", cu); } } diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/resource/java/MapKeyTemporal2_0AnnotationTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/resource/java/MapKeyTemporal2_0AnnotationTests.java index 896af981e0..eb24ff354d 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/resource/java/MapKeyTemporal2_0AnnotationTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/resource/java/MapKeyTemporal2_0AnnotationTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009 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. @@ -11,12 +11,13 @@ package org.eclipse.jpt.jpa.core.tests.internal.jpa2.resource.java; import java.util.Iterator; import org.eclipse.jdt.core.ICompilationUnit; +import org.eclipse.jpt.common.core.resource.java.JavaResourceField; +import org.eclipse.jpt.common.core.resource.java.JavaResourceType; +import org.eclipse.jpt.common.utility.internal.CollectionTools; import org.eclipse.jpt.common.utility.internal.iterators.ArrayIterator; import org.eclipse.jpt.jpa.core.jpa2.resource.java.JPA2_0; import org.eclipse.jpt.jpa.core.jpa2.resource.java.MapKeyTemporal2_0Annotation; 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.TemporalType; @SuppressWarnings("nls") @@ -54,28 +55,28 @@ public class MapKeyTemporal2_0AnnotationTests extends JavaResourceModel2_0TestCa public void testTemporal() throws Exception { ICompilationUnit cu = this.createTestTemporal(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - MapKeyTemporal2_0Annotation temporal = (MapKeyTemporal2_0Annotation) attributeResource.getAnnotation(JPA2_0.MAP_KEY_TEMPORAL); + MapKeyTemporal2_0Annotation temporal = (MapKeyTemporal2_0Annotation) resourceField.getAnnotation(JPA2_0.MAP_KEY_TEMPORAL); assertNotNull(temporal); } public void testGetValue() throws Exception { ICompilationUnit cu = this.createTestTemporalWithValue(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - MapKeyTemporal2_0Annotation temporal = (MapKeyTemporal2_0Annotation) attributeResource.getAnnotation(JPA2_0.MAP_KEY_TEMPORAL); + MapKeyTemporal2_0Annotation temporal = (MapKeyTemporal2_0Annotation) resourceField.getAnnotation(JPA2_0.MAP_KEY_TEMPORAL); assertEquals(TemporalType.DATE, temporal.getValue()); } public void testSetValue() throws Exception { ICompilationUnit cu = this.createTestTemporal(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - MapKeyTemporal2_0Annotation temporal = (MapKeyTemporal2_0Annotation) attributeResource.getAnnotation(JPA2_0.MAP_KEY_TEMPORAL); + MapKeyTemporal2_0Annotation temporal = (MapKeyTemporal2_0Annotation) resourceField.getAnnotation(JPA2_0.MAP_KEY_TEMPORAL); temporal.setValue(TemporalType.TIME); diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/resource/java/MapsId2_0AnnotationTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/resource/java/MapsId2_0AnnotationTests.java index 301a7d52b2..ea19e54fb6 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/resource/java/MapsId2_0AnnotationTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/resource/java/MapsId2_0AnnotationTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009 Oracle. + * 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 @@ -12,11 +12,12 @@ package org.eclipse.jpt.jpa.core.tests.internal.jpa2.resource.java; import java.util.Iterator; import org.eclipse.jdt.core.ICompilationUnit; +import org.eclipse.jpt.common.core.resource.java.JavaResourceField; +import org.eclipse.jpt.common.core.resource.java.JavaResourceType; +import org.eclipse.jpt.common.utility.internal.CollectionTools; import org.eclipse.jpt.common.utility.internal.iterators.ArrayIterator; import org.eclipse.jpt.jpa.core.jpa2.resource.java.JPA2_0; import org.eclipse.jpt.jpa.core.jpa2.resource.java.MapsId2_0Annotation; -import org.eclipse.jpt.jpa.core.resource.java.JavaResourcePersistentAttribute; -import org.eclipse.jpt.jpa.core.resource.java.JavaResourcePersistentType; @SuppressWarnings("nls") public class MapsId2_0AnnotationTests @@ -55,28 +56,28 @@ public class MapsId2_0AnnotationTests public void testMapsId() throws Exception { ICompilationUnit cu = this.createTestMapsId(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - MapsId2_0Annotation annotation = (MapsId2_0Annotation) attributeResource.getAnnotation(JPA2_0.MAPS_ID); + MapsId2_0Annotation annotation = (MapsId2_0Annotation) resourceField.getAnnotation(JPA2_0.MAPS_ID); assertNotNull(annotation); } public void testGetValue() throws Exception { ICompilationUnit cu = this.createTestMapsIdWithValue(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - MapsId2_0Annotation annotation = (MapsId2_0Annotation) attributeResource.getAnnotation(JPA2_0.MAPS_ID); + MapsId2_0Annotation annotation = (MapsId2_0Annotation) resourceField.getAnnotation(JPA2_0.MAPS_ID); assertEquals("foo", annotation.getValue()); } public void testSetValue() throws Exception { ICompilationUnit cu = this.createTestMapsId(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - MapsId2_0Annotation annotation = (MapsId2_0Annotation) attributeResource.getAnnotation(JPA2_0.MAPS_ID); + MapsId2_0Annotation annotation = (MapsId2_0Annotation) resourceField.getAnnotation(JPA2_0.MAPS_ID); annotation.setValue("foo"); assertSourceContains("@MapsId(\"foo\")", cu); diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/resource/java/OneToMany2_0AnnotationTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/resource/java/OneToMany2_0AnnotationTests.java index d2ba109ebc..9f45b12f7b 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/resource/java/OneToMany2_0AnnotationTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/resource/java/OneToMany2_0AnnotationTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2010 Oracle. All rights reserved. + * Copyright (c) 2010, 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. @@ -11,12 +11,13 @@ package org.eclipse.jpt.jpa.core.tests.internal.jpa2.resource.java; import java.util.Iterator; import org.eclipse.jdt.core.ICompilationUnit; +import org.eclipse.jpt.common.core.resource.java.JavaResourceField; +import org.eclipse.jpt.common.core.resource.java.JavaResourceType; +import org.eclipse.jpt.common.utility.internal.CollectionTools; import org.eclipse.jpt.common.utility.internal.iterators.ArrayIterator; import org.eclipse.jpt.jpa.core.jpa2.resource.java.OneToMany2_0Annotation; import org.eclipse.jpt.jpa.core.resource.java.FetchType; 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.OneToManyAnnotation; @SuppressWarnings("nls") @@ -119,28 +120,28 @@ public class OneToMany2_0AnnotationTests extends JavaResourceModel2_0TestCase { public void testOneToMany() throws Exception { ICompilationUnit cu = this.createTestOneToMany(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - OneToManyAnnotation oneToMany = (OneToManyAnnotation) attributeResource.getAnnotation(JPA.ONE_TO_MANY); + OneToManyAnnotation oneToMany = (OneToManyAnnotation) resourceField.getAnnotation(JPA.ONE_TO_MANY); assertNotNull(oneToMany); } public void testGetFetch() throws Exception { ICompilationUnit cu = this.createTestOneToManyWithFetch(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - OneToManyAnnotation oneToMany = (OneToManyAnnotation) attributeResource.getAnnotation(JPA.ONE_TO_MANY); + OneToManyAnnotation oneToMany = (OneToManyAnnotation) resourceField.getAnnotation(JPA.ONE_TO_MANY); assertEquals(FetchType.EAGER, oneToMany.getFetch()); } public void testSetFetch() throws Exception { ICompilationUnit cu = this.createTestOneToManyWithFetch(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - OneToManyAnnotation oneToMany = (OneToManyAnnotation) attributeResource.getAnnotation(JPA.ONE_TO_MANY); + OneToManyAnnotation oneToMany = (OneToManyAnnotation) resourceField.getAnnotation(JPA.ONE_TO_MANY); assertEquals(FetchType.EAGER, oneToMany.getFetch()); oneToMany.setFetch(FetchType.LAZY); @@ -151,10 +152,10 @@ public class OneToMany2_0AnnotationTests extends JavaResourceModel2_0TestCase { public void testSetFetchNull() throws Exception { ICompilationUnit cu = this.createTestOneToManyWithFetch(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - OneToManyAnnotation oneToMany = (OneToManyAnnotation) attributeResource.getAnnotation(JPA.ONE_TO_MANY); + OneToManyAnnotation oneToMany = (OneToManyAnnotation) resourceField.getAnnotation(JPA.ONE_TO_MANY); assertEquals(FetchType.EAGER, oneToMany.getFetch()); oneToMany.setFetch(null); @@ -167,19 +168,19 @@ public class OneToMany2_0AnnotationTests extends JavaResourceModel2_0TestCase { public void testGetTargetEntity() throws Exception { ICompilationUnit cu = this.createTestOneToManyWithTargetEntity(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - OneToManyAnnotation oneToMany = (OneToManyAnnotation) attributeResource.getAnnotation(JPA.ONE_TO_MANY); + OneToManyAnnotation oneToMany = (OneToManyAnnotation) resourceField.getAnnotation(JPA.ONE_TO_MANY); assertEquals(TYPE_NAME, oneToMany.getTargetEntity()); } public void testSetTargetEntity() throws Exception { ICompilationUnit cu = this.createTestOneToManyWithTargetEntity(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - OneToManyAnnotation oneToMany = (OneToManyAnnotation) attributeResource.getAnnotation(JPA.ONE_TO_MANY); + OneToManyAnnotation oneToMany = (OneToManyAnnotation) resourceField.getAnnotation(JPA.ONE_TO_MANY); assertEquals(TYPE_NAME, oneToMany.getTargetEntity()); oneToMany.setTargetEntity("Foo"); @@ -189,10 +190,10 @@ public class OneToMany2_0AnnotationTests extends JavaResourceModel2_0TestCase { public void testSetTargetEntityNull() throws Exception { ICompilationUnit cu = this.createTestOneToManyWithTargetEntity(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - OneToManyAnnotation oneToMany = (OneToManyAnnotation) attributeResource.getAnnotation(JPA.ONE_TO_MANY); + OneToManyAnnotation oneToMany = (OneToManyAnnotation) resourceField.getAnnotation(JPA.ONE_TO_MANY); assertEquals(TYPE_NAME, oneToMany.getTargetEntity()); oneToMany.setTargetEntity(null); @@ -204,10 +205,10 @@ public class OneToMany2_0AnnotationTests extends JavaResourceModel2_0TestCase { public void testGetFullyQualifiedTargetEntity() throws Exception { ICompilationUnit cu = this.createTestOneToManyWithTargetEntity(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - OneToManyAnnotation oneToMany = (OneToManyAnnotation) attributeResource.getAnnotation(JPA.ONE_TO_MANY); + OneToManyAnnotation oneToMany = (OneToManyAnnotation) resourceField.getAnnotation(JPA.ONE_TO_MANY); assertEquals(FULLY_QUALIFIED_TYPE_NAME, oneToMany.getFullyQualifiedTargetEntityClassName()); oneToMany.setTargetEntity("Foo"); @@ -221,29 +222,29 @@ public class OneToMany2_0AnnotationTests extends JavaResourceModel2_0TestCase { public void testGetMappedBy() throws Exception { ICompilationUnit cu = this.createTestOneToManyWithMappedBy(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - OneToManyAnnotation oneToMany = (OneToManyAnnotation) attributeResource.getAnnotation(JPA.ONE_TO_MANY); + OneToManyAnnotation oneToMany = (OneToManyAnnotation) resourceField.getAnnotation(JPA.ONE_TO_MANY); assertEquals("foo", oneToMany.getMappedBy()); } public void testGetMappedByNull() throws Exception { ICompilationUnit cu = this.createTestOneToMany(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - OneToManyAnnotation oneToMany = (OneToManyAnnotation) attributeResource.getAnnotation(JPA.ONE_TO_MANY); + OneToManyAnnotation oneToMany = (OneToManyAnnotation) resourceField.getAnnotation(JPA.ONE_TO_MANY); assertEquals(null, oneToMany.getMappedBy()); } public void testSetMappedBy() throws Exception { ICompilationUnit cu = this.createTestOneToMany(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - OneToManyAnnotation oneToMany = (OneToManyAnnotation) attributeResource.getAnnotation(JPA.ONE_TO_MANY); + OneToManyAnnotation oneToMany = (OneToManyAnnotation) resourceField.getAnnotation(JPA.ONE_TO_MANY); assertNull(oneToMany.getMappedBy()); oneToMany.setMappedBy("bar"); assertEquals("bar", oneToMany.getMappedBy()); @@ -253,10 +254,10 @@ public class OneToMany2_0AnnotationTests extends JavaResourceModel2_0TestCase { public void testSetMappedByNull() throws Exception { ICompilationUnit cu = this.createTestOneToManyWithMappedBy(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - OneToManyAnnotation oneToMany = (OneToManyAnnotation) attributeResource.getAnnotation(JPA.ONE_TO_MANY); + OneToManyAnnotation oneToMany = (OneToManyAnnotation) resourceField.getAnnotation(JPA.ONE_TO_MANY); assertEquals("foo", oneToMany.getMappedBy()); oneToMany.setMappedBy(null); @@ -268,10 +269,10 @@ public class OneToMany2_0AnnotationTests extends JavaResourceModel2_0TestCase { public void testSetCascadeAll() throws Exception { ICompilationUnit cu = this.createTestOneToMany(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - OneToManyAnnotation oneToMany = (OneToManyAnnotation) attributeResource.getAnnotation(JPA.ONE_TO_MANY); + OneToManyAnnotation oneToMany = (OneToManyAnnotation) resourceField.getAnnotation(JPA.ONE_TO_MANY); assertFalse(oneToMany.isCascadeAll()); oneToMany.setCascadeAll(true); @@ -282,10 +283,10 @@ public class OneToMany2_0AnnotationTests extends JavaResourceModel2_0TestCase { public void testSetCascadeMerge() throws Exception { ICompilationUnit cu = this.createTestOneToMany(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - OneToManyAnnotation oneToMany = (OneToManyAnnotation) attributeResource.getAnnotation(JPA.ONE_TO_MANY); + OneToManyAnnotation oneToMany = (OneToManyAnnotation) resourceField.getAnnotation(JPA.ONE_TO_MANY); assertFalse(oneToMany.isCascadeMerge()); oneToMany.setCascadeMerge(true); @@ -296,10 +297,10 @@ public class OneToMany2_0AnnotationTests extends JavaResourceModel2_0TestCase { public void testSetCascadePersist() throws Exception { ICompilationUnit cu = this.createTestOneToMany(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - OneToManyAnnotation oneToMany = (OneToManyAnnotation) attributeResource.getAnnotation(JPA.ONE_TO_MANY); + OneToManyAnnotation oneToMany = (OneToManyAnnotation) resourceField.getAnnotation(JPA.ONE_TO_MANY); assertFalse(oneToMany.isCascadePersist()); oneToMany.setCascadePersist(true); @@ -310,10 +311,10 @@ public class OneToMany2_0AnnotationTests extends JavaResourceModel2_0TestCase { public void testSetCascadeRemove() throws Exception { ICompilationUnit cu = this.createTestOneToMany(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - OneToManyAnnotation oneToMany = (OneToManyAnnotation) attributeResource.getAnnotation(JPA.ONE_TO_MANY); + OneToManyAnnotation oneToMany = (OneToManyAnnotation) resourceField.getAnnotation(JPA.ONE_TO_MANY); assertFalse(oneToMany.isCascadeRemove()); oneToMany.setCascadeRemove(true); @@ -324,10 +325,10 @@ public class OneToMany2_0AnnotationTests extends JavaResourceModel2_0TestCase { public void testSetCascadeRefresh() throws Exception { ICompilationUnit cu = this.createTestOneToMany(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - OneToManyAnnotation oneToMany = (OneToManyAnnotation) attributeResource.getAnnotation(JPA.ONE_TO_MANY); + OneToManyAnnotation oneToMany = (OneToManyAnnotation) resourceField.getAnnotation(JPA.ONE_TO_MANY); assertFalse(oneToMany.isCascadeRefresh()); oneToMany.setCascadeRefresh(true); @@ -338,10 +339,10 @@ public class OneToMany2_0AnnotationTests extends JavaResourceModel2_0TestCase { public void testSetCascadeDetach() throws Exception { ICompilationUnit cu = this.createTestOneToMany(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - OneToMany2_0Annotation oneToMany = (OneToMany2_0Annotation) attributeResource.getAnnotation(JPA.ONE_TO_MANY); + OneToMany2_0Annotation oneToMany = (OneToMany2_0Annotation) resourceField.getAnnotation(JPA.ONE_TO_MANY); assertFalse(oneToMany.isCascadeDetach()); oneToMany.setCascadeDetach(true); @@ -352,10 +353,10 @@ public class OneToMany2_0AnnotationTests extends JavaResourceModel2_0TestCase { public void testCascadeMoreThanOnce() throws Exception { ICompilationUnit cu = this.createTestOneToManyWithCascade(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - OneToManyAnnotation oneToMany = (OneToManyAnnotation) attributeResource.getAnnotation(JPA.ONE_TO_MANY); + OneToManyAnnotation oneToMany = (OneToManyAnnotation) resourceField.getAnnotation(JPA.ONE_TO_MANY); assertTrue(oneToMany.isCascadeAll()); oneToMany.setCascadeAll(true); @@ -377,10 +378,10 @@ public class OneToMany2_0AnnotationTests extends JavaResourceModel2_0TestCase { public void testDuplicateCascade() throws Exception { ICompilationUnit cu = this.createTestOneToManyWithDuplicateCascade(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - OneToManyAnnotation oneToMany = (OneToManyAnnotation) attributeResource.getAnnotation(JPA.ONE_TO_MANY); + OneToManyAnnotation oneToMany = (OneToManyAnnotation) resourceField.getAnnotation(JPA.ONE_TO_MANY); assertTrue(oneToMany.isCascadeMerge()); oneToMany.setCascadeMerge(false);//TODO should the resource model handle this and remove both MERGE @@ -395,10 +396,10 @@ public class OneToMany2_0AnnotationTests extends JavaResourceModel2_0TestCase { public void testMultipleCascade() throws Exception { ICompilationUnit cu = this.createTestOneToManyWithMultipleCascade(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - OneToManyAnnotation oneToMany = (OneToManyAnnotation) attributeResource.getAnnotation(JPA.ONE_TO_MANY); + OneToManyAnnotation oneToMany = (OneToManyAnnotation) resourceField.getAnnotation(JPA.ONE_TO_MANY); assertTrue(oneToMany.isCascadeMerge()); assertTrue(oneToMany.isCascadeRemove()); diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/resource/java/OneToOne2_0AnnotationTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/resource/java/OneToOne2_0AnnotationTests.java index 0b62b90ed0..28b8bedbd7 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/resource/java/OneToOne2_0AnnotationTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/resource/java/OneToOne2_0AnnotationTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2010 Oracle. All rights reserved. + * Copyright (c) 2010, 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. @@ -11,12 +11,13 @@ package org.eclipse.jpt.jpa.core.tests.internal.jpa2.resource.java; import java.util.Iterator; import org.eclipse.jdt.core.ICompilationUnit; +import org.eclipse.jpt.common.core.resource.java.JavaResourceField; +import org.eclipse.jpt.common.core.resource.java.JavaResourceType; +import org.eclipse.jpt.common.utility.internal.CollectionTools; import org.eclipse.jpt.common.utility.internal.iterators.ArrayIterator; import org.eclipse.jpt.jpa.core.jpa2.resource.java.OneToOne2_0Annotation; import org.eclipse.jpt.jpa.core.resource.java.FetchType; 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.OneToOneAnnotation; @SuppressWarnings("nls") @@ -132,28 +133,28 @@ public class OneToOne2_0AnnotationTests extends JavaResourceModel2_0TestCase { public void testOneToOne() throws Exception { ICompilationUnit cu = this.createTestOneToOne(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - OneToOneAnnotation oneToOne = (OneToOneAnnotation) attributeResource.getAnnotation(JPA.ONE_TO_ONE); + OneToOneAnnotation oneToOne = (OneToOneAnnotation) resourceField.getAnnotation(JPA.ONE_TO_ONE); assertNotNull(oneToOne); } public void testGetFetch() throws Exception { ICompilationUnit cu = this.createTestOneToOneWithFetch(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - OneToOneAnnotation oneToOne = (OneToOneAnnotation) attributeResource.getAnnotation(JPA.ONE_TO_ONE); + OneToOneAnnotation oneToOne = (OneToOneAnnotation) resourceField.getAnnotation(JPA.ONE_TO_ONE); assertEquals(FetchType.EAGER, oneToOne.getFetch()); } public void testSetFetch() throws Exception { ICompilationUnit cu = this.createTestOneToOneWithFetch(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - OneToOneAnnotation oneToOne = (OneToOneAnnotation) attributeResource.getAnnotation(JPA.ONE_TO_ONE); + OneToOneAnnotation oneToOne = (OneToOneAnnotation) resourceField.getAnnotation(JPA.ONE_TO_ONE); assertEquals(FetchType.EAGER, oneToOne.getFetch()); oneToOne.setFetch(FetchType.LAZY); @@ -164,10 +165,10 @@ public class OneToOne2_0AnnotationTests extends JavaResourceModel2_0TestCase { public void testSetFetchNull() throws Exception { ICompilationUnit cu = this.createTestOneToOneWithFetch(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - OneToOneAnnotation oneToOne = (OneToOneAnnotation) attributeResource.getAnnotation(JPA.ONE_TO_ONE); + OneToOneAnnotation oneToOne = (OneToOneAnnotation) resourceField.getAnnotation(JPA.ONE_TO_ONE); assertEquals(FetchType.EAGER, oneToOne.getFetch()); oneToOne.setFetch(null); @@ -180,19 +181,19 @@ public class OneToOne2_0AnnotationTests extends JavaResourceModel2_0TestCase { public void testGetTargetEntity() throws Exception { ICompilationUnit cu = this.createTestOneToOneWithTargetEntity(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - OneToOneAnnotation oneToOne = (OneToOneAnnotation) attributeResource.getAnnotation(JPA.ONE_TO_ONE); + OneToOneAnnotation oneToOne = (OneToOneAnnotation) resourceField.getAnnotation(JPA.ONE_TO_ONE); assertEquals(TYPE_NAME, oneToOne.getTargetEntity()); } public void testSetTargetEntity() throws Exception { ICompilationUnit cu = this.createTestOneToOneWithTargetEntity(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - OneToOneAnnotation oneToOne = (OneToOneAnnotation) attributeResource.getAnnotation(JPA.ONE_TO_ONE); + OneToOneAnnotation oneToOne = (OneToOneAnnotation) resourceField.getAnnotation(JPA.ONE_TO_ONE); assertEquals(TYPE_NAME, oneToOne.getTargetEntity()); oneToOne.setTargetEntity("Foo"); @@ -202,10 +203,10 @@ public class OneToOne2_0AnnotationTests extends JavaResourceModel2_0TestCase { public void testSetTargetEntityNull() throws Exception { ICompilationUnit cu = this.createTestOneToOneWithTargetEntity(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - OneToOneAnnotation oneToOne = (OneToOneAnnotation) attributeResource.getAnnotation(JPA.ONE_TO_ONE); + OneToOneAnnotation oneToOne = (OneToOneAnnotation) resourceField.getAnnotation(JPA.ONE_TO_ONE); assertEquals(TYPE_NAME, oneToOne.getTargetEntity()); oneToOne.setTargetEntity(null); @@ -217,10 +218,10 @@ public class OneToOne2_0AnnotationTests extends JavaResourceModel2_0TestCase { public void testGetFullyQualifiedTargetEntity() throws Exception { ICompilationUnit cu = this.createTestOneToOneWithTargetEntity(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - - OneToOneAnnotation oneToOne = (OneToOneAnnotation) attributeResource.getAnnotation(JPA.ONE_TO_ONE); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); + + OneToOneAnnotation oneToOne = (OneToOneAnnotation) resourceField.getAnnotation(JPA.ONE_TO_ONE); assertEquals(FULLY_QUALIFIED_TYPE_NAME, oneToOne.getFullyQualifiedTargetEntityClassName()); oneToOne.setTargetEntity("Foo"); @@ -234,19 +235,19 @@ public class OneToOne2_0AnnotationTests extends JavaResourceModel2_0TestCase { public void testGetOptional() throws Exception { ICompilationUnit cu = this.createTestOneToOneWithOptional(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - OneToOneAnnotation oneToOne = (OneToOneAnnotation) attributeResource.getAnnotation(JPA.ONE_TO_ONE); + OneToOneAnnotation oneToOne = (OneToOneAnnotation) resourceField.getAnnotation(JPA.ONE_TO_ONE); assertEquals(Boolean.TRUE, oneToOne.getOptional()); } public void testSetOptional() throws Exception { ICompilationUnit cu = this.createTestOneToOneWithOptional(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - OneToOneAnnotation oneToOne = (OneToOneAnnotation) attributeResource.getAnnotation(JPA.ONE_TO_ONE); + OneToOneAnnotation oneToOne = (OneToOneAnnotation) resourceField.getAnnotation(JPA.ONE_TO_ONE); assertEquals(Boolean.TRUE, oneToOne.getOptional()); oneToOne.setOptional(Boolean.FALSE); @@ -257,10 +258,10 @@ public class OneToOne2_0AnnotationTests extends JavaResourceModel2_0TestCase { public void testSetOptionalNull() throws Exception { ICompilationUnit cu = this.createTestOneToOneWithOptional(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - OneToOneAnnotation oneToOne = (OneToOneAnnotation) attributeResource.getAnnotation(JPA.ONE_TO_ONE); + OneToOneAnnotation oneToOne = (OneToOneAnnotation) resourceField.getAnnotation(JPA.ONE_TO_ONE); assertEquals(Boolean.TRUE, oneToOne.getOptional()); oneToOne.setOptional(null); @@ -272,28 +273,28 @@ public class OneToOne2_0AnnotationTests extends JavaResourceModel2_0TestCase { public void testGetMappedBy() throws Exception { ICompilationUnit cu = this.createTestOneToOneWithMappedBy(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - OneToOneAnnotation oneToOne = (OneToOneAnnotation) attributeResource.getAnnotation(JPA.ONE_TO_ONE); + OneToOneAnnotation oneToOne = (OneToOneAnnotation) resourceField.getAnnotation(JPA.ONE_TO_ONE); assertEquals("foo", oneToOne.getMappedBy()); } public void testGetMappedByNull() throws Exception { ICompilationUnit cu = this.createTestOneToOne(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - OneToOneAnnotation oneToOne = (OneToOneAnnotation) attributeResource.getAnnotation(JPA.ONE_TO_ONE); + OneToOneAnnotation oneToOne = (OneToOneAnnotation) resourceField.getAnnotation(JPA.ONE_TO_ONE); assertEquals(null, oneToOne.getMappedBy()); } public void testSetMappedBy() throws Exception { ICompilationUnit cu = this.createTestOneToOne(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - OneToOneAnnotation oneToOne = (OneToOneAnnotation) attributeResource.getAnnotation(JPA.ONE_TO_ONE); + OneToOneAnnotation oneToOne = (OneToOneAnnotation) resourceField.getAnnotation(JPA.ONE_TO_ONE); assertNull(oneToOne.getMappedBy()); oneToOne.setMappedBy("bar"); assertEquals("bar", oneToOne.getMappedBy()); @@ -303,10 +304,10 @@ public class OneToOne2_0AnnotationTests extends JavaResourceModel2_0TestCase { public void testSetMappedByNull() throws Exception { ICompilationUnit cu = this.createTestOneToOneWithMappedBy(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - OneToOneAnnotation oneToOne = (OneToOneAnnotation) attributeResource.getAnnotation(JPA.ONE_TO_ONE); + OneToOneAnnotation oneToOne = (OneToOneAnnotation) resourceField.getAnnotation(JPA.ONE_TO_ONE); assertEquals("foo", oneToOne.getMappedBy()); oneToOne.setMappedBy(null); @@ -318,10 +319,10 @@ public class OneToOne2_0AnnotationTests extends JavaResourceModel2_0TestCase { public void testSetCascadeAll() throws Exception { ICompilationUnit cu = this.createTestOneToOne(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - OneToOneAnnotation oneToOne = (OneToOneAnnotation) attributeResource.getAnnotation(JPA.ONE_TO_ONE); + OneToOneAnnotation oneToOne = (OneToOneAnnotation) resourceField.getAnnotation(JPA.ONE_TO_ONE); assertFalse(oneToOne.isCascadeAll()); oneToOne.setCascadeAll(true); @@ -332,10 +333,10 @@ public class OneToOne2_0AnnotationTests extends JavaResourceModel2_0TestCase { public void testSetCascadeMerge() throws Exception { ICompilationUnit cu = this.createTestOneToOne(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - OneToOneAnnotation oneToOne = (OneToOneAnnotation) attributeResource.getAnnotation(JPA.ONE_TO_ONE); + OneToOneAnnotation oneToOne = (OneToOneAnnotation) resourceField.getAnnotation(JPA.ONE_TO_ONE); assertFalse(oneToOne.isCascadeMerge()); oneToOne.setCascadeMerge(true); @@ -346,10 +347,10 @@ public class OneToOne2_0AnnotationTests extends JavaResourceModel2_0TestCase { public void testSetCascadePersist() throws Exception { ICompilationUnit cu = this.createTestOneToOne(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - OneToOneAnnotation oneToOne = (OneToOneAnnotation) attributeResource.getAnnotation(JPA.ONE_TO_ONE); + OneToOneAnnotation oneToOne = (OneToOneAnnotation) resourceField.getAnnotation(JPA.ONE_TO_ONE); assertFalse(oneToOne.isCascadePersist()); oneToOne.setCascadePersist(true); @@ -360,10 +361,10 @@ public class OneToOne2_0AnnotationTests extends JavaResourceModel2_0TestCase { public void testSetCascadeRemove() throws Exception { ICompilationUnit cu = this.createTestOneToOne(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - OneToOneAnnotation oneToOne = (OneToOneAnnotation) attributeResource.getAnnotation(JPA.ONE_TO_ONE); + OneToOneAnnotation oneToOne = (OneToOneAnnotation) resourceField.getAnnotation(JPA.ONE_TO_ONE); assertFalse(oneToOne.isCascadeRemove()); oneToOne.setCascadeRemove(true); @@ -374,10 +375,10 @@ public class OneToOne2_0AnnotationTests extends JavaResourceModel2_0TestCase { public void testSetCascadeRefresh() throws Exception { ICompilationUnit cu = this.createTestOneToOne(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - OneToOneAnnotation oneToOne = (OneToOneAnnotation) attributeResource.getAnnotation(JPA.ONE_TO_ONE); + OneToOneAnnotation oneToOne = (OneToOneAnnotation) resourceField.getAnnotation(JPA.ONE_TO_ONE); assertFalse(oneToOne.isCascadeRefresh()); oneToOne.setCascadeRefresh(true); @@ -388,10 +389,10 @@ public class OneToOne2_0AnnotationTests extends JavaResourceModel2_0TestCase { public void testSetCascadeDetach() throws Exception { ICompilationUnit cu = this.createTestOneToOne(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - OneToOne2_0Annotation oneToOne = (OneToOne2_0Annotation) attributeResource.getAnnotation(JPA.ONE_TO_ONE); + OneToOne2_0Annotation oneToOne = (OneToOne2_0Annotation) resourceField.getAnnotation(JPA.ONE_TO_ONE); assertFalse(oneToOne.isCascadeDetach()); oneToOne.setCascadeDetach(true); @@ -402,10 +403,10 @@ public class OneToOne2_0AnnotationTests extends JavaResourceModel2_0TestCase { public void testCascadeMoreThanOnce() throws Exception { ICompilationUnit cu = this.createTestOneToOneWithCascade(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - OneToOneAnnotation oneToOne = (OneToOneAnnotation) attributeResource.getAnnotation(JPA.ONE_TO_ONE); + OneToOneAnnotation oneToOne = (OneToOneAnnotation) resourceField.getAnnotation(JPA.ONE_TO_ONE); assertTrue(oneToOne.isCascadeAll()); oneToOne.setCascadeAll(true); @@ -427,10 +428,10 @@ public class OneToOne2_0AnnotationTests extends JavaResourceModel2_0TestCase { public void testDuplicateCascade() throws Exception { ICompilationUnit cu = this.createTestOneToOneWithDuplicateCascade(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - OneToOneAnnotation oneToOne = (OneToOneAnnotation) attributeResource.getAnnotation(JPA.ONE_TO_ONE); + OneToOneAnnotation oneToOne = (OneToOneAnnotation) resourceField.getAnnotation(JPA.ONE_TO_ONE); assertTrue(oneToOne.isCascadeMerge()); oneToOne.setCascadeMerge(false);//TODO should the resource model handle this and remove both MERGE @@ -445,10 +446,10 @@ public class OneToOne2_0AnnotationTests extends JavaResourceModel2_0TestCase { public void testMultipleCascade() throws Exception { ICompilationUnit cu = this.createTestOneToOneWithMultipleCascade(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - OneToOneAnnotation oneToOne = (OneToOneAnnotation) attributeResource.getAnnotation(JPA.ONE_TO_ONE); + OneToOneAnnotation oneToOne = (OneToOneAnnotation) resourceField.getAnnotation(JPA.ONE_TO_ONE); assertTrue(oneToOne.isCascadeMerge()); assertTrue(oneToOne.isCascadeRemove()); diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/resource/java/OrderColumn2_0AnnotationTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/resource/java/OrderColumn2_0AnnotationTests.java index 8dd27de309..68aaca4c4f 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/resource/java/OrderColumn2_0AnnotationTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/resource/java/OrderColumn2_0AnnotationTests.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. @@ -11,11 +11,12 @@ package org.eclipse.jpt.jpa.core.tests.internal.jpa2.resource.java; import java.util.Iterator; import org.eclipse.jdt.core.ICompilationUnit; +import org.eclipse.jpt.common.core.resource.java.JavaResourceField; +import org.eclipse.jpt.common.core.resource.java.JavaResourceType; +import org.eclipse.jpt.common.utility.internal.CollectionTools; import org.eclipse.jpt.common.utility.internal.iterators.ArrayIterator; import org.eclipse.jpt.jpa.core.jpa2.resource.java.JPA2_0; import org.eclipse.jpt.jpa.core.jpa2.resource.java.OrderColumn2_0Annotation; -import org.eclipse.jpt.jpa.core.resource.java.JavaResourcePersistentAttribute; -import org.eclipse.jpt.jpa.core.resource.java.JavaResourcePersistentType; @SuppressWarnings("nls") public class OrderColumn2_0AnnotationTests extends JavaResourceModel2_0TestCase { @@ -81,18 +82,18 @@ public class OrderColumn2_0AnnotationTests extends JavaResourceModel2_0TestCase public void testGetName() throws Exception { ICompilationUnit cu = this.createTestOrderColumnWithName(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - OrderColumn2_0Annotation column = (OrderColumn2_0Annotation) attributeResource.getAnnotation(JPA2_0.ORDER_COLUMN); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); + OrderColumn2_0Annotation column = (OrderColumn2_0Annotation) resourceField.getAnnotation(JPA2_0.ORDER_COLUMN); assertNotNull(column); assertEquals(COLUMN_NAME, column.getName()); } public void testGetNull() throws Exception { ICompilationUnit cu = this.createTestOrderColumn(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - OrderColumn2_0Annotation column = (OrderColumn2_0Annotation) attributeResource.getAnnotation(JPA2_0.ORDER_COLUMN); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); + OrderColumn2_0Annotation column = (OrderColumn2_0Annotation) resourceField.getAnnotation(JPA2_0.ORDER_COLUMN); assertNotNull(column); assertNull(column.getName()); assertNull(column.getNullable()); @@ -103,9 +104,9 @@ public class OrderColumn2_0AnnotationTests extends JavaResourceModel2_0TestCase public void testSetName() throws Exception { ICompilationUnit cu = this.createTestOrderColumn(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - OrderColumn2_0Annotation column = (OrderColumn2_0Annotation) attributeResource.getAnnotation(JPA2_0.ORDER_COLUMN); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); + OrderColumn2_0Annotation column = (OrderColumn2_0Annotation) resourceField.getAnnotation(JPA2_0.ORDER_COLUMN); assertNotNull(column); assertNull(column.getName()); @@ -118,33 +119,33 @@ public class OrderColumn2_0AnnotationTests extends JavaResourceModel2_0TestCase public void testSetNameNull() throws Exception { ICompilationUnit cu = this.createTestOrderColumnWithName(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - OrderColumn2_0Annotation column = (OrderColumn2_0Annotation) attributeResource.getAnnotation(JPA2_0.ORDER_COLUMN); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); + OrderColumn2_0Annotation column = (OrderColumn2_0Annotation) resourceField.getAnnotation(JPA2_0.ORDER_COLUMN); assertEquals(COLUMN_NAME, column.getName()); column.setName(null); assertNull(column.getName()); - column = (OrderColumn2_0Annotation) attributeResource.getAnnotation(JPA2_0.ORDER_COLUMN); + column = (OrderColumn2_0Annotation) resourceField.getAnnotation(JPA2_0.ORDER_COLUMN); assertNotNull(column); assertSourceContains("@OrderColumn", cu); } public void testGetColumnDefinition() throws Exception { ICompilationUnit cu = this.createTestOrderColumnWithColumnDefinition(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - OrderColumn2_0Annotation column = (OrderColumn2_0Annotation) attributeResource.getAnnotation(JPA2_0.ORDER_COLUMN); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); + OrderColumn2_0Annotation column = (OrderColumn2_0Annotation) resourceField.getAnnotation(JPA2_0.ORDER_COLUMN); assertEquals(COLUMN_COLUMN_DEFINITION, column.getColumnDefinition()); } public void testSetColumnDefinition() throws Exception { ICompilationUnit cu = this.createTestOrderColumn(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - OrderColumn2_0Annotation column = (OrderColumn2_0Annotation) attributeResource.getAnnotation(JPA2_0.ORDER_COLUMN); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); + OrderColumn2_0Annotation column = (OrderColumn2_0Annotation) resourceField.getAnnotation(JPA2_0.ORDER_COLUMN); assertNotNull(column); assertNull(column.getColumnDefinition()); @@ -156,25 +157,25 @@ public class OrderColumn2_0AnnotationTests extends JavaResourceModel2_0TestCase column.setColumnDefinition(null); - column = (OrderColumn2_0Annotation) attributeResource.getAnnotation(JPA2_0.ORDER_COLUMN); + column = (OrderColumn2_0Annotation) resourceField.getAnnotation(JPA2_0.ORDER_COLUMN); assertNotNull(column); assertSourceContains("@OrderColumn", cu); } public void testGetNullable() throws Exception { ICompilationUnit cu = this.createTestOrderColumnWithBooleanElement("nullable"); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - OrderColumn2_0Annotation column = (OrderColumn2_0Annotation) attributeResource.getAnnotation(JPA2_0.ORDER_COLUMN); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); + OrderColumn2_0Annotation column = (OrderColumn2_0Annotation) resourceField.getAnnotation(JPA2_0.ORDER_COLUMN); assertEquals(Boolean.TRUE, column.getNullable()); } public void testSetNullable() throws Exception { ICompilationUnit cu = this.createTestOrderColumn(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - OrderColumn2_0Annotation column = (OrderColumn2_0Annotation) attributeResource.getAnnotation(JPA2_0.ORDER_COLUMN); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); + OrderColumn2_0Annotation column = (OrderColumn2_0Annotation) resourceField.getAnnotation(JPA2_0.ORDER_COLUMN); assertNotNull(column); assertNull(column.getNullable()); @@ -185,25 +186,25 @@ public class OrderColumn2_0AnnotationTests extends JavaResourceModel2_0TestCase assertSourceContains("@OrderColumn(nullable = false)", cu); column.setNullable(null); - column = (OrderColumn2_0Annotation) attributeResource.getAnnotation(JPA2_0.ORDER_COLUMN); + column = (OrderColumn2_0Annotation) resourceField.getAnnotation(JPA2_0.ORDER_COLUMN); assertNotNull(column); assertSourceContains("@OrderColumn", cu); } public void testGetInsertable() throws Exception { ICompilationUnit cu = this.createTestOrderColumnWithBooleanElement("insertable"); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - OrderColumn2_0Annotation column = (OrderColumn2_0Annotation) attributeResource.getAnnotation(JPA2_0.ORDER_COLUMN); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); + OrderColumn2_0Annotation column = (OrderColumn2_0Annotation) resourceField.getAnnotation(JPA2_0.ORDER_COLUMN); assertEquals(Boolean.TRUE, column.getInsertable()); } public void testSetInsertable() throws Exception { ICompilationUnit cu = this.createTestOrderColumn(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - OrderColumn2_0Annotation column = (OrderColumn2_0Annotation) attributeResource.getAnnotation(JPA2_0.ORDER_COLUMN); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); + OrderColumn2_0Annotation column = (OrderColumn2_0Annotation) resourceField.getAnnotation(JPA2_0.ORDER_COLUMN); assertNotNull(column); assertNull(column.getInsertable()); @@ -214,25 +215,25 @@ public class OrderColumn2_0AnnotationTests extends JavaResourceModel2_0TestCase assertSourceContains("@OrderColumn(insertable = false)", cu); column.setInsertable(null); - column = (OrderColumn2_0Annotation) attributeResource.getAnnotation(JPA2_0.ORDER_COLUMN); + column = (OrderColumn2_0Annotation) resourceField.getAnnotation(JPA2_0.ORDER_COLUMN); assertNotNull(column); assertSourceContains("@OrderColumn", cu); } public void testGetUpdatable() throws Exception { ICompilationUnit cu = this.createTestOrderColumnWithBooleanElement("updatable"); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - OrderColumn2_0Annotation column = (OrderColumn2_0Annotation) attributeResource.getAnnotation(JPA2_0.ORDER_COLUMN); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); + OrderColumn2_0Annotation column = (OrderColumn2_0Annotation) resourceField.getAnnotation(JPA2_0.ORDER_COLUMN); assertEquals(Boolean.TRUE, column.getUpdatable()); } public void testSetUpdatable() throws Exception { ICompilationUnit cu = this.createTestOrderColumn(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - OrderColumn2_0Annotation column = (OrderColumn2_0Annotation) attributeResource.getAnnotation(JPA2_0.ORDER_COLUMN); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); + OrderColumn2_0Annotation column = (OrderColumn2_0Annotation) resourceField.getAnnotation(JPA2_0.ORDER_COLUMN); assertNotNull(column); assertNull(column.getUpdatable()); @@ -244,7 +245,7 @@ public class OrderColumn2_0AnnotationTests extends JavaResourceModel2_0TestCase column.setUpdatable(null); - column = (OrderColumn2_0Annotation) attributeResource.getAnnotation(JPA2_0.ORDER_COLUMN); + column = (OrderColumn2_0Annotation) resourceField.getAnnotation(JPA2_0.ORDER_COLUMN); assertNotNull(column); assertSourceContains("@OrderColumn", cu); } diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/resource/java/SequenceGenerator2_0AnnotationTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/resource/java/SequenceGenerator2_0AnnotationTests.java index 40330577b6..971b31af4d 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/resource/java/SequenceGenerator2_0AnnotationTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/resource/java/SequenceGenerator2_0AnnotationTests.java @@ -1,5 +1,5 @@ /******************************************************************************* -* Copyright (c) 2009 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,13 +12,11 @@ package org.eclipse.jpt.jpa.core.tests.internal.jpa2.resource.java; import java.util.Iterator; import org.eclipse.jdt.core.ICompilationUnit; +import org.eclipse.jpt.common.core.resource.java.JavaResourceField; +import org.eclipse.jpt.common.core.resource.java.JavaResourceType; import org.eclipse.jpt.common.utility.internal.iterators.ArrayIterator; -import org.eclipse.jpt.jpa.core.JpaAnnotationDefinitionProvider; -import org.eclipse.jpt.jpa.core.internal.jpa2.Generic2_0JpaAnnotationDefinitionProvider; import org.eclipse.jpt.jpa.core.jpa2.resource.java.SequenceGenerator2_0Annotation; 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; /** * SequenceGenerator2_0Tests @@ -33,28 +31,23 @@ public class SequenceGenerator2_0AnnotationTests extends JavaResourceModel2_0Tes super(name); } - @Override - protected JpaAnnotationDefinitionProvider annotationDefinitionProvider() { - return Generic2_0JpaAnnotationDefinitionProvider.instance(); - } - // ********** catalog ********** public void testGetCatalog() throws Exception { ICompilationUnit cu = this.createTestSequenceGeneratorWithCatalog(); - JavaResourcePersistentType typeResource = this.buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = this.buildJavaResourceType(cu); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); - SequenceGenerator2_0Annotation sequenceGenerator = (SequenceGenerator2_0Annotation) attributeResource.getAnnotation(JPA.SEQUENCE_GENERATOR); + SequenceGenerator2_0Annotation sequenceGenerator = (SequenceGenerator2_0Annotation) resourceField.getAnnotation(JPA.SEQUENCE_GENERATOR); assertEquals(GENERATOR_CATALOG, sequenceGenerator.getCatalog()); } public void testSetCatalog() throws Exception { ICompilationUnit cu = this.createTestSequenceGeneratorWithCatalog(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = this.buildJavaResourceType(cu); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); - SequenceGenerator2_0Annotation sequenceGenerator = (SequenceGenerator2_0Annotation) attributeResource.getAnnotation(JPA.SEQUENCE_GENERATOR); + SequenceGenerator2_0Annotation sequenceGenerator = (SequenceGenerator2_0Annotation) resourceField.getAnnotation(JPA.SEQUENCE_GENERATOR); assertEquals(GENERATOR_CATALOG, sequenceGenerator.getCatalog()); sequenceGenerator.setCatalog("foo"); @@ -72,19 +65,19 @@ public class SequenceGenerator2_0AnnotationTests extends JavaResourceModel2_0Tes public void testGetSchema() throws Exception { ICompilationUnit cu = this.createTestSequenceGeneratorWithSchema(); - JavaResourcePersistentType typeResource = this.buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = this.buildJavaResourceType(cu); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); - SequenceGenerator2_0Annotation sequenceGenerator = (SequenceGenerator2_0Annotation) attributeResource.getAnnotation(JPA.SEQUENCE_GENERATOR); + SequenceGenerator2_0Annotation sequenceGenerator = (SequenceGenerator2_0Annotation) resourceField.getAnnotation(JPA.SEQUENCE_GENERATOR); assertEquals(GENERATOR_SCHEMA, sequenceGenerator.getSchema()); } public void testSetSchema() throws Exception { ICompilationUnit cu = this.createTestSequenceGeneratorWithSchema(); - JavaResourcePersistentType typeResource = this.buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = this.buildJavaResourceType(cu); + JavaResourceField resourceField = resourceType.getFields().iterator().next(); - SequenceGenerator2_0Annotation sequenceGenerator = (SequenceGenerator2_0Annotation) attributeResource.getAnnotation(JPA.SEQUENCE_GENERATOR); + SequenceGenerator2_0Annotation sequenceGenerator = (SequenceGenerator2_0Annotation) resourceField.getAnnotation(JPA.SEQUENCE_GENERATOR); assertEquals(GENERATOR_SCHEMA, sequenceGenerator.getSchema()); sequenceGenerator.setSchema("foo"); diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/AssociationOverrideTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/AssociationOverrideTests.java index a2f1f6d96f..fb8831a64f 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/AssociationOverrideTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/AssociationOverrideTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2009 Oracle. All rights reserved. + * Copyright (c) 2007, 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. @@ -11,11 +11,13 @@ package org.eclipse.jpt.jpa.core.tests.internal.resource.java; import java.util.Iterator; import org.eclipse.jdt.core.ICompilationUnit; +import org.eclipse.jpt.common.core.resource.java.JavaResourceField; +import org.eclipse.jpt.common.core.resource.java.JavaResourceMember; +import org.eclipse.jpt.common.core.resource.java.JavaResourceType; +import org.eclipse.jpt.common.utility.internal.CollectionTools; import org.eclipse.jpt.common.utility.internal.iterators.ArrayIterator; import org.eclipse.jpt.jpa.core.resource.java.AssociationOverrideAnnotation; 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; @SuppressWarnings("nls") @@ -53,11 +55,15 @@ public class AssociationOverrideTests extends JpaJavaResourceModelTestCase { }); } + private AssociationOverrideAnnotation getAssociationOverrideAnnotationAt(JavaResourceMember resourceMember, int index) { + return (AssociationOverrideAnnotation) resourceMember.getAnnotation(index, JPA.ASSOCIATION_OVERRIDE); + } + public void testGetName() throws Exception { ICompilationUnit cu = this.createTestAssociationOverrideOnField(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - AssociationOverrideAnnotation associationOverride = (AssociationOverrideAnnotation) attributeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDE); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); + AssociationOverrideAnnotation associationOverride = this.getAssociationOverrideAnnotationAt(resourceField, 0); assertNotNull(associationOverride); assertEquals(ASSOCIATION_OVERRIDE_NAME, associationOverride.getName()); @@ -65,9 +71,9 @@ public class AssociationOverrideTests extends JpaJavaResourceModelTestCase { public void testSetName() throws Exception { ICompilationUnit cu = this.createTestAssociationOverrideOnField(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - AssociationOverrideAnnotation associationOverride = (AssociationOverrideAnnotation) attributeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDE); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); + AssociationOverrideAnnotation associationOverride = this.getAssociationOverrideAnnotationAt(resourceField, 0); assertNotNull(associationOverride); assertEquals(ASSOCIATION_OVERRIDE_NAME, associationOverride.getName()); @@ -79,9 +85,9 @@ public class AssociationOverrideTests extends JpaJavaResourceModelTestCase { public void testSetNameNull() throws Exception { ICompilationUnit cu = this.createTestAssociationOverrideOnField(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - AssociationOverrideAnnotation associationOverride = (AssociationOverrideAnnotation) attributeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDE); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); + AssociationOverrideAnnotation associationOverride = this.getAssociationOverrideAnnotationAt(resourceField, 0); assertEquals(ASSOCIATION_OVERRIDE_NAME, associationOverride.getName()); @@ -95,44 +101,40 @@ public class AssociationOverrideTests extends JpaJavaResourceModelTestCase { public void testJoinColumns() throws Exception { ICompilationUnit cu = this.createTestAssociationOverrideOnField(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - - AssociationOverrideAnnotation associationOverride = (AssociationOverrideAnnotation) attributeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDE); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); + AssociationOverrideAnnotation associationOverride = this.getAssociationOverrideAnnotationAt(resourceField, 0); - assertEquals(0, associationOverride.joinColumnsSize()); + assertEquals(0, associationOverride.getJoinColumnsSize()); } public void testJoinColumns2() throws Exception { ICompilationUnit cu = this.createTestAssociationOverrideOnField(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - - AssociationOverrideAnnotation associationOverride = (AssociationOverrideAnnotation) attributeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDE); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); + AssociationOverrideAnnotation associationOverride = this.getAssociationOverrideAnnotationAt(resourceField, 0); associationOverride.addJoinColumn(0); associationOverride.addJoinColumn(1); - assertEquals(2, associationOverride.joinColumnsSize()); + assertEquals(2, associationOverride.getJoinColumnsSize()); } public void testJoinColumns3() throws Exception { ICompilationUnit cu = this.createTestAssociationOverrideWithJoinColumns(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - - AssociationOverrideAnnotation associationOverride = (AssociationOverrideAnnotation) attributeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDE); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); + AssociationOverrideAnnotation associationOverride = this.getAssociationOverrideAnnotationAt(resourceField, 0); - assertEquals(2, associationOverride.joinColumnsSize()); + assertEquals(2, associationOverride.getJoinColumnsSize()); } public void testAddJoinColumn() throws Exception { ICompilationUnit cu = this.createTestAssociationOverrideOnField(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - - AssociationOverrideAnnotation associationOverride = (AssociationOverrideAnnotation) attributeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDE); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); + AssociationOverrideAnnotation associationOverride = this.getAssociationOverrideAnnotationAt(resourceField, 0); associationOverride.addJoinColumn(0).setName("FOO"); associationOverride.addJoinColumn(1); @@ -147,13 +149,12 @@ public class AssociationOverrideTests extends JpaJavaResourceModelTestCase { public void testRemoveJoinColumn() throws Exception { ICompilationUnit cu = this.createTestAssociationOverrideWithJoinColumns(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - - AssociationOverrideAnnotation associationOverride = (AssociationOverrideAnnotation) attributeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDE); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); + AssociationOverrideAnnotation associationOverride = this.getAssociationOverrideAnnotationAt(resourceField, 0); associationOverride.addJoinColumn(0).setName("FOO"); - Iterator joinColumns = associationOverride.joinColumns(); + Iterator joinColumns = associationOverride.getJoinColumns().iterator(); assertEquals("FOO", joinColumns.next().getName()); assertEquals("BAR", joinColumns.next().getName()); assertNull(joinColumns.next().getName()); @@ -161,14 +162,14 @@ public class AssociationOverrideTests extends JpaJavaResourceModelTestCase { assertSourceContains("@AssociationOverride(name = \"" + ASSOCIATION_OVERRIDE_NAME + "\", joinColumns = {@JoinColumn(name = \"FOO\"), @JoinColumn(name = \"BAR\"), @JoinColumn})", cu); associationOverride.removeJoinColumn(1); - joinColumns = associationOverride.joinColumns(); + joinColumns = associationOverride.getJoinColumns().iterator(); assertEquals("FOO", joinColumns.next().getName()); assertNull(joinColumns.next().getName()); assertEquals(false, joinColumns.hasNext()); assertSourceContains("@AssociationOverride(name = \"" + ASSOCIATION_OVERRIDE_NAME + "\", joinColumns = {@JoinColumn(name = \"FOO\"), @JoinColumn})", cu); associationOverride.removeJoinColumn(0); - joinColumns = associationOverride.joinColumns(); + joinColumns = associationOverride.getJoinColumns().iterator(); assertNull(joinColumns.next().getName()); assertEquals(false, joinColumns.hasNext()); assertSourceContains("@AssociationOverride(name = \"" + ASSOCIATION_OVERRIDE_NAME + "\", joinColumns = @JoinColumn)", cu); @@ -181,10 +182,9 @@ public class AssociationOverrideTests extends JpaJavaResourceModelTestCase { public void testMoveJoinColumn() throws Exception { ICompilationUnit cu = this.createTestAssociationOverrideWithJoinColumns(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - - AssociationOverrideAnnotation associationOverride = (AssociationOverrideAnnotation) attributeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDE); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); + AssociationOverrideAnnotation associationOverride = this.getAssociationOverrideAnnotationAt(resourceField, 0); JoinColumnAnnotation joinColumn = associationOverride.joinColumnAt(0); joinColumn.setReferencedColumnName("REF_NAME"); joinColumn.setUnique(Boolean.FALSE); @@ -201,16 +201,15 @@ public class AssociationOverrideTests extends JpaJavaResourceModelTestCase { assertEquals("BAR", associationOverride.joinColumnAt(0).getName()); assertNull(associationOverride.joinColumnAt(1).getName()); assertEquals("FOO", associationOverride.joinColumnAt(2).getName()); - assertEquals(3, associationOverride.joinColumnsSize()); + assertEquals(3, associationOverride.getJoinColumnsSize()); assertSourceContains("@AssociationOverride(name = \"" + ASSOCIATION_OVERRIDE_NAME + "\", joinColumns = {@JoinColumn(name = \"BAR\", referencedColumnName = \"REF_NAME\", unique = false, nullable = false, insertable = false, updatable = false, columnDefinition = \"COLUMN_DEF\", table = \"TABLE\"), @JoinColumn, @JoinColumn(name = \"FOO\")})", cu); } public void testMoveJoinColumn2() throws Exception { ICompilationUnit cu = this.createTestAssociationOverrideWithJoinColumns(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - - AssociationOverrideAnnotation associationOverride = (AssociationOverrideAnnotation) attributeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDE); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); + AssociationOverrideAnnotation associationOverride = this.getAssociationOverrideAnnotationAt(resourceField, 0); JoinColumnAnnotation joinColumn = associationOverride.joinColumnAt(0); joinColumn.setReferencedColumnName("REF_NAME"); @@ -228,20 +227,19 @@ public class AssociationOverrideTests extends JpaJavaResourceModelTestCase { assertNull(associationOverride.joinColumnAt(0).getName()); assertEquals("FOO", associationOverride.joinColumnAt(1).getName()); assertEquals("BAR", associationOverride.joinColumnAt(2).getName()); - assertEquals(3, associationOverride.joinColumnsSize()); + assertEquals(3, associationOverride.getJoinColumnsSize()); assertSourceContains("@AssociationOverride(name = \"" + ASSOCIATION_OVERRIDE_NAME + "\", joinColumns = {@JoinColumn, @JoinColumn(name = \"FOO\"), @JoinColumn(name = \"BAR\", referencedColumnName = \"REF_NAME\", unique = false, nullable = false, insertable = false, updatable = false, columnDefinition = \"COLUMN_DEF\", table = \"TABLE\")})", cu); } public void testSetJoinColumnName() throws Exception { ICompilationUnit cu = this.createTestAssociationOverrideWithJoinColumns(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - - AssociationOverrideAnnotation associationOverride = (AssociationOverrideAnnotation) attributeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDE); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); + AssociationOverrideAnnotation associationOverride = this.getAssociationOverrideAnnotationAt(resourceField, 0); - assertEquals(2, associationOverride.joinColumnsSize()); + assertEquals(2, associationOverride.getJoinColumnsSize()); - JoinColumnAnnotation joinColumn = associationOverride.joinColumns().next(); + JoinColumnAnnotation joinColumn = associationOverride.joinColumnAt(0); assertEquals("BAR", joinColumn.getName()); diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/AssociationOverridesTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/AssociationOverridesTests.java index 9ab25bfe10..10434abf8f 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/AssociationOverridesTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/AssociationOverridesTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2010 Oracle. All rights reserved. + * Copyright (c) 2007, 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. @@ -10,17 +10,16 @@ package org.eclipse.jpt.jpa.core.tests.internal.resource.java; import java.util.Iterator; - import org.eclipse.jdt.core.ICompilationUnit; +import org.eclipse.jpt.common.core.resource.java.JavaResourceField; +import org.eclipse.jpt.common.core.resource.java.JavaResourceMember; +import org.eclipse.jpt.common.core.resource.java.JavaResourceType; +import org.eclipse.jpt.common.core.resource.java.NestableAnnotation; import org.eclipse.jpt.common.utility.internal.CollectionTools; import org.eclipse.jpt.common.utility.internal.iterators.ArrayIterator; 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.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.NestableAnnotation; @SuppressWarnings("nls") public class AssociationOverridesTests extends JpaJavaResourceModelTestCase { @@ -72,12 +71,15 @@ public class AssociationOverridesTests extends JpaJavaResourceModelTestCase { }); } + private AssociationOverrideAnnotation getAssociationOverrideAnnotationAt(JavaResourceMember resourceMember, int index) { + return (AssociationOverrideAnnotation) resourceMember.getAnnotation(index, JPA.ASSOCIATION_OVERRIDE); + } + public void testGetName() throws Exception { ICompilationUnit cu = this.createTestAssociationOverrideOnField(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - AssociationOverridesAnnotation associationOverrides = (AssociationOverridesAnnotation) attributeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDES); - AssociationOverrideAnnotation associationOverride = associationOverrides.getNestedAnnotations().iterator().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); + AssociationOverrideAnnotation associationOverride = this.getAssociationOverrideAnnotationAt(resourceField, 0); assertNotNull(associationOverride); assertEquals(ASSOCIATION_OVERRIDE_NAME, associationOverride.getName()); @@ -85,10 +87,9 @@ public class AssociationOverridesTests extends JpaJavaResourceModelTestCase { public void testSetName() throws Exception { ICompilationUnit cu = this.createTestAssociationOverrideOnField(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - AssociationOverridesAnnotation associationOverrides = (AssociationOverridesAnnotation) attributeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDES); - AssociationOverrideAnnotation associationOverride = associationOverrides.getNestedAnnotations().iterator().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); + AssociationOverrideAnnotation associationOverride = this.getAssociationOverrideAnnotationAt(resourceField, 0); assertNotNull(associationOverride); assertEquals(ASSOCIATION_OVERRIDE_NAME, associationOverride.getName()); @@ -100,10 +101,9 @@ public class AssociationOverridesTests extends JpaJavaResourceModelTestCase { public void testSetNameNull() throws Exception { ICompilationUnit cu = this.createTestAssociationOverrideOnField(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - AssociationOverridesAnnotation associationOverrides = (AssociationOverridesAnnotation) attributeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDES); - AssociationOverrideAnnotation associationOverride = associationOverrides.getNestedAnnotations().iterator().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); + AssociationOverrideAnnotation associationOverride = this.getAssociationOverrideAnnotationAt(resourceField, 0); assertEquals(ASSOCIATION_OVERRIDE_NAME, associationOverride.getName()); associationOverride.setName(null); @@ -116,97 +116,121 @@ public class AssociationOverridesTests extends JpaJavaResourceModelTestCase { public void testAddAssociationOverrideCopyExisting() throws Exception { ICompilationUnit cu = createTestAssociationOverride(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); + JavaResourceType resourceType = buildJavaResourceType(cu); + String expected1 = "@AssociationOverrides({"; + String expected2 = "@AssociationOverride(name = \"FOO\", joinColumns = @JoinColumn(name = \"FOO\", columnDefinition = \"BAR\", referencedColumnName = \"BAZ\")),"; + String expected3 = "@AssociationOverride(name = \"BAR\") })"; - AssociationOverrideAnnotation associationOverride = (AssociationOverrideAnnotation) typeResource.addAnnotation(1, JPA.ASSOCIATION_OVERRIDE, JPA.ASSOCIATION_OVERRIDES); + AssociationOverrideAnnotation associationOverride = (AssociationOverrideAnnotation) resourceType.addAnnotation(1, JPA.ASSOCIATION_OVERRIDE); associationOverride.setName("BAR"); - assertSourceContains("@AssociationOverrides({@AssociationOverride(name = \"FOO\", joinColumns = @JoinColumn(name = \"FOO\", columnDefinition = \"BAR\", referencedColumnName = \"BAZ\")),@AssociationOverride(name = \"BAR\")})", cu); + assertSourceContains(expected1, cu); + assertSourceContains(expected2, cu); + assertSourceContains(expected3, cu); - assertNull(typeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDE)); - assertNotNull(typeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDES)); - assertEquals(2, CollectionTools.size(typeResource.annotations(JPA.ASSOCIATION_OVERRIDE, JPA.ASSOCIATION_OVERRIDES))); + assertNull(resourceType.getAnnotation(JPA.ASSOCIATION_OVERRIDE)); + assertNotNull(resourceType.getAnnotation(JPA.ASSOCIATION_OVERRIDES)); + assertNotNull(resourceType.getAnnotation(0, JPA.ASSOCIATION_OVERRIDE)); + assertEquals(2, resourceType.getAnnotationsSize(JPA.ASSOCIATION_OVERRIDE)); } public void testAddAssociationOverrideToBeginningOfList() throws Exception { ICompilationUnit cu = createTestAssociationOverride(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); + JavaResourceType resourceType = buildJavaResourceType(cu); - AssociationOverrideAnnotation associationOverride = (AssociationOverrideAnnotation) typeResource.addAnnotation(1, JPA.ASSOCIATION_OVERRIDE, JPA.ASSOCIATION_OVERRIDES); + String expected1 = "@AssociationOverrides({"; + String expected2 = "@AssociationOverride(name = \"FOO\", joinColumns = @JoinColumn(name = \"FOO\", columnDefinition = \"BAR\", referencedColumnName = \"BAZ\")),"; + String expected3 = "@AssociationOverride(name = \"BAR\") })"; + + AssociationOverrideAnnotation associationOverride = (AssociationOverrideAnnotation) resourceType.addAnnotation(1, JPA.ASSOCIATION_OVERRIDE); associationOverride.setName("BAR"); - assertSourceContains("@AssociationOverrides({@AssociationOverride(name = \"FOO\", joinColumns = @JoinColumn(name = \"FOO\", columnDefinition = \"BAR\", referencedColumnName = \"BAZ\")),@AssociationOverride(name = \"BAR\")})", cu); + assertSourceContains(expected1, cu); + assertSourceContains(expected2, cu); + assertSourceContains(expected3, cu); - associationOverride = (AssociationOverrideAnnotation) typeResource.addAnnotation(0, JPA.ASSOCIATION_OVERRIDE, JPA.ASSOCIATION_OVERRIDES); + expected2 = "@AssociationOverride(name = \"BAZ\"),"; + expected3 = "@AssociationOverride(name = \"FOO\", joinColumns = @JoinColumn(name = \"FOO\", columnDefinition = \"BAR\", referencedColumnName = \"BAZ\")), @AssociationOverride(name = \"BAR\") })"; + associationOverride = (AssociationOverrideAnnotation) resourceType.addAnnotation(0, JPA.ASSOCIATION_OVERRIDE); associationOverride.setName("BAZ"); - assertSourceContains("@AssociationOverrides({@AssociationOverride(name = \"BAZ\"),@AssociationOverride(name = \"FOO\", joinColumns = @JoinColumn(name = \"FOO\", columnDefinition = \"BAR\", referencedColumnName = \"BAZ\")), @AssociationOverride(name = \"BAR\")})", cu); + assertSourceContains(expected1, cu); + assertSourceContains(expected2, cu); + assertSourceContains(expected3, cu); - Iterator associationOverrides = typeResource.annotations(JPA.ASSOCIATION_OVERRIDE, JPA.ASSOCIATION_OVERRIDES); + Iterator associationOverrides = resourceType.getAnnotations(JPA.ASSOCIATION_OVERRIDE).iterator(); assertEquals("BAZ", ((AssociationOverrideAnnotation) associationOverrides.next()).getName()); assertEquals("FOO", ((AssociationOverrideAnnotation) associationOverrides.next()).getName()); assertEquals("BAR", ((AssociationOverrideAnnotation) associationOverrides.next()).getName()); - assertNull(typeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDE)); - assertNotNull(typeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDES)); - assertEquals(3, CollectionTools.size(typeResource.annotations(JPA.ASSOCIATION_OVERRIDE, JPA.ASSOCIATION_OVERRIDES))); + assertNull(resourceType.getAnnotation(JPA.ASSOCIATION_OVERRIDE)); + assertNotNull(resourceType.getAnnotation(JPA.ASSOCIATION_OVERRIDES)); + assertNotNull(resourceType.getAnnotation(0, JPA.ASSOCIATION_OVERRIDE)); + assertEquals(3, resourceType.getAnnotationsSize(JPA.ASSOCIATION_OVERRIDE)); } public void testRemoveAssociationOverrideCopyExisting() throws Exception { ICompilationUnit cu = createTestAssociationOverride(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); + JavaResourceType resourceType = buildJavaResourceType(cu); + String expected1 = "@AssociationOverrides({"; + String expected2 = "@AssociationOverride(name = \"FOO\", joinColumns = @JoinColumn(name = \"FOO\", columnDefinition = \"BAR\", referencedColumnName = \"BAZ\")),"; + String expected3 = "@AssociationOverride(name = \"BAR\") })"; - AssociationOverrideAnnotation associationOverride = (AssociationOverrideAnnotation) typeResource.addAnnotation(1, JPA.ASSOCIATION_OVERRIDE, JPA.ASSOCIATION_OVERRIDES); + AssociationOverrideAnnotation associationOverride = (AssociationOverrideAnnotation) resourceType.addAnnotation(1, JPA.ASSOCIATION_OVERRIDE); associationOverride.setName("BAR"); - assertSourceContains("@AssociationOverrides({@AssociationOverride(name = \"FOO\", joinColumns = @JoinColumn(name = \"FOO\", columnDefinition = \"BAR\", referencedColumnName = \"BAZ\")),@AssociationOverride(name = \"BAR\")})", cu); + assertSourceContains(expected1, cu); + assertSourceContains(expected2, cu); + assertSourceContains(expected3, cu); - typeResource.removeAnnotation(1, JPA.ASSOCIATION_OVERRIDE, JPA.ASSOCIATION_OVERRIDES); - assertSourceContains("@AssociationOverride(name = \"FOO\", joinColumns = @JoinColumn(name = \"FOO\", columnDefinition = \"BAR\", referencedColumnName = \"BAZ\"))", cu); + expected2 = "@AssociationOverride(name = \"FOO\", joinColumns = @JoinColumn(name = \"FOO\", columnDefinition = \"BAR\", referencedColumnName = \"BAZ\"))"; + resourceType.removeAnnotation(1, JPA.ASSOCIATION_OVERRIDE); + assertSourceContains(expected2, cu); + assertSourceDoesNotContain("@AssociationOverrides", cu); } public void testJoinColumns() throws Exception { ICompilationUnit cu = this.createTestAssociationOverrideOnField(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - AssociationOverrideAnnotation associationOverride = (AssociationOverrideAnnotation) attributeResource.annotations(JPA.ASSOCIATION_OVERRIDE, JPA.ASSOCIATION_OVERRIDES).next(); + AssociationOverrideAnnotation associationOverride = this.getAssociationOverrideAnnotationAt(resourceField, 0); - assertEquals(0, associationOverride.joinColumnsSize()); + assertEquals(0, associationOverride.getJoinColumnsSize()); } public void testJoinColumns2() throws Exception { ICompilationUnit cu = this.createTestAssociationOverrideOnField(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - AssociationOverrideAnnotation associationOverride = (AssociationOverrideAnnotation) attributeResource.annotations(JPA.ASSOCIATION_OVERRIDE, JPA.ASSOCIATION_OVERRIDES).next(); + AssociationOverrideAnnotation associationOverride = this.getAssociationOverrideAnnotationAt(resourceField, 0); associationOverride.addJoinColumn(0); associationOverride.addJoinColumn(1); - assertEquals(2, associationOverride.joinColumnsSize()); + assertEquals(2, associationOverride.getJoinColumnsSize()); } public void testJoinColumns3() throws Exception { ICompilationUnit cu = this.createTestAssociationOverrideWithJoinColumns(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - AssociationOverrideAnnotation associationOverride = (AssociationOverrideAnnotation) attributeResource.annotations(JPA.ASSOCIATION_OVERRIDE, JPA.ASSOCIATION_OVERRIDES).next(); + AssociationOverrideAnnotation associationOverride = this.getAssociationOverrideAnnotationAt(resourceField, 0); - assertEquals(2, associationOverride.joinColumnsSize()); + assertEquals(2, associationOverride.getJoinColumnsSize()); } public void testAddJoinColumn() throws Exception { ICompilationUnit cu = this.createTestAssociationOverrideOnField(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - AssociationOverrideAnnotation associationOverride = (AssociationOverrideAnnotation) attributeResource.annotations(JPA.ASSOCIATION_OVERRIDE, JPA.ASSOCIATION_OVERRIDES).next(); + AssociationOverrideAnnotation associationOverride = this.getAssociationOverrideAnnotationAt(resourceField, 0); associationOverride.addJoinColumn(0).setName("FOO"); associationOverride.addJoinColumn(1); associationOverride.addJoinColumn(0).setName("BAR"); - Iterator joinColumns = associationOverride.joinColumns(); + Iterator joinColumns = associationOverride.getJoinColumns().iterator(); assertEquals("BAR", joinColumns.next().getName()); assertEquals("FOO", joinColumns.next().getName()); assertNull(joinColumns.next().getName()); @@ -216,13 +240,13 @@ public class AssociationOverridesTests extends JpaJavaResourceModelTestCase { public void testRemoveJoinColumn() throws Exception { ICompilationUnit cu = this.createTestAssociationOverrideWithJoinColumns(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - AssociationOverrideAnnotation associationOverride = (AssociationOverrideAnnotation) attributeResource.annotations(JPA.ASSOCIATION_OVERRIDE, JPA.ASSOCIATION_OVERRIDES).next(); + AssociationOverrideAnnotation associationOverride = this.getAssociationOverrideAnnotationAt(resourceField, 0); associationOverride.addJoinColumn(0).setName("FOO"); - Iterator joinColumns = associationOverride.joinColumns(); + Iterator joinColumns = associationOverride.getJoinColumns().iterator(); assertEquals("FOO", joinColumns.next().getName()); assertEquals("BAR", joinColumns.next().getName()); assertNull(joinColumns.next().getName()); @@ -230,14 +254,14 @@ public class AssociationOverridesTests extends JpaJavaResourceModelTestCase { assertSourceContains("@AssociationOverrides(@AssociationOverride(name = \"" + ASSOCIATION_OVERRIDE_NAME + "\", joinColumns = {@JoinColumn(name = \"FOO\"), @JoinColumn(name = \"BAR\"), @JoinColumn}))", cu); associationOverride.removeJoinColumn(1); - joinColumns = associationOverride.joinColumns(); + joinColumns = associationOverride.getJoinColumns().iterator(); assertEquals("FOO", joinColumns.next().getName()); assertNull(joinColumns.next().getName()); assertEquals(false, joinColumns.hasNext()); assertSourceContains("@AssociationOverrides(@AssociationOverride(name = \"" + ASSOCIATION_OVERRIDE_NAME + "\", joinColumns = {@JoinColumn(name = \"FOO\"), @JoinColumn}))", cu); associationOverride.removeJoinColumn(0); - joinColumns = associationOverride.joinColumns(); + joinColumns = associationOverride.getJoinColumns().iterator(); assertNull(joinColumns.next().getName()); assertEquals(false, joinColumns.hasNext()); assertSourceContains("@AssociationOverrides(@AssociationOverride(name = \"" + ASSOCIATION_OVERRIDE_NAME + "\", joinColumns = @JoinColumn))", cu); @@ -250,10 +274,10 @@ public class AssociationOverridesTests extends JpaJavaResourceModelTestCase { public void testMoveJoinColumn() throws Exception { ICompilationUnit cu = this.createTestAssociationOverrideWithJoinColumns(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - AssociationOverrideAnnotation associationOverride = (AssociationOverrideAnnotation) attributeResource.annotations(JPA.ASSOCIATION_OVERRIDE, JPA.ASSOCIATION_OVERRIDES).next(); + AssociationOverrideAnnotation associationOverride = this.getAssociationOverrideAnnotationAt(resourceField, 0); JoinColumnAnnotation joinColumn = associationOverride.joinColumnAt(0); joinColumn.setReferencedColumnName("REF_NAME"); joinColumn.setUnique(Boolean.FALSE); @@ -269,16 +293,16 @@ public class AssociationOverridesTests extends JpaJavaResourceModelTestCase { assertEquals("BAR", associationOverride.joinColumnAt(0).getName()); assertNull(associationOverride.joinColumnAt(1).getName()); assertEquals("FOO", associationOverride.joinColumnAt(2).getName()); - assertEquals(3, associationOverride.joinColumnsSize()); + assertEquals(3, associationOverride.getJoinColumnsSize()); assertSourceContains("@AssociationOverrides(@AssociationOverride(name = \"" + ASSOCIATION_OVERRIDE_NAME + "\", joinColumns = {@JoinColumn(name = \"BAR\", referencedColumnName = \"REF_NAME\", unique = false, nullable = false, insertable = false, updatable = false, columnDefinition = \"COLUMN_DEF\", table = \"TABLE\"), @JoinColumn, @JoinColumn(name = \"FOO\")}))", cu); } public void testMoveJoinColumn2() throws Exception { ICompilationUnit cu = this.createTestAssociationOverrideWithJoinColumns(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - AssociationOverrideAnnotation associationOverride = (AssociationOverrideAnnotation) attributeResource.annotations(JPA.ASSOCIATION_OVERRIDE, JPA.ASSOCIATION_OVERRIDES).next(); + AssociationOverrideAnnotation associationOverride = this.getAssociationOverrideAnnotationAt(resourceField, 0); JoinColumnAnnotation joinColumn = associationOverride.joinColumnAt(0); joinColumn.setReferencedColumnName("REF_NAME"); @@ -295,20 +319,20 @@ public class AssociationOverridesTests extends JpaJavaResourceModelTestCase { assertNull(associationOverride.joinColumnAt(0).getName()); assertEquals("FOO", associationOverride.joinColumnAt(1).getName()); assertEquals("BAR", associationOverride.joinColumnAt(2).getName()); - assertEquals(3, associationOverride.joinColumnsSize()); + assertEquals(3, associationOverride.getJoinColumnsSize()); assertSourceContains("@AssociationOverrides(@AssociationOverride(name = \"" + ASSOCIATION_OVERRIDE_NAME + "\", joinColumns = {@JoinColumn, @JoinColumn(name = \"FOO\"), @JoinColumn(name = \"BAR\", referencedColumnName = \"REF_NAME\", unique = false, nullable = false, insertable = false, updatable = false, columnDefinition = \"COLUMN_DEF\", table = \"TABLE\")}))", cu); } public void testSetJoinColumnName() throws Exception { ICompilationUnit cu = this.createTestAssociationOverrideWithJoinColumns(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - AssociationOverrideAnnotation associationOverride = (AssociationOverrideAnnotation) attributeResource.annotations(JPA.ASSOCIATION_OVERRIDE, JPA.ASSOCIATION_OVERRIDES).next(); + AssociationOverrideAnnotation associationOverride = this.getAssociationOverrideAnnotationAt(resourceField, 0); - assertEquals(2, associationOverride.joinColumnsSize()); + assertEquals(2, associationOverride.getJoinColumnsSize()); - JoinColumnAnnotation joinColumn = associationOverride.joinColumns().next(); + JoinColumnAnnotation joinColumn = associationOverride.joinColumnAt(0); assertEquals("BAR", joinColumn.getName()); diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/AttributeOverrideTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/AttributeOverrideTests.java index 348c4db51f..eec0cf1f62 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/AttributeOverrideTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/AttributeOverrideTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2009 Oracle. All rights reserved. + * Copyright (c) 2007, 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. @@ -11,12 +11,14 @@ package org.eclipse.jpt.jpa.core.tests.internal.resource.java; import java.util.Iterator; import org.eclipse.jdt.core.ICompilationUnit; +import org.eclipse.jpt.common.core.resource.java.JavaResourceField; +import org.eclipse.jpt.common.core.resource.java.JavaResourceMember; +import org.eclipse.jpt.common.core.resource.java.JavaResourceType; +import org.eclipse.jpt.common.utility.internal.CollectionTools; import org.eclipse.jpt.common.utility.internal.iterators.ArrayIterator; import org.eclipse.jpt.jpa.core.resource.java.AttributeOverrideAnnotation; import org.eclipse.jpt.jpa.core.resource.java.ColumnAnnotation; 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; @SuppressWarnings("nls") public class AttributeOverrideTests extends JpaJavaResourceModelTestCase { @@ -53,12 +55,16 @@ public class AttributeOverrideTests extends JpaJavaResourceModelTestCase { } }); } - + + private AttributeOverrideAnnotation getAttributeOverrideAnnotationAt(JavaResourceMember resourceMember, int index) { + return (AttributeOverrideAnnotation) resourceMember.getAnnotation(index, JPA.ATTRIBUTE_OVERRIDE); + } + public void testGetName() throws Exception { ICompilationUnit cu = this.createTestAttributeOverrideOnField(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - AttributeOverrideAnnotation attributeOverride = (AttributeOverrideAnnotation) attributeResource.getAnnotation(JPA.ATTRIBUTE_OVERRIDE); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); + AttributeOverrideAnnotation attributeOverride = this.getAttributeOverrideAnnotationAt(resourceField, 0); assertNotNull(attributeOverride); assertEquals(ATTRIBUTE_OVERRIDE_NAME, attributeOverride.getName()); @@ -66,9 +72,9 @@ public class AttributeOverrideTests extends JpaJavaResourceModelTestCase { public void testGetNullColumn() throws Exception { ICompilationUnit cu = this.createTestAttributeOverrideOnField(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - AttributeOverrideAnnotation attributeOverride = (AttributeOverrideAnnotation) attributeResource.getAnnotation(JPA.ATTRIBUTE_OVERRIDE); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); + AttributeOverrideAnnotation attributeOverride = this.getAttributeOverrideAnnotationAt(resourceField, 0); ColumnAnnotation column = attributeOverride.getColumn(); assertNotNull(attributeOverride); assertNull(column); @@ -76,9 +82,9 @@ public class AttributeOverrideTests extends JpaJavaResourceModelTestCase { public void testSetName() throws Exception { ICompilationUnit cu = this.createTestAttributeOverrideOnField(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - AttributeOverrideAnnotation attributeOverride = (AttributeOverrideAnnotation) attributeResource.getAnnotation(JPA.ATTRIBUTE_OVERRIDE); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); + AttributeOverrideAnnotation attributeOverride = this.getAttributeOverrideAnnotationAt(resourceField, 0); assertNotNull(attributeOverride); assertEquals(ATTRIBUTE_OVERRIDE_NAME, attributeOverride.getName()); @@ -90,9 +96,9 @@ public class AttributeOverrideTests extends JpaJavaResourceModelTestCase { public void testSetNameNull() throws Exception { ICompilationUnit cu = this.createTestAttributeOverrideOnField(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - AttributeOverrideAnnotation attributeOverride = (AttributeOverrideAnnotation) attributeResource.getAnnotation(JPA.ATTRIBUTE_OVERRIDE); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); + AttributeOverrideAnnotation attributeOverride = this.getAttributeOverrideAnnotationAt(resourceField, 0); assertEquals(ATTRIBUTE_OVERRIDE_NAME, attributeOverride.getName()); @@ -105,18 +111,18 @@ public class AttributeOverrideTests extends JpaJavaResourceModelTestCase { public void testColumnGetName() throws Exception { ICompilationUnit cu = this.createTestAttributeOverrideWithColumnOnField(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - AttributeOverrideAnnotation attributeOverride = (AttributeOverrideAnnotation) attributeResource.getAnnotation(JPA.ATTRIBUTE_OVERRIDE); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); + AttributeOverrideAnnotation attributeOverride = this.getAttributeOverrideAnnotationAt(resourceField, 0); ColumnAnnotation column = attributeOverride.getColumn(); assertEquals(COLUMN_NAME, column.getName()); } public void testColumnSetName() throws Exception { ICompilationUnit cu = this.createTestAttributeOverrideWithColumnOnField(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - AttributeOverrideAnnotation attributeOverride = (AttributeOverrideAnnotation) attributeResource.getAnnotation(JPA.ATTRIBUTE_OVERRIDE); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); + AttributeOverrideAnnotation attributeOverride = this.getAttributeOverrideAnnotationAt(resourceField, 0); ColumnAnnotation column = attributeOverride.getColumn(); assertEquals(COLUMN_NAME, column.getName()); @@ -133,9 +139,9 @@ public class AttributeOverrideTests extends JpaJavaResourceModelTestCase { public void testAddColumn() throws Exception { ICompilationUnit cu = this.createTestAttributeOverrideOnField(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - AttributeOverrideAnnotation attributeOverride = (AttributeOverrideAnnotation) attributeResource.getAnnotation(JPA.ATTRIBUTE_OVERRIDE); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); + AttributeOverrideAnnotation attributeOverride = this.getAttributeOverrideAnnotationAt(resourceField, 0); ColumnAnnotation column = attributeOverride.getColumn(); assertNull(column); @@ -147,9 +153,9 @@ public class AttributeOverrideTests extends JpaJavaResourceModelTestCase { public void testRemoveColumn() throws Exception { ICompilationUnit cu = this.createTestAttributeOverrideOnField(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - AttributeOverrideAnnotation attributeOverride = (AttributeOverrideAnnotation) attributeResource.getAnnotation(JPA.ATTRIBUTE_OVERRIDE); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); + AttributeOverrideAnnotation attributeOverride = this.getAttributeOverrideAnnotationAt(resourceField, 0); ColumnAnnotation column = attributeOverride.getColumn(); assertNull(column); } diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/AttributeOverridesTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/AttributeOverridesTests.java index 8ddf1a6da5..2331276d19 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/AttributeOverridesTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/AttributeOverridesTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2010 Oracle. All rights reserved. + * Copyright (c) 2007, 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,15 +12,15 @@ package org.eclipse.jpt.jpa.core.tests.internal.resource.java; import java.util.Iterator; import org.eclipse.jdt.core.ICompilationUnit; +import org.eclipse.jpt.common.core.resource.java.JavaResourceField; +import org.eclipse.jpt.common.core.resource.java.JavaResourceMember; +import org.eclipse.jpt.common.core.resource.java.JavaResourceType; +import org.eclipse.jpt.common.core.resource.java.NestableAnnotation; import org.eclipse.jpt.common.utility.internal.CollectionTools; import org.eclipse.jpt.common.utility.internal.iterators.ArrayIterator; 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.ColumnAnnotation; 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.NestableAnnotation; @SuppressWarnings("nls") public class AttributeOverridesTests extends JpaJavaResourceModelTestCase { @@ -73,12 +73,15 @@ public class AttributeOverridesTests extends JpaJavaResourceModelTestCase { }); } + private AttributeOverrideAnnotation getAttributeOverrideAnnotationAt(JavaResourceMember resourceMember, int index) { + return (AttributeOverrideAnnotation) resourceMember.getAnnotation(index, JPA.ATTRIBUTE_OVERRIDE); + } + public void testGetName() throws Exception { ICompilationUnit cu = this.createTestAttributeOverrideOnField(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - AttributeOverridesAnnotation attributeOverrides = (AttributeOverridesAnnotation) attributeResource.getAnnotation(JPA.ATTRIBUTE_OVERRIDES); - AttributeOverrideAnnotation attributeOverride = attributeOverrides.getNestedAnnotations().iterator().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); + AttributeOverrideAnnotation attributeOverride = this.getAttributeOverrideAnnotationAt(resourceField, 0); assertNotNull(attributeOverride); assertEquals(ATTRIBUTE_OVERRIDE_NAME, attributeOverride.getName()); @@ -86,10 +89,10 @@ public class AttributeOverridesTests extends JpaJavaResourceModelTestCase { public void testGetNullColumn() throws Exception { ICompilationUnit cu = this.createTestAttributeOverrideOnField(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - AttributeOverridesAnnotation attributeOverrides = (AttributeOverridesAnnotation) attributeResource.getAnnotation(JPA.ATTRIBUTE_OVERRIDES); - AttributeOverrideAnnotation attributeOverride = attributeOverrides.getNestedAnnotations().iterator().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); + AttributeOverrideAnnotation attributeOverride = this.getAttributeOverrideAnnotationAt(resourceField, 0); + ColumnAnnotation column = attributeOverride.getColumn(); assertNotNull(attributeOverride); assertNull(column); @@ -97,10 +100,9 @@ public class AttributeOverridesTests extends JpaJavaResourceModelTestCase { public void testSetName() throws Exception { ICompilationUnit cu = this.createTestAttributeOverrideOnField(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - AttributeOverridesAnnotation attributeOverrides = (AttributeOverridesAnnotation) attributeResource.getAnnotation(JPA.ATTRIBUTE_OVERRIDES); - AttributeOverrideAnnotation attributeOverride = attributeOverrides.getNestedAnnotations().iterator().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); + AttributeOverrideAnnotation attributeOverride = this.getAttributeOverrideAnnotationAt(resourceField, 0); assertNotNull(attributeOverride); assertEquals(ATTRIBUTE_OVERRIDE_NAME, attributeOverride.getName()); @@ -112,10 +114,10 @@ public class AttributeOverridesTests extends JpaJavaResourceModelTestCase { public void testSetNameNull() throws Exception { ICompilationUnit cu = this.createTestAttributeOverrideOnField(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - AttributeOverridesAnnotation attributeOverrides = (AttributeOverridesAnnotation) attributeResource.getAnnotation(JPA.ATTRIBUTE_OVERRIDES); - AttributeOverrideAnnotation attributeOverride = attributeOverrides.getNestedAnnotations().iterator().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); + AttributeOverrideAnnotation attributeOverride = this.getAttributeOverrideAnnotationAt(resourceField, 0); + assertEquals(ATTRIBUTE_OVERRIDE_NAME, attributeOverride.getName()); attributeOverride.setName(null); @@ -128,10 +130,9 @@ public class AttributeOverridesTests extends JpaJavaResourceModelTestCase { public void testColumnGetName() throws Exception { ICompilationUnit cu = this.createTestAttributeOverrideWithColumnOnField(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - AttributeOverridesAnnotation attributeOverrides = (AttributeOverridesAnnotation) attributeResource.getAnnotation(JPA.ATTRIBUTE_OVERRIDES); - AttributeOverrideAnnotation attributeOverride = attributeOverrides.getNestedAnnotations().iterator().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); + AttributeOverrideAnnotation attributeOverride = this.getAttributeOverrideAnnotationAt(resourceField, 0); ColumnAnnotation column = attributeOverride.getColumn(); assertEquals(COLUMN_NAME, column.getName()); @@ -139,9 +140,9 @@ public class AttributeOverridesTests extends JpaJavaResourceModelTestCase { public void testColumnSetName() throws Exception { ICompilationUnit cu = this.createTestAttributeOverrideWithColumnOnField(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - AttributeOverrideAnnotation attributeOverride = (AttributeOverrideAnnotation) attributeResource.annotations(JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES).next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); + AttributeOverrideAnnotation attributeOverride = this.getAttributeOverrideAnnotationAt(resourceField, 0); ColumnAnnotation column = attributeOverride.getColumn(); @@ -160,49 +161,72 @@ public class AttributeOverridesTests extends JpaJavaResourceModelTestCase { public void testAddAttributeOverrideCopyExisting() throws Exception { ICompilationUnit cu = createTestAttributeOverride(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); + JavaResourceType resourceType = buildJavaResourceType(cu); - AttributeOverrideAnnotation attributeOverride = (AttributeOverrideAnnotation) typeResource.addAnnotation(1, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + String expected1 = "@AttributeOverrides({"; + String expected2 = "@AttributeOverride(name = \"FOO\", column = @Column(name = \"FOO\", columnDefinition = \"BAR\", table = \"BAZ\", unique = false, nullable = false, insertable = false, updatable = false, length = 1, precision = 1, scale = 1)),"; + String expected3 = "@AttributeOverride(name = \"BAR\") })"; + AttributeOverrideAnnotation attributeOverride = (AttributeOverrideAnnotation) resourceType.addAnnotation(1, JPA.ATTRIBUTE_OVERRIDE); attributeOverride.setName("BAR"); - assertSourceContains("@AttributeOverrides({@AttributeOverride(name = \"FOO\", column = @Column(name = \"FOO\", columnDefinition = \"BAR\", table = \"BAZ\", unique = false, nullable = false, insertable = false, updatable = false, length = 1, precision = 1, scale = 1)),@AttributeOverride(name = \"BAR\")})", cu); + assertSourceContains(expected1, cu); + assertSourceContains(expected2, cu); + assertSourceContains(expected3, cu); - assertNull(typeResource.getAnnotation(JPA.ATTRIBUTE_OVERRIDE)); - assertNotNull(typeResource.getAnnotation(JPA.ATTRIBUTE_OVERRIDES)); - assertEquals(2, CollectionTools.size(typeResource.annotations(JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES))); + assertNull(resourceType.getAnnotation(JPA.ATTRIBUTE_OVERRIDE)); + assertNotNull(resourceType.getAnnotation(JPA.ATTRIBUTE_OVERRIDES)); + assertNotNull(resourceType.getAnnotation(0, JPA.ATTRIBUTE_OVERRIDE)); + assertEquals(2, resourceType.getAnnotationsSize(JPA.ATTRIBUTE_OVERRIDE)); } public void testAddAttributeOverrideToBeginningOfList() throws Exception { ICompilationUnit cu = createTestAttributeOverride(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); + JavaResourceType resourceType = buildJavaResourceType(cu); - AttributeOverrideAnnotation attributeOverride = (AttributeOverrideAnnotation) typeResource.addAnnotation(1, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + String expected1 = "@AttributeOverrides({"; + String expected2 = "@AttributeOverride(name = \"FOO\", column = @Column(name = \"FOO\", columnDefinition = \"BAR\", table = \"BAZ\", unique = false, nullable = false, insertable = false, updatable = false, length = 1, precision = 1, scale = 1)),"; + String expected3 = "@AttributeOverride(name = \"BAR\") })"; + AttributeOverrideAnnotation attributeOverride = (AttributeOverrideAnnotation) resourceType.addAnnotation(1, JPA.ATTRIBUTE_OVERRIDE); attributeOverride.setName("BAR"); - assertSourceContains("@AttributeOverrides({@AttributeOverride(name = \"FOO\", column = @Column(name = \"FOO\", columnDefinition = \"BAR\", table = \"BAZ\", unique = false, nullable = false, insertable = false, updatable = false, length = 1, precision = 1, scale = 1)),@AttributeOverride(name = \"BAR\")})", cu); + assertSourceContains(expected1, cu); + assertSourceContains(expected2, cu); + assertSourceContains(expected3, cu); - attributeOverride = (AttributeOverrideAnnotation) typeResource.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + expected2 = "@AttributeOverride(name = \"BAZ\"),"; + expected3 = "@AttributeOverride(name = \"FOO\", column = @Column(name = \"FOO\", columnDefinition = \"BAR\", table = \"BAZ\", unique = false, nullable = false, insertable = false, updatable = false, length = 1, precision = 1, scale = 1)), @AttributeOverride(name = \"BAR\") })"; + attributeOverride = (AttributeOverrideAnnotation) resourceType.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE); attributeOverride.setName("BAZ"); - assertSourceContains("@AttributeOverrides({@AttributeOverride(name = \"BAZ\"),@AttributeOverride(name = \"FOO\", column = @Column(name = \"FOO\", columnDefinition = \"BAR\", table = \"BAZ\", unique = false, nullable = false, insertable = false, updatable = false, length = 1, precision = 1, scale = 1)), @AttributeOverride(name = \"BAR\")})", cu); + assertSourceContains(expected1, cu); + assertSourceContains(expected2, cu); + assertSourceContains(expected3, cu); - Iterator attributeOverrides = typeResource.annotations(JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + Iterator attributeOverrides = resourceType.getAnnotations(JPA.ATTRIBUTE_OVERRIDE).iterator(); assertEquals("BAZ", ((AttributeOverrideAnnotation) attributeOverrides.next()).getName()); assertEquals("FOO", ((AttributeOverrideAnnotation) attributeOverrides.next()).getName()); assertEquals("BAR", ((AttributeOverrideAnnotation) attributeOverrides.next()).getName()); - assertNull(typeResource.getAnnotation(JPA.ATTRIBUTE_OVERRIDE)); - assertNotNull(typeResource.getAnnotation(JPA.ATTRIBUTE_OVERRIDES)); - assertEquals(3, CollectionTools.size(typeResource.annotations(JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES))); + assertNull(resourceType.getAnnotation(JPA.ATTRIBUTE_OVERRIDE)); + assertNotNull(resourceType.getAnnotation(JPA.ATTRIBUTE_OVERRIDES)); + assertNotNull(resourceType.getAnnotation(0, JPA.ATTRIBUTE_OVERRIDE)); + assertEquals(3, resourceType.getAnnotationsSize(JPA.ATTRIBUTE_OVERRIDE)); } public void testRemoveAttributeOverrideCopyExisting() throws Exception { ICompilationUnit cu = createTestAttributeOverride(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); + JavaResourceType resourceType = buildJavaResourceType(cu); - AttributeOverrideAnnotation attributeOverride = (AttributeOverrideAnnotation) typeResource.addAnnotation(1, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + String expected1 = "@AttributeOverrides({"; + String expected2 = "@AttributeOverride(name = \"FOO\", column = @Column(name = \"FOO\", columnDefinition = \"BAR\", table = \"BAZ\", unique = false, nullable = false, insertable = false, updatable = false, length = 1, precision = 1, scale = 1)),"; + String expected3 = "@AttributeOverride(name = \"BAR\") })"; + AttributeOverrideAnnotation attributeOverride = (AttributeOverrideAnnotation) resourceType.addAnnotation(1, JPA.ATTRIBUTE_OVERRIDE); attributeOverride.setName("BAR"); - assertSourceContains("@AttributeOverrides({@AttributeOverride(name = \"FOO\", column = @Column(name = \"FOO\", columnDefinition = \"BAR\", table = \"BAZ\", unique = false, nullable = false, insertable = false, updatable = false, length = 1, precision = 1, scale = 1)),@AttributeOverride(name = \"BAR\")})", cu); + assertSourceContains(expected1, cu); + assertSourceContains(expected2, cu); + assertSourceContains(expected3, cu); - typeResource.removeAnnotation(1, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); - assertSourceContains("@AttributeOverride(name = \"FOO\", column = @Column(name = \"FOO\", columnDefinition = \"BAR\", table = \"BAZ\", unique = false, nullable = false, insertable = false, updatable = false, length = 1, precision = 1, scale = 1))", cu); + expected1 = "@AttributeOverride(name = \"FOO\", column = @Column(name = \"FOO\", columnDefinition = \"BAR\", table = \"BAZ\", unique = false, nullable = false, insertable = false, updatable = false, length = 1, precision = 1, scale = 1))"; + resourceType.removeAnnotation(1, JPA.ATTRIBUTE_OVERRIDE); + assertSourceContains(expected1, cu); + assertSourceDoesNotContain("@AttributeOverrides", cu); } //not sure i want to test this api, how can we keep ContainerAnnotation.add, move, remove from being public? //users should go throught AbstractJavapersistenceResource. this gets confusing because you would handle it differently diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/BasicTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/BasicTests.java index 4c11241d86..e90df300fb 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/BasicTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/BasicTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2009 Oracle. All rights reserved. + * Copyright (c) 2007, 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. @@ -11,12 +11,13 @@ package org.eclipse.jpt.jpa.core.tests.internal.resource.java; import java.util.Iterator; import org.eclipse.jdt.core.ICompilationUnit; +import org.eclipse.jpt.common.core.resource.java.JavaResourceField; +import org.eclipse.jpt.common.core.resource.java.JavaResourceType; +import org.eclipse.jpt.common.utility.internal.CollectionTools; import org.eclipse.jpt.common.utility.internal.iterators.ArrayIterator; import org.eclipse.jpt.jpa.core.resource.java.BasicAnnotation; import org.eclipse.jpt.jpa.core.resource.java.FetchType; 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; @SuppressWarnings("nls") public class BasicTests extends JpaJavaResourceModelTestCase { @@ -66,28 +67,28 @@ public class BasicTests extends JpaJavaResourceModelTestCase { public void testBasic() throws Exception { ICompilationUnit cu = this.createTestBasic(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - BasicAnnotation basic = (BasicAnnotation) attributeResource.getAnnotation(JPA.BASIC); + BasicAnnotation basic = (BasicAnnotation) resourceField.getAnnotation(JPA.BASIC); assertNotNull(basic); } public void testGetOptional() throws Exception { ICompilationUnit cu = this.createTestBasicWithOptional(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - BasicAnnotation basic = (BasicAnnotation) attributeResource.getAnnotation(JPA.BASIC); + BasicAnnotation basic = (BasicAnnotation) resourceField.getAnnotation(JPA.BASIC); assertEquals(Boolean.TRUE, basic.getOptional()); } public void testSetOptional() throws Exception { ICompilationUnit cu = this.createTestBasicWithOptional(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - BasicAnnotation basic = (BasicAnnotation) attributeResource.getAnnotation(JPA.BASIC); + BasicAnnotation basic = (BasicAnnotation) resourceField.getAnnotation(JPA.BASIC); assertEquals(Boolean.TRUE, basic.getOptional()); basic.setOptional(Boolean.FALSE); @@ -98,10 +99,10 @@ public class BasicTests extends JpaJavaResourceModelTestCase { public void testSetOptionalNull() throws Exception { ICompilationUnit cu = this.createTestBasicWithOptional(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - BasicAnnotation basic = (BasicAnnotation) attributeResource.getAnnotation(JPA.BASIC); + BasicAnnotation basic = (BasicAnnotation) resourceField.getAnnotation(JPA.BASIC); assertEquals(Boolean.TRUE, basic.getOptional()); basic.setOptional(null); @@ -113,19 +114,19 @@ public class BasicTests extends JpaJavaResourceModelTestCase { public void testGetFetch() throws Exception { ICompilationUnit cu = this.createTestBasicWithFetch(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - BasicAnnotation basic = (BasicAnnotation) attributeResource.getAnnotation(JPA.BASIC); + BasicAnnotation basic = (BasicAnnotation) resourceField.getAnnotation(JPA.BASIC); assertEquals(FetchType.EAGER, basic.getFetch()); } public void testSetFetch() throws Exception { ICompilationUnit cu = this.createTestBasicWithFetch(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - BasicAnnotation basic = (BasicAnnotation) attributeResource.getAnnotation(JPA.BASIC); + BasicAnnotation basic = (BasicAnnotation) resourceField.getAnnotation(JPA.BASIC); assertEquals(FetchType.EAGER, basic.getFetch()); basic.setFetch(FetchType.LAZY); @@ -136,10 +137,10 @@ public class BasicTests extends JpaJavaResourceModelTestCase { public void testSetFetchNull() throws Exception { ICompilationUnit cu = this.createTestBasicWithFetch(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - BasicAnnotation basic = (BasicAnnotation) attributeResource.getAnnotation(JPA.BASIC); + BasicAnnotation basic = (BasicAnnotation) resourceField.getAnnotation(JPA.BASIC); assertEquals(FetchType.EAGER, basic.getFetch()); basic.setFetch(null); diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/ColumnTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/ColumnTests.java index 3618daa0f4..06ba8be96f 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/ColumnTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/ColumnTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2009 Oracle. All rights reserved. + * Copyright (c) 2007, 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. @@ -11,11 +11,12 @@ package org.eclipse.jpt.jpa.core.tests.internal.resource.java; import java.util.Iterator; import org.eclipse.jdt.core.ICompilationUnit; +import org.eclipse.jpt.common.core.resource.java.JavaResourceField; +import org.eclipse.jpt.common.core.resource.java.JavaResourceType; +import org.eclipse.jpt.common.utility.internal.CollectionTools; import org.eclipse.jpt.common.utility.internal.iterators.ArrayIterator; import org.eclipse.jpt.jpa.core.resource.java.ColumnAnnotation; 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; @SuppressWarnings("nls") public class ColumnTests extends JpaJavaResourceModelTestCase { @@ -108,18 +109,18 @@ public class ColumnTests extends JpaJavaResourceModelTestCase { public void testGetName() throws Exception { ICompilationUnit cu = this.createTestColumnWithName(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - ColumnAnnotation column = (ColumnAnnotation) attributeResource.getAnnotation(JPA.COLUMN); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); + ColumnAnnotation column = (ColumnAnnotation) resourceField.getAnnotation(JPA.COLUMN); assertNotNull(column); assertEquals(COLUMN_NAME, column.getName()); } public void testGetNull() throws Exception { ICompilationUnit cu = this.createTestColumn(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - ColumnAnnotation column = (ColumnAnnotation) attributeResource.getAnnotation(JPA.COLUMN); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); + ColumnAnnotation column = (ColumnAnnotation) resourceField.getAnnotation(JPA.COLUMN); assertNotNull(column); assertNull(column.getName()); assertNull(column.getNullable()); @@ -132,9 +133,9 @@ public class ColumnTests extends JpaJavaResourceModelTestCase { public void testSetName() throws Exception { ICompilationUnit cu = this.createTestColumn(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - ColumnAnnotation column = (ColumnAnnotation) attributeResource.getAnnotation(JPA.COLUMN); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); + ColumnAnnotation column = (ColumnAnnotation) resourceField.getAnnotation(JPA.COLUMN); assertNotNull(column); assertNull(column.getName()); @@ -147,9 +148,9 @@ public class ColumnTests extends JpaJavaResourceModelTestCase { public void testSetNameNull() throws Exception { ICompilationUnit cu = this.createTestColumnWithName(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - ColumnAnnotation column = (ColumnAnnotation) attributeResource.getAnnotation(JPA.COLUMN); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); + ColumnAnnotation column = (ColumnAnnotation) resourceField.getAnnotation(JPA.COLUMN); assertEquals(COLUMN_NAME, column.getName()); @@ -161,17 +162,17 @@ public class ColumnTests extends JpaJavaResourceModelTestCase { public void testGetTable() throws Exception { ICompilationUnit cu = this.createTestColumnWithTable(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - ColumnAnnotation column = (ColumnAnnotation) attributeResource.getAnnotation(JPA.COLUMN); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); + ColumnAnnotation column = (ColumnAnnotation) resourceField.getAnnotation(JPA.COLUMN); assertEquals(COLUMN_TABLE, column.getTable()); } public void testSetTable() throws Exception { ICompilationUnit cu = this.createTestColumn(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - ColumnAnnotation column = (ColumnAnnotation) attributeResource.getAnnotation(JPA.COLUMN); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); + ColumnAnnotation column = (ColumnAnnotation) resourceField.getAnnotation(JPA.COLUMN); assertNotNull(column); assertNull(column.getTable()); @@ -188,17 +189,17 @@ public class ColumnTests extends JpaJavaResourceModelTestCase { public void testGetColumnDefinition() throws Exception { ICompilationUnit cu = this.createTestColumnWithColumnDefinition(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - ColumnAnnotation column = (ColumnAnnotation) attributeResource.getAnnotation(JPA.COLUMN); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); + ColumnAnnotation column = (ColumnAnnotation) resourceField.getAnnotation(JPA.COLUMN); assertEquals(COLUMN_COLUMN_DEFINITION, column.getColumnDefinition()); } public void testSetColumnDefinition() throws Exception { ICompilationUnit cu = this.createTestColumn(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - ColumnAnnotation column = (ColumnAnnotation) attributeResource.getAnnotation(JPA.COLUMN); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); + ColumnAnnotation column = (ColumnAnnotation) resourceField.getAnnotation(JPA.COLUMN); assertNotNull(column); assertNull(column.getColumnDefinition()); @@ -215,18 +216,18 @@ public class ColumnTests extends JpaJavaResourceModelTestCase { public void testGetUnique() throws Exception { ICompilationUnit cu = this.createTestColumnWithBooleanElement("unique"); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - ColumnAnnotation column = (ColumnAnnotation) attributeResource.getAnnotation(JPA.COLUMN); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); + ColumnAnnotation column = (ColumnAnnotation) resourceField.getAnnotation(JPA.COLUMN); assertEquals(Boolean.TRUE, column.getUnique()); } public void testSetUnique() throws Exception { ICompilationUnit cu = this.createTestColumn(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - ColumnAnnotation column = (ColumnAnnotation) attributeResource.getAnnotation(JPA.COLUMN); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); + ColumnAnnotation column = (ColumnAnnotation) resourceField.getAnnotation(JPA.COLUMN); assertNotNull(column); assertNull(column.getUnique()); @@ -242,18 +243,18 @@ public class ColumnTests extends JpaJavaResourceModelTestCase { public void testGetNullable() throws Exception { ICompilationUnit cu = this.createTestColumnWithBooleanElement("nullable"); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - ColumnAnnotation column = (ColumnAnnotation) attributeResource.getAnnotation(JPA.COLUMN); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); + ColumnAnnotation column = (ColumnAnnotation) resourceField.getAnnotation(JPA.COLUMN); assertEquals(Boolean.TRUE, column.getNullable()); } public void testSetNullable() throws Exception { ICompilationUnit cu = this.createTestColumn(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - ColumnAnnotation column = (ColumnAnnotation) attributeResource.getAnnotation(JPA.COLUMN); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); + ColumnAnnotation column = (ColumnAnnotation) resourceField.getAnnotation(JPA.COLUMN); assertNotNull(column); assertNull(column.getNullable()); @@ -269,18 +270,18 @@ public class ColumnTests extends JpaJavaResourceModelTestCase { public void testGetInsertable() throws Exception { ICompilationUnit cu = this.createTestColumnWithBooleanElement("insertable"); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - ColumnAnnotation column = (ColumnAnnotation) attributeResource.getAnnotation(JPA.COLUMN); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); + ColumnAnnotation column = (ColumnAnnotation) resourceField.getAnnotation(JPA.COLUMN); assertEquals(Boolean.TRUE, column.getInsertable()); } public void testSetInsertable() throws Exception { ICompilationUnit cu = this.createTestColumn(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - ColumnAnnotation column = (ColumnAnnotation) attributeResource.getAnnotation(JPA.COLUMN); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); + ColumnAnnotation column = (ColumnAnnotation) resourceField.getAnnotation(JPA.COLUMN); assertNotNull(column); assertNull(column.getInsertable()); @@ -296,18 +297,18 @@ public class ColumnTests extends JpaJavaResourceModelTestCase { public void testGetUpdatable() throws Exception { ICompilationUnit cu = this.createTestColumnWithBooleanElement("updatable"); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - ColumnAnnotation column = (ColumnAnnotation) attributeResource.getAnnotation(JPA.COLUMN); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); + ColumnAnnotation column = (ColumnAnnotation) resourceField.getAnnotation(JPA.COLUMN); assertEquals(Boolean.TRUE, column.getUpdatable()); } public void testSetUpdatable() throws Exception { ICompilationUnit cu = this.createTestColumn(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - ColumnAnnotation column = (ColumnAnnotation) attributeResource.getAnnotation(JPA.COLUMN); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); + ColumnAnnotation column = (ColumnAnnotation) resourceField.getAnnotation(JPA.COLUMN); assertNotNull(column); assertNull(column.getUpdatable()); @@ -323,18 +324,18 @@ public class ColumnTests extends JpaJavaResourceModelTestCase { public void testGetLength() throws Exception { ICompilationUnit cu = this.createTestColumnWithIntElement("length"); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - ColumnAnnotation column = (ColumnAnnotation) attributeResource.getAnnotation(JPA.COLUMN); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); + ColumnAnnotation column = (ColumnAnnotation) resourceField.getAnnotation(JPA.COLUMN); assertEquals(Integer.valueOf(5), column.getLength()); } public void testSetLength() throws Exception { ICompilationUnit cu = this.createTestColumn(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - ColumnAnnotation column = (ColumnAnnotation) attributeResource.getAnnotation(JPA.COLUMN); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); + ColumnAnnotation column = (ColumnAnnotation) resourceField.getAnnotation(JPA.COLUMN); assertNotNull(column); assertNull(column.getLength()); @@ -350,18 +351,18 @@ public class ColumnTests extends JpaJavaResourceModelTestCase { public void testGetPrecision() throws Exception { ICompilationUnit cu = this.createTestColumnWithIntElement("precision"); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - ColumnAnnotation column = (ColumnAnnotation) attributeResource.getAnnotation(JPA.COLUMN); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); + ColumnAnnotation column = (ColumnAnnotation) resourceField.getAnnotation(JPA.COLUMN); assertEquals(Integer.valueOf(5), column.getPrecision()); } public void testSetPrecision() throws Exception { ICompilationUnit cu = this.createTestColumn(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - ColumnAnnotation column = (ColumnAnnotation) attributeResource.getAnnotation(JPA.COLUMN); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); + ColumnAnnotation column = (ColumnAnnotation) resourceField.getAnnotation(JPA.COLUMN); assertNotNull(column); assertEquals(null, column.getPrecision()); @@ -377,18 +378,18 @@ public class ColumnTests extends JpaJavaResourceModelTestCase { public void testGetScale() throws Exception { ICompilationUnit cu = this.createTestColumnWithIntElement("scale"); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - ColumnAnnotation column = (ColumnAnnotation) attributeResource.getAnnotation(JPA.COLUMN); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); + ColumnAnnotation column = (ColumnAnnotation) resourceField.getAnnotation(JPA.COLUMN); assertEquals(Integer.valueOf(5), column.getScale()); } public void testSetScale() throws Exception { ICompilationUnit cu = this.createTestColumn(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - ColumnAnnotation column = (ColumnAnnotation) attributeResource.getAnnotation(JPA.COLUMN); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); + ColumnAnnotation column = (ColumnAnnotation) resourceField.getAnnotation(JPA.COLUMN); assertNotNull(column); assertNull(column.getScale()); diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/DiscriminatorColumnTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/DiscriminatorColumnTests.java index 9e5715d552..efbde613b9 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/DiscriminatorColumnTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/DiscriminatorColumnTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2009 Oracle. All rights reserved. + * Copyright (c) 2007, 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. @@ -11,11 +11,11 @@ package org.eclipse.jpt.jpa.core.tests.internal.resource.java; import java.util.Iterator; import org.eclipse.jdt.core.ICompilationUnit; +import org.eclipse.jpt.common.core.resource.java.JavaResourceType; import org.eclipse.jpt.common.utility.internal.iterators.ArrayIterator; import org.eclipse.jpt.jpa.core.resource.java.DiscriminatorColumnAnnotation; import org.eclipse.jpt.jpa.core.resource.java.DiscriminatorType; import org.eclipse.jpt.jpa.core.resource.java.JPA; -import org.eclipse.jpt.jpa.core.resource.java.JavaResourcePersistentType; @SuppressWarnings("nls") public class DiscriminatorColumnTests extends JpaJavaResourceModelTestCase { @@ -94,16 +94,16 @@ public class DiscriminatorColumnTests extends JpaJavaResourceModelTestCase { public void testGetName() throws Exception { ICompilationUnit cu = this.createTestDiscriminatorColumnWithName(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - DiscriminatorColumnAnnotation column = (DiscriminatorColumnAnnotation) typeResource.getAnnotation(JPA.DISCRIMINATOR_COLUMN); + JavaResourceType resourceType = buildJavaResourceType(cu); + DiscriminatorColumnAnnotation column = (DiscriminatorColumnAnnotation) resourceType.getAnnotation(JPA.DISCRIMINATOR_COLUMN); assertNotNull(column); assertEquals(COLUMN_NAME, column.getName()); } public void testGetNull() throws Exception { ICompilationUnit cu = this.createTestDiscriminatorColumn(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - DiscriminatorColumnAnnotation column = (DiscriminatorColumnAnnotation) typeResource.getAnnotation(JPA.DISCRIMINATOR_COLUMN); + JavaResourceType resourceType = buildJavaResourceType(cu); + DiscriminatorColumnAnnotation column = (DiscriminatorColumnAnnotation) resourceType.getAnnotation(JPA.DISCRIMINATOR_COLUMN); assertNotNull(column); assertNull(column.getName()); assertNull(column.getDiscriminatorType()); @@ -112,8 +112,8 @@ public class DiscriminatorColumnTests extends JpaJavaResourceModelTestCase { public void testSetName() throws Exception { ICompilationUnit cu = this.createTestDiscriminatorColumn(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - DiscriminatorColumnAnnotation column = (DiscriminatorColumnAnnotation) typeResource.getAnnotation(JPA.DISCRIMINATOR_COLUMN); + JavaResourceType resourceType = buildJavaResourceType(cu); + DiscriminatorColumnAnnotation column = (DiscriminatorColumnAnnotation) resourceType.getAnnotation(JPA.DISCRIMINATOR_COLUMN); assertNotNull(column); assertNull(column.getName()); @@ -126,8 +126,8 @@ public class DiscriminatorColumnTests extends JpaJavaResourceModelTestCase { public void testSetNameNull() throws Exception { ICompilationUnit cu = this.createTestDiscriminatorColumnWithName(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - DiscriminatorColumnAnnotation column = (DiscriminatorColumnAnnotation) typeResource.getAnnotation(JPA.DISCRIMINATOR_COLUMN); + JavaResourceType resourceType = buildJavaResourceType(cu); + DiscriminatorColumnAnnotation column = (DiscriminatorColumnAnnotation) resourceType.getAnnotation(JPA.DISCRIMINATOR_COLUMN); assertEquals(COLUMN_NAME, column.getName()); @@ -139,15 +139,15 @@ public class DiscriminatorColumnTests extends JpaJavaResourceModelTestCase { public void testGetColumnDefinition() throws Exception { ICompilationUnit cu = this.createTestDiscriminatorColumnWithColumnDefinition(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - DiscriminatorColumnAnnotation column = (DiscriminatorColumnAnnotation) typeResource.getAnnotation(JPA.DISCRIMINATOR_COLUMN); + JavaResourceType resourceType = buildJavaResourceType(cu); + DiscriminatorColumnAnnotation column = (DiscriminatorColumnAnnotation) resourceType.getAnnotation(JPA.DISCRIMINATOR_COLUMN); assertEquals(COLUMN_COLUMN_DEFINITION, column.getColumnDefinition()); } public void testSetColumnDefinition() throws Exception { ICompilationUnit cu = this.createTestDiscriminatorColumn(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - DiscriminatorColumnAnnotation column = (DiscriminatorColumnAnnotation) typeResource.getAnnotation(JPA.DISCRIMINATOR_COLUMN); + JavaResourceType resourceType = buildJavaResourceType(cu); + DiscriminatorColumnAnnotation column = (DiscriminatorColumnAnnotation) resourceType.getAnnotation(JPA.DISCRIMINATOR_COLUMN); assertNotNull(column); assertNull(column.getColumnDefinition()); @@ -164,16 +164,16 @@ public class DiscriminatorColumnTests extends JpaJavaResourceModelTestCase { public void testGetLength() throws Exception { ICompilationUnit cu = this.createTestColumnWithIntElement("length"); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - DiscriminatorColumnAnnotation column = (DiscriminatorColumnAnnotation) typeResource.getAnnotation(JPA.DISCRIMINATOR_COLUMN); + JavaResourceType resourceType = buildJavaResourceType(cu); + DiscriminatorColumnAnnotation column = (DiscriminatorColumnAnnotation) resourceType.getAnnotation(JPA.DISCRIMINATOR_COLUMN); assertEquals(Integer.valueOf(5), column.getLength()); } public void testSetLength() throws Exception { ICompilationUnit cu = this.createTestDiscriminatorColumn(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - DiscriminatorColumnAnnotation column = (DiscriminatorColumnAnnotation) typeResource.getAnnotation(JPA.DISCRIMINATOR_COLUMN); + JavaResourceType resourceType = buildJavaResourceType(cu); + DiscriminatorColumnAnnotation column = (DiscriminatorColumnAnnotation) resourceType.getAnnotation(JPA.DISCRIMINATOR_COLUMN); assertNotNull(column); assertNull(column.getLength()); @@ -189,15 +189,15 @@ public class DiscriminatorColumnTests extends JpaJavaResourceModelTestCase { public void testGetDiscriminatorType() throws Exception { ICompilationUnit cu = this.createTestDiscriminatorColumnWithDiscriminatorType(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - DiscriminatorColumnAnnotation column = (DiscriminatorColumnAnnotation) typeResource.getAnnotation(JPA.DISCRIMINATOR_COLUMN); + JavaResourceType resourceType = buildJavaResourceType(cu); + DiscriminatorColumnAnnotation column = (DiscriminatorColumnAnnotation) resourceType.getAnnotation(JPA.DISCRIMINATOR_COLUMN); assertEquals(DiscriminatorType.CHAR, column.getDiscriminatorType()); } public void testSetDiscriminatorType() throws Exception { ICompilationUnit cu = this.createTestDiscriminatorColumn(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - DiscriminatorColumnAnnotation column = (DiscriminatorColumnAnnotation) typeResource.getAnnotation(JPA.DISCRIMINATOR_COLUMN); + JavaResourceType resourceType = buildJavaResourceType(cu); + DiscriminatorColumnAnnotation column = (DiscriminatorColumnAnnotation) resourceType.getAnnotation(JPA.DISCRIMINATOR_COLUMN); assertNull(column.getDiscriminatorType()); diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/DiscriminatorValueTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/DiscriminatorValueTests.java index ab19b7ee3e..fdacd1b956 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/DiscriminatorValueTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/DiscriminatorValueTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2009 Oracle. All rights reserved. + * Copyright (c) 2007, 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. @@ -11,10 +11,10 @@ package org.eclipse.jpt.jpa.core.tests.internal.resource.java; import java.util.Iterator; import org.eclipse.jdt.core.ICompilationUnit; +import org.eclipse.jpt.common.core.resource.java.JavaResourceType; import org.eclipse.jpt.common.utility.internal.iterators.ArrayIterator; import org.eclipse.jpt.jpa.core.resource.java.DiscriminatorValueAnnotation; import org.eclipse.jpt.jpa.core.resource.java.JPA; -import org.eclipse.jpt.jpa.core.resource.java.JavaResourcePersistentType; @SuppressWarnings("nls") public class DiscriminatorValueTests extends JpaJavaResourceModelTestCase { @@ -51,25 +51,25 @@ public class DiscriminatorValueTests extends JpaJavaResourceModelTestCase { public void testDiscriminatorValue() throws Exception { ICompilationUnit cu = this.createTestDiscriminatorValue(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); + JavaResourceType resourceType = buildJavaResourceType(cu); - DiscriminatorValueAnnotation discriminatorValue = (DiscriminatorValueAnnotation) typeResource.getAnnotation(JPA.DISCRIMINATOR_VALUE); + DiscriminatorValueAnnotation discriminatorValue = (DiscriminatorValueAnnotation) resourceType.getAnnotation(JPA.DISCRIMINATOR_VALUE); assertNotNull(discriminatorValue); } public void testGetValue() throws Exception { ICompilationUnit cu = this.createTestDiscriminatorValueWithValue(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); + JavaResourceType resourceType = buildJavaResourceType(cu); - DiscriminatorValueAnnotation discriminatorValue = (DiscriminatorValueAnnotation) typeResource.getAnnotation(JPA.DISCRIMINATOR_VALUE); + DiscriminatorValueAnnotation discriminatorValue = (DiscriminatorValueAnnotation) resourceType.getAnnotation(JPA.DISCRIMINATOR_VALUE); assertEquals("discriminator", discriminatorValue.getValue()); } public void testSetValue() throws Exception { ICompilationUnit cu = this.createTestDiscriminatorValue(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); + JavaResourceType resourceType = buildJavaResourceType(cu); - DiscriminatorValueAnnotation discriminatorValue = (DiscriminatorValueAnnotation) typeResource.getAnnotation(JPA.DISCRIMINATOR_VALUE); + DiscriminatorValueAnnotation discriminatorValue = (DiscriminatorValueAnnotation) resourceType.getAnnotation(JPA.DISCRIMINATOR_VALUE); discriminatorValue.setValue("foo"); diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/EmbeddableTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/EmbeddableTests.java index 402185ef0d..21eee17559 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/EmbeddableTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/EmbeddableTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2009 Oracle. All rights reserved. + * Copyright (c) 2007, 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. @@ -11,12 +11,12 @@ package org.eclipse.jpt.jpa.core.tests.internal.resource.java; import java.util.Iterator; import org.eclipse.jdt.core.ICompilationUnit; +import org.eclipse.jpt.common.core.resource.java.JavaResourceNode; +import org.eclipse.jpt.common.core.resource.java.JavaResourceType; import org.eclipse.jpt.common.utility.internal.iterators.ArrayIterator; import org.eclipse.jpt.jpa.core.resource.java.EmbeddableAnnotation; import org.eclipse.jpt.jpa.core.resource.java.EntityAnnotation; import org.eclipse.jpt.jpa.core.resource.java.JPA; -import org.eclipse.jpt.jpa.core.resource.java.JavaResourceNode; -import org.eclipse.jpt.jpa.core.resource.java.JavaResourcePersistentType; @SuppressWarnings("nls") public class EmbeddableTests extends JpaJavaResourceModelTestCase { @@ -54,20 +54,20 @@ public class EmbeddableTests extends JpaJavaResourceModelTestCase { public void testEmbeddable() throws Exception { ICompilationUnit cu = this.createTestEmbeddable(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); + JavaResourceType resourceType = buildJavaResourceType(cu); - JavaResourceNode mappingAnnotation = typeResource.getAnnotation(EmbeddableAnnotation.ANNOTATION_NAME); + JavaResourceNode mappingAnnotation = resourceType.getAnnotation(EmbeddableAnnotation.ANNOTATION_NAME); assertTrue(mappingAnnotation instanceof EmbeddableAnnotation); } public void testEmbeddableAndEntity() throws Exception { ICompilationUnit cu = this.createTestEmbeddableAndEntity(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); + JavaResourceType resourceType = buildJavaResourceType(cu); - JavaResourceNode mappingAnnotation = typeResource.getAnnotation(EmbeddableAnnotation.ANNOTATION_NAME); + JavaResourceNode mappingAnnotation = resourceType.getAnnotation(EmbeddableAnnotation.ANNOTATION_NAME); assertTrue(mappingAnnotation instanceof EmbeddableAnnotation); - EntityAnnotation entity = (EntityAnnotation) typeResource.getAnnotation(JPA.ENTITY); + EntityAnnotation entity = (EntityAnnotation) resourceType.getAnnotation(JPA.ENTITY); assertNotNull(entity); } diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/EmbeddedIdTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/EmbeddedIdTests.java index 65ae4071f3..12317ee4a7 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/EmbeddedIdTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/EmbeddedIdTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2009 Oracle. All rights reserved. + * Copyright (c) 2007, 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. @@ -11,12 +11,13 @@ package org.eclipse.jpt.jpa.core.tests.internal.resource.java; import java.util.Iterator; import org.eclipse.jdt.core.ICompilationUnit; +import org.eclipse.jpt.common.core.resource.java.JavaResourceField; +import org.eclipse.jpt.common.core.resource.java.JavaResourceNode; +import org.eclipse.jpt.common.core.resource.java.JavaResourceType; +import org.eclipse.jpt.common.utility.internal.CollectionTools; import org.eclipse.jpt.common.utility.internal.iterators.ArrayIterator; import org.eclipse.jpt.jpa.core.resource.java.EmbeddedIdAnnotation; import org.eclipse.jpt.jpa.core.resource.java.JPA; -import org.eclipse.jpt.jpa.core.resource.java.JavaResourceNode; -import org.eclipse.jpt.jpa.core.resource.java.JavaResourcePersistentAttribute; -import org.eclipse.jpt.jpa.core.resource.java.JavaResourcePersistentType; @SuppressWarnings("nls") public class EmbeddedIdTests extends JpaJavaResourceModelTestCase { @@ -40,10 +41,10 @@ public class EmbeddedIdTests extends JpaJavaResourceModelTestCase { public void testEmbeddedId() throws Exception { ICompilationUnit cu = this.createTestEmbeddedId(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - JavaResourceNode mappingAnnotation = attributeResource.getAnnotation(EmbeddedIdAnnotation.ANNOTATION_NAME); + JavaResourceNode mappingAnnotation = resourceField.getAnnotation(EmbeddedIdAnnotation.ANNOTATION_NAME); assertTrue(mappingAnnotation instanceof EmbeddedIdAnnotation); } diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/EmbeddedTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/EmbeddedTests.java index 310a9fbbeb..2335e75954 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/EmbeddedTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/EmbeddedTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2009 Oracle. All rights reserved. + * Copyright (c) 2007, 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. @@ -11,12 +11,13 @@ package org.eclipse.jpt.jpa.core.tests.internal.resource.java; import java.util.Iterator; import org.eclipse.jdt.core.ICompilationUnit; +import org.eclipse.jpt.common.core.resource.java.JavaResourceField; +import org.eclipse.jpt.common.core.resource.java.JavaResourceNode; +import org.eclipse.jpt.common.core.resource.java.JavaResourceType; +import org.eclipse.jpt.common.utility.internal.CollectionTools; import org.eclipse.jpt.common.utility.internal.iterators.ArrayIterator; import org.eclipse.jpt.jpa.core.resource.java.EmbeddedAnnotation; import org.eclipse.jpt.jpa.core.resource.java.JPA; -import org.eclipse.jpt.jpa.core.resource.java.JavaResourceNode; -import org.eclipse.jpt.jpa.core.resource.java.JavaResourcePersistentAttribute; -import org.eclipse.jpt.jpa.core.resource.java.JavaResourcePersistentType; @SuppressWarnings("nls") public class EmbeddedTests extends JpaJavaResourceModelTestCase { @@ -40,10 +41,10 @@ public class EmbeddedTests extends JpaJavaResourceModelTestCase { public void testEmbedded() throws Exception { ICompilationUnit cu = this.createTestEmbedded(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - JavaResourceNode mappingAnnotation = attributeResource.getAnnotation(EmbeddedAnnotation.ANNOTATION_NAME); + JavaResourceNode mappingAnnotation = resourceField.getAnnotation(EmbeddedAnnotation.ANNOTATION_NAME); assertTrue(mappingAnnotation instanceof EmbeddedAnnotation); } diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/EntityTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/EntityTests.java index 3d976a8ddf..a1d9de6f4f 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/EntityTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/EntityTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2009 Oracle. All rights reserved. + * Copyright (c) 2007, 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. @@ -11,11 +11,10 @@ package org.eclipse.jpt.jpa.core.tests.internal.resource.java; import java.util.Iterator; import org.eclipse.jdt.core.ICompilationUnit; +import org.eclipse.jpt.common.core.resource.java.JavaResourceType; import org.eclipse.jpt.common.utility.internal.iterators.ArrayIterator; import org.eclipse.jpt.jpa.core.resource.java.EntityAnnotation; import org.eclipse.jpt.jpa.core.resource.java.JPA; -import org.eclipse.jpt.jpa.core.resource.java.JavaResourceNode; -import org.eclipse.jpt.jpa.core.resource.java.JavaResourcePersistentType; import org.eclipse.jpt.jpa.core.resource.java.MappedSuperclassAnnotation; @SuppressWarnings("nls") @@ -69,27 +68,27 @@ public class EntityTests extends JpaJavaResourceModelTestCase { public void testGetName() throws Exception { ICompilationUnit cu = this.createTestEntityWithName(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); + JavaResourceType resourceType = buildJavaResourceType(cu); - EntityAnnotation entity = (EntityAnnotation) typeResource.getAnnotation(JPA.ENTITY); + EntityAnnotation entity = (EntityAnnotation) resourceType.getAnnotation(JPA.ENTITY); assertTrue(entity != null); assertEquals(ENTITY_NAME, entity.getName()); } public void testGetNameNull() throws Exception { ICompilationUnit cu = this.createTestEntity(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); + JavaResourceType resourceType = buildJavaResourceType(cu); - EntityAnnotation entity = (EntityAnnotation) typeResource.getAnnotation(JPA.ENTITY); + EntityAnnotation entity = (EntityAnnotation) resourceType.getAnnotation(JPA.ENTITY); assertTrue(entity != null); assertNull(entity.getName()); } public void testSetName() throws Exception { ICompilationUnit cu = this.createTestEntity(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); + JavaResourceType resourceType = buildJavaResourceType(cu); - EntityAnnotation entity = (EntityAnnotation) typeResource.getAnnotation(JPA.ENTITY); + EntityAnnotation entity = (EntityAnnotation) resourceType.getAnnotation(JPA.ENTITY); assertNull(entity.getName()); entity.setName("Foo"); assertEquals("Foo", entity.getName()); @@ -99,9 +98,9 @@ public class EntityTests extends JpaJavaResourceModelTestCase { public void testSetNameNull() throws Exception { ICompilationUnit cu = this.createTestEntityWithName(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); + JavaResourceType resourceType = buildJavaResourceType(cu); - EntityAnnotation entity = (EntityAnnotation) typeResource.getAnnotation(JPA.ENTITY); + EntityAnnotation entity = (EntityAnnotation) resourceType.getAnnotation(JPA.ENTITY); assertEquals(ENTITY_NAME, entity.getName()); entity.setName(null); @@ -113,12 +112,12 @@ public class EntityTests extends JpaJavaResourceModelTestCase { public void testMappedSuperclassAndEntity() throws Exception { ICompilationUnit cu = this.createTestMappedSuperclassAndEntity(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); + JavaResourceType resourceType = buildJavaResourceType(cu); - JavaResourceNode mappingAnnotation = typeResource.getAnnotation(EntityAnnotation.ANNOTATION_NAME); - assertTrue(mappingAnnotation instanceof EntityAnnotation); + EntityAnnotation mappingAnnotation = (EntityAnnotation) resourceType.getAnnotation(JPA.ENTITY); + assertNotNull(mappingAnnotation); - MappedSuperclassAnnotation mappedSuperclass = (MappedSuperclassAnnotation) typeResource.getAnnotation(JPA.MAPPED_SUPERCLASS); + MappedSuperclassAnnotation mappedSuperclass = (MappedSuperclassAnnotation) resourceType.getAnnotation(JPA.MAPPED_SUPERCLASS); assertNotNull(mappedSuperclass); } diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/EnumeratedTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/EnumeratedTests.java index a22cd81ebf..7a6f8d44df 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/EnumeratedTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/EnumeratedTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2009 Oracle. All rights reserved. + * Copyright (c) 2007, 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. @@ -11,12 +11,13 @@ package org.eclipse.jpt.jpa.core.tests.internal.resource.java; import java.util.Iterator; import org.eclipse.jdt.core.ICompilationUnit; +import org.eclipse.jpt.common.core.resource.java.JavaResourceField; +import org.eclipse.jpt.common.core.resource.java.JavaResourceType; +import org.eclipse.jpt.common.utility.internal.CollectionTools; import org.eclipse.jpt.common.utility.internal.iterators.ArrayIterator; import org.eclipse.jpt.jpa.core.resource.java.EnumType; import org.eclipse.jpt.jpa.core.resource.java.EnumeratedAnnotation; 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; @SuppressWarnings("nls") public class EnumeratedTests extends JpaJavaResourceModelTestCase { @@ -53,28 +54,28 @@ public class EnumeratedTests extends JpaJavaResourceModelTestCase { public void testEnumerated() throws Exception { ICompilationUnit cu = this.createTestEnumerated(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - EnumeratedAnnotation enumerated = (EnumeratedAnnotation) attributeResource.getAnnotation(JPA.ENUMERATED); + EnumeratedAnnotation enumerated = (EnumeratedAnnotation) resourceField.getAnnotation(JPA.ENUMERATED); assertNotNull(enumerated); } public void testGetValue() throws Exception { ICompilationUnit cu = this.createTestEnumeratedWithValue(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - EnumeratedAnnotation enumerated = (EnumeratedAnnotation) attributeResource.getAnnotation(JPA.ENUMERATED); + EnumeratedAnnotation enumerated = (EnumeratedAnnotation) resourceField.getAnnotation(JPA.ENUMERATED); assertEquals(EnumType.ORDINAL, enumerated.getValue()); } public void testSetValue() throws Exception { ICompilationUnit cu = this.createTestEnumerated(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - EnumeratedAnnotation enumerated = (EnumeratedAnnotation) attributeResource.getAnnotation(JPA.ENUMERATED); + EnumeratedAnnotation enumerated = (EnumeratedAnnotation) resourceField.getAnnotation(JPA.ENUMERATED); enumerated.setValue(EnumType.STRING); diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/GeneratedValueTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/GeneratedValueTests.java index 5062212d28..ee536a2732 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/GeneratedValueTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/GeneratedValueTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2009 Oracle. All rights reserved. + * Copyright (c) 2007, 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. @@ -11,12 +11,13 @@ package org.eclipse.jpt.jpa.core.tests.internal.resource.java; import java.util.Iterator; import org.eclipse.jdt.core.ICompilationUnit; +import org.eclipse.jpt.common.core.resource.java.JavaResourceField; +import org.eclipse.jpt.common.core.resource.java.JavaResourceType; +import org.eclipse.jpt.common.utility.internal.CollectionTools; import org.eclipse.jpt.common.utility.internal.iterators.ArrayIterator; import org.eclipse.jpt.jpa.core.resource.java.GeneratedValueAnnotation; import org.eclipse.jpt.jpa.core.resource.java.GenerationType; 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; @SuppressWarnings("nls") public class GeneratedValueTests extends JpaJavaResourceModelTestCase { @@ -67,28 +68,28 @@ public class GeneratedValueTests extends JpaJavaResourceModelTestCase { public void testGeneratedValue() throws Exception { ICompilationUnit cu = this.createTestGeneratedValue(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - GeneratedValueAnnotation generatedValue = (GeneratedValueAnnotation) attributeResource.getAnnotation(JPA.GENERATED_VALUE); + GeneratedValueAnnotation generatedValue = (GeneratedValueAnnotation) resourceField.getAnnotation(JPA.GENERATED_VALUE); assertNotNull(generatedValue); } public void testGetGenerator() throws Exception { ICompilationUnit cu = this.createTestGeneratedValueWithGenerator(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - GeneratedValueAnnotation generatedValue = (GeneratedValueAnnotation) attributeResource.getAnnotation(JPA.GENERATED_VALUE); + GeneratedValueAnnotation generatedValue = (GeneratedValueAnnotation) resourceField.getAnnotation(JPA.GENERATED_VALUE); assertEquals(GENERATOR, generatedValue.getGenerator()); } public void testSetGenerator() throws Exception { ICompilationUnit cu = this.createTestGeneratedValueWithGenerator(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - GeneratedValueAnnotation generatedValue = (GeneratedValueAnnotation) attributeResource.getAnnotation(JPA.GENERATED_VALUE); + GeneratedValueAnnotation generatedValue = (GeneratedValueAnnotation) resourceField.getAnnotation(JPA.GENERATED_VALUE); assertEquals(GENERATOR, generatedValue.getGenerator()); generatedValue.setGenerator("foo"); @@ -105,19 +106,19 @@ public class GeneratedValueTests extends JpaJavaResourceModelTestCase { public void testGetStrategy() throws Exception { ICompilationUnit cu = this.createTestGeneratedValueWithStrategy(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - GeneratedValueAnnotation generatedValue = (GeneratedValueAnnotation) attributeResource.getAnnotation(JPA.GENERATED_VALUE); + GeneratedValueAnnotation generatedValue = (GeneratedValueAnnotation) resourceField.getAnnotation(JPA.GENERATED_VALUE); assertEquals(GenerationType.SEQUENCE, generatedValue.getStrategy()); } public void testSetStrategy() throws Exception { ICompilationUnit cu = this.createTestGeneratedValueWithStrategy(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - GeneratedValueAnnotation generatedValue = (GeneratedValueAnnotation) attributeResource.getAnnotation(JPA.GENERATED_VALUE); + GeneratedValueAnnotation generatedValue = (GeneratedValueAnnotation) resourceField.getAnnotation(JPA.GENERATED_VALUE); assertEquals(GenerationType.SEQUENCE, generatedValue.getStrategy()); generatedValue.setStrategy(GenerationType.TABLE); diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/IdClassTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/IdClassTests.java index c5dad6dbd8..ced5111f8f 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/IdClassTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/IdClassTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2009 Oracle. All rights reserved. + * Copyright (c) 2007, 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. @@ -11,10 +11,10 @@ package org.eclipse.jpt.jpa.core.tests.internal.resource.java; import java.util.Iterator; import org.eclipse.jdt.core.ICompilationUnit; +import org.eclipse.jpt.common.core.resource.java.JavaResourceType; import org.eclipse.jpt.common.utility.internal.iterators.ArrayIterator; import org.eclipse.jpt.jpa.core.resource.java.IdClassAnnotation; import org.eclipse.jpt.jpa.core.resource.java.JPA; -import org.eclipse.jpt.jpa.core.resource.java.JavaResourcePersistentType; @SuppressWarnings("nls") public class IdClassTests extends JpaJavaResourceModelTestCase { @@ -53,26 +53,26 @@ public class IdClassTests extends JpaJavaResourceModelTestCase { public void testIdClass() throws Exception { ICompilationUnit cu = this.createTestIdClass(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); + JavaResourceType resourceType = buildJavaResourceType(cu); - IdClassAnnotation idClass = (IdClassAnnotation) typeResource.getAnnotation(JPA.ID_CLASS); + IdClassAnnotation idClass = (IdClassAnnotation) resourceType.getAnnotation(JPA.ID_CLASS); assertNotNull(idClass); assertNull(idClass.getValue()); } public void testGetValue() throws Exception { ICompilationUnit cu = this.createTestIdClassWithValue(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); + JavaResourceType resourceType = buildJavaResourceType(cu); - IdClassAnnotation idClass = (IdClassAnnotation) typeResource.getAnnotation(JPA.ID_CLASS); + IdClassAnnotation idClass = (IdClassAnnotation) resourceType.getAnnotation(JPA.ID_CLASS); assertEquals(ID_CLASS_VALUE, idClass.getValue()); } public void testSetValue() throws Exception { ICompilationUnit cu = this.createTestIdClassWithValue(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); + JavaResourceType resourceType = buildJavaResourceType(cu); - IdClassAnnotation idClass = (IdClassAnnotation) typeResource.getAnnotation(JPA.ID_CLASS); + IdClassAnnotation idClass = (IdClassAnnotation) resourceType.getAnnotation(JPA.ID_CLASS); assertEquals(ID_CLASS_VALUE, idClass.getValue()); idClass.setValue("foo"); @@ -87,9 +87,9 @@ public class IdClassTests extends JpaJavaResourceModelTestCase { public void testGetFullyQualifiedClass() throws Exception { ICompilationUnit cu = this.createTestIdClassWithValue(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); + JavaResourceType resourceType = buildJavaResourceType(cu); - IdClassAnnotation idClass = (IdClassAnnotation) typeResource.getAnnotation(JPA.ID_CLASS); + IdClassAnnotation idClass = (IdClassAnnotation) resourceType.getAnnotation(JPA.ID_CLASS); assertNotNull(idClass.getValue()); assertEquals("MyClass", idClass.getFullyQualifiedClassName()); //bug 196200 changed this diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/IdTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/IdTests.java index 73a7643ca7..26fc303f9d 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/IdTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/IdTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2009 Oracle. All rights reserved. + * Copyright (c) 2007, 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. @@ -11,12 +11,13 @@ package org.eclipse.jpt.jpa.core.tests.internal.resource.java; import java.util.Iterator; import org.eclipse.jdt.core.ICompilationUnit; +import org.eclipse.jpt.common.core.resource.java.JavaResourceField; +import org.eclipse.jpt.common.core.resource.java.JavaResourceNode; +import org.eclipse.jpt.common.core.resource.java.JavaResourceType; +import org.eclipse.jpt.common.utility.internal.CollectionTools; import org.eclipse.jpt.common.utility.internal.iterators.ArrayIterator; 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.JavaResourceNode; -import org.eclipse.jpt.jpa.core.resource.java.JavaResourcePersistentAttribute; -import org.eclipse.jpt.jpa.core.resource.java.JavaResourcePersistentType; @SuppressWarnings("nls") public class IdTests extends JpaJavaResourceModelTestCase { @@ -40,10 +41,10 @@ public class IdTests extends JpaJavaResourceModelTestCase { public void testId() throws Exception { ICompilationUnit cu = this.createTestId(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - JavaResourceNode mappingAnnotation = attributeResource.getAnnotation(IdAnnotation.ANNOTATION_NAME); + JavaResourceNode mappingAnnotation = resourceField.getAnnotation(IdAnnotation.ANNOTATION_NAME); assertTrue(mappingAnnotation instanceof IdAnnotation); } diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/InheritanceTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/InheritanceTests.java index 458f094fe4..a4e7beed25 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/InheritanceTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/InheritanceTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2009 Oracle. All rights reserved. + * Copyright (c) 2007, 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. @@ -11,11 +11,11 @@ package org.eclipse.jpt.jpa.core.tests.internal.resource.java; import java.util.Iterator; import org.eclipse.jdt.core.ICompilationUnit; +import org.eclipse.jpt.common.core.resource.java.JavaResourceType; import org.eclipse.jpt.common.utility.internal.iterators.ArrayIterator; import org.eclipse.jpt.jpa.core.resource.java.InheritanceAnnotation; import org.eclipse.jpt.jpa.core.resource.java.InheritanceType; import org.eclipse.jpt.jpa.core.resource.java.JPA; -import org.eclipse.jpt.jpa.core.resource.java.JavaResourcePersistentType; @SuppressWarnings("nls") public class InheritanceTests extends JpaJavaResourceModelTestCase { @@ -52,25 +52,25 @@ public class InheritanceTests extends JpaJavaResourceModelTestCase { public void testInheritance() throws Exception { ICompilationUnit cu = this.createTestInheritance(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); + JavaResourceType resourceType = buildJavaResourceType(cu); - InheritanceAnnotation inheritance = (InheritanceAnnotation) typeResource.getAnnotation(JPA.INHERITANCE); + InheritanceAnnotation inheritance = (InheritanceAnnotation) resourceType.getAnnotation(JPA.INHERITANCE); assertNotNull(inheritance); } public void testGetStrategy() throws Exception { ICompilationUnit cu = this.createTestInheritanceWithStrategy(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); + JavaResourceType resourceType = buildJavaResourceType(cu); - InheritanceAnnotation inheritance = (InheritanceAnnotation) typeResource.getAnnotation(JPA.INHERITANCE); + InheritanceAnnotation inheritance = (InheritanceAnnotation) resourceType.getAnnotation(JPA.INHERITANCE); assertEquals(InheritanceType.JOINED, inheritance.getStrategy()); } public void testSetStrategy() throws Exception { ICompilationUnit cu = this.createTestInheritance(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); + JavaResourceType resourceType = buildJavaResourceType(cu); - InheritanceAnnotation inheritance = (InheritanceAnnotation) typeResource.getAnnotation(JPA.INHERITANCE); + InheritanceAnnotation inheritance = (InheritanceAnnotation) resourceType.getAnnotation(JPA.INHERITANCE); inheritance.setStrategy(InheritanceType.TABLE_PER_CLASS); assertSourceContains("@Inheritance(strategy = TABLE_PER_CLASS)", cu); diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/JavaResourceAttributeTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/JavaResourceAttributeTests.java new file mode 100644 index 0000000000..1ec05fdc56 --- /dev/null +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/JavaResourceAttributeTests.java @@ -0,0 +1,718 @@ +/******************************************************************************* + * Copyright (c) 2007, 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. + * + * Contributors: + * Oracle - initial API and implementation + ******************************************************************************/ +package org.eclipse.jpt.jpa.core.tests.internal.resource.java; + +import java.lang.reflect.Modifier; +import java.util.Arrays; +import java.util.Collections; +import java.util.Iterator; +import org.eclipse.core.runtime.NullProgressMonitor; +import org.eclipse.jdt.core.ICompilationUnit; +import org.eclipse.jpt.common.core.resource.java.JavaResourceAttribute; +import org.eclipse.jpt.common.core.resource.java.JavaResourceField; +import org.eclipse.jpt.common.core.resource.java.JavaResourceNode; +import org.eclipse.jpt.common.core.resource.java.JavaResourceType; +import org.eclipse.jpt.common.core.utility.jdt.AnnotatedElement.Editor; +import org.eclipse.jpt.common.core.utility.jdt.ModifiedDeclaration; +import org.eclipse.jpt.common.utility.internal.CollectionTools; +import org.eclipse.jpt.common.utility.internal.iterables.EmptyIterable; +import org.eclipse.jpt.common.utility.internal.iterators.ArrayIterator; +import org.eclipse.jpt.jpa.core.internal.resource.java.source.SourceIdAnnotation; +import org.eclipse.jpt.jpa.core.internal.resource.java.source.SourceOneToOneAnnotation; +import org.eclipse.jpt.jpa.core.resource.java.AttributeOverrideAnnotation; +import org.eclipse.jpt.jpa.core.resource.java.BasicAnnotation; +import org.eclipse.jpt.jpa.core.resource.java.ColumnAnnotation; +import org.eclipse.jpt.jpa.core.resource.java.GeneratedValueAnnotation; +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.OneToManyAnnotation; + +@SuppressWarnings("nls") +public class JavaResourceAttributeTests extends JpaJavaResourceModelTestCase { + + public JavaResourceAttributeTests(String name) { + super(name); + } + + private ICompilationUnit createTestEntity() throws Exception { + return this.createTestType(new DefaultAnnotationWriter() { + @Override + public Iterator imports() { + return new ArrayIterator(JPA.ENTITY); + } + @Override + public void appendTypeAnnotationTo(StringBuilder sb) { + sb.append("@Entity"); + } + }); + } + + private ICompilationUnit createTestEntityWithNonResolvingField() throws Exception { + return this.createTestType(new DefaultAnnotationWriter() { + @Override + public Iterator imports() { + return new ArrayIterator(JPA.ENTITY); + } + @Override + public void appendTypeAnnotationTo(StringBuilder sb) { + sb.append("@Entity"); + } + + @Override + public void appendIdFieldAnnotationTo(StringBuilder sb) { + sb.append("private Foo foo;").append(CR); + sb.append(CR); + } + }); + } + + private ICompilationUnit createTestEntityMultipleVariableDeclarationsPerLine() throws Exception { + return this.createTestType(new DefaultAnnotationWriter() { + @Override + public Iterator imports() { + return new ArrayIterator(JPA.ENTITY, JPA.ID, JPA.COLUMN); + } + @Override + public void appendTypeAnnotationTo(StringBuilder sb) { + sb.append("@Entity"); + } + + @Override + public void appendIdFieldAnnotationTo(StringBuilder sb) { + sb.append(CR); + sb.append(" "); + sb.append("@Id"); + sb.append(CR); + sb.append(" "); + sb.append("@Column(name = \"baz\")"); + sb.append(" private String foo, bar;").append(CR); + sb.append(CR); + } + }); + } + + private ICompilationUnit createTestEntityWithIdAndBasic() throws Exception { + return this.createTestType(new DefaultAnnotationWriter() { + @Override + public Iterator imports() { + return new ArrayIterator(JPA.ENTITY, JPA.ID, JPA.BASIC); + } + @Override + public void appendTypeAnnotationTo(StringBuilder sb) { + sb.append("@Entity"); + } + + @Override + public void appendIdFieldAnnotationTo(StringBuilder sb) { + sb.append("@Id"); + sb.append(CR); + sb.append("@Basic"); + } + }); + } + + private ICompilationUnit createTestEntityAnnotatedField() throws Exception { + return this.createTestType(new DefaultAnnotationWriter() { + @Override + public Iterator imports() { + return new ArrayIterator(JPA.ENTITY, JPA.ID, JPA.COLUMN); + } + @Override + public void appendTypeAnnotationTo(StringBuilder sb) { + sb.append("@Entity"); + } + + @Override + public void appendIdFieldAnnotationTo(StringBuilder sb) { + sb.append("@Id"); + sb.append(CR); + sb.append(" "); + sb.append("@Column"); + } + }); + } + + private ICompilationUnit createTestEntityWithColumn() throws Exception { + return this.createTestType(new DefaultAnnotationWriter() { + @Override + public Iterator imports() { + return new ArrayIterator(JPA.ENTITY, JPA.COLUMN); + } + @Override + public void appendTypeAnnotationTo(StringBuilder sb) { + sb.append("@Entity"); + } + + @Override + public void appendIdFieldAnnotationTo(StringBuilder sb) { + sb.append("@Column(name = \"FOO\", table = \"MY_TABLE\")"); + } + }); + } + + private ICompilationUnit createTestEntityWithIdColumnGeneratedValue() throws Exception { + return this.createTestType(new DefaultAnnotationWriter() { + @Override + public Iterator imports() { + return new ArrayIterator(JPA.ENTITY, JPA.COLUMN, JPA.ID, JPA.GENERATED_VALUE); + } + @Override + public void appendTypeAnnotationTo(StringBuilder sb) { + sb.append("@Entity"); + } + @Override + public void appendIdFieldAnnotationTo(StringBuilder sb) { + sb.append("@Id"); + sb.append(CR); + sb.append("@Column"); + sb.append(CR); + sb.append("@GeneratedValue"); + } + }); + } + + + private ICompilationUnit createTestEntityMultipleColumns() throws Exception { + return this.createTestType(new DefaultAnnotationWriter() { + @Override + public Iterator imports() { + return new ArrayIterator(JPA.ENTITY, JPA.COLUMN); + } + @Override + public void appendTypeAnnotationTo(StringBuilder sb) { + sb.append("@Entity"); + } + + @Override + public void appendIdFieldAnnotationTo(StringBuilder sb) { + sb.append("@Column(name = \"FOO\")"); + sb.append(CR); + sb.append("@Column(name = \"BAR\")"); + } + }); + } + + private ICompilationUnit createTestEmbeddedWithAttributeOverride() throws Exception { + return this.createTestType(new DefaultAnnotationWriter() { + @Override + public Iterator imports() { + return new ArrayIterator(JPA.EMBEDDED, JPA.ATTRIBUTE_OVERRIDE); + } + @Override + public void appendIdFieldAnnotationTo(StringBuilder sb) { + sb.append("@Embedded"); + sb.append(CR); + sb.append("@AttributeOverride(name = \"FOO\")"); + } + }); + } + private ICompilationUnit createTestEmbeddedWithAttributeOverrides() throws Exception { + return this.createTestType(new DefaultAnnotationWriter() { + @Override + public Iterator imports() { + return new ArrayIterator(JPA.EMBEDDED, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + } + @Override + public void appendIdFieldAnnotationTo(StringBuilder sb) { + sb.append("@Embedded"); + sb.append(CR); + sb.append("@AttributeOverrides(@AttributeOverride(name = \"FOO\"))"); + } + }); + } + private ICompilationUnit createTestEmbeddedWithAttributeOverridesEmpty() throws Exception { + return this.createTestType(new DefaultAnnotationWriter() { + @Override + public Iterator imports() { + return new ArrayIterator(JPA.EMBEDDED, JPA.ATTRIBUTE_OVERRIDES); + } + @Override + public void appendIdFieldAnnotationTo(StringBuilder sb) { + sb.append("@Embedded"); + sb.append(CR); + sb.append("@AttributeOverrides()"); + } + }); + } + + private ICompilationUnit createTestEmbeddedWith2AttributeOverrides() throws Exception { + return this.createTestType(new DefaultAnnotationWriter() { + @Override + public Iterator imports() { + return new ArrayIterator(JPA.EMBEDDED, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + } + @Override + public void appendIdFieldAnnotationTo(StringBuilder sb) { + sb.append("@Embedded"); + sb.append(CR); + sb.append("@AttributeOverrides({@AttributeOverride(name = \"FOO\"), @AttributeOverride(name = \"BAR\")})"); + } + }); + } + + private ICompilationUnit createTestTypePublicAttribute() throws Exception { + + return this.createTestType(new DefaultAnnotationWriter() { + + @Override + public void appendIdFieldAnnotationTo(StringBuilder sb) { + sb.append(CR); + sb.append(" public String foo;"); + sb.append(CR); + } + }); + } + + private ICompilationUnit createTestTypePackageAttribute() throws Exception { + + return this.createTestType(new DefaultAnnotationWriter() { + + @Override + public void appendIdFieldAnnotationTo(StringBuilder sb) { + sb.append(CR); + sb.append(" String foo;"); + sb.append(CR); + } + }); + } + + private ICompilationUnit createTestTypeFinalAttribute() throws Exception { + + return this.createTestType(new DefaultAnnotationWriter() { + + @Override + public void appendIdFieldAnnotationTo(StringBuilder sb) { + sb.append(CR); + sb.append(" public final String foo;"); + sb.append(CR); + } + }); + } + + public void testJavaAttributeAnnotations() throws Exception { + ICompilationUnit cu = this.createTestEntityWithColumn(); + JavaResourceType typeResource = buildJavaResourceType(cu); + JavaResourceAttribute resourceAttribute = typeResource.getFields().iterator().next(); + assertEquals(1, resourceAttribute.getAnnotationsSize()); + } + + public void testJavaAttributeAnnotation() throws Exception { + ICompilationUnit cu = this.createTestEntityWithColumn(); + JavaResourceType typeResource = buildJavaResourceType(cu); + JavaResourceAttribute resourceAttribute = typeResource.getFields().iterator().next(); + assertNotNull(resourceAttribute.getAnnotation(JPA.COLUMN)); + } + + public void testJavaAttributeAnnotationNull() throws Exception { + ICompilationUnit cu = this.createTestEntity(); + JavaResourceType typeResource = buildJavaResourceType(cu); + JavaResourceAttribute resourceAttribute = typeResource.getFields().iterator().next(); + assertNull(resourceAttribute.getAnnotation(JPA.TABLE)); + } + + //This will result in a compilation error, but we assume the first column found + public void testDuplicateAnnotations() throws Exception { + ICompilationUnit cu = this.createTestEntityMultipleColumns(); + JavaResourceType typeResource = buildJavaResourceType(cu); + JavaResourceAttribute resourceAttribute = typeResource.getFields().iterator().next(); + ColumnAnnotation columnResource = (ColumnAnnotation) resourceAttribute.getAnnotation(JPA.COLUMN); + assertEquals("FOO", columnResource.getName()); + } + + public void testRemoveColumn() throws Exception { + ICompilationUnit cu = this.createTestEntityWithColumn(); + JavaResourceType typeResource = buildJavaResourceType(cu); + JavaResourceAttribute resourceAttribute = typeResource.getFields().iterator().next(); + resourceAttribute.removeAnnotation(JPA.COLUMN); + + assertSourceDoesNotContain("@Column", cu); + } + + public void testRemoveColumnName() throws Exception { + ICompilationUnit cu = this.createTestEntityWithColumn(); + JavaResourceType typeResource = buildJavaResourceType(cu); + JavaResourceAttribute resourceAttribute = typeResource.getFields().iterator().next(); + + ColumnAnnotation columnResource = (ColumnAnnotation) resourceAttribute.getAnnotation(JPA.COLUMN); + columnResource.setTable(null); + assertSourceContains("@Column(name = \"FOO\")", cu); + + columnResource.setName(null); + assertSourceDoesNotContain("(name", cu); + assertSourceDoesNotContain("@Column(", cu); + } + + public void testMultipleAttributeMappings() throws Exception { + ICompilationUnit cu = this.createTestEntityWithIdAndBasic(); + JavaResourceType typeResource = buildJavaResourceType(cu); + JavaResourceAttribute resourceAttribute = typeResource.getFields().iterator().next(); + + assertEquals(2, resourceAttribute.getAnnotationsSize()); + assertNotNull(resourceAttribute.getAnnotation(JPA.BASIC)); + assertNotNull(resourceAttribute.getAnnotation(JPA.ID)); + + JavaResourceNode javaAttributeMappingAnnotation = resourceAttribute.getAnnotation(BasicAnnotation.ANNOTATION_NAME); + assertTrue(javaAttributeMappingAnnotation instanceof BasicAnnotation); + assertSourceContains("@Basic", cu); + assertSourceContains("@Id", cu); + + resourceAttribute.setPrimaryAnnotation(JPA.ONE_TO_MANY, EmptyIterable.instance()); + assertEquals(1, resourceAttribute.getAnnotationsSize()); + javaAttributeMappingAnnotation = resourceAttribute.getAnnotation(OneToManyAnnotation.ANNOTATION_NAME); + assertTrue(javaAttributeMappingAnnotation instanceof OneToManyAnnotation); + assertSourceDoesNotContain("@Id", cu); + assertSourceContains("@OneToMany", cu); + assertSourceDoesNotContain("@Basic", cu); + } + + public void testSetJavaAttributeMappingAnnotation() throws Exception { + ICompilationUnit cu = createTestType(); + JavaResourceType typeResource = buildJavaResourceType(cu); + JavaResourceAttribute resourceAttribute = typeResource.getFields().iterator().next(); + assertEquals(0, resourceAttribute.getAnnotationsSize()); + + resourceAttribute.setPrimaryAnnotation(JPA.ID, EmptyIterable.instance()); + assertTrue(resourceAttribute.getAnnotation(IdAnnotation.ANNOTATION_NAME) instanceof IdAnnotation); + assertSourceContains("@Id", cu); + } + + public void testSetJavaAttributeMappingAnnotation2() throws Exception { + ICompilationUnit cu = createTestEntityWithColumn(); + JavaResourceType typeResource = buildJavaResourceType(cu); + JavaResourceAttribute resourceAttribute = typeResource.getFields().iterator().next(); + assertEquals(1, resourceAttribute.getAnnotationsSize()); + + resourceAttribute.setPrimaryAnnotation(JPA.ID, Collections.singleton(ColumnAnnotation.ANNOTATION_NAME)); + assertTrue(resourceAttribute.getAnnotation(IdAnnotation.ANNOTATION_NAME) instanceof IdAnnotation); + + assertSourceContains("@Id", cu); + assertSourceContains("@Column", cu); + } + + public void testSetJavaAttributeMappingAnnotation3() throws Exception { + ICompilationUnit cu = createTestEntityWithIdColumnGeneratedValue(); + JavaResourceType typeResource = buildJavaResourceType(cu); + JavaResourceAttribute resourceAttribute = typeResource.getFields().iterator().next(); + assertTrue(resourceAttribute.getAnnotation(IdAnnotation.ANNOTATION_NAME) instanceof IdAnnotation); + + resourceAttribute.setPrimaryAnnotation( + JPA.BASIC, + Arrays.asList(new String[] { + ColumnAnnotation.ANNOTATION_NAME, + GeneratedValueAnnotation.ANNOTATION_NAME})); + assertTrue(resourceAttribute.getAnnotation(BasicAnnotation.ANNOTATION_NAME) instanceof BasicAnnotation); + + assertSourceDoesNotContain("@Id", cu); + assertSourceContains("@GeneratedValue", cu); //not supported by Basic + assertSourceContains("@Column", cu); //common between Id and Basic + } + + public void testSetJavaAttributeMappingAnnotationNull() throws Exception { + ICompilationUnit cu = createTestEntityWithIdColumnGeneratedValue(); + JavaResourceType typeResource = buildJavaResourceType(cu); + JavaResourceAttribute resourceAttribute = typeResource.getFields().iterator().next(); + assertTrue(resourceAttribute.getAnnotation(IdAnnotation.ANNOTATION_NAME) instanceof IdAnnotation); + + resourceAttribute.setPrimaryAnnotation( + null, + Arrays.asList(new String[] { + ColumnAnnotation.ANNOTATION_NAME, + GeneratedValueAnnotation.ANNOTATION_NAME})); + + assertEquals(2, resourceAttribute.getAnnotationsSize()); + assertSourceDoesNotContain("@Id", cu); + assertSourceContains("@GeneratedValue", cu); //not supported by Basic + assertSourceContains("@Column", cu); //common between Id and Basic + } + + public void testAddJavaAttributeAnnotation() throws Exception { + ICompilationUnit cu = createTestEntity(); + JavaResourceType typeResource = buildJavaResourceType(cu); + + JavaResourceAttribute resourceAttribute = typeResource.getFields().iterator().next(); + + assertSourceDoesNotContain("@Column", cu); + resourceAttribute.addAnnotation(JPA.COLUMN); + assertSourceContains("@Column", cu); + } + + public void testRemoveJavaAttributeAnnotation() throws Exception { + ICompilationUnit cu = createTestEntityAnnotatedField(); + JavaResourceType typeResource = buildJavaResourceType(cu); + JavaResourceAttribute resourceAttribute = typeResource.getFields().iterator().next(); + assertSourceContains("@Column", cu); + resourceAttribute.removeAnnotation(JPA.COLUMN); + assertSourceDoesNotContain("@Column", cu); + } + + //update source code to change from @Id to @OneToOne and make sure @Column is not removed + public void testChangeAttributeMappingInSource() throws Exception { + ICompilationUnit cu = createTestEntityAnnotatedField(); + JavaResourceType typeResource = buildJavaResourceType(cu); + final JavaResourceAttribute resourceAttribute = typeResource.getFields().iterator().next(); + + idField(cu).edit(new Editor() { + public void edit(ModifiedDeclaration declaration) { + SourceIdAnnotation.DECLARATION_ANNOTATION_ADAPTER.removeAnnotation(declaration); + } + }); + + cu.createImport("javax.persistence.OneToOne", null, new NullProgressMonitor()); + + idField(cu).edit(new Editor() { + public void edit(ModifiedDeclaration declaration) { + SourceOneToOneAnnotation.DECLARATION_ANNOTATION_ADAPTER.newMarkerAnnotation(declaration); + } + }); + + assertNotNull(resourceAttribute.getAnnotation(JPA.COLUMN)); + assertNull(resourceAttribute.getAnnotation(JPA.ID)); + assertNotNull(resourceAttribute.getAnnotation(JPA.ONE_TO_ONE)); + assertSourceContains("@Column", cu); + } + + public void testJavaAttributeAnnotationsNestable() throws Exception { + ICompilationUnit cu = createTestEmbeddedWithAttributeOverride(); + JavaResourceType typeResource = buildJavaResourceType(cu); + JavaResourceAttribute resourceAttribute = typeResource.getFields().iterator().next(); + + assertEquals(1, resourceAttribute.getAnnotationsSize(JPA.ATTRIBUTE_OVERRIDE)); + + AttributeOverrideAnnotation attributeOverride = (AttributeOverrideAnnotation) resourceAttribute.getAnnotations(JPA.ATTRIBUTE_OVERRIDE).iterator().next(); + + assertEquals("FOO", attributeOverride.getName()); + } + + public void testJavaAttributeAnnotationsNoNestable() throws Exception { + ICompilationUnit cu = createTestEntity(); + JavaResourceType typeResource = buildJavaResourceType(cu); + JavaResourceAttribute resourceAttribute = typeResource.getFields().iterator().next(); + + assertEquals(0, resourceAttribute.getAnnotationsSize(JPA.ATTRIBUTE_OVERRIDE)); + } + + public void testJavaAttributeAnnotationsContainerNoNestable() throws Exception { + ICompilationUnit cu = createTestEmbeddedWithAttributeOverridesEmpty(); + JavaResourceType typeResource = buildJavaResourceType(cu); + JavaResourceAttribute resourceAttribute = typeResource.getFields().iterator().next(); + + assertEquals(0, resourceAttribute.getAnnotationsSize(JPA.ATTRIBUTE_OVERRIDE)); + } + + // -->> @AttributeOverride(name="FOO") + public void testAddJavaAttributeAnnotationNestableContainer() throws Exception { + ICompilationUnit cu = createTestEntity(); + JavaResourceType typeResource = buildJavaResourceType(cu); + JavaResourceAttribute resourceAttribute = typeResource.getFields().iterator().next(); + AttributeOverrideAnnotation attributeOverride = (AttributeOverrideAnnotation) resourceAttribute.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE); + attributeOverride.setName("FOO"); + assertSourceContains("@AttributeOverride(name = \"FOO\")", cu); + } + + // @Embedded -->> @Embedded + // @AttributeOverride(name="FOO") @AttributeOverrides({@AttributeOverride(name="FOO"), @AttributeOverride(name="BAR")}) + public void testAddJavaAttributeAnnotationNestableContainer2() throws Exception { + ICompilationUnit cu = createTestEmbeddedWithAttributeOverride(); + JavaResourceType typeResource = buildJavaResourceType(cu); + JavaResourceAttribute resourceAttribute = typeResource.getFields().iterator().next(); + + AttributeOverrideAnnotation attributeOverride = (AttributeOverrideAnnotation) resourceAttribute.addAnnotation(1, JPA.ATTRIBUTE_OVERRIDE); + attributeOverride.setName("BAR"); + assertSourceContains("@AttributeOverrides({ @AttributeOverride(name = \"FOO\"), @AttributeOverride(name = \"BAR\") })", cu); + + assertNull(resourceAttribute.getAnnotation(JPA.ATTRIBUTE_OVERRIDE)); + assertNotNull(resourceAttribute.getAnnotation(JPA.ATTRIBUTE_OVERRIDES)); + assertNotNull(resourceAttribute.getAnnotation(0, JPA.ATTRIBUTE_OVERRIDE)); + assertEquals(2, resourceAttribute.getAnnotationsSize(JPA.ATTRIBUTE_OVERRIDE)); + } + + // @Embedded + // @AttributeOverrides(@AttributeOverride(name="FOO")) + // || + // \/ + // @Embedded + // @AttributeOverrides({@AttributeOverride(name="FOO"), @AttributeOverride(name="BAR")}) + public void testAddJavaAttributeAnnotationNestableContainer3() throws Exception { + ICompilationUnit cu = createTestEmbeddedWithAttributeOverrides(); + JavaResourceType typeResource = buildJavaResourceType(cu); + JavaResourceAttribute resourceAttribute = typeResource.getFields().iterator().next(); + + AttributeOverrideAnnotation attributeOverride = (AttributeOverrideAnnotation) resourceAttribute.addAnnotation(1, JPA.ATTRIBUTE_OVERRIDE); + attributeOverride.setName("BAR"); + assertSourceContains("@AttributeOverrides({@AttributeOverride(name = \"FOO\"),@AttributeOverride(name = \"BAR\")})", cu); + + assertNull(resourceAttribute.getAnnotation(JPA.ATTRIBUTE_OVERRIDE)); + assertNotNull(resourceAttribute.getAnnotation(JPA.ATTRIBUTE_OVERRIDES)); + assertNotNull(resourceAttribute.getAnnotation(0, JPA.ATTRIBUTE_OVERRIDE)); + assertEquals(2, resourceAttribute.getAnnotationsSize(JPA.ATTRIBUTE_OVERRIDE)); + } + + public void testAddJavaAttributeAnnotationNestableContainer5() throws Exception { + ICompilationUnit cu = createTestEmbeddedWithAttributeOverrides(); + JavaResourceType typeResource = buildJavaResourceType(cu); + JavaResourceAttribute resourceAttribute = typeResource.getFields().iterator().next(); + + AttributeOverrideAnnotation attributeOverride = (AttributeOverrideAnnotation) resourceAttribute.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE); + attributeOverride.setName("BAR"); + assertSourceContains("@AttributeOverrides({@AttributeOverride(name = \"BAR\"),@AttributeOverride(name = \"FOO\")})", cu); + + assertNull(resourceAttribute.getAnnotation(JPA.ATTRIBUTE_OVERRIDE)); + assertNotNull(resourceAttribute.getAnnotation(JPA.ATTRIBUTE_OVERRIDES)); + assertNotNull(resourceAttribute.getAnnotation(0, JPA.ATTRIBUTE_OVERRIDE)); + assertEquals(2, resourceAttribute.getAnnotationsSize(JPA.ATTRIBUTE_OVERRIDE)); + } + + //@Entity + //@AttributeOverride(name="FOO") + public void testRemoveJavaAttributeAnnotationNestableContainer() throws Exception { + ICompilationUnit cu = createTestEmbeddedWithAttributeOverride(); + JavaResourceType typeResource = buildJavaResourceType(cu); + JavaResourceAttribute resourceAttribute = typeResource.getFields().iterator().next(); + + resourceAttribute.removeAnnotation(0, JPA.ATTRIBUTE_OVERRIDE); + + assertSourceDoesNotContain("@AttributeOverride", cu); + } + + //@Embedded + //@AttributeOverrides(@AttributeOverride(name = \"FOO\")) + public void testRemoveJavaAttributeAnnotationNestableContainer2() throws Exception { + ICompilationUnit cu = createTestEmbeddedWithAttributeOverrides(); + JavaResourceType typeResource = buildJavaResourceType(cu); + JavaResourceAttribute resourceAttribute = typeResource.getFields().iterator().next(); + + resourceAttribute.removeAnnotation(0, JPA.ATTRIBUTE_OVERRIDE); + + assertSourceDoesNotContain("@AttributeOverride(name = \"FOO\")", cu); + assertSourceContains("@AttributeOverrides", cu); + } + + public void testRemoveJavaAttributeAnnotationIndex() throws Exception { + ICompilationUnit cu = createTestEmbeddedWith2AttributeOverrides(); + JavaResourceType typeResource = buildJavaResourceType(cu); + JavaResourceAttribute resourceAttribute = typeResource.getFields().iterator().next(); + + resourceAttribute.removeAnnotation(0, JPA.ATTRIBUTE_OVERRIDE); + + assertSourceDoesNotContain("@AttributeOverride(name = \"FOO\"", cu); + assertSourceContains("@AttributeOverride(name = \"BAR\"", cu); + assertSourceDoesNotContain("@AttributeOverrides", cu); + } + + public void testRemoveJavaAttributeAnnotationIndex2() throws Exception { + ICompilationUnit cu = createTestEmbeddedWith2AttributeOverrides(); + JavaResourceType typeResource = buildJavaResourceType(cu); + JavaResourceAttribute resourceAttribute = typeResource.getFields().iterator().next(); + + AttributeOverrideAnnotation newAnnotation = (AttributeOverrideAnnotation)resourceAttribute.addAnnotation(2, JPA.ATTRIBUTE_OVERRIDE); + newAnnotation.setName("BAZ"); + assertSourceContains("@AttributeOverrides({@AttributeOverride(name = \"FOO\"), @AttributeOverride(name = \"BAR\"),", cu); + assertSourceContains("@AttributeOverride(name = \"BAZ\")})", cu); + + resourceAttribute.removeAnnotation(1, JPA.ATTRIBUTE_OVERRIDE); + assertSourceContains("@AttributeOverrides({@AttributeOverride(name = \"FOO\"), @AttributeOverride(name = \"BAZ\")})", cu); + } + + public void testMoveJavaTypeAnnotation() throws Exception { + ICompilationUnit cu = createTestEmbeddedWith2AttributeOverrides(); + JavaResourceType typeResource = buildJavaResourceType(cu); + JavaResourceAttribute resourceAttribute = typeResource.getFields().iterator().next(); + + AttributeOverrideAnnotation newAnnotation = (AttributeOverrideAnnotation)resourceAttribute.addAnnotation(2, JPA.ATTRIBUTE_OVERRIDE); + newAnnotation.setName("BAZ"); + assertSourceContains("@AttributeOverrides({@AttributeOverride(name = \"FOO\"), @AttributeOverride(name = \"BAR\"),", cu); + assertSourceContains("@AttributeOverride(name = \"BAZ\")})", cu); + + + resourceAttribute.moveAnnotation(0, 2, JPA.ATTRIBUTE_OVERRIDE); + assertSourceContains("@AttributeOverrides({@AttributeOverride(name = \"BAZ\"), @AttributeOverride(name = \"FOO\"),", cu); + assertSourceContains("@AttributeOverride(name = \"BAR\")})", cu); + } + + public void testMoveJavaTypeAnnotation2() throws Exception { + ICompilationUnit cu = createTestEmbeddedWith2AttributeOverrides(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceAttribute resourceAttribute = resourceType.getFields().iterator().next(); + + AttributeOverrideAnnotation newAnnotation = (AttributeOverrideAnnotation) resourceAttribute.addAnnotation(2, JPA.ATTRIBUTE_OVERRIDE); + newAnnotation.setName("BAZ"); + assertSourceContains("@AttributeOverrides({@AttributeOverride(name = \"FOO\"), @AttributeOverride(name = \"BAR\"),", cu); + assertSourceContains("@AttributeOverride(name = \"BAZ\")})", cu); + + resourceAttribute.moveAnnotation(1, 0, JPA.ATTRIBUTE_OVERRIDE); + assertSourceContains("@AttributeOverrides({@AttributeOverride(name = \"BAR\"), @AttributeOverride(name = \"FOO\"),", cu); + assertSourceContains("@AttributeOverride(name = \"BAZ\")})", cu); + } + + public void testGetTypeName() throws Exception { + ICompilationUnit cu = createTestEntityWithNonResolvingField(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceAttribute resourceAttribute = resourceType.getFields().iterator().next(); + + assertEquals("foo", resourceAttribute.getName()); + assertEquals("test.Foo", resourceAttribute.getTypeName()); //bug 196200 changed this + + this.javaProject.createCompilationUnit("test", "Foo.java", "public class Foo {}"); + + assertEquals("test.Foo", resourceAttribute.getTypeName()); + } + + //this tests that we handle mutliple variable declarations in one line. + //The annotations should apply to all fields defined. This is not really a useful + //thing to do with JPA beyond the most basic things that use default column names + public void testMultipleVariableDeclarationsPerLine() throws Exception { + ICompilationUnit cu = createTestEntityMultipleVariableDeclarationsPerLine(); + JavaResourceType typeResource = buildJavaResourceType(cu); + + assertEquals(4, CollectionTools.size(typeResource.getFields())); + Iterator fields = typeResource.getFields().iterator(); + JavaResourceField resourceField = fields.next(); + ColumnAnnotation column = (ColumnAnnotation) resourceField.getAnnotation(JPA.COLUMN); + assertEquals("baz", column.getName()); + + resourceField = fields.next(); + column = (ColumnAnnotation) resourceField.getAnnotation(JPA.COLUMN); + assertEquals("baz", column.getName()); + } + + public void testIsPublic() throws Exception { + ICompilationUnit cu = createTestTypePublicAttribute(); + JavaResourceType typeResource = buildJavaResourceType(cu); + JavaResourceAttribute attribute = typeResource.getFields().iterator().next(); + + assertTrue(Modifier.isPublic(attribute.getModifiers())); + } + + public void testIsPublicFalse() throws Exception { + ICompilationUnit cu = createTestTypePackageAttribute(); + JavaResourceType typeResource = buildJavaResourceType(cu); + JavaResourceAttribute attribute = typeResource.getFields().iterator().next(); + + assertFalse(Modifier.isPublic(attribute.getModifiers())); + } + + public void testIsFinal() throws Exception { + ICompilationUnit cu = createTestTypeFinalAttribute(); + JavaResourceType typeResource = buildJavaResourceType(cu); + JavaResourceAttribute attribute = typeResource.getFields().iterator().next(); + + assertTrue(Modifier.isFinal(attribute.getModifiers())); + } + + public void testIsFinalFalse() throws Exception { + ICompilationUnit cu = createTestTypePackageAttribute(); + JavaResourceType typeResource = buildJavaResourceType(cu); + JavaResourceAttribute attribute = typeResource.getFields().iterator().next(); + + assertFalse(Modifier.isFinal(attribute.getModifiers())); + } + + //TODO add tests for JPTTools static methods +} diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/JavaResourceModelTestCase.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/JavaResourceModelTestCase.java index 875b399636..3573fa84e0 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/JavaResourceModelTestCase.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/JavaResourceModelTestCase.java @@ -1,3 +1,12 @@ +/******************************************************************************* + * Copyright (c) 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. + * + * Contributors: + * Oracle - initial API and implementation + ******************************************************************************/ package org.eclipse.jpt.jpa.core.tests.internal.resource.java; import org.eclipse.jdt.core.ElementChangedEvent; @@ -6,22 +15,22 @@ import org.eclipse.jdt.core.IElementChangedListener; import org.eclipse.jdt.core.IJavaElement; import org.eclipse.jdt.core.IJavaElementDelta; import org.eclipse.jdt.core.JavaCore; +import org.eclipse.jpt.common.core.AnnotationProvider; +import org.eclipse.jpt.common.core.internal.resource.java.source.SourcePackageInfoCompilationUnit; +import org.eclipse.jpt.common.core.internal.resource.java.source.SourceTypeCompilationUnit; import org.eclipse.jpt.common.core.internal.utility.jdt.NullAnnotationEditFormatter; +import org.eclipse.jpt.common.core.resource.java.JavaResourceCompilationUnit; +import org.eclipse.jpt.common.core.resource.java.JavaResourcePackage; +import org.eclipse.jpt.common.core.resource.java.JavaResourcePackageInfoCompilationUnit; +import org.eclipse.jpt.common.core.resource.java.JavaResourceType; import org.eclipse.jpt.common.core.tests.internal.utility.jdt.AnnotationTestCase; import org.eclipse.jpt.common.utility.CommandExecutor; import org.eclipse.jpt.common.utility.internal.BitTools; import org.eclipse.jpt.common.utility.internal.ReflectionTools; import org.eclipse.jpt.common.utility.internal.StringTools; import org.eclipse.jpt.jpa.core.JpaAnnotationDefinitionProvider; -import org.eclipse.jpt.jpa.core.JpaAnnotationProvider; import org.eclipse.jpt.jpa.core.internal.GenericJpaAnnotationDefinitionProvider; -import org.eclipse.jpt.jpa.core.internal.GenericJpaAnnotationProvider; -import org.eclipse.jpt.jpa.core.internal.resource.java.source.SourcePackageInfoCompilationUnit; -import org.eclipse.jpt.jpa.core.internal.resource.java.source.SourceTypeCompilationUnit; -import org.eclipse.jpt.jpa.core.resource.java.JavaResourceCompilationUnit; -import org.eclipse.jpt.jpa.core.resource.java.JavaResourcePackage; -import org.eclipse.jpt.jpa.core.resource.java.JavaResourcePackageInfoCompilationUnit; -import org.eclipse.jpt.jpa.core.resource.java.JavaResourcePersistentType; +import org.eclipse.jpt.jpa.core.internal.JpaAnnotationProvider; @SuppressWarnings("nls") @@ -132,14 +141,14 @@ public class JavaResourceModelTestCase return pkgCu.getPackage(); } - protected JavaResourcePersistentType buildJavaTypeResource(ICompilationUnit cu) { + protected JavaResourceType buildJavaResourceType(ICompilationUnit cu) { this.javaResourceCompilationUnit = this.buildJavaResourceCompilationUnit(cu); this.javaResourceCompilationUnit.resolveTypes(); - return this.hackJavaResourcePersistentType(); + return this.hackJavaResourceType(); } - protected JavaResourcePersistentType hackJavaResourcePersistentType() { - return (JavaResourcePersistentType) ReflectionTools.getFieldValue(this.javaResourceCompilationUnit, "persistentType"); + protected JavaResourceType hackJavaResourceType() { + return (JavaResourceType) ReflectionTools.getFieldValue(this.javaResourceCompilationUnit, "primaryType"); } protected JavaResourceCompilationUnit buildJavaResourceCompilationUnit(ICompilationUnit cu) { @@ -154,8 +163,8 @@ public class JavaResourceModelTestCase ); } - protected JpaAnnotationProvider buildAnnotationProvider() { - return new GenericJpaAnnotationProvider(this.annotationDefinitionProvider()); + protected AnnotationProvider buildAnnotationProvider() { + return new JpaAnnotationProvider(this.annotationDefinitionProvider()); } protected JpaAnnotationDefinitionProvider annotationDefinitionProvider() { diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/JavaResourcePersistentAttributeTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/JavaResourcePersistentAttributeTests.java deleted file mode 100644 index 51d23da9a7..0000000000 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/JavaResourcePersistentAttributeTests.java +++ /dev/null @@ -1,870 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007, 2010 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. - * - * Contributors: - * Oracle - initial API and implementation - ******************************************************************************/ -package org.eclipse.jpt.jpa.core.tests.internal.resource.java; - -import java.lang.reflect.Modifier; -import java.util.Arrays; -import java.util.Collections; -import java.util.Iterator; -import java.util.List; - -import org.eclipse.core.runtime.NullProgressMonitor; -import org.eclipse.jdt.core.ICompilationUnit; -import org.eclipse.jpt.common.core.utility.jdt.ModifiedDeclaration; -import org.eclipse.jpt.common.core.utility.jdt.AnnotatedElement.Editor; -import org.eclipse.jpt.common.utility.internal.CollectionTools; -import org.eclipse.jpt.common.utility.internal.ReflectionTools; -import org.eclipse.jpt.common.utility.internal.iterables.EmptyIterable; -import org.eclipse.jpt.common.utility.internal.iterators.ArrayIterator; -import org.eclipse.jpt.jpa.core.internal.resource.java.source.SourceIdAnnotation; -import org.eclipse.jpt.jpa.core.internal.resource.java.source.SourceOneToOneAnnotation; -import org.eclipse.jpt.jpa.core.resource.java.AttributeOverrideAnnotation; -import org.eclipse.jpt.jpa.core.resource.java.BasicAnnotation; -import org.eclipse.jpt.jpa.core.resource.java.ColumnAnnotation; -import org.eclipse.jpt.jpa.core.resource.java.GeneratedValueAnnotation; -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.JavaResourceNode; -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.NestableAnnotation; -import org.eclipse.jpt.jpa.core.resource.java.OneToManyAnnotation; - -@SuppressWarnings("nls") -public class JavaResourcePersistentAttributeTests extends JpaJavaResourceModelTestCase { - - public JavaResourcePersistentAttributeTests(String name) { - super(name); - } - - private ICompilationUnit createTestEntity() throws Exception { - return this.createTestType(new DefaultAnnotationWriter() { - @Override - public Iterator imports() { - return new ArrayIterator(JPA.ENTITY); - } - @Override - public void appendTypeAnnotationTo(StringBuilder sb) { - sb.append("@Entity"); - } - }); - } - - private ICompilationUnit createTestEntityWithNonResolvingField() throws Exception { - return this.createTestType(new DefaultAnnotationWriter() { - @Override - public Iterator imports() { - return new ArrayIterator(JPA.ENTITY); - } - @Override - public void appendTypeAnnotationTo(StringBuilder sb) { - sb.append("@Entity"); - } - - @Override - public void appendIdFieldAnnotationTo(StringBuilder sb) { - sb.append("private Foo foo;").append(CR); - sb.append(CR); - } - }); - } - private ICompilationUnit createTestEntityWithNonResolvingMethod() throws Exception { - return this.createTestType(new DefaultAnnotationWriter() { - @Override - public Iterator imports() { - return new ArrayIterator(JPA.ENTITY); - } - @Override - public void appendTypeAnnotationTo(StringBuilder sb) { - sb.append("@Entity"); - } - - @Override - public void appendIdFieldAnnotationTo(StringBuilder sb) { - sb.append("private Foo foo;").append(CR); - sb.append(CR); - sb.append(" @Id"); - sb.append(CR); - sb.append(" public Foo getFoo() {").append(CR); - sb.append(" return this.foo;").append(CR); - sb.append(" }").append(CR); - sb.append(CR); - sb.append(" "); - sb.append(CR); - sb.append(" public void setFoo(Foo foo) {").append(CR); - sb.append(" this.foo = foo;").append(CR); - sb.append(" }").append(CR); - sb.append(CR); - sb.append(" "); - } - }); - } - - private ICompilationUnit createTestEntityMultipleVariableDeclarationsPerLine() throws Exception { - return this.createTestType(new DefaultAnnotationWriter() { - @Override - public Iterator imports() { - return new ArrayIterator(JPA.ENTITY, JPA.ID, JPA.COLUMN); - } - @Override - public void appendTypeAnnotationTo(StringBuilder sb) { - sb.append("@Entity"); - } - - @Override - public void appendIdFieldAnnotationTo(StringBuilder sb) { - sb.append(CR); - sb.append(" "); - sb.append("@Id"); - sb.append(CR); - sb.append(" "); - sb.append("@Column(name = \"baz\")"); - sb.append(" private String foo, bar;").append(CR); - sb.append(CR); - } - }); - } - - private ICompilationUnit createTestEntityWithIdAndBasic() throws Exception { - return this.createTestType(new DefaultAnnotationWriter() { - @Override - public Iterator imports() { - return new ArrayIterator(JPA.ENTITY, JPA.ID, JPA.BASIC); - } - @Override - public void appendTypeAnnotationTo(StringBuilder sb) { - sb.append("@Entity"); - } - - @Override - public void appendIdFieldAnnotationTo(StringBuilder sb) { - sb.append("@Id"); - sb.append(CR); - sb.append("@Basic"); - } - }); - } - - private ICompilationUnit createTestEntityAnnotatedField() throws Exception { - return this.createTestType(new DefaultAnnotationWriter() { - @Override - public Iterator imports() { - return new ArrayIterator(JPA.ENTITY, JPA.ID, JPA.COLUMN); - } - @Override - public void appendTypeAnnotationTo(StringBuilder sb) { - sb.append("@Entity"); - } - - @Override - public void appendIdFieldAnnotationTo(StringBuilder sb) { - sb.append("@Id"); - sb.append(CR); - sb.append(" "); - sb.append("@Column"); - } - }); - } - - private ICompilationUnit createTestEntityWithColumn() throws Exception { - return this.createTestType(new DefaultAnnotationWriter() { - @Override - public Iterator imports() { - return new ArrayIterator(JPA.ENTITY, JPA.COLUMN); - } - @Override - public void appendTypeAnnotationTo(StringBuilder sb) { - sb.append("@Entity"); - } - - @Override - public void appendIdFieldAnnotationTo(StringBuilder sb) { - sb.append("@Column(name = \"FOO\", table = \"MY_TABLE\")"); - } - }); - } - - private ICompilationUnit createTestEntityWithIdColumnGeneratedValue() throws Exception { - return this.createTestType(new DefaultAnnotationWriter() { - @Override - public Iterator imports() { - return new ArrayIterator(JPA.ENTITY, JPA.COLUMN, JPA.ID, JPA.GENERATED_VALUE); - } - @Override - public void appendTypeAnnotationTo(StringBuilder sb) { - sb.append("@Entity"); - } - @Override - public void appendIdFieldAnnotationTo(StringBuilder sb) { - sb.append("@Id"); - sb.append(CR); - sb.append("@Column"); - sb.append(CR); - sb.append("@GeneratedValue"); - } - }); - } - - - private ICompilationUnit createTestEntityMultipleColumns() throws Exception { - return this.createTestType(new DefaultAnnotationWriter() { - @Override - public Iterator imports() { - return new ArrayIterator(JPA.ENTITY, JPA.COLUMN); - } - @Override - public void appendTypeAnnotationTo(StringBuilder sb) { - sb.append("@Entity"); - } - - @Override - public void appendIdFieldAnnotationTo(StringBuilder sb) { - sb.append("@Column(name = \"FOO\")"); - sb.append(CR); - sb.append("@Column(name = \"BAR\")"); - } - }); - } - - private ICompilationUnit createTestEmbeddedWithAttributeOverride() throws Exception { - return this.createTestType(new DefaultAnnotationWriter() { - @Override - public Iterator imports() { - return new ArrayIterator(JPA.EMBEDDED, JPA.ATTRIBUTE_OVERRIDE); - } - @Override - public void appendIdFieldAnnotationTo(StringBuilder sb) { - sb.append("@Embedded"); - sb.append(CR); - sb.append("@AttributeOverride(name = \"FOO\")"); - } - }); - } - private ICompilationUnit createTestEmbeddedWithAttributeOverrides() throws Exception { - return this.createTestType(new DefaultAnnotationWriter() { - @Override - public Iterator imports() { - return new ArrayIterator(JPA.EMBEDDED, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); - } - @Override - public void appendIdFieldAnnotationTo(StringBuilder sb) { - sb.append("@Embedded"); - sb.append(CR); - sb.append("@AttributeOverrides(@AttributeOverride(name = \"FOO\"))"); - } - }); - } - private ICompilationUnit createTestEmbeddedWithAttributeOverridesEmpty() throws Exception { - return this.createTestType(new DefaultAnnotationWriter() { - @Override - public Iterator imports() { - return new ArrayIterator(JPA.EMBEDDED, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); - } - @Override - public void appendIdFieldAnnotationTo(StringBuilder sb) { - sb.append("@Embedded"); - sb.append(CR); - sb.append("@AttributeOverrides()"); - } - }); - } - - private ICompilationUnit createTestEmbeddedWith2AttributeOverrides() throws Exception { - return this.createTestType(new DefaultAnnotationWriter() { - @Override - public Iterator imports() { - return new ArrayIterator(JPA.EMBEDDED, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); - } - @Override - public void appendIdFieldAnnotationTo(StringBuilder sb) { - sb.append("@Embedded"); - sb.append(CR); - sb.append("@AttributeOverrides({@AttributeOverride(name = \"FOO\"), @AttributeOverride(name = \"BAR\")})"); - } - }); - } - - private ICompilationUnit createTestEmbeddedWithAttributeOverrideAndAttributeOverrides() throws Exception { - return this.createTestType(new DefaultAnnotationWriter() { - @Override - public Iterator imports() { - return new ArrayIterator(JPA.EMBEDDED, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); - } - @Override - public void appendIdFieldAnnotationTo(StringBuilder sb) { - sb.append("@Embedded"); - sb.append(CR); - sb.append("@AttributeOverride(name = \"FOO\")"); - sb.append(CR); - sb.append("@AttributeOverrides({@AttributeOverride(name = \"BAR\"), @AttributeOverride(name = \"BAZ\")})"); - } - }); - } - - private ICompilationUnit createTestTypePublicAttribute() throws Exception { - - return this.createTestType(new DefaultAnnotationWriter() { - - @Override - public void appendIdFieldAnnotationTo(StringBuilder sb) { - sb.append(CR); - sb.append(" public String foo;"); - sb.append(CR); - } - }); - } - - private ICompilationUnit createTestTypePackageAttribute() throws Exception { - - return this.createTestType(new DefaultAnnotationWriter() { - - @Override - public void appendIdFieldAnnotationTo(StringBuilder sb) { - sb.append(CR); - sb.append(" String foo;"); - sb.append(CR); - } - }); - } - - private ICompilationUnit createTestTypeFinalAttribute() throws Exception { - - return this.createTestType(new DefaultAnnotationWriter() { - - @Override - public void appendIdFieldAnnotationTo(StringBuilder sb) { - sb.append(CR); - sb.append(" public final String foo;"); - sb.append(CR); - } - }); - } - - public void testJavaAttributeAnnotations() throws Exception { - ICompilationUnit cu = this.createTestEntityWithColumn(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - assertEquals(1, attributeResource.annotationsSize()); - } - - public void testJavaAttributeAnnotation() throws Exception { - ICompilationUnit cu = this.createTestEntityWithColumn(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - assertNotNull(attributeResource.getAnnotation(JPA.COLUMN)); - } - - public void testJavaAttributeAnnotationNull() throws Exception { - ICompilationUnit cu = this.createTestEntity(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - assertNull(attributeResource.getAnnotation(JPA.TABLE)); - } - - //This will result in a compilation error, but we assume the first column found - public void testDuplicateAnnotations() throws Exception { - ICompilationUnit cu = this.createTestEntityMultipleColumns(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - ColumnAnnotation columnResource = (ColumnAnnotation) attributeResource.getAnnotation(JPA.COLUMN); - assertEquals("FOO", columnResource.getName()); - } - - public void testRemoveColumn() throws Exception { - ICompilationUnit cu = this.createTestEntityWithColumn(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - attributeResource.removeAnnotation(JPA.COLUMN); - - assertSourceDoesNotContain("@Column", cu); - } - - public void testRemoveColumnName() throws Exception { - ICompilationUnit cu = this.createTestEntityWithColumn(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - - ColumnAnnotation columnResource = (ColumnAnnotation) attributeResource.getAnnotation(JPA.COLUMN); - columnResource.setTable(null); - assertSourceContains("@Column(name = \"FOO\")", cu); - - columnResource.setName(null); - assertSourceDoesNotContain("(name", cu); - assertSourceDoesNotContain("@Column(", cu); - } - - public void testMultipleAttributeMappings() throws Exception { - ICompilationUnit cu = this.createTestEntityWithIdAndBasic(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - - assertEquals(2, attributeResource.annotationsSize()); - assertNotNull(attributeResource.getAnnotation(JPA.BASIC)); - assertNotNull(attributeResource.getAnnotation(JPA.ID)); - - JavaResourceNode javaAttributeMappingAnnotation = attributeResource.getAnnotation(BasicAnnotation.ANNOTATION_NAME); - assertTrue(javaAttributeMappingAnnotation instanceof BasicAnnotation); - assertSourceContains("@Basic", cu); - assertSourceContains("@Id", cu); - - attributeResource.setPrimaryAnnotation(JPA.ONE_TO_MANY, EmptyIterable.instance()); - assertEquals(1, attributeResource.annotationsSize()); - javaAttributeMappingAnnotation = attributeResource.getAnnotation(OneToManyAnnotation.ANNOTATION_NAME); - assertTrue(javaAttributeMappingAnnotation instanceof OneToManyAnnotation); - assertSourceDoesNotContain("@Id", cu); - assertSourceContains("@OneToMany", cu); - assertSourceDoesNotContain("@Basic", cu); - } - - public void testSetJavaAttributeMappingAnnotation() throws Exception { - ICompilationUnit cu = createTestType(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - assertEquals(0, attributeResource.annotationsSize()); - - attributeResource.setPrimaryAnnotation(JPA.ID, EmptyIterable.instance()); - assertTrue(attributeResource.getAnnotation(IdAnnotation.ANNOTATION_NAME) instanceof IdAnnotation); - assertSourceContains("@Id", cu); - } - - public void testSetJavaAttributeMappingAnnotation2() throws Exception { - ICompilationUnit cu = createTestEntityWithColumn(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - assertEquals(1, attributeResource.annotationsSize()); - - attributeResource.setPrimaryAnnotation(JPA.ID, Collections.singleton(ColumnAnnotation.ANNOTATION_NAME)); - assertTrue(attributeResource.getAnnotation(IdAnnotation.ANNOTATION_NAME) instanceof IdAnnotation); - - assertSourceContains("@Id", cu); - assertSourceContains("@Column", cu); - } - - public void testSetJavaAttributeMappingAnnotation3() throws Exception { - ICompilationUnit cu = createTestEntityWithIdColumnGeneratedValue(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - assertTrue(attributeResource.getAnnotation(IdAnnotation.ANNOTATION_NAME) instanceof IdAnnotation); - - attributeResource.setPrimaryAnnotation( - JPA.BASIC, - Arrays.asList(new String[] { - ColumnAnnotation.ANNOTATION_NAME, - GeneratedValueAnnotation.ANNOTATION_NAME})); - assertTrue(attributeResource.getAnnotation(BasicAnnotation.ANNOTATION_NAME) instanceof BasicAnnotation); - - assertSourceDoesNotContain("@Id", cu); - assertSourceContains("@GeneratedValue", cu); //not supported by Basic - assertSourceContains("@Column", cu); //common between Id and Basic - } - - public void testSetJavaAttributeMappingAnnotationNull() throws Exception { - ICompilationUnit cu = createTestEntityWithIdColumnGeneratedValue(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - assertTrue(attributeResource.getAnnotation(IdAnnotation.ANNOTATION_NAME) instanceof IdAnnotation); - - attributeResource.setPrimaryAnnotation( - null, - Arrays.asList(new String[] { - ColumnAnnotation.ANNOTATION_NAME, - GeneratedValueAnnotation.ANNOTATION_NAME})); - - assertEquals(2, attributeResource.annotationsSize()); - assertSourceDoesNotContain("@Id", cu); - assertSourceContains("@GeneratedValue", cu); //not supported by Basic - assertSourceContains("@Column", cu); //common between Id and Basic - } - - public void testAddJavaAttributeAnnotation() throws Exception { - ICompilationUnit cu = createTestEntity(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - - assertSourceDoesNotContain("@Column", cu); - attributeResource.addAnnotation(JPA.COLUMN); - assertSourceContains("@Column", cu); - } - - public void testRemoveJavaAttributeAnnotation() throws Exception { - ICompilationUnit cu = createTestEntityAnnotatedField(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - assertSourceContains("@Column", cu); - attributeResource.removeAnnotation(JPA.COLUMN); - assertSourceDoesNotContain("@Column", cu); - } - - //update source code to change from @Id to @OneToOne and make sure @Column is not removed - public void testChangeAttributeMappingInSource() throws Exception { - ICompilationUnit cu = createTestEntityAnnotatedField(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - final JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - - idField(cu).edit(new Editor() { - public void edit(ModifiedDeclaration declaration) { - SourceIdAnnotation.DECLARATION_ANNOTATION_ADAPTER.removeAnnotation(declaration); - } - }); - - cu.createImport("javax.persistence.OneToOne", null, new NullProgressMonitor()); - - idField(cu).edit(new Editor() { - public void edit(ModifiedDeclaration declaration) { - SourceOneToOneAnnotation.DECLARATION_ANNOTATION_ADAPTER.newMarkerAnnotation(declaration); - } - }); - - assertNotNull(attributeResource.getAnnotation(JPA.COLUMN)); - assertNull(attributeResource.getAnnotation(JPA.ID)); - assertNotNull(attributeResource.getAnnotation(JPA.ONE_TO_ONE)); - assertSourceContains("@Column", cu); - } - - public void testJavaAttributeAnnotationsNestable() throws Exception { - ICompilationUnit cu = createTestEmbeddedWithAttributeOverride(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - - assertEquals(1, CollectionTools.size(attributeResource.annotations(JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES))); - - AttributeOverrideAnnotation attributeOverride = (AttributeOverrideAnnotation) attributeResource.annotations(JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES).next(); - - assertEquals("FOO", attributeOverride.getName()); - } - - public void testJavaAttributeAnnotationsNoNestable() throws Exception { - ICompilationUnit cu = createTestEntity(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - - assertEquals(0, CollectionTools.size(attributeResource.annotations(JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES))); - } - - public void testJavaAttributeAnnotationsContainerNoNestable() throws Exception { - ICompilationUnit cu = createTestEmbeddedWithAttributeOverridesEmpty(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - - assertEquals(0, CollectionTools.size(attributeResource.annotations(JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES))); - } - - public void testJavaAttributeAnnotationsNestableAndContainer() throws Exception { - ICompilationUnit cu = createTestEmbeddedWithAttributeOverrideAndAttributeOverrides(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - assertNotNull(attributeResource.getAnnotation(JPA.ATTRIBUTE_OVERRIDE)); - assertNotNull(attributeResource.getAnnotation(JPA.ATTRIBUTE_OVERRIDES)); - assertEquals(2, CollectionTools.size(attributeResource.annotations(JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES))); - - AttributeOverrideAnnotation attributeOverrideResource = (AttributeOverrideAnnotation) attributeResource.annotations(JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES).next(); - assertEquals("BAR", attributeOverrideResource.getName()); - } - - // -->> @AttributeOverride(name="FOO") - public void testAddJavaAttributeAnnotationNestableContainer() throws Exception { - ICompilationUnit cu = createTestEntity(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - AttributeOverrideAnnotation attributeOverride = (AttributeOverrideAnnotation) attributeResource.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); - attributeOverride.setName("FOO"); - assertSourceContains("@AttributeOverride(name = \"FOO\")", cu); - } - - // @Embedded -->> @Embedded - // @AttributeOverride(name="FOO") @AttributeOverrides({@AttributeOverride(name="FOO"), @AttributeOverride(name="BAR")}) - public void testAddJavaAttributeAnnotationNestableContainer2() throws Exception { - ICompilationUnit cu = createTestEmbeddedWithAttributeOverride(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - - AttributeOverrideAnnotation attributeOverride = (AttributeOverrideAnnotation) attributeResource.addAnnotation(1, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); - attributeOverride.setName("BAR"); - assertSourceContains("@AttributeOverrides({@AttributeOverride(name = \"FOO\"),@AttributeOverride(name = \"BAR\")})", cu); - - assertNull(attributeResource.getAnnotation(JPA.ATTRIBUTE_OVERRIDE)); - assertNotNull(attributeResource.getAnnotation(JPA.ATTRIBUTE_OVERRIDES)); - assertEquals(2, CollectionTools.size(attributeResource.annotations(JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES))); - } - - // @Embedded - // @AttributeOverrides(@AttributeOverride(name="FOO")) - // || - // \/ - // @Embedded - // @AttributeOverrides({@AttributeOverride(name="FOO"), @AttributeOverride(name="BAR")}) - public void testAddJavaAttributeAnnotationNestableContainer3() throws Exception { - ICompilationUnit cu = createTestEmbeddedWithAttributeOverrides(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - - AttributeOverrideAnnotation attributeOverride = (AttributeOverrideAnnotation) attributeResource.addAnnotation(1, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); - attributeOverride.setName("BAR"); - assertSourceContains("@AttributeOverrides({@AttributeOverride(name = \"FOO\"),@AttributeOverride(name = \"BAR\")})", cu); - - assertNull(attributeResource.getAnnotation(JPA.ATTRIBUTE_OVERRIDE)); - assertNotNull(attributeResource.getAnnotation(JPA.ATTRIBUTE_OVERRIDES)); - assertEquals(2, CollectionTools.size(attributeResource.annotations(JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES))); - } - - public void testAddJavaAttributeAnnotationNestableContainer5() throws Exception { - ICompilationUnit cu = createTestEmbeddedWithAttributeOverrides(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - - AttributeOverrideAnnotation attributeOverride = (AttributeOverrideAnnotation) attributeResource.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); - attributeOverride.setName("BAR"); - assertSourceContains("@AttributeOverrides({@AttributeOverride(name = \"BAR\"),@AttributeOverride(name = \"FOO\")})", cu); - - assertNull(attributeResource.getAnnotation(JPA.ATTRIBUTE_OVERRIDE)); - assertNotNull(attributeResource.getAnnotation(JPA.ATTRIBUTE_OVERRIDES)); - assertEquals(2, CollectionTools.size(attributeResource.annotations(JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES))); - } - - // @Embedded - // @SecondaryTable(name=\"FOO\") - // @AttributeOverrides({@AttributeOverride(name=\"BAR\"), @AttributeOverride(name=\"BAZ\")}) - // || - // \/ - // @Embedded - // @AttributeOverride(name=\"FOO\") - // @AttributeOverrides({@AttributeOverride(name=\"BAR\"), @AttributeOverride(name=\"BAZ\"), @AttributeOverride(name=\"BOO\")}) - public void testAddJavaAttributeAnnotationNestableContainer4() throws Exception { - ICompilationUnit cu = createTestEmbeddedWithAttributeOverrideAndAttributeOverrides(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - - assertNotNull(attributeResource.getAnnotation(JPA.ATTRIBUTE_OVERRIDE)); - assertNotNull(attributeResource.getAnnotation(JPA.ATTRIBUTE_OVERRIDES)); - assertEquals(2, CollectionTools.size(attributeResource.annotations(JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES))); - - AttributeOverrideAnnotation attributeOverride = (AttributeOverrideAnnotation) attributeResource.addAnnotation(2, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); - assertSourceContains("@AttributeOverrides({@AttributeOverride(name = \"BAR\"), @AttributeOverride(name = \"BAZ\"),", cu); - assertSourceContains("@AttributeOverride})", cu); - attributeOverride.setName("BOO"); - - assertNotNull(attributeResource.getAnnotation(JPA.ATTRIBUTE_OVERRIDE)); - assertNotNull(attributeResource.getAnnotation(JPA.ATTRIBUTE_OVERRIDES)); - assertEquals(3, CollectionTools.size(attributeResource.annotations(JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES))); - - Iterator attributeOverrideAnnotations = attributeResource.annotations(JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); - attributeOverride = (AttributeOverrideAnnotation) attributeOverrideAnnotations.next(); - assertEquals("BAR", attributeOverride.getName()); - attributeOverride = (AttributeOverrideAnnotation) attributeOverrideAnnotations.next(); - assertEquals("BAZ", attributeOverride.getName()); - attributeOverride = (AttributeOverrideAnnotation) attributeOverrideAnnotations.next(); - assertEquals("BOO", attributeOverride.getName()); - - assertSourceContains("@AttributeOverrides({@AttributeOverride(name = \"BAR\"), @AttributeOverride(name = \"BAZ\"),", cu); - assertSourceContains("@AttributeOverride(name = \"BOO\")})", cu); - } - - //@Entity - //@AttributeOverride(name="FOO") - public void testRemoveJavaAttributeAnnotationNestableContainer() throws Exception { - ICompilationUnit cu = createTestEmbeddedWithAttributeOverride(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - - attributeResource.removeAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); - - assertSourceDoesNotContain("@AttributeOverride", cu); - } - - - //@Entity - //@SecondaryTables(@SecondaryTable(name="FOO")) - public void testRemoveJavaAttributeAnnotationNestableContainer2() throws Exception { - ICompilationUnit cu = createTestEmbeddedWithAttributeOverrides(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - - attributeResource.removeAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); - - assertSourceDoesNotContain("@AttributeOverride", cu); - assertSourceDoesNotContain("@AttributeOverrides", cu); - } - - public void testRemoveJavaAttributeAnnotationIndex() throws Exception { - ICompilationUnit cu = createTestEmbeddedWith2AttributeOverrides(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - - attributeResource.removeAnnotation(0, JPA.ATTRIBUTE_OVERRIDE , JPA.ATTRIBUTE_OVERRIDES); - - assertSourceDoesNotContain("@AttributeOverride(name = \"FOO\"", cu); - assertSourceContains("@AttributeOverride(name = \"BAR\"", cu); - assertSourceDoesNotContain("@AttributeOverrides", cu); - } - - public void testRemoveJavaAttributeAnnotationIndex2() throws Exception { - ICompilationUnit cu = createTestEmbeddedWith2AttributeOverrides(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - - AttributeOverrideAnnotation newAnnotation = (AttributeOverrideAnnotation)attributeResource.addAnnotation(2, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); - newAnnotation.setName("BAZ"); - assertSourceContains("@AttributeOverrides({@AttributeOverride(name = \"FOO\"), @AttributeOverride(name = \"BAR\"),", cu); - assertSourceContains("@AttributeOverride(name = \"BAZ\")})", cu); - - attributeResource.removeAnnotation(1, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); - assertSourceContains("@AttributeOverrides({@AttributeOverride(name = \"FOO\"), @AttributeOverride(name = \"BAZ\")})", cu); - } - - public void testMoveJavaTypeAnnotation() throws Exception { - ICompilationUnit cu = createTestEmbeddedWith2AttributeOverrides(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - - AttributeOverrideAnnotation newAnnotation = (AttributeOverrideAnnotation)attributeResource.addAnnotation(2, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); - newAnnotation.setName("BAZ"); - assertSourceContains("@AttributeOverrides({@AttributeOverride(name = \"FOO\"), @AttributeOverride(name = \"BAR\"),", cu); - assertSourceContains("@AttributeOverride(name = \"BAZ\")})", cu); - - - attributeResource.moveAnnotation(0, 2, JPA.ATTRIBUTE_OVERRIDES); - assertSourceContains("@AttributeOverrides({@AttributeOverride(name = \"BAZ\"), @AttributeOverride(name = \"FOO\"),", cu); - assertSourceContains("@AttributeOverride(name = \"BAR\")})", cu); - } - - public void testMoveJavaTypeAnnotation2() throws Exception { - ICompilationUnit cu = createTestEmbeddedWith2AttributeOverrides(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - - AttributeOverrideAnnotation newAnnotation = (AttributeOverrideAnnotation) attributeResource.addAnnotation(2, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); - newAnnotation.setName("BAZ"); - assertSourceContains("@AttributeOverrides({@AttributeOverride(name = \"FOO\"), @AttributeOverride(name = \"BAR\"),", cu); - assertSourceContains("@AttributeOverride(name = \"BAZ\")})", cu); - - attributeResource.moveAnnotation(1, 0, JPA.ATTRIBUTE_OVERRIDES); - assertSourceContains("@AttributeOverrides({@AttributeOverride(name = \"BAR\"), @AttributeOverride(name = \"FOO\"),", cu); - assertSourceContains("@AttributeOverride(name = \"BAZ\")})", cu); - } - - //more detailed tests in JPTToolsTests - public void testIsPersistableField() throws Exception { - ICompilationUnit cu = createTestEntity(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - - assertTrue(attributeResource.isPersistable()); - } - - public void testIsPersistableField2() throws Exception { - ICompilationUnit cu = createTestEntityWithNonResolvingField(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - @SuppressWarnings("unchecked") - List attributes = (List) ReflectionTools.getFieldValue(typeResource, "fields"); - JavaResourcePersistentAttribute attributeResource = attributes.get(0); - - assertEquals("foo", attributeResource.getName()); - assertTrue(attributeResource.isField()); - assertTrue(attributeResource.isPersistable()); //bug 196200 changed this - - this.javaProject.createCompilationUnit("test", "Foo.java", "public class Foo {}"); - - assertTrue(attributeResource.isPersistable()); - } - - public void testGetTypeName() throws Exception { - ICompilationUnit cu = createTestEntityWithNonResolvingField(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - @SuppressWarnings("unchecked") - List attributes = (List) ReflectionTools.getFieldValue(typeResource, "fields"); - JavaResourcePersistentAttribute attributeResource = attributes.get(0); - - assertEquals("foo", attributeResource.getName()); - assertEquals("test.Foo", attributeResource.getTypeName()); //bug 196200 changed this - - this.javaProject.createCompilationUnit("test", "Foo.java", "public class Foo {}"); - - assertEquals("test.Foo", attributeResource.getTypeName()); - } - - - //more detailed tests in JPTToolsTests - public void testIsPersistableMethod() throws Exception { - ICompilationUnit cu = createTestEntity(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.persistableProperties().next(); - - assertTrue(attributeResource.isPersistable()); - } - - public void testIsPersistableMethod2() throws Exception { - ICompilationUnit cu = createTestEntityWithNonResolvingMethod(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - @SuppressWarnings("unchecked") - List attributes = (List) ReflectionTools.getFieldValue(typeResource, "methods"); - JavaResourcePersistentAttribute attributeResource = attributes.get(0); - - assertEquals("foo", attributeResource.getName()); - assertTrue(attributeResource.isProperty()); - assertTrue(attributeResource.isPersistable());//bug 196200 changed this - - this.javaProject.createCompilationUnit("test", "Foo.java", "public class Foo {}"); - - assertTrue(attributeResource.isPersistable()); - } - - //this tests that we handle mutliple variable declarations in one line. - //The annotations should apply to all fields defined. This is not really a useful - //thing to do with JPA beyond the most basic things that use default column names - public void testMultipleVariableDeclarationsPerLine() throws Exception { - ICompilationUnit cu = createTestEntityMultipleVariableDeclarationsPerLine(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - - assertEquals(4, CollectionTools.size(typeResource.fields())); - Iterator fields = typeResource.fields(); - JavaResourcePersistentAttribute attributeResource = fields.next(); - ColumnAnnotation column = (ColumnAnnotation) attributeResource.getAnnotation(JPA.COLUMN); - assertEquals("baz", column.getName()); - - attributeResource = fields.next(); - column = (ColumnAnnotation) attributeResource.getAnnotation(JPA.COLUMN); - assertEquals("baz", column.getName()); - } - - public void testIsPublic() throws Exception { - ICompilationUnit cu = createTestTypePublicAttribute(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attribute = typeResource.persistableAttributes().next(); - - assertTrue(Modifier.isPublic(attribute.getModifiers())); - } - - public void testIsPublicFalse() throws Exception { - ICompilationUnit cu = createTestTypePackageAttribute(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attribute = typeResource.persistableAttributes().next(); - - assertFalse(Modifier.isPublic(attribute.getModifiers())); - } - - public void testIsFinal() throws Exception { - ICompilationUnit cu = createTestTypeFinalAttribute(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attribute = typeResource.persistableAttributes().next(); - - assertTrue(Modifier.isFinal(attribute.getModifiers())); - } - - public void testIsFinalFalse() throws Exception { - ICompilationUnit cu = createTestTypePackageAttribute(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attribute = typeResource.persistableAttributes().next(); - - assertFalse(Modifier.isFinal(attribute.getModifiers())); - } - - //TODO add tests for JPTTools static methods -} diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/JavaResourcePersistentTypeTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/JavaResourcePersistentTypeTests.java deleted file mode 100644 index a865148f4a..0000000000 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/JavaResourcePersistentTypeTests.java +++ /dev/null @@ -1,937 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007, 2010 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. - * - * Contributors: - * Oracle - initial API and implementation - ******************************************************************************/ -package org.eclipse.jpt.jpa.core.tests.internal.resource.java; - -import java.util.Iterator; - -import org.eclipse.core.runtime.NullProgressMonitor; -import org.eclipse.jdt.core.ICompilationUnit; -import org.eclipse.jpt.common.core.utility.jdt.ModifiedDeclaration; -import org.eclipse.jpt.common.core.utility.jdt.AnnotatedElement.Editor; -import org.eclipse.jpt.common.utility.internal.CollectionTools; -import org.eclipse.jpt.common.utility.internal.iterables.EmptyIterable; -import org.eclipse.jpt.common.utility.internal.iterators.ArrayIterator; -import org.eclipse.jpt.jpa.core.internal.resource.java.source.SourceEmbeddableAnnotation; -import org.eclipse.jpt.jpa.core.internal.resource.java.source.SourceEntityAnnotation; -import org.eclipse.jpt.jpa.core.resource.java.AccessType; -import org.eclipse.jpt.jpa.core.resource.java.EmbeddableAnnotation; -import org.eclipse.jpt.jpa.core.resource.java.EntityAnnotation; -import org.eclipse.jpt.jpa.core.resource.java.JPA; -import org.eclipse.jpt.jpa.core.resource.java.JavaResourceNode; -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.MappedSuperclassAnnotation; -import org.eclipse.jpt.jpa.core.resource.java.NestableAnnotation; -import org.eclipse.jpt.jpa.core.resource.java.SecondaryTableAnnotation; -import org.eclipse.jpt.jpa.core.resource.java.TableAnnotation; - -@SuppressWarnings("nls") -public class JavaResourcePersistentTypeTests extends JpaJavaResourceModelTestCase { - - public JavaResourcePersistentTypeTests(String name) { - super(name); - } - - private ICompilationUnit createTestEntity() throws Exception { - return this.createTestType(new DefaultAnnotationWriter() { - @Override - public Iterator imports() { - return new ArrayIterator(JPA.ENTITY); - } - @Override - public void appendTypeAnnotationTo(StringBuilder sb) { - sb.append("@Entity"); - } - }); - } - - private ICompilationUnit createTestInvalidAnnotations() throws Exception { - return this.createTestType(new DefaultAnnotationWriter() { - @Override - public Iterator imports() { - return new ArrayIterator("javax.persistence.Foo"); - } - @Override - public void appendTypeAnnotationTo(StringBuilder sb) { - sb.append("@Foo"); - } - - @Override - public void appendIdFieldAnnotationTo(StringBuilder sb) { - sb.append("@Foo"); - } - }); - } - - private ICompilationUnit createTestEntityWithMemberEmbeddable() throws Exception { - return this.createTestType(new DefaultAnnotationWriter() { - @Override - public Iterator imports() { - return new ArrayIterator(JPA.ENTITY, JPA.EMBEDDABLE); - } - @Override - public void appendTypeAnnotationTo(StringBuilder sb) { - sb.append("@Entity"); - } - - @Override - public void appendMemberTypeTo(StringBuilder sb) { - sb.append(" @Embeddable"); - sb.append(CR); - sb.append(" public static class Foo { }").append(CR); - - } - }); - } - - private ICompilationUnit createTestEntityDuplicates() throws Exception { - return this.createTestType(new DefaultAnnotationWriter() { - @Override - public Iterator imports() { - return new ArrayIterator(JPA.ENTITY); - } - @Override - public void appendTypeAnnotationTo(StringBuilder sb) { - sb.append("@Entity(name = \"FirstEntity\")").append(CR); - sb.append("@Entity(name = \"SecondEntity\")"); - } - }); - } - - private ICompilationUnit createTestEntityWithEmbeddable() throws Exception { - return this.createTestType(new DefaultAnnotationWriter() { - @Override - public Iterator imports() { - return new ArrayIterator(JPA.ENTITY, JPA.EMBEDDABLE); - } - @Override - public void appendTypeAnnotationTo(StringBuilder sb) { - sb.append("@Entity"); - sb.append(CR); - sb.append("@Embeddable"); - } - }); - } - - private ICompilationUnit createTestEntityAnnotatedField() throws Exception { - return this.createTestType(new DefaultAnnotationWriter() { - @Override - public Iterator imports() { - return new ArrayIterator(JPA.ENTITY, JPA.ID); - } - @Override - public void appendTypeAnnotationTo(StringBuilder sb) { - sb.append("@Entity"); - } - - @Override - public void appendIdFieldAnnotationTo(StringBuilder sb) { - sb.append("@Id"); - } - }); - } - - private ICompilationUnit createTestEntityAnnotatedMethod() throws Exception { - return this.createTestType(new DefaultAnnotationWriter() { - @Override - public Iterator imports() { - return new ArrayIterator(JPA.ENTITY, JPA.ID); - } - @Override - public void appendTypeAnnotationTo(StringBuilder sb) { - sb.append("@Entity"); - } - - @Override - public void appendGetIdMethodAnnotationTo(StringBuilder sb) { - sb.append("@Id"); - } - }); - } - - private ICompilationUnit createTestEntityAnnotatedFieldAndMethod() throws Exception { - return this.createTestType(new DefaultAnnotationWriter() { - @Override - public Iterator imports() { - return new ArrayIterator(JPA.ENTITY, JPA.ID); - } - @Override - public void appendTypeAnnotationTo(StringBuilder sb) { - sb.append("@Entity"); - } - - @Override - public void appendGetIdMethodAnnotationTo(StringBuilder sb) { - sb.append("@Id"); - } - - @Override - public void appendIdFieldAnnotationTo(StringBuilder sb) { - sb.append("@Id"); - } - }); - } - - private ICompilationUnit createTestEntityAnnotatedNonPersistableMethod() throws Exception { - return this.createTestType(new DefaultAnnotationWriter() { - @Override - public Iterator imports() { - return new ArrayIterator(JPA.ENTITY, JPA.ID); - } - @Override - public void appendTypeAnnotationTo(StringBuilder sb) { - sb.append("@Entity"); - } - @Override - public void appendGetNameMethodAnnotationTo(StringBuilder sb) { - sb.append("@Id"); - } - }); - } - - private ICompilationUnit createTestEntityAnnotatedPersistableMethodNonPersistableField() throws Exception { - return this.createTestType(new DefaultAnnotationWriter() { - @Override - public Iterator imports() { - return new ArrayIterator(JPA.ENTITY, JPA.COLUMN); - } - @Override - public void appendTypeAnnotationTo(StringBuilder sb) { - sb.append("@Entity"); - } - - @Override - public void appendIdFieldAnnotationTo(StringBuilder sb) { - sb.append("@Column"); - sb.append(" private transient int notPersistable;").append(CR); - sb.append(CR); - - } - @Override - public void appendGetIdMethodAnnotationTo(StringBuilder sb) { - sb.append("@Column"); - } - }); - } - - private ICompilationUnit createTestEntityNoPersistableFields() throws Exception { - return this.createTestType(new DefaultAnnotationWriter() { - @Override - public Iterator imports() { - return new ArrayIterator(JPA.ENTITY); - } - @Override - public void appendTypeAnnotationTo(StringBuilder sb) { - sb.append("@Entity"); - } - @Override - public void appendMemberTypeTo(StringBuilder sb) { - sb.delete(sb.indexOf("private int id;"), sb.indexOf("private int id;") + "private int id;".length()); - sb.delete(sb.indexOf("private String name;"), sb.indexOf("private String name;") + "private String name;".length()); - } - }); - } - -// private ICompilationUnit createTestEntityLarge(final int i) throws Exception { -// return this.createTestType(new DefaultAnnotationWriter() { -// @Override -// public Iterator imports() { -// return new ArrayIterator(JPA.ENTITY + i); -// } -// @Override -// public void appendTypeAnnotationTo(StringBuilder sb) { -// sb.append("@Entity" + i); -// sb.append(CR); -// } -// @Override -// public String typeName() { -// return TYPE_NAME + i; -// } -// }); -// } -// -// public void testLarge() throws Exception { -// for (int i = START; i <= END; i++) { -// this.createAnnotationAndMembers("Entity" +i, "String name();"); -// } -// -// List cus = new ArrayList(); -// for (int i = START; i <= END; i++) { -// cus.add(createTestEntityLarge(i)); -// } -// long start = System.currentTimeMillis(); -// List typeResources = new ArrayList(); -// for (int i = 0; i < END; i++) { -// typeResources.add(buildJavaTypeResource(cus.get(i))); -// } -// long end = System.currentTimeMillis(); -// -// System.out.println(end-start + "ms"); -// for (int i = 0; i < END; i++) { -// assertEquals(1, CollectionTools.size(typeResources.get(i).javaTypeMappingAnnotations())); -// assertNotNull(typeResources.get(i).javaTypeMappingAnnotation(JPA.ENTITY + (i+1))); -// } -// -// -//// assertEquals(0, CollectionTools.size(typeResource.javaTypeAnnotations())); -// } - - - - private ICompilationUnit createTestEntityWithTable() throws Exception { - return this.createTestType(new DefaultAnnotationWriter() { - @Override - public Iterator imports() { - return new ArrayIterator(JPA.ENTITY, JPA.TABLE); - } - @Override - public void appendTypeAnnotationTo(StringBuilder sb) { - sb.append("@Entity"); - sb.append(CR); - sb.append("@Table(name = \"FOO\", schema = \"BAR\")"); - } - }); - } - -// private ICompilationUnit createTestEntityWithTableAndIdClass() throws Exception { -// createEntityAnnotation(); -// this.createAnnotationAndMembers("Table", "String name(); String schema();"); -// this.createAnnotationAndMembers("IdClass", "Class value();"); -// return this.createTestType(new DefaultAnnotationWriter() { -// @Override -// public Iterator imports() { -// return new ArrayIterator(JPA.ENTITY, JPA.TABLE, JPA.ID_CLASS); -// } -// @Override -// public void appendTypeAnnotationTo(StringBuilder sb) { -// sb.append("@Entity"); -// sb.append(CR); -// sb.append("@Table"); -// sb.append(CR); -// sb.append("@IdClass"); -// } -// }); -// } -// - - private ICompilationUnit createTestEntityMultipleTables() throws Exception { - return this.createTestType(new DefaultAnnotationWriter() { - @Override - public Iterator imports() { - return new ArrayIterator(JPA.ENTITY, JPA.TABLE); - } - @Override - public void appendTypeAnnotationTo(StringBuilder sb) { - sb.append("@Entity"); - sb.append(CR); - sb.append("@Table(name = \"FOO\")"); - sb.append(CR); - sb.append("@Table(name = \"BAR\")"); - } - }); - } - - private ICompilationUnit createTestEntityWithSecondaryTable() throws Exception { - return this.createTestType(new DefaultAnnotationWriter() { - @Override - public Iterator imports() { - return new ArrayIterator(JPA.ENTITY, JPA.SECONDARY_TABLE); - } - @Override - public void appendTypeAnnotationTo(StringBuilder sb) { - sb.append("@Entity"); - sb.append(CR); - sb.append("@SecondaryTable(name = \"FOO\")"); - } - }); - } - private ICompilationUnit createTestEntityWithEmptySecondaryTables() throws Exception { - return this.createTestType(new DefaultAnnotationWriter() { - @Override - public Iterator imports() { - return new ArrayIterator(JPA.ENTITY, JPA.SECONDARY_TABLE, JPA.SECONDARY_TABLES); - } - @Override - public void appendTypeAnnotationTo(StringBuilder sb) { - sb.append("@Entity"); - sb.append(CR); - sb.append("@SecondaryTables()"); - } - }); - } - - private ICompilationUnit createTestEntityWithSecondaryTables() throws Exception { - return this.createTestType(new DefaultAnnotationWriter() { - @Override - public Iterator imports() { - return new ArrayIterator(JPA.ENTITY, JPA.SECONDARY_TABLE, JPA.SECONDARY_TABLES); - } - @Override - public void appendTypeAnnotationTo(StringBuilder sb) { - sb.append("@Entity"); - sb.append(CR); - sb.append("@SecondaryTables(@SecondaryTable(name = \"FOO\"))"); - } - }); - } - - private ICompilationUnit createTestEntityWith2SecondaryTables() throws Exception { - return this.createTestType(new DefaultAnnotationWriter() { - @Override - public Iterator imports() { - return new ArrayIterator(JPA.ENTITY, JPA.SECONDARY_TABLE, JPA.SECONDARY_TABLES); - } - @Override - public void appendTypeAnnotationTo(StringBuilder sb) { - sb.append("@Entity"); - sb.append(CR); - sb.append("@SecondaryTables({@SecondaryTable(name = \"FOO\"), @SecondaryTable(name = \"BAR\")})"); - } - }); - } - - private ICompilationUnit createTestEntityWithSecondaryTableAndSecondaryTables() throws Exception { - return this.createTestType(new DefaultAnnotationWriter() { - @Override - public Iterator imports() { - return new ArrayIterator(JPA.ENTITY, JPA.SECONDARY_TABLE, JPA.SECONDARY_TABLES); - } - @Override - public void appendTypeAnnotationTo(StringBuilder sb) { - sb.append("@Entity"); - sb.append(CR); - sb.append("@SecondaryTable(name = \"FOO\")"); - sb.append(CR); - sb.append("@SecondaryTables({@SecondaryTable(name = \"BAR\"), @SecondaryTable(name = \"BAZ\")})"); - } - }); - } - - private ICompilationUnit createTestEntityWithMemberTypes() throws Exception { - return this.createTestType(new DefaultAnnotationWriter() { - @Override - public Iterator imports() { - return new ArrayIterator(JPA.ENTITY); - } - @Override - public void appendTypeAnnotationTo(StringBuilder sb) { - sb.append("@Entity"); - } - @Override - public void appendMemberTypeTo(StringBuilder sb) { - sb.append(" static class FooStatic {}").append(CR); - sb.append(CR); - sb.append(" class FooNotStatic {}").append(CR); - sb.append(CR); - sb.append(" @interface MyAnnotation {}").append(CR); - sb.append(CR); - sb.append(" enum MyEnum {}").append(CR); - } - }); - } - - public void testJavaTypeAnnotations() throws Exception { - ICompilationUnit cu = this.createTestEntityWithTable(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - assertEquals(2, typeResource.annotationsSize()); - } - - public void testJavaTypeAnnotation() throws Exception { - ICompilationUnit cu = this.createTestEntityWithTable(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - assertNotNull(typeResource.getAnnotation(JPA.TABLE)); - } - - public void testJavaTypeAnnotationNull() throws Exception { - ICompilationUnit cu = this.createTestEntity(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - assertNull(typeResource.getAnnotation(JPA.TABLE)); - } - - //This will result in a compilation error, but we assume the first table found - public void testDuplicateAnnotations() throws Exception { - ICompilationUnit cu = this.createTestEntityMultipleTables(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - TableAnnotation tableResource = (TableAnnotation) typeResource.getAnnotation(JPA.TABLE); - assertEquals("FOO", tableResource.getName()); - } - - public void testRemoveTable() throws Exception { - ICompilationUnit cu = this.createTestEntityWithTable(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - typeResource.removeAnnotation(JPA.TABLE); - - assertSourceDoesNotContain("@Table", cu); - } - - public void testRemoveTableName() throws Exception { - ICompilationUnit cu = this.createTestEntityWithTable(); - JavaResourcePersistentType jrpt = buildJavaTypeResource(cu); - - TableAnnotation tableAnnotation = (TableAnnotation) jrpt.getAnnotation(JPA.TABLE); - tableAnnotation.setSchema(null); - assertSourceContains("@Table(name = \"FOO\")", cu); - - tableAnnotation.setName(null); - assertSourceDoesNotContain("(name", cu); - } - - public void testMultipleTypeMappings() throws Exception { - ICompilationUnit cu = this.createTestEntityWithEmbeddable(); - - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - - assertEquals(2, typeResource.annotationsSize()); - assertNotNull(typeResource.getAnnotation(JPA.EMBEDDABLE)); - assertNotNull(typeResource.getAnnotation(JPA.ENTITY)); - - JavaResourceNode javaTypeMappingAnnotation = typeResource.getAnnotation(EmbeddableAnnotation.ANNOTATION_NAME); - assertTrue(javaTypeMappingAnnotation instanceof EmbeddableAnnotation); - assertSourceContains("@Entity", cu); - assertSourceContains("@Embeddable", cu); - - typeResource.setPrimaryAnnotation(JPA.MAPPED_SUPERCLASS, EmptyIterable.instance()); - assertEquals(1, typeResource.annotationsSize()); - javaTypeMappingAnnotation = typeResource.getAnnotation(MappedSuperclassAnnotation.ANNOTATION_NAME); - assertTrue(javaTypeMappingAnnotation instanceof MappedSuperclassAnnotation); - assertSourceDoesNotContain("@Entity", cu); - assertSourceContains("@MappedSuperclass", cu); - assertSourceDoesNotContain("@Embeddable", cu); - } - - public void testSetJavaTypeMappingAnnotation() throws Exception { - ICompilationUnit cu = createTestType(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - assertEquals(0, typeResource.annotationsSize()); - - typeResource.setPrimaryAnnotation(JPA.ENTITY, EmptyIterable.instance()); - assertTrue(typeResource.getAnnotation(EntityAnnotation.ANNOTATION_NAME) instanceof EntityAnnotation); - assertSourceContains("@Entity", cu); - } - - public void testAddJavaTypeAnnotation() throws Exception { - ICompilationUnit cu = createTestEntity(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - - assertSourceDoesNotContain("@Table", cu); - typeResource.addAnnotation(JPA.TABLE); - - assertSourceContains("@Table", cu); - } - - public void testRemoveJavaTypeAnnotation() throws Exception { - ICompilationUnit cu = createTestEntityWithTable(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - assertSourceContains("@Table", cu); - typeResource.removeAnnotation(JPA.TABLE); - assertSourceDoesNotContain("@Table", cu); - } - - //update source code to change from @Entity to @Embeddable and make sure @Table is not removed - public void testChangeTypeMappingInSource() throws Exception { - ICompilationUnit cu = createTestEntityWithTable(); - final JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - - testType(cu).edit(new Editor() { - public void edit(ModifiedDeclaration declaration) { - SourceEntityAnnotation.DECLARATION_ANNOTATION_ADAPTER.removeAnnotation(declaration); - } - }); - - cu.createImport("javax.persistence.Embeddable", null, new NullProgressMonitor()); - - this.testType(cu).edit(new Editor() { - public void edit(ModifiedDeclaration declaration) { - SourceEmbeddableAnnotation.DECLARATION_ANNOTATION_ADAPTER.newMarkerAnnotation(declaration); - } - }); - - assertNotNull(typeResource.getAnnotation(JPA.TABLE)); - assertNull(typeResource.getAnnotation(JPA.ENTITY)); - assertNotNull(typeResource.getAnnotation(JPA.EMBEDDABLE)); - assertSourceContains("@Table", cu); - } - - public void testJavaTypeAnnotationsNestable() throws Exception { - ICompilationUnit cu = createTestEntityWithSecondaryTable(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - - assertEquals(1, CollectionTools.size(typeResource.annotations(JPA.SECONDARY_TABLE, JPA.SECONDARY_TABLES))); - - SecondaryTableAnnotation secondaryTableResource = (SecondaryTableAnnotation) typeResource.annotations(JPA.SECONDARY_TABLE, JPA.SECONDARY_TABLES).next(); - - assertEquals("FOO", secondaryTableResource.getName()); - } - - public void testJavaTypeAnnotationsNoNestable() throws Exception { - ICompilationUnit cu = createTestEntity(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - - assertEquals(0, CollectionTools.size(typeResource.annotations(JPA.SECONDARY_TABLE, JPA.SECONDARY_TABLES))); - } - - public void testJavaTypeAnnotationsContainerNoNestable() throws Exception { - ICompilationUnit cu = createTestEntityWithEmptySecondaryTables(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - - assertEquals(0, CollectionTools.size(typeResource.annotations(JPA.SECONDARY_TABLE, JPA.SECONDARY_TABLES))); - } - - public void testJavaTypeAnnotationsNestableAndContainer() throws Exception { - ICompilationUnit cu = createTestEntityWithSecondaryTableAndSecondaryTables(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - - assertNotNull(typeResource.getAnnotation(JPA.SECONDARY_TABLE)); - assertNotNull(typeResource.getAnnotation(JPA.SECONDARY_TABLES)); - assertEquals(2, CollectionTools.size(typeResource.annotations(JPA.SECONDARY_TABLE, JPA.SECONDARY_TABLES))); - - SecondaryTableAnnotation secondaryTableResource = (SecondaryTableAnnotation) typeResource.annotations(JPA.SECONDARY_TABLE, JPA.SECONDARY_TABLES).next(); - assertEquals("BAR", secondaryTableResource.getName()); - } - - // @Entity -->> @Entity - // @SecondaryTable(name="FOO") - public void testAddJavaTypeAnnotationNestableContainer() throws Exception { - ICompilationUnit cu = createTestEntity(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - SecondaryTableAnnotation secondaryTableResource = (SecondaryTableAnnotation) typeResource.addAnnotation(0, JPA.SECONDARY_TABLE, JPA.SECONDARY_TABLES); - secondaryTableResource.setName("FOO"); - assertSourceContains("@SecondaryTable(name = \"FOO\")", cu); - } - - // @Entity -->> @Entity - // @SecondaryTable(name="FOO") @SecondaryTables({@SecondaryTable(name="FOO"), @SecondaryTable(name="BAR")}) - public void testAddJavaTypeAnnotationNestableContainer2() throws Exception { - ICompilationUnit cu = createTestEntityWithSecondaryTable(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - - SecondaryTableAnnotation secondaryTableResource = (SecondaryTableAnnotation) typeResource.addAnnotation(1, JPA.SECONDARY_TABLE, JPA.SECONDARY_TABLES); - secondaryTableResource.setName("BAR"); - assertSourceContains("@SecondaryTables({@SecondaryTable(name = \"FOO\"),@SecondaryTable(name = \"BAR\")})", cu); - - assertNull(typeResource.getAnnotation(JPA.SECONDARY_TABLE)); - assertNotNull(typeResource.getAnnotation(JPA.SECONDARY_TABLES)); - assertEquals(2, CollectionTools.size(typeResource.annotations(JPA.SECONDARY_TABLE, JPA.SECONDARY_TABLES))); - } - - // @Entity - // @SecondaryTables(@SecondaryTable(name="FOO")) - // || - // \/ - // @Entity - // @SecondaryTables({@SecondaryTable(name="FOO"), @SecondaryTable(name="BAR")}) - public void testAddJavaTypeAnnotationNestableContainer3() throws Exception { - ICompilationUnit cu = createTestEntityWithSecondaryTables(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - - SecondaryTableAnnotation secondaryTableResource = (SecondaryTableAnnotation) typeResource.addAnnotation(1, JPA.SECONDARY_TABLE, JPA.SECONDARY_TABLES); - secondaryTableResource.setName("BAR"); - assertSourceContains("@SecondaryTables({@SecondaryTable(name = \"FOO\"),@SecondaryTable(name = \"BAR\")})", cu); - - assertNull(typeResource.getAnnotation(JPA.SECONDARY_TABLE)); - assertNotNull(typeResource.getAnnotation(JPA.SECONDARY_TABLES)); - assertEquals(2, CollectionTools.size(typeResource.annotations(JPA.SECONDARY_TABLE, JPA.SECONDARY_TABLES))); - } - - public void testAddJavaTypeAnnotationNestableContainer5() throws Exception { - ICompilationUnit cu = createTestEntityWithSecondaryTables(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - - SecondaryTableAnnotation secondaryTableResource = (SecondaryTableAnnotation) typeResource.addAnnotation(0, JPA.SECONDARY_TABLE, JPA.SECONDARY_TABLES); - secondaryTableResource.setName("BAR"); - assertSourceContains("@SecondaryTables({@SecondaryTable(name = \"BAR\"),@SecondaryTable(name = \"FOO\")})", cu); - - assertNull(typeResource.getAnnotation(JPA.SECONDARY_TABLE)); - assertNotNull(typeResource.getAnnotation(JPA.SECONDARY_TABLES)); - assertEquals(2, CollectionTools.size(typeResource.annotations(JPA.SECONDARY_TABLE, JPA.SECONDARY_TABLES))); - } - - public void testAddJavaTypeAnnotationNestableContainer6() throws Exception { - ICompilationUnit cu = createTestEntityWithSecondaryTables(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - - SecondaryTableAnnotation secondaryTableResource = (SecondaryTableAnnotation) typeResource.addAnnotation(0, JPA.SECONDARY_TABLE, JPA.SECONDARY_TABLES); - secondaryTableResource.setName("BAR"); - assertSourceContains("@SecondaryTables({@SecondaryTable(name = \"BAR\"),@SecondaryTable(name = \"FOO\")})", cu); - - assertNull(typeResource.getAnnotation(JPA.SECONDARY_TABLE)); - assertNotNull(typeResource.getAnnotation(JPA.SECONDARY_TABLES)); - assertEquals(2, CollectionTools.size(typeResource.annotations(JPA.SECONDARY_TABLE, JPA.SECONDARY_TABLES))); - - secondaryTableResource = (SecondaryTableAnnotation) typeResource.addAnnotation(0, JPA.SECONDARY_TABLE, JPA.SECONDARY_TABLES); - secondaryTableResource.setName("BAZ"); - assertSourceContains("@SecondaryTables({@SecondaryTable(name = \"BAZ\"),@SecondaryTable(name = \"BAR\"), @SecondaryTable(name = \"FOO\")})", cu); - - assertEquals(3, CollectionTools.size(typeResource.annotations(JPA.SECONDARY_TABLE, JPA.SECONDARY_TABLES))); - } - - // @Entity - // @SecondaryTable(name=\"FOO\") - // @SecondaryTables({@SecondaryTable(name=\"BAR\"), @SecondaryTable(name=\"BAZ\")}) - // || - // \/ - // @Entity - // @SecondaryTable(name=\"FOO\") - // @SecondaryTables({@SecondaryTable(name=\"BAR\"), @SecondaryTable(name=\"BAZ\"), @SecondaryTable(name=\"BOO\")}) - public void testAddJavaTypeAnnotationNestableContainer4() throws Exception { - ICompilationUnit cu = createTestEntityWithSecondaryTableAndSecondaryTables(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - - assertNotNull(typeResource.getAnnotation(JPA.SECONDARY_TABLE)); - assertNotNull(typeResource.getAnnotation(JPA.SECONDARY_TABLES)); - assertEquals(2, CollectionTools.size(typeResource.annotations(JPA.SECONDARY_TABLE, JPA.SECONDARY_TABLES))); - - SecondaryTableAnnotation secondaryTableResource = (SecondaryTableAnnotation) typeResource.addAnnotation(2, JPA.SECONDARY_TABLE, JPA.SECONDARY_TABLES); - assertSourceContains("@SecondaryTables({@SecondaryTable(name = \"BAR\"), @SecondaryTable(name = \"BAZ\"), @SecondaryTable})", cu); - secondaryTableResource.setName("BOO"); - - assertNotNull(typeResource.getAnnotation(JPA.SECONDARY_TABLE)); - assertNotNull(typeResource.getAnnotation(JPA.SECONDARY_TABLES)); - assertEquals(3, CollectionTools.size(typeResource.annotations(JPA.SECONDARY_TABLE, JPA.SECONDARY_TABLES))); - - Iterator secondaryTableAnnotations = typeResource.annotations(JPA.SECONDARY_TABLE, JPA.SECONDARY_TABLES); - secondaryTableResource = (SecondaryTableAnnotation) secondaryTableAnnotations.next(); - assertEquals("BAR", secondaryTableResource.getName()); - secondaryTableResource = (SecondaryTableAnnotation) secondaryTableAnnotations.next(); - assertEquals("BAZ", secondaryTableResource.getName()); - secondaryTableResource = (SecondaryTableAnnotation) secondaryTableAnnotations.next(); - assertEquals("BOO", secondaryTableResource.getName()); - - assertSourceContains("@SecondaryTables({@SecondaryTable(name = \"BAR\"), @SecondaryTable(name = \"BAZ\"), @SecondaryTable(name = \"BOO\")})", cu); - } - - //@Entity - //@SecondaryTable(name="FOO") - public void testRemoveJavaTypeAnnotationNestableContainer() throws Exception { - ICompilationUnit cu = createTestEntityWithSecondaryTable(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - - typeResource.removeAnnotation(0, JPA.SECONDARY_TABLE, JPA.SECONDARY_TABLES); - - assertSourceDoesNotContain("@SecondaryTable", cu); - } - - - //@Entity - //@SecondaryTables(@SecondaryTable(name="FOO")) - public void testRemoveJavaTypeAnnotationNestableContainer2() throws Exception { - ICompilationUnit cu = createTestEntityWithSecondaryTables(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - - typeResource.removeAnnotation(0, JPA.SECONDARY_TABLE, JPA.SECONDARY_TABLES); - - assertSourceDoesNotContain("@SecondaryTable", cu); - assertSourceDoesNotContain("@SecondaryTables", cu); - } - - public void testRemoveJavaTypeAnnotationIndex() throws Exception { - ICompilationUnit cu = createTestEntityWith2SecondaryTables(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - - typeResource.removeAnnotation(0, JPA.SECONDARY_TABLE, JPA.SECONDARY_TABLES); - - assertSourceDoesNotContain("@SecondaryTable(name = \"FOO\"", cu); - assertSourceContains("@SecondaryTable(name = \"BAR\"", cu); - assertSourceDoesNotContain("@SecondaryTables", cu); - } - - public void testRemoveJavaTypeAnnotationIndex2() throws Exception { - ICompilationUnit cu = createTestEntityWith2SecondaryTables(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - - SecondaryTableAnnotation newAnnotation = (SecondaryTableAnnotation)typeResource.addAnnotation(2, JPA.SECONDARY_TABLE, JPA.SECONDARY_TABLES); - newAnnotation.setName("BAZ"); - assertSourceContains("@SecondaryTables({@SecondaryTable(name = \"FOO\"), @SecondaryTable(name = \"BAR\"), @SecondaryTable(name = \"BAZ", cu); - - typeResource.removeAnnotation(1, JPA.SECONDARY_TABLE, JPA.SECONDARY_TABLES); - assertSourceContains("@SecondaryTables({@SecondaryTable(name = \"FOO\"), @SecondaryTable(name = \"BAZ\")})", cu); - } - - public void testMoveJavaTypeAnnotation() throws Exception { - ICompilationUnit cu = createTestEntityWith2SecondaryTables(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - - SecondaryTableAnnotation newAnnotation = (SecondaryTableAnnotation)typeResource.addAnnotation(2, JPA.SECONDARY_TABLE, JPA.SECONDARY_TABLES); - newAnnotation.setName("BAZ"); - assertSourceContains("@SecondaryTables({@SecondaryTable(name = \"FOO\"), @SecondaryTable(name = \"BAR\"), @SecondaryTable(name = \"BAZ\")})", cu); - - typeResource.moveAnnotation(0, 2, JPA.SECONDARY_TABLES); - assertSourceContains("@SecondaryTables({@SecondaryTable(name = \"BAZ\"), @SecondaryTable(name = \"FOO\"), @SecondaryTable(name = \"BAR\")})", cu); - } - - public void testMoveJavaTypeAnnotation2() throws Exception { - ICompilationUnit cu = createTestEntityWith2SecondaryTables(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - - SecondaryTableAnnotation newAnnotation = (SecondaryTableAnnotation)typeResource.addAnnotation(2, JPA.SECONDARY_TABLE, JPA.SECONDARY_TABLES); - newAnnotation.setName("BAZ"); - assertSourceContains("@SecondaryTables({@SecondaryTable(name = \"FOO\"), @SecondaryTable(name = \"BAR\"), @SecondaryTable(name = \"BAZ\")})", cu); - - typeResource.moveAnnotation(2, 0, JPA.SECONDARY_TABLES); - assertSourceContains("@SecondaryTables({@SecondaryTable(name = \"BAR\"), @SecondaryTable(name = \"BAZ\"), @SecondaryTable(name = \"FOO\")})", cu); - } - - public void testNestedTypes() throws Exception { - ICompilationUnit cu = createTestEntityWithMemberTypes(); - JavaResourcePersistentType persistentType = buildJavaTypeResource(cu); - - assertEquals("only persistable types should be returned by #persistableTypes()", 2, CollectionTools.size(persistentType.persistableTypes())); - assertEquals("enums and interfaces should be ignored", 2, CollectionTools.size(persistentType.types())); - } - - public void testDuplicateEntityAnnotations() throws Exception { - ICompilationUnit cu = createTestEntityDuplicates(); - JavaResourcePersistentType persistentType = buildJavaTypeResource(cu); - - EntityAnnotation javaTypeMappingAnnotation = (EntityAnnotation) persistentType.getAnnotation(JPA.ENTITY); - assertEquals("FirstEntity", javaTypeMappingAnnotation.getName()); - - assertEquals(1, persistentType.annotationsSize()); - - javaTypeMappingAnnotation = (EntityAnnotation) persistentType.getAnnotation(EntityAnnotation.ANNOTATION_NAME); - assertEquals("FirstEntity", javaTypeMappingAnnotation.getName()); - - } - - - public void testAttributes() throws Exception { - // TODO - } - - public void testFields() throws Exception { - // TODO - } - - public void testProperties() throws Exception { - // TODO - } - - - //TODO more tests here with superclasses other than Object. - //1. Test where the superclass does not resolve - //2. Test a superclass that does resolve - //3. What about a superclass that is a class file in a jar?? - //4. - public void testGetSuperclassQualifiedName() throws Exception { - ICompilationUnit cu = createTestEntity(); - JavaResourcePersistentType persistentType = buildJavaTypeResource(cu); - - assertEquals("java.lang.Object", persistentType.getSuperclassQualifiedName()); - - } - - public void testIsAnnotated() throws Exception { - ICompilationUnit cu = createTestEntity(); - JavaResourcePersistentType persistentType = buildJavaTypeResource(cu); - - assertTrue(persistentType.isAnnotated()); - - persistentType.removeAnnotation(JPA.ENTITY); - assertFalse(persistentType.isAnnotated()); - - persistentType.addAnnotation(JPA.TABLE); - assertTrue(persistentType.isAnnotated()); - } - - public void testIsMapped() throws Exception { - ICompilationUnit cu = createTestEntity(); - JavaResourcePersistentType persistentType = buildJavaTypeResource(cu); - - assertTrue(persistentType.isMapped()); - - persistentType.removeAnnotation(JPA.ENTITY); - assertFalse(persistentType.isMapped()); - - persistentType.addAnnotation(JPA.TABLE); - assertFalse(persistentType.isMapped()); - - persistentType.addAnnotation(JPA.EMBEDDABLE); - assertTrue(persistentType.isMapped()); - } - - //more detailed tests in JPTToolsTests - public void testIsPersistable() throws Exception { - ICompilationUnit cu = createTestEntity(); - JavaResourcePersistentType persistentType = buildJavaTypeResource(cu); - - assertTrue(persistentType.isPersistable()); - } - - public void testAnnotatedMemberType() throws Exception { - ICompilationUnit cu = this.createTestEntityWithMemberEmbeddable(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - assertNotNull(typeResource.getAnnotation(JPA.ENTITY)); - assertNull(typeResource.getAnnotation(JPA.EMBEDDABLE)); - - JavaResourcePersistentType nestedType = typeResource.persistableTypes().next(); - assertNull(nestedType.getAnnotation(JPA.ENTITY)); - assertNotNull(nestedType.getAnnotation(JPA.EMBEDDABLE)); - } - - public void testInvalidAnnotations() throws Exception { - ICompilationUnit cu = this.createTestInvalidAnnotations(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - assertEquals(0, typeResource.annotationsSize()); - assertEquals(0, typeResource.annotationsSize()); - - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - assertEquals(0, attributeResource.annotationsSize()); - assertEquals(0, attributeResource.annotationsSize()); - } - - public void testGetAccessNoAttributesAnnotated() throws Exception { - ICompilationUnit cu = createTestEntity(); - JavaResourcePersistentType persistentType = buildJavaTypeResource(cu); - - assertNull(JavaResourcePersistentType.Tools.buildAccess(persistentType)); - } - - public void testGetAccessFieldsAnnotated() throws Exception { - ICompilationUnit cu = createTestEntityAnnotatedField(); - JavaResourcePersistentType persistentType = buildJavaTypeResource(cu); - - assertEquals(AccessType.FIELD, JavaResourcePersistentType.Tools.buildAccess(persistentType)); - } - - public void testGetAccessMethodsAnnotated() throws Exception { - ICompilationUnit cu = createTestEntityAnnotatedMethod(); - JavaResourcePersistentType persistentType = buildJavaTypeResource(cu); - - assertEquals(AccessType.PROPERTY, JavaResourcePersistentType.Tools.buildAccess(persistentType)); - } - - public void testGetAccessFieldsAndMethodsAnnotated() throws Exception { - ICompilationUnit cu = createTestEntityAnnotatedFieldAndMethod(); - JavaResourcePersistentType persistentType = buildJavaTypeResource(cu); - - assertEquals(AccessType.FIELD, JavaResourcePersistentType.Tools.buildAccess(persistentType)); - } - - public void testGetAccessNonPersistableMethodAnnotated() throws Exception { - ICompilationUnit cu = createTestEntityAnnotatedNonPersistableMethod(); - JavaResourcePersistentType persistentType = buildJavaTypeResource(cu); - - assertNull(JavaResourcePersistentType.Tools.buildAccess(persistentType)); - } - - public void testGetAccessPersistableMethodAndNonPersistableFieldAnnotated() throws Exception { - ICompilationUnit cu = createTestEntityAnnotatedPersistableMethodNonPersistableField(); - JavaResourcePersistentType persistentType = buildJavaTypeResource(cu); - - assertEquals(AccessType.PROPERTY, JavaResourcePersistentType.Tools.buildAccess(persistentType)); - } - - public void testGetAccessNoPersistableFieldsAnnotated() throws Exception { - ICompilationUnit cu = createTestEntityNoPersistableFields(); - JavaResourcePersistentType persistentType = buildJavaTypeResource(cu); - - assertNull(JavaResourcePersistentType.Tools.buildAccess(persistentType)); - } -} diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/JavaResourceTypeTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/JavaResourceTypeTests.java new file mode 100644 index 0000000000..f32ee74085 --- /dev/null +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/JavaResourceTypeTests.java @@ -0,0 +1,679 @@ +/******************************************************************************* + * Copyright (c) 2007, 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. + * + * Contributors: + * Oracle - initial API and implementation + ******************************************************************************/ +package org.eclipse.jpt.jpa.core.tests.internal.resource.java; + +import java.util.Iterator; + +import org.eclipse.core.runtime.NullProgressMonitor; +import org.eclipse.jdt.core.ICompilationUnit; +import org.eclipse.jpt.common.core.resource.java.JavaResourceField; +import org.eclipse.jpt.common.core.resource.java.JavaResourceNode; +import org.eclipse.jpt.common.core.resource.java.JavaResourceType; +import org.eclipse.jpt.common.core.utility.jdt.ModifiedDeclaration; +import org.eclipse.jpt.common.core.utility.jdt.AnnotatedElement.Editor; +import org.eclipse.jpt.common.utility.internal.CollectionTools; +import org.eclipse.jpt.common.utility.internal.iterables.EmptyIterable; +import org.eclipse.jpt.common.utility.internal.iterators.ArrayIterator; +import org.eclipse.jpt.jpa.core.internal.resource.java.source.SourceEmbeddableAnnotation; +import org.eclipse.jpt.jpa.core.internal.resource.java.source.SourceEntityAnnotation; +import org.eclipse.jpt.jpa.core.resource.java.EmbeddableAnnotation; +import org.eclipse.jpt.jpa.core.resource.java.EntityAnnotation; +import org.eclipse.jpt.jpa.core.resource.java.JPA; +import org.eclipse.jpt.jpa.core.resource.java.MappedSuperclassAnnotation; +import org.eclipse.jpt.jpa.core.resource.java.SecondaryTableAnnotation; +import org.eclipse.jpt.jpa.core.resource.java.TableAnnotation; +import org.eclipse.jpt.jpa.core.tests.internal.resource.java.JpaJavaResourceModelTestCase; + +@SuppressWarnings("nls") +public class JavaResourceTypeTests extends JpaJavaResourceModelTestCase { + + public JavaResourceTypeTests(String name) { + super(name); + } + + private ICompilationUnit createTestEntity() throws Exception { + return this.createTestType(new DefaultAnnotationWriter() { + @Override + public Iterator imports() { + return new ArrayIterator(JPA.ENTITY); + } + @Override + public void appendTypeAnnotationTo(StringBuilder sb) { + sb.append("@Entity"); + } + }); + } + + private ICompilationUnit createTestInvalidAnnotations() throws Exception { + return this.createTestType(new DefaultAnnotationWriter() { + @Override + public Iterator imports() { + return new ArrayIterator("javax.persistence.Foo"); + } + @Override + public void appendTypeAnnotationTo(StringBuilder sb) { + sb.append("@Foo"); + } + + @Override + public void appendIdFieldAnnotationTo(StringBuilder sb) { + sb.append("@Foo"); + } + }); + } + + private ICompilationUnit createTestEntityWithMemberEmbeddable() throws Exception { + return this.createTestType(new DefaultAnnotationWriter() { + @Override + public Iterator imports() { + return new ArrayIterator(JPA.ENTITY, JPA.EMBEDDABLE); + } + @Override + public void appendTypeAnnotationTo(StringBuilder sb) { + sb.append("@Entity"); + } + + @Override + public void appendMemberTypeTo(StringBuilder sb) { + sb.append(" @Embeddable"); + sb.append(CR); + sb.append(" public static class Foo { }").append(CR); + + } + }); + } + + private ICompilationUnit createTestEntityDuplicates() throws Exception { + return this.createTestType(new DefaultAnnotationWriter() { + @Override + public Iterator imports() { + return new ArrayIterator(JPA.ENTITY); + } + @Override + public void appendTypeAnnotationTo(StringBuilder sb) { + sb.append("@Entity(name = \"FirstEntity\")").append(CR); + sb.append("@Entity(name = \"SecondEntity\")"); + } + }); + } + + private ICompilationUnit createTestEntityWithEmbeddable() throws Exception { + return this.createTestType(new DefaultAnnotationWriter() { + @Override + public Iterator imports() { + return new ArrayIterator(JPA.ENTITY, JPA.EMBEDDABLE); + } + @Override + public void appendTypeAnnotationTo(StringBuilder sb) { + sb.append("@Entity"); + sb.append(CR); + sb.append("@Embeddable"); + } + }); + } + + +// private ICompilationUnit createTestEntityLarge(final int i) throws Exception { +// return this.createTestType(new DefaultAnnotationWriter() { +// @Override +// public Iterator imports() { +// return new ArrayIterator(JPA.ENTITY + i); +// } +// @Override +// public void appendTypeAnnotationTo(StringBuilder sb) { +// sb.append("@Entity" + i); +// sb.append(CR); +// } +// @Override +// public String typeName() { +// return TYPE_NAME + i; +// } +// }); +// } +// +// public void testLarge() throws Exception { +// for (int i = START; i <= END; i++) { +// this.createAnnotationAndMembers("Entity" +i, "String name();"); +// } +// +// List cus = new ArrayList(); +// for (int i = START; i <= END; i++) { +// cus.add(createTestEntityLarge(i)); +// } +// long start = System.currentTimeMillis(); +// List resourceTypes = new ArrayList(); +// for (int i = 0; i < END; i++) { +// resourceTypes.add(buildJavaresourceType(cus.get(i))); +// } +// long end = System.currentTimeMillis(); +// +// System.out.println(end-start + "ms"); +// for (int i = 0; i < END; i++) { +// assertEquals(1, CollectionTools.size(resourceTypes.get(i).javaTypeMappingAnnotations())); +// assertNotNull(resourceTypes.get(i).javaTypeMappingAnnotation(JPA.ENTITY + (i+1))); +// } +// +// +//// assertEquals(0, CollectionTools.size(resourceType.javaTypeAnnotations())); +// } + + + + private ICompilationUnit createTestEntityWithTable() throws Exception { + return this.createTestType(new DefaultAnnotationWriter() { + @Override + public Iterator imports() { + return new ArrayIterator(JPA.ENTITY, JPA.TABLE); + } + @Override + public void appendTypeAnnotationTo(StringBuilder sb) { + sb.append("@Entity"); + sb.append(CR); + sb.append("@Table(name = \"FOO\", schema = \"BAR\")"); + } + }); + } + +// private ICompilationUnit createTestEntityWithTableAndIdClass() throws Exception { +// createEntityAnnotation(); +// this.createAnnotationAndMembers("Table", "String name(); String schema();"); +// this.createAnnotationAndMembers("IdClass", "Class value();"); +// return this.createTestType(new DefaultAnnotationWriter() { +// @Override +// public Iterator imports() { +// return new ArrayIterator(JPA.ENTITY, JPA.TABLE, JPA.ID_CLASS); +// } +// @Override +// public void appendTypeAnnotationTo(StringBuilder sb) { +// sb.append("@Entity"); +// sb.append(CR); +// sb.append("@Table"); +// sb.append(CR); +// sb.append("@IdClass"); +// } +// }); +// } +// + + private ICompilationUnit createTestEntityMultipleTables() throws Exception { + return this.createTestType(new DefaultAnnotationWriter() { + @Override + public Iterator imports() { + return new ArrayIterator(JPA.ENTITY, JPA.TABLE); + } + @Override + public void appendTypeAnnotationTo(StringBuilder sb) { + sb.append("@Entity"); + sb.append(CR); + sb.append("@Table(name = \"FOO\")"); + sb.append(CR); + sb.append("@Table(name = \"BAR\")"); + } + }); + } + + private ICompilationUnit createTestEntityWithSecondaryTable() throws Exception { + return this.createTestType(new DefaultAnnotationWriter() { + @Override + public Iterator imports() { + return new ArrayIterator(JPA.ENTITY, JPA.SECONDARY_TABLE); + } + @Override + public void appendTypeAnnotationTo(StringBuilder sb) { + sb.append("@Entity"); + sb.append(CR); + sb.append("@SecondaryTable(name = \"FOO\")"); + } + }); + } + private ICompilationUnit createTestEntityWithEmptySecondaryTables() throws Exception { + return this.createTestType(new DefaultAnnotationWriter() { + @Override + public Iterator imports() { + return new ArrayIterator(JPA.ENTITY, JPA.SECONDARY_TABLES); + } + @Override + public void appendTypeAnnotationTo(StringBuilder sb) { + sb.append("@Entity"); + sb.append(CR); + sb.append("@SecondaryTables()"); + } + }); + } + + private ICompilationUnit createTestEntityWithSecondaryTables() throws Exception { + return this.createTestType(new DefaultAnnotationWriter() { + @Override + public Iterator imports() { + return new ArrayIterator(JPA.ENTITY, JPA.SECONDARY_TABLE, JPA.SECONDARY_TABLES); + } + @Override + public void appendTypeAnnotationTo(StringBuilder sb) { + sb.append("@Entity"); + sb.append(CR); + sb.append("@SecondaryTables(@SecondaryTable(name = \"FOO\"))"); + } + }); + } + + private ICompilationUnit createTestEntityWith2SecondaryTables() throws Exception { + return this.createTestType(new DefaultAnnotationWriter() { + @Override + public Iterator imports() { + return new ArrayIterator(JPA.ENTITY, JPA.SECONDARY_TABLE, JPA.SECONDARY_TABLES); + } + @Override + public void appendTypeAnnotationTo(StringBuilder sb) { + sb.append("@Entity"); + sb.append(CR); + sb.append("@SecondaryTables({@SecondaryTable(name = \"FOO\"), @SecondaryTable(name = \"BAR\")})"); + } + }); + } + + private ICompilationUnit createTestEntityWithMemberTypes() throws Exception { + return this.createTestType(new DefaultAnnotationWriter() { + @Override + public Iterator imports() { + return new ArrayIterator(JPA.ENTITY); + } + @Override + public void appendTypeAnnotationTo(StringBuilder sb) { + sb.append("@Entity"); + } + @Override + public void appendMemberTypeTo(StringBuilder sb) { + sb.append(" static class FooStatic {}").append(CR); + sb.append(CR); + sb.append(" class FooNotStatic {}").append(CR); + sb.append(CR); + sb.append(" @interface MyAnnotation {}").append(CR); + sb.append(CR); + sb.append(" enum MyEnum {}").append(CR); + } + }); + } + + public void testJavaTypeAnnotations() throws Exception { + ICompilationUnit cu = this.createTestEntityWithTable(); + JavaResourceType resourceType = buildJavaResourceType(cu); + assertEquals(2, resourceType.getAnnotationsSize()); + } + + public void testJavaTypeAnnotation() throws Exception { + ICompilationUnit cu = this.createTestEntityWithTable(); + JavaResourceType resourceType = buildJavaResourceType(cu); + assertNotNull(resourceType.getAnnotation(JPA.TABLE)); + } + + public void testJavaTypeAnnotationNull() throws Exception { + ICompilationUnit cu = this.createTestEntity(); + JavaResourceType resourceType = buildJavaResourceType(cu); + assertNull(resourceType.getAnnotation(JPA.TABLE)); + } + + //This will result in a compilation error, but we assume the first table found + public void testDuplicateAnnotations() throws Exception { + ICompilationUnit cu = this.createTestEntityMultipleTables(); + JavaResourceType resourceType = buildJavaResourceType(cu); + TableAnnotation tableResource = (TableAnnotation) resourceType.getAnnotation(JPA.TABLE); + assertEquals("FOO", tableResource.getName()); + } + + public void testRemoveTable() throws Exception { + ICompilationUnit cu = this.createTestEntityWithTable(); + JavaResourceType resourceType = buildJavaResourceType(cu); + resourceType.removeAnnotation(JPA.TABLE); + + assertSourceDoesNotContain("@Table", cu); + } + + public void testRemoveTableName() throws Exception { + ICompilationUnit cu = this.createTestEntityWithTable(); + JavaResourceType resourceType = buildJavaResourceType(cu); + + TableAnnotation tableAnnotation = (TableAnnotation) resourceType.getAnnotation(JPA.TABLE); + tableAnnotation.setSchema(null); + assertSourceContains("@Table(name = \"FOO\")", cu); + + tableAnnotation.setName(null); + assertSourceDoesNotContain("(name", cu); + } + + public void testMultipleTypeMappings() throws Exception { + ICompilationUnit cu = this.createTestEntityWithEmbeddable(); + + JavaResourceType resourceType = buildJavaResourceType(cu); + + assertEquals(2, resourceType.getAnnotationsSize()); + assertNotNull(resourceType.getAnnotation(JPA.EMBEDDABLE)); + assertNotNull(resourceType.getAnnotation(JPA.ENTITY)); + + JavaResourceNode javaTypeMappingAnnotation = resourceType.getAnnotation(EmbeddableAnnotation.ANNOTATION_NAME); + assertTrue(javaTypeMappingAnnotation instanceof EmbeddableAnnotation); + assertSourceContains("@Entity", cu); + assertSourceContains("@Embeddable", cu); + + resourceType.setPrimaryAnnotation(JPA.MAPPED_SUPERCLASS, EmptyIterable.instance()); + assertEquals(1, resourceType.getAnnotationsSize()); + javaTypeMappingAnnotation = resourceType.getAnnotation(MappedSuperclassAnnotation.ANNOTATION_NAME); + assertTrue(javaTypeMappingAnnotation instanceof MappedSuperclassAnnotation); + assertSourceDoesNotContain("@Entity", cu); + assertSourceContains("@MappedSuperclass", cu); + assertSourceDoesNotContain("@Embeddable", cu); + } + + public void testSetJavaTypeMappingAnnotation() throws Exception { + ICompilationUnit cu = createTestType(); + JavaResourceType resourceType = buildJavaResourceType(cu); + assertEquals(0, resourceType.getAnnotationsSize()); + + resourceType.setPrimaryAnnotation(JPA.ENTITY, EmptyIterable.instance()); + assertTrue(resourceType.getAnnotation(EntityAnnotation.ANNOTATION_NAME) instanceof EntityAnnotation); + assertSourceContains("@Entity", cu); + } + + public void testAddJavaTypeAnnotation() throws Exception { + ICompilationUnit cu = createTestEntity(); + JavaResourceType resourceType = buildJavaResourceType(cu); + + assertSourceDoesNotContain("@Table", cu); + resourceType.addAnnotation(JPA.TABLE); + + assertSourceContains("@Table", cu); + } + + public void testRemoveJavaTypeAnnotation() throws Exception { + ICompilationUnit cu = createTestEntityWithTable(); + JavaResourceType resourceType = buildJavaResourceType(cu); + assertSourceContains("@Table", cu); + resourceType.removeAnnotation(JPA.TABLE); + assertSourceDoesNotContain("@Table", cu); + } + + //update source code to change from @Entity to @Embeddable and make sure @Table is not removed + public void testChangeTypeMappingInSource() throws Exception { + ICompilationUnit cu = createTestEntityWithTable(); + final JavaResourceType resourceType = buildJavaResourceType(cu); + + testType(cu).edit(new Editor() { + public void edit(ModifiedDeclaration declaration) { + SourceEntityAnnotation.DECLARATION_ANNOTATION_ADAPTER.removeAnnotation(declaration); + } + }); + + cu.createImport("javax.persistence.Embeddable", null, new NullProgressMonitor()); + + this.testType(cu).edit(new Editor() { + public void edit(ModifiedDeclaration declaration) { + SourceEmbeddableAnnotation.DECLARATION_ANNOTATION_ADAPTER.newMarkerAnnotation(declaration); + } + }); + + assertNotNull(resourceType.getAnnotation(JPA.TABLE)); + assertNull(resourceType.getAnnotation(JPA.ENTITY)); + assertNotNull(resourceType.getAnnotation(JPA.EMBEDDABLE)); + assertSourceContains("@Table", cu); + } + + public void testJavaTypeAnnotationsNestable() throws Exception { + ICompilationUnit cu = createTestEntityWithSecondaryTable(); + JavaResourceType resourceType = buildJavaResourceType(cu); + + assertEquals(1, resourceType.getAnnotationsSize(JPA.SECONDARY_TABLE)); + + SecondaryTableAnnotation secondaryTableResource = (SecondaryTableAnnotation) resourceType.getAnnotations(JPA.SECONDARY_TABLE).iterator().next(); + + assertEquals("FOO", secondaryTableResource.getName()); + } + + public void testJavaTypeAnnotationsNoNestable() throws Exception { + ICompilationUnit cu = createTestEntity(); + JavaResourceType resourceType = buildJavaResourceType(cu); + + assertEquals(0, resourceType.getAnnotationsSize(JPA.SECONDARY_TABLE)); + } + + public void testJavaTypeAnnotationsContainerNoNestable() throws Exception { + ICompilationUnit cu = createTestEntityWithEmptySecondaryTables(); + JavaResourceType resourceType = buildJavaResourceType(cu); + + assertEquals(0, resourceType.getAnnotationsSize(JPA.SECONDARY_TABLE)); + } + + // @Entity -->> @Entity + // @SecondaryTable(name="FOO") + public void testAddJavaTypeAnnotationNestableContainer() throws Exception { + ICompilationUnit cu = createTestEntity(); + JavaResourceType resourceType = buildJavaResourceType(cu); + SecondaryTableAnnotation secondaryTableResource = (SecondaryTableAnnotation) resourceType.addAnnotation(0, JPA.SECONDARY_TABLE); + secondaryTableResource.setName("FOO"); + assertSourceContains("@SecondaryTable(name = \"FOO\")", cu); + } + + // @Entity -->> @Entity + // @SecondaryTable(name="FOO") @SecondaryTables({@SecondaryTable(name="FOO"), @SecondaryTable(name="BAR")}) + public void testAddJavaTypeAnnotationNestableContainer2() throws Exception { + ICompilationUnit cu = createTestEntityWithSecondaryTable(); + JavaResourceType resourceType = buildJavaResourceType(cu); + + SecondaryTableAnnotation secondaryTableResource = (SecondaryTableAnnotation) resourceType.addAnnotation(1, JPA.SECONDARY_TABLE); + secondaryTableResource.setName("BAR"); + assertSourceContains("@SecondaryTables({ @SecondaryTable(name = \"FOO\"), @SecondaryTable(name = \"BAR\") })", cu); + + assertNotNull(resourceType.getAnnotation(0, JPA.SECONDARY_TABLE)); + assertEquals(2, resourceType.getAnnotationsSize(JPA.SECONDARY_TABLE)); + } + + // @Entity + // @SecondaryTables(@SecondaryTable(name="FOO")) + // || + // \/ + // @Entity + // @SecondaryTables({@SecondaryTable(name="FOO"), @SecondaryTable(name="BAR")}) + public void testAddJavaTypeAnnotationNestableContainer3() throws Exception { + ICompilationUnit cu = createTestEntityWithSecondaryTables(); + JavaResourceType resourceType = buildJavaResourceType(cu); + + SecondaryTableAnnotation secondaryTableResource = (SecondaryTableAnnotation) resourceType.addAnnotation(1, JPA.SECONDARY_TABLE); + secondaryTableResource.setName("BAR"); + assertSourceContains("@SecondaryTables({@SecondaryTable(name = \"FOO\"),@SecondaryTable(name = \"BAR\")})", cu); + + assertNotNull(resourceType.getAnnotation(0, JPA.SECONDARY_TABLE)); + assertEquals(2, resourceType.getAnnotationsSize(JPA.SECONDARY_TABLE)); + } + + public void testAddJavaTypeAnnotationNestableContainer5() throws Exception { + ICompilationUnit cu = createTestEntityWithSecondaryTables(); + JavaResourceType resourceType = buildJavaResourceType(cu); + + SecondaryTableAnnotation secondaryTableResource = (SecondaryTableAnnotation) resourceType.addAnnotation(0, JPA.SECONDARY_TABLE); + secondaryTableResource.setName("BAR"); + assertSourceContains("@SecondaryTables({@SecondaryTable(name = \"BAR\"),@SecondaryTable(name = \"FOO\")})", cu); + + assertNotNull(resourceType.getAnnotation(0, JPA.SECONDARY_TABLE)); + assertEquals(2, resourceType.getAnnotationsSize(JPA.SECONDARY_TABLE)); + } + + public void testAddJavaTypeAnnotationNestableContainer6() throws Exception { + ICompilationUnit cu = createTestEntityWithSecondaryTables(); + JavaResourceType resourceType = buildJavaResourceType(cu); + + SecondaryTableAnnotation secondaryTableResource = (SecondaryTableAnnotation) resourceType.addAnnotation(0, JPA.SECONDARY_TABLE); + secondaryTableResource.setName("BAR"); + assertSourceContains("@SecondaryTables({@SecondaryTable(name = \"BAR\"),@SecondaryTable(name = \"FOO\")})", cu); + + assertNotNull(resourceType.getAnnotation(0, JPA.SECONDARY_TABLE)); + assertEquals(2, resourceType.getAnnotationsSize(JPA.SECONDARY_TABLE)); + + secondaryTableResource = (SecondaryTableAnnotation) resourceType.addAnnotation(0, JPA.SECONDARY_TABLE); + secondaryTableResource.setName("BAZ"); + assertSourceContains("@SecondaryTables({@SecondaryTable(name = \"BAZ\"),@SecondaryTable(name = \"BAR\"), @SecondaryTable(name = \"FOO\")})", cu); + + assertEquals(3, resourceType.getAnnotationsSize(JPA.SECONDARY_TABLE)); + } + + + //@Entity + //@SecondaryTable(name="FOO") + public void testRemoveJavaTypeAnnotationNestableContainer() throws Exception { + ICompilationUnit cu = createTestEntityWithSecondaryTable(); + JavaResourceType resourceType = buildJavaResourceType(cu); + + resourceType.removeAnnotation(0, JPA.SECONDARY_TABLE); + + assertSourceDoesNotContain("@SecondaryTable", cu); + } + + + //@Entity + //@SecondaryTables(@SecondaryTable(name="FOO")) + public void testRemoveJavaTypeAnnotationNestableContainer2() throws Exception { + ICompilationUnit cu = createTestEntityWithSecondaryTables(); + JavaResourceType resourceType = buildJavaResourceType(cu); + + resourceType.removeAnnotation(0, JPA.SECONDARY_TABLE); + + assertSourceDoesNotContain("@SecondaryTable(name = \"FOO\")", cu); + assertSourceContains("@SecondaryTables", cu); + } + + public void testRemoveJavaTypeAnnotationIndex() throws Exception { + ICompilationUnit cu = createTestEntityWith2SecondaryTables(); + JavaResourceType resourceType = buildJavaResourceType(cu); + + resourceType.removeAnnotation(0, JPA.SECONDARY_TABLE); + + assertSourceDoesNotContain("@SecondaryTable(name = \"FOO\"", cu); + assertSourceContains("@SecondaryTable(name = \"BAR\"", cu); + assertSourceDoesNotContain("@SecondaryTables", cu); + } + + public void testRemoveJavaTypeAnnotationIndex2() throws Exception { + ICompilationUnit cu = createTestEntityWith2SecondaryTables(); + JavaResourceType resourceType = buildJavaResourceType(cu); + + SecondaryTableAnnotation newAnnotation = (SecondaryTableAnnotation)resourceType.addAnnotation(2, JPA.SECONDARY_TABLE); + newAnnotation.setName("BAZ"); + assertSourceContains("@SecondaryTables({@SecondaryTable(name = \"FOO\"), @SecondaryTable(name = \"BAR\"), @SecondaryTable(name = \"BAZ", cu); + + resourceType.removeAnnotation(1, JPA.SECONDARY_TABLE); + assertSourceContains("@SecondaryTables({@SecondaryTable(name = \"FOO\"), @SecondaryTable(name = \"BAZ\")})", cu); + } + + public void testMoveJavaTypeAnnotation() throws Exception { + ICompilationUnit cu = createTestEntityWith2SecondaryTables(); + JavaResourceType resourceType = buildJavaResourceType(cu); + + SecondaryTableAnnotation newAnnotation = (SecondaryTableAnnotation)resourceType.addAnnotation(2, JPA.SECONDARY_TABLE); + newAnnotation.setName("BAZ"); + assertSourceContains("@SecondaryTables({@SecondaryTable(name = \"FOO\"), @SecondaryTable(name = \"BAR\"), @SecondaryTable(name = \"BAZ\")})", cu); + + resourceType.moveAnnotation(0, 2, JPA.SECONDARY_TABLE); + assertSourceContains("@SecondaryTables({@SecondaryTable(name = \"BAZ\"), @SecondaryTable(name = \"FOO\"), @SecondaryTable(name = \"BAR\")})", cu); + } + + public void testMoveJavaTypeAnnotation2() throws Exception { + ICompilationUnit cu = createTestEntityWith2SecondaryTables(); + JavaResourceType resourceType = buildJavaResourceType(cu); + + SecondaryTableAnnotation newAnnotation = (SecondaryTableAnnotation)resourceType.addAnnotation(2, JPA.SECONDARY_TABLE); + newAnnotation.setName("BAZ"); + assertSourceContains("@SecondaryTables({@SecondaryTable(name = \"FOO\"), @SecondaryTable(name = \"BAR\"), @SecondaryTable(name = \"BAZ\")})", cu); + + resourceType.moveAnnotation(2, 0, JPA.SECONDARY_TABLE); + assertSourceContains("@SecondaryTables({@SecondaryTable(name = \"BAR\"), @SecondaryTable(name = \"BAZ\"), @SecondaryTable(name = \"FOO\")})", cu); + } + + public void testNestedTypes() throws Exception { + ICompilationUnit cu = createTestEntityWithMemberTypes(); + JavaResourceType resourceType = buildJavaResourceType(cu); + + assertEquals("only not classes and interfaces should be returned by #getTypes()", 2, CollectionTools.size(resourceType.getTypes())); + assertEquals("only enums should be returned by #getEnums()", 1, CollectionTools.size(resourceType.getEnums())); + } + + public void testDuplicateEntityAnnotations() throws Exception { + ICompilationUnit cu = createTestEntityDuplicates(); + JavaResourceType resourceType = buildJavaResourceType(cu); + + EntityAnnotation javaTypeMappingAnnotation = (EntityAnnotation) resourceType.getAnnotation(JPA.ENTITY); + assertEquals("FirstEntity", javaTypeMappingAnnotation.getName()); + + assertEquals(1, resourceType.getAnnotationsSize()); + + javaTypeMappingAnnotation = (EntityAnnotation) resourceType.getAnnotation(EntityAnnotation.ANNOTATION_NAME); + assertEquals("FirstEntity", javaTypeMappingAnnotation.getName()); + + } + + + public void testAttributes() throws Exception { + // TODO + } + + public void testFields() throws Exception { + // TODO + } + + public void testProperties() throws Exception { + // TODO + } + + + //TODO more tests here with superclasses other than Object. + //1. Test where the superclass does not resolve + //2. Test a superclass that does resolve + //3. What about a superclass that is a class file in a jar?? + //4. + public void testGetSuperclassQualifiedName() throws Exception { + ICompilationUnit cu = createTestEntity(); + JavaResourceType resourceType = buildJavaResourceType(cu); + + assertEquals("java.lang.Object", resourceType.getSuperclassQualifiedName()); + + } + + public void testIsAnnotated() throws Exception { + ICompilationUnit cu = createTestEntity(); + JavaResourceType resourceType = buildJavaResourceType(cu); + + assertTrue(resourceType.isAnnotated()); + + resourceType.removeAnnotation(JPA.ENTITY); + assertFalse(resourceType.isAnnotated()); + + resourceType.addAnnotation(JPA.TABLE); + assertTrue(resourceType.isAnnotated()); + } + + public void testAnnotatedMemberType() throws Exception { + ICompilationUnit cu = this.createTestEntityWithMemberEmbeddable(); + JavaResourceType resourceType = buildJavaResourceType(cu); + assertNotNull(resourceType.getAnnotation(JPA.ENTITY)); + assertNull(resourceType.getAnnotation(JPA.EMBEDDABLE)); + + JavaResourceType nestedType = resourceType.getTypes().iterator().next(); + assertNull(nestedType.getAnnotation(JPA.ENTITY)); + assertNotNull(nestedType.getAnnotation(JPA.EMBEDDABLE)); + } + + public void testInvalidAnnotations() throws Exception { + ICompilationUnit cu = this.createTestInvalidAnnotations(); + JavaResourceType resourceType = buildJavaResourceType(cu); + assertEquals(0, resourceType.getAnnotationsSize()); + assertEquals(0, resourceType.getAnnotationsSize()); + + JavaResourceField resourceField = resourceType.getFields().iterator().next(); + assertEquals(0, resourceField.getAnnotationsSize()); + assertEquals(0, resourceField.getAnnotationsSize()); + } + +} diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/JoinColumnTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/JoinColumnTests.java index 24492bf2a6..a570ab8bfe 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/JoinColumnTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/JoinColumnTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2009 Oracle. All rights reserved. + * Copyright (c) 2007, 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. @@ -11,10 +11,11 @@ package org.eclipse.jpt.jpa.core.tests.internal.resource.java; import java.util.Iterator; import org.eclipse.jdt.core.ICompilationUnit; +import org.eclipse.jpt.common.core.resource.java.JavaResourceField; +import org.eclipse.jpt.common.core.resource.java.JavaResourceType; +import org.eclipse.jpt.common.utility.internal.CollectionTools; import org.eclipse.jpt.common.utility.internal.iterators.ArrayIterator; 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; @SuppressWarnings("nls") @@ -109,18 +110,18 @@ public class JoinColumnTests extends JpaJavaResourceModelTestCase { public void testGetName() throws Exception { ICompilationUnit cu = this.createTestJoinColumnWithName(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - JoinColumnAnnotation column = (JoinColumnAnnotation) attributeResource.getAnnotation(JPA.JOIN_COLUMN); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); + JoinColumnAnnotation column = (JoinColumnAnnotation) resourceField.getAnnotation(0, JPA.JOIN_COLUMN); assertNotNull(column); assertEquals(COLUMN_NAME, column.getName()); } public void testGetNull() throws Exception { ICompilationUnit cu = this.createTestJoinColumn(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - JoinColumnAnnotation column = (JoinColumnAnnotation) attributeResource.getAnnotation(JPA.JOIN_COLUMN); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); + JoinColumnAnnotation column = (JoinColumnAnnotation) resourceField.getAnnotation(0, JPA.JOIN_COLUMN); assertNotNull(column); assertNull(column.getName()); assertNull(column.getNullable()); @@ -134,9 +135,9 @@ public class JoinColumnTests extends JpaJavaResourceModelTestCase { public void testSetName() throws Exception { ICompilationUnit cu = this.createTestJoinColumn(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - JoinColumnAnnotation column = (JoinColumnAnnotation) attributeResource.getAnnotation(JPA.JOIN_COLUMN); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); + JoinColumnAnnotation column = (JoinColumnAnnotation) resourceField.getAnnotation(0, JPA.JOIN_COLUMN); assertNotNull(column); assertNull(column.getName()); @@ -149,9 +150,9 @@ public class JoinColumnTests extends JpaJavaResourceModelTestCase { public void testSetNameNull() throws Exception { ICompilationUnit cu = this.createTestJoinColumnWithName(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - JoinColumnAnnotation column = (JoinColumnAnnotation) attributeResource.getAnnotation(JPA.JOIN_COLUMN); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); + JoinColumnAnnotation column = (JoinColumnAnnotation) resourceField.getAnnotation(0, JPA.JOIN_COLUMN); assertEquals(COLUMN_NAME, column.getName()); @@ -163,17 +164,17 @@ public class JoinColumnTests extends JpaJavaResourceModelTestCase { public void testGetTable() throws Exception { ICompilationUnit cu = this.createTestJoinColumnWithTable(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - JoinColumnAnnotation column = (JoinColumnAnnotation) attributeResource.getAnnotation(JPA.JOIN_COLUMN); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); + JoinColumnAnnotation column = (JoinColumnAnnotation) resourceField.getAnnotation(0, JPA.JOIN_COLUMN); assertEquals(COLUMN_TABLE, column.getTable()); } public void testSetTable() throws Exception { ICompilationUnit cu = this.createTestJoinColumn(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - JoinColumnAnnotation column = (JoinColumnAnnotation) attributeResource.getAnnotation(JPA.JOIN_COLUMN); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); + JoinColumnAnnotation column = (JoinColumnAnnotation) resourceField.getAnnotation(0, JPA.JOIN_COLUMN); assertNotNull(column); assertNull(column.getTable()); @@ -190,17 +191,17 @@ public class JoinColumnTests extends JpaJavaResourceModelTestCase { public void testGetReferencedColumnName() throws Exception { ICompilationUnit cu = this.createTestJoinColumnWithReferencedColumnName(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - JoinColumnAnnotation column = (JoinColumnAnnotation) attributeResource.getAnnotation(JPA.JOIN_COLUMN); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); + JoinColumnAnnotation column = (JoinColumnAnnotation) resourceField.getAnnotation(0, JPA.JOIN_COLUMN); assertEquals(COLUMN_REFERENCED_COLUMN_NAME, column.getReferencedColumnName()); } public void testSetReferencedColumnName() throws Exception { ICompilationUnit cu = this.createTestJoinColumn(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - JoinColumnAnnotation column = (JoinColumnAnnotation) attributeResource.getAnnotation(JPA.JOIN_COLUMN); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); + JoinColumnAnnotation column = (JoinColumnAnnotation) resourceField.getAnnotation(0, JPA.JOIN_COLUMN); assertNotNull(column); assertNull(column.getReferencedColumnName()); @@ -217,17 +218,17 @@ public class JoinColumnTests extends JpaJavaResourceModelTestCase { public void testGetColumnDefinition() throws Exception { ICompilationUnit cu = this.createTestJoinColumnWithColumnDefinition(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - JoinColumnAnnotation column = (JoinColumnAnnotation) attributeResource.getAnnotation(JPA.JOIN_COLUMN); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); + JoinColumnAnnotation column = (JoinColumnAnnotation) resourceField.getAnnotation(0, JPA.JOIN_COLUMN); assertEquals(COLUMN_COLUMN_DEFINITION, column.getColumnDefinition()); } public void testSetColumnDefinition() throws Exception { ICompilationUnit cu = this.createTestJoinColumn(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - JoinColumnAnnotation column = (JoinColumnAnnotation) attributeResource.getAnnotation(JPA.JOIN_COLUMN); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); + JoinColumnAnnotation column = (JoinColumnAnnotation) resourceField.getAnnotation(0, JPA.JOIN_COLUMN); assertNotNull(column); assertNull(column.getColumnDefinition()); @@ -244,18 +245,18 @@ public class JoinColumnTests extends JpaJavaResourceModelTestCase { public void testGetUnique() throws Exception { ICompilationUnit cu = this.createTestJoinColumnWithBooleanElement("unique"); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - JoinColumnAnnotation column = (JoinColumnAnnotation) attributeResource.getAnnotation(JPA.JOIN_COLUMN); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); + JoinColumnAnnotation column = (JoinColumnAnnotation) resourceField.getAnnotation(0, JPA.JOIN_COLUMN); assertEquals(Boolean.TRUE, column.getUnique()); } public void testSetUnique() throws Exception { ICompilationUnit cu = this.createTestJoinColumn(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - JoinColumnAnnotation column = (JoinColumnAnnotation) attributeResource.getAnnotation(JPA.JOIN_COLUMN); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); + JoinColumnAnnotation column = (JoinColumnAnnotation) resourceField.getAnnotation(0, JPA.JOIN_COLUMN); assertNotNull(column); assertNull(column.getUnique()); @@ -271,18 +272,18 @@ public class JoinColumnTests extends JpaJavaResourceModelTestCase { public void testGetNullable() throws Exception { ICompilationUnit cu = this.createTestJoinColumnWithBooleanElement("nullable"); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - JoinColumnAnnotation column = (JoinColumnAnnotation) attributeResource.getAnnotation(JPA.JOIN_COLUMN); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); + JoinColumnAnnotation column = (JoinColumnAnnotation) resourceField.getAnnotation(0, JPA.JOIN_COLUMN); assertEquals(Boolean.TRUE, column.getNullable()); } public void testSetNullable() throws Exception { ICompilationUnit cu = this.createTestJoinColumn(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - JoinColumnAnnotation column = (JoinColumnAnnotation) attributeResource.getAnnotation(JPA.JOIN_COLUMN); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); + JoinColumnAnnotation column = (JoinColumnAnnotation) resourceField.getAnnotation(0, JPA.JOIN_COLUMN); assertNotNull(column); assertNull(column.getNullable()); @@ -298,18 +299,18 @@ public class JoinColumnTests extends JpaJavaResourceModelTestCase { public void testGetInsertable() throws Exception { ICompilationUnit cu = this.createTestJoinColumnWithBooleanElement("insertable"); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - JoinColumnAnnotation column = (JoinColumnAnnotation) attributeResource.getAnnotation(JPA.JOIN_COLUMN); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); + JoinColumnAnnotation column = (JoinColumnAnnotation) resourceField.getAnnotation(0, JPA.JOIN_COLUMN); assertEquals(Boolean.TRUE, column.getInsertable()); } public void testSetInsertable() throws Exception { ICompilationUnit cu = this.createTestJoinColumn(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - JoinColumnAnnotation column = (JoinColumnAnnotation) attributeResource.getAnnotation(JPA.JOIN_COLUMN); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); + JoinColumnAnnotation column = (JoinColumnAnnotation) resourceField.getAnnotation(0, JPA.JOIN_COLUMN); assertNotNull(column); assertNull(column.getInsertable()); @@ -325,18 +326,18 @@ public class JoinColumnTests extends JpaJavaResourceModelTestCase { public void testGetUpdatable() throws Exception { ICompilationUnit cu = this.createTestJoinColumnWithBooleanElement("updatable"); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - JoinColumnAnnotation column = (JoinColumnAnnotation) attributeResource.getAnnotation(JPA.JOIN_COLUMN); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); + JoinColumnAnnotation column = (JoinColumnAnnotation) resourceField.getAnnotation(0, JPA.JOIN_COLUMN); assertEquals(Boolean.TRUE, column.getUpdatable()); } public void testSetUpdatable() throws Exception { ICompilationUnit cu = this.createTestJoinColumn(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - JoinColumnAnnotation column = (JoinColumnAnnotation) attributeResource.getAnnotation(JPA.JOIN_COLUMN); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); + JoinColumnAnnotation column = (JoinColumnAnnotation) resourceField.getAnnotation(0, JPA.JOIN_COLUMN); assertNotNull(column); assertNull(column.getUpdatable()); diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/JoinColumnsTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/JoinColumnsTests.java index 4ad35369f8..8c568a50fe 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/JoinColumnsTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/JoinColumnsTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2009 Oracle. All rights reserved. + * Copyright (c) 2007, 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,13 +12,14 @@ package org.eclipse.jpt.jpa.core.tests.internal.resource.java; import java.util.Iterator; import org.eclipse.jdt.core.ICompilationUnit; +import org.eclipse.jpt.common.core.resource.java.JavaResourceField; +import org.eclipse.jpt.common.core.resource.java.JavaResourceMember; +import org.eclipse.jpt.common.core.resource.java.JavaResourceType; +import org.eclipse.jpt.common.core.resource.java.NestableAnnotation; import org.eclipse.jpt.common.utility.internal.CollectionTools; import org.eclipse.jpt.common.utility.internal.iterators.ArrayIterator; 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.NestableAnnotation; @SuppressWarnings("nls") public class JoinColumnsTests extends JpaJavaResourceModelTestCase { @@ -123,20 +124,24 @@ public class JoinColumnsTests extends JpaJavaResourceModelTestCase { }); } + private JoinColumnAnnotation joinColumnAt(JavaResourceMember resourceMember, int index) { + return (JoinColumnAnnotation) CollectionTools.get(resourceMember.getAnnotations(JPA.JOIN_COLUMN), index); + } + public void testGetName() throws Exception { ICompilationUnit cu = this.createTestJoinColumnWithName(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - JoinColumnAnnotation column = (JoinColumnAnnotation) attributeResource.annotations(JPA.JOIN_COLUMN, JPA.JOIN_COLUMNS).next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); + JoinColumnAnnotation column = this.joinColumnAt(resourceField, 0); assertNotNull(column); assertEquals(COLUMN_NAME, column.getName()); } public void testGetNull() throws Exception { ICompilationUnit cu = this.createTestJoinColumns(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - JoinColumnAnnotation column = (JoinColumnAnnotation) attributeResource.annotations(JPA.JOIN_COLUMN, JPA.JOIN_COLUMNS).next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); + JoinColumnAnnotation column = this.joinColumnAt(resourceField, 0); assertNotNull(column); assertNull(column.getName()); assertNull(column.getNullable()); @@ -149,9 +154,9 @@ public class JoinColumnsTests extends JpaJavaResourceModelTestCase { public void testSetName() throws Exception { ICompilationUnit cu = this.createTestJoinColumns(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - JoinColumnAnnotation column = (JoinColumnAnnotation) attributeResource.annotations(JPA.JOIN_COLUMN, JPA.JOIN_COLUMNS).next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); + JoinColumnAnnotation column = this.joinColumnAt(resourceField, 0); assertNotNull(column); assertNull(column.getName()); @@ -164,9 +169,9 @@ public class JoinColumnsTests extends JpaJavaResourceModelTestCase { public void testSetNameNull() throws Exception { ICompilationUnit cu = this.createTestJoinColumnWithName(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - JoinColumnAnnotation column = (JoinColumnAnnotation) attributeResource.annotations(JPA.JOIN_COLUMN, JPA.JOIN_COLUMNS).next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); + JoinColumnAnnotation column = this.joinColumnAt(resourceField, 0); assertEquals(COLUMN_NAME, column.getName()); @@ -178,17 +183,17 @@ public class JoinColumnsTests extends JpaJavaResourceModelTestCase { public void testGetTable() throws Exception { ICompilationUnit cu = this.createTestJoinColumnWithTable(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - JoinColumnAnnotation column = (JoinColumnAnnotation) attributeResource.annotations(JPA.JOIN_COLUMN, JPA.JOIN_COLUMNS).next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); + JoinColumnAnnotation column = this.joinColumnAt(resourceField, 0); assertEquals(COLUMN_TABLE, column.getTable()); } public void testSetTable() throws Exception { ICompilationUnit cu = this.createTestJoinColumns(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - JoinColumnAnnotation column = (JoinColumnAnnotation) attributeResource.annotations(JPA.JOIN_COLUMN, JPA.JOIN_COLUMNS).next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); + JoinColumnAnnotation column = this.joinColumnAt(resourceField, 0); assertNotNull(column); assertNull(column.getTable()); @@ -205,17 +210,17 @@ public class JoinColumnsTests extends JpaJavaResourceModelTestCase { public void testGetReferencedColumnName() throws Exception { ICompilationUnit cu = this.createTestJoinColumnWithReferencedColumnName(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - JoinColumnAnnotation column = (JoinColumnAnnotation) attributeResource.annotations(JPA.JOIN_COLUMN, JPA.JOIN_COLUMNS).next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); + JoinColumnAnnotation column = this.joinColumnAt(resourceField, 0); assertEquals(COLUMN_REFERENCED_COLUMN_NAME, column.getReferencedColumnName()); } public void testSetReferencedColumnName() throws Exception { ICompilationUnit cu = this.createTestJoinColumns(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - JoinColumnAnnotation column = (JoinColumnAnnotation) attributeResource.annotations(JPA.JOIN_COLUMN, JPA.JOIN_COLUMNS).next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); + JoinColumnAnnotation column = this.joinColumnAt(resourceField, 0); assertNotNull(column); assertNull(column.getReferencedColumnName()); @@ -232,17 +237,17 @@ public class JoinColumnsTests extends JpaJavaResourceModelTestCase { public void testGetColumnDefinition() throws Exception { ICompilationUnit cu = this.createTestJoinColumnWithColumnDefinition(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - JoinColumnAnnotation column = (JoinColumnAnnotation) attributeResource.annotations(JPA.JOIN_COLUMN, JPA.JOIN_COLUMNS).next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); + JoinColumnAnnotation column = this.joinColumnAt(resourceField, 0); assertEquals(COLUMN_COLUMN_DEFINITION, column.getColumnDefinition()); } public void testSetColumnDefinition() throws Exception { ICompilationUnit cu = this.createTestJoinColumns(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - JoinColumnAnnotation column = (JoinColumnAnnotation) attributeResource.annotations(JPA.JOIN_COLUMN, JPA.JOIN_COLUMNS).next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); + JoinColumnAnnotation column = this.joinColumnAt(resourceField, 0); assertNotNull(column); assertNull(column.getColumnDefinition()); @@ -259,18 +264,18 @@ public class JoinColumnsTests extends JpaJavaResourceModelTestCase { public void testGetUnique() throws Exception { ICompilationUnit cu = this.createTestJoinColumnWithBooleanElement("unique"); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - JoinColumnAnnotation column = (JoinColumnAnnotation) attributeResource.annotations(JPA.JOIN_COLUMN, JPA.JOIN_COLUMNS).next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); + JoinColumnAnnotation column = this.joinColumnAt(resourceField, 0); assertTrue(column.getUnique().booleanValue()); } public void testSetUnique() throws Exception { ICompilationUnit cu = this.createTestJoinColumns(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - JoinColumnAnnotation column = (JoinColumnAnnotation) attributeResource.annotations(JPA.JOIN_COLUMN, JPA.JOIN_COLUMNS).next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); + JoinColumnAnnotation column = this.joinColumnAt(resourceField, 0); assertNotNull(column); assertNull(column.getUnique()); @@ -286,18 +291,18 @@ public class JoinColumnsTests extends JpaJavaResourceModelTestCase { public void testGetNullable() throws Exception { ICompilationUnit cu = this.createTestJoinColumnWithBooleanElement("nullable"); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - JoinColumnAnnotation column = (JoinColumnAnnotation) attributeResource.annotations(JPA.JOIN_COLUMN, JPA.JOIN_COLUMNS).next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); + JoinColumnAnnotation column = this.joinColumnAt(resourceField, 0); assertTrue(column.getNullable().booleanValue()); } public void testSetNullable() throws Exception { ICompilationUnit cu = this.createTestJoinColumns(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - JoinColumnAnnotation column = (JoinColumnAnnotation) attributeResource.annotations(JPA.JOIN_COLUMN, JPA.JOIN_COLUMNS).next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); + JoinColumnAnnotation column = this.joinColumnAt(resourceField, 0); assertNotNull(column); assertNull(column.getNullable()); @@ -313,18 +318,18 @@ public class JoinColumnsTests extends JpaJavaResourceModelTestCase { public void testGetInsertable() throws Exception { ICompilationUnit cu = this.createTestJoinColumnWithBooleanElement("insertable"); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - JoinColumnAnnotation column = (JoinColumnAnnotation) attributeResource.annotations(JPA.JOIN_COLUMN, JPA.JOIN_COLUMNS).next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); + JoinColumnAnnotation column = this.joinColumnAt(resourceField, 0); assertTrue(column.getInsertable().booleanValue()); } public void testSetInsertable() throws Exception { ICompilationUnit cu = this.createTestJoinColumns(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - JoinColumnAnnotation column = (JoinColumnAnnotation) attributeResource.annotations(JPA.JOIN_COLUMN, JPA.JOIN_COLUMNS).next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); + JoinColumnAnnotation column = this.joinColumnAt(resourceField, 0); assertNotNull(column); assertNull(column.getInsertable()); @@ -340,18 +345,18 @@ public class JoinColumnsTests extends JpaJavaResourceModelTestCase { public void testGetUpdatable() throws Exception { ICompilationUnit cu = this.createTestJoinColumnWithBooleanElement("updatable"); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - JoinColumnAnnotation column = (JoinColumnAnnotation) attributeResource.annotations(JPA.JOIN_COLUMN, JPA.JOIN_COLUMNS).next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); + JoinColumnAnnotation column = this.joinColumnAt(resourceField, 0); assertTrue(column.getUpdatable().booleanValue()); } public void testSetUpdatable() throws Exception { ICompilationUnit cu = this.createTestJoinColumns(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - JoinColumnAnnotation column = (JoinColumnAnnotation) attributeResource.annotations(JPA.JOIN_COLUMN, JPA.JOIN_COLUMNS).next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); + JoinColumnAnnotation column = this.joinColumnAt(resourceField, 0); assertNotNull(column); assertNull(column.getUpdatable()); @@ -368,53 +373,74 @@ public class JoinColumnsTests extends JpaJavaResourceModelTestCase { public void testAddJoinColumnCopyExisting() throws Exception { ICompilationUnit cu = createTestJoinColumn(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - JoinColumnAnnotation joinColumn = (JoinColumnAnnotation) attributeResource.addAnnotation(1, JPA.JOIN_COLUMN, JPA.JOIN_COLUMNS); + String expected1 = "@JoinColumns({"; + String expected2 = "@JoinColumn(name = \"BAR\", referencedColumnName = \"REF_NAME\", unique = false, nullable = false, insertable = false, updatable = false, columnDefinition = \"COLUMN_DEF\", table = \"TABLE\"),"; + String expected3 = "@JoinColumn(name = \"FOO\") })"; + JoinColumnAnnotation joinColumn = (JoinColumnAnnotation) resourceField.addAnnotation(1, JPA.JOIN_COLUMN); joinColumn.setName("FOO"); - assertSourceContains("@JoinColumns({@JoinColumn(name = \"BAR\", columnDefinition = \"COLUMN_DEF\", table = \"TABLE\", unique = false, nullable = false, insertable = false, updatable = false, referencedColumnName = \"REF_NAME\"),@JoinColumn(name = \"FOO\")})", cu); - - assertNull(attributeResource.getAnnotation(JPA.JOIN_COLUMN)); - assertNotNull(attributeResource.getAnnotation(JPA.JOIN_COLUMNS)); - assertEquals(2, CollectionTools.size(attributeResource.annotations(JPA.JOIN_COLUMN, JPA.JOIN_COLUMNS))); + assertSourceContains(expected1, cu); + assertSourceContains(expected2, cu); + assertSourceContains(expected3, cu); + + assertNotNull(resourceField.getAnnotation(0, JPA.JOIN_COLUMN)); + assertNotNull(resourceField.getAnnotation(0, JPA.JOIN_COLUMN)); + assertEquals(2, resourceField.getAnnotationsSize(JPA.JOIN_COLUMN)); } public void testAddJoinColumnToBeginningOfList() throws Exception { ICompilationUnit cu = createTestJoinColumn(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - JoinColumnAnnotation joinColumn = (JoinColumnAnnotation) attributeResource.addAnnotation(1, JPA.JOIN_COLUMN, JPA.JOIN_COLUMNS); + String expected1 = "@JoinColumns({"; + String expected2 = "@JoinColumn(name = \"BAR\", referencedColumnName = \"REF_NAME\", unique = false, nullable = false, insertable = false, updatable = false, columnDefinition = \"COLUMN_DEF\", table = \"TABLE\"),"; + String expected3 = "@JoinColumn(name = \"FOO\") })"; + JoinColumnAnnotation joinColumn = (JoinColumnAnnotation) resourceField.addAnnotation(1, JPA.JOIN_COLUMN); joinColumn.setName("FOO"); - assertSourceContains("@JoinColumns({@JoinColumn(name = \"BAR\", columnDefinition = \"COLUMN_DEF\", table = \"TABLE\", unique = false, nullable = false, insertable = false, updatable = false, referencedColumnName = \"REF_NAME\"),@JoinColumn(name = \"FOO\")})", cu); + assertSourceContains(expected1, cu); + assertSourceContains(expected2, cu); + assertSourceContains(expected3, cu); - joinColumn = (JoinColumnAnnotation) attributeResource.addAnnotation(0, JPA.JOIN_COLUMN, JPA.JOIN_COLUMNS); + expected2 = "@JoinColumn(name = \"BAZ\"),"; + expected3 = "@JoinColumn(name = \"BAR\", referencedColumnName = \"REF_NAME\", unique = false, nullable = false, insertable = false, updatable = false, columnDefinition = \"COLUMN_DEF\", table = \"TABLE\"), @JoinColumn(name = \"FOO\") })"; + joinColumn = (JoinColumnAnnotation) resourceField.addAnnotation(0, JPA.JOIN_COLUMN); joinColumn.setName("BAZ"); - assertSourceContains("@JoinColumns({@JoinColumn(name = \"BAZ\"),@JoinColumn(name = \"BAR\", columnDefinition = \"COLUMN_DEF\", table = \"TABLE\", unique = false, nullable = false, insertable = false, updatable = false, referencedColumnName = \"REF_NAME\"), @JoinColumn(name = \"FOO\")})", cu); + assertSourceContains(expected1, cu); + assertSourceContains(expected2, cu); + assertSourceContains(expected3, cu); - Iterator joinColumns = attributeResource.annotations(JPA.JOIN_COLUMN, JPA.JOIN_COLUMNS); + Iterator joinColumns = resourceField.getAnnotations(JPA.JOIN_COLUMN).iterator(); assertEquals("BAZ", ((JoinColumnAnnotation) joinColumns.next()).getName()); assertEquals("BAR", ((JoinColumnAnnotation) joinColumns.next()).getName()); assertEquals("FOO", ((JoinColumnAnnotation) joinColumns.next()).getName()); - assertNull(attributeResource.getAnnotation(JPA.JOIN_COLUMN)); - assertNotNull(attributeResource.getAnnotation(JPA.JOIN_COLUMNS)); - assertEquals(3, CollectionTools.size(attributeResource.annotations(JPA.JOIN_COLUMN, JPA.JOIN_COLUMNS))); + assertNotNull(resourceField.getAnnotation(0, JPA.JOIN_COLUMN)); + assertNotNull(resourceField.getAnnotation(0, JPA.JOIN_COLUMN)); + assertEquals(3, resourceField.getAnnotationsSize(JPA.JOIN_COLUMN)); } public void testRemoveJoinColumnCopyExisting() throws Exception { ICompilationUnit cu = createTestJoinColumn(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - JoinColumnAnnotation joinColumn = (JoinColumnAnnotation) attributeResource.addAnnotation(1, JPA.JOIN_COLUMN, JPA.JOIN_COLUMNS); + String expected1 = "@JoinColumns({"; + String expected2 = "@JoinColumn(name = \"BAR\", referencedColumnName = \"REF_NAME\", unique = false, nullable = false, insertable = false, updatable = false, columnDefinition = \"COLUMN_DEF\", table = \"TABLE\"),"; + String expected3 = "@JoinColumn(name = \"FOO\") })"; + JoinColumnAnnotation joinColumn = (JoinColumnAnnotation) resourceField.addAnnotation(1, JPA.JOIN_COLUMN); joinColumn.setName("FOO"); - assertSourceContains("@JoinColumns({@JoinColumn(name = \"BAR\", columnDefinition = \"COLUMN_DEF\", table = \"TABLE\", unique = false, nullable = false, insertable = false, updatable = false, referencedColumnName = \"REF_NAME\"),@JoinColumn(name = \"FOO\")})", cu); + assertSourceContains(expected1, cu); + assertSourceContains(expected2, cu); + assertSourceContains(expected3, cu); - attributeResource.removeAnnotation(1, JPA.JOIN_COLUMN, JPA.JOIN_COLUMNS); - assertSourceContains("@JoinColumn(name = \"BAR\", columnDefinition = \"COLUMN_DEF\", table = \"TABLE\", unique = false, nullable = false, insertable = false, updatable = false, referencedColumnName = \"REF_NAME\")", cu); + expected1 = "@JoinColumn(name = \"BAR\", referencedColumnName = \"REF_NAME\", unique = false, nullable = false, insertable = false, updatable = false, columnDefinition = \"COLUMN_DEF\", table = \"TABLE\")"; + resourceField.removeAnnotation(1, JPA.JOIN_COLUMN); + assertSourceContains(expected1, cu); + assertSourceDoesNotContain("@JoinColumns", cu); } } diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/JoinTableTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/JoinTableTests.java index c9df5f615a..6bfb8ac293 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/JoinTableTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/JoinTableTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2009 Oracle. All rights reserved. + * Copyright (c) 2007, 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. @@ -11,10 +11,11 @@ package org.eclipse.jpt.jpa.core.tests.internal.resource.java; import java.util.Iterator; import org.eclipse.jdt.core.ICompilationUnit; +import org.eclipse.jpt.common.core.resource.java.JavaResourceField; +import org.eclipse.jpt.common.core.resource.java.JavaResourceType; +import org.eclipse.jpt.common.utility.internal.CollectionTools; import org.eclipse.jpt.common.utility.internal.iterators.ArrayIterator; 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.JoinTableAnnotation; @@ -123,20 +124,20 @@ public class JoinTableTests extends JpaJavaResourceModelTestCase { public void testGetName() throws Exception { ICompilationUnit cu = this.createTestJoinTableWithName(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - JoinTableAnnotation table = (JoinTableAnnotation) attributeResource.getAnnotation(JPA.JOIN_TABLE); + JoinTableAnnotation table = (JoinTableAnnotation) resourceField.getAnnotation(JPA.JOIN_TABLE); assertNotNull(table); assertEquals(TABLE_NAME, table.getName()); } public void testGetNull() throws Exception { ICompilationUnit cu = this.createTestJoinTable(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - JoinTableAnnotation table = (JoinTableAnnotation) attributeResource.getAnnotation(JPA.JOIN_TABLE); + JoinTableAnnotation table = (JoinTableAnnotation) resourceField.getAnnotation(JPA.JOIN_TABLE); assertNotNull(table); assertNull(table.getName()); assertNull(table.getCatalog()); @@ -145,10 +146,10 @@ public class JoinTableTests extends JpaJavaResourceModelTestCase { public void testSetName() throws Exception { ICompilationUnit cu = this.createTestJoinTable(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - JoinTableAnnotation table = (JoinTableAnnotation) attributeResource.getAnnotation(JPA.JOIN_TABLE); + JoinTableAnnotation table = (JoinTableAnnotation) resourceField.getAnnotation(JPA.JOIN_TABLE); assertNotNull(table); assertNull(table.getName()); @@ -160,10 +161,10 @@ public class JoinTableTests extends JpaJavaResourceModelTestCase { public void testSetNameNull() throws Exception { ICompilationUnit cu = this.createTestJoinTableWithName(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - JoinTableAnnotation table = (JoinTableAnnotation) attributeResource.getAnnotation(JPA.JOIN_TABLE); + JoinTableAnnotation table = (JoinTableAnnotation) resourceField.getAnnotation(JPA.JOIN_TABLE); assertEquals(TABLE_NAME, table.getName()); table.setName(null); @@ -174,20 +175,20 @@ public class JoinTableTests extends JpaJavaResourceModelTestCase { public void testGetCatalog() throws Exception { ICompilationUnit cu = this.createTestJoinTableWithCatalog(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - JoinTableAnnotation table = (JoinTableAnnotation) attributeResource.getAnnotation(JPA.JOIN_TABLE); + JoinTableAnnotation table = (JoinTableAnnotation) resourceField.getAnnotation(JPA.JOIN_TABLE); assertNotNull(table); assertEquals(CATALOG_NAME, table.getCatalog()); } public void testSetCatalog() throws Exception { ICompilationUnit cu = this.createTestJoinTable(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - JoinTableAnnotation table = (JoinTableAnnotation) attributeResource.getAnnotation(JPA.JOIN_TABLE); + JoinTableAnnotation table = (JoinTableAnnotation) resourceField.getAnnotation(JPA.JOIN_TABLE); assertNotNull(table); assertNull(table.getCatalog()); @@ -199,10 +200,10 @@ public class JoinTableTests extends JpaJavaResourceModelTestCase { public void testSetCatalogNull() throws Exception { ICompilationUnit cu = this.createTestJoinTableWithCatalog(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - JoinTableAnnotation table = (JoinTableAnnotation) attributeResource.getAnnotation(JPA.JOIN_TABLE); + JoinTableAnnotation table = (JoinTableAnnotation) resourceField.getAnnotation(JPA.JOIN_TABLE); assertEquals(CATALOG_NAME, table.getCatalog()); table.setCatalog(null); @@ -213,20 +214,20 @@ public class JoinTableTests extends JpaJavaResourceModelTestCase { public void testGetSchema() throws Exception { ICompilationUnit cu = this.createTestJoinTableWithSchema(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - JoinTableAnnotation table = (JoinTableAnnotation) attributeResource.getAnnotation(JPA.JOIN_TABLE); + JoinTableAnnotation table = (JoinTableAnnotation) resourceField.getAnnotation(JPA.JOIN_TABLE); assertNotNull(table); assertEquals(SCHEMA_NAME, table.getSchema()); } public void testSetSchema() throws Exception { ICompilationUnit cu = this.createTestJoinTable(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - JoinTableAnnotation table = (JoinTableAnnotation) attributeResource.getAnnotation(JPA.JOIN_TABLE); + JoinTableAnnotation table = (JoinTableAnnotation) resourceField.getAnnotation(JPA.JOIN_TABLE); assertNotNull(table); assertNull(table.getSchema()); @@ -238,10 +239,10 @@ public class JoinTableTests extends JpaJavaResourceModelTestCase { public void testSetSchemaNull() throws Exception { ICompilationUnit cu = this.createTestJoinTableWithSchema(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - JoinTableAnnotation table = (JoinTableAnnotation) attributeResource.getAnnotation(JPA.JOIN_TABLE); + JoinTableAnnotation table = (JoinTableAnnotation) resourceField.getAnnotation(JPA.JOIN_TABLE); assertEquals(SCHEMA_NAME, table.getSchema()); table.setSchema(null); @@ -252,89 +253,89 @@ public class JoinTableTests extends JpaJavaResourceModelTestCase { public void testUniqueConstraints() throws Exception { ICompilationUnit cu = this.createTestJoinTable(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - JoinTableAnnotation table = (JoinTableAnnotation) attributeResource.getAnnotation(JPA.JOIN_TABLE); + JoinTableAnnotation table = (JoinTableAnnotation) resourceField.getAnnotation(JPA.JOIN_TABLE); - assertEquals(0, table.uniqueConstraintsSize()); + assertEquals(0, table.getUniqueConstraintsSize()); } public void testUniqueConstraints2() throws Exception { ICompilationUnit cu = this.createTestJoinTable(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - JoinTableAnnotation table = (JoinTableAnnotation) attributeResource.getAnnotation(JPA.JOIN_TABLE); + JoinTableAnnotation table = (JoinTableAnnotation) resourceField.getAnnotation(JPA.JOIN_TABLE); table.addUniqueConstraint(0); table.addUniqueConstraint(1); - assertEquals(2, table.uniqueConstraintsSize()); + assertEquals(2, table.getUniqueConstraintsSize()); } public void testUniqueConstraints3() throws Exception { ICompilationUnit cu = this.createTestJoinTableWithUniqueConstraints(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - JoinTableAnnotation table = (JoinTableAnnotation) attributeResource.getAnnotation(JPA.JOIN_TABLE); + JoinTableAnnotation table = (JoinTableAnnotation) resourceField.getAnnotation(JPA.JOIN_TABLE); - assertEquals(3, table.uniqueConstraintsSize()); + assertEquals(3, table.getUniqueConstraintsSize()); } public void testAddUniqueConstraint() throws Exception { ICompilationUnit cu = this.createTestJoinTable(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - JoinTableAnnotation table = (JoinTableAnnotation) attributeResource.getAnnotation(JPA.JOIN_TABLE); + JoinTableAnnotation table = (JoinTableAnnotation) resourceField.getAnnotation(JPA.JOIN_TABLE); table.addUniqueConstraint(0).addColumnName("FOO"); table.addUniqueConstraint(1); table.addUniqueConstraint(0).addColumnName("BAR"); - assertEquals("BAR", table.uniqueConstraintAt(0).columnNames().next()); - assertEquals("FOO", table.uniqueConstraintAt(1).columnNames().next()); - assertEquals(0, table.uniqueConstraintAt(2).columnNamesSize()); + assertEquals("BAR", table.uniqueConstraintAt(0).columnNameAt(0)); + assertEquals("FOO", table.uniqueConstraintAt(1).columnNameAt(0)); + assertEquals(0, table.uniqueConstraintAt(2).getColumnNamesSize()); assertSourceContains("@JoinTable(uniqueConstraints = {@UniqueConstraint(columnNames = \"BAR\"),@UniqueConstraint(columnNames = \"FOO\"), @UniqueConstraint})", cu); } public void testRemoveUniqueConstraint() throws Exception { ICompilationUnit cu = this.createTestJoinTableWithUniqueConstraints(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - JoinTableAnnotation table = (JoinTableAnnotation) attributeResource.getAnnotation(JPA.JOIN_TABLE); - assertEquals("BAR", table.uniqueConstraintAt(0).columnNames().next()); - assertEquals("FOO", table.uniqueConstraintAt(1).columnNames().next()); - assertEquals("BAZ", table.uniqueConstraintAt(2).columnNames().next()); - assertEquals(3, table.uniqueConstraintsSize()); + JoinTableAnnotation table = (JoinTableAnnotation) resourceField.getAnnotation(JPA.JOIN_TABLE); + assertEquals("BAR", table.uniqueConstraintAt(0).columnNameAt(0)); + assertEquals("FOO", table.uniqueConstraintAt(1).columnNameAt(0)); + assertEquals("BAZ", table.uniqueConstraintAt(2).columnNameAt(0)); + assertEquals(3, table.getUniqueConstraintsSize()); table.removeUniqueConstraint(1); - assertEquals("BAR", table.uniqueConstraintAt(0).columnNames().next()); - assertEquals("BAZ", table.uniqueConstraintAt(1).columnNames().next()); - assertEquals(2, table.uniqueConstraintsSize()); + assertEquals("BAR", table.uniqueConstraintAt(0).columnNameAt(0)); + assertEquals("BAZ", table.uniqueConstraintAt(1).columnNameAt(0)); + assertEquals(2, table.getUniqueConstraintsSize()); assertSourceContains("@JoinTable(uniqueConstraints = {@UniqueConstraint(columnNames = {\"BAR\"}), @UniqueConstraint(columnNames = {\"BAZ\"})})", cu); table.removeUniqueConstraint(0); - assertEquals("BAZ", table.uniqueConstraintAt(0).columnNames().next()); - assertEquals(1, table.uniqueConstraintsSize()); + assertEquals("BAZ", table.uniqueConstraintAt(0).columnNameAt(0)); + assertEquals(1, table.getUniqueConstraintsSize()); assertSourceContains("@JoinTable(uniqueConstraints = @UniqueConstraint(columnNames = {\"BAZ\"}))", cu); table.removeUniqueConstraint(0); - assertEquals(0, table.uniqueConstraintsSize()); + assertEquals(0, table.getUniqueConstraintsSize()); assertSourceDoesNotContain("@JoinTable(", cu); } public void testMoveUniqueConstraint() throws Exception { ICompilationUnit cu = this.createTestJoinTableWithUniqueConstraints(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - JoinTableAnnotation table = (JoinTableAnnotation) attributeResource.getAnnotation(JPA.JOIN_TABLE); + JoinTableAnnotation table = (JoinTableAnnotation) resourceField.getAnnotation(JPA.JOIN_TABLE); assertSourceContains("@JoinTable(uniqueConstraints = {@UniqueConstraint(columnNames = {\"BAR\"}), @UniqueConstraint(columnNames = {\"FOO\"}), @UniqueConstraint(columnNames = {\"BAZ\"})})", cu); table.moveUniqueConstraint(2, 0); @@ -343,10 +344,10 @@ public class JoinTableTests extends JpaJavaResourceModelTestCase { public void testMoveUniqueConstraint2() throws Exception { ICompilationUnit cu = this.createTestJoinTableWithUniqueConstraints(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - JoinTableAnnotation table = (JoinTableAnnotation) attributeResource.getAnnotation(JPA.JOIN_TABLE); + JoinTableAnnotation table = (JoinTableAnnotation) resourceField.getAnnotation(JPA.JOIN_TABLE); assertSourceContains("@JoinTable(uniqueConstraints = {@UniqueConstraint(columnNames = {\"BAR\"}), @UniqueConstraint(columnNames = {\"FOO\"}), @UniqueConstraint(columnNames = {\"BAZ\"})})", cu); table.moveUniqueConstraint(0, 2); @@ -355,44 +356,44 @@ public class JoinTableTests extends JpaJavaResourceModelTestCase { public void testJoinColumns() throws Exception { ICompilationUnit cu = this.createTestJoinTable(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - JoinTableAnnotation table = (JoinTableAnnotation) attributeResource.getAnnotation(JPA.JOIN_TABLE); + JoinTableAnnotation table = (JoinTableAnnotation) resourceField.getAnnotation(JPA.JOIN_TABLE); - assertEquals(0, table.joinColumnsSize()); + assertEquals(0, table.getJoinColumnsSize()); } public void testJoinColumns2() throws Exception { ICompilationUnit cu = this.createTestJoinTable(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - JoinTableAnnotation table = (JoinTableAnnotation) attributeResource.getAnnotation(JPA.JOIN_TABLE); + JoinTableAnnotation table = (JoinTableAnnotation) resourceField.getAnnotation(JPA.JOIN_TABLE); table.addJoinColumn(0); table.addJoinColumn(1); - assertEquals(2, table.joinColumnsSize()); + assertEquals(2, table.getJoinColumnsSize()); } public void testJoinColumns3() throws Exception { ICompilationUnit cu = this.createTestJoinTableWithJoinColumns(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - JoinTableAnnotation table = (JoinTableAnnotation) attributeResource.getAnnotation(JPA.JOIN_TABLE); + JoinTableAnnotation table = (JoinTableAnnotation) resourceField.getAnnotation(JPA.JOIN_TABLE); - assertEquals(2, table.joinColumnsSize()); + assertEquals(2, table.getJoinColumnsSize()); } public void testAddJoinColumn() throws Exception { ICompilationUnit cu = this.createTestJoinTable(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - JoinTableAnnotation table = (JoinTableAnnotation) attributeResource.getAnnotation(JPA.JOIN_TABLE); + JoinTableAnnotation table = (JoinTableAnnotation) resourceField.getAnnotation(JPA.JOIN_TABLE); table.addJoinColumn(0).setName("FOO"); table.addJoinColumn(1); @@ -406,40 +407,40 @@ public class JoinTableTests extends JpaJavaResourceModelTestCase { public void testRemoveJoinColumn() throws Exception { ICompilationUnit cu = this.createTestJoinTableWithJoinColumns(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - JoinTableAnnotation table = (JoinTableAnnotation) attributeResource.getAnnotation(JPA.JOIN_TABLE); + JoinTableAnnotation table = (JoinTableAnnotation) resourceField.getAnnotation(JPA.JOIN_TABLE); table.addJoinColumn(0).setName("FOO"); assertEquals("FOO", table.joinColumnAt(0).getName()); assertEquals("BAR", table.joinColumnAt(1).getName()); assertNull(table.joinColumnAt(2).getName()); - assertEquals(3, table.joinColumnsSize()); + assertEquals(3, table.getJoinColumnsSize()); table.removeJoinColumn(1); assertEquals("FOO", table.joinColumnAt(0).getName()); assertNull(table.joinColumnAt(1).getName()); - assertEquals(2, table.joinColumnsSize()); + assertEquals(2, table.getJoinColumnsSize()); assertSourceContains("@JoinTable(joinColumns = {@JoinColumn(name = \"FOO\"), @JoinColumn})", cu); table.removeJoinColumn(0); assertNull(table.joinColumnAt(0).getName()); - assertEquals(1, table.joinColumnsSize()); + assertEquals(1, table.getJoinColumnsSize()); assertSourceContains("@JoinTable(joinColumns = @JoinColumn)", cu); table.removeJoinColumn(0); - assertEquals(0, table.joinColumnsSize()); + assertEquals(0, table.getJoinColumnsSize()); assertSourceDoesNotContain("@JoinTable(", cu); } public void testMoveJoinColumn() throws Exception { ICompilationUnit cu = this.createTestJoinTableWithJoinColumns(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - JoinTableAnnotation table = (JoinTableAnnotation) attributeResource.getAnnotation(JPA.JOIN_TABLE); + JoinTableAnnotation table = (JoinTableAnnotation) resourceField.getAnnotation(JPA.JOIN_TABLE); JoinColumnAnnotation joinColumn = table.joinColumnAt(0); joinColumn.setReferencedColumnName("REF_NAME"); joinColumn.setUnique(Boolean.FALSE); @@ -456,16 +457,16 @@ public class JoinTableTests extends JpaJavaResourceModelTestCase { assertEquals("BAR", table.joinColumnAt(0).getName()); assertNull(table.joinColumnAt(1).getName()); assertEquals("FOO", table.joinColumnAt(2).getName()); - assertEquals(3, table.joinColumnsSize()); + assertEquals(3, table.getJoinColumnsSize()); assertSourceContains("@JoinTable(joinColumns = {@JoinColumn(name = \"BAR\", referencedColumnName = \"REF_NAME\", unique = false, nullable = false, insertable = false, updatable = false, columnDefinition = \"COLUMN_DEF\", table = \"TABLE\"), @JoinColumn, @JoinColumn(name = \"FOO\")})", cu); } public void testMoveJoinColumn2() throws Exception { ICompilationUnit cu = this.createTestJoinTableWithJoinColumns(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - JoinTableAnnotation table = (JoinTableAnnotation) attributeResource.getAnnotation(JPA.JOIN_TABLE); + JoinTableAnnotation table = (JoinTableAnnotation) resourceField.getAnnotation(JPA.JOIN_TABLE); JoinColumnAnnotation joinColumn = table.joinColumnAt(0); joinColumn.setReferencedColumnName("REF_NAME"); @@ -485,20 +486,20 @@ public class JoinTableTests extends JpaJavaResourceModelTestCase { assertNull(table.joinColumnAt(0).getName()); assertEquals("FOO", table.joinColumnAt(1).getName()); assertEquals("BAR", table.joinColumnAt(2).getName()); - assertEquals(3, table.joinColumnsSize()); + assertEquals(3, table.getJoinColumnsSize()); assertSourceContains("@JoinTable(joinColumns = {@JoinColumn, @JoinColumn(name = \"FOO\"), @JoinColumn(name = \"BAR\", referencedColumnName = \"REF_NAME\", unique = false, nullable = false, insertable = false, updatable = false, columnDefinition = \"COLUMN_DEF\", table = \"TABLE\")})", cu); } public void testSetJoinColumnName() throws Exception { ICompilationUnit cu = this.createTestJoinTableWithJoinColumns(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - JoinTableAnnotation table = (JoinTableAnnotation) attributeResource.getAnnotation(JPA.JOIN_TABLE); + JoinTableAnnotation table = (JoinTableAnnotation) resourceField.getAnnotation(JPA.JOIN_TABLE); - assertEquals(2, table.joinColumnsSize()); + assertEquals(2, table.getJoinColumnsSize()); - JoinColumnAnnotation joinColumn = table.joinColumns().next(); + JoinColumnAnnotation joinColumn = table.joinColumnAt(0); assertEquals("BAR", joinColumn.getName()); @@ -510,44 +511,43 @@ public class JoinTableTests extends JpaJavaResourceModelTestCase { public void testInverseJoinColumns() throws Exception { ICompilationUnit cu = this.createTestJoinTable(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - JoinTableAnnotation table = (JoinTableAnnotation) attributeResource.getAnnotation(JPA.JOIN_TABLE); + JoinTableAnnotation table = (JoinTableAnnotation) resourceField.getAnnotation(JPA.JOIN_TABLE); - assertEquals(0, table.inverseJoinColumnsSize()); + assertEquals(0, table.getInverseJoinColumnsSize()); } public void testInverseJoinColumns2() throws Exception { ICompilationUnit cu = this.createTestJoinTable(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - JoinTableAnnotation table = (JoinTableAnnotation) attributeResource.getAnnotation(JPA.JOIN_TABLE); + JoinTableAnnotation table = (JoinTableAnnotation) resourceField.getAnnotation(JPA.JOIN_TABLE); table.addInverseJoinColumn(0); table.addInverseJoinColumn(1); - assertEquals(2, table.inverseJoinColumnsSize()); + assertEquals(2, table.getInverseJoinColumnsSize()); } public void testInverseJoinColumns3() throws Exception { ICompilationUnit cu = this.createTestJoinTableWithInverseJoinColumns(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - - JoinTableAnnotation table = (JoinTableAnnotation) attributeResource.getAnnotation(JPA.JOIN_TABLE); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); + JoinTableAnnotation table = (JoinTableAnnotation) resourceField.getAnnotation(JPA.JOIN_TABLE); - assertEquals(2, table.inverseJoinColumnsSize()); + assertEquals(2, table.getInverseJoinColumnsSize()); } public void testAddInverseJoinColumn() throws Exception { ICompilationUnit cu = this.createTestJoinTable(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - JoinTableAnnotation table = (JoinTableAnnotation) attributeResource.getAnnotation(JPA.JOIN_TABLE); + JoinTableAnnotation table = (JoinTableAnnotation) resourceField.getAnnotation(JPA.JOIN_TABLE); table.addInverseJoinColumn(0).setName("FOO"); table.addInverseJoinColumn(1); @@ -561,13 +561,13 @@ public class JoinTableTests extends JpaJavaResourceModelTestCase { public void testRemoveInverseJoinColumn() throws Exception { ICompilationUnit cu = this.createTestJoinTableWithInverseJoinColumns(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - JoinTableAnnotation table = (JoinTableAnnotation) attributeResource.getAnnotation(JPA.JOIN_TABLE); + JoinTableAnnotation table = (JoinTableAnnotation) resourceField.getAnnotation(JPA.JOIN_TABLE); table.addInverseJoinColumn(2).setName("FOO"); - Iterator inverseJoinColumns = table.inverseJoinColumns(); + Iterator inverseJoinColumns = table.getInverseJoinColumns().iterator(); assertEquals("BAR", inverseJoinColumns.next().getName()); assertNull(inverseJoinColumns.next().getName()); assertEquals("FOO", inverseJoinColumns.next().getName()); @@ -575,14 +575,14 @@ public class JoinTableTests extends JpaJavaResourceModelTestCase { table.removeInverseJoinColumn(1); assertSourceContains("@JoinTable(inverseJoinColumns = {@JoinColumn(name = \"BAR\"), @JoinColumn(name = \"FOO\")})", cu); - inverseJoinColumns = table.inverseJoinColumns(); + inverseJoinColumns = table.getInverseJoinColumns().iterator(); assertEquals("BAR", inverseJoinColumns.next().getName()); assertEquals("FOO", inverseJoinColumns.next().getName()); assertFalse(inverseJoinColumns.hasNext()); table.removeInverseJoinColumn(0); assertSourceContains("@JoinTable(inverseJoinColumns = @JoinColumn(name = \"FOO\"))", cu); - inverseJoinColumns = table.inverseJoinColumns(); + inverseJoinColumns = table.getInverseJoinColumns().iterator(); assertEquals("FOO", inverseJoinColumns.next().getName()); assertFalse(inverseJoinColumns.hasNext()); @@ -592,19 +592,19 @@ public class JoinTableTests extends JpaJavaResourceModelTestCase { public void testMoveInverseJoinColumn() throws Exception { ICompilationUnit cu = this.createTestJoinTableWithInverseJoinColumns(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - JoinTableAnnotation table = (JoinTableAnnotation) attributeResource.getAnnotation(JPA.JOIN_TABLE); + JoinTableAnnotation table = (JoinTableAnnotation) resourceField.getAnnotation(JPA.JOIN_TABLE); table.addInverseJoinColumn(0).setName("FOO"); - Iterator inverseJoinColumns = table.inverseJoinColumns(); + Iterator inverseJoinColumns = table.getInverseJoinColumns().iterator(); assertEquals("FOO", inverseJoinColumns.next().getName()); assertEquals("BAR", inverseJoinColumns.next().getName()); assertNull(inverseJoinColumns.next().getName()); table.moveInverseJoinColumn(2, 0); - inverseJoinColumns = table.inverseJoinColumns(); + inverseJoinColumns = table.getInverseJoinColumns().iterator(); assertEquals("BAR", inverseJoinColumns.next().getName()); assertNull(inverseJoinColumns.next().getName()); assertEquals("FOO", inverseJoinColumns.next().getName()); @@ -614,19 +614,19 @@ public class JoinTableTests extends JpaJavaResourceModelTestCase { public void testMoveInverseJoinColumn2() throws Exception { ICompilationUnit cu = this.createTestJoinTableWithInverseJoinColumns(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - JoinTableAnnotation table = (JoinTableAnnotation) attributeResource.getAnnotation(JPA.JOIN_TABLE); + JoinTableAnnotation table = (JoinTableAnnotation) resourceField.getAnnotation(JPA.JOIN_TABLE); table.addInverseJoinColumn(1).setName("FOO"); - Iterator inverseJoinColumns = table.inverseJoinColumns(); + Iterator inverseJoinColumns = table.getInverseJoinColumns().iterator(); assertEquals("BAR", inverseJoinColumns.next().getName()); assertEquals("FOO", inverseJoinColumns.next().getName()); assertNull(inverseJoinColumns.next().getName()); table.moveInverseJoinColumn(0, 2); - inverseJoinColumns = table.inverseJoinColumns(); + inverseJoinColumns = table.getInverseJoinColumns().iterator(); assertNull(inverseJoinColumns.next().getName()); assertEquals("BAR", inverseJoinColumns.next().getName()); assertEquals("FOO", inverseJoinColumns.next().getName()); @@ -636,14 +636,14 @@ public class JoinTableTests extends JpaJavaResourceModelTestCase { public void testSetInverseJoinColumnName() throws Exception { ICompilationUnit cu = this.createTestJoinTableWithInverseJoinColumns(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - JoinTableAnnotation table = (JoinTableAnnotation) attributeResource.getAnnotation(JPA.JOIN_TABLE); + JoinTableAnnotation table = (JoinTableAnnotation) resourceField.getAnnotation(JPA.JOIN_TABLE); - assertEquals(2, table.inverseJoinColumnsSize()); + assertEquals(2, table.getInverseJoinColumnsSize()); - JoinColumnAnnotation joinColumn = table.inverseJoinColumns().next(); + JoinColumnAnnotation joinColumn = table.inverseJoinColumnAt(0); assertEquals("BAR", joinColumn.getName()); diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/JptJavaResourceTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/JptJavaResourceTests.java index e0e7722c3e..cb7d7cc80c 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/JptJavaResourceTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/JptJavaResourceTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2010 Oracle. All rights reserved. + * Copyright (c) 2007, 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. @@ -16,8 +16,8 @@ public class JptJavaResourceTests { public static Test suite() { TestSuite suite = new TestSuite(JptJavaResourceTests.class.getPackage().getName()); - suite.addTestSuite(JavaResourcePersistentTypeTests.class); - suite.addTestSuite(JavaResourcePersistentAttributeTests.class); + suite.addTestSuite(JavaResourceTypeTests.class); + suite.addTestSuite(JavaResourceAttributeTests.class); suite.addTestSuite(JPTToolsTests.class); suite.addTestSuite(AssociationOverrideTests.class); diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/LobTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/LobTests.java index 58c48aa7dc..d660c8103b 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/LobTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/LobTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2009 Oracle. All rights reserved. + * Copyright (c) 2007, 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. @@ -11,10 +11,11 @@ package org.eclipse.jpt.jpa.core.tests.internal.resource.java; import java.util.Iterator; import org.eclipse.jdt.core.ICompilationUnit; +import org.eclipse.jpt.common.core.resource.java.JavaResourceField; +import org.eclipse.jpt.common.core.resource.java.JavaResourceType; +import org.eclipse.jpt.common.utility.internal.CollectionTools; import org.eclipse.jpt.common.utility.internal.iterators.ArrayIterator; 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.LobAnnotation; @SuppressWarnings("nls") @@ -39,10 +40,10 @@ public class LobTests extends JpaJavaResourceModelTestCase { public void testLob() throws Exception { ICompilationUnit cu = this.createTestLob(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - LobAnnotation lob = (LobAnnotation) attributeResource.getAnnotation(JPA.LOB); + LobAnnotation lob = (LobAnnotation) resourceField.getAnnotation(JPA.LOB); assertNotNull(lob); } diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/ManyToManyTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/ManyToManyTests.java index 9907f97c7c..fae22f1be4 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/ManyToManyTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/ManyToManyTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2009 Oracle. All rights reserved. + * Copyright (c) 2007, 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. @@ -11,11 +11,12 @@ package org.eclipse.jpt.jpa.core.tests.internal.resource.java; import java.util.Iterator; import org.eclipse.jdt.core.ICompilationUnit; +import org.eclipse.jpt.common.core.resource.java.JavaResourceField; +import org.eclipse.jpt.common.core.resource.java.JavaResourceType; +import org.eclipse.jpt.common.utility.internal.CollectionTools; import org.eclipse.jpt.common.utility.internal.iterators.ArrayIterator; import org.eclipse.jpt.jpa.core.resource.java.FetchType; 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.ManyToManyAnnotation; @SuppressWarnings("nls") @@ -118,28 +119,28 @@ public class ManyToManyTests extends JpaJavaResourceModelTestCase { public void testManyToMany() throws Exception { ICompilationUnit cu = this.createTestManyToMany(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - ManyToManyAnnotation manyToMany = (ManyToManyAnnotation) attributeResource.getAnnotation(JPA.MANY_TO_MANY); + ManyToManyAnnotation manyToMany = (ManyToManyAnnotation) resourceField.getAnnotation(JPA.MANY_TO_MANY); assertNotNull(manyToMany); } public void testGetFetch() throws Exception { ICompilationUnit cu = this.createTestManyToManyWithFetch(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - ManyToManyAnnotation manyToMany = (ManyToManyAnnotation) attributeResource.getAnnotation(JPA.MANY_TO_MANY); + ManyToManyAnnotation manyToMany = (ManyToManyAnnotation) resourceField.getAnnotation(JPA.MANY_TO_MANY); assertEquals(FetchType.EAGER, manyToMany.getFetch()); } public void testSetFetch() throws Exception { ICompilationUnit cu = this.createTestManyToManyWithFetch(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - ManyToManyAnnotation manyToMany = (ManyToManyAnnotation) attributeResource.getAnnotation(JPA.MANY_TO_MANY); + ManyToManyAnnotation manyToMany = (ManyToManyAnnotation) resourceField.getAnnotation(JPA.MANY_TO_MANY); assertEquals(FetchType.EAGER, manyToMany.getFetch()); manyToMany.setFetch(FetchType.LAZY); @@ -150,10 +151,10 @@ public class ManyToManyTests extends JpaJavaResourceModelTestCase { public void testSetFetchNull() throws Exception { ICompilationUnit cu = this.createTestManyToManyWithFetch(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - ManyToManyAnnotation manyToMany = (ManyToManyAnnotation) attributeResource.getAnnotation(JPA.MANY_TO_MANY); + ManyToManyAnnotation manyToMany = (ManyToManyAnnotation) resourceField.getAnnotation(JPA.MANY_TO_MANY); assertEquals(FetchType.EAGER, manyToMany.getFetch()); manyToMany.setFetch(null); @@ -165,19 +166,19 @@ public class ManyToManyTests extends JpaJavaResourceModelTestCase { public void testGetTargetEntity() throws Exception { ICompilationUnit cu = this.createTestManyToManyWithTargetEntity(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - ManyToManyAnnotation manyToMany = (ManyToManyAnnotation) attributeResource.getAnnotation(JPA.MANY_TO_MANY); + ManyToManyAnnotation manyToMany = (ManyToManyAnnotation) resourceField.getAnnotation(JPA.MANY_TO_MANY); assertEquals(TYPE_NAME, manyToMany.getTargetEntity()); } public void testSetTargetEntity() throws Exception { ICompilationUnit cu = this.createTestManyToManyWithTargetEntity(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - ManyToManyAnnotation manyToMany = (ManyToManyAnnotation) attributeResource.getAnnotation(JPA.MANY_TO_MANY); + ManyToManyAnnotation manyToMany = (ManyToManyAnnotation) resourceField.getAnnotation(JPA.MANY_TO_MANY); assertEquals(TYPE_NAME, manyToMany.getTargetEntity()); manyToMany.setTargetEntity("Foo"); @@ -187,10 +188,10 @@ public class ManyToManyTests extends JpaJavaResourceModelTestCase { public void testSetTargetEntityNull() throws Exception { ICompilationUnit cu = this.createTestManyToManyWithTargetEntity(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - ManyToManyAnnotation manyToMany = (ManyToManyAnnotation) attributeResource.getAnnotation(JPA.MANY_TO_MANY); + ManyToManyAnnotation manyToMany = (ManyToManyAnnotation) resourceField.getAnnotation(JPA.MANY_TO_MANY); assertEquals(TYPE_NAME, manyToMany.getTargetEntity()); manyToMany.setTargetEntity(null); @@ -202,10 +203,10 @@ public class ManyToManyTests extends JpaJavaResourceModelTestCase { public void testGetFullyQualifiedTargetEntity() throws Exception { ICompilationUnit cu = this.createTestManyToManyWithTargetEntity(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - ManyToManyAnnotation manyToMany = (ManyToManyAnnotation) attributeResource.getAnnotation(JPA.MANY_TO_MANY); + ManyToManyAnnotation manyToMany = (ManyToManyAnnotation) resourceField.getAnnotation(JPA.MANY_TO_MANY); assertEquals(FULLY_QUALIFIED_TYPE_NAME, manyToMany.getFullyQualifiedTargetEntityClassName()); manyToMany.setTargetEntity("Foo"); @@ -219,28 +220,28 @@ public class ManyToManyTests extends JpaJavaResourceModelTestCase { public void testGetMappedBy() throws Exception { ICompilationUnit cu = this.createTestManyToManyWithMappedBy(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - ManyToManyAnnotation manyToMany = (ManyToManyAnnotation) attributeResource.getAnnotation(JPA.MANY_TO_MANY); + ManyToManyAnnotation manyToMany = (ManyToManyAnnotation) resourceField.getAnnotation(JPA.MANY_TO_MANY); assertEquals("foo", manyToMany.getMappedBy()); } public void testGetMappedByNull() throws Exception { ICompilationUnit cu = this.createTestManyToMany(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - ManyToManyAnnotation manyToMany = (ManyToManyAnnotation) attributeResource.getAnnotation(JPA.MANY_TO_MANY); + ManyToManyAnnotation manyToMany = (ManyToManyAnnotation) resourceField.getAnnotation(JPA.MANY_TO_MANY); assertEquals(null, manyToMany.getMappedBy()); } public void testSetMappedBy() throws Exception { ICompilationUnit cu = this.createTestManyToMany(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - ManyToManyAnnotation manyToMany = (ManyToManyAnnotation) attributeResource.getAnnotation(JPA.MANY_TO_MANY); + ManyToManyAnnotation manyToMany = (ManyToManyAnnotation) resourceField.getAnnotation(JPA.MANY_TO_MANY); assertNull(manyToMany.getMappedBy()); manyToMany.setMappedBy("bar"); assertEquals("bar", manyToMany.getMappedBy()); @@ -250,10 +251,10 @@ public class ManyToManyTests extends JpaJavaResourceModelTestCase { public void testSetMappedByNull() throws Exception { ICompilationUnit cu = this.createTestManyToManyWithMappedBy(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - ManyToManyAnnotation manyToMany = (ManyToManyAnnotation) attributeResource.getAnnotation(JPA.MANY_TO_MANY); + ManyToManyAnnotation manyToMany = (ManyToManyAnnotation) resourceField.getAnnotation(JPA.MANY_TO_MANY); assertEquals("foo", manyToMany.getMappedBy()); manyToMany.setMappedBy(null); @@ -265,10 +266,10 @@ public class ManyToManyTests extends JpaJavaResourceModelTestCase { public void testSetCascadeAll() throws Exception { ICompilationUnit cu = this.createTestManyToMany(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - ManyToManyAnnotation manyToMany = (ManyToManyAnnotation) attributeResource.getAnnotation(JPA.MANY_TO_MANY); + ManyToManyAnnotation manyToMany = (ManyToManyAnnotation) resourceField.getAnnotation(JPA.MANY_TO_MANY); assertFalse(manyToMany.isCascadeAll()); manyToMany.setCascadeAll(true); @@ -279,10 +280,10 @@ public class ManyToManyTests extends JpaJavaResourceModelTestCase { public void testSetCascadeMerge() throws Exception { ICompilationUnit cu = this.createTestManyToMany(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - ManyToManyAnnotation manyToMany = (ManyToManyAnnotation) attributeResource.getAnnotation(JPA.MANY_TO_MANY); + ManyToManyAnnotation manyToMany = (ManyToManyAnnotation) resourceField.getAnnotation(JPA.MANY_TO_MANY); assertFalse(manyToMany.isCascadeMerge()); manyToMany.setCascadeMerge(true); @@ -293,10 +294,10 @@ public class ManyToManyTests extends JpaJavaResourceModelTestCase { public void testSetCascadePersist() throws Exception { ICompilationUnit cu = this.createTestManyToMany(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - ManyToManyAnnotation manyToMany = (ManyToManyAnnotation) attributeResource.getAnnotation(JPA.MANY_TO_MANY); + ManyToManyAnnotation manyToMany = (ManyToManyAnnotation) resourceField.getAnnotation(JPA.MANY_TO_MANY); assertFalse(manyToMany.isCascadePersist()); manyToMany.setCascadePersist(true); @@ -307,10 +308,10 @@ public class ManyToManyTests extends JpaJavaResourceModelTestCase { public void testSetCascadeRemove() throws Exception { ICompilationUnit cu = this.createTestManyToMany(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - ManyToManyAnnotation manyToMany = (ManyToManyAnnotation) attributeResource.getAnnotation(JPA.MANY_TO_MANY); + ManyToManyAnnotation manyToMany = (ManyToManyAnnotation) resourceField.getAnnotation(JPA.MANY_TO_MANY); assertFalse(manyToMany.isCascadeRemove()); manyToMany.setCascadeRemove(true); @@ -321,10 +322,10 @@ public class ManyToManyTests extends JpaJavaResourceModelTestCase { public void testSetCascadeRefresh() throws Exception { ICompilationUnit cu = this.createTestManyToMany(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - ManyToManyAnnotation manyToMany = (ManyToManyAnnotation) attributeResource.getAnnotation(JPA.MANY_TO_MANY); + ManyToManyAnnotation manyToMany = (ManyToManyAnnotation) resourceField.getAnnotation(JPA.MANY_TO_MANY); assertFalse(manyToMany.isCascadeRefresh()); manyToMany.setCascadeRefresh(true); @@ -335,10 +336,10 @@ public class ManyToManyTests extends JpaJavaResourceModelTestCase { public void testCascadeMoreThanOnce() throws Exception { ICompilationUnit cu = this.createTestManyToManyWithCascade(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - ManyToManyAnnotation manyToMany = (ManyToManyAnnotation) attributeResource.getAnnotation(JPA.MANY_TO_MANY); + ManyToManyAnnotation manyToMany = (ManyToManyAnnotation) resourceField.getAnnotation(JPA.MANY_TO_MANY); assertTrue(manyToMany.isCascadeAll()); manyToMany.setCascadeAll(true); @@ -360,10 +361,10 @@ public class ManyToManyTests extends JpaJavaResourceModelTestCase { public void testDuplicateCascade() throws Exception { ICompilationUnit cu = this.createTestManyToManyWithDuplicateCascade(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - ManyToManyAnnotation manyToMany = (ManyToManyAnnotation) attributeResource.getAnnotation(JPA.MANY_TO_MANY); + ManyToManyAnnotation manyToMany = (ManyToManyAnnotation) resourceField.getAnnotation(JPA.MANY_TO_MANY); assertTrue(manyToMany.isCascadeMerge()); manyToMany.setCascadeMerge(false); //TODO should the resource model handle this and remove both MERGE @@ -378,10 +379,10 @@ public class ManyToManyTests extends JpaJavaResourceModelTestCase { public void testMultipleCascade() throws Exception { ICompilationUnit cu = this.createTestManyToManyWithMultipleCascade(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - ManyToManyAnnotation manyToMany = (ManyToManyAnnotation) attributeResource.getAnnotation(JPA.MANY_TO_MANY); + ManyToManyAnnotation manyToMany = (ManyToManyAnnotation) resourceField.getAnnotation(JPA.MANY_TO_MANY); assertTrue(manyToMany.isCascadeMerge()); assertTrue(manyToMany.isCascadeRemove()); diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/ManyToOneTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/ManyToOneTests.java index 23b7fa4f8a..d221a7a029 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/ManyToOneTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/ManyToOneTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2009 Oracle. All rights reserved. + * Copyright (c) 2007, 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. @@ -11,11 +11,12 @@ package org.eclipse.jpt.jpa.core.tests.internal.resource.java; import java.util.Iterator; import org.eclipse.jdt.core.ICompilationUnit; +import org.eclipse.jpt.common.core.resource.java.JavaResourceField; +import org.eclipse.jpt.common.core.resource.java.JavaResourceType; +import org.eclipse.jpt.common.utility.internal.CollectionTools; import org.eclipse.jpt.common.utility.internal.iterators.ArrayIterator; import org.eclipse.jpt.jpa.core.resource.java.FetchType; 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.ManyToOneAnnotation; @SuppressWarnings("nls") @@ -118,28 +119,28 @@ public class ManyToOneTests extends JpaJavaResourceModelTestCase { public void testManyToOne() throws Exception { ICompilationUnit cu = this.createTestManyToOne(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - ManyToOneAnnotation manyToOne = (ManyToOneAnnotation) attributeResource.getAnnotation(JPA.MANY_TO_ONE); + ManyToOneAnnotation manyToOne = (ManyToOneAnnotation) resourceField.getAnnotation(JPA.MANY_TO_ONE); assertNotNull(manyToOne); } public void testGetFetch() throws Exception { ICompilationUnit cu = this.createTestManyToOneWithFetch(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - ManyToOneAnnotation manyToOne = (ManyToOneAnnotation) attributeResource.getAnnotation(JPA.MANY_TO_ONE); + ManyToOneAnnotation manyToOne = (ManyToOneAnnotation) resourceField.getAnnotation(JPA.MANY_TO_ONE); assertEquals(FetchType.EAGER, manyToOne.getFetch()); } public void testSetFetch() throws Exception { ICompilationUnit cu = this.createTestManyToOneWithFetch(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - ManyToOneAnnotation manyToOne = (ManyToOneAnnotation) attributeResource.getAnnotation(JPA.MANY_TO_ONE); + ManyToOneAnnotation manyToOne = (ManyToOneAnnotation) resourceField.getAnnotation(JPA.MANY_TO_ONE); assertEquals(FetchType.EAGER, manyToOne.getFetch()); manyToOne.setFetch(FetchType.LAZY); @@ -150,10 +151,10 @@ public class ManyToOneTests extends JpaJavaResourceModelTestCase { public void testSetFetchNull() throws Exception { ICompilationUnit cu = this.createTestManyToOneWithFetch(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - ManyToOneAnnotation manyToOne = (ManyToOneAnnotation) attributeResource.getAnnotation(JPA.MANY_TO_ONE); + ManyToOneAnnotation manyToOne = (ManyToOneAnnotation) resourceField.getAnnotation(JPA.MANY_TO_ONE); assertEquals(FetchType.EAGER, manyToOne.getFetch()); manyToOne.setFetch(null); @@ -166,19 +167,19 @@ public class ManyToOneTests extends JpaJavaResourceModelTestCase { public void testGetTargetEntity() throws Exception { ICompilationUnit cu = this.createTestManyToOneWithTargetEntity(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - ManyToOneAnnotation manyToOne = (ManyToOneAnnotation) attributeResource.getAnnotation(JPA.MANY_TO_ONE); + ManyToOneAnnotation manyToOne = (ManyToOneAnnotation) resourceField.getAnnotation(JPA.MANY_TO_ONE); assertEquals(TYPE_NAME, manyToOne.getTargetEntity()); } public void testSetTargetEntity() throws Exception { ICompilationUnit cu = this.createTestManyToOneWithTargetEntity(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - ManyToOneAnnotation manyToOne = (ManyToOneAnnotation) attributeResource.getAnnotation(JPA.MANY_TO_ONE); + ManyToOneAnnotation manyToOne = (ManyToOneAnnotation) resourceField.getAnnotation(JPA.MANY_TO_ONE); assertEquals(TYPE_NAME, manyToOne.getTargetEntity()); manyToOne.setTargetEntity("Foo"); @@ -188,10 +189,10 @@ public class ManyToOneTests extends JpaJavaResourceModelTestCase { public void testSetTargetEntityNull() throws Exception { ICompilationUnit cu = this.createTestManyToOneWithTargetEntity(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - ManyToOneAnnotation manyToOne = (ManyToOneAnnotation) attributeResource.getAnnotation(JPA.MANY_TO_ONE); + ManyToOneAnnotation manyToOne = (ManyToOneAnnotation) resourceField.getAnnotation(JPA.MANY_TO_ONE); assertEquals(TYPE_NAME, manyToOne.getTargetEntity()); manyToOne.setTargetEntity(null); @@ -203,10 +204,10 @@ public class ManyToOneTests extends JpaJavaResourceModelTestCase { public void testGetFullyQualifiedTargetEntity() throws Exception { ICompilationUnit cu = this.createTestManyToOneWithTargetEntity(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - ManyToOneAnnotation manyToOne = (ManyToOneAnnotation) attributeResource.getAnnotation(JPA.MANY_TO_ONE); + ManyToOneAnnotation manyToOne = (ManyToOneAnnotation) resourceField.getAnnotation(JPA.MANY_TO_ONE); assertEquals(FULLY_QUALIFIED_TYPE_NAME, manyToOne.getFullyQualifiedTargetEntityClassName()); manyToOne.setTargetEntity("Foo"); @@ -220,19 +221,19 @@ public class ManyToOneTests extends JpaJavaResourceModelTestCase { public void testGetOptional() throws Exception { ICompilationUnit cu = this.createTestManyToOneWithOptional(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - ManyToOneAnnotation manyToOne = (ManyToOneAnnotation) attributeResource.getAnnotation(JPA.MANY_TO_ONE); + ManyToOneAnnotation manyToOne = (ManyToOneAnnotation) resourceField.getAnnotation(JPA.MANY_TO_ONE); assertEquals(Boolean.TRUE, manyToOne.getOptional()); } public void testSetOptional() throws Exception { ICompilationUnit cu = this.createTestManyToOneWithOptional(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - ManyToOneAnnotation manyToOne = (ManyToOneAnnotation) attributeResource.getAnnotation(JPA.MANY_TO_ONE); + ManyToOneAnnotation manyToOne = (ManyToOneAnnotation) resourceField.getAnnotation(JPA.MANY_TO_ONE); assertEquals(Boolean.TRUE, manyToOne.getOptional()); manyToOne.setOptional(Boolean.FALSE); @@ -243,10 +244,10 @@ public class ManyToOneTests extends JpaJavaResourceModelTestCase { public void testSetOptionalNull() throws Exception { ICompilationUnit cu = this.createTestManyToOneWithOptional(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - ManyToOneAnnotation manyToOne = (ManyToOneAnnotation) attributeResource.getAnnotation(JPA.MANY_TO_ONE); + ManyToOneAnnotation manyToOne = (ManyToOneAnnotation) resourceField.getAnnotation(JPA.MANY_TO_ONE); assertEquals(Boolean.TRUE, manyToOne.getOptional()); manyToOne.setOptional(null); @@ -258,10 +259,10 @@ public class ManyToOneTests extends JpaJavaResourceModelTestCase { public void testSetCascadeAll() throws Exception { ICompilationUnit cu = this.createTestManyToOne(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - ManyToOneAnnotation manyToOne = (ManyToOneAnnotation) attributeResource.getAnnotation(JPA.MANY_TO_ONE); + ManyToOneAnnotation manyToOne = (ManyToOneAnnotation) resourceField.getAnnotation(JPA.MANY_TO_ONE); assertFalse(manyToOne.isCascadeAll()); manyToOne.setCascadeAll(true); @@ -272,10 +273,10 @@ public class ManyToOneTests extends JpaJavaResourceModelTestCase { public void testSetCascadeMerge() throws Exception { ICompilationUnit cu = this.createTestManyToOne(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - ManyToOneAnnotation manyToOne = (ManyToOneAnnotation) attributeResource.getAnnotation(JPA.MANY_TO_ONE); + ManyToOneAnnotation manyToOne = (ManyToOneAnnotation) resourceField.getAnnotation(JPA.MANY_TO_ONE); assertFalse(manyToOne.isCascadeMerge()); manyToOne.setCascadeMerge(true); @@ -286,10 +287,10 @@ public class ManyToOneTests extends JpaJavaResourceModelTestCase { public void testSetCascadePersist() throws Exception { ICompilationUnit cu = this.createTestManyToOne(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - ManyToOneAnnotation manyToOne = (ManyToOneAnnotation) attributeResource.getAnnotation(JPA.MANY_TO_ONE); + ManyToOneAnnotation manyToOne = (ManyToOneAnnotation) resourceField.getAnnotation(JPA.MANY_TO_ONE); assertFalse(manyToOne.isCascadePersist()); manyToOne.setCascadePersist(true); @@ -300,10 +301,10 @@ public class ManyToOneTests extends JpaJavaResourceModelTestCase { public void testSetCascadeRemove() throws Exception { ICompilationUnit cu = this.createTestManyToOne(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - ManyToOneAnnotation manyToOne = (ManyToOneAnnotation) attributeResource.getAnnotation(JPA.MANY_TO_ONE); + ManyToOneAnnotation manyToOne = (ManyToOneAnnotation) resourceField.getAnnotation(JPA.MANY_TO_ONE); assertFalse(manyToOne.isCascadeRemove()); manyToOne.setCascadeRemove(true); @@ -314,10 +315,10 @@ public class ManyToOneTests extends JpaJavaResourceModelTestCase { public void testSetCascadeRefresh() throws Exception { ICompilationUnit cu = this.createTestManyToOne(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - ManyToOneAnnotation manyToOne = (ManyToOneAnnotation) attributeResource.getAnnotation(JPA.MANY_TO_ONE); + ManyToOneAnnotation manyToOne = (ManyToOneAnnotation) resourceField.getAnnotation(JPA.MANY_TO_ONE); assertFalse(manyToOne.isCascadeRefresh()); manyToOne.setCascadeRefresh(true); @@ -328,10 +329,10 @@ public class ManyToOneTests extends JpaJavaResourceModelTestCase { public void testCascadeMoreThanOnce() throws Exception { ICompilationUnit cu = this.createTestManyToOneWithCascade(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - ManyToOneAnnotation manyToOne = (ManyToOneAnnotation) attributeResource.getAnnotation(JPA.MANY_TO_ONE); + ManyToOneAnnotation manyToOne = (ManyToOneAnnotation) resourceField.getAnnotation(JPA.MANY_TO_ONE); assertTrue(manyToOne.isCascadeAll()); manyToOne.setCascadeAll(true); @@ -353,10 +354,10 @@ public class ManyToOneTests extends JpaJavaResourceModelTestCase { public void testDuplicateCascade() throws Exception { ICompilationUnit cu = this.createTestManyToOneWithDuplicateCascade(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - ManyToOneAnnotation manyToOne = (ManyToOneAnnotation) attributeResource.getAnnotation(JPA.MANY_TO_ONE); + ManyToOneAnnotation manyToOne = (ManyToOneAnnotation) resourceField.getAnnotation(JPA.MANY_TO_ONE); assertTrue(manyToOne.isCascadeMerge()); manyToOne.setCascadeMerge(false);//TODO should the resource model handle this and remove both MERGE @@ -371,10 +372,10 @@ public class ManyToOneTests extends JpaJavaResourceModelTestCase { public void testMultipleCascade() throws Exception { ICompilationUnit cu = this.createTestManyToOneWithMultipleCascade(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - ManyToOneAnnotation manyToOne = (ManyToOneAnnotation) attributeResource.getAnnotation(JPA.MANY_TO_ONE); + ManyToOneAnnotation manyToOne = (ManyToOneAnnotation) resourceField.getAnnotation(JPA.MANY_TO_ONE); assertTrue(manyToOne.isCascadeMerge()); assertTrue(manyToOne.isCascadeRemove()); diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/MapKeyTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/MapKeyTests.java index 0a5ca90816..0ef74ab3ea 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/MapKeyTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/MapKeyTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2009 Oracle. All rights reserved. + * Copyright (c) 2007, 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. @@ -11,10 +11,11 @@ package org.eclipse.jpt.jpa.core.tests.internal.resource.java; import java.util.Iterator; import org.eclipse.jdt.core.ICompilationUnit; +import org.eclipse.jpt.common.core.resource.java.JavaResourceField; +import org.eclipse.jpt.common.core.resource.java.JavaResourceType; +import org.eclipse.jpt.common.utility.internal.CollectionTools; import org.eclipse.jpt.common.utility.internal.iterators.ArrayIterator; 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.MapKeyAnnotation; @SuppressWarnings("nls") @@ -52,28 +53,28 @@ public class MapKeyTests extends JpaJavaResourceModelTestCase { public void testMapKey() throws Exception { ICompilationUnit cu = this.createTestMapKey(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - MapKeyAnnotation mapKey = (MapKeyAnnotation) attributeResource.getAnnotation(JPA.MAP_KEY); + MapKeyAnnotation mapKey = (MapKeyAnnotation) resourceField.getAnnotation(JPA.MAP_KEY); assertNotNull(mapKey); } public void testGetName() throws Exception { ICompilationUnit cu = this.createTestMapKeyWithName(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - MapKeyAnnotation mapKey = (MapKeyAnnotation) attributeResource.getAnnotation(JPA.MAP_KEY); + MapKeyAnnotation mapKey = (MapKeyAnnotation) resourceField.getAnnotation(JPA.MAP_KEY); assertEquals("key", mapKey.getName()); } public void testSetName() throws Exception { ICompilationUnit cu = this.createTestMapKey(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - MapKeyAnnotation mapKey = (MapKeyAnnotation) attributeResource.getAnnotation(JPA.MAP_KEY); + MapKeyAnnotation mapKey = (MapKeyAnnotation) resourceField.getAnnotation(JPA.MAP_KEY); mapKey.setName("foo"); diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/MappedSuperclassTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/MappedSuperclassTests.java index a03bc910ee..03d08f6a39 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/MappedSuperclassTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/MappedSuperclassTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2009 Oracle. All rights reserved. + * Copyright (c) 2007, 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. @@ -11,11 +11,11 @@ package org.eclipse.jpt.jpa.core.tests.internal.resource.java; import java.util.Iterator; import org.eclipse.jdt.core.ICompilationUnit; +import org.eclipse.jpt.common.core.resource.java.JavaResourceNode; +import org.eclipse.jpt.common.core.resource.java.JavaResourceType; import org.eclipse.jpt.common.utility.internal.iterators.ArrayIterator; import org.eclipse.jpt.jpa.core.resource.java.EntityAnnotation; import org.eclipse.jpt.jpa.core.resource.java.JPA; -import org.eclipse.jpt.jpa.core.resource.java.JavaResourceNode; -import org.eclipse.jpt.jpa.core.resource.java.JavaResourcePersistentType; import org.eclipse.jpt.jpa.core.resource.java.MappedSuperclassAnnotation; @SuppressWarnings("nls") @@ -54,20 +54,20 @@ public class MappedSuperclassTests extends JpaJavaResourceModelTestCase { public void testMappedSuperclass() throws Exception { ICompilationUnit cu = this.createTestMappedSuperclass(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); + JavaResourceType resourceType = buildJavaResourceType(cu); - JavaResourceNode mappingAnnotation = typeResource.getAnnotation(MappedSuperclassAnnotation.ANNOTATION_NAME); + JavaResourceNode mappingAnnotation = resourceType.getAnnotation(MappedSuperclassAnnotation.ANNOTATION_NAME); assertTrue(mappingAnnotation instanceof MappedSuperclassAnnotation); } public void testMappedSuperclassAndEntity() throws Exception { ICompilationUnit cu = this.createTestMappedSuperclassAndEntity(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); + JavaResourceType resourceType = buildJavaResourceType(cu); - JavaResourceNode mappingAnnotation = typeResource.getAnnotation(EntityAnnotation.ANNOTATION_NAME); + JavaResourceNode mappingAnnotation = resourceType.getAnnotation(EntityAnnotation.ANNOTATION_NAME); assertTrue(mappingAnnotation instanceof EntityAnnotation); - MappedSuperclassAnnotation mappedSuperclass = (MappedSuperclassAnnotation) typeResource.getAnnotation(JPA.MAPPED_SUPERCLASS); + MappedSuperclassAnnotation mappedSuperclass = (MappedSuperclassAnnotation) resourceType.getAnnotation(JPA.MAPPED_SUPERCLASS); assertNotNull(mappedSuperclass); } diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/NamedNativeQueriesTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/NamedNativeQueriesTests.java index 69a1998768..f8e60be450 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/NamedNativeQueriesTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/NamedNativeQueriesTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2010 Oracle. All rights reserved. + * Copyright (c) 2007, 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,13 +12,11 @@ package org.eclipse.jpt.jpa.core.tests.internal.resource.java; import java.util.Iterator; import org.eclipse.jdt.core.ICompilationUnit; -import org.eclipse.jpt.common.utility.internal.CollectionTools; +import org.eclipse.jpt.common.core.resource.java.JavaResourceType; +import org.eclipse.jpt.common.core.resource.java.NestableAnnotation; import org.eclipse.jpt.common.utility.internal.iterators.ArrayIterator; 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.NamedNativeQueriesAnnotation; import org.eclipse.jpt.jpa.core.resource.java.NamedNativeQueryAnnotation; -import org.eclipse.jpt.jpa.core.resource.java.NestableAnnotation; @SuppressWarnings("nls") public class NamedNativeQueriesTests extends JpaJavaResourceModelTestCase { @@ -112,28 +110,25 @@ public class NamedNativeQueriesTests extends JpaJavaResourceModelTestCase { public void testNamedNativeQuery() throws Exception { ICompilationUnit cu = this.createTestNamedNativeQueries(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); + JavaResourceType resourceType = buildJavaResourceType(cu); - NamedNativeQueriesAnnotation namedQueries = (NamedNativeQueriesAnnotation) typeResource.getAnnotation(JPA.NAMED_NATIVE_QUERIES); - NamedNativeQueryAnnotation namedQuery = namedQueries.getNestedAnnotations().iterator().next(); + NamedNativeQueryAnnotation namedQuery = (NamedNativeQueryAnnotation) resourceType.getAnnotation(0, JPA.NAMED_NATIVE_QUERY); assertNotNull(namedQuery); } public void testGetName() throws Exception { ICompilationUnit cu = this.createTestNamedNativeQueryWithName(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); + JavaResourceType resourceType = buildJavaResourceType(cu); - NamedNativeQueriesAnnotation namedQueries = (NamedNativeQueriesAnnotation) typeResource.getAnnotation(JPA.NAMED_NATIVE_QUERIES); - NamedNativeQueryAnnotation namedQuery = namedQueries.getNestedAnnotations().iterator().next(); + NamedNativeQueryAnnotation namedQuery = (NamedNativeQueryAnnotation) resourceType.getAnnotation(0, JPA.NAMED_NATIVE_QUERY); assertEquals(QUERY_NAME, namedQuery.getName()); } public void testSetName() throws Exception { ICompilationUnit cu = this.createTestNamedNativeQueryWithName(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); + JavaResourceType resourceType = buildJavaResourceType(cu); - NamedNativeQueriesAnnotation namedQueries = (NamedNativeQueriesAnnotation) typeResource.getAnnotation(JPA.NAMED_NATIVE_QUERIES); - NamedNativeQueryAnnotation namedQuery = namedQueries.getNestedAnnotations().iterator().next(); + NamedNativeQueryAnnotation namedQuery = (NamedNativeQueryAnnotation) resourceType.getAnnotation(0, JPA.NAMED_NATIVE_QUERY); assertEquals(QUERY_NAME, namedQuery.getName()); namedQuery.setName("foo"); @@ -149,19 +144,17 @@ public class NamedNativeQueriesTests extends JpaJavaResourceModelTestCase { public void testGetQuery() throws Exception { ICompilationUnit cu = this.createTestNamedNativeQueryWithQuery(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); + JavaResourceType resourceType = buildJavaResourceType(cu); - NamedNativeQueriesAnnotation namedQueries = (NamedNativeQueriesAnnotation) typeResource.getAnnotation(JPA.NAMED_NATIVE_QUERIES); - NamedNativeQueryAnnotation namedQuery = namedQueries.getNestedAnnotations().iterator().next(); + NamedNativeQueryAnnotation namedQuery = (NamedNativeQueryAnnotation) resourceType.getAnnotation(0, JPA.NAMED_NATIVE_QUERY); assertEquals(QUERY_QUERY, namedQuery.getQuery()); } public void testSetQuery() throws Exception { ICompilationUnit cu = this.createTestNamedNativeQueryWithQuery(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); + JavaResourceType resourceType = buildJavaResourceType(cu); - NamedNativeQueriesAnnotation namedQueries = (NamedNativeQueriesAnnotation) typeResource.getAnnotation(JPA.NAMED_NATIVE_QUERIES); - NamedNativeQueryAnnotation namedQuery = namedQueries.getNestedAnnotations().iterator().next(); + NamedNativeQueryAnnotation namedQuery = (NamedNativeQueryAnnotation) resourceType.getAnnotation(0, JPA.NAMED_NATIVE_QUERY); assertEquals(QUERY_QUERY, namedQuery.getQuery()); namedQuery.setQuery("foo"); @@ -177,19 +170,17 @@ public class NamedNativeQueriesTests extends JpaJavaResourceModelTestCase { public void testGetResultClass() throws Exception { ICompilationUnit cu = this.createTestNamedNativeQueryWithResultClass(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); + JavaResourceType resourceType = buildJavaResourceType(cu); - NamedNativeQueriesAnnotation namedQueries = (NamedNativeQueriesAnnotation) typeResource.getAnnotation(JPA.NAMED_NATIVE_QUERIES); - NamedNativeQueryAnnotation namedQuery = namedQueries.getNestedAnnotations().iterator().next(); + NamedNativeQueryAnnotation namedQuery = (NamedNativeQueryAnnotation) resourceType.getAnnotation(0, JPA.NAMED_NATIVE_QUERY); assertEquals(QUERY_RESULT_CLASS, namedQuery.getResultClass()); } public void testSetResultClass() throws Exception { ICompilationUnit cu = this.createTestNamedNativeQueryWithResultClass(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); + JavaResourceType resourceType = buildJavaResourceType(cu); - NamedNativeQueriesAnnotation namedQueries = (NamedNativeQueriesAnnotation) typeResource.getAnnotation(JPA.NAMED_NATIVE_QUERIES); - NamedNativeQueryAnnotation namedQuery = namedQueries.getNestedAnnotations().iterator().next(); + NamedNativeQueryAnnotation namedQuery = (NamedNativeQueryAnnotation) resourceType.getAnnotation(0, JPA.NAMED_NATIVE_QUERY); assertEquals(QUERY_RESULT_CLASS, namedQuery.getResultClass()); namedQuery.setResultClass("foo"); @@ -205,10 +196,9 @@ public class NamedNativeQueriesTests extends JpaJavaResourceModelTestCase { public void testGetFullyQualifiedClass() throws Exception { ICompilationUnit cu = this.createTestNamedNativeQueryWithResultClass(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); + JavaResourceType resourceType = buildJavaResourceType(cu); - NamedNativeQueriesAnnotation namedQueries = (NamedNativeQueriesAnnotation) typeResource.getAnnotation(JPA.NAMED_NATIVE_QUERIES); - NamedNativeQueryAnnotation namedQuery = namedQueries.getNestedAnnotations().iterator().next(); + NamedNativeQueryAnnotation namedQuery = (NamedNativeQueryAnnotation) resourceType.getAnnotation(0, JPA.NAMED_NATIVE_QUERY); assertNotNull(namedQuery.getResultClass()); assertEquals("Result", namedQuery.getFullyQualifiedResultClassName());//bug 196200 changed this @@ -220,19 +210,17 @@ public class NamedNativeQueriesTests extends JpaJavaResourceModelTestCase { public void testGetResultSetMapping() throws Exception { ICompilationUnit cu = this.createTestNamedNativeQueryWithResultSetMapping(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); + JavaResourceType resourceType = buildJavaResourceType(cu); - NamedNativeQueriesAnnotation namedQueries = (NamedNativeQueriesAnnotation) typeResource.getAnnotation(JPA.NAMED_NATIVE_QUERIES); - NamedNativeQueryAnnotation namedQuery = namedQueries.getNestedAnnotations().iterator().next(); + NamedNativeQueryAnnotation namedQuery = (NamedNativeQueryAnnotation) resourceType.getAnnotation(0, JPA.NAMED_NATIVE_QUERY); assertEquals(QUERY_RESULT_SET_MAPPING, namedQuery.getResultSetMapping()); } public void testSetResultSetMapping() throws Exception { ICompilationUnit cu = this.createTestNamedNativeQueryWithResultSetMapping(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); + JavaResourceType resourceType = buildJavaResourceType(cu); - NamedNativeQueriesAnnotation namedQueries = (NamedNativeQueriesAnnotation) typeResource.getAnnotation(JPA.NAMED_NATIVE_QUERIES); - NamedNativeQueryAnnotation namedQuery = namedQueries.getNestedAnnotations().iterator().next(); + NamedNativeQueryAnnotation namedQuery = (NamedNativeQueryAnnotation) resourceType.getAnnotation(0, JPA.NAMED_NATIVE_QUERY); assertEquals(QUERY_RESULT_SET_MAPPING, namedQuery.getResultSetMapping()); namedQuery.setResultSetMapping("foo"); @@ -248,43 +236,39 @@ public class NamedNativeQueriesTests extends JpaJavaResourceModelTestCase { public void testHints() throws Exception { ICompilationUnit cu = this.createTestNamedNativeQueries(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); + JavaResourceType resourceType = buildJavaResourceType(cu); - NamedNativeQueriesAnnotation namedQueries = (NamedNativeQueriesAnnotation) typeResource.getAnnotation(JPA.NAMED_NATIVE_QUERIES); - NamedNativeQueryAnnotation namedQuery = namedQueries.getNestedAnnotations().iterator().next(); + NamedNativeQueryAnnotation namedQuery = (NamedNativeQueryAnnotation) resourceType.getAnnotation(0, JPA.NAMED_NATIVE_QUERY); - assertEquals(0, namedQuery.hintsSize()); + assertEquals(0, namedQuery.getHintsSize()); } public void testHints2() throws Exception { ICompilationUnit cu = this.createTestNamedNativeQueries(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); + JavaResourceType resourceType = buildJavaResourceType(cu); - NamedNativeQueriesAnnotation namedQueries = (NamedNativeQueriesAnnotation) typeResource.getAnnotation(JPA.NAMED_NATIVE_QUERIES); - NamedNativeQueryAnnotation namedQuery = namedQueries.getNestedAnnotations().iterator().next(); + NamedNativeQueryAnnotation namedQuery = (NamedNativeQueryAnnotation) resourceType.getAnnotation(0, JPA.NAMED_NATIVE_QUERY); namedQuery.addHint(0); namedQuery.addHint(1); - assertEquals(2, namedQuery.hintsSize()); + assertEquals(2, namedQuery.getHintsSize()); } public void testHints3() throws Exception { ICompilationUnit cu = this.createTestNamedNativeQueryWithQueryHints(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); + JavaResourceType resourceType = buildJavaResourceType(cu); - NamedNativeQueriesAnnotation namedQueries = (NamedNativeQueriesAnnotation) typeResource.getAnnotation(JPA.NAMED_NATIVE_QUERIES); - NamedNativeQueryAnnotation namedQuery = namedQueries.getNestedAnnotations().iterator().next(); + NamedNativeQueryAnnotation namedQuery = (NamedNativeQueryAnnotation) resourceType.getAnnotation(0, JPA.NAMED_NATIVE_QUERY); - assertEquals(2, namedQuery.hintsSize()); + assertEquals(2, namedQuery.getHintsSize()); } public void testAddHint() throws Exception { ICompilationUnit cu = this.createTestNamedNativeQueries(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); + JavaResourceType resourceType = buildJavaResourceType(cu); - NamedNativeQueriesAnnotation namedQueries = (NamedNativeQueriesAnnotation) typeResource.getAnnotation(JPA.NAMED_NATIVE_QUERIES); - NamedNativeQueryAnnotation namedQuery = namedQueries.getNestedAnnotations().iterator().next(); + NamedNativeQueryAnnotation namedQuery = (NamedNativeQueryAnnotation) resourceType.getAnnotation(0, JPA.NAMED_NATIVE_QUERY); namedQuery.addHint(0).setName("FOO"); namedQuery.addHint(1); @@ -298,124 +282,144 @@ public class NamedNativeQueriesTests extends JpaJavaResourceModelTestCase { public void testRemoveHint() throws Exception { ICompilationUnit cu = this.createTestNamedNativeQueryWithQueryHints(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); + JavaResourceType resourceType = buildJavaResourceType(cu); - NamedNativeQueriesAnnotation namedQueries = (NamedNativeQueriesAnnotation) typeResource.getAnnotation(JPA.NAMED_NATIVE_QUERIES); - NamedNativeQueryAnnotation namedQuery = namedQueries.getNestedAnnotations().iterator().next(); + NamedNativeQueryAnnotation namedQuery = (NamedNativeQueryAnnotation) resourceType.getAnnotation(0, JPA.NAMED_NATIVE_QUERY); namedQuery.addHint(0).setName("BAZ"); assertEquals("BAZ", namedQuery.hintAt(0).getName()); assertEquals("BAR", namedQuery.hintAt(1).getName()); assertNull(namedQuery.hintAt(2).getName()); - assertEquals(3, namedQuery.hintsSize()); + assertEquals(3, namedQuery.getHintsSize()); namedQuery.removeHint(2); assertEquals("BAZ", namedQuery.hintAt(0).getName()); assertEquals("BAR", namedQuery.hintAt(1).getName()); - assertEquals(2, namedQuery.hintsSize()); + assertEquals(2, namedQuery.getHintsSize()); assertSourceContains("@NamedNativeQueries(@NamedNativeQuery(hints = {@QueryHint(name = \"BAZ\"), @QueryHint(name = \"BAR\", value = \"FOO\")}))", cu); namedQuery.removeHint(0); assertEquals("BAR", namedQuery.hintAt(0).getName()); - assertEquals(1, namedQuery.hintsSize()); + assertEquals(1, namedQuery.getHintsSize()); assertSourceContains("@NamedNativeQueries(@NamedNativeQuery(hints = @QueryHint(name = \"BAR\", value = \"FOO\")))", cu); namedQuery.removeHint(0); - assertEquals(0, namedQuery.hintsSize()); + assertEquals(0, namedQuery.getHintsSize()); assertSourceDoesNotContain("@NamedNativeQuery(", cu); } public void testMoveHint() throws Exception { ICompilationUnit cu = this.createTestNamedNativeQueryWithQueryHints(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); + JavaResourceType resourceType = buildJavaResourceType(cu); - NamedNativeQueriesAnnotation namedQueries = (NamedNativeQueriesAnnotation) typeResource.getAnnotation(JPA.NAMED_NATIVE_QUERIES); - NamedNativeQueryAnnotation namedQuery = namedQueries.getNestedAnnotations().iterator().next(); + NamedNativeQueryAnnotation namedQuery = (NamedNativeQueryAnnotation) resourceType.getAnnotation(0, JPA.NAMED_NATIVE_QUERY); namedQuery.addHint(0).setName("BAZ"); assertEquals("BAZ", namedQuery.hintAt(0).getName()); assertEquals("BAR", namedQuery.hintAt(1).getName()); assertNull(namedQuery.hintAt(2).getName()); - assertEquals(3, namedQuery.hintsSize()); + assertEquals(3, namedQuery.getHintsSize()); namedQuery.moveHint(2, 0); assertEquals("BAR", namedQuery.hintAt(0).getName()); assertNull(namedQuery.hintAt(1).getName()); assertEquals("BAZ", namedQuery.hintAt(2).getName()); - assertEquals(3, namedQuery.hintsSize()); + assertEquals(3, namedQuery.getHintsSize()); assertSourceContains("@NamedNativeQueries(@NamedNativeQuery(hints = {@QueryHint(name = \"BAR\", value = \"FOO\"), @QueryHint, @QueryHint(name = \"BAZ\")}))", cu); } public void testMoveHint2() throws Exception { ICompilationUnit cu = this.createTestNamedNativeQueryWithQueryHints(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); + JavaResourceType resourceType = buildJavaResourceType(cu); - NamedNativeQueriesAnnotation namedQueries = (NamedNativeQueriesAnnotation) typeResource.getAnnotation(JPA.NAMED_NATIVE_QUERIES); - NamedNativeQueryAnnotation namedQuery = namedQueries.getNestedAnnotations().iterator().next(); + NamedNativeQueryAnnotation namedQuery = (NamedNativeQueryAnnotation) resourceType.getAnnotation(0, JPA.NAMED_NATIVE_QUERY); namedQuery.addHint(0).setName("BAZ"); assertEquals("BAZ", namedQuery.hintAt(0).getName()); assertEquals("BAR", namedQuery.hintAt(1).getName()); assertNull(namedQuery.hintAt(2).getName()); - assertEquals(3, namedQuery.hintsSize()); + assertEquals(3, namedQuery.getHintsSize()); namedQuery.moveHint(0, 2); assertNull(namedQuery.hintAt(0).getName()); assertEquals("BAZ", namedQuery.hintAt(1).getName()); assertEquals("BAR", namedQuery.hintAt(2).getName()); - assertEquals(3, namedQuery.hintsSize()); + assertEquals(3, namedQuery.getHintsSize()); assertSourceContains("@NamedNativeQueries(@NamedNativeQuery(hints = {@QueryHint, @QueryHint(name = \"BAZ\"), @QueryHint(name = \"BAR\", value = \"FOO\")}))", cu); } public void testAddNamedNativeQueryCopyExisting() throws Exception { ICompilationUnit cu = createTestNamedNativeQuery(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); + JavaResourceType resourceType = buildJavaResourceType(cu); - NamedNativeQueryAnnotation namedQuery = (NamedNativeQueryAnnotation) typeResource.addAnnotation(1, JPA.NAMED_NATIVE_QUERY, JPA.NAMED_NATIVE_QUERIES); + String expected1 = "@NamedNativeQueries({"; + String expected2 = "@NamedNativeQuery(name = \"foo\", query = \"bar\", hints = @QueryHint(name = \"BAR\", value = \"FOO\"), resultClass = Foo.class, resultSetMapping = \"mapping\"),"; + String expected3 = "@NamedNativeQuery(name = \"BAR\") })"; + NamedNativeQueryAnnotation namedQuery = (NamedNativeQueryAnnotation) resourceType.addAnnotation(1, JPA.NAMED_NATIVE_QUERY); namedQuery.setName("BAR"); - assertSourceContains("@NamedNativeQueries({@NamedNativeQuery(name = \"foo\", query = \"bar\", hints = @QueryHint(name = \"BAR\", value = \"FOO\"), resultClass = Foo.class, resultSetMapping = \"mapping\"),@NamedNativeQuery(name = \"BAR\")})", cu); - - assertNull(typeResource.getAnnotation(JPA.NAMED_NATIVE_QUERY)); - assertNotNull(typeResource.getAnnotation(JPA.NAMED_NATIVE_QUERIES)); - assertEquals(2, CollectionTools.size(typeResource.annotations(JPA.NAMED_NATIVE_QUERY, JPA.NAMED_NATIVE_QUERIES))); + assertSourceContains(expected1, cu); + assertSourceContains(expected2, cu); + assertSourceContains(expected3, cu); + + assertNull(resourceType.getAnnotation(JPA.NAMED_NATIVE_QUERY)); + assertNotNull(resourceType.getAnnotation(JPA.NAMED_NATIVE_QUERIES)); + assertNotNull(resourceType.getAnnotation(0, JPA.NAMED_NATIVE_QUERY)); + assertEquals(2, resourceType.getAnnotationsSize(JPA.NAMED_NATIVE_QUERY)); } public void testAddNamedNativeQueryToBeginningOfList() throws Exception { ICompilationUnit cu = createTestNamedNativeQuery(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); + JavaResourceType resourceType = buildJavaResourceType(cu); - NamedNativeQueryAnnotation namedQuery = (NamedNativeQueryAnnotation) typeResource.addAnnotation(1, JPA.NAMED_NATIVE_QUERY, JPA.NAMED_NATIVE_QUERIES); + String expected1 = "@NamedNativeQueries({"; + String expected2 = "@NamedNativeQuery(name = \"foo\", query = \"bar\", hints = @QueryHint(name = \"BAR\", value = \"FOO\"), resultClass = Foo.class, resultSetMapping = \"mapping\"),"; + String expected3 = "@NamedNativeQuery(name = \"BAR\") })"; + NamedNativeQueryAnnotation namedQuery = (NamedNativeQueryAnnotation) resourceType.addAnnotation(1, JPA.NAMED_NATIVE_QUERY); namedQuery.setName("BAR"); - assertSourceContains("@NamedNativeQueries({@NamedNativeQuery(name = \"foo\", query = \"bar\", hints = @QueryHint(name = \"BAR\", value = \"FOO\"), resultClass = Foo.class, resultSetMapping = \"mapping\"),@NamedNativeQuery(name = \"BAR\")})", cu); + assertSourceContains(expected1, cu); + assertSourceContains(expected2, cu); + assertSourceContains(expected3, cu); - namedQuery = (NamedNativeQueryAnnotation) typeResource.addAnnotation(0, JPA.NAMED_NATIVE_QUERY, JPA.NAMED_NATIVE_QUERIES); + expected2 = "@NamedNativeQuery(name = \"BAZ\"),"; + expected3 = "@NamedNativeQuery(name = \"foo\", query = \"bar\", hints = @QueryHint(name = \"BAR\", value = \"FOO\"), resultClass = Foo.class, resultSetMapping = \"mapping\"), @NamedNativeQuery(name = \"BAR\") })"; + namedQuery = (NamedNativeQueryAnnotation) resourceType.addAnnotation(0, JPA.NAMED_NATIVE_QUERY); namedQuery.setName("BAZ"); - assertSourceContains("@NamedNativeQueries({@NamedNativeQuery(name = \"BAZ\"),@NamedNativeQuery(name = \"foo\", query = \"bar\", hints = @QueryHint(name = \"BAR\", value = \"FOO\"), resultClass = Foo.class, resultSetMapping = \"mapping\"), @NamedNativeQuery(name = \"BAR\")})", cu); + assertSourceContains(expected1, cu); + assertSourceContains(expected2, cu); + assertSourceContains(expected3, cu); - Iterator namedQueries = typeResource.annotations(JPA.NAMED_NATIVE_QUERY, JPA.NAMED_NATIVE_QUERIES); + Iterator namedQueries = resourceType.getAnnotations(JPA.NAMED_NATIVE_QUERY).iterator(); assertEquals("BAZ", ((NamedNativeQueryAnnotation) namedQueries.next()).getName()); assertEquals("foo", ((NamedNativeQueryAnnotation) namedQueries.next()).getName()); assertEquals("BAR", ((NamedNativeQueryAnnotation) namedQueries.next()).getName()); - assertNull(typeResource.getAnnotation(JPA.NAMED_NATIVE_QUERY)); - assertNotNull(typeResource.getAnnotation(JPA.NAMED_NATIVE_QUERIES)); - assertEquals(3, CollectionTools.size(typeResource.annotations(JPA.NAMED_NATIVE_QUERY, JPA.NAMED_NATIVE_QUERIES))); + assertNull(resourceType.getAnnotation(JPA.NAMED_NATIVE_QUERY)); + assertNotNull(resourceType.getAnnotation(JPA.NAMED_NATIVE_QUERIES)); + assertNotNull(resourceType.getAnnotation(0, JPA.NAMED_NATIVE_QUERY)); + assertEquals(3, resourceType.getAnnotationsSize(JPA.NAMED_NATIVE_QUERY)); } public void testRemoveNamedNativeQueryCopyExisting() throws Exception { ICompilationUnit cu = createTestNamedNativeQuery(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); + JavaResourceType resourceType = buildJavaResourceType(cu); - NamedNativeQueryAnnotation namedQuery = (NamedNativeQueryAnnotation) typeResource.addAnnotation(1, JPA.NAMED_NATIVE_QUERY, JPA.NAMED_NATIVE_QUERIES); + String expected1 = "@NamedNativeQueries({"; + String expected2 = "@NamedNativeQuery(name = \"foo\", query = \"bar\", hints = @QueryHint(name = \"BAR\", value = \"FOO\"), resultClass = Foo.class, resultSetMapping = \"mapping\"),"; + String expected3 = "@NamedNativeQuery(name = \"BAR\") })"; + NamedNativeQueryAnnotation namedQuery = (NamedNativeQueryAnnotation) resourceType.addAnnotation(1, JPA.NAMED_NATIVE_QUERY); namedQuery.setName("BAR"); - assertSourceContains("@NamedNativeQueries({@NamedNativeQuery(name = \"foo\", query = \"bar\", hints = @QueryHint(name = \"BAR\", value = \"FOO\"), resultClass = Foo.class, resultSetMapping = \"mapping\"),@NamedNativeQuery(name = \"BAR\")})", cu); - - typeResource.removeAnnotation(1, JPA.NAMED_NATIVE_QUERY, JPA.NAMED_NATIVE_QUERIES); - assertSourceContains("@NamedNativeQuery(name = \"foo\", query = \"bar\", hints = @QueryHint(name = \"BAR\", value = \"FOO\"), resultClass = Foo.class, resultSetMapping = \"mapping\")", cu); + assertSourceContains(expected1, cu); + assertSourceContains(expected2, cu); + assertSourceContains(expected3, cu); + + expected1 = "@NamedNativeQuery(name = \"foo\", query = \"bar\", hints = @QueryHint(name = \"BAR\", value = \"FOO\"), resultClass = Foo.class, resultSetMapping = \"mapping\")"; + resourceType.removeAnnotation(1, JPA.NAMED_NATIVE_QUERY); + assertSourceContains(expected1, cu); + assertSourceDoesNotContain("@NamedNativeQueries", cu); } } diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/NamedNativeQueryTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/NamedNativeQueryTests.java index b2718ee03a..e8fa64dd6e 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/NamedNativeQueryTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/NamedNativeQueryTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2009 Oracle. All rights reserved. + * Copyright (c) 2007, 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. @@ -11,9 +11,9 @@ package org.eclipse.jpt.jpa.core.tests.internal.resource.java; import java.util.Iterator; import org.eclipse.jdt.core.ICompilationUnit; +import org.eclipse.jpt.common.core.resource.java.JavaResourceType; import org.eclipse.jpt.common.utility.internal.iterators.ArrayIterator; 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.NamedNativeQueryAnnotation; @SuppressWarnings("nls") @@ -95,25 +95,25 @@ public class NamedNativeQueryTests extends JpaJavaResourceModelTestCase { public void testNamedNativeQuery() throws Exception { ICompilationUnit cu = this.createTestNamedNativeQuery(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); + JavaResourceType resourceType = buildJavaResourceType(cu); - NamedNativeQueryAnnotation namedQuery = (NamedNativeQueryAnnotation) typeResource.getAnnotation(JPA.NAMED_NATIVE_QUERY); + NamedNativeQueryAnnotation namedQuery = (NamedNativeQueryAnnotation) resourceType.getAnnotation(0, JPA.NAMED_NATIVE_QUERY); assertNotNull(namedQuery); } public void testGetName() throws Exception { ICompilationUnit cu = this.createTestNamedNativeQueryWithName(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); + JavaResourceType resourceType = buildJavaResourceType(cu); - NamedNativeQueryAnnotation namedQuery = (NamedNativeQueryAnnotation) typeResource.getAnnotation(JPA.NAMED_NATIVE_QUERY); + NamedNativeQueryAnnotation namedQuery = (NamedNativeQueryAnnotation) resourceType.getAnnotation(0, JPA.NAMED_NATIVE_QUERY); assertEquals(QUERY_NAME, namedQuery.getName()); } public void testSetName() throws Exception { ICompilationUnit cu = this.createTestNamedNativeQueryWithName(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); + JavaResourceType resourceType = buildJavaResourceType(cu); - NamedNativeQueryAnnotation namedQuery = (NamedNativeQueryAnnotation) typeResource.getAnnotation(JPA.NAMED_NATIVE_QUERY); + NamedNativeQueryAnnotation namedQuery = (NamedNativeQueryAnnotation) resourceType.getAnnotation(0, JPA.NAMED_NATIVE_QUERY); assertEquals(QUERY_NAME, namedQuery.getName()); namedQuery.setName("foo"); @@ -129,17 +129,17 @@ public class NamedNativeQueryTests extends JpaJavaResourceModelTestCase { public void testGetQuery() throws Exception { ICompilationUnit cu = this.createTestNamedNativeQueryWithQuery(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); + JavaResourceType resourceType = buildJavaResourceType(cu); - NamedNativeQueryAnnotation namedQuery = (NamedNativeQueryAnnotation) typeResource.getAnnotation(JPA.NAMED_NATIVE_QUERY); + NamedNativeQueryAnnotation namedQuery = (NamedNativeQueryAnnotation) resourceType.getAnnotation(0, JPA.NAMED_NATIVE_QUERY); assertEquals(QUERY_QUERY, namedQuery.getQuery()); } public void testSetQuery() throws Exception { ICompilationUnit cu = this.createTestNamedNativeQueryWithQuery(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); + JavaResourceType resourceType = buildJavaResourceType(cu); - NamedNativeQueryAnnotation namedQuery = (NamedNativeQueryAnnotation) typeResource.getAnnotation(JPA.NAMED_NATIVE_QUERY); + NamedNativeQueryAnnotation namedQuery = (NamedNativeQueryAnnotation) resourceType.getAnnotation(0, JPA.NAMED_NATIVE_QUERY); assertEquals(QUERY_QUERY, namedQuery.getQuery()); namedQuery.setQuery("foo"); @@ -155,17 +155,17 @@ public class NamedNativeQueryTests extends JpaJavaResourceModelTestCase { public void testGetResultClass() throws Exception { ICompilationUnit cu = this.createTestNamedNativeQueryWithResultClass(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); + JavaResourceType resourceType = buildJavaResourceType(cu); - NamedNativeQueryAnnotation namedQuery = (NamedNativeQueryAnnotation) typeResource.getAnnotation(JPA.NAMED_NATIVE_QUERY); + NamedNativeQueryAnnotation namedQuery = (NamedNativeQueryAnnotation) resourceType.getAnnotation(0, JPA.NAMED_NATIVE_QUERY); assertEquals(QUERY_RESULT_CLASS, namedQuery.getResultClass()); } public void testSetResultClass() throws Exception { ICompilationUnit cu = this.createTestNamedNativeQueryWithResultClass(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); + JavaResourceType resourceType = buildJavaResourceType(cu); - NamedNativeQueryAnnotation namedQuery = (NamedNativeQueryAnnotation) typeResource.getAnnotation(JPA.NAMED_NATIVE_QUERY); + NamedNativeQueryAnnotation namedQuery = (NamedNativeQueryAnnotation) resourceType.getAnnotation(0, JPA.NAMED_NATIVE_QUERY); assertEquals(QUERY_RESULT_CLASS, namedQuery.getResultClass()); namedQuery.setResultClass("foo"); @@ -181,9 +181,9 @@ public class NamedNativeQueryTests extends JpaJavaResourceModelTestCase { public void testGetFullyQualifiedClass() throws Exception { ICompilationUnit cu = this.createTestNamedNativeQueryWithResultClass(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); + JavaResourceType resourceType = buildJavaResourceType(cu); - NamedNativeQueryAnnotation namedQuery = (NamedNativeQueryAnnotation) typeResource.getAnnotation(JPA.NAMED_NATIVE_QUERY); + NamedNativeQueryAnnotation namedQuery = (NamedNativeQueryAnnotation) resourceType.getAnnotation(0, JPA.NAMED_NATIVE_QUERY); assertNotNull(namedQuery.getResultClass()); assertEquals("Result", namedQuery.getFullyQualifiedResultClassName());//bug 196200 changed this @@ -195,17 +195,17 @@ public class NamedNativeQueryTests extends JpaJavaResourceModelTestCase { public void testGetResultSetMapping() throws Exception { ICompilationUnit cu = this.createTestNamedNativeQueryWithResultSetMapping(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); + JavaResourceType resourceType = buildJavaResourceType(cu); - NamedNativeQueryAnnotation namedQuery = (NamedNativeQueryAnnotation) typeResource.getAnnotation(JPA.NAMED_NATIVE_QUERY); + NamedNativeQueryAnnotation namedQuery = (NamedNativeQueryAnnotation) resourceType.getAnnotation(0, JPA.NAMED_NATIVE_QUERY); assertEquals(QUERY_RESULT_SET_MAPPING, namedQuery.getResultSetMapping()); } public void testSetResultSetMapping() throws Exception { ICompilationUnit cu = this.createTestNamedNativeQueryWithResultSetMapping(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); + JavaResourceType resourceType = buildJavaResourceType(cu); - NamedNativeQueryAnnotation namedQuery = (NamedNativeQueryAnnotation) typeResource.getAnnotation(JPA.NAMED_NATIVE_QUERY); + NamedNativeQueryAnnotation namedQuery = (NamedNativeQueryAnnotation) resourceType.getAnnotation(0, JPA.NAMED_NATIVE_QUERY); assertEquals(QUERY_RESULT_SET_MAPPING, namedQuery.getResultSetMapping()); namedQuery.setResultSetMapping("foo"); @@ -221,40 +221,40 @@ public class NamedNativeQueryTests extends JpaJavaResourceModelTestCase { public void testHints() throws Exception { ICompilationUnit cu = this.createTestNamedNativeQuery(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); + JavaResourceType resourceType = buildJavaResourceType(cu); - NamedNativeQueryAnnotation namedQuery = (NamedNativeQueryAnnotation) typeResource.getAnnotation(JPA.NAMED_NATIVE_QUERY); + NamedNativeQueryAnnotation namedQuery = (NamedNativeQueryAnnotation) resourceType.getAnnotation(0, JPA.NAMED_NATIVE_QUERY); - assertEquals(0, namedQuery.hintsSize()); + assertEquals(0, namedQuery.getHintsSize()); } public void testHints2() throws Exception { ICompilationUnit cu = this.createTestNamedNativeQuery(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); + JavaResourceType resourceType = buildJavaResourceType(cu); - NamedNativeQueryAnnotation namedQuery = (NamedNativeQueryAnnotation) typeResource.getAnnotation(JPA.NAMED_NATIVE_QUERY); + NamedNativeQueryAnnotation namedQuery = (NamedNativeQueryAnnotation) resourceType.getAnnotation(0, JPA.NAMED_NATIVE_QUERY); namedQuery.addHint(0); namedQuery.addHint(1); - assertEquals(2, namedQuery.hintsSize()); + assertEquals(2, namedQuery.getHintsSize()); } public void testHints3() throws Exception { ICompilationUnit cu = this.createTestNamedNativeQueryWithQueryHints(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); + JavaResourceType resourceType = buildJavaResourceType(cu); - NamedNativeQueryAnnotation namedQuery = (NamedNativeQueryAnnotation) typeResource.getAnnotation(JPA.NAMED_NATIVE_QUERY); + NamedNativeQueryAnnotation namedQuery = (NamedNativeQueryAnnotation) resourceType.getAnnotation(0, JPA.NAMED_NATIVE_QUERY); - assertEquals(2, namedQuery.hintsSize()); + assertEquals(2, namedQuery.getHintsSize()); } public void testAddHint() throws Exception { ICompilationUnit cu = this.createTestNamedNativeQuery(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); + JavaResourceType resourceType = buildJavaResourceType(cu); - NamedNativeQueryAnnotation namedQuery = (NamedNativeQueryAnnotation) typeResource.getAnnotation(JPA.NAMED_NATIVE_QUERY); + NamedNativeQueryAnnotation namedQuery = (NamedNativeQueryAnnotation) resourceType.getAnnotation(0, JPA.NAMED_NATIVE_QUERY); namedQuery.addHint(0).setName("FOO"); namedQuery.addHint(1); @@ -268,73 +268,73 @@ public class NamedNativeQueryTests extends JpaJavaResourceModelTestCase { public void testRemoveHint() throws Exception { ICompilationUnit cu = this.createTestNamedNativeQueryWithQueryHints(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); + JavaResourceType resourceType = buildJavaResourceType(cu); - NamedNativeQueryAnnotation namedQuery = (NamedNativeQueryAnnotation) typeResource.getAnnotation(JPA.NAMED_NATIVE_QUERY); + NamedNativeQueryAnnotation namedQuery = (NamedNativeQueryAnnotation) resourceType.getAnnotation(0, JPA.NAMED_NATIVE_QUERY); namedQuery.addHint(0).setName("BAZ"); assertEquals("BAZ", namedQuery.hintAt(0).getName()); assertEquals("BAR", namedQuery.hintAt(1).getName()); assertNull(namedQuery.hintAt(2).getName()); - assertEquals(3, namedQuery.hintsSize()); + assertEquals(3, namedQuery.getHintsSize()); namedQuery.removeHint(2); assertEquals("BAZ", namedQuery.hintAt(0).getName()); assertEquals("BAR", namedQuery.hintAt(1).getName()); - assertEquals(2, namedQuery.hintsSize()); + assertEquals(2, namedQuery.getHintsSize()); assertSourceContains("@NamedNativeQuery(hints = {@QueryHint(name = \"BAZ\"), @QueryHint(name = \"BAR\", value = \"FOO\")})", cu); namedQuery.removeHint(0); assertEquals("BAR", namedQuery.hintAt(0).getName()); - assertEquals(1, namedQuery.hintsSize()); + assertEquals(1, namedQuery.getHintsSize()); assertSourceContains("@NamedNativeQuery(hints = @QueryHint(name = \"BAR\", value = \"FOO\"))", cu); namedQuery.removeHint(0); - assertEquals(0, namedQuery.hintsSize()); + assertEquals(0, namedQuery.getHintsSize()); assertSourceDoesNotContain("@NamedNativeQuery(", cu); } public void testMoveHint() throws Exception { ICompilationUnit cu = this.createTestNamedNativeQueryWithQueryHints(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); + JavaResourceType resourceType = buildJavaResourceType(cu); - NamedNativeQueryAnnotation namedQuery = (NamedNativeQueryAnnotation) typeResource.getAnnotation(JPA.NAMED_NATIVE_QUERY); + NamedNativeQueryAnnotation namedQuery = (NamedNativeQueryAnnotation) resourceType.getAnnotation(0, JPA.NAMED_NATIVE_QUERY); namedQuery.addHint(0).setName("BAZ"); assertEquals("BAZ", namedQuery.hintAt(0).getName()); assertEquals("BAR", namedQuery.hintAt(1).getName()); assertNull(namedQuery.hintAt(2).getName()); - assertEquals(3, namedQuery.hintsSize()); + assertEquals(3, namedQuery.getHintsSize()); namedQuery.moveHint(2, 0); assertEquals("BAR", namedQuery.hintAt(0).getName()); assertNull(namedQuery.hintAt(1).getName()); assertEquals("BAZ", namedQuery.hintAt(2).getName()); - assertEquals(3, namedQuery.hintsSize()); + assertEquals(3, namedQuery.getHintsSize()); assertSourceContains("@NamedNativeQuery(hints = {@QueryHint(name = \"BAR\", value = \"FOO\"), @QueryHint, @QueryHint(name = \"BAZ\")})", cu); } public void testMoveHint2() throws Exception { ICompilationUnit cu = this.createTestNamedNativeQueryWithQueryHints(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); + JavaResourceType resourceType = buildJavaResourceType(cu); - NamedNativeQueryAnnotation namedQuery = (NamedNativeQueryAnnotation) typeResource.getAnnotation(JPA.NAMED_NATIVE_QUERY); + NamedNativeQueryAnnotation namedQuery = (NamedNativeQueryAnnotation) resourceType.getAnnotation(0, JPA.NAMED_NATIVE_QUERY); namedQuery.addHint(0).setName("BAZ"); assertEquals("BAZ", namedQuery.hintAt(0).getName()); assertEquals("BAR", namedQuery.hintAt(1).getName()); assertNull(namedQuery.hintAt(2).getName()); - assertEquals(3, namedQuery.hintsSize()); + assertEquals(3, namedQuery.getHintsSize()); namedQuery.moveHint(0, 2); assertNull(namedQuery.hintAt(0).getName()); assertEquals("BAZ", namedQuery.hintAt(1).getName()); assertEquals("BAR", namedQuery.hintAt(2).getName()); - assertEquals(3, namedQuery.hintsSize()); + assertEquals(3, namedQuery.getHintsSize()); assertSourceContains("@NamedNativeQuery(hints = {@QueryHint, @QueryHint(name = \"BAZ\"), @QueryHint(name = \"BAR\", value = \"FOO\")})", cu); } diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/NamedQueriesTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/NamedQueriesTests.java index ce8153034d..91a9a27ec1 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/NamedQueriesTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/NamedQueriesTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2010 Oracle. All rights reserved. + * Copyright (c) 2007, 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,13 +12,11 @@ package org.eclipse.jpt.jpa.core.tests.internal.resource.java; import java.util.Iterator; import org.eclipse.jdt.core.ICompilationUnit; -import org.eclipse.jpt.common.utility.internal.CollectionTools; +import org.eclipse.jpt.common.core.resource.java.JavaResourceType; +import org.eclipse.jpt.common.core.resource.java.NestableAnnotation; import org.eclipse.jpt.common.utility.internal.iterators.ArrayIterator; 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.NamedQueriesAnnotation; import org.eclipse.jpt.jpa.core.resource.java.NamedQueryAnnotation; -import org.eclipse.jpt.jpa.core.resource.java.NestableAnnotation; @SuppressWarnings("nls") public class NamedQueriesTests extends JpaJavaResourceModelTestCase { @@ -93,28 +91,25 @@ public class NamedQueriesTests extends JpaJavaResourceModelTestCase { public void testNamedQuery() throws Exception { ICompilationUnit cu = this.createTestNamedQueries(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); + JavaResourceType resourceType = buildJavaResourceType(cu); - NamedQueriesAnnotation namedQueries = (NamedQueriesAnnotation) typeResource.getAnnotation(JPA.NAMED_QUERIES); - NamedQueryAnnotation namedQuery = namedQueries.getNestedAnnotations().iterator().next(); + NamedQueryAnnotation namedQuery = (NamedQueryAnnotation) resourceType.getAnnotation(0, JPA.NAMED_QUERY); assertNotNull(namedQuery); } public void testGetName() throws Exception { ICompilationUnit cu = this.createTestNamedQueryWithName(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); + JavaResourceType resourceType = buildJavaResourceType(cu); - NamedQueriesAnnotation namedQueries = (NamedQueriesAnnotation) typeResource.getAnnotation(JPA.NAMED_QUERIES); - NamedQueryAnnotation namedQuery = namedQueries.getNestedAnnotations().iterator().next(); + NamedQueryAnnotation namedQuery = (NamedQueryAnnotation) resourceType.getAnnotation(0, JPA.NAMED_QUERY); assertEquals(QUERY_NAME, namedQuery.getName()); } public void testSetName() throws Exception { ICompilationUnit cu = this.createTestNamedQueryWithName(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); + JavaResourceType resourceType = buildJavaResourceType(cu); - NamedQueriesAnnotation namedQueries = (NamedQueriesAnnotation) typeResource.getAnnotation(JPA.NAMED_QUERIES); - NamedQueryAnnotation namedQuery = namedQueries.getNestedAnnotations().iterator().next(); + NamedQueryAnnotation namedQuery = (NamedQueryAnnotation) resourceType.getAnnotation(0, JPA.NAMED_QUERY); assertEquals(QUERY_NAME, namedQuery.getName()); namedQuery.setName("foo"); @@ -130,19 +125,17 @@ public class NamedQueriesTests extends JpaJavaResourceModelTestCase { public void testGetQuery() throws Exception { ICompilationUnit cu = this.createTestNamedQueryWithQuery(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); + JavaResourceType resourceType = buildJavaResourceType(cu); - NamedQueriesAnnotation namedQueries = (NamedQueriesAnnotation) typeResource.getAnnotation(JPA.NAMED_QUERIES); - NamedQueryAnnotation namedQuery = namedQueries.getNestedAnnotations().iterator().next(); + NamedQueryAnnotation namedQuery = (NamedQueryAnnotation) resourceType.getAnnotation(0, JPA.NAMED_QUERY); assertEquals(QUERY_QUERY, namedQuery.getQuery()); } public void testSetQuery() throws Exception { ICompilationUnit cu = this.createTestNamedQueryWithQuery(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); + JavaResourceType resourceType = buildJavaResourceType(cu); - NamedQueriesAnnotation namedQueries = (NamedQueriesAnnotation) typeResource.getAnnotation(JPA.NAMED_QUERIES); - NamedQueryAnnotation namedQuery = namedQueries.getNestedAnnotations().iterator().next(); + NamedQueryAnnotation namedQuery = (NamedQueryAnnotation) resourceType.getAnnotation(0, JPA.NAMED_QUERY); assertEquals(QUERY_QUERY, namedQuery.getQuery()); namedQuery.setQuery("foo"); @@ -158,43 +151,39 @@ public class NamedQueriesTests extends JpaJavaResourceModelTestCase { public void testHints() throws Exception { ICompilationUnit cu = this.createTestNamedQueries(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); + JavaResourceType resourceType = buildJavaResourceType(cu); - NamedQueriesAnnotation namedQueries = (NamedQueriesAnnotation) typeResource.getAnnotation(JPA.NAMED_QUERIES); - NamedQueryAnnotation namedQuery = namedQueries.getNestedAnnotations().iterator().next(); + NamedQueryAnnotation namedQuery = (NamedQueryAnnotation) resourceType.getAnnotation(0, JPA.NAMED_QUERY); - assertEquals(0, namedQuery.hintsSize()); + assertEquals(0, namedQuery.getHintsSize()); } public void testHints2() throws Exception { ICompilationUnit cu = this.createTestNamedQueries(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); + JavaResourceType resourceType = buildJavaResourceType(cu); - NamedQueriesAnnotation namedQueries = (NamedQueriesAnnotation) typeResource.getAnnotation(JPA.NAMED_QUERIES); - NamedQueryAnnotation namedQuery = namedQueries.getNestedAnnotations().iterator().next(); + NamedQueryAnnotation namedQuery = (NamedQueryAnnotation) resourceType.getAnnotation(0, JPA.NAMED_QUERY); namedQuery.addHint(0); namedQuery.addHint(1); - assertEquals(2, namedQuery.hintsSize()); + assertEquals(2, namedQuery.getHintsSize()); } public void testHints3() throws Exception { ICompilationUnit cu = this.createTestNamedQueryWithQueryHints(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); + JavaResourceType resourceType = buildJavaResourceType(cu); - NamedQueriesAnnotation namedQueries = (NamedQueriesAnnotation) typeResource.getAnnotation(JPA.NAMED_QUERIES); - NamedQueryAnnotation namedQuery = namedQueries.getNestedAnnotations().iterator().next(); + NamedQueryAnnotation namedQuery = (NamedQueryAnnotation) resourceType.getAnnotation(0, JPA.NAMED_QUERY); - assertEquals(2, namedQuery.hintsSize()); + assertEquals(2, namedQuery.getHintsSize()); } public void testAddHint() throws Exception { ICompilationUnit cu = this.createTestNamedQueries(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); + JavaResourceType resourceType = buildJavaResourceType(cu); - NamedQueriesAnnotation namedQueries = (NamedQueriesAnnotation) typeResource.getAnnotation(JPA.NAMED_QUERIES); - NamedQueryAnnotation namedQuery = namedQueries.getNestedAnnotations().iterator().next(); + NamedQueryAnnotation namedQuery = (NamedQueryAnnotation) resourceType.getAnnotation(0, JPA.NAMED_QUERY); namedQuery.addHint(0).setName("FOO"); namedQuery.addHint(1); @@ -209,123 +198,142 @@ public class NamedQueriesTests extends JpaJavaResourceModelTestCase { public void testRemoveHint() throws Exception { ICompilationUnit cu = this.createTestNamedQueryWithQueryHints(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); + JavaResourceType resourceType = buildJavaResourceType(cu); - NamedQueriesAnnotation namedQueries = (NamedQueriesAnnotation) typeResource.getAnnotation(JPA.NAMED_QUERIES); - NamedQueryAnnotation namedQuery = namedQueries.getNestedAnnotations().iterator().next(); + NamedQueryAnnotation namedQuery = (NamedQueryAnnotation) resourceType.getAnnotation(0, JPA.NAMED_QUERY); namedQuery.addHint(0).setName("BAZ"); assertEquals("BAZ", namedQuery.hintAt(0).getName()); assertEquals("BAR", namedQuery.hintAt(1).getName()); assertNull(namedQuery.hintAt(2).getName()); - assertEquals(3, namedQuery.hintsSize()); + assertEquals(3, namedQuery.getHintsSize()); namedQuery.removeHint(2); assertEquals("BAZ", namedQuery.hintAt(0).getName()); assertEquals("BAR", namedQuery.hintAt(1).getName()); - assertEquals(2, namedQuery.hintsSize()); + assertEquals(2, namedQuery.getHintsSize()); assertSourceContains("@NamedQueries(@NamedQuery(hints = {@QueryHint(name = \"BAZ\"), @QueryHint(name = \"BAR\", value = \"FOO\")}))", cu); namedQuery.removeHint(0); assertEquals("BAR", namedQuery.hintAt(0).getName()); - assertEquals(1, namedQuery.hintsSize()); + assertEquals(1, namedQuery.getHintsSize()); assertSourceContains("@NamedQueries(@NamedQuery(hints = @QueryHint(name = \"BAR\", value = \"FOO\")))", cu); namedQuery.removeHint(0); - assertEquals(0, namedQuery.hintsSize()); + assertEquals(0, namedQuery.getHintsSize()); assertSourceDoesNotContain("@NamedQuery(", cu); } public void testMoveHint() throws Exception { ICompilationUnit cu = this.createTestNamedQueryWithQueryHints(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); + JavaResourceType resourceType = buildJavaResourceType(cu); - NamedQueriesAnnotation namedQueries = (NamedQueriesAnnotation) typeResource.getAnnotation(JPA.NAMED_QUERIES); - NamedQueryAnnotation namedQuery = namedQueries.getNestedAnnotations().iterator().next(); + NamedQueryAnnotation namedQuery = (NamedQueryAnnotation) resourceType.getAnnotation(0, JPA.NAMED_QUERY); namedQuery.addHint(0).setName("BAZ"); assertEquals("BAZ", namedQuery.hintAt(0).getName()); assertEquals("BAR", namedQuery.hintAt(1).getName()); assertNull(namedQuery.hintAt(2).getName()); - assertEquals(3, namedQuery.hintsSize()); + assertEquals(3, namedQuery.getHintsSize()); namedQuery.moveHint(2, 0); assertEquals("BAR", namedQuery.hintAt(0).getName()); assertNull(namedQuery.hintAt(1).getName()); assertEquals("BAZ", namedQuery.hintAt(2).getName()); - assertEquals(3, namedQuery.hintsSize()); + assertEquals(3, namedQuery.getHintsSize()); assertSourceContains("@NamedQueries(@NamedQuery(hints = {@QueryHint(name = \"BAR\", value = \"FOO\"), @QueryHint, @QueryHint(name = \"BAZ\")}))", cu); } public void testMoveHint2() throws Exception { ICompilationUnit cu = this.createTestNamedQueryWithQueryHints(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); + JavaResourceType resourceType = buildJavaResourceType(cu); - NamedQueriesAnnotation namedQueries = (NamedQueriesAnnotation) typeResource.getAnnotation(JPA.NAMED_QUERIES); - NamedQueryAnnotation namedQuery = namedQueries.getNestedAnnotations().iterator().next(); + NamedQueryAnnotation namedQuery = (NamedQueryAnnotation) resourceType.getAnnotation(0, JPA.NAMED_QUERY); namedQuery.addHint(0).setName("BAZ"); assertEquals("BAZ", namedQuery.hintAt(0).getName()); assertEquals("BAR", namedQuery.hintAt(1).getName()); assertNull(namedQuery.hintAt(2).getName()); - assertEquals(3, namedQuery.hintsSize()); + assertEquals(3, namedQuery.getHintsSize()); namedQuery.moveHint(0, 2); assertNull(namedQuery.hintAt(0).getName()); assertEquals("BAZ", namedQuery.hintAt(1).getName()); assertEquals("BAR", namedQuery.hintAt(2).getName()); - assertEquals(3, namedQuery.hintsSize()); + assertEquals(3, namedQuery.getHintsSize()); assertSourceContains("@NamedQueries(@NamedQuery(hints = {@QueryHint, @QueryHint(name = \"BAZ\"), @QueryHint(name = \"BAR\", value = \"FOO\")}))", cu); } public void testAddNamedQueryCopyExisting() throws Exception { ICompilationUnit cu = createTestNamedQuery(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); + JavaResourceType resourceType = buildJavaResourceType(cu); - NamedQueryAnnotation namedQuery = (NamedQueryAnnotation) typeResource.addAnnotation(1, JPA.NAMED_QUERY, JPA.NAMED_QUERIES); + String expected1 = "@NamedQueries({"; + String expected2 = "@NamedQuery(name = \"foo\", query = \"bar\", hints = @QueryHint(name = \"BAR\", value = \"FOO\")),"; + String expected3 = "@NamedQuery(name = \"BAR\") })"; + NamedQueryAnnotation namedQuery = (NamedQueryAnnotation) resourceType.addAnnotation(1, JPA.NAMED_QUERY); namedQuery.setName("BAR"); - assertSourceContains("@NamedQueries({@NamedQuery(name = \"foo\", query = \"bar\", hints = @QueryHint(name = \"BAR\", value = \"FOO\")),@NamedQuery(name = \"BAR\")})", cu); - - assertNull(typeResource.getAnnotation(JPA.NAMED_QUERY)); - assertNotNull(typeResource.getAnnotation(JPA.NAMED_QUERIES)); - assertEquals(2, CollectionTools.size(typeResource.annotations(JPA.NAMED_QUERY, JPA.NAMED_QUERIES))); + assertSourceContains(expected1, cu); + assertSourceContains(expected2, cu); + assertSourceContains(expected3, cu); + + assertNull(resourceType.getAnnotation(JPA.NAMED_QUERY)); + assertNotNull(resourceType.getAnnotation(JPA.NAMED_QUERIES)); + assertNotNull(resourceType.getAnnotation(0, JPA.NAMED_QUERY)); + assertEquals(2, resourceType.getAnnotationsSize(JPA.NAMED_QUERY)); } public void testAddNamedQueryToBeginningOfList() throws Exception { ICompilationUnit cu = createTestNamedQuery(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); + JavaResourceType resourceType = buildJavaResourceType(cu); - NamedQueryAnnotation namedQuery = (NamedQueryAnnotation) typeResource.addAnnotation(1, JPA.NAMED_QUERY, JPA.NAMED_QUERIES); + String expected1 = "@NamedQueries({"; + String expected2 = "@NamedQuery(name = \"foo\", query = \"bar\", hints = @QueryHint(name = \"BAR\", value = \"FOO\")),"; + String expected3 = "@NamedQuery(name = \"BAR\") })"; + NamedQueryAnnotation namedQuery = (NamedQueryAnnotation) resourceType.addAnnotation(1, JPA.NAMED_QUERY); namedQuery.setName("BAR"); - assertSourceContains("@NamedQueries({@NamedQuery(name = \"foo\", query = \"bar\", hints = @QueryHint(name = \"BAR\", value = \"FOO\")),@NamedQuery(name = \"BAR\")})", cu); + assertSourceContains(expected1, cu); + assertSourceContains(expected2, cu); + assertSourceContains(expected3, cu); - namedQuery = (NamedQueryAnnotation) typeResource.addAnnotation(0, JPA.NAMED_QUERY, JPA.NAMED_QUERIES); + expected2 = "@NamedQuery(name = \"BAZ\"),"; + expected3 = "@NamedQuery(name = \"foo\", query = \"bar\", hints = @QueryHint(name = \"BAR\", value = \"FOO\")), @NamedQuery(name = \"BAR\") })"; + namedQuery = (NamedQueryAnnotation) resourceType.addAnnotation(0, JPA.NAMED_QUERY); namedQuery.setName("BAZ"); - assertSourceContains("@NamedQueries({@NamedQuery(name = \"BAZ\"),@NamedQuery(name = \"foo\", query = \"bar\", hints = @QueryHint(name = \"BAR\", value = \"FOO\")), @NamedQuery(name = \"BAR\")})", cu); + assertSourceContains(expected1, cu); + assertSourceContains(expected2, cu); + assertSourceContains(expected3, cu); - Iterator namedQueries = typeResource.annotations(JPA.NAMED_QUERY, JPA.NAMED_QUERIES); + Iterator namedQueries = resourceType.getAnnotations(JPA.NAMED_QUERY).iterator(); assertEquals("BAZ", ((NamedQueryAnnotation) namedQueries.next()).getName()); assertEquals("foo", ((NamedQueryAnnotation) namedQueries.next()).getName()); assertEquals("BAR", ((NamedQueryAnnotation) namedQueries.next()).getName()); - assertNull(typeResource.getAnnotation(JPA.NAMED_QUERY)); - assertNotNull(typeResource.getAnnotation(JPA.NAMED_QUERIES)); - assertEquals(3, CollectionTools.size(typeResource.annotations(JPA.NAMED_QUERY, JPA.NAMED_QUERIES))); + assertNull(resourceType.getAnnotation(JPA.NAMED_QUERY)); + assertNotNull(resourceType.getAnnotation(JPA.NAMED_QUERIES)); + assertNotNull(resourceType.getAnnotation(0, JPA.NAMED_QUERY)); + assertEquals(3, resourceType.getAnnotationsSize(JPA.NAMED_QUERY)); } public void testRemoveNamedQueryCopyExisting() throws Exception { ICompilationUnit cu = createTestNamedQuery(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); + JavaResourceType resourceType = buildJavaResourceType(cu); - NamedQueryAnnotation namedQuery = (NamedQueryAnnotation) typeResource.addAnnotation(1, JPA.NAMED_QUERY, JPA.NAMED_QUERIES); + String expected1 = "@NamedQueries({"; + String expected2 = "@NamedQuery(name = \"foo\", query = \"bar\", hints = @QueryHint(name = \"BAR\", value = \"FOO\")),"; + String expected3 = "@NamedQuery(name = \"BAR\") })"; + NamedQueryAnnotation namedQuery = (NamedQueryAnnotation) resourceType.addAnnotation(1, JPA.NAMED_QUERY); namedQuery.setName("BAR"); - assertSourceContains("@NamedQueries({@NamedQuery(name = \"foo\", query = \"bar\", hints = @QueryHint(name = \"BAR\", value = \"FOO\")),@NamedQuery(name = \"BAR\")})", cu); - - typeResource.removeAnnotation(1, JPA.NAMED_QUERY, JPA.NAMED_QUERIES); - assertSourceContains("@NamedQuery(name = \"foo\", query = \"bar\", hints = @QueryHint(name = \"BAR\", value = \"FOO\"))", cu); + assertSourceContains(expected1, cu); + assertSourceContains(expected2, cu); + assertSourceContains(expected3, cu); + + expected1 = "@NamedQuery(name = \"foo\", query = \"bar\", hints = @QueryHint(name = \"BAR\", value = \"FOO\"))"; + resourceType.removeAnnotation(1, JPA.NAMED_QUERY); + assertSourceContains(expected1, cu); + assertSourceDoesNotContain("@NamedNativeQueries", cu); } - } diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/NamedQueryTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/NamedQueryTests.java index 08598e2a0e..6a1491711c 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/NamedQueryTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/NamedQueryTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2009 Oracle. All rights reserved. + * Copyright (c) 2007, 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,9 +12,9 @@ package org.eclipse.jpt.jpa.core.tests.internal.resource.java; import java.util.Iterator; import java.util.ListIterator; import org.eclipse.jdt.core.ICompilationUnit; +import org.eclipse.jpt.common.core.resource.java.JavaResourceType; import org.eclipse.jpt.common.utility.internal.iterators.ArrayIterator; 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.NamedQueryAnnotation; import org.eclipse.jpt.jpa.core.resource.java.QueryHintAnnotation; @@ -77,25 +77,25 @@ public class NamedQueryTests extends JpaJavaResourceModelTestCase { public void testNamedQuery() throws Exception { ICompilationUnit cu = this.createTestNamedQuery(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); + JavaResourceType resourceType = buildJavaResourceType(cu); - NamedQueryAnnotation namedQuery = (NamedQueryAnnotation) typeResource.getAnnotation(JPA.NAMED_QUERY); + NamedQueryAnnotation namedQuery = (NamedQueryAnnotation) resourceType.getAnnotation(0, JPA.NAMED_QUERY); assertNotNull(namedQuery); } public void testGetName() throws Exception { ICompilationUnit cu = this.createTestNamedQueryWithName(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); + JavaResourceType resourceType = buildJavaResourceType(cu); - NamedQueryAnnotation namedQuery = (NamedQueryAnnotation) typeResource.getAnnotation(JPA.NAMED_QUERY); + NamedQueryAnnotation namedQuery = (NamedQueryAnnotation) resourceType.getAnnotation(0, JPA.NAMED_QUERY); assertEquals(QUERY_NAME, namedQuery.getName()); } public void testSetName() throws Exception { ICompilationUnit cu = this.createTestNamedQueryWithName(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); + JavaResourceType resourceType = buildJavaResourceType(cu); - NamedQueryAnnotation namedQuery = (NamedQueryAnnotation) typeResource.getAnnotation(JPA.NAMED_QUERY); + NamedQueryAnnotation namedQuery = (NamedQueryAnnotation) resourceType.getAnnotation(0, JPA.NAMED_QUERY); assertEquals(QUERY_NAME, namedQuery.getName()); namedQuery.setName("foo"); @@ -111,17 +111,17 @@ public class NamedQueryTests extends JpaJavaResourceModelTestCase { public void testGetQuery() throws Exception { ICompilationUnit cu = this.createTestNamedQueryWithQuery(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); + JavaResourceType resourceType = buildJavaResourceType(cu); - NamedQueryAnnotation namedQuery = (NamedQueryAnnotation) typeResource.getAnnotation(JPA.NAMED_QUERY); + NamedQueryAnnotation namedQuery = (NamedQueryAnnotation) resourceType.getAnnotation(0, JPA.NAMED_QUERY); assertEquals(QUERY_QUERY, namedQuery.getQuery()); } public void testSetQuery() throws Exception { ICompilationUnit cu = this.createTestNamedQueryWithQuery(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); + JavaResourceType resourceType = buildJavaResourceType(cu); - NamedQueryAnnotation namedQuery = (NamedQueryAnnotation) typeResource.getAnnotation(JPA.NAMED_QUERY); + NamedQueryAnnotation namedQuery = (NamedQueryAnnotation) resourceType.getAnnotation(0, JPA.NAMED_QUERY); assertEquals(QUERY_QUERY, namedQuery.getQuery()); namedQuery.setQuery("foo"); @@ -137,43 +137,43 @@ public class NamedQueryTests extends JpaJavaResourceModelTestCase { public void testHints() throws Exception { ICompilationUnit cu = this.createTestNamedQuery(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); + JavaResourceType resourceType = buildJavaResourceType(cu); - NamedQueryAnnotation namedQuery = (NamedQueryAnnotation) typeResource.getAnnotation(JPA.NAMED_QUERY); + NamedQueryAnnotation namedQuery = (NamedQueryAnnotation) resourceType.getAnnotation(0, JPA.NAMED_QUERY); - assertEquals(0, namedQuery.hintsSize()); + assertEquals(0, namedQuery.getHintsSize()); } public void testHints2() throws Exception { ICompilationUnit cu = this.createTestNamedQuery(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); + JavaResourceType resourceType = buildJavaResourceType(cu); - NamedQueryAnnotation namedQuery = (NamedQueryAnnotation) typeResource.getAnnotation(JPA.NAMED_QUERY); + NamedQueryAnnotation namedQuery = (NamedQueryAnnotation) resourceType.getAnnotation(0, JPA.NAMED_QUERY); namedQuery.addHint(0); namedQuery.addHint(1); - assertEquals(2, namedQuery.hintsSize()); + assertEquals(2, namedQuery.getHintsSize()); } public void testHints3() throws Exception { ICompilationUnit cu = this.createTestNamedQueryWithQueryHints(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); + JavaResourceType resourceType = buildJavaResourceType(cu); - NamedQueryAnnotation namedQuery = (NamedQueryAnnotation) typeResource.getAnnotation(JPA.NAMED_QUERY); + NamedQueryAnnotation namedQuery = (NamedQueryAnnotation) resourceType.getAnnotation(0, JPA.NAMED_QUERY); - assertEquals(2, namedQuery.hintsSize()); + assertEquals(2, namedQuery.getHintsSize()); - ListIterator iterator = namedQuery.hints(); + ListIterator iterator = namedQuery.getHints().iterator(); assertEquals("BAR", iterator.next().getName()); assertNull(iterator.next().getName()); } public void testAddHint() throws Exception { ICompilationUnit cu = this.createTestNamedQuery(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - - NamedQueryAnnotation namedQuery = (NamedQueryAnnotation) typeResource.getAnnotation(JPA.NAMED_QUERY); + JavaResourceType resourceType = buildJavaResourceType(cu); + + NamedQueryAnnotation namedQuery = (NamedQueryAnnotation) resourceType.getAnnotation(0, JPA.NAMED_QUERY); namedQuery.addHint(0).setName("FOO"); namedQuery.addHint(1); @@ -188,71 +188,71 @@ public class NamedQueryTests extends JpaJavaResourceModelTestCase { public void testRemoveHint() throws Exception { ICompilationUnit cu = this.createTestNamedQueryWithQueryHints(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); + JavaResourceType resourceType = buildJavaResourceType(cu); - NamedQueryAnnotation namedQuery = (NamedQueryAnnotation) typeResource.getAnnotation(JPA.NAMED_QUERY); + NamedQueryAnnotation namedQuery = (NamedQueryAnnotation) resourceType.getAnnotation(0, JPA.NAMED_QUERY); namedQuery.addHint(0).setName("BAZ"); assertEquals("BAZ", namedQuery.hintAt(0).getName()); assertEquals("BAR", namedQuery.hintAt(1).getName()); assertNull(namedQuery.hintAt(2).getName()); - assertEquals(3, namedQuery.hintsSize()); + assertEquals(3, namedQuery.getHintsSize()); namedQuery.removeHint(2); assertEquals("BAZ", namedQuery.hintAt(0).getName()); assertEquals("BAR", namedQuery.hintAt(1).getName()); - assertEquals(2, namedQuery.hintsSize()); + assertEquals(2, namedQuery.getHintsSize()); assertSourceContains("@NamedQuery(hints = {@QueryHint(name = \"BAZ\"), @QueryHint(name = \"BAR\", value = \"FOO\")})", cu); namedQuery.removeHint(0); assertEquals("BAR", namedQuery.hintAt(0).getName()); - assertEquals(1, namedQuery.hintsSize()); + assertEquals(1, namedQuery.getHintsSize()); assertSourceContains("@NamedQuery(hints = @QueryHint(name = \"BAR\", value = \"FOO\"))", cu); namedQuery.removeHint(0); - assertEquals(0, namedQuery.hintsSize()); + assertEquals(0, namedQuery.getHintsSize()); assertSourceDoesNotContain("@NamedQuery(", cu); } public void testMoveHint() throws Exception { ICompilationUnit cu = this.createTestNamedQueryWithQueryHints(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); + JavaResourceType resourceType = buildJavaResourceType(cu); - NamedQueryAnnotation namedQuery = (NamedQueryAnnotation) typeResource.getAnnotation(JPA.NAMED_QUERY); + NamedQueryAnnotation namedQuery = (NamedQueryAnnotation) resourceType.getAnnotation(0, JPA.NAMED_QUERY); namedQuery.addHint(0).setName("BAZ"); assertEquals("BAZ", namedQuery.hintAt(0).getName()); assertEquals("BAR", namedQuery.hintAt(1).getName()); assertNull(namedQuery.hintAt(2).getName()); - assertEquals(3, namedQuery.hintsSize()); + assertEquals(3, namedQuery.getHintsSize()); namedQuery.moveHint(2, 0); assertEquals("BAR", namedQuery.hintAt(0).getName()); assertNull(namedQuery.hintAt(1).getName()); assertEquals("BAZ", namedQuery.hintAt(2).getName()); - assertEquals(3, namedQuery.hintsSize()); + assertEquals(3, namedQuery.getHintsSize()); assertSourceContains("@NamedQuery(hints = {@QueryHint(name = \"BAR\", value = \"FOO\"), @QueryHint, @QueryHint(name = \"BAZ\")})", cu); } public void testMoveHint2() throws Exception { ICompilationUnit cu = this.createTestNamedQueryWithQueryHints(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); + JavaResourceType resourceType = buildJavaResourceType(cu); - NamedQueryAnnotation namedQuery = (NamedQueryAnnotation) typeResource.getAnnotation(JPA.NAMED_QUERY); + NamedQueryAnnotation namedQuery = (NamedQueryAnnotation) resourceType.getAnnotation(0, JPA.NAMED_QUERY); namedQuery.addHint(0).setName("BAZ"); assertEquals("BAZ", namedQuery.hintAt(0).getName()); assertEquals("BAR", namedQuery.hintAt(1).getName()); assertNull(namedQuery.hintAt(2).getName()); - assertEquals(3, namedQuery.hintsSize()); + assertEquals(3, namedQuery.getHintsSize()); namedQuery.moveHint(0, 2); assertNull(namedQuery.hintAt(0).getName()); assertEquals("BAZ", namedQuery.hintAt(1).getName()); assertEquals("BAR", namedQuery.hintAt(2).getName()); - assertEquals(3, namedQuery.hintsSize()); + assertEquals(3, namedQuery.getHintsSize()); assertSourceContains("@NamedQuery(hints = {@QueryHint, @QueryHint(name = \"BAZ\"), @QueryHint(name = \"BAR\", value = \"FOO\")})", cu); } diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/OneToManyTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/OneToManyTests.java index de7de6bb79..88e6f08235 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/OneToManyTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/OneToManyTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2009 Oracle. All rights reserved. + * Copyright (c) 2007, 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. @@ -11,11 +11,12 @@ package org.eclipse.jpt.jpa.core.tests.internal.resource.java; import java.util.Iterator; import org.eclipse.jdt.core.ICompilationUnit; +import org.eclipse.jpt.common.core.resource.java.JavaResourceField; +import org.eclipse.jpt.common.core.resource.java.JavaResourceType; +import org.eclipse.jpt.common.utility.internal.CollectionTools; import org.eclipse.jpt.common.utility.internal.iterators.ArrayIterator; import org.eclipse.jpt.jpa.core.resource.java.FetchType; 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.OneToManyAnnotation; @SuppressWarnings("nls") @@ -118,28 +119,28 @@ public class OneToManyTests extends JpaJavaResourceModelTestCase { public void testOneToMany() throws Exception { ICompilationUnit cu = this.createTestOneToMany(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - OneToManyAnnotation oneToMany = (OneToManyAnnotation) attributeResource.getAnnotation(JPA.ONE_TO_MANY); + OneToManyAnnotation oneToMany = (OneToManyAnnotation) resourceField.getAnnotation(JPA.ONE_TO_MANY); assertNotNull(oneToMany); } public void testGetFetch() throws Exception { ICompilationUnit cu = this.createTestOneToManyWithFetch(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - OneToManyAnnotation oneToMany = (OneToManyAnnotation) attributeResource.getAnnotation(JPA.ONE_TO_MANY); + OneToManyAnnotation oneToMany = (OneToManyAnnotation) resourceField.getAnnotation(JPA.ONE_TO_MANY); assertEquals(FetchType.EAGER, oneToMany.getFetch()); } public void testSetFetch() throws Exception { ICompilationUnit cu = this.createTestOneToManyWithFetch(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - OneToManyAnnotation oneToMany = (OneToManyAnnotation) attributeResource.getAnnotation(JPA.ONE_TO_MANY); + OneToManyAnnotation oneToMany = (OneToManyAnnotation) resourceField.getAnnotation(JPA.ONE_TO_MANY); assertEquals(FetchType.EAGER, oneToMany.getFetch()); oneToMany.setFetch(FetchType.LAZY); @@ -150,10 +151,10 @@ public class OneToManyTests extends JpaJavaResourceModelTestCase { public void testSetFetchNull() throws Exception { ICompilationUnit cu = this.createTestOneToManyWithFetch(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - OneToManyAnnotation oneToMany = (OneToManyAnnotation) attributeResource.getAnnotation(JPA.ONE_TO_MANY); + OneToManyAnnotation oneToMany = (OneToManyAnnotation) resourceField.getAnnotation(JPA.ONE_TO_MANY); assertEquals(FetchType.EAGER, oneToMany.getFetch()); oneToMany.setFetch(null); @@ -166,19 +167,19 @@ public class OneToManyTests extends JpaJavaResourceModelTestCase { public void testGetTargetEntity() throws Exception { ICompilationUnit cu = this.createTestOneToManyWithTargetEntity(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - OneToManyAnnotation oneToMany = (OneToManyAnnotation) attributeResource.getAnnotation(JPA.ONE_TO_MANY); + OneToManyAnnotation oneToMany = (OneToManyAnnotation) resourceField.getAnnotation(JPA.ONE_TO_MANY); assertEquals(TYPE_NAME, oneToMany.getTargetEntity()); } public void testSetTargetEntity() throws Exception { ICompilationUnit cu = this.createTestOneToManyWithTargetEntity(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - OneToManyAnnotation oneToMany = (OneToManyAnnotation) attributeResource.getAnnotation(JPA.ONE_TO_MANY); + OneToManyAnnotation oneToMany = (OneToManyAnnotation) resourceField.getAnnotation(JPA.ONE_TO_MANY); assertEquals(TYPE_NAME, oneToMany.getTargetEntity()); oneToMany.setTargetEntity("Foo"); @@ -188,10 +189,10 @@ public class OneToManyTests extends JpaJavaResourceModelTestCase { public void testSetTargetEntityNull() throws Exception { ICompilationUnit cu = this.createTestOneToManyWithTargetEntity(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - OneToManyAnnotation oneToMany = (OneToManyAnnotation) attributeResource.getAnnotation(JPA.ONE_TO_MANY); + OneToManyAnnotation oneToMany = (OneToManyAnnotation) resourceField.getAnnotation(JPA.ONE_TO_MANY); assertEquals(TYPE_NAME, oneToMany.getTargetEntity()); oneToMany.setTargetEntity(null); @@ -203,10 +204,10 @@ public class OneToManyTests extends JpaJavaResourceModelTestCase { public void testGetFullyQualifiedTargetEntity() throws Exception { ICompilationUnit cu = this.createTestOneToManyWithTargetEntity(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - OneToManyAnnotation oneToMany = (OneToManyAnnotation) attributeResource.getAnnotation(JPA.ONE_TO_MANY); + OneToManyAnnotation oneToMany = (OneToManyAnnotation) resourceField.getAnnotation(JPA.ONE_TO_MANY); assertEquals(FULLY_QUALIFIED_TYPE_NAME, oneToMany.getFullyQualifiedTargetEntityClassName()); oneToMany.setTargetEntity("Foo"); @@ -220,29 +221,29 @@ public class OneToManyTests extends JpaJavaResourceModelTestCase { public void testGetMappedBy() throws Exception { ICompilationUnit cu = this.createTestOneToManyWithMappedBy(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - OneToManyAnnotation oneToMany = (OneToManyAnnotation) attributeResource.getAnnotation(JPA.ONE_TO_MANY); + OneToManyAnnotation oneToMany = (OneToManyAnnotation) resourceField.getAnnotation(JPA.ONE_TO_MANY); assertEquals("foo", oneToMany.getMappedBy()); } public void testGetMappedByNull() throws Exception { ICompilationUnit cu = this.createTestOneToMany(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - OneToManyAnnotation oneToMany = (OneToManyAnnotation) attributeResource.getAnnotation(JPA.ONE_TO_MANY); + OneToManyAnnotation oneToMany = (OneToManyAnnotation) resourceField.getAnnotation(JPA.ONE_TO_MANY); assertEquals(null, oneToMany.getMappedBy()); } public void testSetMappedBy() throws Exception { ICompilationUnit cu = this.createTestOneToMany(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - OneToManyAnnotation oneToMany = (OneToManyAnnotation) attributeResource.getAnnotation(JPA.ONE_TO_MANY); + OneToManyAnnotation oneToMany = (OneToManyAnnotation) resourceField.getAnnotation(JPA.ONE_TO_MANY); assertNull(oneToMany.getMappedBy()); oneToMany.setMappedBy("bar"); assertEquals("bar", oneToMany.getMappedBy()); @@ -252,10 +253,10 @@ public class OneToManyTests extends JpaJavaResourceModelTestCase { public void testSetMappedByNull() throws Exception { ICompilationUnit cu = this.createTestOneToManyWithMappedBy(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - OneToManyAnnotation oneToMany = (OneToManyAnnotation) attributeResource.getAnnotation(JPA.ONE_TO_MANY); + OneToManyAnnotation oneToMany = (OneToManyAnnotation) resourceField.getAnnotation(JPA.ONE_TO_MANY); assertEquals("foo", oneToMany.getMappedBy()); oneToMany.setMappedBy(null); @@ -267,10 +268,10 @@ public class OneToManyTests extends JpaJavaResourceModelTestCase { public void testSetCascadeAll() throws Exception { ICompilationUnit cu = this.createTestOneToMany(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - OneToManyAnnotation oneToMany = (OneToManyAnnotation) attributeResource.getAnnotation(JPA.ONE_TO_MANY); + OneToManyAnnotation oneToMany = (OneToManyAnnotation) resourceField.getAnnotation(JPA.ONE_TO_MANY); assertFalse(oneToMany.isCascadeAll()); oneToMany.setCascadeAll(true); @@ -281,10 +282,10 @@ public class OneToManyTests extends JpaJavaResourceModelTestCase { public void testSetCascadeMerge() throws Exception { ICompilationUnit cu = this.createTestOneToMany(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - OneToManyAnnotation oneToMany = (OneToManyAnnotation) attributeResource.getAnnotation(JPA.ONE_TO_MANY); + OneToManyAnnotation oneToMany = (OneToManyAnnotation) resourceField.getAnnotation(JPA.ONE_TO_MANY); assertFalse(oneToMany.isCascadeMerge()); oneToMany.setCascadeMerge(true); @@ -295,10 +296,10 @@ public class OneToManyTests extends JpaJavaResourceModelTestCase { public void testSetCascadePersist() throws Exception { ICompilationUnit cu = this.createTestOneToMany(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - OneToManyAnnotation oneToMany = (OneToManyAnnotation) attributeResource.getAnnotation(JPA.ONE_TO_MANY); + OneToManyAnnotation oneToMany = (OneToManyAnnotation) resourceField.getAnnotation(JPA.ONE_TO_MANY); assertFalse(oneToMany.isCascadePersist()); oneToMany.setCascadePersist(true); @@ -309,10 +310,10 @@ public class OneToManyTests extends JpaJavaResourceModelTestCase { public void testSetCascadeRemove() throws Exception { ICompilationUnit cu = this.createTestOneToMany(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - OneToManyAnnotation oneToMany = (OneToManyAnnotation) attributeResource.getAnnotation(JPA.ONE_TO_MANY); + OneToManyAnnotation oneToMany = (OneToManyAnnotation) resourceField.getAnnotation(JPA.ONE_TO_MANY); assertFalse(oneToMany.isCascadeRemove()); oneToMany.setCascadeRemove(true); @@ -323,10 +324,10 @@ public class OneToManyTests extends JpaJavaResourceModelTestCase { public void testSetCascadeRefresh() throws Exception { ICompilationUnit cu = this.createTestOneToMany(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - OneToManyAnnotation oneToMany = (OneToManyAnnotation) attributeResource.getAnnotation(JPA.ONE_TO_MANY); + OneToManyAnnotation oneToMany = (OneToManyAnnotation) resourceField.getAnnotation(JPA.ONE_TO_MANY); assertFalse(oneToMany.isCascadeRefresh()); oneToMany.setCascadeRefresh(true); @@ -337,10 +338,10 @@ public class OneToManyTests extends JpaJavaResourceModelTestCase { public void testCascadeMoreThanOnce() throws Exception { ICompilationUnit cu = this.createTestOneToManyWithCascade(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - OneToManyAnnotation oneToMany = (OneToManyAnnotation) attributeResource.getAnnotation(JPA.ONE_TO_MANY); + OneToManyAnnotation oneToMany = (OneToManyAnnotation) resourceField.getAnnotation(JPA.ONE_TO_MANY); assertTrue(oneToMany.isCascadeAll()); oneToMany.setCascadeAll(true); @@ -362,10 +363,10 @@ public class OneToManyTests extends JpaJavaResourceModelTestCase { public void testDuplicateCascade() throws Exception { ICompilationUnit cu = this.createTestOneToManyWithDuplicateCascade(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - OneToManyAnnotation oneToMany = (OneToManyAnnotation) attributeResource.getAnnotation(JPA.ONE_TO_MANY); + OneToManyAnnotation oneToMany = (OneToManyAnnotation) resourceField.getAnnotation(JPA.ONE_TO_MANY); assertTrue(oneToMany.isCascadeMerge()); oneToMany.setCascadeMerge(false);//TODO should the resource model handle this and remove both MERGE @@ -380,10 +381,10 @@ public class OneToManyTests extends JpaJavaResourceModelTestCase { public void testMultipleCascade() throws Exception { ICompilationUnit cu = this.createTestOneToManyWithMultipleCascade(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - OneToManyAnnotation oneToMany = (OneToManyAnnotation) attributeResource.getAnnotation(JPA.ONE_TO_MANY); + OneToManyAnnotation oneToMany = (OneToManyAnnotation) resourceField.getAnnotation(JPA.ONE_TO_MANY); assertTrue(oneToMany.isCascadeMerge()); assertTrue(oneToMany.isCascadeRemove()); diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/OneToOneTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/OneToOneTests.java index ba14b802b8..fe0f567469 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/OneToOneTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/OneToOneTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2009 Oracle. All rights reserved. + * Copyright (c) 2007, 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. @@ -11,11 +11,12 @@ package org.eclipse.jpt.jpa.core.tests.internal.resource.java; import java.util.Iterator; import org.eclipse.jdt.core.ICompilationUnit; +import org.eclipse.jpt.common.core.resource.java.JavaResourceField; +import org.eclipse.jpt.common.core.resource.java.JavaResourceType; +import org.eclipse.jpt.common.utility.internal.CollectionTools; import org.eclipse.jpt.common.utility.internal.iterators.ArrayIterator; import org.eclipse.jpt.jpa.core.resource.java.FetchType; 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.OneToOneAnnotation; @SuppressWarnings("nls") @@ -131,28 +132,28 @@ public class OneToOneTests extends JpaJavaResourceModelTestCase { public void testOneToOne() throws Exception { ICompilationUnit cu = this.createTestOneToOne(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - OneToOneAnnotation oneToOne = (OneToOneAnnotation) attributeResource.getAnnotation(JPA.ONE_TO_ONE); + OneToOneAnnotation oneToOne = (OneToOneAnnotation) resourceField.getAnnotation(JPA.ONE_TO_ONE); assertNotNull(oneToOne); } public void testGetFetch() throws Exception { ICompilationUnit cu = this.createTestOneToOneWithFetch(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - OneToOneAnnotation oneToOne = (OneToOneAnnotation) attributeResource.getAnnotation(JPA.ONE_TO_ONE); + OneToOneAnnotation oneToOne = (OneToOneAnnotation) resourceField.getAnnotation(JPA.ONE_TO_ONE); assertEquals(FetchType.EAGER, oneToOne.getFetch()); } public void testSetFetch() throws Exception { ICompilationUnit cu = this.createTestOneToOneWithFetch(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - OneToOneAnnotation oneToOne = (OneToOneAnnotation) attributeResource.getAnnotation(JPA.ONE_TO_ONE); + OneToOneAnnotation oneToOne = (OneToOneAnnotation) resourceField.getAnnotation(JPA.ONE_TO_ONE); assertEquals(FetchType.EAGER, oneToOne.getFetch()); oneToOne.setFetch(FetchType.LAZY); @@ -163,10 +164,10 @@ public class OneToOneTests extends JpaJavaResourceModelTestCase { public void testSetFetchNull() throws Exception { ICompilationUnit cu = this.createTestOneToOneWithFetch(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - OneToOneAnnotation oneToOne = (OneToOneAnnotation) attributeResource.getAnnotation(JPA.ONE_TO_ONE); + OneToOneAnnotation oneToOne = (OneToOneAnnotation) resourceField.getAnnotation(JPA.ONE_TO_ONE); assertEquals(FetchType.EAGER, oneToOne.getFetch()); oneToOne.setFetch(null); @@ -179,19 +180,19 @@ public class OneToOneTests extends JpaJavaResourceModelTestCase { public void testGetTargetEntity() throws Exception { ICompilationUnit cu = this.createTestOneToOneWithTargetEntity(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - OneToOneAnnotation oneToOne = (OneToOneAnnotation) attributeResource.getAnnotation(JPA.ONE_TO_ONE); + OneToOneAnnotation oneToOne = (OneToOneAnnotation) resourceField.getAnnotation(JPA.ONE_TO_ONE); assertEquals(TYPE_NAME, oneToOne.getTargetEntity()); } public void testSetTargetEntity() throws Exception { ICompilationUnit cu = this.createTestOneToOneWithTargetEntity(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - OneToOneAnnotation oneToOne = (OneToOneAnnotation) attributeResource.getAnnotation(JPA.ONE_TO_ONE); + OneToOneAnnotation oneToOne = (OneToOneAnnotation) resourceField.getAnnotation(JPA.ONE_TO_ONE); assertEquals(TYPE_NAME, oneToOne.getTargetEntity()); oneToOne.setTargetEntity("Foo"); @@ -201,10 +202,10 @@ public class OneToOneTests extends JpaJavaResourceModelTestCase { public void testSetTargetEntityNull() throws Exception { ICompilationUnit cu = this.createTestOneToOneWithTargetEntity(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - OneToOneAnnotation oneToOne = (OneToOneAnnotation) attributeResource.getAnnotation(JPA.ONE_TO_ONE); + OneToOneAnnotation oneToOne = (OneToOneAnnotation) resourceField.getAnnotation(JPA.ONE_TO_ONE); assertEquals(TYPE_NAME, oneToOne.getTargetEntity()); oneToOne.setTargetEntity(null); @@ -216,10 +217,10 @@ public class OneToOneTests extends JpaJavaResourceModelTestCase { public void testGetFullyQualifiedTargetEntity() throws Exception { ICompilationUnit cu = this.createTestOneToOneWithTargetEntity(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - OneToOneAnnotation oneToOne = (OneToOneAnnotation) attributeResource.getAnnotation(JPA.ONE_TO_ONE); + OneToOneAnnotation oneToOne = (OneToOneAnnotation) resourceField.getAnnotation(JPA.ONE_TO_ONE); assertEquals(FULLY_QUALIFIED_TYPE_NAME, oneToOne.getFullyQualifiedTargetEntityClassName()); oneToOne.setTargetEntity("Foo"); @@ -233,19 +234,19 @@ public class OneToOneTests extends JpaJavaResourceModelTestCase { public void testGetOptional() throws Exception { ICompilationUnit cu = this.createTestOneToOneWithOptional(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - OneToOneAnnotation oneToOne = (OneToOneAnnotation) attributeResource.getAnnotation(JPA.ONE_TO_ONE); + OneToOneAnnotation oneToOne = (OneToOneAnnotation) resourceField.getAnnotation(JPA.ONE_TO_ONE); assertEquals(Boolean.TRUE, oneToOne.getOptional()); } public void testSetOptional() throws Exception { ICompilationUnit cu = this.createTestOneToOneWithOptional(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - OneToOneAnnotation oneToOne = (OneToOneAnnotation) attributeResource.getAnnotation(JPA.ONE_TO_ONE); + OneToOneAnnotation oneToOne = (OneToOneAnnotation) resourceField.getAnnotation(JPA.ONE_TO_ONE); assertEquals(Boolean.TRUE, oneToOne.getOptional()); oneToOne.setOptional(Boolean.FALSE); @@ -256,10 +257,10 @@ public class OneToOneTests extends JpaJavaResourceModelTestCase { public void testSetOptionalNull() throws Exception { ICompilationUnit cu = this.createTestOneToOneWithOptional(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - OneToOneAnnotation oneToOne = (OneToOneAnnotation) attributeResource.getAnnotation(JPA.ONE_TO_ONE); + OneToOneAnnotation oneToOne = (OneToOneAnnotation) resourceField.getAnnotation(JPA.ONE_TO_ONE); assertEquals(Boolean.TRUE, oneToOne.getOptional()); oneToOne.setOptional(null); @@ -271,28 +272,28 @@ public class OneToOneTests extends JpaJavaResourceModelTestCase { public void testGetMappedBy() throws Exception { ICompilationUnit cu = this.createTestOneToOneWithMappedBy(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - OneToOneAnnotation oneToOne = (OneToOneAnnotation) attributeResource.getAnnotation(JPA.ONE_TO_ONE); + OneToOneAnnotation oneToOne = (OneToOneAnnotation) resourceField.getAnnotation(JPA.ONE_TO_ONE); assertEquals("foo", oneToOne.getMappedBy()); } public void testGetMappedByNull() throws Exception { ICompilationUnit cu = this.createTestOneToOne(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - OneToOneAnnotation oneToOne = (OneToOneAnnotation) attributeResource.getAnnotation(JPA.ONE_TO_ONE); + OneToOneAnnotation oneToOne = (OneToOneAnnotation) resourceField.getAnnotation(JPA.ONE_TO_ONE); assertEquals(null, oneToOne.getMappedBy()); } public void testSetMappedBy() throws Exception { ICompilationUnit cu = this.createTestOneToOne(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - OneToOneAnnotation oneToOne = (OneToOneAnnotation) attributeResource.getAnnotation(JPA.ONE_TO_ONE); + OneToOneAnnotation oneToOne = (OneToOneAnnotation) resourceField.getAnnotation(JPA.ONE_TO_ONE); assertNull(oneToOne.getMappedBy()); oneToOne.setMappedBy("bar"); assertEquals("bar", oneToOne.getMappedBy()); @@ -302,10 +303,10 @@ public class OneToOneTests extends JpaJavaResourceModelTestCase { public void testSetMappedByNull() throws Exception { ICompilationUnit cu = this.createTestOneToOneWithMappedBy(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - OneToOneAnnotation oneToOne = (OneToOneAnnotation) attributeResource.getAnnotation(JPA.ONE_TO_ONE); + OneToOneAnnotation oneToOne = (OneToOneAnnotation) resourceField.getAnnotation(JPA.ONE_TO_ONE); assertEquals("foo", oneToOne.getMappedBy()); oneToOne.setMappedBy(null); @@ -317,10 +318,10 @@ public class OneToOneTests extends JpaJavaResourceModelTestCase { public void testSetCascadeAll() throws Exception { ICompilationUnit cu = this.createTestOneToOne(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - OneToOneAnnotation oneToOne = (OneToOneAnnotation) attributeResource.getAnnotation(JPA.ONE_TO_ONE); + OneToOneAnnotation oneToOne = (OneToOneAnnotation) resourceField.getAnnotation(JPA.ONE_TO_ONE); assertFalse(oneToOne.isCascadeAll()); oneToOne.setCascadeAll(true); @@ -331,10 +332,10 @@ public class OneToOneTests extends JpaJavaResourceModelTestCase { public void testSetCascadeMerge() throws Exception { ICompilationUnit cu = this.createTestOneToOne(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - OneToOneAnnotation oneToOne = (OneToOneAnnotation) attributeResource.getAnnotation(JPA.ONE_TO_ONE); + OneToOneAnnotation oneToOne = (OneToOneAnnotation) resourceField.getAnnotation(JPA.ONE_TO_ONE); assertFalse(oneToOne.isCascadeMerge()); oneToOne.setCascadeMerge(true); @@ -345,10 +346,10 @@ public class OneToOneTests extends JpaJavaResourceModelTestCase { public void testSetCascadePersist() throws Exception { ICompilationUnit cu = this.createTestOneToOne(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - OneToOneAnnotation oneToOne = (OneToOneAnnotation) attributeResource.getAnnotation(JPA.ONE_TO_ONE); + OneToOneAnnotation oneToOne = (OneToOneAnnotation) resourceField.getAnnotation(JPA.ONE_TO_ONE); assertFalse(oneToOne.isCascadePersist()); oneToOne.setCascadePersist(true); @@ -359,10 +360,10 @@ public class OneToOneTests extends JpaJavaResourceModelTestCase { public void testSetCascadeRemove() throws Exception { ICompilationUnit cu = this.createTestOneToOne(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - OneToOneAnnotation oneToOne = (OneToOneAnnotation) attributeResource.getAnnotation(JPA.ONE_TO_ONE); + OneToOneAnnotation oneToOne = (OneToOneAnnotation) resourceField.getAnnotation(JPA.ONE_TO_ONE); assertFalse(oneToOne.isCascadeRemove()); oneToOne.setCascadeRemove(true); @@ -373,10 +374,10 @@ public class OneToOneTests extends JpaJavaResourceModelTestCase { public void testSetCascadeRefresh() throws Exception { ICompilationUnit cu = this.createTestOneToOne(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - OneToOneAnnotation oneToOne = (OneToOneAnnotation) attributeResource.getAnnotation(JPA.ONE_TO_ONE); + OneToOneAnnotation oneToOne = (OneToOneAnnotation) resourceField.getAnnotation(JPA.ONE_TO_ONE); assertFalse(oneToOne.isCascadeRefresh()); oneToOne.setCascadeRefresh(true); @@ -387,10 +388,10 @@ public class OneToOneTests extends JpaJavaResourceModelTestCase { public void testCascadeMoreThanOnce() throws Exception { ICompilationUnit cu = this.createTestOneToOneWithCascade(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - OneToOneAnnotation oneToOne = (OneToOneAnnotation) attributeResource.getAnnotation(JPA.ONE_TO_ONE); + OneToOneAnnotation oneToOne = (OneToOneAnnotation) resourceField.getAnnotation(JPA.ONE_TO_ONE); assertTrue(oneToOne.isCascadeAll()); oneToOne.setCascadeAll(true); @@ -412,10 +413,10 @@ public class OneToOneTests extends JpaJavaResourceModelTestCase { public void testDuplicateCascade() throws Exception { ICompilationUnit cu = this.createTestOneToOneWithDuplicateCascade(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - OneToOneAnnotation oneToOne = (OneToOneAnnotation) attributeResource.getAnnotation(JPA.ONE_TO_ONE); + OneToOneAnnotation oneToOne = (OneToOneAnnotation) resourceField.getAnnotation(JPA.ONE_TO_ONE); assertTrue(oneToOne.isCascadeMerge()); oneToOne.setCascadeMerge(false);//TODO should the resource model handle this and remove both MERGE @@ -430,10 +431,10 @@ public class OneToOneTests extends JpaJavaResourceModelTestCase { public void testMultipleCascade() throws Exception { ICompilationUnit cu = this.createTestOneToOneWithMultipleCascade(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - OneToOneAnnotation oneToOne = (OneToOneAnnotation) attributeResource.getAnnotation(JPA.ONE_TO_ONE); + OneToOneAnnotation oneToOne = (OneToOneAnnotation) resourceField.getAnnotation(JPA.ONE_TO_ONE); assertTrue(oneToOne.isCascadeMerge()); assertTrue(oneToOne.isCascadeRemove()); diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/OrderByTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/OrderByTests.java index d029d50952..45af210208 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/OrderByTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/OrderByTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2009 Oracle. All rights reserved. + * Copyright (c) 2007, 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. @@ -11,10 +11,11 @@ package org.eclipse.jpt.jpa.core.tests.internal.resource.java; import java.util.Iterator; import org.eclipse.jdt.core.ICompilationUnit; +import org.eclipse.jpt.common.core.resource.java.JavaResourceField; +import org.eclipse.jpt.common.core.resource.java.JavaResourceType; +import org.eclipse.jpt.common.utility.internal.CollectionTools; import org.eclipse.jpt.common.utility.internal.iterators.ArrayIterator; 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.OrderByAnnotation; @SuppressWarnings("nls") @@ -52,28 +53,28 @@ public class OrderByTests extends JpaJavaResourceModelTestCase { public void testOrderBy() throws Exception { ICompilationUnit cu = this.createTestOrderBy(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - OrderByAnnotation orderBy = (OrderByAnnotation) attributeResource.getAnnotation(JPA.ORDER_BY); + OrderByAnnotation orderBy = (OrderByAnnotation) resourceField.getAnnotation(JPA.ORDER_BY); assertNotNull(orderBy); } public void testGetValue() throws Exception { ICompilationUnit cu = this.createTestOrderByWithValue(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - OrderByAnnotation orderBy = (OrderByAnnotation) attributeResource.getAnnotation(JPA.ORDER_BY); + OrderByAnnotation orderBy = (OrderByAnnotation) resourceField.getAnnotation(JPA.ORDER_BY); assertEquals("key", orderBy.getValue()); } public void testSetValue() throws Exception { ICompilationUnit cu = this.createTestOrderBy(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - OrderByAnnotation orderBy = (OrderByAnnotation) attributeResource.getAnnotation(JPA.ORDER_BY); + OrderByAnnotation orderBy = (OrderByAnnotation) resourceField.getAnnotation(JPA.ORDER_BY); orderBy.setValue("foo"); diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/PrimaryKeyJoinColumnTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/PrimaryKeyJoinColumnTests.java index cfda90ffc1..ac65d38137 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/PrimaryKeyJoinColumnTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/PrimaryKeyJoinColumnTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2009 Oracle. All rights reserved. + * Copyright (c) 2007, 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. @@ -11,10 +11,11 @@ package org.eclipse.jpt.jpa.core.tests.internal.resource.java; import java.util.Iterator; import org.eclipse.jdt.core.ICompilationUnit; +import org.eclipse.jpt.common.core.resource.java.JavaResourceField; +import org.eclipse.jpt.common.core.resource.java.JavaResourceType; +import org.eclipse.jpt.common.utility.internal.CollectionTools; import org.eclipse.jpt.common.utility.internal.iterators.ArrayIterator; 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.PrimaryKeyJoinColumnAnnotation; @SuppressWarnings("nls") @@ -82,18 +83,18 @@ public class PrimaryKeyJoinColumnTests extends JpaJavaResourceModelTestCase { public void testGetName() throws Exception { ICompilationUnit cu = this.createTestPrimaryKeyJoinColumnWithName(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - PrimaryKeyJoinColumnAnnotation column = (PrimaryKeyJoinColumnAnnotation) attributeResource.getAnnotation(JPA.PRIMARY_KEY_JOIN_COLUMN); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); + PrimaryKeyJoinColumnAnnotation column = (PrimaryKeyJoinColumnAnnotation) resourceField.getAnnotation(0, JPA.PRIMARY_KEY_JOIN_COLUMN); assertNotNull(column); assertEquals(COLUMN_NAME, column.getName()); } public void testGetNull() throws Exception { ICompilationUnit cu = this.createTestPrimaryKeyJoinColumn(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - PrimaryKeyJoinColumnAnnotation column = (PrimaryKeyJoinColumnAnnotation) attributeResource.getAnnotation(JPA.PRIMARY_KEY_JOIN_COLUMN); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); + PrimaryKeyJoinColumnAnnotation column = (PrimaryKeyJoinColumnAnnotation) resourceField.getAnnotation(0, JPA.PRIMARY_KEY_JOIN_COLUMN); assertNotNull(column); assertNull(column.getReferencedColumnName()); assertNull(column.getColumnDefinition()); @@ -101,9 +102,9 @@ public class PrimaryKeyJoinColumnTests extends JpaJavaResourceModelTestCase { public void testSetName() throws Exception { ICompilationUnit cu = this.createTestPrimaryKeyJoinColumn(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - PrimaryKeyJoinColumnAnnotation column = (PrimaryKeyJoinColumnAnnotation) attributeResource.getAnnotation(JPA.PRIMARY_KEY_JOIN_COLUMN); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); + PrimaryKeyJoinColumnAnnotation column = (PrimaryKeyJoinColumnAnnotation) resourceField.getAnnotation(0, JPA.PRIMARY_KEY_JOIN_COLUMN); assertNotNull(column); assertNull(column.getName()); @@ -116,9 +117,9 @@ public class PrimaryKeyJoinColumnTests extends JpaJavaResourceModelTestCase { public void testSetNameNull() throws Exception { ICompilationUnit cu = this.createTestPrimaryKeyJoinColumnWithName(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - PrimaryKeyJoinColumnAnnotation column = (PrimaryKeyJoinColumnAnnotation) attributeResource.getAnnotation(JPA.PRIMARY_KEY_JOIN_COLUMN); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); + PrimaryKeyJoinColumnAnnotation column = (PrimaryKeyJoinColumnAnnotation) resourceField.getAnnotation(0, JPA.PRIMARY_KEY_JOIN_COLUMN); assertEquals(COLUMN_NAME, column.getName()); @@ -132,17 +133,17 @@ public class PrimaryKeyJoinColumnTests extends JpaJavaResourceModelTestCase { public void testGetReferencedColumnName() throws Exception { ICompilationUnit cu = this.createTestPrimaryKeyJoinColumnWithReferencedColumnName(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - PrimaryKeyJoinColumnAnnotation column = (PrimaryKeyJoinColumnAnnotation) attributeResource.getAnnotation(JPA.PRIMARY_KEY_JOIN_COLUMN); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); + PrimaryKeyJoinColumnAnnotation column = (PrimaryKeyJoinColumnAnnotation) resourceField.getAnnotation(0, JPA.PRIMARY_KEY_JOIN_COLUMN); assertEquals(COLUMN_REFERENCED_COLUMN_NAME, column.getReferencedColumnName()); } public void testSetReferencedColumnName() throws Exception { ICompilationUnit cu = this.createTestPrimaryKeyJoinColumn(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - PrimaryKeyJoinColumnAnnotation column = (PrimaryKeyJoinColumnAnnotation) attributeResource.getAnnotation(JPA.PRIMARY_KEY_JOIN_COLUMN); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); + PrimaryKeyJoinColumnAnnotation column = (PrimaryKeyJoinColumnAnnotation) resourceField.getAnnotation(0, JPA.PRIMARY_KEY_JOIN_COLUMN); assertNotNull(column); assertNull(column.getReferencedColumnName()); @@ -159,17 +160,17 @@ public class PrimaryKeyJoinColumnTests extends JpaJavaResourceModelTestCase { public void testGetColumnDefinition() throws Exception { ICompilationUnit cu = this.createTestPrimaryKeyJoinColumnWithColumnDefinition(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - PrimaryKeyJoinColumnAnnotation column = (PrimaryKeyJoinColumnAnnotation) attributeResource.getAnnotation(JPA.PRIMARY_KEY_JOIN_COLUMN); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); + PrimaryKeyJoinColumnAnnotation column = (PrimaryKeyJoinColumnAnnotation) resourceField.getAnnotation(0, JPA.PRIMARY_KEY_JOIN_COLUMN); assertEquals(COLUMN_COLUMN_DEFINITION, column.getColumnDefinition()); } public void testSetColumnDefinition() throws Exception { ICompilationUnit cu = this.createTestPrimaryKeyJoinColumn(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - PrimaryKeyJoinColumnAnnotation column = (PrimaryKeyJoinColumnAnnotation) attributeResource.getAnnotation(JPA.PRIMARY_KEY_JOIN_COLUMN); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); + PrimaryKeyJoinColumnAnnotation column = (PrimaryKeyJoinColumnAnnotation) resourceField.getAnnotation(0, JPA.PRIMARY_KEY_JOIN_COLUMN); assertNotNull(column); assertNull(column.getColumnDefinition()); diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/PrimaryKeyJoinColumnsTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/PrimaryKeyJoinColumnsTests.java index 1b35e9d679..cfa0bb6714 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/PrimaryKeyJoinColumnsTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/PrimaryKeyJoinColumnsTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2009 Oracle. All rights reserved. + * Copyright (c) 2007, 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,12 +12,12 @@ package org.eclipse.jpt.jpa.core.tests.internal.resource.java; import java.util.Iterator; import org.eclipse.jdt.core.ICompilationUnit; +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.utility.internal.CollectionTools; import org.eclipse.jpt.common.utility.internal.iterators.ArrayIterator; 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.NestableAnnotation; import org.eclipse.jpt.jpa.core.resource.java.PrimaryKeyJoinColumnAnnotation; @SuppressWarnings("nls") @@ -98,18 +98,18 @@ public class PrimaryKeyJoinColumnsTests extends JpaJavaResourceModelTestCase { public void testGetName() throws Exception { ICompilationUnit cu = this.createTestPrimaryKeyJoinColumnWithName(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - PrimaryKeyJoinColumnAnnotation column = (PrimaryKeyJoinColumnAnnotation) attributeResource.annotations(JPA.PRIMARY_KEY_JOIN_COLUMN, JPA.PRIMARY_KEY_JOIN_COLUMNS).next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); + PrimaryKeyJoinColumnAnnotation column = (PrimaryKeyJoinColumnAnnotation) resourceField.getAnnotation(0, JPA.PRIMARY_KEY_JOIN_COLUMN); assertNotNull(column); assertEquals(COLUMN_NAME, column.getName()); } public void testGetNull() throws Exception { ICompilationUnit cu = this.createTestPrimaryKeyJoinColumns(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - PrimaryKeyJoinColumnAnnotation column = (PrimaryKeyJoinColumnAnnotation) attributeResource.annotations(JPA.PRIMARY_KEY_JOIN_COLUMN, JPA.PRIMARY_KEY_JOIN_COLUMNS).next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); + PrimaryKeyJoinColumnAnnotation column = (PrimaryKeyJoinColumnAnnotation) resourceField.getAnnotation(0, JPA.PRIMARY_KEY_JOIN_COLUMN); assertNotNull(column); assertNull(column.getName()); assertNull(column.getReferencedColumnName()); @@ -118,9 +118,9 @@ public class PrimaryKeyJoinColumnsTests extends JpaJavaResourceModelTestCase { public void testSetName() throws Exception { ICompilationUnit cu = this.createTestPrimaryKeyJoinColumns(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - PrimaryKeyJoinColumnAnnotation column = (PrimaryKeyJoinColumnAnnotation) attributeResource.annotations(JPA.PRIMARY_KEY_JOIN_COLUMN, JPA.PRIMARY_KEY_JOIN_COLUMNS).next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); + PrimaryKeyJoinColumnAnnotation column = (PrimaryKeyJoinColumnAnnotation) resourceField.getAnnotation(0, JPA.PRIMARY_KEY_JOIN_COLUMN); assertNotNull(column); assertNull(column.getName()); @@ -133,9 +133,9 @@ public class PrimaryKeyJoinColumnsTests extends JpaJavaResourceModelTestCase { public void testSetNameNull() throws Exception { ICompilationUnit cu = this.createTestPrimaryKeyJoinColumnWithName(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - PrimaryKeyJoinColumnAnnotation column = (PrimaryKeyJoinColumnAnnotation) attributeResource.annotations(JPA.PRIMARY_KEY_JOIN_COLUMN, JPA.PRIMARY_KEY_JOIN_COLUMNS).next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); + PrimaryKeyJoinColumnAnnotation column = (PrimaryKeyJoinColumnAnnotation) resourceField.getAnnotation(0, JPA.PRIMARY_KEY_JOIN_COLUMN); assertEquals(COLUMN_NAME, column.getName()); @@ -147,17 +147,17 @@ public class PrimaryKeyJoinColumnsTests extends JpaJavaResourceModelTestCase { public void testGetReferencedColumnName() throws Exception { ICompilationUnit cu = this.createTestPrimaryKeyJoinColumnWithReferencedColumnName(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - PrimaryKeyJoinColumnAnnotation column = (PrimaryKeyJoinColumnAnnotation) attributeResource.annotations(JPA.PRIMARY_KEY_JOIN_COLUMN, JPA.PRIMARY_KEY_JOIN_COLUMNS).next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); + PrimaryKeyJoinColumnAnnotation column = (PrimaryKeyJoinColumnAnnotation) resourceField.getAnnotation(0, JPA.PRIMARY_KEY_JOIN_COLUMN); assertEquals(COLUMN_REFERENCED_COLUMN_NAME, column.getReferencedColumnName()); } public void testSetReferencedColumnName() throws Exception { ICompilationUnit cu = this.createTestPrimaryKeyJoinColumns(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - PrimaryKeyJoinColumnAnnotation column = (PrimaryKeyJoinColumnAnnotation) attributeResource.annotations(JPA.PRIMARY_KEY_JOIN_COLUMN, JPA.PRIMARY_KEY_JOIN_COLUMNS).next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); + PrimaryKeyJoinColumnAnnotation column = (PrimaryKeyJoinColumnAnnotation) resourceField.getAnnotation(0, JPA.PRIMARY_KEY_JOIN_COLUMN); assertNotNull(column); assertNull(column.getReferencedColumnName()); @@ -174,17 +174,17 @@ public class PrimaryKeyJoinColumnsTests extends JpaJavaResourceModelTestCase { public void testGetColumnDefinition() throws Exception { ICompilationUnit cu = this.createTestPrimaryKeyJoinColumnWithColumnDefinition(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - PrimaryKeyJoinColumnAnnotation column = (PrimaryKeyJoinColumnAnnotation) attributeResource.annotations(JPA.PRIMARY_KEY_JOIN_COLUMN, JPA.PRIMARY_KEY_JOIN_COLUMNS).next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); + PrimaryKeyJoinColumnAnnotation column = (PrimaryKeyJoinColumnAnnotation) resourceField.getAnnotation(0, JPA.PRIMARY_KEY_JOIN_COLUMN); assertEquals(COLUMN_COLUMN_DEFINITION, column.getColumnDefinition()); } public void testSetColumnDefinition() throws Exception { ICompilationUnit cu = this.createTestPrimaryKeyJoinColumns(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - PrimaryKeyJoinColumnAnnotation column = (PrimaryKeyJoinColumnAnnotation) attributeResource.annotations(JPA.PRIMARY_KEY_JOIN_COLUMN, JPA.PRIMARY_KEY_JOIN_COLUMNS).next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); + PrimaryKeyJoinColumnAnnotation column = (PrimaryKeyJoinColumnAnnotation) resourceField.getAnnotation(0, JPA.PRIMARY_KEY_JOIN_COLUMN); assertNotNull(column); assertNull(column.getColumnDefinition()); @@ -202,51 +202,72 @@ public class PrimaryKeyJoinColumnsTests extends JpaJavaResourceModelTestCase { public void testAddPrimaryKeyJoinColumnCopyExisting() throws Exception { ICompilationUnit cu = createTestPrimaryKeyJoinColumn(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - PrimaryKeyJoinColumnAnnotation joinColumn = (PrimaryKeyJoinColumnAnnotation) attributeResource.addAnnotation(1, JPA.PRIMARY_KEY_JOIN_COLUMN, JPA.PRIMARY_KEY_JOIN_COLUMNS); + String expected1 = "@PrimaryKeyJoinColumns({"; + String expected2 = "@PrimaryKeyJoinColumn(name = \"BAR\", columnDefinition = \"COLUMN_DEF\", referencedColumnName = \"REF_NAME\"),"; + String expected3 = "@PrimaryKeyJoinColumn(name = \"FOO\") })"; + PrimaryKeyJoinColumnAnnotation joinColumn = (PrimaryKeyJoinColumnAnnotation) resourceField.addAnnotation(1, JPA.PRIMARY_KEY_JOIN_COLUMN); joinColumn.setName("FOO"); - assertSourceContains("@PrimaryKeyJoinColumns({@PrimaryKeyJoinColumn(name = \"BAR\", columnDefinition = \"COLUMN_DEF\", referencedColumnName = \"REF_NAME\"),@PrimaryKeyJoinColumn(name = \"FOO\")})", cu); + assertSourceContains(expected1, cu); + assertSourceContains(expected2, cu); + assertSourceContains(expected3, cu); - assertNull(attributeResource.getAnnotation(JPA.PRIMARY_KEY_JOIN_COLUMN)); - assertNotNull(attributeResource.getAnnotation(JPA.PRIMARY_KEY_JOIN_COLUMNS)); - assertEquals(2, CollectionTools.size(attributeResource.annotations(JPA.PRIMARY_KEY_JOIN_COLUMN, JPA.PRIMARY_KEY_JOIN_COLUMNS))); + assertNotNull(resourceField.getAnnotation(0, JPA.PRIMARY_KEY_JOIN_COLUMN)); + assertNotNull(resourceField.getAnnotation(0, JPA.PRIMARY_KEY_JOIN_COLUMN)); + assertEquals(2, resourceField.getAnnotationsSize(JPA.PRIMARY_KEY_JOIN_COLUMN)); } public void testAddPrimaryKeyJoinColumnToBeginningOfList() throws Exception { ICompilationUnit cu = createTestPrimaryKeyJoinColumn(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - PrimaryKeyJoinColumnAnnotation joinColumn = (PrimaryKeyJoinColumnAnnotation) attributeResource.addAnnotation(1, JPA.PRIMARY_KEY_JOIN_COLUMN, JPA.PRIMARY_KEY_JOIN_COLUMNS); + String expected1 = "@PrimaryKeyJoinColumns({"; + String expected2 = "@PrimaryKeyJoinColumn(name = \"BAR\", columnDefinition = \"COLUMN_DEF\", referencedColumnName = \"REF_NAME\"),"; + String expected3 = "@PrimaryKeyJoinColumn(name = \"FOO\") })"; + PrimaryKeyJoinColumnAnnotation joinColumn = (PrimaryKeyJoinColumnAnnotation) resourceField.addAnnotation(1, JPA.PRIMARY_KEY_JOIN_COLUMN); joinColumn.setName("FOO"); - assertSourceContains("@PrimaryKeyJoinColumns({@PrimaryKeyJoinColumn(name = \"BAR\", columnDefinition = \"COLUMN_DEF\", referencedColumnName = \"REF_NAME\"),@PrimaryKeyJoinColumn(name = \"FOO\")})", cu); + assertSourceContains(expected1, cu); + assertSourceContains(expected2, cu); + assertSourceContains(expected3, cu); - joinColumn = (PrimaryKeyJoinColumnAnnotation) attributeResource.addAnnotation(0, JPA.PRIMARY_KEY_JOIN_COLUMN, JPA.PRIMARY_KEY_JOIN_COLUMNS); + expected2 = "@PrimaryKeyJoinColumn(name = \"BAZ\"),"; + expected3 = "@PrimaryKeyJoinColumn(name = \"BAR\", columnDefinition = \"COLUMN_DEF\", referencedColumnName = \"REF_NAME\"), @PrimaryKeyJoinColumn(name = \"FOO\") })"; + joinColumn = (PrimaryKeyJoinColumnAnnotation) resourceField.addAnnotation(0, JPA.PRIMARY_KEY_JOIN_COLUMN); joinColumn.setName("BAZ"); - assertSourceContains("@PrimaryKeyJoinColumns({@PrimaryKeyJoinColumn(name = \"BAZ\"),@PrimaryKeyJoinColumn(name = \"BAR\", columnDefinition = \"COLUMN_DEF\", referencedColumnName = \"REF_NAME\"), @PrimaryKeyJoinColumn(name = \"FOO\")})", cu); + assertSourceContains(expected1, cu); + assertSourceContains(expected2, cu); + assertSourceContains(expected3, cu); - Iterator pkJoinColumns = attributeResource.annotations(JPA.PRIMARY_KEY_JOIN_COLUMN, JPA.PRIMARY_KEY_JOIN_COLUMNS); + Iterator pkJoinColumns = resourceField.getAnnotations(JPA.PRIMARY_KEY_JOIN_COLUMN).iterator(); assertEquals("BAZ", ((PrimaryKeyJoinColumnAnnotation) pkJoinColumns.next()).getName()); assertEquals("BAR", ((PrimaryKeyJoinColumnAnnotation) pkJoinColumns.next()).getName()); assertEquals("FOO", ((PrimaryKeyJoinColumnAnnotation) pkJoinColumns.next()).getName()); - assertNull(attributeResource.getAnnotation(JPA.PRIMARY_KEY_JOIN_COLUMN)); - assertNotNull(attributeResource.getAnnotation(JPA.PRIMARY_KEY_JOIN_COLUMNS)); - assertEquals(3, CollectionTools.size(attributeResource.annotations(JPA.PRIMARY_KEY_JOIN_COLUMN, JPA.PRIMARY_KEY_JOIN_COLUMNS))); + assertNotNull(resourceField.getAnnotation(0, JPA.PRIMARY_KEY_JOIN_COLUMN)); + assertNotNull(resourceField.getAnnotation(0, JPA.PRIMARY_KEY_JOIN_COLUMN)); + assertEquals(3, resourceField.getAnnotationsSize(JPA.PRIMARY_KEY_JOIN_COLUMN)); } public void testRemovePrimaryKeyJoinColumnCopyExisting() throws Exception { ICompilationUnit cu = createTestPrimaryKeyJoinColumn(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - PrimaryKeyJoinColumnAnnotation joinColumn = (PrimaryKeyJoinColumnAnnotation) attributeResource.addAnnotation(1, JPA.PRIMARY_KEY_JOIN_COLUMN, JPA.PRIMARY_KEY_JOIN_COLUMNS); + String expected1 = "@PrimaryKeyJoinColumns({"; + String expected2 = "@PrimaryKeyJoinColumn(name = \"BAR\", columnDefinition = \"COLUMN_DEF\", referencedColumnName = \"REF_NAME\"),"; + String expected3 = "@PrimaryKeyJoinColumn(name = \"FOO\") })"; + PrimaryKeyJoinColumnAnnotation joinColumn = (PrimaryKeyJoinColumnAnnotation) resourceField.addAnnotation(1, JPA.PRIMARY_KEY_JOIN_COLUMN); joinColumn.setName("FOO"); - assertSourceContains("@PrimaryKeyJoinColumns({@PrimaryKeyJoinColumn(name = \"BAR\", columnDefinition = \"COLUMN_DEF\", referencedColumnName = \"REF_NAME\"),@PrimaryKeyJoinColumn(name = \"FOO\")})", cu); + assertSourceContains(expected1, cu); + assertSourceContains(expected2, cu); + assertSourceContains(expected3, cu); - attributeResource.removeAnnotation(1, JPA.PRIMARY_KEY_JOIN_COLUMN, JPA.PRIMARY_KEY_JOIN_COLUMNS); - assertSourceContains("@PrimaryKeyJoinColumn(name = \"BAR\", columnDefinition = \"COLUMN_DEF\", referencedColumnName = \"REF_NAME\")", cu); + expected1 = "@PrimaryKeyJoinColumn(name = \"BAR\", columnDefinition = \"COLUMN_DEF\", referencedColumnName = \"REF_NAME\")"; + resourceField.removeAnnotation(1, JPA.PRIMARY_KEY_JOIN_COLUMN); + assertSourceContains(expected1, cu); + assertSourceDoesNotContain("@PrimaryKeyJoinColumns", cu); } } diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/QueryHintTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/QueryHintTests.java index 80326ae352..8a07427449 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/QueryHintTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/QueryHintTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2009 Oracle. All rights reserved. + * Copyright (c) 2007, 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. @@ -11,9 +11,9 @@ package org.eclipse.jpt.jpa.core.tests.internal.resource.java; import java.util.Iterator; import org.eclipse.jdt.core.ICompilationUnit; +import org.eclipse.jpt.common.core.resource.java.JavaResourceType; import org.eclipse.jpt.common.utility.internal.iterators.ArrayIterator; 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.NamedQueryAnnotation; import org.eclipse.jpt.jpa.core.resource.java.QueryHintAnnotation; @@ -42,19 +42,19 @@ public class QueryHintTests extends JpaJavaResourceModelTestCase { public void testGetName() throws Exception { ICompilationUnit cu = this.createTestNamedQueryWithQueryHints(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); + JavaResourceType resourceType = buildJavaResourceType(cu); - NamedQueryAnnotation namedQuery = (NamedQueryAnnotation) typeResource.getAnnotation(JPA.NAMED_QUERY); - QueryHintAnnotation queryHint = namedQuery.hints().next(); + NamedQueryAnnotation namedQuery = (NamedQueryAnnotation) resourceType.getAnnotation(0, JPA.NAMED_QUERY); + QueryHintAnnotation queryHint = namedQuery.hintAt(0); assertEquals(QUERY_HINT_NAME, queryHint.getName()); } public void testSetName() throws Exception { ICompilationUnit cu = this.createTestNamedQueryWithQueryHints(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); + JavaResourceType resourceType = buildJavaResourceType(cu); - NamedQueryAnnotation namedQuery = (NamedQueryAnnotation) typeResource.getAnnotation(JPA.NAMED_QUERY); - QueryHintAnnotation queryHint = namedQuery.hints().next(); + NamedQueryAnnotation namedQuery = (NamedQueryAnnotation) resourceType.getAnnotation(0, JPA.NAMED_QUERY); + QueryHintAnnotation queryHint = namedQuery.hintAt(0); assertEquals(QUERY_HINT_NAME, queryHint.getName()); queryHint.setName("foo"); diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/SecondaryTableTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/SecondaryTableTests.java index c25c69d6c9..d8d4ed5122 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/SecondaryTableTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/SecondaryTableTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2009 Oracle. All rights reserved. + * Copyright (c) 2007, 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. @@ -11,9 +11,9 @@ package org.eclipse.jpt.jpa.core.tests.internal.resource.java; import java.util.Iterator; import org.eclipse.jdt.core.ICompilationUnit; +import org.eclipse.jpt.common.core.resource.java.JavaResourceType; import org.eclipse.jpt.common.utility.internal.iterators.ArrayIterator; 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.PrimaryKeyJoinColumnAnnotation; import org.eclipse.jpt.jpa.core.resource.java.SecondaryTableAnnotation; import org.eclipse.jpt.jpa.core.resource.java.UniqueConstraintAnnotation; @@ -109,18 +109,18 @@ public class SecondaryTableTests extends JpaJavaResourceModelTestCase { public void testGetName() throws Exception { ICompilationUnit cu = this.createTestSecondaryTableWithName(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); + JavaResourceType resourceType = buildJavaResourceType(cu); - SecondaryTableAnnotation table = (SecondaryTableAnnotation) typeResource.getAnnotation(JPA.SECONDARY_TABLE); + SecondaryTableAnnotation table = (SecondaryTableAnnotation) resourceType.getAnnotation(0, JPA.SECONDARY_TABLE); assertNotNull(table); assertEquals(TABLE_NAME, table.getName()); } public void testGetNull() throws Exception { ICompilationUnit cu = this.createTestSecondaryTable(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); + JavaResourceType resourceType = buildJavaResourceType(cu); - SecondaryTableAnnotation table = (SecondaryTableAnnotation) typeResource.getAnnotation(JPA.SECONDARY_TABLE); + SecondaryTableAnnotation table = (SecondaryTableAnnotation) resourceType.getAnnotation(0, JPA.SECONDARY_TABLE); assertNotNull(table); assertNull(table.getName()); assertNull(table.getCatalog()); @@ -129,9 +129,9 @@ public class SecondaryTableTests extends JpaJavaResourceModelTestCase { public void testSetName() throws Exception { ICompilationUnit cu = this.createTestSecondaryTable(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); + JavaResourceType resourceType = buildJavaResourceType(cu); - SecondaryTableAnnotation table = (SecondaryTableAnnotation) typeResource.getAnnotation(JPA.SECONDARY_TABLE); + SecondaryTableAnnotation table = (SecondaryTableAnnotation) resourceType.getAnnotation(0, JPA.SECONDARY_TABLE); assertNotNull(table); assertNull(table.getName()); @@ -143,9 +143,9 @@ public class SecondaryTableTests extends JpaJavaResourceModelTestCase { public void testSetNameNull() throws Exception { ICompilationUnit cu = this.createTestSecondaryTableWithName(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); + JavaResourceType resourceType = buildJavaResourceType(cu); - SecondaryTableAnnotation table = (SecondaryTableAnnotation) typeResource.getAnnotation(JPA.SECONDARY_TABLE); + SecondaryTableAnnotation table = (SecondaryTableAnnotation) resourceType.getAnnotation(0, JPA.SECONDARY_TABLE); assertEquals(TABLE_NAME, table.getName()); table.setName(null); @@ -156,18 +156,18 @@ public class SecondaryTableTests extends JpaJavaResourceModelTestCase { public void testGetCatalog() throws Exception { ICompilationUnit cu = this.createTestSecondaryTableWithCatalog(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); + JavaResourceType resourceType = buildJavaResourceType(cu); - SecondaryTableAnnotation table = (SecondaryTableAnnotation) typeResource.getAnnotation(JPA.SECONDARY_TABLE); + SecondaryTableAnnotation table = (SecondaryTableAnnotation) resourceType.getAnnotation(0, JPA.SECONDARY_TABLE); assertNotNull(table); assertEquals(CATALOG_NAME, table.getCatalog()); } public void testSetCatalog() throws Exception { ICompilationUnit cu = this.createTestSecondaryTable(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); + JavaResourceType resourceType = buildJavaResourceType(cu); - SecondaryTableAnnotation table = (SecondaryTableAnnotation) typeResource.getAnnotation(JPA.SECONDARY_TABLE); + SecondaryTableAnnotation table = (SecondaryTableAnnotation) resourceType.getAnnotation(0, JPA.SECONDARY_TABLE); assertNotNull(table); assertNull(table.getCatalog()); @@ -179,9 +179,9 @@ public class SecondaryTableTests extends JpaJavaResourceModelTestCase { public void testSetCatalogNull() throws Exception { ICompilationUnit cu = this.createTestSecondaryTableWithCatalog(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); + JavaResourceType resourceType = buildJavaResourceType(cu); - SecondaryTableAnnotation table = (SecondaryTableAnnotation) typeResource.getAnnotation(JPA.SECONDARY_TABLE); + SecondaryTableAnnotation table = (SecondaryTableAnnotation) resourceType.getAnnotation(0, JPA.SECONDARY_TABLE); assertEquals(CATALOG_NAME, table.getCatalog()); table.setCatalog(null); @@ -192,18 +192,18 @@ public class SecondaryTableTests extends JpaJavaResourceModelTestCase { public void testGetSchema() throws Exception { ICompilationUnit cu = this.createTestSecondaryTableWithSchema(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); + JavaResourceType resourceType = buildJavaResourceType(cu); - SecondaryTableAnnotation table = (SecondaryTableAnnotation) typeResource.getAnnotation(JPA.SECONDARY_TABLE); + SecondaryTableAnnotation table = (SecondaryTableAnnotation) resourceType.getAnnotation(0, JPA.SECONDARY_TABLE); assertNotNull(table); assertEquals(SCHEMA_NAME, table.getSchema()); } public void testSetSchema() throws Exception { ICompilationUnit cu = this.createTestSecondaryTable(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); + JavaResourceType resourceType = buildJavaResourceType(cu); - SecondaryTableAnnotation table = (SecondaryTableAnnotation) typeResource.getAnnotation(JPA.SECONDARY_TABLE); + SecondaryTableAnnotation table = (SecondaryTableAnnotation) resourceType.getAnnotation(0, JPA.SECONDARY_TABLE); assertNotNull(table); assertNull(table.getSchema()); @@ -215,9 +215,9 @@ public class SecondaryTableTests extends JpaJavaResourceModelTestCase { public void testSetSchemaNull() throws Exception { ICompilationUnit cu = this.createTestSecondaryTableWithSchema(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); + JavaResourceType resourceType = buildJavaResourceType(cu); - SecondaryTableAnnotation table = (SecondaryTableAnnotation) typeResource.getAnnotation(JPA.SECONDARY_TABLE); + SecondaryTableAnnotation table = (SecondaryTableAnnotation) resourceType.getAnnotation(0, JPA.SECONDARY_TABLE); assertEquals(SCHEMA_NAME, table.getSchema()); table.setSchema(null); @@ -229,139 +229,139 @@ public class SecondaryTableTests extends JpaJavaResourceModelTestCase { public void testUniqueConstraints() throws Exception { ICompilationUnit cu = this.createTestSecondaryTable(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - SecondaryTableAnnotation table = (SecondaryTableAnnotation) typeResource.getAnnotation(JPA.SECONDARY_TABLE); + JavaResourceType resourceType = buildJavaResourceType(cu); + SecondaryTableAnnotation table = (SecondaryTableAnnotation) resourceType.getAnnotation(0, JPA.SECONDARY_TABLE); - assertEquals(0, table.uniqueConstraintsSize()); + assertEquals(0, table.getUniqueConstraintsSize()); } public void testUniqueConstraints2() throws Exception { ICompilationUnit cu = this.createTestSecondaryTable(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - SecondaryTableAnnotation table = (SecondaryTableAnnotation) typeResource.getAnnotation(JPA.SECONDARY_TABLE); + JavaResourceType resourceType = buildJavaResourceType(cu); + SecondaryTableAnnotation table = (SecondaryTableAnnotation) resourceType.getAnnotation(0, JPA.SECONDARY_TABLE); table.addUniqueConstraint(0); table.addUniqueConstraint(1); - assertEquals(2, table.uniqueConstraintsSize()); + assertEquals(2, table.getUniqueConstraintsSize()); } public void testUniqueConstraints3() throws Exception { ICompilationUnit cu = this.createTestSecondaryTableWithUniqueConstraints(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - SecondaryTableAnnotation table = (SecondaryTableAnnotation) typeResource.getAnnotation(JPA.SECONDARY_TABLE); + JavaResourceType resourceType = buildJavaResourceType(cu); + SecondaryTableAnnotation table = (SecondaryTableAnnotation) resourceType.getAnnotation(0, JPA.SECONDARY_TABLE); - assertEquals(3, table.uniqueConstraintsSize()); + assertEquals(3, table.getUniqueConstraintsSize()); } public void testAddUniqueConstraint() throws Exception { ICompilationUnit cu = this.createTestSecondaryTable(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - SecondaryTableAnnotation table = (SecondaryTableAnnotation) typeResource.getAnnotation(JPA.SECONDARY_TABLE); + JavaResourceType resourceType = buildJavaResourceType(cu); + SecondaryTableAnnotation table = (SecondaryTableAnnotation) resourceType.getAnnotation(0, JPA.SECONDARY_TABLE); table.addUniqueConstraint(0).addColumnName("FOO"); table.addUniqueConstraint(1); table.addUniqueConstraint(0).addColumnName("BAR"); - assertEquals("BAR", table.uniqueConstraintAt(0).columnNames().next()); - assertEquals("FOO", table.uniqueConstraintAt(1).columnNames().next()); - assertEquals(0, table.uniqueConstraintAt(2).columnNamesSize()); + assertEquals("BAR", table.uniqueConstraintAt(0).columnNameAt(0)); + assertEquals("FOO", table.uniqueConstraintAt(1).columnNameAt(0)); + assertEquals(0, table.uniqueConstraintAt(2).getColumnNamesSize()); assertSourceContains("@SecondaryTable(uniqueConstraints = {@UniqueConstraint(columnNames = \"BAR\"),@UniqueConstraint(columnNames = \"FOO\"), @UniqueConstraint})", cu); } public void testRemoveUniqueConstraint() throws Exception { ICompilationUnit cu = this.createTestSecondaryTableWithUniqueConstraints(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - SecondaryTableAnnotation table = (SecondaryTableAnnotation) typeResource.getAnnotation(JPA.SECONDARY_TABLE); + JavaResourceType resourceType = buildJavaResourceType(cu); + SecondaryTableAnnotation table = (SecondaryTableAnnotation) resourceType.getAnnotation(0, JPA.SECONDARY_TABLE); table.removeUniqueConstraint(1); - Iterator uniqueConstraints = table.uniqueConstraints(); - assertEquals("BAR", uniqueConstraints.next().columnNames().next()); - assertEquals("BAZ", uniqueConstraints.next().columnNames().next()); + Iterator uniqueConstraints = table.getUniqueConstraints().iterator(); + assertEquals("BAR", uniqueConstraints.next().columnNameAt(0)); + assertEquals("BAZ", uniqueConstraints.next().columnNameAt(0)); assertFalse(uniqueConstraints.hasNext()); assertSourceContains("@SecondaryTable(uniqueConstraints = {@UniqueConstraint(columnNames = {\"BAR\"}), @UniqueConstraint(columnNames = {\"BAZ\"})})", cu); table.removeUniqueConstraint(0); - uniqueConstraints = table.uniqueConstraints(); - assertEquals("BAZ", uniqueConstraints.next().columnNames().next()); + uniqueConstraints = table.getUniqueConstraints().iterator(); + assertEquals("BAZ", uniqueConstraints.next().columnNameAt(0)); assertFalse(uniqueConstraints.hasNext()); assertSourceContains("@SecondaryTable(uniqueConstraints = @UniqueConstraint(columnNames = {\"BAZ\"}))", cu); table.removeUniqueConstraint(0); - uniqueConstraints = table.uniqueConstraints(); + uniqueConstraints = table.getUniqueConstraints().iterator(); assertFalse(uniqueConstraints.hasNext()); assertSourceDoesNotContain("@SecondaryTable(", cu); } public void testMoveUniqueConstraint() throws Exception { ICompilationUnit cu = this.createTestSecondaryTableWithUniqueConstraints(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - SecondaryTableAnnotation secondaryTable = (SecondaryTableAnnotation) typeResource.getAnnotation(JPA.SECONDARY_TABLE); + JavaResourceType resourceType = buildJavaResourceType(cu); + SecondaryTableAnnotation secondaryTable = (SecondaryTableAnnotation) resourceType.getAnnotation(0, JPA.SECONDARY_TABLE); - assertEquals("BAR", secondaryTable.uniqueConstraintAt(0).columnNames().next()); - assertEquals("FOO", secondaryTable.uniqueConstraintAt(1).columnNames().next()); - assertEquals("BAZ", secondaryTable.uniqueConstraintAt(2).columnNames().next()); - assertEquals(3, secondaryTable.uniqueConstraintsSize()); + assertEquals("BAR", secondaryTable.uniqueConstraintAt(0).columnNameAt(0)); + assertEquals("FOO", secondaryTable.uniqueConstraintAt(1).columnNameAt(0)); + assertEquals("BAZ", secondaryTable.uniqueConstraintAt(2).columnNameAt(0)); + assertEquals(3, secondaryTable.getUniqueConstraintsSize()); secondaryTable.moveUniqueConstraint(2, 0); - assertEquals("FOO", secondaryTable.uniqueConstraintAt(0).columnNames().next()); - assertEquals("BAZ", secondaryTable.uniqueConstraintAt(1).columnNames().next()); - assertEquals("BAR", secondaryTable.uniqueConstraintAt(2).columnNames().next()); - assertEquals(3, secondaryTable.uniqueConstraintsSize()); + assertEquals("FOO", secondaryTable.uniqueConstraintAt(0).columnNameAt(0)); + assertEquals("BAZ", secondaryTable.uniqueConstraintAt(1).columnNameAt(0)); + assertEquals("BAR", secondaryTable.uniqueConstraintAt(2).columnNameAt(0)); + assertEquals(3, secondaryTable.getUniqueConstraintsSize()); assertSourceContains("@SecondaryTable(uniqueConstraints = {@UniqueConstraint(columnNames = {\"FOO\"}), @UniqueConstraint(columnNames = {\"BAZ\"}), @UniqueConstraint(columnNames = {\"BAR\"})})", cu); } public void testMoveUniqueConstraint2() throws Exception { ICompilationUnit cu = this.createTestSecondaryTableWithUniqueConstraints(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - SecondaryTableAnnotation secondaryTable = (SecondaryTableAnnotation) typeResource.getAnnotation(JPA.SECONDARY_TABLE); + JavaResourceType resourceType = buildJavaResourceType(cu); + SecondaryTableAnnotation secondaryTable = (SecondaryTableAnnotation) resourceType.getAnnotation(0, JPA.SECONDARY_TABLE); - assertEquals("BAR", secondaryTable.uniqueConstraintAt(0).columnNames().next()); - assertEquals("FOO", secondaryTable.uniqueConstraintAt(1).columnNames().next()); - assertEquals("BAZ", secondaryTable.uniqueConstraintAt(2).columnNames().next()); - assertEquals(3, secondaryTable.uniqueConstraintsSize()); + assertEquals("BAR", secondaryTable.uniqueConstraintAt(0).columnNameAt(0)); + assertEquals("FOO", secondaryTable.uniqueConstraintAt(1).columnNameAt(0)); + assertEquals("BAZ", secondaryTable.uniqueConstraintAt(2).columnNameAt(0)); + assertEquals(3, secondaryTable.getUniqueConstraintsSize()); secondaryTable.moveUniqueConstraint(0, 2); - assertEquals("BAZ", secondaryTable.uniqueConstraintAt(0).columnNames().next()); - assertEquals("BAR", secondaryTable.uniqueConstraintAt(1).columnNames().next()); - assertEquals("FOO", secondaryTable.uniqueConstraintAt(2).columnNames().next()); - assertEquals(3, secondaryTable.uniqueConstraintsSize()); + assertEquals("BAZ", secondaryTable.uniqueConstraintAt(0).columnNameAt(0)); + assertEquals("BAR", secondaryTable.uniqueConstraintAt(1).columnNameAt(0)); + assertEquals("FOO", secondaryTable.uniqueConstraintAt(2).columnNameAt(0)); + assertEquals(3, secondaryTable.getUniqueConstraintsSize()); assertSourceContains("@SecondaryTable(uniqueConstraints = {@UniqueConstraint(columnNames = {\"BAZ\"}), @UniqueConstraint(columnNames = {\"BAR\"}), @UniqueConstraint(columnNames = {\"FOO\"})})", cu); } public void testPkJoinColumns() throws Exception { ICompilationUnit cu = this.createTestSecondaryTable(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - SecondaryTableAnnotation table = (SecondaryTableAnnotation) typeResource.getAnnotation(JPA.SECONDARY_TABLE); + JavaResourceType resourceType = buildJavaResourceType(cu); + SecondaryTableAnnotation table = (SecondaryTableAnnotation) resourceType.getAnnotation(0, JPA.SECONDARY_TABLE); - assertEquals(0, table.pkJoinColumnsSize()); + assertEquals(0, table.getPkJoinColumnsSize()); } public void testPkJoinColumns2() throws Exception { ICompilationUnit cu = this.createTestSecondaryTable(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - SecondaryTableAnnotation table = (SecondaryTableAnnotation) typeResource.getAnnotation(JPA.SECONDARY_TABLE); + JavaResourceType resourceType = buildJavaResourceType(cu); + SecondaryTableAnnotation table = (SecondaryTableAnnotation) resourceType.getAnnotation(0, JPA.SECONDARY_TABLE); table.addPkJoinColumn(0); table.addPkJoinColumn(1); - assertEquals(2, table.pkJoinColumnsSize()); + assertEquals(2, table.getPkJoinColumnsSize()); } public void testPkJoinColumns3() throws Exception { ICompilationUnit cu = this.createTestSecondaryTableWithPkJoinColumns(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - SecondaryTableAnnotation table = (SecondaryTableAnnotation) typeResource.getAnnotation(JPA.SECONDARY_TABLE); + JavaResourceType resourceType = buildJavaResourceType(cu); + SecondaryTableAnnotation table = (SecondaryTableAnnotation) resourceType.getAnnotation(0, JPA.SECONDARY_TABLE); - assertEquals(3, table.pkJoinColumnsSize()); + assertEquals(3, table.getPkJoinColumnsSize()); } public void testAddPkJoinColumn() throws Exception { ICompilationUnit cu = this.createTestSecondaryTable(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - SecondaryTableAnnotation table = (SecondaryTableAnnotation) typeResource.getAnnotation(JPA.SECONDARY_TABLE); + JavaResourceType resourceType = buildJavaResourceType(cu); + SecondaryTableAnnotation table = (SecondaryTableAnnotation) resourceType.getAnnotation(0, JPA.SECONDARY_TABLE); table.addPkJoinColumn(0).setName("FOO"); @@ -372,14 +372,14 @@ public class SecondaryTableTests extends JpaJavaResourceModelTestCase { assertNull(table.pkJoinColumnAt(1).getName()); assertEquals("FOO", table.pkJoinColumnAt(2).getName()); - assertEquals(3, table.pkJoinColumnsSize()); + assertEquals(3, table.getPkJoinColumnsSize()); assertSourceContains("@SecondaryTable(pkJoinColumns = {@PrimaryKeyJoinColumn(name = \"BAR\"),@PrimaryKeyJoinColumn, @PrimaryKeyJoinColumn(name = \"FOO\")})", cu); } public void testRemovePkJoinColumn() throws Exception { ICompilationUnit cu = this.createTestSecondaryTableWithPkJoinColumns(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - SecondaryTableAnnotation table = (SecondaryTableAnnotation) typeResource.getAnnotation(JPA.SECONDARY_TABLE); + JavaResourceType resourceType = buildJavaResourceType(cu); + SecondaryTableAnnotation table = (SecondaryTableAnnotation) resourceType.getAnnotation(0, JPA.SECONDARY_TABLE); table.removePkJoinColumn(1); assertSourceContains("@SecondaryTable(pkJoinColumns = {@PrimaryKeyJoinColumn(name = \"BAR\"), @PrimaryKeyJoinColumn(name = \"BAZ\")})", cu); @@ -394,8 +394,8 @@ public class SecondaryTableTests extends JpaJavaResourceModelTestCase { public void testMovePkJoinColumn() throws Exception { ICompilationUnit cu = this.createTestSecondaryTableWithPkJoinColumns(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - SecondaryTableAnnotation table = (SecondaryTableAnnotation) typeResource.getAnnotation(JPA.SECONDARY_TABLE); + JavaResourceType resourceType = buildJavaResourceType(cu); + SecondaryTableAnnotation table = (SecondaryTableAnnotation) resourceType.getAnnotation(0, JPA.SECONDARY_TABLE); PrimaryKeyJoinColumnAnnotation joinColumn = table.pkJoinColumnAt(0); joinColumn.setReferencedColumnName("REF_NAME"); joinColumn.setColumnDefinition("COLUMN_DEF"); @@ -405,8 +405,8 @@ public class SecondaryTableTests extends JpaJavaResourceModelTestCase { public void testMovePkJoinColumn2() throws Exception { ICompilationUnit cu = this.createTestSecondaryTableWithPkJoinColumns(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - SecondaryTableAnnotation table = (SecondaryTableAnnotation) typeResource.getAnnotation(JPA.SECONDARY_TABLE); + JavaResourceType resourceType = buildJavaResourceType(cu); + SecondaryTableAnnotation table = (SecondaryTableAnnotation) resourceType.getAnnotation(0, JPA.SECONDARY_TABLE); PrimaryKeyJoinColumnAnnotation joinColumn = table.pkJoinColumnAt(0); @@ -418,12 +418,12 @@ public class SecondaryTableTests extends JpaJavaResourceModelTestCase { public void testSetPkJoinColumnName() throws Exception { ICompilationUnit cu = this.createTestSecondaryTableWithPkJoinColumns(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - SecondaryTableAnnotation table = (SecondaryTableAnnotation) typeResource.getAnnotation(JPA.SECONDARY_TABLE); + JavaResourceType resourceType = buildJavaResourceType(cu); + SecondaryTableAnnotation table = (SecondaryTableAnnotation) resourceType.getAnnotation(0, JPA.SECONDARY_TABLE); - assertEquals(3, table.pkJoinColumnsSize()); + assertEquals(3, table.getPkJoinColumnsSize()); - PrimaryKeyJoinColumnAnnotation joinColumn = table.pkJoinColumns().next(); + PrimaryKeyJoinColumnAnnotation joinColumn = table.pkJoinColumnAt(0); assertEquals("BAR", joinColumn.getName()); diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/SecondaryTablesTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/SecondaryTablesTests.java index 4b20f28957..af866a8313 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/SecondaryTablesTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/SecondaryTablesTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2010 Oracle. All rights reserved. + * Copyright (c) 2007, 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,14 +12,13 @@ package org.eclipse.jpt.jpa.core.tests.internal.resource.java; import java.util.Iterator; import org.eclipse.jdt.core.ICompilationUnit; -import org.eclipse.jpt.common.utility.internal.CollectionTools; +import org.eclipse.jpt.common.core.resource.java.Annotation; +import org.eclipse.jpt.common.core.resource.java.JavaResourceType; +import org.eclipse.jpt.common.core.resource.java.NestableAnnotation; import org.eclipse.jpt.common.utility.internal.iterators.ArrayIterator; 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.core.resource.java.PrimaryKeyJoinColumnAnnotation; import org.eclipse.jpt.jpa.core.resource.java.SecondaryTableAnnotation; -import org.eclipse.jpt.jpa.core.resource.java.SecondaryTablesAnnotation; @SuppressWarnings("nls") public class SecondaryTablesTests extends JpaJavaResourceModelTestCase { @@ -127,23 +126,20 @@ public class SecondaryTablesTests extends JpaJavaResourceModelTestCase { public void testGetName() throws Exception { ICompilationUnit cu = this.createTestSecondaryTableWithName(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); + JavaResourceType resourceType = buildJavaResourceType(cu); - SecondaryTableAnnotation table = (SecondaryTableAnnotation) typeResource.getAnnotation(JPA.SECONDARY_TABLE); - assertNull(table); - SecondaryTablesAnnotation secondaryTables = (SecondaryTablesAnnotation) typeResource.getAnnotation(JPA.SECONDARY_TABLES); + Annotation secondaryTables = resourceType.getAnnotation(JPA.SECONDARY_TABLES); assertNotNull(secondaryTables); - SecondaryTableAnnotation secondaryTable = secondaryTables.getNestedAnnotations().iterator().next(); + SecondaryTableAnnotation secondaryTable = (SecondaryTableAnnotation) resourceType.getAnnotation(0, JPA.SECONDARY_TABLE); assertEquals(TABLE_NAME, secondaryTable.getName()); } public void testGetNull() throws Exception { ICompilationUnit cu = this.createTestSecondaryTables(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); + JavaResourceType resourceType = buildJavaResourceType(cu); - SecondaryTablesAnnotation secondaryTables = (SecondaryTablesAnnotation) typeResource.getAnnotation(JPA.SECONDARY_TABLES); - SecondaryTableAnnotation secondaryTable = secondaryTables.getNestedAnnotations().iterator().next(); + SecondaryTableAnnotation secondaryTable = (SecondaryTableAnnotation) resourceType.getAnnotation(0, JPA.SECONDARY_TABLE); assertNull(secondaryTable.getName()); assertNull(secondaryTable.getCatalog()); assertNull(secondaryTable.getSchema()); @@ -151,10 +147,9 @@ public class SecondaryTablesTests extends JpaJavaResourceModelTestCase { public void testSetName() throws Exception { ICompilationUnit cu = this.createTestSecondaryTables(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); + JavaResourceType resourceType = buildJavaResourceType(cu); - SecondaryTablesAnnotation secondaryTables = (SecondaryTablesAnnotation) typeResource.getAnnotation(JPA.SECONDARY_TABLES); - SecondaryTableAnnotation secondaryTable = secondaryTables.getNestedAnnotations().iterator().next(); + SecondaryTableAnnotation secondaryTable = (SecondaryTableAnnotation) resourceType.getAnnotation(0, JPA.SECONDARY_TABLE); assertNull(secondaryTable.getName()); @@ -166,10 +161,9 @@ public class SecondaryTablesTests extends JpaJavaResourceModelTestCase { public void testSetNameNull() throws Exception { ICompilationUnit cu = this.createTestSecondaryTableWithName(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); + JavaResourceType resourceType = buildJavaResourceType(cu); - SecondaryTablesAnnotation secondaryTables = (SecondaryTablesAnnotation) typeResource.getAnnotation(JPA.SECONDARY_TABLES); - SecondaryTableAnnotation secondaryTable = secondaryTables.getNestedAnnotations().iterator().next(); + SecondaryTableAnnotation secondaryTable = (SecondaryTableAnnotation) resourceType.getAnnotation(0, JPA.SECONDARY_TABLE); assertEquals(TABLE_NAME, secondaryTable.getName()); secondaryTable.setName(null); @@ -180,19 +174,17 @@ public class SecondaryTablesTests extends JpaJavaResourceModelTestCase { public void testGetCatalog() throws Exception { ICompilationUnit cu = this.createTestSecondaryTableWithCatalog(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); + JavaResourceType resourceType = buildJavaResourceType(cu); - SecondaryTablesAnnotation secondaryTables = (SecondaryTablesAnnotation) typeResource.getAnnotation(JPA.SECONDARY_TABLES); - SecondaryTableAnnotation secondaryTable = secondaryTables.getNestedAnnotations().iterator().next(); + SecondaryTableAnnotation secondaryTable = (SecondaryTableAnnotation) resourceType.getAnnotation(0, JPA.SECONDARY_TABLE); assertEquals(CATALOG_NAME, secondaryTable.getCatalog()); } public void testSetCatalog() throws Exception { ICompilationUnit cu = this.createTestSecondaryTables(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); + JavaResourceType resourceType = buildJavaResourceType(cu); - SecondaryTablesAnnotation secondaryTables = (SecondaryTablesAnnotation) typeResource.getAnnotation(JPA.SECONDARY_TABLES); - SecondaryTableAnnotation secondaryTable = secondaryTables.getNestedAnnotations().iterator().next(); + SecondaryTableAnnotation secondaryTable = (SecondaryTableAnnotation) resourceType.getAnnotation(0, JPA.SECONDARY_TABLE); assertNull(secondaryTable.getCatalog()); secondaryTable.setCatalog("Foo"); @@ -203,10 +195,9 @@ public class SecondaryTablesTests extends JpaJavaResourceModelTestCase { public void testSetCatalogNull() throws Exception { ICompilationUnit cu = this.createTestSecondaryTableWithCatalog(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); + JavaResourceType resourceType = buildJavaResourceType(cu); - SecondaryTablesAnnotation secondaryTables = (SecondaryTablesAnnotation) typeResource.getAnnotation(JPA.SECONDARY_TABLES); - SecondaryTableAnnotation secondaryTable = secondaryTables.getNestedAnnotations().iterator().next(); + SecondaryTableAnnotation secondaryTable = (SecondaryTableAnnotation) resourceType.getAnnotation(0, JPA.SECONDARY_TABLE); assertEquals(CATALOG_NAME, secondaryTable.getCatalog()); secondaryTable.setCatalog(null); @@ -217,20 +208,18 @@ public class SecondaryTablesTests extends JpaJavaResourceModelTestCase { public void testGetSchema() throws Exception { ICompilationUnit cu = this.createTestSecondaryTableWithSchema(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); + JavaResourceType resourceType = buildJavaResourceType(cu); - SecondaryTablesAnnotation secondaryTables = (SecondaryTablesAnnotation) typeResource.getAnnotation(JPA.SECONDARY_TABLES); - SecondaryTableAnnotation secondaryTable = secondaryTables.getNestedAnnotations().iterator().next(); + SecondaryTableAnnotation secondaryTable = (SecondaryTableAnnotation) resourceType.getAnnotation(0, JPA.SECONDARY_TABLE); assertNotNull(secondaryTable); assertEquals(SCHEMA_NAME, secondaryTable.getSchema()); } public void testSetSchema() throws Exception { ICompilationUnit cu = this.createTestSecondaryTables(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); + JavaResourceType resourceType = buildJavaResourceType(cu); - SecondaryTablesAnnotation secondaryTables = (SecondaryTablesAnnotation) typeResource.getAnnotation(JPA.SECONDARY_TABLES); - SecondaryTableAnnotation secondaryTable = secondaryTables.getNestedAnnotations().iterator().next(); + SecondaryTableAnnotation secondaryTable = (SecondaryTableAnnotation) resourceType.getAnnotation(0, JPA.SECONDARY_TABLE); assertNull(secondaryTable.getSchema()); secondaryTable.setSchema("Foo"); @@ -241,10 +230,9 @@ public class SecondaryTablesTests extends JpaJavaResourceModelTestCase { public void testSetSchemaNull() throws Exception { ICompilationUnit cu = this.createTestSecondaryTableWithSchema(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); + JavaResourceType resourceType = buildJavaResourceType(cu); - SecondaryTablesAnnotation secondaryTables = (SecondaryTablesAnnotation) typeResource.getAnnotation(JPA.SECONDARY_TABLES); - SecondaryTableAnnotation secondaryTable = secondaryTables.getNestedAnnotations().iterator().next(); + SecondaryTableAnnotation secondaryTable = (SecondaryTableAnnotation) resourceType.getAnnotation(0, JPA.SECONDARY_TABLE); assertEquals(SCHEMA_NAME, secondaryTable.getSchema()); secondaryTable.setSchema(null); @@ -256,56 +244,51 @@ public class SecondaryTablesTests extends JpaJavaResourceModelTestCase { public void testUniqueConstraints() throws Exception { ICompilationUnit cu = this.createTestSecondaryTables(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - SecondaryTablesAnnotation secondaryTables = (SecondaryTablesAnnotation) typeResource.getAnnotation(JPA.SECONDARY_TABLES); - SecondaryTableAnnotation secondaryTable = secondaryTables.getNestedAnnotations().iterator().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + SecondaryTableAnnotation secondaryTable = (SecondaryTableAnnotation) resourceType.getAnnotation(0, JPA.SECONDARY_TABLE); - assertEquals(0, secondaryTable.uniqueConstraintsSize()); + assertEquals(0, secondaryTable.getUniqueConstraintsSize()); } public void testUniqueConstraints2() throws Exception { ICompilationUnit cu = this.createTestSecondaryTables(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - SecondaryTablesAnnotation secondaryTables = (SecondaryTablesAnnotation) typeResource.getAnnotation(JPA.SECONDARY_TABLES); - SecondaryTableAnnotation secondaryTable = secondaryTables.getNestedAnnotations().iterator().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + SecondaryTableAnnotation secondaryTable = (SecondaryTableAnnotation) resourceType.getAnnotation(0, JPA.SECONDARY_TABLE); secondaryTable.addUniqueConstraint(0); secondaryTable.addUniqueConstraint(1); - assertEquals(2, secondaryTable.uniqueConstraintsSize()); + assertEquals(2, secondaryTable.getUniqueConstraintsSize()); } public void testUniqueConstraints3() throws Exception { ICompilationUnit cu = this.createTestSecondaryTableWithUniqueConstraints(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - SecondaryTablesAnnotation secondaryTables = (SecondaryTablesAnnotation) typeResource.getAnnotation(JPA.SECONDARY_TABLES); - SecondaryTableAnnotation secondaryTable = secondaryTables.getNestedAnnotations().iterator().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + SecondaryTableAnnotation secondaryTable = (SecondaryTableAnnotation) resourceType.getAnnotation(0, JPA.SECONDARY_TABLE); - assertEquals(2, secondaryTable.uniqueConstraintsSize()); + assertEquals(2, secondaryTable.getUniqueConstraintsSize()); } public void testAddUniqueConstraint() throws Exception { ICompilationUnit cu = this.createTestSecondaryTables(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - SecondaryTablesAnnotation secondaryTables = (SecondaryTablesAnnotation) typeResource.getAnnotation(JPA.SECONDARY_TABLES); - SecondaryTableAnnotation secondaryTable = secondaryTables.getNestedAnnotations().iterator().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + SecondaryTableAnnotation secondaryTable = (SecondaryTableAnnotation) resourceType.getAnnotation(0, JPA.SECONDARY_TABLE); secondaryTable.addUniqueConstraint(0).addColumnName("FOO"); secondaryTable.addUniqueConstraint(1); secondaryTable.addUniqueConstraint(0).addColumnName("BAR"); - assertEquals("BAR", secondaryTable.uniqueConstraintAt(0).columnNames().next()); - assertEquals("FOO", secondaryTable.uniqueConstraintAt(1).columnNames().next()); - assertEquals(0, secondaryTable.uniqueConstraintAt(2).columnNamesSize()); + assertEquals("BAR", secondaryTable.uniqueConstraintAt(0).columnNameAt(0)); + assertEquals("FOO", secondaryTable.uniqueConstraintAt(1).columnNameAt(0)); + assertEquals(0, secondaryTable.uniqueConstraintAt(2).getColumnNamesSize()); assertSourceContains("@SecondaryTables(@SecondaryTable(uniqueConstraints = {@UniqueConstraint(columnNames = \"BAR\"),@UniqueConstraint(columnNames = \"FOO\"), @UniqueConstraint}))", cu); } public void testRemoveUniqueConstraint() throws Exception { ICompilationUnit cu = this.createTestSecondaryTableWithUniqueConstraints(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - SecondaryTablesAnnotation secondaryTables = (SecondaryTablesAnnotation) typeResource.getAnnotation(JPA.SECONDARY_TABLES); - SecondaryTableAnnotation secondaryTable = secondaryTables.getNestedAnnotations().iterator().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + SecondaryTableAnnotation secondaryTable = (SecondaryTableAnnotation) resourceType.getAnnotation(0, JPA.SECONDARY_TABLE); secondaryTable.addUniqueConstraint(0).addColumnName("FOO"); secondaryTable.removeUniqueConstraint(2); @@ -320,37 +303,35 @@ public class SecondaryTablesTests extends JpaJavaResourceModelTestCase { public void testMoveUniqueConstraint() throws Exception { ICompilationUnit cu = this.createTestSecondaryTableWithUniqueConstraints(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - SecondaryTablesAnnotation secondaryTables = (SecondaryTablesAnnotation) typeResource.getAnnotation(JPA.SECONDARY_TABLES); - SecondaryTableAnnotation secondaryTable = secondaryTables.getNestedAnnotations().iterator().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + SecondaryTableAnnotation secondaryTable = (SecondaryTableAnnotation) resourceType.getAnnotation(0, JPA.SECONDARY_TABLE); secondaryTable.addUniqueConstraint(0).addColumnName("FOO"); - assertEquals("FOO", secondaryTable.uniqueConstraintAt(0).columnNames().next()); - assertEquals("BAR", secondaryTable.uniqueConstraintAt(1).columnNames().next()); - assertFalse(secondaryTable.uniqueConstraintAt(2).columnNames().hasNext()); + assertEquals("FOO", secondaryTable.uniqueConstraintAt(0).columnNameAt(0)); + assertEquals("BAR", secondaryTable.uniqueConstraintAt(1).columnNameAt(0)); + assertEquals(0, secondaryTable.uniqueConstraintAt(2).getColumnNamesSize()); secondaryTable.moveUniqueConstraint(2, 0); - assertEquals("BAR", secondaryTable.uniqueConstraintAt(0).columnNames().next()); - assertFalse(secondaryTable.uniqueConstraintAt(1).columnNames().hasNext()); - assertEquals("FOO", secondaryTable.uniqueConstraintAt(2).columnNames().next()); + assertEquals("BAR", secondaryTable.uniqueConstraintAt(0).columnNameAt(0)); + assertEquals(0, secondaryTable.uniqueConstraintAt(1).getColumnNamesSize()); + assertEquals("FOO", secondaryTable.uniqueConstraintAt(2).columnNameAt(0)); assertSourceContains("@SecondaryTables(@SecondaryTable(uniqueConstraints = {@UniqueConstraint(columnNames = {\"BAR\"}), @UniqueConstraint, @UniqueConstraint(columnNames = \"FOO\")}))", cu); } public void testMoveUniqueConstraint2() throws Exception { ICompilationUnit cu = this.createTestSecondaryTableWithUniqueConstraints(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - SecondaryTablesAnnotation secondaryTables = (SecondaryTablesAnnotation) typeResource.getAnnotation(JPA.SECONDARY_TABLES); - SecondaryTableAnnotation secondaryTable = secondaryTables.getNestedAnnotations().iterator().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + SecondaryTableAnnotation secondaryTable = (SecondaryTableAnnotation) resourceType.getAnnotation(0, JPA.SECONDARY_TABLE); secondaryTable.addUniqueConstraint(0).addColumnName("FOO"); - assertEquals("FOO", secondaryTable.uniqueConstraintAt(0).columnNames().next()); - assertEquals("BAR", secondaryTable.uniqueConstraintAt(1).columnNames().next()); - assertFalse(secondaryTable.uniqueConstraintAt(2).columnNames().hasNext()); + assertEquals("FOO", secondaryTable.uniqueConstraintAt(0).columnNameAt(0)); + assertEquals("BAR", secondaryTable.uniqueConstraintAt(1).columnNameAt(0)); + assertEquals(0, secondaryTable.uniqueConstraintAt(2).getColumnNamesSize()); secondaryTable.moveUniqueConstraint(0, 2); - assertFalse(secondaryTable.uniqueConstraintAt(0).columnNames().hasNext()); - assertEquals("FOO", secondaryTable.uniqueConstraintAt(1).columnNames().next()); - assertEquals("BAR", secondaryTable.uniqueConstraintAt(2).columnNames().next()); + assertEquals(0, secondaryTable.uniqueConstraintAt(0).getColumnNamesSize()); + assertEquals("FOO", secondaryTable.uniqueConstraintAt(1).columnNameAt(0)); + assertEquals("BAR", secondaryTable.uniqueConstraintAt(2).columnNameAt(0)); assertSourceContains("@SecondaryTables(@SecondaryTable(uniqueConstraints = {@UniqueConstraint, @UniqueConstraint(columnNames = \"FOO\"), @UniqueConstraint(columnNames = {\"BAR\"})}))", cu); } @@ -359,83 +340,102 @@ public class SecondaryTablesTests extends JpaJavaResourceModelTestCase { // @SecondaryTable(name="FOO") @SecondaryTables({@SecondaryTable(name="FOO"), @SecondaryTable(name="BAR")}) public void testAddSecondaryTableCopyExisting() throws Exception { ICompilationUnit cu = createTestSecondaryTable(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); + JavaResourceType resourceType = buildJavaResourceType(cu); - SecondaryTableAnnotation secondaryTable = (SecondaryTableAnnotation) typeResource.addAnnotation(1, JPA.SECONDARY_TABLE, JPA.SECONDARY_TABLES); + String expected1 = "@SecondaryTables({"; + String expected2 = "@SecondaryTable(name = \"FOO\", catalog = \"BAR\", schema = \"BAZ\", uniqueConstraints = @UniqueConstraint(columnNames = { \"BAR\" })),"; + String expected3 = "@SecondaryTable(name = \"BAR\") })"; + SecondaryTableAnnotation secondaryTable = (SecondaryTableAnnotation) resourceType.addAnnotation(1, JPA.SECONDARY_TABLE); secondaryTable.setName("BAR"); - assertSourceContains("@SecondaryTables({@SecondaryTable(name = \"FOO\", schema = \"BAZ\", catalog = \"BAR\", uniqueConstraints = @UniqueConstraint(columnNames = \"BAR\")),@SecondaryTable(name = \"BAR\")})", cu); + assertSourceContains(expected1, cu); + assertSourceContains(expected2, cu); + assertSourceContains(expected3, cu); - assertNull(typeResource.getAnnotation(JPA.SECONDARY_TABLE)); - assertNotNull(typeResource.getAnnotation(JPA.SECONDARY_TABLES)); - assertEquals(2, CollectionTools.size(typeResource.annotations(JPA.SECONDARY_TABLE, JPA.SECONDARY_TABLES))); + assertNotNull(resourceType.getAnnotation(0, JPA.SECONDARY_TABLE)); + assertEquals(2, resourceType.getAnnotationsSize(JPA.SECONDARY_TABLE)); } public void testAddSecondaryTable() throws Exception { ICompilationUnit cu = createTestSecondaryTable(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); + JavaResourceType resourceType = buildJavaResourceType(cu); - SecondaryTableAnnotation secondaryTable = (SecondaryTableAnnotation) typeResource.addAnnotation(1, JPA.SECONDARY_TABLE, JPA.SECONDARY_TABLES); + String expected1 = "@SecondaryTables({"; + String expected2 = "@SecondaryTable(name = \"FOO\", catalog = \"BAR\", schema = \"BAZ\", uniqueConstraints = @UniqueConstraint(columnNames = { \"BAR\" })),"; + String expected3 = "@SecondaryTable(name = \"BAR\") })"; + SecondaryTableAnnotation secondaryTable = (SecondaryTableAnnotation) resourceType.addAnnotation(1, JPA.SECONDARY_TABLE); secondaryTable.setName("BAR"); - assertSourceContains("@SecondaryTables({@SecondaryTable(name = \"FOO\", schema = \"BAZ\", catalog = \"BAR\", uniqueConstraints = @UniqueConstraint(columnNames = \"BAR\")),@SecondaryTable(name = \"BAR\")})", cu); + assertSourceContains(expected1, cu); + assertSourceContains(expected2, cu); + assertSourceContains(expected3, cu); - secondaryTable = (SecondaryTableAnnotation) typeResource.addAnnotation(0, JPA.SECONDARY_TABLE, JPA.SECONDARY_TABLES); + expected2 = "@SecondaryTable(name = \"BAZ\"),"; + expected3 = "@SecondaryTable(name = \"FOO\", catalog = \"BAR\", schema = \"BAZ\", uniqueConstraints = @UniqueConstraint(columnNames = { \"BAR\" })), @SecondaryTable(name = \"BAR\") })"; + secondaryTable = (SecondaryTableAnnotation) resourceType.addAnnotation(0, JPA.SECONDARY_TABLE); secondaryTable.setName("BAZ"); - assertSourceContains("@SecondaryTables({@SecondaryTable(name = \"BAZ\"),@SecondaryTable(name = \"FOO\", schema = \"BAZ\", catalog = \"BAR\", uniqueConstraints = @UniqueConstraint(columnNames = \"BAR\")), @SecondaryTable(name = \"BAR\")})", cu); + assertSourceContains(expected1, cu); + assertSourceContains(expected2, cu); + assertSourceContains(expected3, cu); - Iterator secondaryTables = typeResource.annotations(JPA.SECONDARY_TABLE, JPA.SECONDARY_TABLES); + Iterator secondaryTables = resourceType.getAnnotations(JPA.SECONDARY_TABLE).iterator(); assertEquals("BAZ", ((SecondaryTableAnnotation) secondaryTables.next()).getName()); assertEquals("FOO", ((SecondaryTableAnnotation) secondaryTables.next()).getName()); assertEquals("BAR", ((SecondaryTableAnnotation) secondaryTables.next()).getName()); - assertNull(typeResource.getAnnotation(JPA.SECONDARY_TABLE)); - assertNotNull(typeResource.getAnnotation(JPA.SECONDARY_TABLES)); - assertEquals(3, CollectionTools.size(typeResource.annotations(JPA.SECONDARY_TABLE, JPA.SECONDARY_TABLES))); + assertNotNull(resourceType.getAnnotation(0, JPA.SECONDARY_TABLE)); + assertEquals(3, resourceType.getAnnotationsSize(JPA.SECONDARY_TABLE)); } public void testRemoveSecondaryTableCopyExisting() throws Exception { ICompilationUnit cu = createTestSecondaryTable(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); + JavaResourceType resourceType = buildJavaResourceType(cu); - SecondaryTableAnnotation secondaryTable = (SecondaryTableAnnotation) typeResource.addAnnotation(1, JPA.SECONDARY_TABLE, JPA.SECONDARY_TABLES); + String expected1 = "@SecondaryTables({"; + String expected2 = "@SecondaryTable(name = \"FOO\", catalog = \"BAR\", schema = \"BAZ\", uniqueConstraints = @UniqueConstraint(columnNames = { \"BAR\" })),"; + String expected3 = "@SecondaryTable(name = \"BAR\") })"; + SecondaryTableAnnotation secondaryTable = (SecondaryTableAnnotation) resourceType.addAnnotation(1, JPA.SECONDARY_TABLE); secondaryTable.setName("BAR"); - assertSourceContains("@SecondaryTables({@SecondaryTable(name = \"FOO\", schema = \"BAZ\", catalog = \"BAR\", uniqueConstraints = @UniqueConstraint(columnNames = \"BAR\")),@SecondaryTable(name = \"BAR\")})", cu); + assertSourceContains(expected1, cu); + assertSourceContains(expected2, cu); + assertSourceContains(expected3, cu); - typeResource.removeAnnotation(1, JPA.SECONDARY_TABLE, JPA.SECONDARY_TABLES); - assertSourceContains("@SecondaryTable(name = \"FOO\", schema = \"BAZ\", catalog = \"BAR\", uniqueConstraints = @UniqueConstraint(columnNames = \"BAR\"))", cu); + expected1 = "@SecondaryTable(name = \"FOO\", catalog = \"BAR\", schema = \"BAZ\", uniqueConstraints = @UniqueConstraint(columnNames = { \"BAR\" }))"; + resourceType.removeAnnotation(1, JPA.SECONDARY_TABLE); + assertSourceContains(expected1, cu); + assertSourceDoesNotContain("@SecondaryTables", cu); } public void testPkJoinColumns() throws Exception { ICompilationUnit cu = this.createTestSecondaryTables(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - SecondaryTableAnnotation table = (SecondaryTableAnnotation) typeResource.annotations(JPA.SECONDARY_TABLE, JPA.SECONDARY_TABLES).next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + SecondaryTableAnnotation table = (SecondaryTableAnnotation) resourceType.getAnnotation(0, JPA.SECONDARY_TABLE); - assertEquals(0, table.pkJoinColumnsSize()); + assertEquals(0, table.getPkJoinColumnsSize()); } public void testPkJoinColumns2() throws Exception { ICompilationUnit cu = this.createTestSecondaryTables(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - SecondaryTableAnnotation table = (SecondaryTableAnnotation) typeResource.annotations(JPA.SECONDARY_TABLE, JPA.SECONDARY_TABLES).next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + SecondaryTableAnnotation table = (SecondaryTableAnnotation) resourceType.getAnnotation(0, JPA.SECONDARY_TABLE); table.addPkJoinColumn(0); table.addPkJoinColumn(1); - assertEquals(2, table.pkJoinColumnsSize()); + assertEquals(2, table.getPkJoinColumnsSize()); } public void testPkJoinColumns3() throws Exception { ICompilationUnit cu = this.createTestSecondaryTablesWithPkJoinColumns(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - SecondaryTableAnnotation table = (SecondaryTableAnnotation) typeResource.annotations(JPA.SECONDARY_TABLE, JPA.SECONDARY_TABLES).next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + SecondaryTableAnnotation table = (SecondaryTableAnnotation) resourceType.getAnnotation(0, JPA.SECONDARY_TABLE); - assertEquals(3, table.pkJoinColumnsSize()); + assertEquals(3, table.getPkJoinColumnsSize()); } public void testAddPkJoinColumn() throws Exception { ICompilationUnit cu = this.createTestSecondaryTables(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - SecondaryTableAnnotation table = (SecondaryTableAnnotation) typeResource.annotations(JPA.SECONDARY_TABLE, JPA.SECONDARY_TABLES).next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + SecondaryTableAnnotation table = (SecondaryTableAnnotation) resourceType.getAnnotation(0, JPA.SECONDARY_TABLE); table.addPkJoinColumn(0).setName("FOO"); table.addPkJoinColumn(1); @@ -446,8 +446,8 @@ public class SecondaryTablesTests extends JpaJavaResourceModelTestCase { public void testRemovePkJoinColumn() throws Exception { ICompilationUnit cu = this.createTestSecondaryTablesWithPkJoinColumns(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - SecondaryTableAnnotation table = (SecondaryTableAnnotation) typeResource.annotations(JPA.SECONDARY_TABLE, JPA.SECONDARY_TABLES).next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + SecondaryTableAnnotation table = (SecondaryTableAnnotation) resourceType.getAnnotation(0, JPA.SECONDARY_TABLE); table.removePkJoinColumn(1); assertSourceContains("@SecondaryTables(@SecondaryTable(pkJoinColumns = {@PrimaryKeyJoinColumn(name = \"BAR\"), @PrimaryKeyJoinColumn(name = \"BAZ\")}))", cu); @@ -461,8 +461,8 @@ public class SecondaryTablesTests extends JpaJavaResourceModelTestCase { public void testMovePkJoinColumn() throws Exception { ICompilationUnit cu = this.createTestSecondaryTablesWithPkJoinColumns(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - SecondaryTableAnnotation table = (SecondaryTableAnnotation) typeResource.annotations(JPA.SECONDARY_TABLE, JPA.SECONDARY_TABLES).next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + SecondaryTableAnnotation table = (SecondaryTableAnnotation) resourceType.getAnnotation(0, JPA.SECONDARY_TABLE); PrimaryKeyJoinColumnAnnotation joinColumn = table.pkJoinColumnAt(0); joinColumn.setReferencedColumnName("REF_NAME"); joinColumn.setColumnDefinition("COLUMN_DEF"); @@ -472,8 +472,8 @@ public class SecondaryTablesTests extends JpaJavaResourceModelTestCase { public void testMovePkJoinColumn2() throws Exception { ICompilationUnit cu = this.createTestSecondaryTablesWithPkJoinColumns(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - SecondaryTableAnnotation table = (SecondaryTableAnnotation) typeResource.annotations(JPA.SECONDARY_TABLE, JPA.SECONDARY_TABLES).next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + SecondaryTableAnnotation table = (SecondaryTableAnnotation) resourceType.getAnnotation(0, JPA.SECONDARY_TABLE); PrimaryKeyJoinColumnAnnotation joinColumn = table.pkJoinColumnAt(0); @@ -485,12 +485,12 @@ public class SecondaryTablesTests extends JpaJavaResourceModelTestCase { public void testSetPkJoinColumnName() throws Exception { ICompilationUnit cu = this.createTestSecondaryTablesWithPkJoinColumns(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - SecondaryTableAnnotation table = (SecondaryTableAnnotation) typeResource.annotations(JPA.SECONDARY_TABLE, JPA.SECONDARY_TABLES).next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + SecondaryTableAnnotation table = (SecondaryTableAnnotation) resourceType.getAnnotation(0, JPA.SECONDARY_TABLE); - assertEquals(3, table.pkJoinColumnsSize()); + assertEquals(3, table.getPkJoinColumnsSize()); - PrimaryKeyJoinColumnAnnotation joinColumn = table.pkJoinColumns().next(); + PrimaryKeyJoinColumnAnnotation joinColumn = table.pkJoinColumnAt(0); assertEquals("BAR", joinColumn.getName()); diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/SequenceGeneratorTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/SequenceGeneratorTests.java index 9dde604f4e..8e99caf5bb 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/SequenceGeneratorTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/SequenceGeneratorTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2009 Oracle. All rights reserved. + * Copyright (c) 2007, 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. @@ -10,12 +10,12 @@ package org.eclipse.jpt.jpa.core.tests.internal.resource.java; import java.util.Iterator; - import org.eclipse.jdt.core.ICompilationUnit; +import org.eclipse.jpt.common.core.resource.java.JavaResourceField; +import org.eclipse.jpt.common.core.resource.java.JavaResourceType; +import org.eclipse.jpt.common.utility.internal.CollectionTools; import org.eclipse.jpt.common.utility.internal.iterators.ArrayIterator; 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.SequenceGeneratorAnnotation; @SuppressWarnings("nls") @@ -100,36 +100,36 @@ public class SequenceGeneratorTests extends JpaJavaResourceModelTestCase { public void testSequenceGeneratorOnField() throws Exception { ICompilationUnit cu = this.createTestSequenceGeneratorOnField(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - SequenceGeneratorAnnotation sequenceGenerator = (SequenceGeneratorAnnotation) attributeResource.getAnnotation(JPA.SEQUENCE_GENERATOR); + SequenceGeneratorAnnotation sequenceGenerator = (SequenceGeneratorAnnotation) resourceField.getAnnotation(JPA.SEQUENCE_GENERATOR); assertNotNull(sequenceGenerator); } public void testSequenceGeneratorOnType() throws Exception { ICompilationUnit cu = this.createTestSequenceGeneratorOnType(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); + JavaResourceType resourceType = buildJavaResourceType(cu); - SequenceGeneratorAnnotation sequenceGenerator = (SequenceGeneratorAnnotation) typeResource.getAnnotation(JPA.SEQUENCE_GENERATOR); + SequenceGeneratorAnnotation sequenceGenerator = (SequenceGeneratorAnnotation) resourceType.getAnnotation(JPA.SEQUENCE_GENERATOR); assertNotNull(sequenceGenerator); } public void testGetName() throws Exception { ICompilationUnit cu = this.createTestSequenceGeneratorWithName(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - SequenceGeneratorAnnotation sequenceGenerator = (SequenceGeneratorAnnotation) attributeResource.getAnnotation(JPA.SEQUENCE_GENERATOR); + SequenceGeneratorAnnotation sequenceGenerator = (SequenceGeneratorAnnotation) resourceField.getAnnotation(JPA.SEQUENCE_GENERATOR); assertEquals(GENERATOR_NAME, sequenceGenerator.getName()); } public void testSetName() throws Exception { ICompilationUnit cu = this.createTestSequenceGeneratorWithName(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - SequenceGeneratorAnnotation sequenceGenerator = (SequenceGeneratorAnnotation) attributeResource.getAnnotation(JPA.SEQUENCE_GENERATOR); + SequenceGeneratorAnnotation sequenceGenerator = (SequenceGeneratorAnnotation) resourceField.getAnnotation(JPA.SEQUENCE_GENERATOR); assertEquals(GENERATOR_NAME, sequenceGenerator.getName()); sequenceGenerator.setName("foo"); @@ -145,19 +145,19 @@ public class SequenceGeneratorTests extends JpaJavaResourceModelTestCase { public void testGetSequenceName() throws Exception { ICompilationUnit cu = this.createTestSequenceGeneratorWithSequenceName(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - SequenceGeneratorAnnotation sequenceGenerator = (SequenceGeneratorAnnotation) attributeResource.getAnnotation(JPA.SEQUENCE_GENERATOR); + SequenceGeneratorAnnotation sequenceGenerator = (SequenceGeneratorAnnotation) resourceField.getAnnotation(JPA.SEQUENCE_GENERATOR); assertEquals(GENERATOR_SEQUENCE_NAME, sequenceGenerator.getSequenceName()); } public void testSetSequenceName() throws Exception { ICompilationUnit cu = this.createTestSequenceGeneratorWithSequenceName(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - SequenceGeneratorAnnotation sequenceGenerator = (SequenceGeneratorAnnotation) attributeResource.getAnnotation(JPA.SEQUENCE_GENERATOR); + SequenceGeneratorAnnotation sequenceGenerator = (SequenceGeneratorAnnotation) resourceField.getAnnotation(JPA.SEQUENCE_GENERATOR); assertEquals(GENERATOR_SEQUENCE_NAME, sequenceGenerator.getSequenceName()); sequenceGenerator.setSequenceName("foo"); @@ -173,19 +173,19 @@ public class SequenceGeneratorTests extends JpaJavaResourceModelTestCase { public void testGetAllocationSize() throws Exception { ICompilationUnit cu = this.createTestSequenceGeneratorWithAllocationSize(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - SequenceGeneratorAnnotation sequenceGenerator = (SequenceGeneratorAnnotation) attributeResource.getAnnotation(JPA.SEQUENCE_GENERATOR); + SequenceGeneratorAnnotation sequenceGenerator = (SequenceGeneratorAnnotation) resourceField.getAnnotation(JPA.SEQUENCE_GENERATOR); assertEquals(GENERATOR_ALLOCATION_SIZE, sequenceGenerator.getAllocationSize()); } public void testSetAllocationSize() throws Exception { ICompilationUnit cu = this.createTestSequenceGeneratorWithAllocationSize(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - SequenceGeneratorAnnotation sequenceGenerator = (SequenceGeneratorAnnotation) attributeResource.getAnnotation(JPA.SEQUENCE_GENERATOR); + SequenceGeneratorAnnotation sequenceGenerator = (SequenceGeneratorAnnotation) resourceField.getAnnotation(JPA.SEQUENCE_GENERATOR); assertEquals(GENERATOR_ALLOCATION_SIZE, sequenceGenerator.getAllocationSize()); sequenceGenerator.setAllocationSize(Integer.valueOf(500)); @@ -203,19 +203,19 @@ public class SequenceGeneratorTests extends JpaJavaResourceModelTestCase { public void testGetInitialValue() throws Exception { ICompilationUnit cu = this.createTestSequenceGeneratorWithInitialValue(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - SequenceGeneratorAnnotation sequenceGenerator = (SequenceGeneratorAnnotation) attributeResource.getAnnotation(JPA.SEQUENCE_GENERATOR); + SequenceGeneratorAnnotation sequenceGenerator = (SequenceGeneratorAnnotation) resourceField.getAnnotation(JPA.SEQUENCE_GENERATOR); assertEquals(GENERATOR_INITIAL_VALUE, sequenceGenerator.getInitialValue()); } public void testSetInitialValue() throws Exception { ICompilationUnit cu = this.createTestSequenceGeneratorWithInitialValue(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - SequenceGeneratorAnnotation sequenceGenerator = (SequenceGeneratorAnnotation) attributeResource.getAnnotation(JPA.SEQUENCE_GENERATOR); + SequenceGeneratorAnnotation sequenceGenerator = (SequenceGeneratorAnnotation) resourceField.getAnnotation(JPA.SEQUENCE_GENERATOR); assertEquals(GENERATOR_INITIAL_VALUE, sequenceGenerator.getInitialValue()); sequenceGenerator.setInitialValue(Integer.valueOf(500)); diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/TableGeneratorTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/TableGeneratorTests.java index a337733a99..cf2ec06bbf 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/TableGeneratorTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/TableGeneratorTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2009 Oracle. All rights reserved. + * Copyright (c) 2007, 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. @@ -11,10 +11,11 @@ package org.eclipse.jpt.jpa.core.tests.internal.resource.java; import java.util.Iterator; import org.eclipse.jdt.core.ICompilationUnit; +import org.eclipse.jpt.common.core.resource.java.JavaResourceField; +import org.eclipse.jpt.common.core.resource.java.JavaResourceType; +import org.eclipse.jpt.common.utility.internal.CollectionTools; import org.eclipse.jpt.common.utility.internal.iterators.ArrayIterator; 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.TableGeneratorAnnotation; @SuppressWarnings("nls") @@ -136,36 +137,36 @@ public class TableGeneratorTests extends JpaJavaResourceModelTestCase { public void testTableGeneratorOnField() throws Exception { ICompilationUnit cu = this.createTestTableGeneratorOnField(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - TableGeneratorAnnotation tableGenerator = (TableGeneratorAnnotation) attributeResource.getAnnotation(JPA.TABLE_GENERATOR); + TableGeneratorAnnotation tableGenerator = (TableGeneratorAnnotation) resourceField.getAnnotation(JPA.TABLE_GENERATOR); assertNotNull(tableGenerator); } public void testTableGeneratorOnType() throws Exception { ICompilationUnit cu = this.createTestTableGeneratorOnType(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); + JavaResourceType resourceType = buildJavaResourceType(cu); - TableGeneratorAnnotation tableGenerator = (TableGeneratorAnnotation) typeResource.getAnnotation(JPA.TABLE_GENERATOR); + TableGeneratorAnnotation tableGenerator = (TableGeneratorAnnotation) resourceType.getAnnotation(JPA.TABLE_GENERATOR); assertNotNull(tableGenerator); } public void testGetName() throws Exception { ICompilationUnit cu = this.createTestTableGeneratorWithName(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - TableGeneratorAnnotation tableGenerator = (TableGeneratorAnnotation) attributeResource.getAnnotation(JPA.TABLE_GENERATOR); + TableGeneratorAnnotation tableGenerator = (TableGeneratorAnnotation) resourceField.getAnnotation(JPA.TABLE_GENERATOR); assertEquals(GENERATOR_NAME, tableGenerator.getName()); } public void testSetName() throws Exception { ICompilationUnit cu = this.createTestTableGeneratorWithName(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - TableGeneratorAnnotation tableGenerator = (TableGeneratorAnnotation) attributeResource.getAnnotation(JPA.TABLE_GENERATOR); + TableGeneratorAnnotation tableGenerator = (TableGeneratorAnnotation) resourceField.getAnnotation(JPA.TABLE_GENERATOR); assertEquals(GENERATOR_NAME, tableGenerator.getName()); tableGenerator.setName("foo"); @@ -181,19 +182,19 @@ public class TableGeneratorTests extends JpaJavaResourceModelTestCase { public void testGetTable() throws Exception { ICompilationUnit cu = this.createTestTableGeneratorWithTable(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - TableGeneratorAnnotation tableGenerator = (TableGeneratorAnnotation) attributeResource.getAnnotation(JPA.TABLE_GENERATOR); + TableGeneratorAnnotation tableGenerator = (TableGeneratorAnnotation) resourceField.getAnnotation(JPA.TABLE_GENERATOR); assertEquals(GENERATOR_TABLE, tableGenerator.getTable()); } public void testSetTable() throws Exception { ICompilationUnit cu = this.createTestTableGeneratorWithTable(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - TableGeneratorAnnotation tableGenerator = (TableGeneratorAnnotation) attributeResource.getAnnotation(JPA.TABLE_GENERATOR); + TableGeneratorAnnotation tableGenerator = (TableGeneratorAnnotation) resourceField.getAnnotation(JPA.TABLE_GENERATOR); assertEquals(GENERATOR_TABLE, tableGenerator.getTable()); tableGenerator.setTable("foo"); @@ -209,19 +210,19 @@ public class TableGeneratorTests extends JpaJavaResourceModelTestCase { public void testGetCatalog() throws Exception { ICompilationUnit cu = this.createTestTableGeneratorWithCatalog(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - TableGeneratorAnnotation tableGenerator = (TableGeneratorAnnotation) attributeResource.getAnnotation(JPA.TABLE_GENERATOR); + TableGeneratorAnnotation tableGenerator = (TableGeneratorAnnotation) resourceField.getAnnotation(JPA.TABLE_GENERATOR); assertEquals(GENERATOR_CATALOG, tableGenerator.getCatalog()); } public void testSetCatalog() throws Exception { ICompilationUnit cu = this.createTestTableGeneratorWithCatalog(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - TableGeneratorAnnotation tableGenerator = (TableGeneratorAnnotation) attributeResource.getAnnotation(JPA.TABLE_GENERATOR); + TableGeneratorAnnotation tableGenerator = (TableGeneratorAnnotation) resourceField.getAnnotation(JPA.TABLE_GENERATOR); assertEquals(GENERATOR_CATALOG, tableGenerator.getCatalog()); tableGenerator.setCatalog("foo"); @@ -237,19 +238,19 @@ public class TableGeneratorTests extends JpaJavaResourceModelTestCase { public void testGetSchema() throws Exception { ICompilationUnit cu = this.createTestTableGeneratorWithSchema(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - TableGeneratorAnnotation tableGenerator = (TableGeneratorAnnotation) attributeResource.getAnnotation(JPA.TABLE_GENERATOR); + TableGeneratorAnnotation tableGenerator = (TableGeneratorAnnotation) resourceField.getAnnotation(JPA.TABLE_GENERATOR); assertEquals(GENERATOR_SCHEMA, tableGenerator.getSchema()); } public void testSetSchema() throws Exception { ICompilationUnit cu = this.createTestTableGeneratorWithSchema(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - TableGeneratorAnnotation tableGenerator = (TableGeneratorAnnotation) attributeResource.getAnnotation(JPA.TABLE_GENERATOR); + TableGeneratorAnnotation tableGenerator = (TableGeneratorAnnotation) resourceField.getAnnotation(JPA.TABLE_GENERATOR); assertEquals(GENERATOR_SCHEMA, tableGenerator.getSchema()); tableGenerator.setSchema("foo"); @@ -265,19 +266,19 @@ public class TableGeneratorTests extends JpaJavaResourceModelTestCase { public void testGetPkColumnName() throws Exception { ICompilationUnit cu = this.createTestTableGeneratorWithPkColumnName(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - TableGeneratorAnnotation tableGenerator = (TableGeneratorAnnotation) attributeResource.getAnnotation(JPA.TABLE_GENERATOR); + TableGeneratorAnnotation tableGenerator = (TableGeneratorAnnotation) resourceField.getAnnotation(JPA.TABLE_GENERATOR); assertEquals(GENERATOR_PK_COLUMN_NAME, tableGenerator.getPkColumnName()); } public void testSetPkColumnName() throws Exception { ICompilationUnit cu = this.createTestTableGeneratorWithPkColumnName(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - TableGeneratorAnnotation tableGenerator = (TableGeneratorAnnotation) attributeResource.getAnnotation(JPA.TABLE_GENERATOR); + TableGeneratorAnnotation tableGenerator = (TableGeneratorAnnotation) resourceField.getAnnotation(JPA.TABLE_GENERATOR); assertEquals(GENERATOR_PK_COLUMN_NAME, tableGenerator.getPkColumnName()); tableGenerator.setPkColumnName("foo"); @@ -293,19 +294,19 @@ public class TableGeneratorTests extends JpaJavaResourceModelTestCase { public void testGetValueColumnName() throws Exception { ICompilationUnit cu = this.createTestTableGeneratorWithValueColumnName(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - TableGeneratorAnnotation tableGenerator = (TableGeneratorAnnotation) attributeResource.getAnnotation(JPA.TABLE_GENERATOR); + TableGeneratorAnnotation tableGenerator = (TableGeneratorAnnotation) resourceField.getAnnotation(JPA.TABLE_GENERATOR); assertEquals(GENERATOR_VALUE_COLUMN_NAME, tableGenerator.getValueColumnName()); } public void testSetValueColumnName() throws Exception { ICompilationUnit cu = this.createTestTableGeneratorWithValueColumnName(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - TableGeneratorAnnotation tableGenerator = (TableGeneratorAnnotation) attributeResource.getAnnotation(JPA.TABLE_GENERATOR); + TableGeneratorAnnotation tableGenerator = (TableGeneratorAnnotation) resourceField.getAnnotation(JPA.TABLE_GENERATOR); assertEquals(GENERATOR_VALUE_COLUMN_NAME, tableGenerator.getValueColumnName()); tableGenerator.setValueColumnName("foo"); @@ -321,19 +322,19 @@ public class TableGeneratorTests extends JpaJavaResourceModelTestCase { public void testGetPkColumnValue() throws Exception { ICompilationUnit cu = this.createTestTableGeneratorWithPkColumnValue(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - TableGeneratorAnnotation tableGenerator = (TableGeneratorAnnotation) attributeResource.getAnnotation(JPA.TABLE_GENERATOR); + TableGeneratorAnnotation tableGenerator = (TableGeneratorAnnotation) resourceField.getAnnotation(JPA.TABLE_GENERATOR); assertEquals(GENERATOR_PK_COLUMN_VALUE, tableGenerator.getPkColumnValue()); } public void testSetPkColumnValue() throws Exception { ICompilationUnit cu = this.createTestTableGeneratorWithPkColumnValue(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - TableGeneratorAnnotation tableGenerator = (TableGeneratorAnnotation) attributeResource.getAnnotation(JPA.TABLE_GENERATOR); + TableGeneratorAnnotation tableGenerator = (TableGeneratorAnnotation) resourceField.getAnnotation(JPA.TABLE_GENERATOR); assertEquals(GENERATOR_PK_COLUMN_VALUE, tableGenerator.getPkColumnValue()); tableGenerator.setPkColumnValue("foo"); @@ -349,19 +350,19 @@ public class TableGeneratorTests extends JpaJavaResourceModelTestCase { public void testGetAllocationSize() throws Exception { ICompilationUnit cu = this.createTestTableGeneratorWithAllocationSize(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - TableGeneratorAnnotation tableGenerator = (TableGeneratorAnnotation) attributeResource.getAnnotation(JPA.TABLE_GENERATOR); + TableGeneratorAnnotation tableGenerator = (TableGeneratorAnnotation) resourceField.getAnnotation(JPA.TABLE_GENERATOR); assertEquals(GENERATOR_ALLOCATION_SIZE, tableGenerator.getAllocationSize()); } public void testSetAllocationSize() throws Exception { ICompilationUnit cu = this.createTestTableGeneratorWithAllocationSize(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - TableGeneratorAnnotation tableGenerator = (TableGeneratorAnnotation) attributeResource.getAnnotation(JPA.TABLE_GENERATOR); + TableGeneratorAnnotation tableGenerator = (TableGeneratorAnnotation) resourceField.getAnnotation(JPA.TABLE_GENERATOR); assertEquals(GENERATOR_ALLOCATION_SIZE, tableGenerator.getAllocationSize()); tableGenerator.setAllocationSize(Integer.valueOf(500)); @@ -379,19 +380,19 @@ public class TableGeneratorTests extends JpaJavaResourceModelTestCase { public void testGetInitialValue() throws Exception { ICompilationUnit cu = this.createTestTableGeneratorWithInitialValue(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - TableGeneratorAnnotation tableGenerator = (TableGeneratorAnnotation) attributeResource.getAnnotation(JPA.TABLE_GENERATOR); + TableGeneratorAnnotation tableGenerator = (TableGeneratorAnnotation) resourceField.getAnnotation(JPA.TABLE_GENERATOR); assertEquals(GENERATOR_INITIAL_VALUE, tableGenerator.getInitialValue()); } public void testSetInitialValue() throws Exception { ICompilationUnit cu = this.createTestTableGeneratorWithInitialValue(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - TableGeneratorAnnotation tableGenerator = (TableGeneratorAnnotation) attributeResource.getAnnotation(JPA.TABLE_GENERATOR); + TableGeneratorAnnotation tableGenerator = (TableGeneratorAnnotation) resourceField.getAnnotation(JPA.TABLE_GENERATOR); assertEquals(GENERATOR_INITIAL_VALUE, tableGenerator.getInitialValue()); tableGenerator.setInitialValue(Integer.valueOf(500)); @@ -409,62 +410,62 @@ public class TableGeneratorTests extends JpaJavaResourceModelTestCase { public void testUniqueConstraints() throws Exception { ICompilationUnit cu = this.createTestTableGeneratorOnField(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - TableGeneratorAnnotation tableGenerator = (TableGeneratorAnnotation) attributeResource.getAnnotation(JPA.TABLE_GENERATOR); + TableGeneratorAnnotation tableGenerator = (TableGeneratorAnnotation) resourceField.getAnnotation(JPA.TABLE_GENERATOR); - assertEquals(0, tableGenerator.uniqueConstraintsSize()); + assertEquals(0, tableGenerator.getUniqueConstraintsSize()); } public void testUniqueConstraints2() throws Exception { ICompilationUnit cu = this.createTestTableGeneratorOnField(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - TableGeneratorAnnotation tableGenerator = (TableGeneratorAnnotation) attributeResource.getAnnotation(JPA.TABLE_GENERATOR); + TableGeneratorAnnotation tableGenerator = (TableGeneratorAnnotation) resourceField.getAnnotation(JPA.TABLE_GENERATOR); tableGenerator.addUniqueConstraint(0); tableGenerator.addUniqueConstraint(1); - assertEquals(2, tableGenerator.uniqueConstraintsSize()); + assertEquals(2, tableGenerator.getUniqueConstraintsSize()); } public void testUniqueConstraints3() throws Exception { ICompilationUnit cu = this.createTestTableGeneratorWithUniqueConstraints(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - TableGeneratorAnnotation tableGenerator = (TableGeneratorAnnotation) attributeResource.getAnnotation(JPA.TABLE_GENERATOR); + TableGeneratorAnnotation tableGenerator = (TableGeneratorAnnotation) resourceField.getAnnotation(JPA.TABLE_GENERATOR); - assertEquals(3, tableGenerator.uniqueConstraintsSize()); + assertEquals(3, tableGenerator.getUniqueConstraintsSize()); } public void testAddUniqueConstraint() throws Exception { ICompilationUnit cu = this.createTestTableGeneratorOnField(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - TableGeneratorAnnotation tableGenerator = (TableGeneratorAnnotation) attributeResource.getAnnotation(JPA.TABLE_GENERATOR); + TableGeneratorAnnotation tableGenerator = (TableGeneratorAnnotation) resourceField.getAnnotation(JPA.TABLE_GENERATOR); tableGenerator.addUniqueConstraint(0).addColumnName("FOO"); tableGenerator.addUniqueConstraint(1); tableGenerator.addUniqueConstraint(0).addColumnName("BAR"); - assertEquals("BAR", tableGenerator.uniqueConstraintAt(0).columnNames().next()); - assertEquals("FOO", tableGenerator.uniqueConstraintAt(1).columnNames().next()); - assertEquals(0, tableGenerator.uniqueConstraintAt(2).columnNamesSize()); + assertEquals("BAR", tableGenerator.uniqueConstraintAt(0).columnNameAt(0)); + assertEquals("FOO", tableGenerator.uniqueConstraintAt(1).columnNameAt(0)); + assertEquals(0, tableGenerator.uniqueConstraintAt(2).getColumnNamesSize()); - assertEquals(3, tableGenerator.uniqueConstraintsSize()); + assertEquals(3, tableGenerator.getUniqueConstraintsSize()); assertSourceContains("@TableGenerator(uniqueConstraints = {@UniqueConstraint(columnNames = \"BAR\"),@UniqueConstraint(columnNames = \"FOO\"), @UniqueConstraint})", cu); } public void testRemoveUniqueConstraint() throws Exception { ICompilationUnit cu = this.createTestTableGeneratorWithUniqueConstraints(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - TableGeneratorAnnotation tableGenerator = (TableGeneratorAnnotation) attributeResource.getAnnotation(JPA.TABLE_GENERATOR); + TableGeneratorAnnotation tableGenerator = (TableGeneratorAnnotation) resourceField.getAnnotation(JPA.TABLE_GENERATOR); tableGenerator.removeUniqueConstraint(1); assertSourceContains("@TableGenerator(uniqueConstraints = {@UniqueConstraint(columnNames = {\"BAR\"}), @UniqueConstraint(columnNames = {\"BAZ\"})})", cu); @@ -478,10 +479,10 @@ public class TableGeneratorTests extends JpaJavaResourceModelTestCase { public void testMoveUniqueConstraint() throws Exception { ICompilationUnit cu = this.createTestTableGeneratorWithUniqueConstraints(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - TableGeneratorAnnotation tableGenerator = (TableGeneratorAnnotation) attributeResource.getAnnotation(JPA.TABLE_GENERATOR); + TableGeneratorAnnotation tableGenerator = (TableGeneratorAnnotation) resourceField.getAnnotation(JPA.TABLE_GENERATOR); tableGenerator.moveUniqueConstraint(2, 0); assertSourceContains("@TableGenerator(uniqueConstraints = {@UniqueConstraint(columnNames = {\"FOO\"}), @UniqueConstraint(columnNames = {\"BAZ\"}), @UniqueConstraint(columnNames = {\"BAR\"})})", cu); @@ -489,10 +490,10 @@ public class TableGeneratorTests extends JpaJavaResourceModelTestCase { public void testMoveUniqueConstraint2() throws Exception { ICompilationUnit cu = this.createTestTableGeneratorWithUniqueConstraints(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - TableGeneratorAnnotation tableGenerator = (TableGeneratorAnnotation) attributeResource.getAnnotation(JPA.TABLE_GENERATOR); + TableGeneratorAnnotation tableGenerator = (TableGeneratorAnnotation) resourceField.getAnnotation(JPA.TABLE_GENERATOR); tableGenerator.moveUniqueConstraint(0, 2); assertSourceContains("@TableGenerator(uniqueConstraints = {@UniqueConstraint(columnNames = {\"BAZ\"}), @UniqueConstraint(columnNames = {\"BAR\"}), @UniqueConstraint(columnNames = {\"FOO\"})})", cu); diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/TableTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/TableTests.java index b432e69c29..f14a6b4aba 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/TableTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/TableTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2009 Oracle. All rights reserved. + * Copyright (c) 2007, 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,9 +12,9 @@ package org.eclipse.jpt.jpa.core.tests.internal.resource.java; import java.util.Iterator; import java.util.ListIterator; import org.eclipse.jdt.core.ICompilationUnit; +import org.eclipse.jpt.common.core.resource.java.JavaResourceType; import org.eclipse.jpt.common.utility.internal.iterators.ArrayIterator; 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.TableAnnotation; @SuppressWarnings("nls") @@ -95,18 +95,18 @@ public class TableTests extends JpaJavaResourceModelTestCase { public void testGetName() throws Exception { ICompilationUnit cu = this.createTestTableWithName(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); + JavaResourceType resourceType = buildJavaResourceType(cu); - TableAnnotation table = (TableAnnotation) typeResource.getAnnotation(JPA.TABLE); + TableAnnotation table = (TableAnnotation) resourceType.getAnnotation(JPA.TABLE); assertNotNull(table); assertEquals(TABLE_NAME, table.getName()); } public void testGetNull() throws Exception { ICompilationUnit cu = this.createTestTable(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); + JavaResourceType resourceType = buildJavaResourceType(cu); - TableAnnotation table = (TableAnnotation) typeResource.getAnnotation(JPA.TABLE); + TableAnnotation table = (TableAnnotation) resourceType.getAnnotation(JPA.TABLE); assertNotNull(table); assertNull(table.getName()); assertNull(table.getCatalog()); @@ -115,9 +115,9 @@ public class TableTests extends JpaJavaResourceModelTestCase { public void testSetName() throws Exception { ICompilationUnit cu = this.createTestTable(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); + JavaResourceType resourceType = buildJavaResourceType(cu); - TableAnnotation table = (TableAnnotation) typeResource.getAnnotation(JPA.TABLE); + TableAnnotation table = (TableAnnotation) resourceType.getAnnotation(JPA.TABLE); assertNotNull(table); assertNull(table.getName()); @@ -129,9 +129,9 @@ public class TableTests extends JpaJavaResourceModelTestCase { public void testSetNameNull() throws Exception { ICompilationUnit cu = this.createTestTableWithName(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); + JavaResourceType resourceType = buildJavaResourceType(cu); - TableAnnotation table = (TableAnnotation) typeResource.getAnnotation(JPA.TABLE); + TableAnnotation table = (TableAnnotation) resourceType.getAnnotation(JPA.TABLE); assertEquals(TABLE_NAME, table.getName()); table.setName(null); @@ -142,18 +142,18 @@ public class TableTests extends JpaJavaResourceModelTestCase { public void testGetCatalog() throws Exception { ICompilationUnit cu = this.createTestTableWithCatalog(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); + JavaResourceType resourceType = buildJavaResourceType(cu); - TableAnnotation table = (TableAnnotation) typeResource.getAnnotation(JPA.TABLE); + TableAnnotation table = (TableAnnotation) resourceType.getAnnotation(JPA.TABLE); assertNotNull(table); assertEquals(CATALOG_NAME, table.getCatalog()); } public void testSetCatalog() throws Exception { ICompilationUnit cu = this.createTestTable(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); + JavaResourceType resourceType = buildJavaResourceType(cu); - TableAnnotation table = (TableAnnotation) typeResource.getAnnotation(JPA.TABLE); + TableAnnotation table = (TableAnnotation) resourceType.getAnnotation(JPA.TABLE); assertNotNull(table); assertNull(table.getCatalog()); @@ -165,9 +165,9 @@ public class TableTests extends JpaJavaResourceModelTestCase { public void testSetCatalogNull() throws Exception { ICompilationUnit cu = this.createTestTableWithCatalog(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); + JavaResourceType resourceType = buildJavaResourceType(cu); - TableAnnotation table = (TableAnnotation) typeResource.getAnnotation(JPA.TABLE); + TableAnnotation table = (TableAnnotation) resourceType.getAnnotation(JPA.TABLE); assertEquals(CATALOG_NAME, table.getCatalog()); table.setCatalog(null); @@ -178,18 +178,18 @@ public class TableTests extends JpaJavaResourceModelTestCase { public void testGetSchema() throws Exception { ICompilationUnit cu = this.createTestTableWithSchema(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); + JavaResourceType resourceType = buildJavaResourceType(cu); - TableAnnotation table = (TableAnnotation) typeResource.getAnnotation(JPA.TABLE); + TableAnnotation table = (TableAnnotation) resourceType.getAnnotation(JPA.TABLE); assertNotNull(table); assertEquals(SCHEMA_NAME, table.getSchema()); } public void testSetSchema() throws Exception { ICompilationUnit cu = this.createTestTable(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); + JavaResourceType resourceType = buildJavaResourceType(cu); - TableAnnotation table = (TableAnnotation) typeResource.getAnnotation(JPA.TABLE); + TableAnnotation table = (TableAnnotation) resourceType.getAnnotation(JPA.TABLE); assertNotNull(table); assertNull(table.getSchema()); @@ -201,9 +201,9 @@ public class TableTests extends JpaJavaResourceModelTestCase { public void testSetSchemaNull() throws Exception { ICompilationUnit cu = this.createTestTableWithSchema(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); + JavaResourceType resourceType = buildJavaResourceType(cu); - TableAnnotation table = (TableAnnotation) typeResource.getAnnotation(JPA.TABLE); + TableAnnotation table = (TableAnnotation) resourceType.getAnnotation(JPA.TABLE); assertEquals(SCHEMA_NAME, table.getSchema()); table.setSchema(null); @@ -214,51 +214,51 @@ public class TableTests extends JpaJavaResourceModelTestCase { public void testUniqueConstraints() throws Exception { ICompilationUnit cu = this.createTestTable(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - TableAnnotation table = (TableAnnotation) typeResource.getAnnotation(JPA.TABLE); + JavaResourceType resourceType = buildJavaResourceType(cu); + TableAnnotation table = (TableAnnotation) resourceType.getAnnotation(JPA.TABLE); - assertEquals(0, table.uniqueConstraintsSize()); + assertEquals(0, table.getUniqueConstraintsSize()); } public void testUniqueConstraints2() throws Exception { ICompilationUnit cu = this.createTestTable(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - TableAnnotation table = (TableAnnotation) typeResource.getAnnotation(JPA.TABLE); + JavaResourceType resourceType = buildJavaResourceType(cu); + TableAnnotation table = (TableAnnotation) resourceType.getAnnotation(JPA.TABLE); table.addUniqueConstraint(0); table.addUniqueConstraint(1); - assertEquals(2, table.uniqueConstraintsSize()); + assertEquals(2, table.getUniqueConstraintsSize()); } public void testUniqueConstraints3() throws Exception { ICompilationUnit cu = this.createTestTableWithUniqueConstraints(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - TableAnnotation table = (TableAnnotation) typeResource.getAnnotation(JPA.TABLE); + JavaResourceType resourceType = buildJavaResourceType(cu); + TableAnnotation table = (TableAnnotation) resourceType.getAnnotation(JPA.TABLE); - assertEquals(3, table.uniqueConstraintsSize()); + assertEquals(3, table.getUniqueConstraintsSize()); } public void testAddUniqueConstraint() throws Exception { ICompilationUnit cu = this.createTestTable(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - TableAnnotation table = (TableAnnotation) typeResource.getAnnotation(JPA.TABLE); + JavaResourceType resourceType = buildJavaResourceType(cu); + TableAnnotation table = (TableAnnotation) resourceType.getAnnotation(JPA.TABLE); table.addUniqueConstraint(0).addColumnName("FOO"); table.addUniqueConstraint(1); table.addUniqueConstraint(0).addColumnName("BAR"); - assertEquals("BAR", table.uniqueConstraintAt(0).columnNames().next()); - assertEquals("FOO", table.uniqueConstraintAt(1).columnNames().next()); - assertEquals(0, table.uniqueConstraintAt(2).columnNamesSize()); + assertEquals("BAR", table.uniqueConstraintAt(0).columnNameAt(0)); + assertEquals("FOO", table.uniqueConstraintAt(1).columnNameAt(0)); + assertEquals(0, table.uniqueConstraintAt(2).getColumnNamesSize()); assertSourceContains("@Table(uniqueConstraints = {@UniqueConstraint(columnNames = \"BAR\"),@UniqueConstraint(columnNames = \"FOO\"), @UniqueConstraint})", cu); } public void testAddUniqueConstraint2() throws Exception { ICompilationUnit cu = this.createTestTable(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - TableAnnotation table = (TableAnnotation) typeResource.getAnnotation(JPA.TABLE); + JavaResourceType resourceType = buildJavaResourceType(cu); + TableAnnotation table = (TableAnnotation) resourceType.getAnnotation(JPA.TABLE); table.addUniqueConstraint(0).addColumnName("FOO"); table.addUniqueConstraint(0); @@ -267,15 +267,15 @@ public class TableTests extends JpaJavaResourceModelTestCase { assertSourceContains("@Table(uniqueConstraints = {@UniqueConstraint,@UniqueConstraint(columnNames = { \"BAR\", \"BAZ\" }), @UniqueConstraint(columnNames = \"FOO\")})", cu); - assertEquals("FOO", table.uniqueConstraintAt(2).columnNames().next()); - ListIterator columnNames = table.uniqueConstraintAt(1).columnNames(); + assertEquals("FOO", table.uniqueConstraintAt(2).columnNameAt(0)); + ListIterator columnNames = table.uniqueConstraintAt(1).getColumnNames().iterator(); assertEquals("BAR", columnNames.next()); assertEquals("BAZ", columnNames.next()); } public void testRemoveUniqueConstraint() throws Exception { ICompilationUnit cu = this.createTestTableWithUniqueConstraints(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - TableAnnotation table = (TableAnnotation) typeResource.getAnnotation(JPA.TABLE); + JavaResourceType resourceType = buildJavaResourceType(cu); + TableAnnotation table = (TableAnnotation) resourceType.getAnnotation(JPA.TABLE); table.removeUniqueConstraint(1); assertSourceContains("@Table(uniqueConstraints = {@UniqueConstraint(columnNames = {\"BAR\"}), @UniqueConstraint(columnNames = {\"BAZ\"})})", cu); @@ -289,8 +289,8 @@ public class TableTests extends JpaJavaResourceModelTestCase { public void testRemoveUniqueConstraint2() throws Exception { ICompilationUnit cu = this.createTestTable(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - TableAnnotation table = (TableAnnotation) typeResource.getAnnotation(JPA.TABLE); + JavaResourceType resourceType = buildJavaResourceType(cu); + TableAnnotation table = (TableAnnotation) resourceType.getAnnotation(JPA.TABLE); table.addUniqueConstraint(0).addColumnName("FOO"); table.addUniqueConstraint(1).addColumnName("BAR"); table.addUniqueConstraint(2).addColumnName("BAZ"); @@ -308,8 +308,8 @@ public class TableTests extends JpaJavaResourceModelTestCase { public void testRemoveUniqueConstraint3() throws Exception { ICompilationUnit cu = this.createTestTable(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - TableAnnotation table = (TableAnnotation) typeResource.getAnnotation(JPA.TABLE); + JavaResourceType resourceType = buildJavaResourceType(cu); + TableAnnotation table = (TableAnnotation) resourceType.getAnnotation(JPA.TABLE); table.addUniqueConstraint(0).addColumnName("FOO"); table.addUniqueConstraint(1).addColumnName("BAR"); table.addUniqueConstraint(2).addColumnName("BAZ"); @@ -327,8 +327,8 @@ public class TableTests extends JpaJavaResourceModelTestCase { public void testMoveUniqueConstraint() throws Exception { ICompilationUnit cu = this.createTestTableWithUniqueConstraints(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - TableAnnotation table = (TableAnnotation) typeResource.getAnnotation(JPA.TABLE); + JavaResourceType resourceType = buildJavaResourceType(cu); + TableAnnotation table = (TableAnnotation) resourceType.getAnnotation(JPA.TABLE); table.moveUniqueConstraint(2, 0); assertSourceContains("@Table(uniqueConstraints = {@UniqueConstraint(columnNames = {\"FOO\"}), @UniqueConstraint(columnNames = {\"BAZ\"}), @UniqueConstraint(columnNames = {\"BAR\"})})", cu); @@ -336,8 +336,8 @@ public class TableTests extends JpaJavaResourceModelTestCase { public void testMoveUniqueConstraint2() throws Exception { ICompilationUnit cu = this.createTestTableWithUniqueConstraints(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - TableAnnotation table = (TableAnnotation) typeResource.getAnnotation(JPA.TABLE); + JavaResourceType resourceType = buildJavaResourceType(cu); + TableAnnotation table = (TableAnnotation) resourceType.getAnnotation(JPA.TABLE); table.moveUniqueConstraint(0, 2); assertSourceContains("@Table(uniqueConstraints = {@UniqueConstraint(columnNames = {\"BAZ\"}), @UniqueConstraint(columnNames = {\"BAR\"}), @UniqueConstraint(columnNames = {\"FOO\"})})", cu); diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/TemporalTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/TemporalTests.java index 6dea89f25c..61953901d4 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/TemporalTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/TemporalTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2009 Oracle. All rights reserved. + * Copyright (c) 2007, 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. @@ -11,10 +11,11 @@ package org.eclipse.jpt.jpa.core.tests.internal.resource.java; import java.util.Iterator; import org.eclipse.jdt.core.ICompilationUnit; +import org.eclipse.jpt.common.core.resource.java.JavaResourceField; +import org.eclipse.jpt.common.core.resource.java.JavaResourceType; +import org.eclipse.jpt.common.utility.internal.CollectionTools; import org.eclipse.jpt.common.utility.internal.iterators.ArrayIterator; 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.TemporalAnnotation; import org.eclipse.jpt.jpa.core.resource.java.TemporalType; @@ -53,28 +54,28 @@ public class TemporalTests extends JpaJavaResourceModelTestCase { public void testTemporal() throws Exception { ICompilationUnit cu = this.createTestTemporal(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - TemporalAnnotation temporal = (TemporalAnnotation) attributeResource.getAnnotation(JPA.TEMPORAL); + TemporalAnnotation temporal = (TemporalAnnotation) resourceField.getAnnotation(JPA.TEMPORAL); assertNotNull(temporal); } public void testGetValue() throws Exception { ICompilationUnit cu = this.createTestTemporalWithValue(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - TemporalAnnotation temporal = (TemporalAnnotation) attributeResource.getAnnotation(JPA.TEMPORAL); + TemporalAnnotation temporal = (TemporalAnnotation) resourceField.getAnnotation(JPA.TEMPORAL); assertEquals(TemporalType.DATE, temporal.getValue()); } public void testSetValue() throws Exception { ICompilationUnit cu = this.createTestTemporal(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - TemporalAnnotation temporal = (TemporalAnnotation) attributeResource.getAnnotation(JPA.TEMPORAL); + TemporalAnnotation temporal = (TemporalAnnotation) resourceField.getAnnotation(JPA.TEMPORAL); temporal.setValue(TemporalType.TIME); diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/TransientTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/TransientTests.java index 9d812050c8..8815516a87 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/TransientTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/TransientTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2009 Oracle. All rights reserved. + * Copyright (c) 2007, 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. @@ -11,11 +11,12 @@ package org.eclipse.jpt.jpa.core.tests.internal.resource.java; import java.util.Iterator; import org.eclipse.jdt.core.ICompilationUnit; +import org.eclipse.jpt.common.core.resource.java.JavaResourceField; +import org.eclipse.jpt.common.core.resource.java.JavaResourceNode; +import org.eclipse.jpt.common.core.resource.java.JavaResourceType; +import org.eclipse.jpt.common.utility.internal.CollectionTools; import org.eclipse.jpt.common.utility.internal.iterators.ArrayIterator; import org.eclipse.jpt.jpa.core.resource.java.JPA; -import org.eclipse.jpt.jpa.core.resource.java.JavaResourceNode; -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.TransientAnnotation; @SuppressWarnings("nls") @@ -40,10 +41,10 @@ public class TransientTests extends JpaJavaResourceModelTestCase { public void testTransient() throws Exception { ICompilationUnit cu = this.createTestTransient(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - JavaResourceNode mappingAnnotation = attributeResource.getAnnotation(TransientAnnotation.ANNOTATION_NAME); + JavaResourceNode mappingAnnotation = resourceField.getAnnotation(TransientAnnotation.ANNOTATION_NAME); assertTrue(mappingAnnotation instanceof TransientAnnotation); } diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/VersionTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/VersionTests.java index 8abae7dea7..2f045e7a63 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/VersionTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/resource/java/VersionTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2009 Oracle. All rights reserved. + * Copyright (c) 2007, 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. @@ -11,11 +11,12 @@ package org.eclipse.jpt.jpa.core.tests.internal.resource.java; import java.util.Iterator; import org.eclipse.jdt.core.ICompilationUnit; +import org.eclipse.jpt.common.core.resource.java.JavaResourceField; +import org.eclipse.jpt.common.core.resource.java.JavaResourceNode; +import org.eclipse.jpt.common.core.resource.java.JavaResourceType; +import org.eclipse.jpt.common.utility.internal.CollectionTools; import org.eclipse.jpt.common.utility.internal.iterators.ArrayIterator; import org.eclipse.jpt.jpa.core.resource.java.JPA; -import org.eclipse.jpt.jpa.core.resource.java.JavaResourceNode; -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.VersionAnnotation; @SuppressWarnings("nls") @@ -40,10 +41,10 @@ public class VersionTests extends JpaJavaResourceModelTestCase { public void testVersion() throws Exception { ICompilationUnit cu = this.createTestVersion(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); + JavaResourceType resourceType = buildJavaResourceType(cu); + JavaResourceField resourceField = CollectionTools.get(resourceType.getFields(), 0); - JavaResourceNode mappingAnnotation = attributeResource.getAnnotation(VersionAnnotation.ANNOTATION_NAME); + JavaResourceNode mappingAnnotation = resourceField.getAnnotation(VersionAnnotation.ANNOTATION_NAME); assertTrue(mappingAnnotation instanceof VersionAnnotation); } } -- cgit v1.2.3