Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkmoore2011-08-02 13:24:47 +0000
committerkmoore2011-08-02 13:24:47 +0000
commit3d505d221f38ced0b003a7ab4c3bec329e66520d (patch)
tree523ab7f29009dc5f54adcc0d373d46a5c9db78c1 /jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa
parenta940ce0028751421c5c7312b19128b3a5f518386 (diff)
downloadwebtools.dali-3d505d221f38ced0b003a7ab4c3bec329e66520d.tar.gz
webtools.dali-3d505d221f38ced0b003a7ab4c3bec329e66520d.tar.xz
webtools.dali-3d505d221f38ced0b003a7ab4c3bec329e66520d.zip
changing the rest of the Iterator API to Iterable
Diffstat (limited to 'jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa')
-rw-r--r--jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/GenericJavaPersistentTypeTests.java4
-rw-r--r--jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaEmbeddableTests.java12
-rw-r--r--jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaEntityTests.java44
-rw-r--r--jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaManyToManyMappingTests.java12
-rw-r--r--jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaMappedSuperclassTests.java14
-rw-r--r--jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaOneToManyMappingTests.java12
-rw-r--r--jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaOneToOneMappingTests.java6
-rw-r--r--jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmEntityTests.java20
-rw-r--r--jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmManyToManyMappingTests.java18
-rw-r--r--jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmOneToManyMappingTests.java18
-rw-r--r--jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmOneToOneMappingTests.java6
-rw-r--r--jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/persistence/PersistenceUnitTestCase.java2
-rw-r--r--jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/java/GenericJavaElementCollectionMapping2_0Tests.java10
-rw-r--r--jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/java/GenericJavaEmbeddedMapping2_0Tests.java2
-rw-r--r--jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/java/GenericJavaEntity2_0Tests.java30
-rw-r--r--jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/java/GenericJavaManyToManyMapping2_0Tests.java20
-rw-r--r--jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/java/GenericJavaOneToManyMapping2_0Tests.java20
-rw-r--r--jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/java/GenericJavaOneToOneMapping2_0Tests.java12
-rw-r--r--jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/java/GenericJavaPersistentType2_0Tests.java4
-rw-r--r--jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/orm/GenericOrmElementCollectionMapping2_0Tests.java14
-rw-r--r--jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/orm/GenericOrmEmbeddedMapping2_0Tests.java2
-rw-r--r--jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/orm/GenericOrmEntity2_0Tests.java26
-rw-r--r--jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/orm/GenericOrmManyToManyMapping2_0Tests.java24
-rw-r--r--jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/orm/GenericOrmOneToManyMapping2_0Tests.java24
-rw-r--r--jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/orm/GenericOrmOneToOneMapping2_0Tests.java12
-rw-r--r--jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/persistence/Generic2_0OptionsTests.java14
26 files changed, 191 insertions, 191 deletions
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 1223b406b0..fb6019638b 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
@@ -501,7 +501,7 @@ public class GenericJavaPersistentTypeTests extends ContextModelTestCase
JavaPersistentType rootJavaPersistentType = classRefs.next().getJavaPersistentType();
JavaPersistentType childJavaPersistentType = classRefs.next().getJavaPersistentType();
- Iterator<PersistentType> inheritanceHierarchy = childJavaPersistentType.inheritanceHierarchy();
+ Iterator<PersistentType> inheritanceHierarchy = childJavaPersistentType.getInheritanceHierarchy().iterator();
assertEquals(childJavaPersistentType, inheritanceHierarchy.next());
assertEquals(rootJavaPersistentType, inheritanceHierarchy.next());
@@ -519,7 +519,7 @@ public class GenericJavaPersistentTypeTests extends ContextModelTestCase
JavaPersistentType childJavaPersistentType = classRefs.next().getJavaPersistentType();
JavaPersistentType rootJavaPersistentType = classRefs.next().getJavaPersistentType();
- Iterator<PersistentType> inheritanceHierarchy = childJavaPersistentType.inheritanceHierarchy();
+ Iterator<PersistentType> inheritanceHierarchy = childJavaPersistentType.getInheritanceHierarchy().iterator();
assertEquals(childJavaPersistentType, inheritanceHierarchy.next());
assertEquals(rootJavaPersistentType, inheritanceHierarchy.next());
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 766d9f9793..c096920447 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
@@ -88,7 +88,7 @@ public class JavaEmbeddableTests extends ContextModelTestCase
addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME);
Embeddable embeddable = (Embeddable) getJavaPersistentType().getMapping();
- Iterator<String> overridableAttributeNames = embeddable.overridableAttributeNames();
+ Iterator<String> overridableAttributeNames = embeddable.getOverridableAttributeNames().iterator();
assertEquals(overridableAttributeNames.next(), "id");
assertEquals(overridableAttributeNames.next(), "name");
assertFalse(overridableAttributeNames.hasNext());
@@ -99,7 +99,7 @@ public class JavaEmbeddableTests extends ContextModelTestCase
addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME);
Embeddable embeddable = (Embeddable) getJavaPersistentType().getMapping();
- Iterator<String> overridableAssociationNames = embeddable.overridableAssociationNames();
+ Iterator<String> overridableAssociationNames = embeddable.getOverridableAssociationNames().iterator();
assertFalse(overridableAssociationNames.hasNext());
}
@@ -137,7 +137,7 @@ public class JavaEmbeddableTests extends ContextModelTestCase
Embeddable embeddable = (Embeddable) getJavaPersistentType().getMapping();
- assertFalse(embeddable.associatedTables().hasNext());
+ assertFalse(embeddable.getAssociatedTables().iterator().hasNext());
}
public void testAssociatedTablesIncludingInherited() throws Exception {
@@ -146,7 +146,7 @@ public class JavaEmbeddableTests extends ContextModelTestCase
Embeddable embeddable = (Embeddable) getJavaPersistentType().getMapping();
- assertFalse(embeddable.allAssociatedTables().hasNext());
+ assertFalse(embeddable.getAllAssociatedTables().iterator().hasNext());
}
public void testAssociatedTableNamesIncludingInherited() throws Exception {
@@ -155,7 +155,7 @@ public class JavaEmbeddableTests extends ContextModelTestCase
Embeddable embeddable = (Embeddable) getJavaPersistentType().getMapping();
- assertFalse(embeddable.allAssociatedTableNames().hasNext());
+ assertFalse(embeddable.getAllAssociatedTableNames().iterator().hasNext());
}
//TODO need to create a subclass mappedSuperclass and test this
@@ -164,7 +164,7 @@ public class JavaEmbeddableTests extends ContextModelTestCase
addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME);
Embeddable embeddable = (Embeddable) getJavaPersistentType().getMapping();
- Iterator<String> overridableAssociationNames = embeddable.overridableAssociationNames();
+ Iterator<String> overridableAssociationNames = embeddable.getOverridableAssociationNames().iterator();
assertFalse(overridableAssociationNames.hasNext());
}
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 242279e950..e3c04c2d77 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
@@ -1096,8 +1096,8 @@ public class JavaEntityTests extends ContextModelTestCase
createTestEntityWithSecondaryTables();
addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME);
- assertEquals(3, CollectionTools.size(getJavaEntity().associatedTables()));
- Iterator<ReadOnlyTable> associatedTables = getJavaEntity().associatedTables();
+ assertEquals(3, CollectionTools.size(getJavaEntity().getAssociatedTables()));
+ Iterator<ReadOnlyTable> associatedTables = getJavaEntity().getAssociatedTables().iterator();
ReadOnlyTable table1 = associatedTables.next();
SecondaryTable table2 = (SecondaryTable) associatedTables.next();
SecondaryTable table3 = (SecondaryTable) associatedTables.next();
@@ -1116,8 +1116,8 @@ public class JavaEntityTests extends ContextModelTestCase
Entity childEntity = (Entity) specifiedClassRefs.next().getJavaPersistentType().getMapping();
Entity rootEntity = (Entity) specifiedClassRefs.next().getJavaPersistentType().getMapping();
- assertEquals(3, CollectionTools.size(rootEntity.allAssociatedTables()));
- Iterator<ReadOnlyTable> associatedTables = rootEntity.allAssociatedTables();
+ assertEquals(3, CollectionTools.size(rootEntity.getAllAssociatedTables()));
+ Iterator<ReadOnlyTable> associatedTables = rootEntity.getAllAssociatedTables().iterator();
ReadOnlyTable table1 = associatedTables.next();
SecondaryTable table2 = (SecondaryTable) associatedTables.next();
SecondaryTable table3 = (SecondaryTable) associatedTables.next();
@@ -1127,7 +1127,7 @@ public class JavaEntityTests extends ContextModelTestCase
//TODO probably want this to be 3, since in this case the child descriptor really uses the
//parent table because it is single table inheritance strategy. Not sure yet how to deal with this.
- assertEquals(4, CollectionTools.size(childEntity.allAssociatedTables()));
+ assertEquals(4, CollectionTools.size(childEntity.getAllAssociatedTables()));
}
public void testAssociatedTableNamesIncludingInherited() throws Exception {
@@ -1140,8 +1140,8 @@ public class JavaEntityTests extends ContextModelTestCase
Entity childEntity = (Entity) specifiedClassRefs.next().getJavaPersistentType().getMapping();
Entity rootEntity = (Entity) specifiedClassRefs.next().getJavaPersistentType().getMapping();
- assertEquals(3, CollectionTools.size(rootEntity.allAssociatedTableNames()));
- Iterator<String> associatedTables = rootEntity.allAssociatedTableNames();
+ assertEquals(3, CollectionTools.size(rootEntity.getAllAssociatedTableNames()));
+ Iterator<String> associatedTables = rootEntity.getAllAssociatedTableNames().iterator();
String table1 = associatedTables.next();
String table2 = associatedTables.next();
String table3 = associatedTables.next();
@@ -1151,7 +1151,7 @@ public class JavaEntityTests extends ContextModelTestCase
//TODO probably want this to be 3, since in this case the child descriptor really uses the
//parent table because it is single table inheritance strategy. Not sure yet how to deal with this.
- assertEquals(4, CollectionTools.size(childEntity.allAssociatedTableNames()));
+ assertEquals(4, CollectionTools.size(childEntity.getAllAssociatedTableNames()));
}
public void testAddSecondaryTableToResourceModel() throws Exception {
@@ -1695,13 +1695,13 @@ public class JavaEntityTests extends ContextModelTestCase
createTestEntity();
addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME);
- Iterator<String> overridableAttributes = getJavaEntity().overridableAttributeNames();
+ Iterator<String> overridableAttributes = getJavaEntity().getOverridableAttributeNames().iterator();
assertFalse(overridableAttributes.hasNext());
getJavaEntity().setSpecifiedInheritanceStrategy(InheritanceType.TABLE_PER_CLASS);
- overridableAttributes = getJavaEntity().overridableAttributeNames();
+ overridableAttributes = getJavaEntity().getOverridableAttributeNames().iterator();
assertEquals("id", overridableAttributes.next());
assertEquals("name", overridableAttributes.next());
assertFalse(overridableAttributes.hasNext());
@@ -1711,13 +1711,13 @@ public class JavaEntityTests extends ContextModelTestCase
createTestEntity();
addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME);
- Iterator<String> overridableAttributeNames = getJavaEntity().overridableAttributeNames();
+ Iterator<String> overridableAttributeNames = getJavaEntity().getOverridableAttributeNames().iterator();
assertFalse(overridableAttributeNames.hasNext());
getJavaEntity().setSpecifiedInheritanceStrategy(InheritanceType.TABLE_PER_CLASS);
- overridableAttributeNames = getJavaEntity().overridableAttributeNames();
+ overridableAttributeNames = getJavaEntity().getOverridableAttributeNames().iterator();
assertEquals("id", overridableAttributeNames.next());
assertEquals("name", overridableAttributeNames.next());
assertFalse(overridableAttributeNames.hasNext());
@@ -1729,7 +1729,7 @@ public class JavaEntityTests extends ContextModelTestCase
addXmlClassRef(PACKAGE_NAME + ".AnnotationTestTypeChild");
addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME);
- Iterator<String> overridableAttributes = getJavaEntity().allOverridableAttributeNames();
+ Iterator<String> overridableAttributes = getJavaEntity().getAllOverridableAttributeNames().iterator();
assertEquals("foo", overridableAttributes.next());
assertEquals("basic", overridableAttributes.next());
assertEquals("id", overridableAttributes.next());
@@ -1743,7 +1743,7 @@ public class JavaEntityTests extends ContextModelTestCase
addXmlClassRef(PACKAGE_NAME + ".AnnotationTestTypeChild");
addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME);
- Iterator<String> overridableAttributes = getJavaEntity().allOverridableAttributeNames();
+ Iterator<String> overridableAttributes = getJavaEntity().getAllOverridableAttributeNames().iterator();
assertEquals("id", overridableAttributes.next());
assertEquals("name", overridableAttributes.next());
assertEquals("foo", overridableAttributes.next());
@@ -1753,7 +1753,7 @@ public class JavaEntityTests extends ContextModelTestCase
ListIterator<ClassRef> classRefs = getPersistenceUnit().getSpecifiedClassRefs().iterator();
classRefs.next();
JavaEntity abstractEntity = (JavaEntity) classRefs.next().getJavaPersistentType().getMapping();
- overridableAttributes = abstractEntity.allOverridableAttributeNames();
+ overridableAttributes = abstractEntity.getAllOverridableAttributeNames().iterator();
assertEquals("id", overridableAttributes.next());
assertEquals("name", overridableAttributes.next());
assertEquals("foo", overridableAttributes.next());
@@ -1766,7 +1766,7 @@ public class JavaEntityTests extends ContextModelTestCase
addXmlClassRef(PACKAGE_NAME + ".AnnotationTestTypeChild");
addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME);
- Iterator<String> overridableAssociations = getJavaEntity().allOverridableAssociationNames();
+ Iterator<String> overridableAssociations = getJavaEntity().getAllOverridableAssociationNames().iterator();
assertEquals("address", overridableAssociations.next());
assertEquals("address2", overridableAssociations.next());
assertFalse(overridableAssociations.hasNext());
@@ -1775,7 +1775,7 @@ public class JavaEntityTests extends ContextModelTestCase
ListIterator<ClassRef> classRefs = getPersistenceUnit().getSpecifiedClassRefs().iterator();
classRefs.next();
JavaEntity abstractEntity = (JavaEntity) classRefs.next().getJavaPersistentType().getMapping();
- overridableAssociations = abstractEntity.allOverridableAssociationNames();
+ overridableAssociations = abstractEntity.getAllOverridableAssociationNames().iterator();
assertEquals("address", overridableAssociations.next());
assertEquals("address2", overridableAssociations.next());
assertFalse(overridableAssociations.hasNext());
@@ -1787,7 +1787,7 @@ public class JavaEntityTests extends ContextModelTestCase
addXmlClassRef(PACKAGE_NAME + ".AnnotationTestTypeChild");
getEntityMappings().addPersistentType(MappingKeys.MAPPED_SUPERCLASS_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME);
- Iterator<String> overridableAttributes = getJavaEntity().allOverridableAttributeNames();
+ Iterator<String> overridableAttributes = getJavaEntity().getAllOverridableAttributeNames().iterator();
assertEquals("foo", overridableAttributes.next());
assertEquals("basic", overridableAttributes.next());
assertEquals("id", overridableAttributes.next());
@@ -1801,7 +1801,7 @@ public class JavaEntityTests extends ContextModelTestCase
addXmlClassRef(PACKAGE_NAME + ".AnnotationTestTypeChild");
addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME);
- Iterator<String> overridableAttributeNames = getJavaEntity().allOverridableAttributeNames();
+ Iterator<String> overridableAttributeNames = getJavaEntity().getAllOverridableAttributeNames().iterator();
assertEquals("foo", overridableAttributeNames.next());
assertEquals("basic", overridableAttributeNames.next());
assertEquals("id", overridableAttributeNames.next());
@@ -2320,7 +2320,7 @@ public class JavaEntityTests extends ContextModelTestCase
createTestEntity();
addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME);
- Iterator<String> overridableAssociationNames = getJavaEntity().overridableAssociationNames();
+ Iterator<String> overridableAssociationNames = getJavaEntity().getOverridableAssociationNames().iterator();
assertFalse(overridableAssociationNames.hasNext());
}
@@ -2330,7 +2330,7 @@ public class JavaEntityTests extends ContextModelTestCase
addXmlClassRef(PACKAGE_NAME + ".AnnotationTestTypeChild");
addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME);
- Iterator<String> overridableAssociationNames = getJavaEntity().allOverridableAssociationNames();
+ Iterator<String> overridableAssociationNames = getJavaEntity().getAllOverridableAssociationNames().iterator();
assertEquals("oneToOne", overridableAssociationNames.next());
assertEquals("manyToOne", overridableAssociationNames.next());
assertFalse(overridableAssociationNames.hasNext());
@@ -2342,7 +2342,7 @@ public class JavaEntityTests extends ContextModelTestCase
addXmlClassRef(PACKAGE_NAME + ".AnnotationTestTypeChild");
addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME);
- Iterator<String> overridableAssociations = getJavaEntity().allOverridableAssociationNames();
+ Iterator<String> overridableAssociations = getJavaEntity().getAllOverridableAssociationNames().iterator();
assertEquals("oneToOne", overridableAssociations.next());
assertEquals("manyToOne", overridableAssociations.next());
assertFalse(overridableAssociations.hasNext());
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 6f5246237d..6137fb3420 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
@@ -766,7 +766,7 @@ public class JavaManyToManyMappingTests extends ContextModelTestCase
ManyToManyMapping manyToManyMapping = (ManyToManyMapping) persistentAttribute.getMapping();
Iterator<String> attributeNames =
- manyToManyMapping.getRelationship().getMappedByStrategy().candidateMappedByAttributeNames();
+ manyToManyMapping.getRelationship().getMappedByStrategy().getCandidateMappedByAttributeNames().iterator();
assertEquals("id", attributeNames.next());
assertEquals("city", attributeNames.next());
assertEquals("state", attributeNames.next());
@@ -775,12 +775,12 @@ public class JavaManyToManyMappingTests extends ContextModelTestCase
manyToManyMapping.setSpecifiedTargetEntity("foo");
attributeNames =
- manyToManyMapping.getRelationship().getMappedByStrategy().candidateMappedByAttributeNames();
+ manyToManyMapping.getRelationship().getMappedByStrategy().getCandidateMappedByAttributeNames().iterator();
assertFalse(attributeNames.hasNext());
manyToManyMapping.setSpecifiedTargetEntity(null);
attributeNames =
- manyToManyMapping.getRelationship().getMappedByStrategy().candidateMappedByAttributeNames();
+ manyToManyMapping.getRelationship().getMappedByStrategy().getCandidateMappedByAttributeNames().iterator();
assertEquals("id", attributeNames.next());
assertEquals("city", attributeNames.next());
assertEquals("state", attributeNames.next());
@@ -972,7 +972,7 @@ public class JavaManyToManyMappingTests extends ContextModelTestCase
JavaManyToManyMapping javaManyToManyMapping = (JavaManyToManyMapping) getJavaPersistentType().getAttributeNamed("addresses").getMapping();
Iterator<String> mapKeyNames =
- javaManyToManyMapping.candidateMapKeyNames();
+ javaManyToManyMapping.getCandidateMapKeyNames().iterator();
assertEquals("id", mapKeyNames.next());
assertEquals("city", mapKeyNames.next());
assertEquals("state", mapKeyNames.next());
@@ -991,11 +991,11 @@ public class JavaManyToManyMappingTests extends ContextModelTestCase
JavaManyToManyMapping javaManyToManyMapping = (JavaManyToManyMapping) getJavaPersistentType().getAttributeNamed("addresses").getMapping();
- Iterator<String> mapKeyNames = javaManyToManyMapping.candidateMapKeyNames();
+ Iterator<String> mapKeyNames = javaManyToManyMapping.getCandidateMapKeyNames().iterator();
assertEquals(false, mapKeyNames.hasNext());
javaManyToManyMapping.setSpecifiedTargetEntity("test.Address");
- mapKeyNames = javaManyToManyMapping.candidateMapKeyNames();
+ mapKeyNames = javaManyToManyMapping.getCandidateMapKeyNames().iterator();
assertEquals("id", mapKeyNames.next());
assertEquals("city", mapKeyNames.next());
assertEquals("state", mapKeyNames.next());
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 8623519544..d078818d70 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
@@ -114,7 +114,7 @@ public class JavaMappedSuperclassTests extends ContextModelTestCase
addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME);
MappedSuperclass mappedSuperclass = (MappedSuperclass) getJavaPersistentType().getMapping();
- Iterator<String> overridableAttributeNames = mappedSuperclass.overridableAttributeNames();
+ Iterator<String> overridableAttributeNames = mappedSuperclass.getOverridableAttributeNames().iterator();
assertEquals("id", overridableAttributeNames.next());
assertEquals("name", overridableAttributeNames.next());
assertFalse(overridableAttributeNames.hasNext());
@@ -125,7 +125,7 @@ public class JavaMappedSuperclassTests extends ContextModelTestCase
addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME);
MappedSuperclass mappedSuperclass = (MappedSuperclass) getJavaPersistentType().getMapping();
- Iterator<String> overridableAssociationNames = mappedSuperclass.overridableAssociationNames();
+ Iterator<String> overridableAssociationNames = mappedSuperclass.getOverridableAssociationNames().iterator();
assertFalse(overridableAssociationNames.hasNext());
}
@@ -145,7 +145,7 @@ public class JavaMappedSuperclassTests extends ContextModelTestCase
MappedSuperclass mappedSuperclass = (MappedSuperclass) getJavaPersistentType().getMapping();
- assertFalse(mappedSuperclass.associatedTables().hasNext());
+ assertFalse(mappedSuperclass.getAssociatedTables().iterator().hasNext());
}
public void testAssociatedTablesIncludingInherited() throws Exception {
@@ -154,7 +154,7 @@ public class JavaMappedSuperclassTests extends ContextModelTestCase
MappedSuperclass mappedSuperclass = (MappedSuperclass) getJavaPersistentType().getMapping();
- assertFalse(mappedSuperclass.allAssociatedTables().hasNext());
+ assertFalse(mappedSuperclass.getAllAssociatedTables().iterator().hasNext());
}
public void testAssociatedTableNamesIncludingInherited() throws Exception {
@@ -163,7 +163,7 @@ public class JavaMappedSuperclassTests extends ContextModelTestCase
MappedSuperclass mappedSuperclass = (MappedSuperclass) getJavaPersistentType().getMapping();
- assertFalse(mappedSuperclass.allAssociatedTableNames().hasNext());
+ assertFalse(mappedSuperclass.getAllAssociatedTableNames().iterator().hasNext());
}
public void testAllOverridableAttributeNames() throws Exception {
@@ -171,7 +171,7 @@ public class JavaMappedSuperclassTests extends ContextModelTestCase
addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME);
MappedSuperclass mappedSuperclass = (MappedSuperclass) getJavaPersistentType().getMapping();
- Iterator<String> overridableAttributeNames = mappedSuperclass.overridableAttributeNames();
+ Iterator<String> overridableAttributeNames = mappedSuperclass.getOverridableAttributeNames().iterator();
assertEquals("id", overridableAttributeNames.next());
assertEquals("name", overridableAttributeNames.next());
assertFalse(overridableAttributeNames.hasNext());
@@ -183,7 +183,7 @@ public class JavaMappedSuperclassTests extends ContextModelTestCase
addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME);
MappedSuperclass mappedSuperclass = (MappedSuperclass) getJavaPersistentType().getMapping();
- Iterator<String> overridableAssociationNames = mappedSuperclass.overridableAssociationNames();
+ Iterator<String> overridableAssociationNames = mappedSuperclass.getOverridableAssociationNames().iterator();
assertFalse(overridableAssociationNames.hasNext());
}
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 3c9058db33..caea3e45a0 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
@@ -695,7 +695,7 @@ public class JavaOneToManyMappingTests extends ContextModelTestCase
OneToManyMapping oneToManyMapping = (OneToManyMapping) persistentAttribute.getMapping();
Iterator<String> attributeNames =
- oneToManyMapping.getRelationship().getMappedByStrategy().candidateMappedByAttributeNames();
+ oneToManyMapping.getRelationship().getMappedByStrategy().getCandidateMappedByAttributeNames().iterator();
assertEquals("id", attributeNames.next());
assertEquals("city", attributeNames.next());
assertEquals("state", attributeNames.next());
@@ -704,12 +704,12 @@ public class JavaOneToManyMappingTests extends ContextModelTestCase
oneToManyMapping.setSpecifiedTargetEntity("foo");
attributeNames =
- oneToManyMapping.getRelationship().getMappedByStrategy().candidateMappedByAttributeNames();
+ oneToManyMapping.getRelationship().getMappedByStrategy().getCandidateMappedByAttributeNames().iterator();
assertFalse(attributeNames.hasNext());
oneToManyMapping.setSpecifiedTargetEntity(null);
attributeNames =
- oneToManyMapping.getRelationship().getMappedByStrategy().candidateMappedByAttributeNames();
+ oneToManyMapping.getRelationship().getMappedByStrategy().getCandidateMappedByAttributeNames().iterator();
assertEquals("id", attributeNames.next());
assertEquals("city", attributeNames.next());
assertEquals("state", attributeNames.next());
@@ -977,7 +977,7 @@ public class JavaOneToManyMappingTests extends ContextModelTestCase
JavaOneToManyMapping javaOneToManyMapping = (JavaOneToManyMapping) getJavaPersistentType().getAttributeNamed("addresses").getMapping();
Iterator<String> mapKeyNames =
- javaOneToManyMapping.candidateMapKeyNames();
+ javaOneToManyMapping.getCandidateMapKeyNames().iterator();
assertEquals("id", mapKeyNames.next());
assertEquals("city", mapKeyNames.next());
assertEquals("state", mapKeyNames.next());
@@ -996,11 +996,11 @@ public class JavaOneToManyMappingTests extends ContextModelTestCase
JavaOneToManyMapping javaOneToManyMapping = (JavaOneToManyMapping) getJavaPersistentType().getAttributeNamed("addresses").getMapping();
- Iterator<String> mapKeyNames = javaOneToManyMapping.candidateMapKeyNames();
+ Iterator<String> mapKeyNames = javaOneToManyMapping.getCandidateMapKeyNames().iterator();
assertEquals(false, mapKeyNames.hasNext());
javaOneToManyMapping.setSpecifiedTargetEntity("test.Address");
- mapKeyNames = javaOneToManyMapping.candidateMapKeyNames();
+ mapKeyNames = javaOneToManyMapping.getCandidateMapKeyNames().iterator();
assertEquals("id", mapKeyNames.next());
assertEquals("city", mapKeyNames.next());
assertEquals("state", mapKeyNames.next());
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 37f87fa678..1182d2e810 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
@@ -986,7 +986,7 @@ public class JavaOneToOneMappingTests extends ContextModelTestCase
OneToOneMapping oneToOneMapping = (OneToOneMapping) persistentAttribute.getMapping();
Iterator<String> attributeNames =
- oneToOneMapping.getRelationship().getMappedByStrategy().candidateMappedByAttributeNames();
+ oneToOneMapping.getRelationship().getMappedByStrategy().getCandidateMappedByAttributeNames().iterator();
assertEquals("id", attributeNames.next());
assertEquals("city", attributeNames.next());
assertEquals("state", attributeNames.next());
@@ -995,12 +995,12 @@ public class JavaOneToOneMappingTests extends ContextModelTestCase
oneToOneMapping.setSpecifiedTargetEntity("foo");
attributeNames =
- oneToOneMapping.getRelationship().getMappedByStrategy().candidateMappedByAttributeNames();
+ oneToOneMapping.getRelationship().getMappedByStrategy().getCandidateMappedByAttributeNames().iterator();
assertFalse(attributeNames.hasNext());
oneToOneMapping.setSpecifiedTargetEntity(null);
attributeNames =
- oneToOneMapping.getRelationship().getMappedByStrategy().candidateMappedByAttributeNames();
+ oneToOneMapping.getRelationship().getMappedByStrategy().getCandidateMappedByAttributeNames().iterator();
assertEquals("id", attributeNames.next());
assertEquals("city", attributeNames.next());
assertEquals("state", attributeNames.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 488b614da6..ccb0c071d4 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
@@ -995,13 +995,13 @@ public class OrmEntityTests extends ContextModelTestCase
OrmPersistentType persistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME);
OrmEntity entity = (OrmEntity) persistentType.getMapping();
- assertEquals(1, CollectionTools.size(entity.associatedTables()));
+ assertEquals(1, CollectionTools.size(entity.getAssociatedTables()));
entity.addSpecifiedSecondaryTable(0).setSpecifiedName("FOO");
- assertEquals(2, CollectionTools.size(entity.associatedTables()));
+ assertEquals(2, CollectionTools.size(entity.getAssociatedTables()));
entity.addSpecifiedSecondaryTable(0).setSpecifiedName("BAR");
- assertEquals(3, CollectionTools.size(entity.associatedTables()));
+ assertEquals(3, CollectionTools.size(entity.getAssociatedTables()));
}
public void testAssociatedTableNamesIncludingInherited() throws Exception {
@@ -1883,13 +1883,13 @@ public class OrmEntityTests extends ContextModelTestCase
OrmPersistentType persistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME);
Entity entity = (Entity) persistentType.getMapping();
- Iterator<String> overridableAttributes = persistentType.getMapping().overridableAttributeNames();
+ Iterator<String> overridableAttributes = persistentType.getMapping().getOverridableAttributeNames().iterator();
assertFalse(overridableAttributes.hasNext());
entity.setSpecifiedInheritanceStrategy(InheritanceType.TABLE_PER_CLASS);
- overridableAttributes = entity.overridableAttributeNames();
+ overridableAttributes = entity.getOverridableAttributeNames().iterator();
assertEquals("id", overridableAttributes.next());
assertEquals("name", overridableAttributes.next());
assertFalse(overridableAttributes.hasNext());
@@ -1900,12 +1900,12 @@ public class OrmEntityTests extends ContextModelTestCase
OrmPersistentType persistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME);
Entity entity = (Entity) persistentType.getMapping();
- Iterator<String> overridableAttributeNames = persistentType.getMapping().overridableAttributeNames();
+ Iterator<String> overridableAttributeNames = persistentType.getMapping().getOverridableAttributeNames().iterator();
entity.setSpecifiedInheritanceStrategy(InheritanceType.TABLE_PER_CLASS);
- overridableAttributeNames = entity.overridableAttributeNames();
+ overridableAttributeNames = entity.getOverridableAttributeNames().iterator();
assertEquals("id", overridableAttributeNames.next());
assertEquals("name", overridableAttributeNames.next());
assertFalse(overridableAttributeNames.hasNext());
@@ -1918,7 +1918,7 @@ public class OrmEntityTests extends ContextModelTestCase
getEntityMappings().addPersistentType(MappingKeys.MAPPED_SUPERCLASS_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME);
OrmEntity entity = (OrmEntity) persistentType.getMapping();
- Iterator<String> overridableAttributes = entity.allOverridableAttributeNames();
+ Iterator<String> overridableAttributes = entity.getAllOverridableAttributeNames().iterator();
assertEquals("foo", overridableAttributes.next());
assertEquals("basic", overridableAttributes.next());
assertEquals("id", overridableAttributes.next());
@@ -1934,14 +1934,14 @@ public class OrmEntityTests extends ContextModelTestCase
OrmEntity entity = (OrmEntity) persistentType.getMapping();
OrmEntity abstractEntity = (OrmEntity) abstractPersistentType.getMapping();
- Iterator<String> overridableAttributes = entity.allOverridableAttributeNames();
+ Iterator<String> overridableAttributes = entity.getAllOverridableAttributeNames().iterator();
assertEquals("id", overridableAttributes.next());
assertEquals("name", overridableAttributes.next());
assertEquals("foo", overridableAttributes.next());
assertFalse(overridableAttributes.hasNext());
- overridableAttributes = abstractEntity.allOverridableAttributeNames();
+ overridableAttributes = abstractEntity.getAllOverridableAttributeNames().iterator();
assertEquals("id", overridableAttributes.next());
assertEquals("name", overridableAttributes.next());
assertEquals("foo", overridableAttributes.next());
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 e7077ba8f6..ac7a850c1d 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
@@ -917,7 +917,7 @@ public class OrmManyToManyMappingTests extends ContextModelTestCase
ManyToManyMapping manyToManyMapping = (ManyToManyMapping) persistentAttribute.getMapping();
Iterator<String> attributeNames =
- manyToManyMapping.getRelationship().getMappedByStrategy().candidateMappedByAttributeNames();
+ manyToManyMapping.getRelationship().getMappedByStrategy().getCandidateMappedByAttributeNames().iterator();
assertEquals("id", attributeNames.next());
assertEquals("city", attributeNames.next());
assertEquals("state", attributeNames.next());
@@ -926,12 +926,12 @@ public class OrmManyToManyMappingTests extends ContextModelTestCase
manyToManyMapping.setSpecifiedTargetEntity("foo");
attributeNames =
- manyToManyMapping.getRelationship().getMappedByStrategy().candidateMappedByAttributeNames();
+ manyToManyMapping.getRelationship().getMappedByStrategy().getCandidateMappedByAttributeNames().iterator();
assertFalse(attributeNames.hasNext());
manyToManyMapping.setSpecifiedTargetEntity(null);
attributeNames =
- manyToManyMapping.getRelationship().getMappedByStrategy().candidateMappedByAttributeNames();
+ manyToManyMapping.getRelationship().getMappedByStrategy().getCandidateMappedByAttributeNames().iterator();
assertEquals("id", attributeNames.next());
assertEquals("city", attributeNames.next());
assertEquals("state", attributeNames.next());
@@ -953,7 +953,7 @@ public class OrmManyToManyMappingTests extends ContextModelTestCase
ManyToManyMapping virtualManyToManyMapping = (ManyToManyMapping) ormPersistentType.getAttributeNamed("addresses").getMapping();
- Iterator<String> mapKeyNames = virtualManyToManyMapping.candidateMapKeyNames();
+ Iterator<String> mapKeyNames = virtualManyToManyMapping.getCandidateMapKeyNames().iterator();
assertEquals("id", mapKeyNames.next());
assertEquals("city", mapKeyNames.next());
assertEquals("state", mapKeyNames.next());
@@ -973,11 +973,11 @@ public class OrmManyToManyMappingTests extends ContextModelTestCase
ManyToManyMapping virtualManyToManyMapping = (ManyToManyMapping) ormPersistentType.getAttributeNamed("addresses").getMapping();
JavaManyToManyMapping javaManyToManyMapping = (JavaManyToManyMapping) ormPersistentType.getJavaPersistentType().getAttributeNamed("addresses").getMapping();
- Iterator<String> mapKeyNames = virtualManyToManyMapping.candidateMapKeyNames();
+ Iterator<String> mapKeyNames = virtualManyToManyMapping.getCandidateMapKeyNames().iterator();
assertEquals(false, mapKeyNames.hasNext());
javaManyToManyMapping.setSpecifiedTargetEntity("test.Address");
- mapKeyNames = virtualManyToManyMapping.candidateMapKeyNames();
+ mapKeyNames = virtualManyToManyMapping.getCandidateMapKeyNames().iterator();
assertEquals("id", mapKeyNames.next());
assertEquals("city", mapKeyNames.next());
assertEquals("state", mapKeyNames.next());
@@ -986,11 +986,11 @@ public class OrmManyToManyMappingTests extends ContextModelTestCase
ormPersistentType.getAttributeNamed("addresses").convertToSpecified();
OrmManyToManyMapping specifiedManyToManyMapping = (OrmManyToManyMapping) ormPersistentType.getAttributeNamed("addresses").getMapping();
- mapKeyNames = specifiedManyToManyMapping.candidateMapKeyNames();
+ mapKeyNames = specifiedManyToManyMapping.getCandidateMapKeyNames().iterator();
assertEquals(false, mapKeyNames.hasNext());
specifiedManyToManyMapping.setSpecifiedTargetEntity("test.Address");
- mapKeyNames = specifiedManyToManyMapping.candidateMapKeyNames();
+ mapKeyNames = specifiedManyToManyMapping.getCandidateMapKeyNames().iterator();
assertEquals("id", mapKeyNames.next());
assertEquals("city", mapKeyNames.next());
assertEquals("state", mapKeyNames.next());
@@ -998,7 +998,7 @@ public class OrmManyToManyMappingTests extends ContextModelTestCase
assertFalse(mapKeyNames.hasNext());
specifiedManyToManyMapping.setSpecifiedTargetEntity("String");
- mapKeyNames = specifiedManyToManyMapping.candidateMapKeyNames();
+ mapKeyNames = specifiedManyToManyMapping.getCandidateMapKeyNames().iterator();
assertEquals(false, mapKeyNames.hasNext());
}
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 052359241c..4d9ddf18e6 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
@@ -911,7 +911,7 @@ public class OrmOneToManyMappingTests extends ContextModelTestCase
OneToManyMapping oneToManyMapping = (OneToManyMapping) persistentAttribute.getMapping();
Iterator<String> attributeNames =
- oneToManyMapping.getRelationship().getMappedByStrategy().candidateMappedByAttributeNames();
+ oneToManyMapping.getRelationship().getMappedByStrategy().getCandidateMappedByAttributeNames().iterator();
assertEquals("id", attributeNames.next());
assertEquals("city", attributeNames.next());
assertEquals("state", attributeNames.next());
@@ -920,12 +920,12 @@ public class OrmOneToManyMappingTests extends ContextModelTestCase
oneToManyMapping.setSpecifiedTargetEntity("foo");
attributeNames =
- oneToManyMapping.getRelationship().getMappedByStrategy().candidateMappedByAttributeNames();
+ oneToManyMapping.getRelationship().getMappedByStrategy().getCandidateMappedByAttributeNames().iterator();
assertFalse(attributeNames.hasNext());
oneToManyMapping.setSpecifiedTargetEntity(null);
attributeNames =
- oneToManyMapping.getRelationship().getMappedByStrategy().candidateMappedByAttributeNames();
+ oneToManyMapping.getRelationship().getMappedByStrategy().getCandidateMappedByAttributeNames().iterator();
assertEquals("id", attributeNames.next());
assertEquals("city", attributeNames.next());
assertEquals("state", attributeNames.next());
@@ -947,7 +947,7 @@ public class OrmOneToManyMappingTests extends ContextModelTestCase
OneToManyMapping virtualOneToManyMapping = (OneToManyMapping) ormPersistentType.getAttributeNamed("addresses").getMapping();
- Iterator<String> mapKeyNames = virtualOneToManyMapping.candidateMapKeyNames();
+ Iterator<String> mapKeyNames = virtualOneToManyMapping.getCandidateMapKeyNames().iterator();
assertEquals("id", mapKeyNames.next());
assertEquals("city", mapKeyNames.next());
assertEquals("state", mapKeyNames.next());
@@ -968,11 +968,11 @@ public class OrmOneToManyMappingTests extends ContextModelTestCase
OneToManyMapping virtualOneToManyMapping = (OneToManyMapping) virtualAttribute.getMapping();
JavaOneToManyMapping javaOneToManyMapping = (JavaOneToManyMapping) ormPersistentType.getJavaPersistentType().getAttributeNamed("addresses").getMapping();
- Iterator<String> mapKeyNames = virtualOneToManyMapping.candidateMapKeyNames();
+ Iterator<String> mapKeyNames = virtualOneToManyMapping.getCandidateMapKeyNames().iterator();
assertEquals(false, mapKeyNames.hasNext());
javaOneToManyMapping.setSpecifiedTargetEntity("test.Address");
- mapKeyNames = virtualOneToManyMapping.candidateMapKeyNames();
+ mapKeyNames = virtualOneToManyMapping.getCandidateMapKeyNames().iterator();
assertEquals("id", mapKeyNames.next());
assertEquals("city", mapKeyNames.next());
assertEquals("state", mapKeyNames.next());
@@ -980,11 +980,11 @@ public class OrmOneToManyMappingTests extends ContextModelTestCase
assertFalse(mapKeyNames.hasNext());
OrmOneToManyMapping specifiedOneToManyMapping = (OrmOneToManyMapping) virtualAttribute.convertToSpecified().getMapping();
- mapKeyNames = specifiedOneToManyMapping.candidateMapKeyNames();
+ mapKeyNames = specifiedOneToManyMapping.getCandidateMapKeyNames().iterator();
assertEquals(false, mapKeyNames.hasNext());
specifiedOneToManyMapping.setSpecifiedTargetEntity("test.Address");
- mapKeyNames = specifiedOneToManyMapping.candidateMapKeyNames();
+ mapKeyNames = specifiedOneToManyMapping.getCandidateMapKeyNames().iterator();
assertEquals("id", mapKeyNames.next());
assertEquals("city", mapKeyNames.next());
assertEquals("state", mapKeyNames.next());
@@ -992,7 +992,7 @@ public class OrmOneToManyMappingTests extends ContextModelTestCase
assertFalse(mapKeyNames.hasNext());
specifiedOneToManyMapping.setSpecifiedTargetEntity("String");
- mapKeyNames = specifiedOneToManyMapping.candidateMapKeyNames();
+ mapKeyNames = specifiedOneToManyMapping.getCandidateMapKeyNames().iterator();
assertEquals(false, mapKeyNames.hasNext());
}
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 ad11571e15..b0dfe76a21 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
@@ -1168,7 +1168,7 @@ public class OrmOneToOneMappingTests extends ContextModelTestCase
OneToOneMapping oneToOneMapping = (OneToOneMapping) persistentAttribute.getMapping();
Iterator<String> attributeNames =
- oneToOneMapping.getRelationship().getMappedByStrategy().candidateMappedByAttributeNames();
+ oneToOneMapping.getRelationship().getMappedByStrategy().getCandidateMappedByAttributeNames().iterator();
assertEquals("id", attributeNames.next());
assertEquals("city", attributeNames.next());
assertEquals("state", attributeNames.next());
@@ -1177,12 +1177,12 @@ public class OrmOneToOneMappingTests extends ContextModelTestCase
oneToOneMapping.setSpecifiedTargetEntity("foo");
attributeNames =
- oneToOneMapping.getRelationship().getMappedByStrategy().candidateMappedByAttributeNames();
+ oneToOneMapping.getRelationship().getMappedByStrategy().getCandidateMappedByAttributeNames().iterator();
assertFalse(attributeNames.hasNext());
oneToOneMapping.setSpecifiedTargetEntity(null);
attributeNames =
- oneToOneMapping.getRelationship().getMappedByStrategy().candidateMappedByAttributeNames();
+ oneToOneMapping.getRelationship().getMappedByStrategy().getCandidateMappedByAttributeNames().iterator();
assertEquals("id", attributeNames.next());
assertEquals("city", attributeNames.next());
assertEquals("state", attributeNames.next());
diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/persistence/PersistenceUnitTestCase.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/persistence/PersistenceUnitTestCase.java
index 507ae06904..48befbb7ed 100644
--- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/persistence/PersistenceUnitTestCase.java
+++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/persistence/PersistenceUnitTestCase.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.
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 9c6dcc0119..2267409676 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
@@ -887,7 +887,7 @@ public class GenericJavaElementCollectionMapping2_0Tests extends Generic2_0Conte
ElementCollectionMapping2_0 elementCollectionMapping2_0 = (ElementCollectionMapping2_0) persistentAttribute.getMapping();
Iterator<String> mapKeyNames =
- elementCollectionMapping2_0.candidateMapKeyNames();
+ elementCollectionMapping2_0.getCandidateMapKeyNames().iterator();
assertEquals("city", mapKeyNames.next());
assertEquals("state", mapKeyNames.next());
assertEquals("state.name", mapKeyNames.next());
@@ -907,11 +907,11 @@ public class GenericJavaElementCollectionMapping2_0Tests extends Generic2_0Conte
PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next();
ElementCollectionMapping2_0 elementCollectionMapping2_0 = (ElementCollectionMapping2_0) persistentAttribute.getMapping();
- Iterator<String> mapKeyNames = elementCollectionMapping2_0.candidateMapKeyNames();
+ Iterator<String> mapKeyNames = elementCollectionMapping2_0.getCandidateMapKeyNames().iterator();
assertEquals(false, mapKeyNames.hasNext());
elementCollectionMapping2_0.setSpecifiedTargetClass("Address");
- mapKeyNames = elementCollectionMapping2_0.candidateMapKeyNames();
+ mapKeyNames = elementCollectionMapping2_0.getCandidateMapKeyNames().iterator();
assertEquals("city", mapKeyNames.next());
assertEquals("state", mapKeyNames.next());
assertEquals("state.name", mapKeyNames.next());
@@ -920,7 +920,7 @@ public class GenericJavaElementCollectionMapping2_0Tests extends Generic2_0Conte
assertFalse(mapKeyNames.hasNext());
elementCollectionMapping2_0.setSpecifiedTargetClass("String");
- mapKeyNames = elementCollectionMapping2_0.candidateMapKeyNames();
+ mapKeyNames = elementCollectionMapping2_0.getCandidateMapKeyNames().iterator();
assertEquals(false, mapKeyNames.hasNext());
}
@@ -2068,6 +2068,6 @@ public class GenericJavaElementCollectionMapping2_0Tests extends Generic2_0Conte
//If there is a StackOverflowError you will not be able to get the mapping
JavaElementCollectionMapping2_0 elementCollectionMapping = (JavaElementCollectionMapping2_0) getJavaPersistentType().getAttributeNamed("elementCollection").getMapping();
- assertFalse(elementCollectionMapping.allOverridableAttributeMappingNames().hasNext());
+ assertFalse(elementCollectionMapping.getAllOverridableAttributeMappingNames().iterator().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 352f35bd7e..f404e5a4a8 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
@@ -1536,6 +1536,6 @@ public class GenericJavaEmbeddedMapping2_0Tests extends Generic2_0ContextModelTe
//If there is a StackOverflowError you will not be able to get the mapping
JavaEmbeddedMapping2_0 embeddedMapping = (JavaEmbeddedMapping2_0) getJavaPersistentType().getAttributeNamed("embedded").getMapping();
- assertFalse(embeddedMapping.allOverridableAttributeMappingNames().hasNext());
+ assertFalse(embeddedMapping.getAllOverridableAttributeMappingNames().iterator().hasNext());
}
}
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 cb9421d7a5..7c9ee50303 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
@@ -598,13 +598,13 @@ public class GenericJavaEntity2_0Tests extends Generic2_0ContextModelTestCase
createTestEntity();
addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME);
- Iterator<String> overridableAttributes = getJavaEntity().overridableAttributeNames();
+ Iterator<String> overridableAttributes = getJavaEntity().getOverridableAttributeNames().iterator();
assertFalse(overridableAttributes.hasNext());
getJavaEntity().setSpecifiedInheritanceStrategy(InheritanceType.TABLE_PER_CLASS);
- overridableAttributes = getJavaEntity().overridableAttributeNames();
+ overridableAttributes = getJavaEntity().getOverridableAttributeNames().iterator();
assertEquals("id", overridableAttributes.next());
assertEquals("name", overridableAttributes.next());
assertFalse(overridableAttributes.hasNext());
@@ -614,13 +614,13 @@ public class GenericJavaEntity2_0Tests extends Generic2_0ContextModelTestCase
createTestEntity();
addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME);
- Iterator<String> overridableAttributeNames = getJavaEntity().overridableAttributeNames();
+ Iterator<String> overridableAttributeNames = getJavaEntity().getOverridableAttributeNames().iterator();
assertFalse(overridableAttributeNames.hasNext());
getJavaEntity().setSpecifiedInheritanceStrategy(InheritanceType.TABLE_PER_CLASS);
- overridableAttributeNames = getJavaEntity().overridableAttributeNames();
+ overridableAttributeNames = getJavaEntity().getOverridableAttributeNames().iterator();
assertEquals("id", overridableAttributeNames.next());
assertEquals("name", overridableAttributeNames.next());
assertFalse(overridableAttributeNames.hasNext());
@@ -632,7 +632,7 @@ public class GenericJavaEntity2_0Tests extends Generic2_0ContextModelTestCase
addXmlClassRef(PACKAGE_NAME + ".AnnotationTestTypeChild");
addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME);
- Iterator<String> overridableAttributes = getJavaEntity().allOverridableAttributeNames();
+ Iterator<String> overridableAttributes = getJavaEntity().getAllOverridableAttributeNames().iterator();
assertEquals("id", overridableAttributes.next());
assertEquals("name", overridableAttributes.next());
assertEquals("foo", overridableAttributes.next());
@@ -645,7 +645,7 @@ public class GenericJavaEntity2_0Tests extends Generic2_0ContextModelTestCase
addXmlClassRef(PACKAGE_NAME + ".AnnotationTestTypeChild");
addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME);
- Iterator<String> overridableAttributes = getJavaEntity().allOverridableAttributeNames();
+ Iterator<String> overridableAttributes = getJavaEntity().getAllOverridableAttributeNames().iterator();
assertEquals("id", overridableAttributes.next());
assertEquals("name", overridableAttributes.next());
assertEquals("foo", overridableAttributes.next());
@@ -655,7 +655,7 @@ public class GenericJavaEntity2_0Tests extends Generic2_0ContextModelTestCase
ListIterator<ClassRef> classRefs = getPersistenceUnit().getSpecifiedClassRefs().iterator();
classRefs.next();
JavaEntity abstractEntity = (JavaEntity) classRefs.next().getJavaPersistentType().getMapping();
- overridableAttributes = abstractEntity.allOverridableAttributeNames();
+ overridableAttributes = abstractEntity.getAllOverridableAttributeNames().iterator();
assertEquals("id", overridableAttributes.next());
assertEquals("name", overridableAttributes.next());
assertEquals("foo", overridableAttributes.next());
@@ -668,7 +668,7 @@ public class GenericJavaEntity2_0Tests extends Generic2_0ContextModelTestCase
addXmlClassRef(PACKAGE_NAME + ".AnnotationTestTypeChild");
addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME);
- Iterator<String> overridableAssociations = getJavaEntity().allOverridableAssociationNames();
+ Iterator<String> overridableAssociations = getJavaEntity().getAllOverridableAssociationNames().iterator();
assertEquals("address", overridableAssociations.next());
assertEquals("address2", overridableAssociations.next());
assertEquals("address3", overridableAssociations.next());
@@ -679,7 +679,7 @@ public class GenericJavaEntity2_0Tests extends Generic2_0ContextModelTestCase
ListIterator<ClassRef> classRefs = getPersistenceUnit().getSpecifiedClassRefs().iterator();
classRefs.next();
JavaEntity abstractEntity = (JavaEntity) classRefs.next().getJavaPersistentType().getMapping();
- overridableAssociations = abstractEntity.allOverridableAssociationNames();
+ overridableAssociations = abstractEntity.getAllOverridableAssociationNames().iterator();
assertEquals("address", overridableAssociations.next());
assertEquals("address2", overridableAssociations.next());
assertEquals("address3", overridableAssociations.next());
@@ -693,7 +693,7 @@ public class GenericJavaEntity2_0Tests extends Generic2_0ContextModelTestCase
addXmlClassRef(PACKAGE_NAME + ".AnnotationTestTypeChild");
getEntityMappings().addPersistentType(MappingKeys.MAPPED_SUPERCLASS_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME);
- Iterator<String> overridableAttributes = getJavaEntity().allOverridableAttributeNames();
+ Iterator<String> overridableAttributes = getJavaEntity().getAllOverridableAttributeNames().iterator();
assertEquals("id", overridableAttributes.next());
assertEquals("name", overridableAttributes.next());
assertEquals("foo", overridableAttributes.next());
@@ -706,7 +706,7 @@ public class GenericJavaEntity2_0Tests extends Generic2_0ContextModelTestCase
addXmlClassRef(PACKAGE_NAME + ".AnnotationTestTypeChild");
addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME);
- Iterator<String> overridableAttributeNames = getJavaEntity().allOverridableAttributeNames();
+ Iterator<String> overridableAttributeNames = getJavaEntity().getAllOverridableAttributeNames().iterator();
assertEquals("id", overridableAttributeNames.next());
assertEquals("name", overridableAttributeNames.next());
assertEquals("foo", overridableAttributeNames.next());
@@ -1171,7 +1171,7 @@ public class GenericJavaEntity2_0Tests extends Generic2_0ContextModelTestCase
createTestEntity();
addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME);
- Iterator<String> overridableAssociations = getJavaEntity().overridableAssociationNames();
+ Iterator<String> overridableAssociations = getJavaEntity().getOverridableAssociationNames().iterator();
assertFalse(overridableAssociations.hasNext());
}
@@ -1179,7 +1179,7 @@ public class GenericJavaEntity2_0Tests extends Generic2_0ContextModelTestCase
createTestEntity();
addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME);
- Iterator<String> overridableAssociationNames = getJavaEntity().overridableAssociationNames();
+ Iterator<String> overridableAssociationNames = getJavaEntity().getOverridableAssociationNames().iterator();
assertFalse(overridableAssociationNames.hasNext());
}
@@ -1190,7 +1190,7 @@ public class GenericJavaEntity2_0Tests extends Generic2_0ContextModelTestCase
addXmlClassRef(PACKAGE_NAME + ".AnnotationTestTypeChild");
addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME);
- Iterator<String> overridableAssociationNames = getJavaEntity().allOverridableAssociationNames();
+ Iterator<String> overridableAssociationNames = getJavaEntity().getAllOverridableAssociationNames().iterator();
assertEquals("address", overridableAssociationNames.next());
assertEquals("address2", overridableAssociationNames.next());
assertEquals("address3", overridableAssociationNames.next());
@@ -1204,7 +1204,7 @@ public class GenericJavaEntity2_0Tests extends Generic2_0ContextModelTestCase
addXmlClassRef(PACKAGE_NAME + ".AnnotationTestTypeChild");
getEntityMappings().addPersistentType(MappingKeys.MAPPED_SUPERCLASS_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME);
- Iterator<String> overridableAssociations = getJavaEntity().allOverridableAssociationNames();
+ Iterator<String> overridableAssociations = getJavaEntity().getAllOverridableAssociationNames().iterator();
assertEquals("address", overridableAssociations.next());
assertEquals("address2", overridableAssociations.next());
assertEquals("address3", overridableAssociations.next());
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 8d41c5b462..fcdcf70534 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
@@ -327,7 +327,7 @@ public class GenericJavaManyToManyMapping2_0Tests
ManyToManyMapping manyToManyMapping = (ManyToManyMapping) persistentAttribute.getMapping();
Iterator<String> attributeNames =
- manyToManyMapping.getRelationship().getMappedByStrategy().candidateMappedByAttributeNames();
+ manyToManyMapping.getRelationship().getMappedByStrategy().getCandidateMappedByAttributeNames().iterator();
assertEquals("id", attributeNames.next());
assertEquals("city", attributeNames.next());
assertEquals("state", attributeNames.next());
@@ -339,12 +339,12 @@ public class GenericJavaManyToManyMapping2_0Tests
manyToManyMapping.setSpecifiedTargetEntity("foo");
attributeNames =
- manyToManyMapping.getRelationship().getMappedByStrategy().candidateMappedByAttributeNames();
+ manyToManyMapping.getRelationship().getMappedByStrategy().getCandidateMappedByAttributeNames().iterator();
assertFalse(attributeNames.hasNext());
manyToManyMapping.setSpecifiedTargetEntity(null);
attributeNames =
- manyToManyMapping.getRelationship().getMappedByStrategy().candidateMappedByAttributeNames();
+ manyToManyMapping.getRelationship().getMappedByStrategy().getCandidateMappedByAttributeNames().iterator();
assertEquals("id", attributeNames.next());
assertEquals("city", attributeNames.next());
assertEquals("state", attributeNames.next());
@@ -370,7 +370,7 @@ public class GenericJavaManyToManyMapping2_0Tests
ManyToManyMapping manyToManyMapping = (ManyToManyMapping) persistentAttribute.getMapping();
Iterator<String> attributeNames =
- manyToManyMapping.getRelationship().getMappedByStrategy().candidateMappedByAttributeNames();
+ manyToManyMapping.getRelationship().getMappedByStrategy().getCandidateMappedByAttributeNames().iterator();
assertEquals("id", attributeNames.next());
assertEquals("city", attributeNames.next());
assertEquals("state", attributeNames.next());
@@ -381,12 +381,12 @@ public class GenericJavaManyToManyMapping2_0Tests
manyToManyMapping.setSpecifiedTargetEntity("foo");
attributeNames =
- manyToManyMapping.getRelationship().getMappedByStrategy().candidateMappedByAttributeNames();
+ manyToManyMapping.getRelationship().getMappedByStrategy().getCandidateMappedByAttributeNames().iterator();
assertFalse(attributeNames.hasNext());
manyToManyMapping.setSpecifiedTargetEntity(null);
attributeNames =
- manyToManyMapping.getRelationship().getMappedByStrategy().candidateMappedByAttributeNames();
+ manyToManyMapping.getRelationship().getMappedByStrategy().getCandidateMappedByAttributeNames().iterator();
assertEquals("id", attributeNames.next());
assertEquals("city", attributeNames.next());
assertEquals("state", attributeNames.next());
@@ -478,7 +478,7 @@ public class GenericJavaManyToManyMapping2_0Tests
ManyToManyMapping manyToManyMapping2_0 = (ManyToManyMapping) persistentAttribute.getMapping();
Iterator<String> mapKeyNames =
- manyToManyMapping2_0.candidateMapKeyNames();
+ manyToManyMapping2_0.getCandidateMapKeyNames().iterator();
assertEquals("id", mapKeyNames.next());
assertEquals("city", mapKeyNames.next());
assertEquals("state", mapKeyNames.next());
@@ -500,11 +500,11 @@ public class GenericJavaManyToManyMapping2_0Tests
PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next();
ManyToManyMapping manyToManyMapping2_0 = (ManyToManyMapping) persistentAttribute.getMapping();
- Iterator<String> mapKeyNames = manyToManyMapping2_0.candidateMapKeyNames();
+ Iterator<String> mapKeyNames = manyToManyMapping2_0.getCandidateMapKeyNames().iterator();
assertEquals(false, mapKeyNames.hasNext());
manyToManyMapping2_0.setSpecifiedTargetEntity("Address");
- mapKeyNames = manyToManyMapping2_0.candidateMapKeyNames();
+ mapKeyNames = manyToManyMapping2_0.getCandidateMapKeyNames().iterator();
assertEquals("id", mapKeyNames.next());
assertEquals("city", mapKeyNames.next());
assertEquals("state", mapKeyNames.next());
@@ -515,7 +515,7 @@ public class GenericJavaManyToManyMapping2_0Tests
assertFalse(mapKeyNames.hasNext());
manyToManyMapping2_0.setSpecifiedTargetEntity("String");
- mapKeyNames = manyToManyMapping2_0.candidateMapKeyNames();
+ mapKeyNames = manyToManyMapping2_0.getCandidateMapKeyNames().iterator();
assertEquals(false, mapKeyNames.hasNext());
}
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 ffd10f4096..08c34867c0 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
@@ -352,7 +352,7 @@ public class GenericJavaOneToManyMapping2_0Tests
OneToManyMapping oneToManyMapping = (OneToManyMapping) persistentAttribute.getMapping();
Iterator<String> attributeNames =
- oneToManyMapping.getRelationship().getMappedByStrategy().candidateMappedByAttributeNames();
+ oneToManyMapping.getRelationship().getMappedByStrategy().getCandidateMappedByAttributeNames().iterator();
assertEquals("id", attributeNames.next());
assertEquals("city", attributeNames.next());
assertEquals("state", attributeNames.next());
@@ -364,12 +364,12 @@ public class GenericJavaOneToManyMapping2_0Tests
oneToManyMapping.setSpecifiedTargetEntity("foo");
attributeNames =
- oneToManyMapping.getRelationship().getMappedByStrategy().candidateMappedByAttributeNames();
+ oneToManyMapping.getRelationship().getMappedByStrategy().getCandidateMappedByAttributeNames().iterator();
assertFalse(attributeNames.hasNext());
oneToManyMapping.setSpecifiedTargetEntity(null);
attributeNames =
- oneToManyMapping.getRelationship().getMappedByStrategy().candidateMappedByAttributeNames();
+ oneToManyMapping.getRelationship().getMappedByStrategy().getCandidateMappedByAttributeNames().iterator();
assertEquals("id", attributeNames.next());
assertEquals("city", attributeNames.next());
assertEquals("state", attributeNames.next());
@@ -395,7 +395,7 @@ public class GenericJavaOneToManyMapping2_0Tests
OneToManyMapping oneToManyMapping = (OneToManyMapping) persistentAttribute.getMapping();
Iterator<String> attributeNames =
- oneToManyMapping.getRelationship().getMappedByStrategy().candidateMappedByAttributeNames();
+ oneToManyMapping.getRelationship().getMappedByStrategy().getCandidateMappedByAttributeNames().iterator();
assertEquals("id", attributeNames.next());
assertEquals("city", attributeNames.next());
assertEquals("state", attributeNames.next());
@@ -406,12 +406,12 @@ public class GenericJavaOneToManyMapping2_0Tests
oneToManyMapping.setSpecifiedTargetEntity("foo");
attributeNames =
- oneToManyMapping.getRelationship().getMappedByStrategy().candidateMappedByAttributeNames();
+ oneToManyMapping.getRelationship().getMappedByStrategy().getCandidateMappedByAttributeNames().iterator();
assertFalse(attributeNames.hasNext());
oneToManyMapping.setSpecifiedTargetEntity(null);
attributeNames =
- oneToManyMapping.getRelationship().getMappedByStrategy().candidateMappedByAttributeNames();
+ oneToManyMapping.getRelationship().getMappedByStrategy().getCandidateMappedByAttributeNames().iterator();
assertEquals("id", attributeNames.next());
assertEquals("city", attributeNames.next());
assertEquals("state", attributeNames.next());
@@ -639,7 +639,7 @@ public class GenericJavaOneToManyMapping2_0Tests
OneToManyMapping2_0 oneToManyMapping2_0 = (OneToManyMapping2_0) persistentAttribute.getMapping();
Iterator<String> mapKeyNames =
- oneToManyMapping2_0.candidateMapKeyNames();
+ oneToManyMapping2_0.getCandidateMapKeyNames().iterator();
assertEquals("id", mapKeyNames.next());
assertEquals("city", mapKeyNames.next());
assertEquals("state", mapKeyNames.next());
@@ -661,11 +661,11 @@ public class GenericJavaOneToManyMapping2_0Tests
PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next();
OneToManyMapping2_0 oneToManyMapping2_0 = (OneToManyMapping2_0) persistentAttribute.getMapping();
- Iterator<String> mapKeyNames = oneToManyMapping2_0.candidateMapKeyNames();
+ Iterator<String> mapKeyNames = oneToManyMapping2_0.getCandidateMapKeyNames().iterator();
assertEquals(false, mapKeyNames.hasNext());
oneToManyMapping2_0.setSpecifiedTargetEntity("Address");
- mapKeyNames = oneToManyMapping2_0.candidateMapKeyNames();
+ mapKeyNames = oneToManyMapping2_0.getCandidateMapKeyNames().iterator();
assertEquals("id", mapKeyNames.next());
assertEquals("city", mapKeyNames.next());
assertEquals("state", mapKeyNames.next());
@@ -676,7 +676,7 @@ public class GenericJavaOneToManyMapping2_0Tests
assertFalse(mapKeyNames.hasNext());
oneToManyMapping2_0.setSpecifiedTargetEntity("String");
- mapKeyNames = oneToManyMapping2_0.candidateMapKeyNames();
+ mapKeyNames = oneToManyMapping2_0.getCandidateMapKeyNames().iterator();
assertEquals(false, mapKeyNames.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 db8302401e..e0549f4fdd 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
@@ -487,7 +487,7 @@ public class GenericJavaOneToOneMapping2_0Tests
OneToOneMapping oneToOneMapping = (OneToOneMapping) persistentAttribute.getMapping();
Iterator<String> attributeNames =
- oneToOneMapping.getRelationship().getMappedByStrategy().candidateMappedByAttributeNames();
+ oneToOneMapping.getRelationship().getMappedByStrategy().getCandidateMappedByAttributeNames().iterator();
assertEquals("id", attributeNames.next());
assertEquals("city", attributeNames.next());
assertEquals("state", attributeNames.next());
@@ -498,12 +498,12 @@ public class GenericJavaOneToOneMapping2_0Tests
oneToOneMapping.setSpecifiedTargetEntity("foo");
attributeNames =
- oneToOneMapping.getRelationship().getMappedByStrategy().candidateMappedByAttributeNames();
+ oneToOneMapping.getRelationship().getMappedByStrategy().getCandidateMappedByAttributeNames().iterator();
assertFalse(attributeNames.hasNext());
oneToOneMapping.setSpecifiedTargetEntity(null);
attributeNames =
- oneToOneMapping.getRelationship().getMappedByStrategy().candidateMappedByAttributeNames();
+ oneToOneMapping.getRelationship().getMappedByStrategy().getCandidateMappedByAttributeNames().iterator();
assertEquals("id", attributeNames.next());
assertEquals("city", attributeNames.next());
assertEquals("state", attributeNames.next());
@@ -528,7 +528,7 @@ public class GenericJavaOneToOneMapping2_0Tests
OneToOneMapping oneToOneMapping = (OneToOneMapping) persistentAttribute.getMapping();
Iterator<String> attributeNames =
- oneToOneMapping.getRelationship().getMappedByStrategy().candidateMappedByAttributeNames();
+ oneToOneMapping.getRelationship().getMappedByStrategy().getCandidateMappedByAttributeNames().iterator();
assertEquals("id", attributeNames.next());
assertEquals("city", attributeNames.next());
assertEquals("state", attributeNames.next());
@@ -539,12 +539,12 @@ public class GenericJavaOneToOneMapping2_0Tests
oneToOneMapping.setSpecifiedTargetEntity("foo");
attributeNames =
- oneToOneMapping.getRelationship().getMappedByStrategy().candidateMappedByAttributeNames();
+ oneToOneMapping.getRelationship().getMappedByStrategy().getCandidateMappedByAttributeNames().iterator();
assertFalse(attributeNames.hasNext());
oneToOneMapping.setSpecifiedTargetEntity(null);
attributeNames =
- oneToOneMapping.getRelationship().getMappedByStrategy().candidateMappedByAttributeNames();
+ oneToOneMapping.getRelationship().getMappedByStrategy().getCandidateMappedByAttributeNames().iterator();
assertEquals("id", attributeNames.next());
assertEquals("city", attributeNames.next());
assertEquals("state", attributeNames.next());
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 bdb121fe8b..37bff06833 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
@@ -597,7 +597,7 @@ public class GenericJavaPersistentType2_0Tests extends Generic2_0ContextModelTes
JavaPersistentType rootJavaPersistentType = classRefs.next().getJavaPersistentType();
JavaPersistentType childJavaPersistentType = classRefs.next().getJavaPersistentType();
- Iterator<PersistentType> inheritanceHierarchy = childJavaPersistentType.inheritanceHierarchy();
+ Iterator<PersistentType> inheritanceHierarchy = childJavaPersistentType.getInheritanceHierarchy().iterator();
assertEquals(childJavaPersistentType, inheritanceHierarchy.next());
assertEquals(rootJavaPersistentType, inheritanceHierarchy.next());
@@ -615,7 +615,7 @@ public class GenericJavaPersistentType2_0Tests extends Generic2_0ContextModelTes
JavaPersistentType childJavaPersistentType = classRefs.next().getJavaPersistentType();
JavaPersistentType rootJavaPersistentType = classRefs.next().getJavaPersistentType();
- Iterator<PersistentType> inheritanceHierarchy = childJavaPersistentType.inheritanceHierarchy();
+ Iterator<PersistentType> inheritanceHierarchy = childJavaPersistentType.getInheritanceHierarchy().iterator();
assertEquals(childJavaPersistentType, inheritanceHierarchy.next());
assertEquals(rootJavaPersistentType, inheritanceHierarchy.next());
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 e844327d1c..81879526a7 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
@@ -794,7 +794,7 @@ public class GenericOrmElementCollectionMapping2_0Tests extends Generic2_0Contex
ElementCollectionMapping2_0 virtualElementCollectionMapping = (ElementCollectionMapping2_0) ormPersistentType.getAttributeNamed("addresses").getMapping();
- Iterator<String> mapKeyNames = virtualElementCollectionMapping.candidateMapKeyNames();
+ Iterator<String> mapKeyNames = virtualElementCollectionMapping.getCandidateMapKeyNames().iterator();
assertEquals("city", mapKeyNames.next());
assertEquals("state", mapKeyNames.next());
assertEquals("state.name", mapKeyNames.next());
@@ -815,11 +815,11 @@ public class GenericOrmElementCollectionMapping2_0Tests extends Generic2_0Contex
ElementCollectionMapping2_0 virtualElementCollectionMapping = (ElementCollectionMapping2_0) ormPersistentType.getAttributeNamed("addresses").getMapping();
JavaElementCollectionMapping2_0 javaElementCollectionMapping = (JavaElementCollectionMapping2_0) ormPersistentType.getJavaPersistentType().getAttributeNamed("addresses").getMapping();
- Iterator<String> mapKeyNames = virtualElementCollectionMapping.candidateMapKeyNames();
+ Iterator<String> mapKeyNames = virtualElementCollectionMapping.getCandidateMapKeyNames().iterator();
assertEquals(false, mapKeyNames.hasNext());
javaElementCollectionMapping.setSpecifiedTargetClass("test.Address");
- mapKeyNames = virtualElementCollectionMapping.candidateMapKeyNames();
+ mapKeyNames = virtualElementCollectionMapping.getCandidateMapKeyNames().iterator();
assertEquals("city", mapKeyNames.next());
assertEquals("state", mapKeyNames.next());
assertEquals("state.name", mapKeyNames.next());
@@ -829,11 +829,11 @@ public class GenericOrmElementCollectionMapping2_0Tests extends Generic2_0Contex
ormPersistentType.getAttributeNamed("addresses").convertToSpecified();
virtualElementCollectionMapping = (OrmElementCollectionMapping2_0) ormPersistentType.getAttributeNamed("addresses").getMapping();
- mapKeyNames = virtualElementCollectionMapping.candidateMapKeyNames();
+ mapKeyNames = virtualElementCollectionMapping.getCandidateMapKeyNames().iterator();
assertEquals(false, mapKeyNames.hasNext());
virtualElementCollectionMapping.setSpecifiedTargetClass("test.Address");
- mapKeyNames = virtualElementCollectionMapping.candidateMapKeyNames();
+ mapKeyNames = virtualElementCollectionMapping.getCandidateMapKeyNames().iterator();
assertEquals("city", mapKeyNames.next());
assertEquals("state", mapKeyNames.next());
assertEquals("state.name", mapKeyNames.next());
@@ -842,7 +842,7 @@ public class GenericOrmElementCollectionMapping2_0Tests extends Generic2_0Contex
assertFalse(mapKeyNames.hasNext());
virtualElementCollectionMapping.setSpecifiedTargetClass("String");
- mapKeyNames = virtualElementCollectionMapping.candidateMapKeyNames();
+ mapKeyNames = virtualElementCollectionMapping.getCandidateMapKeyNames().iterator();
assertEquals(false, mapKeyNames.hasNext());
}
@@ -1454,6 +1454,6 @@ public class GenericOrmElementCollectionMapping2_0Tests extends Generic2_0Contex
OrmPersistentType persistentType = getEntityMappings().addPersistentType(MappingKeys.EMBEDDABLE_TYPE_MAPPING_KEY, PACKAGE_NAME + ".Foo");
ElementCollectionMapping2_0 mapping = (ElementCollectionMapping2_0) persistentType.getAttributeNamed("elementCollection").getMapping();
- assertFalse(mapping.allOverridableAttributeMappingNames().hasNext());
+ assertFalse(mapping.getAllOverridableAttributeMappingNames().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/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 25cb494d9c..0a82a030a7 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
@@ -1729,6 +1729,6 @@ public class GenericOrmEmbeddedMapping2_0Tests extends Generic2_0ContextModelTes
OrmPersistentType persistentType = getEntityMappings().addPersistentType(MappingKeys.EMBEDDABLE_TYPE_MAPPING_KEY, PACKAGE_NAME + ".Foo");
EmbeddedMapping2_0 embeddedMapping = (EmbeddedMapping2_0) persistentType.getAttributeNamed("embedded").getMapping();
- assertFalse(embeddedMapping.allOverridableAttributeMappingNames().hasNext());
+ assertFalse(embeddedMapping.getAllOverridableAttributeMappingNames().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/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 7e997b5020..559fef408e 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
@@ -541,13 +541,13 @@ public class GenericOrmEntity2_0Tests extends Generic2_0ContextModelTestCase
OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME);
OrmEntity entity = (OrmEntity) ormPersistentType.getMapping();
- Iterator<String> overridableAttributes = entity.overridableAttributeNames();
+ Iterator<String> overridableAttributes = entity.getOverridableAttributeNames().iterator();
assertFalse(overridableAttributes.hasNext());
entity.setSpecifiedInheritanceStrategy(InheritanceType.TABLE_PER_CLASS);
- overridableAttributes = entity.overridableAttributeNames();
+ overridableAttributes = entity.getOverridableAttributeNames().iterator();
assertEquals("id", overridableAttributes.next());
assertEquals("name", overridableAttributes.next());
assertFalse(overridableAttributes.hasNext());
@@ -558,13 +558,13 @@ public class GenericOrmEntity2_0Tests extends Generic2_0ContextModelTestCase
OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME);
OrmEntity entity = (OrmEntity) ormPersistentType.getMapping();
- Iterator<String> overridableAttributeNames = entity.overridableAttributeNames();
+ Iterator<String> overridableAttributeNames = entity.getOverridableAttributeNames().iterator();
assertFalse(overridableAttributeNames.hasNext());
entity.setSpecifiedInheritanceStrategy(InheritanceType.TABLE_PER_CLASS);
- overridableAttributeNames = entity.overridableAttributeNames();
+ overridableAttributeNames = entity.getOverridableAttributeNames().iterator();
assertEquals("id", overridableAttributeNames.next());
assertEquals("name", overridableAttributeNames.next());
assertFalse(overridableAttributeNames.hasNext());
@@ -576,7 +576,7 @@ public class GenericOrmEntity2_0Tests extends Generic2_0ContextModelTestCase
addXmlClassRef(PACKAGE_NAME + ".AnnotationTestTypeChild");
addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME);
- Iterator<String> overridableAttributes = getJavaEntity().allOverridableAttributeNames();
+ Iterator<String> overridableAttributes = getJavaEntity().getAllOverridableAttributeNames().iterator();
assertEquals("id", overridableAttributes.next());
assertEquals("name", overridableAttributes.next());
assertEquals("foo", overridableAttributes.next());
@@ -590,7 +590,7 @@ public class GenericOrmEntity2_0Tests extends Generic2_0ContextModelTestCase
getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME);
OrmEntity ormEntity = (OrmEntity) ormPersistentType.getMapping();
- Iterator<String> overridableAttributes = ormEntity.allOverridableAttributeNames();
+ Iterator<String> overridableAttributes = ormEntity.getAllOverridableAttributeNames().iterator();
assertEquals("id", overridableAttributes.next());
assertEquals("name", overridableAttributes.next());
assertEquals("foo", overridableAttributes.next());
@@ -598,7 +598,7 @@ public class GenericOrmEntity2_0Tests extends Generic2_0ContextModelTestCase
OrmEntity abstractEntity = (OrmEntity) ormEntity.getParentEntity();
- overridableAttributes = abstractEntity.allOverridableAttributeNames();
+ overridableAttributes = abstractEntity.getAllOverridableAttributeNames().iterator();
assertEquals("id", overridableAttributes.next());
assertEquals("name", overridableAttributes.next());
assertEquals("foo", overridableAttributes.next());
@@ -612,7 +612,7 @@ public class GenericOrmEntity2_0Tests extends Generic2_0ContextModelTestCase
getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME);
OrmEntity ormEntity = (OrmEntity) ormPersistentType.getMapping();
- Iterator<String> overridableAssociations = ormEntity.allOverridableAssociationNames();
+ Iterator<String> overridableAssociations = ormEntity.getAllOverridableAssociationNames().iterator();
assertEquals("address", overridableAssociations.next());
assertEquals("address2", overridableAssociations.next());
assertEquals("address3", overridableAssociations.next());
@@ -621,7 +621,7 @@ public class GenericOrmEntity2_0Tests extends Generic2_0ContextModelTestCase
OrmEntity abstractEntity = (OrmEntity) ormEntity.getParentEntity();
- overridableAssociations = abstractEntity.allOverridableAssociationNames();
+ overridableAssociations = abstractEntity.getAllOverridableAssociationNames().iterator();
assertEquals("address", overridableAssociations.next());
assertEquals("address2", overridableAssociations.next());
assertEquals("address3", overridableAssociations.next());
@@ -649,7 +649,7 @@ public class GenericOrmEntity2_0Tests extends Generic2_0ContextModelTestCase
getEntityMappings().addPersistentType(MappingKeys.MAPPED_SUPERCLASS_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME);
OrmEntity ormEntity = (OrmEntity) ormPersistentType.getMapping();
- Iterator<String> overridableAttributeNames = ormEntity.allOverridableAttributeNames();
+ Iterator<String> overridableAttributeNames = ormEntity.getAllOverridableAttributeNames().iterator();
assertEquals("id", overridableAttributeNames.next());
assertEquals("name", overridableAttributeNames.next());
assertEquals("foo", overridableAttributeNames.next());
@@ -1087,7 +1087,7 @@ public class GenericOrmEntity2_0Tests extends Generic2_0ContextModelTestCase
OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "test.AnnotationTestTypeChild");
OrmEntity entity = (OrmEntity) ormPersistentType.getMapping();
- Iterator<String> overridableAssociationNames = entity.overridableAssociationNames();
+ Iterator<String> overridableAssociationNames = entity.getOverridableAssociationNames().iterator();
assertFalse(overridableAssociationNames.hasNext());
}
@@ -1099,7 +1099,7 @@ public class GenericOrmEntity2_0Tests extends Generic2_0ContextModelTestCase
getEntityMappings().addPersistentType(MappingKeys.MAPPED_SUPERCLASS_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME);
OrmEntity ormEntity = (OrmEntity) ormPersistentType.getMapping();
- Iterator<String> overridableAssociationNames = ormEntity.allOverridableAssociationNames();
+ Iterator<String> overridableAssociationNames = ormEntity.getAllOverridableAssociationNames().iterator();
assertEquals("address", overridableAssociationNames.next());
assertEquals("address2", overridableAssociationNames.next());
assertEquals("address3", overridableAssociationNames.next());
@@ -1114,7 +1114,7 @@ public class GenericOrmEntity2_0Tests extends Generic2_0ContextModelTestCase
getEntityMappings().addPersistentType(MappingKeys.MAPPED_SUPERCLASS_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME);
OrmEntity ormEntity = (OrmEntity) ormPersistentType.getMapping();
- Iterator<String> overridableAssociations = ormEntity.allOverridableAssociationNames();
+ Iterator<String> overridableAssociations = ormEntity.getAllOverridableAssociationNames().iterator();
assertEquals("address", overridableAssociations.next());
assertEquals("address2", overridableAssociations.next());
assertEquals("address3", overridableAssociations.next());
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 b11c5b1f9a..0cfb6a561f 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
@@ -250,7 +250,7 @@ public class GenericOrmManyToManyMapping2_0Tests
ManyToManyMapping manyToManyMapping = (ManyToManyMapping) persistentAttribute.getMapping();
Iterator<String> attributeNames =
- manyToManyMapping.getRelationship().getMappedByStrategy().candidateMappedByAttributeNames();
+ manyToManyMapping.getRelationship().getMappedByStrategy().getCandidateMappedByAttributeNames().iterator();
assertEquals("id", attributeNames.next());
assertEquals("city", attributeNames.next());
assertEquals("state", attributeNames.next());
@@ -261,12 +261,12 @@ public class GenericOrmManyToManyMapping2_0Tests
manyToManyMapping.setSpecifiedTargetEntity("foo");
attributeNames =
- manyToManyMapping.getRelationship().getMappedByStrategy().candidateMappedByAttributeNames();
+ manyToManyMapping.getRelationship().getMappedByStrategy().getCandidateMappedByAttributeNames().iterator();
assertFalse(attributeNames.hasNext());
manyToManyMapping.setSpecifiedTargetEntity(null);
attributeNames =
- manyToManyMapping.getRelationship().getMappedByStrategy().candidateMappedByAttributeNames();
+ manyToManyMapping.getRelationship().getMappedByStrategy().getCandidateMappedByAttributeNames().iterator();
assertEquals("id", attributeNames.next());
assertEquals("city", attributeNames.next());
assertEquals("state", attributeNames.next());
@@ -296,7 +296,7 @@ public class GenericOrmManyToManyMapping2_0Tests
ManyToManyMapping manyToManyMapping = (ManyToManyMapping) persistentAttribute.getMapping();
Iterator<String> attributeNames =
- manyToManyMapping.getRelationship().getMappedByStrategy().candidateMappedByAttributeNames();
+ manyToManyMapping.getRelationship().getMappedByStrategy().getCandidateMappedByAttributeNames().iterator();
assertEquals("id", attributeNames.next());
assertEquals("city", attributeNames.next());
assertEquals("state", attributeNames.next());
@@ -307,12 +307,12 @@ public class GenericOrmManyToManyMapping2_0Tests
manyToManyMapping.setSpecifiedTargetEntity("foo");
attributeNames =
- manyToManyMapping.getRelationship().getMappedByStrategy().candidateMappedByAttributeNames();
+ manyToManyMapping.getRelationship().getMappedByStrategy().getCandidateMappedByAttributeNames().iterator();
assertFalse(attributeNames.hasNext());
manyToManyMapping.setSpecifiedTargetEntity(null);
attributeNames =
- manyToManyMapping.getRelationship().getMappedByStrategy().candidateMappedByAttributeNames();
+ manyToManyMapping.getRelationship().getMappedByStrategy().getCandidateMappedByAttributeNames().iterator();
assertEquals("id", attributeNames.next());
assertEquals("city", attributeNames.next());
assertEquals("state", attributeNames.next());
@@ -422,7 +422,7 @@ public class GenericOrmManyToManyMapping2_0Tests
ManyToManyMapping virtualManyToManyMapping = (ManyToManyMapping) ormPersistentType.getAttributeNamed("addresses").getMapping();
- Iterator<String> mapKeyNames = virtualManyToManyMapping.candidateMapKeyNames();
+ Iterator<String> mapKeyNames = virtualManyToManyMapping.getCandidateMapKeyNames().iterator();
assertEquals("id", mapKeyNames.next());
assertEquals("city", mapKeyNames.next());
assertEquals("state", mapKeyNames.next());
@@ -444,11 +444,11 @@ public class GenericOrmManyToManyMapping2_0Tests
ManyToManyMapping virtualManyToManyMapping = (ManyToManyMapping) ormPersistentType.getAttributeNamed("addresses").getMapping();
JavaManyToManyMapping javaManyToManyMapping = (JavaManyToManyMapping) ormPersistentType.getJavaPersistentType().getAttributeNamed("addresses").getMapping();
- Iterator<String> mapKeyNames = virtualManyToManyMapping.candidateMapKeyNames();
+ Iterator<String> mapKeyNames = virtualManyToManyMapping.getCandidateMapKeyNames().iterator();
assertEquals(false, mapKeyNames.hasNext());
javaManyToManyMapping.setSpecifiedTargetEntity("test.Address");
- mapKeyNames = virtualManyToManyMapping.candidateMapKeyNames();
+ mapKeyNames = virtualManyToManyMapping.getCandidateMapKeyNames().iterator();
assertEquals("id", mapKeyNames.next());
assertEquals("city", mapKeyNames.next());
assertEquals("state", mapKeyNames.next());
@@ -459,11 +459,11 @@ public class GenericOrmManyToManyMapping2_0Tests
ormPersistentType.getAttributeNamed("addresses").convertToSpecified();
virtualManyToManyMapping = (OrmManyToManyMapping) ormPersistentType.getAttributeNamed("addresses").getMapping();
- mapKeyNames = virtualManyToManyMapping.candidateMapKeyNames();
+ mapKeyNames = virtualManyToManyMapping.getCandidateMapKeyNames().iterator();
assertEquals(false, mapKeyNames.hasNext());
virtualManyToManyMapping.setSpecifiedTargetEntity("test.Address");
- mapKeyNames = virtualManyToManyMapping.candidateMapKeyNames();
+ mapKeyNames = virtualManyToManyMapping.getCandidateMapKeyNames().iterator();
assertEquals("id", mapKeyNames.next());
assertEquals("city", mapKeyNames.next());
assertEquals("state", mapKeyNames.next());
@@ -473,7 +473,7 @@ public class GenericOrmManyToManyMapping2_0Tests
assertFalse(mapKeyNames.hasNext());
virtualManyToManyMapping.setSpecifiedTargetEntity("String");
- mapKeyNames = virtualManyToManyMapping.candidateMapKeyNames();
+ mapKeyNames = virtualManyToManyMapping.getCandidateMapKeyNames().iterator();
assertEquals(false, mapKeyNames.hasNext());
}
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 930930c1fa..e6f3d2a45e 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
@@ -286,7 +286,7 @@ public class GenericOrmOneToManyMapping2_0Tests
OneToManyMapping oneToManyMapping = (OneToManyMapping) persistentAttribute.getMapping();
Iterator<String> attributeNames =
- oneToManyMapping.getRelationship().getMappedByStrategy().candidateMappedByAttributeNames();
+ oneToManyMapping.getRelationship().getMappedByStrategy().getCandidateMappedByAttributeNames().iterator();
assertEquals("id", attributeNames.next());
assertEquals("city", attributeNames.next());
assertEquals("state", attributeNames.next());
@@ -297,12 +297,12 @@ public class GenericOrmOneToManyMapping2_0Tests
oneToManyMapping.setSpecifiedTargetEntity("foo");
attributeNames =
- oneToManyMapping.getRelationship().getMappedByStrategy().candidateMappedByAttributeNames();
+ oneToManyMapping.getRelationship().getMappedByStrategy().getCandidateMappedByAttributeNames().iterator();
assertFalse(attributeNames.hasNext());
oneToManyMapping.setSpecifiedTargetEntity(null);
attributeNames =
- oneToManyMapping.getRelationship().getMappedByStrategy().candidateMappedByAttributeNames();
+ oneToManyMapping.getRelationship().getMappedByStrategy().getCandidateMappedByAttributeNames().iterator();
assertEquals("id", attributeNames.next());
assertEquals("city", attributeNames.next());
assertEquals("state", attributeNames.next());
@@ -332,7 +332,7 @@ public class GenericOrmOneToManyMapping2_0Tests
OneToManyMapping oneToManyMapping = (OneToManyMapping) persistentAttribute.getMapping();
Iterator<String> attributeNames =
- oneToManyMapping.getRelationship().getMappedByStrategy().candidateMappedByAttributeNames();
+ oneToManyMapping.getRelationship().getMappedByStrategy().getCandidateMappedByAttributeNames().iterator();
assertEquals("id", attributeNames.next());
assertEquals("city", attributeNames.next());
assertEquals("state", attributeNames.next());
@@ -343,12 +343,12 @@ public class GenericOrmOneToManyMapping2_0Tests
oneToManyMapping.setSpecifiedTargetEntity("foo");
attributeNames =
- oneToManyMapping.getRelationship().getMappedByStrategy().candidateMappedByAttributeNames();
+ oneToManyMapping.getRelationship().getMappedByStrategy().getCandidateMappedByAttributeNames().iterator();
assertFalse(attributeNames.hasNext());
oneToManyMapping.setSpecifiedTargetEntity(null);
attributeNames =
- oneToManyMapping.getRelationship().getMappedByStrategy().candidateMappedByAttributeNames();
+ oneToManyMapping.getRelationship().getMappedByStrategy().getCandidateMappedByAttributeNames().iterator();
assertEquals("id", attributeNames.next());
assertEquals("city", attributeNames.next());
assertEquals("state", attributeNames.next());
@@ -500,7 +500,7 @@ public class GenericOrmOneToManyMapping2_0Tests
OneToManyMapping oneToManyMapping = (OneToManyMapping) ormPersistentType.getAttributeNamed("addresses").getMapping();
- Iterator<String> mapKeyNames = oneToManyMapping.candidateMapKeyNames();
+ Iterator<String> mapKeyNames = oneToManyMapping.getCandidateMapKeyNames().iterator();
assertEquals("id", mapKeyNames.next());
assertEquals("city", mapKeyNames.next());
assertEquals("state", mapKeyNames.next());
@@ -522,11 +522,11 @@ public class GenericOrmOneToManyMapping2_0Tests
OneToManyMapping oneToManyMapping = (OneToManyMapping) ormPersistentType.getAttributeNamed("addresses").getMapping();
JavaOneToManyMapping javaOneToManyMapping = (JavaOneToManyMapping) ormPersistentType.getJavaPersistentType().getAttributeNamed("addresses").getMapping();
- Iterator<String> mapKeyNames = oneToManyMapping.candidateMapKeyNames();
+ Iterator<String> mapKeyNames = oneToManyMapping.getCandidateMapKeyNames().iterator();
assertEquals(false, mapKeyNames.hasNext());
javaOneToManyMapping.setSpecifiedTargetEntity("test.Address");
- mapKeyNames = oneToManyMapping.candidateMapKeyNames();
+ mapKeyNames = oneToManyMapping.getCandidateMapKeyNames().iterator();
assertEquals("id", mapKeyNames.next());
assertEquals("city", mapKeyNames.next());
assertEquals("state", mapKeyNames.next());
@@ -537,11 +537,11 @@ public class GenericOrmOneToManyMapping2_0Tests
ormPersistentType.getAttributeNamed("addresses").convertToSpecified();
oneToManyMapping = (OneToManyMapping) ormPersistentType.getAttributeNamed("addresses").getMapping();
- mapKeyNames = oneToManyMapping.candidateMapKeyNames();
+ mapKeyNames = oneToManyMapping.getCandidateMapKeyNames().iterator();
assertEquals(false, mapKeyNames.hasNext());
oneToManyMapping.setSpecifiedTargetEntity("test.Address");
- mapKeyNames = oneToManyMapping.candidateMapKeyNames();
+ mapKeyNames = oneToManyMapping.getCandidateMapKeyNames().iterator();
assertEquals("id", mapKeyNames.next());
assertEquals("city", mapKeyNames.next());
assertEquals("state", mapKeyNames.next());
@@ -551,7 +551,7 @@ public class GenericOrmOneToManyMapping2_0Tests
assertFalse(mapKeyNames.hasNext());
oneToManyMapping.setSpecifiedTargetEntity("String");
- mapKeyNames = oneToManyMapping.candidateMapKeyNames();
+ mapKeyNames = oneToManyMapping.getCandidateMapKeyNames().iterator();
assertEquals(false, mapKeyNames.hasNext());
}
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 ebb0febdf1..d90195fd20 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
@@ -503,7 +503,7 @@ public class GenericOrmOneToOneMapping2_0Tests
OneToOneMapping oneToOneMapping = (OneToOneMapping) persistentAttribute.getMapping();
Iterator<String> attributeNames =
- oneToOneMapping.getRelationship().getMappedByStrategy().candidateMappedByAttributeNames();
+ oneToOneMapping.getRelationship().getMappedByStrategy().getCandidateMappedByAttributeNames().iterator();
assertEquals("id", attributeNames.next());
assertEquals("city", attributeNames.next());
assertEquals("state", attributeNames.next());
@@ -514,12 +514,12 @@ public class GenericOrmOneToOneMapping2_0Tests
oneToOneMapping.setSpecifiedTargetEntity("foo");
attributeNames =
- oneToOneMapping.getRelationship().getMappedByStrategy().candidateMappedByAttributeNames();
+ oneToOneMapping.getRelationship().getMappedByStrategy().getCandidateMappedByAttributeNames().iterator();
assertFalse(attributeNames.hasNext());
oneToOneMapping.setSpecifiedTargetEntity(null);
attributeNames =
- oneToOneMapping.getRelationship().getMappedByStrategy().candidateMappedByAttributeNames();
+ oneToOneMapping.getRelationship().getMappedByStrategy().getCandidateMappedByAttributeNames().iterator();
assertEquals("id", attributeNames.next());
assertEquals("city", attributeNames.next());
assertEquals("state", attributeNames.next());
@@ -548,7 +548,7 @@ public class GenericOrmOneToOneMapping2_0Tests
ReadOnlyPersistentAttribute persistentAttribute = ormPersistentType.getAttributes().iterator().next();
OneToOneMapping oneToOneMapping = (OneToOneMapping) persistentAttribute.getMapping();
- Iterator<String> attributeNames = oneToOneMapping.getRelationship().getMappedByStrategy().candidateMappedByAttributeNames();
+ Iterator<String> attributeNames = oneToOneMapping.getRelationship().getMappedByStrategy().getCandidateMappedByAttributeNames().iterator();
assertEquals("id", attributeNames.next());
assertEquals("city", attributeNames.next());
assertEquals("state", attributeNames.next());
@@ -559,12 +559,12 @@ public class GenericOrmOneToOneMapping2_0Tests
oneToOneMapping.setSpecifiedTargetEntity("foo");
attributeNames =
- oneToOneMapping.getRelationship().getMappedByStrategy().candidateMappedByAttributeNames();
+ oneToOneMapping.getRelationship().getMappedByStrategy().getCandidateMappedByAttributeNames().iterator();
assertFalse(attributeNames.hasNext());
oneToOneMapping.setSpecifiedTargetEntity(null);
attributeNames =
- oneToOneMapping.getRelationship().getMappedByStrategy().candidateMappedByAttributeNames();
+ oneToOneMapping.getRelationship().getMappedByStrategy().getCandidateMappedByAttributeNames().iterator();
assertEquals("id", attributeNames.next());
assertEquals("city", attributeNames.next());
assertEquals("state", attributeNames.next());
diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/persistence/Generic2_0OptionsTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/persistence/Generic2_0OptionsTests.java
index 5faa5f219d..10ea07e67f 100644
--- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/persistence/Generic2_0OptionsTests.java
+++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/persistence/Generic2_0OptionsTests.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.
@@ -111,15 +111,15 @@ public class Generic2_0OptionsTests extends Generic2_0PersistenceUnitTests
else if (propertyName.equals(JpaOptions2_0.QUERY_TIMEOUT_PROPERTY))
modelValue = this.options.getQueryTimeout();
else if (propertyName.equals(JpaOptions2_0.VALIDATION_GROUP_PRE_PERSIST_PROPERTY)) {
- ListIterator<String> iterator = this.options.validationGroupPrePersists();
+ ListIterator<String> iterator = this.options.getValidationGroupPrePersists().iterator();
modelValue = this.getFirstElement(iterator);
}
else if (propertyName.equals(JpaOptions2_0.VALIDATION_GROUP_PRE_UPDATE_PROPERTY)) {
- ListIterator<String> iterator = this.options.validationGroupPreUpdates();
+ ListIterator<String> iterator = this.options.getValidationGroupPreUpdates().iterator();
modelValue = this.getFirstElement(iterator);
}
else if (propertyName.equals(JpaOptions2_0.VALIDATION_GROUP_PRE_REMOVE_PROPERTY)) {
- ListIterator<String> iterator = this.options.validationGroupPreRemoves();
+ ListIterator<String> iterator = this.options.getValidationGroupPreRemoves().iterator();
modelValue = this.getFirstElement(iterator);
}
else
@@ -494,11 +494,11 @@ public class Generic2_0OptionsTests extends Generic2_0PersistenceUnitTests
private int getValidationGroupSize(String propertyName) throws NoSuchFieldException {
int result = 0;
if (propertyName.equals(JpaOptions2_0.VALIDATION_GROUP_PRE_PERSIST_PROPERTY))
- result = this.options.validationGroupPrePersistsSize();
+ result = this.options.getValidationGroupPrePersistsSize();
else if (propertyName.equals(JpaOptions2_0.VALIDATION_GROUP_PRE_UPDATE_PROPERTY))
- result = this.options.validationGroupPreUpdatesSize();
+ result = this.options.getValidationGroupPreUpdatesSize();
else if (propertyName.equals(JpaOptions2_0.VALIDATION_GROUP_PRE_REMOVE_PROPERTY))
- result = this.options.validationGroupPreRemovesSize();
+ result = this.options.getValidationGroupPreRemovesSize();
else
this.throwMissingDefinition("verifyValidationGroupSize", propertyName);
return result;

Back to the top