diff options
| author | kmoore | 2011-08-02 13:24:47 +0000 |
|---|---|---|
| committer | kmoore | 2011-08-02 13:24:47 +0000 |
| commit | 3d505d221f38ced0b003a7ab4c3bec329e66520d (patch) | |
| tree | 523ab7f29009dc5f54adcc0d373d46a5c9db78c1 | |
| parent | a940ce0028751421c5c7312b19128b3a5f518386 (diff) | |
| download | webtools.dali-3d505d221f38ced0b003a7ab4c3bec329e66520d.tar.gz webtools.dali-3d505d221f38ced0b003a7ab4c3bec329e66520d.tar.xz webtools.dali-3d505d221f38ced0b003a7ab4c3bec329e66520d.zip | |
changing the rest of the Iterator API to Iterable
176 files changed, 1449 insertions, 1677 deletions
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/AttributeMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/AttributeMapping.java index 3422add9a4..e646eda921 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/AttributeMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/AttributeMapping.java @@ -9,8 +9,6 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.context; -import java.util.Iterator; - /** * JPA attribute mapping. * <p> @@ -118,7 +116,7 @@ public interface AttributeMapping * <li><code>"embedded.bar"</code> * </ul> */ - Iterator<String> allMappingNames(); + Iterable<String> getAllMappingNames(); /** * This is used to determine the virtual attribute overrides for an @@ -128,7 +126,7 @@ public interface AttributeMapping * In a JPA 2.0 project this will include overridable nested attributes. * @see #isOverridableAttributeMapping() */ - Iterator<String> allOverridableAttributeMappingNames(); + Iterable<String> getAllOverridableAttributeMappingNames(); /** * This is used to determine the virtual association overrides for an @@ -138,7 +136,7 @@ public interface AttributeMapping * In a JPA 2.0 project this will include overridable nested associations. * @see #isOverridableAssociationMapping() */ - Iterator<String> allOverridableAssociationMappingNames(); + Iterable<String> getAllOverridableAssociationMappingNames(); /** * Return the mapping itself if its name matches the specified name. diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/CollectionMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/CollectionMapping.java index 5b8dc30347..268b5fea17 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/CollectionMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/CollectionMapping.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. @@ -9,8 +9,6 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.context; -import java.util.Iterator; - /** * JPA collection mapping (e.g. 1:m, m:m, element collection) * <p> @@ -69,7 +67,7 @@ public interface CollectionMapping void setCustomMapKey(boolean customMapKey); String CUSTOM_MAP_KEY_PROPERTY = "customMapKey"; //$NON-NLS-1$ - Iterator<String> candidateMapKeyNames(); + Iterable<String> getCandidateMapKeyNames(); String getMetamodelFieldMapKeyTypeName(); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/MappedByRelationshipStrategy.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/MappedByRelationshipStrategy.java index 525cece96b..370b25e901 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/MappedByRelationshipStrategy.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/MappedByRelationshipStrategy.java @@ -9,8 +9,6 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.context; -import java.util.Iterator; - /** * "Mapped by" relationship strategy * <p> @@ -49,7 +47,7 @@ public interface MappedByRelationshipStrategy /** * Return the possible attribute names the strategy might use. */ - Iterator<String> candidateMappedByAttributeNames(); + Iterable<String> getCandidateMappedByAttributeNames(); /** * Return whether this strategy's relationship is owned by the given other diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/OverrideContainer.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/OverrideContainer.java index 3f582e9b33..b491f2dc0d 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/OverrideContainer.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/OverrideContainer.java @@ -9,7 +9,6 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.context; -import java.util.Iterator; import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; import org.eclipse.jpt.jpa.core.internal.context.BaseColumnTextRangeResolver; import org.eclipse.jpt.jpa.core.internal.context.JptValidator; @@ -59,7 +58,7 @@ public interface OverrideContainer * type mapping. * @see #getOverridableTypeMapping() */ - Iterator<String> allOverridableNames(); + Iterable<String> getAllOverridableNames(); /** * Return whether the specified table cannot be explicitly specified @@ -71,7 +70,7 @@ public interface OverrideContainer * Return the names of tables that are valid for an override's * column or join column. */ - Iterator<String> candidateTableNames(); + Iterable<String> getCandidateTableNames(); /** * Return the database table for the specified table name. @@ -187,9 +186,9 @@ public interface OverrideContainer TypeMapping getOverridableTypeMapping(); /** - * @see OverrideContainer#allOverridableNames() + * @see OverrideContainer#getAllOverridableNames() */ - Iterator<String> allOverridableNames(); + Iterable<String> getAllOverridableNames(); /** * @see OverrideContainer#getDefaultTableName() @@ -207,9 +206,9 @@ public interface OverrideContainer org.eclipse.jpt.jpa.db.Table resolveDbTable(String tableName); /** - * @see OverrideContainer#candidateTableNames() + * @see OverrideContainer#getCandidateTableNames() */ - Iterator<String> candidateTableNames(); + Iterable<String> getCandidateTableNames(); JptValidator buildOverrideValidator(ReadOnlyOverride override, OverrideContainer container, OverrideTextRangeResolver textRangeResolver); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/PersistentType.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/PersistentType.java index adeb788f4c..c2c6d756c7 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/PersistentType.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/PersistentType.java @@ -9,7 +9,6 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.context; -import java.util.Iterator; import java.util.List; import org.eclipse.jdt.core.IPackageFragment; import org.eclipse.jpt.common.core.utility.TextRange; @@ -142,7 +141,7 @@ public interface PersistentType * The returned iterator will return elements infinitely if the hierarchy * has a loop. */ - Iterator<PersistentType> inheritanceHierarchy(); + Iterable<PersistentType> getInheritanceHierarchy(); /** * Return the persistent type's "persistence" inheritance hierarchy, @@ -150,7 +149,7 @@ public interface PersistentType * The returned iterator will return elements infinitely if the hierarchy * has a loop. */ - Iterator<PersistentType> ancestors(); + Iterable<PersistentType> getAncestors(); // ********** validation ********** diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/ReadOnlyBaseColumn.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/ReadOnlyBaseColumn.java index 03d3c921e8..977672f988 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/ReadOnlyBaseColumn.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/ReadOnlyBaseColumn.java @@ -9,8 +9,6 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.context; -import java.util.Iterator; - /** * Read-only @@ -98,7 +96,7 @@ public interface ReadOnlyBaseColumn /** * Return a list of table names that are valid for this column */ - Iterator<String> candidateTableNames(); + Iterable<String> getCandidateTableNames(); // ********** owner ********** @@ -119,6 +117,6 @@ public interface ReadOnlyBaseColumn /** * Return a list of table names that are valid for this column */ - Iterator<String> candidateTableNames(); + Iterable<String> getCandidateTableNames(); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/ReadOnlyOverride.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/ReadOnlyOverride.java index f49749a26e..8b5e26784d 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/ReadOnlyOverride.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/ReadOnlyOverride.java @@ -9,7 +9,6 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.context; -import java.util.Iterator; import org.eclipse.jpt.jpa.core.internal.context.BaseColumnTextRangeResolver; import org.eclipse.jpt.jpa.core.internal.context.JptValidator; import org.eclipse.jpt.jpa.db.Table; @@ -57,7 +56,7 @@ public interface ReadOnlyOverride * Return the names of tables that are valid for the override's * column or join column. */ - Iterator<String> candidateTableNames(); + Iterable<String> getCandidateTableNames(); /** * Return the database table for the specified table name. diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/ReadOnlyOverrideRelationship.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/ReadOnlyOverrideRelationship.java index 8ca8284888..6889075443 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/ReadOnlyOverrideRelationship.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/ReadOnlyOverrideRelationship.java @@ -9,7 +9,6 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.context; -import java.util.Iterator; import org.eclipse.jpt.jpa.core.internal.context.BaseColumnTextRangeResolver; import org.eclipse.jpt.jpa.core.internal.context.JptValidator; import org.eclipse.jpt.jpa.db.Table; @@ -45,7 +44,7 @@ public interface ReadOnlyOverrideRelationship * Return the names of tables that are valid for the relationship's * join column. */ - Iterator<String> candidateTableNames(); + Iterable<String> getCandidateTableNames(); /** * Return the database table for the specified table name. diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/ReadOnlyUniqueConstraint.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/ReadOnlyUniqueConstraint.java index 4273e163ca..74e130a620 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/ReadOnlyUniqueConstraint.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/ReadOnlyUniqueConstraint.java @@ -9,8 +9,6 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.context; -import java.util.Iterator; - /** * Read-only database unique constraint * <p> @@ -46,6 +44,6 @@ public interface ReadOnlyUniqueConstraint * All containers must implement this interface. */ interface Owner { - Iterator<String> candidateUniqueConstraintColumnNames(); + Iterable<String> getCandidateUniqueConstraintColumnNames(); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/RelationshipMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/RelationshipMapping.java index 5bfecd7f7e..16cf97465b 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/RelationshipMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/RelationshipMapping.java @@ -9,8 +9,6 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.context; -import java.util.Iterator; - /** * JPA relationship (1:1, 1:m, m:1, m:m) mapping. * <p> @@ -56,7 +54,7 @@ public interface RelationshipMapping * Return all attribute names on the target entity, provided target entity * resolves */ - Iterator<String> allTargetEntityAttributeNames(); + Iterable<String> getAllTargetEntityAttributeNames(); /** * Return the char to be used for browsing or creating the target entity IType. diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/TypeMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/TypeMapping.java index dea91b312d..827961d571 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/TypeMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/TypeMapping.java @@ -9,7 +9,6 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.context; -import java.util.Iterator; import org.eclipse.jpt.jpa.core.context.java.JavaPersistentType; import org.eclipse.jpt.jpa.db.Schema; @@ -66,7 +65,7 @@ public interface TypeMapping * The returned iterator will return elements infinitely if the hierarchy * has a loop. */ - Iterator<TypeMapping> inheritanceHierarchy(); + Iterable<TypeMapping> getInheritanceHierarchy(); // ********** tables ********** @@ -89,21 +88,21 @@ public interface TypeMapping * Return the type mapping's "associated" tables, which includes the primary * table and the collection of secondary tables. */ - Iterator<ReadOnlyTable> associatedTables(); + Iterable<ReadOnlyTable> getAssociatedTables(); /** * Return the type mapping's "associated" tables, which includes the primary * table and the collection of secondary tables, as well as all inherited * "associated" tables. */ - Iterator<ReadOnlyTable> allAssociatedTables(); + Iterable<ReadOnlyTable> getAllAssociatedTables(); /** * Return the names of the type mapping's "associated" tables, which * includes the primary table and the collection of secondary tables, as * well as all the inherited "associated" tables. */ - Iterator<String> allAssociatedTableNames(); + Iterable<String> getAllAssociatedTableNames(); /** * Return the resolved <em>associated</em> db table with the specified name; @@ -130,7 +129,7 @@ public interface TypeMapping /** * A convenience method for getting the attribute mappings from PersistentType.attributes() */ - <T extends AttributeMapping> Iterator<T> attributeMappings(); + <T extends AttributeMapping> Iterable<T> getAttributeMappings(); /** * Return attribute mappings of a particular mapping type that are declared on this type mapping @@ -141,7 +140,7 @@ public interface TypeMapping * Return all the attribute mappings in the type mapping's * inheritance hierarchy. */ - Iterator<AttributeMapping> allAttributeMappings(); + Iterable<AttributeMapping> getAllAttributeMappings(); /** * Return attribute mappings of a particular mapping type that are declared anywhere on this @@ -168,13 +167,13 @@ public interface TypeMapping * Return an Iterator of attribute names that can be overridden by a * sub type mapping. */ - Iterator<String> overridableAttributeNames(); + Iterable<String> getOverridableAttributeNames(); /** * Return an Iterator of all attribute names that can be overridden in this * type mapping. */ - Iterator<String> allOverridableAttributeNames(); + Iterable<String> getAllOverridableAttributeNames(); /** * Return the column of the overridable attribute mapping (or attribute @@ -192,13 +191,13 @@ public interface TypeMapping * Return an Iterator of associations names that can be overridden in this * type mapping. */ - Iterator<String> overridableAssociationNames(); + Iterable<String> getOverridableAssociationNames(); /** * Return an Iterator of all associations names that can be overridden in this * type mapping. */ - Iterator<String> allOverridableAssociationNames(); + Iterable<String> getAllOverridableAssociationNames(); Relationship resolveOverriddenRelationship(String attributeName); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaJpaContextNode.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaJpaContextNode.java index ff33b25ef8..068f576114 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaJpaContextNode.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaJpaContextNode.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2010 Oracle. All rights reserved. + * Copyright (c) 2007, 2011 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html. @@ -9,7 +9,6 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.context.java; -import java.util.Iterator; import java.util.List; import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.common.core.utility.TextRange; @@ -37,7 +36,7 @@ public interface JavaJpaContextNode * Return the Java code-completion proposals for the specified position * in the source code. */ - Iterator<String> javaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot); + Iterable<String> getJavaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot); // ********** validation ********** diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaTypeMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaTypeMapping.java index 0578698820..c03af30914 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaTypeMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaTypeMapping.java @@ -9,7 +9,6 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.context.java; -import java.util.Iterator; import org.eclipse.jpt.common.core.resource.java.Annotation; import org.eclipse.jpt.common.core.resource.java.JavaResourceType; import org.eclipse.jpt.jpa.core.context.TypeMapping; @@ -39,7 +38,7 @@ public interface JavaTypeMapping JavaPersistentType getPersistentType(); @SuppressWarnings("unchecked") - Iterator<JavaAttributeMapping> attributeMappings(); + Iterable<JavaAttributeMapping> getAttributeMappings(); @SuppressWarnings("unchecked") Iterable<JavaAttributeMapping> getAttributeMappings(String mappingKey); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/AttributeMappingTools.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/AttributeMappingTools.java index ea6a5dbdb9..796cb0e144 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/AttributeMappingTools.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/AttributeMappingTools.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2006, 2010 Oracle. All rights reserved. + * Copyright (c) 2006, 2011 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html. @@ -9,7 +9,6 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.internal.context; -import java.util.Iterator; import org.eclipse.jpt.common.utility.internal.Transformer; import org.eclipse.jpt.jpa.core.context.AttributeMapping; @@ -21,36 +20,36 @@ public final class AttributeMappingTools // ********** all mapping names transformer ********** - public static final Transformer<AttributeMapping, Iterator<String>> ALL_MAPPING_NAMES_TRANSFORMER = new AllMappingNamesTransformer(); + public static final Transformer<AttributeMapping, Iterable<String>> ALL_MAPPING_NAMES_TRANSFORMER = new AllMappingNamesTransformer(); static class AllMappingNamesTransformer - implements Transformer<AttributeMapping, Iterator<String>> + implements Transformer<AttributeMapping, Iterable<String>> { - public Iterator<String> transform(AttributeMapping mapping) { - return mapping.allMappingNames(); + public Iterable<String> transform(AttributeMapping mapping) { + return mapping.getAllMappingNames(); } } // ********** all overridable attribute mapping names transformer ********** - public static final Transformer<AttributeMapping, Iterator<String>> ALL_OVERRIDABLE_ATTRIBUTE_MAPPING_NAMES_TRANSFORMER = new AllOverridableAttributeMappingNamesTransformer(); + public static final Transformer<AttributeMapping, Iterable<String>> ALL_OVERRIDABLE_ATTRIBUTE_MAPPING_NAMES_TRANSFORMER = new AllOverridableAttributeMappingNamesTransformer(); static class AllOverridableAttributeMappingNamesTransformer - implements Transformer<AttributeMapping, Iterator<String>> + implements Transformer<AttributeMapping, Iterable<String>> { - public Iterator<String> transform(AttributeMapping mapping) { - return mapping.allOverridableAttributeMappingNames(); + public Iterable<String> transform(AttributeMapping mapping) { + return mapping.getAllOverridableAttributeMappingNames(); } } // ********** all overridable association mapping names transformer ********** - public static final Transformer<AttributeMapping, Iterator<String>> ALL_OVERRIDABLE_ASSOCIATION_MAPPING_NAMES_TRANSFORMER = new AllOverridableAssociationMappingNamesTransformer(); + public static final Transformer<AttributeMapping, Iterable<String>> ALL_OVERRIDABLE_ASSOCIATION_MAPPING_NAMES_TRANSFORMER = new AllOverridableAssociationMappingNamesTransformer(); static class AllOverridableAssociationMappingNamesTransformer - implements Transformer<AttributeMapping, Iterator<String>> + implements Transformer<AttributeMapping, Iterable<String>> { - public Iterator<String> transform(AttributeMapping mapping) { - return mapping.allOverridableAssociationMappingNames(); + public Iterable<String> transform(AttributeMapping mapping) { + return mapping.getAllOverridableAssociationMappingNames(); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/MappingTools.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/MappingTools.java index cf7add0a1e..93c14529e3 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/MappingTools.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/MappingTools.java @@ -9,8 +9,6 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.internal.context; -import java.util.Iterator; -import org.eclipse.jpt.common.utility.internal.CollectionTools; import org.eclipse.jpt.common.utility.internal.StringTools; import org.eclipse.jpt.common.utility.internal.Transformer; import org.eclipse.jpt.jpa.core.context.AttributeMapping; @@ -233,8 +231,7 @@ public final class MappingTools { if ((attributeName == null) || (typeMapping == null)) { return null; } - for (Iterator<AttributeMapping> stream = typeMapping.allAttributeMappings(); stream.hasNext(); ) { - AttributeMapping attributeMapping = stream.next(); + for (AttributeMapping attributeMapping : typeMapping.getAllAttributeMappings()) { if (attributeName.equals(attributeMapping.getName())) { if (attributeMapping instanceof RelationshipMapping) { return (RelationshipMapping) attributeMapping; @@ -292,7 +289,7 @@ public final class MappingTools { return null; } - for (TypeMapping typeMapping : CollectionTools.iterable(overridableTypeMapping.inheritanceHierarchy())) { + for (TypeMapping typeMapping : overridableTypeMapping.getInheritanceHierarchy()) { Column column = typeMapping.resolveOverriddenColumn(attributeName); if (column != null) { return column; @@ -308,7 +305,7 @@ public final class MappingTools { return null; } - for (TypeMapping typeMapping : CollectionTools.iterable(overridableTypeMapping.inheritanceHierarchy())) { + for (TypeMapping typeMapping : overridableTypeMapping.getInheritanceHierarchy()) { Relationship relationship = typeMapping.resolveOverriddenRelationship(attributeName); if (relationship != null) { return relationship; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/TypeMappingTools.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/TypeMappingTools.java index c558a733d8..f9b0287c3a 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/TypeMappingTools.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/TypeMappingTools.java @@ -9,7 +9,6 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.internal.context; -import java.util.Iterator; import org.eclipse.jpt.common.utility.internal.CollectionTools; import org.eclipse.jpt.common.utility.internal.Transformer; import org.eclipse.jpt.common.utility.internal.iterables.CompositeIterable; @@ -118,48 +117,48 @@ public class TypeMappingTools { // ********** attribute mappings transformer ********** - public static final Transformer<TypeMapping, Iterator<AttributeMapping>> ATTRIBUTE_MAPPINGS_TRANSFORMER = new AttributeMappingsTransformer(); + public static final Transformer<TypeMapping, Iterable<AttributeMapping>> ATTRIBUTE_MAPPINGS_TRANSFORMER = new AttributeMappingsTransformer(); static class AttributeMappingsTransformer - implements Transformer<TypeMapping, Iterator<AttributeMapping>> + implements Transformer<TypeMapping, Iterable<AttributeMapping>> { - public Iterator<AttributeMapping> transform(TypeMapping mapping) { - return mapping.attributeMappings(); + public Iterable<AttributeMapping> transform(TypeMapping mapping) { + return mapping.getAttributeMappings(); } } // ********** associated tables transformer ********** - public static final Transformer<TypeMapping, Iterator<ReadOnlyTable>> ASSOCIATED_TABLES_TRANSFORMER = new AssociatedTablesTransformer(); + public static final Transformer<TypeMapping, Iterable<ReadOnlyTable>> ASSOCIATED_TABLES_TRANSFORMER = new AssociatedTablesTransformer(); static class AssociatedTablesTransformer - implements Transformer<TypeMapping, Iterator<ReadOnlyTable>> + implements Transformer<TypeMapping, Iterable<ReadOnlyTable>> { - public Iterator<ReadOnlyTable> transform(TypeMapping mapping) { - return mapping.associatedTables(); + public Iterable<ReadOnlyTable> transform(TypeMapping mapping) { + return mapping.getAssociatedTables(); } } // ********** overridable attribute names transformer ********** - public static final Transformer<TypeMapping, Iterator<String>> OVERRIDABLE_ATTRIBUTE_NAMES_TRANSFORMER = new OverridableAttributeNamesTransformer(); + public static final Transformer<TypeMapping, Iterable<String>> OVERRIDABLE_ATTRIBUTE_NAMES_TRANSFORMER = new OverridableAttributeNamesTransformer(); static class OverridableAttributeNamesTransformer - implements Transformer<TypeMapping, Iterator<String>> + implements Transformer<TypeMapping, Iterable<String>> { - public Iterator<String> transform(TypeMapping mapping) { - return mapping.overridableAttributeNames(); + public Iterable<String> transform(TypeMapping mapping) { + return mapping.getOverridableAttributeNames(); } } // ********** overridable association names transformer ********** - public static final Transformer<TypeMapping, Iterator<String>> OVERRIDABLE_ASSOCIATION_NAMES_TRANSFORMER = new OverridableAssociationNamesTransformer(); + public static final Transformer<TypeMapping, Iterable<String>> OVERRIDABLE_ASSOCIATION_NAMES_TRANSFORMER = new OverridableAssociationNamesTransformer(); static class OverridableAssociationNamesTransformer - implements Transformer<TypeMapping, Iterator<String>> + implements Transformer<TypeMapping, Iterable<String>> { - public Iterator<String> transform(TypeMapping mapping) { - return mapping.overridableAssociationNames(); + public Iterable<String> transform(TypeMapping mapping) { + return mapping.getOverridableAssociationNames(); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaAttributeMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaAttributeMapping.java index d1cfdbf5aa..949ba1c367 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaAttributeMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaAttributeMapping.java @@ -10,15 +10,14 @@ package org.eclipse.jpt.jpa.core.internal.context.java; import java.util.ArrayList; -import java.util.Iterator; import java.util.List; import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.common.core.resource.java.Annotation; import org.eclipse.jpt.common.core.resource.java.JavaResourceAttribute; import org.eclipse.jpt.common.core.utility.TextRange; import org.eclipse.jpt.common.utility.internal.Transformer; -import org.eclipse.jpt.common.utility.internal.iterators.EmptyIterator; -import org.eclipse.jpt.common.utility.internal.iterators.SingleElementIterator; +import org.eclipse.jpt.common.utility.internal.iterables.EmptyIterable; +import org.eclipse.jpt.common.utility.internal.iterables.SingleElementIterable; import org.eclipse.jpt.jpa.core.context.AttributeMapping; import org.eclipse.jpt.jpa.core.context.Column; import org.eclipse.jpt.jpa.core.context.ColumnMapping; @@ -193,20 +192,20 @@ public abstract class AbstractJavaAttributeMapping<A extends Annotation> // ********** embedded mappings ********** - public Iterator<String> allMappingNames() { - return new SingleElementIterator<String>(this.getName()); + public Iterable<String> getAllMappingNames() { + return new SingleElementIterable<String>(this.getName()); } - public Iterator<String> allOverridableAttributeMappingNames() { + public Iterable<String> getAllOverridableAttributeMappingNames() { return this.isOverridableAttributeMapping() ? - new SingleElementIterator<String>(this.getName()) : - EmptyIterator.<String>instance(); + new SingleElementIterable<String>(this.getName()) : + EmptyIterable.<String>instance(); } - public Iterator<String> allOverridableAssociationMappingNames() { + public Iterable<String> getAllOverridableAssociationMappingNames() { return this.isOverridableAssociationMapping() ? - new SingleElementIterator<String>(this.getName()) : - EmptyIterator.<String>instance(); + new SingleElementIterable<String>(this.getName()) : + EmptyIterable.<String>instance(); } public Column resolveOverriddenColumn(String attributeName) { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaBaseColumn.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaBaseColumn.java index 9107d3e04c..f0199d6275 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaBaseColumn.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaBaseColumn.java @@ -9,12 +9,11 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.internal.context.java; -import java.util.Iterator; import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.common.core.utility.TextRange; import org.eclipse.jpt.common.utility.Filter; import org.eclipse.jpt.common.utility.internal.StringTools; -import org.eclipse.jpt.common.utility.internal.iterators.FilteringIterator; +import org.eclipse.jpt.common.utility.internal.iterables.FilteringIterable; import org.eclipse.jpt.jpa.core.context.ReadOnlyBaseColumn; import org.eclipse.jpt.jpa.core.context.java.JavaBaseColumn; import org.eclipse.jpt.jpa.core.context.java.JavaJpaContextNode; @@ -323,13 +322,13 @@ public abstract class AbstractJavaBaseColumn<A extends BaseColumnAnnotation, O e // ********** Java completion proposals ********** @Override - public Iterator<String> javaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) { - Iterator<String> result = super.javaCompletionProposals(pos, filter, astRoot); + public Iterable<String> getJavaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) { + Iterable<String> result = super.getJavaCompletionProposals(pos, filter, astRoot); if (result != null) { return result; } if (this.tableTouches(pos, astRoot)) { - return this.javaCandidateTableNames(filter); + return this.getJavaCandidateTableNames(filter); } return null; } @@ -338,16 +337,16 @@ public abstract class AbstractJavaBaseColumn<A extends BaseColumnAnnotation, O e return this.getColumnAnnotation().tableTouches(pos, astRoot); } - protected Iterator<String> javaCandidateTableNames(Filter<String> filter) { - return StringTools.convertToJavaStringLiterals(this.candidateTableNames(filter)); + protected Iterable<String> getJavaCandidateTableNames(Filter<String> filter) { + return StringTools.convertToJavaStringLiterals(this.getCandidateTableNames(filter)); } - protected Iterator<String> candidateTableNames(Filter<String> filter) { - return new FilteringIterator<String>(this.candidateTableNames(), filter); + protected Iterable<String> getCandidateTableNames(Filter<String> filter) { + return new FilteringIterable<String>(this.getCandidateTableNames(), filter); } - public Iterator<String> candidateTableNames() { - return this.owner.candidateTableNames(); + public Iterable<String> getCandidateTableNames() { + return this.owner.getCandidateTableNames(); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaBaseEmbeddedMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaBaseEmbeddedMapping.java index 1ae854a3cd..76bac34d47 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaBaseEmbeddedMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaBaseEmbeddedMapping.java @@ -9,7 +9,6 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.internal.context.java; -import java.util.Iterator; import java.util.List; import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.common.core.resource.java.Annotation; @@ -17,9 +16,9 @@ import org.eclipse.jpt.common.core.resource.java.JavaResourceMember; import org.eclipse.jpt.common.core.utility.TextRange; import org.eclipse.jpt.common.utility.Filter; import org.eclipse.jpt.common.utility.internal.Transformer; -import org.eclipse.jpt.common.utility.internal.iterators.CompositeIterator; -import org.eclipse.jpt.common.utility.internal.iterators.EmptyIterator; -import org.eclipse.jpt.common.utility.internal.iterators.TransformationIterator; +import org.eclipse.jpt.common.utility.internal.iterables.CompositeIterable; +import org.eclipse.jpt.common.utility.internal.iterables.EmptyIterable; +import org.eclipse.jpt.common.utility.internal.iterables.TransformationIterable; import org.eclipse.jpt.jpa.core.context.AttributeMapping; import org.eclipse.jpt.jpa.core.context.AttributeOverride; import org.eclipse.jpt.jpa.core.context.AttributeOverrideContainer; @@ -117,33 +116,33 @@ public abstract class AbstractJavaBaseEmbeddedMapping<A extends Annotation> // ********** embedded mappings ********** @Override - public Iterator<String> allOverridableAttributeMappingNames() { + public Iterable<String> getAllOverridableAttributeMappingNames() { return this.isJpa2_0Compatible() ? - this.embeddableOverridableAttributeMappingNames() : - super.allOverridableAttributeMappingNames(); + this.getEmbeddableOverridableAttributeMappingNames() : + super.getAllOverridableAttributeMappingNames(); } - protected Iterator<String> embeddableOverridableAttributeMappingNames() { - return this.qualifiedEmbeddableOverridableMappingNames(AttributeMappingTools.ALL_OVERRIDABLE_ATTRIBUTE_MAPPING_NAMES_TRANSFORMER); + protected Iterable<String> getEmbeddableOverridableAttributeMappingNames() { + return this.getQualifiedEmbeddableOverridableMappingNames(AttributeMappingTools.ALL_OVERRIDABLE_ATTRIBUTE_MAPPING_NAMES_TRANSFORMER); } @Override - public Iterator<String> allOverridableAssociationMappingNames() { + public Iterable<String> getAllOverridableAssociationMappingNames() { return this.isJpa2_0Compatible() ? - this.embeddableOverridableAssociationMappingNames() : - super.allOverridableAssociationMappingNames(); + this.getEmbeddableOverridableAssociationMappingNames() : + super.getAllOverridableAssociationMappingNames(); } - protected Iterator<String> embeddableOverridableAssociationMappingNames() { - return this.qualifiedEmbeddableOverridableMappingNames(AttributeMappingTools.ALL_OVERRIDABLE_ASSOCIATION_MAPPING_NAMES_TRANSFORMER); + protected Iterable<String> getEmbeddableOverridableAssociationMappingNames() { + return this.getQualifiedEmbeddableOverridableMappingNames(AttributeMappingTools.ALL_OVERRIDABLE_ASSOCIATION_MAPPING_NAMES_TRANSFORMER); } - protected Iterator<String> qualifiedEmbeddableOverridableMappingNames(Transformer<AttributeMapping, Iterator<String>> transformer) { - return new TransformationIterator<String, String>(this.embeddableAttributeMappingNames(transformer), this.buildQualifierTransformer()); + protected Iterable<String> getQualifiedEmbeddableOverridableMappingNames(Transformer<AttributeMapping, Iterable<String>> transformer) { + return new TransformationIterable<String, String>(this.getEmbeddableAttributeMappingNames(transformer), this.buildQualifierTransformer()); } - protected Iterator<String> embeddableAttributeMappingNames(Transformer<AttributeMapping, Iterator<String>> transformer) { - return new CompositeIterator<String>(this.embeddableAttributeMappingNamesLists(transformer)); + protected Iterable<String> getEmbeddableAttributeMappingNames(Transformer<AttributeMapping, Iterable<String>> transformer) { + return new CompositeIterable<String>(this.getEmbeddableAttributeMappingNamesLists(transformer)); } /** @@ -151,17 +150,17 @@ public abstract class AbstractJavaBaseEmbeddedMapping<A extends Annotation> * embedded mapping's target embeddable type mapping's attribute mappings * (attribute or association mappings, depending on the specified transformer). */ - protected Iterator<Iterator<String>> embeddableAttributeMappingNamesLists(Transformer<AttributeMapping, Iterator<String>> transformer) { - return new TransformationIterator<AttributeMapping, Iterator<String>>(this.embeddableAttributeMappings(), transformer); + protected Iterable<Iterable<String>> getEmbeddableAttributeMappingNamesLists(Transformer<AttributeMapping, Iterable<String>> transformer) { + return new TransformationIterable<AttributeMapping, Iterable<String>>(this.getEmbeddableAttributeMappings(), transformer); } /** * Return the target embeddable's attribute mappings. */ - protected Iterator<AttributeMapping> embeddableAttributeMappings() { + protected Iterable<AttributeMapping> getEmbeddableAttributeMappings() { return ((this.targetEmbeddable != null) && (this.targetEmbeddable != this.getTypeMapping())) ? - this.targetEmbeddable.attributeMappings() : - EmptyIterator.<AttributeMapping>instance(); + this.targetEmbeddable.getAttributeMappings() : + EmptyIterable.<AttributeMapping>instance(); } @@ -190,13 +189,13 @@ public abstract class AbstractJavaBaseEmbeddedMapping<A extends Annotation> // ********** Java completion proposals ********** @Override - public Iterator<String> javaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) { - Iterator<String> result = super.javaCompletionProposals(pos, filter, astRoot); + public Iterable<String> getJavaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) { + Iterable<String> result = super.getJavaCompletionProposals(pos, filter, astRoot); if (result != null) { return result; } - result = this.attributeOverrideContainer.javaCompletionProposals(pos, filter, astRoot); + result = this.attributeOverrideContainer.getJavaCompletionProposals(pos, filter, astRoot); if (result != null) { return result; } @@ -257,9 +256,9 @@ public abstract class AbstractJavaBaseEmbeddedMapping<A extends Annotation> return AbstractJavaBaseEmbeddedMapping.this.getTargetEmbeddable(); } - public Iterator<String> allOverridableNames() { + public Iterable<String> getAllOverridableNames() { TypeMapping overriddenTypeMapping = this.getOverridableTypeMapping(); - return (overriddenTypeMapping != null) ? this.allOverridableAttributeNames_(overriddenTypeMapping) : EmptyIterator.<String>instance(); + return (overriddenTypeMapping != null) ? this.getAllOverridableAttributeNames_(overriddenTypeMapping) : EmptyIterable.<String>instance(); } /** @@ -267,8 +266,8 @@ public abstract class AbstractJavaBaseEmbeddedMapping<A extends Annotation> * <p> * NB: Overridden in {@link GenericJavaEmbeddedIdMapping.AttributeOverrideContainerOwner} */ - protected Iterator<String> allOverridableAttributeNames_(TypeMapping overriddenTypeMapping) { - return overriddenTypeMapping.allOverridableAttributeNames(); + protected Iterable<String> getAllOverridableAttributeNames_(TypeMapping overriddenTypeMapping) { + return overriddenTypeMapping.getAllOverridableAttributeNames(); } public Column resolveOverriddenColumn(String attributeName) { @@ -279,8 +278,8 @@ public abstract class AbstractJavaBaseEmbeddedMapping<A extends Annotation> return this.getTypeMapping().tableNameIsInvalid(tableName); } - public Iterator<String> candidateTableNames() { - return this.getTypeMapping().allAssociatedTableNames(); + public Iterable<String> getCandidateTableNames() { + return this.getTypeMapping().getAllAssociatedTableNames(); } public Table resolveDbTable(String tableName) { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaBasicMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaBasicMapping.java index 56c7ce458b..be2893ecb6 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaBasicMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaBasicMapping.java @@ -9,7 +9,6 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.internal.context.java; -import java.util.Iterator; import java.util.List; import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.common.core.resource.java.Annotation; @@ -343,8 +342,8 @@ public abstract class AbstractJavaBasicMapping return this.getTypeMapping().tableNameIsInvalid(tableName); } - public Iterator<String> candidateTableNames() { - return this.getTypeMapping().allAssociatedTableNames(); + public Iterable<String> getCandidateTableNames() { + return this.getTypeMapping().getAllAssociatedTableNames(); } public JptValidator buildColumnValidator(ReadOnlyNamedColumn col, NamedColumnTextRangeResolver textRangeResolver) { @@ -355,16 +354,16 @@ public abstract class AbstractJavaBasicMapping // ********** Java completion proposals ********** @Override - public Iterator<String> javaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) { - Iterator<String> result = super.javaCompletionProposals(pos, filter, astRoot); + public Iterable<String> getJavaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) { + Iterable<String> result = super.getJavaCompletionProposals(pos, filter, astRoot); if (result != null) { return result; } - result = this.column.javaCompletionProposals(pos, filter, astRoot); + result = this.column.getJavaCompletionProposals(pos, filter, astRoot); if (result != null) { return result; } - result = this.converter.javaCompletionProposals(pos, filter, astRoot); + result = this.converter.getJavaCompletionProposals(pos, filter, astRoot); if (result != null) { return result; } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaEntity.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaEntity.java index c4e9df0dcd..684ccbfe3e 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaEntity.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaEntity.java @@ -9,7 +9,6 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.internal.context.java; -import java.util.HashSet; import java.util.Iterator; import java.util.List; import java.util.Vector; @@ -24,6 +23,7 @@ import org.eclipse.jpt.common.utility.internal.NotNullFilter; import org.eclipse.jpt.common.utility.internal.StringTools; import org.eclipse.jpt.common.utility.internal.Tools; import org.eclipse.jpt.common.utility.internal.iterables.CompositeIterable; +import org.eclipse.jpt.common.utility.internal.iterables.EmptyIterable; import org.eclipse.jpt.common.utility.internal.iterables.EmptyListIterable; import org.eclipse.jpt.common.utility.internal.iterables.FilteringIterable; import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; @@ -31,10 +31,6 @@ import org.eclipse.jpt.common.utility.internal.iterables.LiveCloneListIterable; import org.eclipse.jpt.common.utility.internal.iterables.SingleElementListIterable; import org.eclipse.jpt.common.utility.internal.iterables.SubListIterableWrapper; import org.eclipse.jpt.common.utility.internal.iterables.TransformationIterable; -import org.eclipse.jpt.common.utility.internal.iterators.CompositeIterator; -import org.eclipse.jpt.common.utility.internal.iterators.EmptyIterator; -import org.eclipse.jpt.common.utility.internal.iterators.FilteringIterator; -import org.eclipse.jpt.common.utility.internal.iterators.TransformationIterator; import org.eclipse.jpt.jpa.core.JpaPlatformVariation.Supported; import org.eclipse.jpt.jpa.core.MappingKeys; import org.eclipse.jpt.jpa.core.context.AssociationOverride; @@ -951,33 +947,22 @@ public abstract class AbstractJavaEntity // ********** associated tables ********** @Override - public Iterator<ReadOnlyTable> associatedTables() { - return this.getAssociatedTables().iterator(); - } - public Iterable<ReadOnlyTable> getAssociatedTables() { return new CompositeIterable<ReadOnlyTable>(this.table, this.getSecondaryTables()); } - @Override - public Iterator<ReadOnlyTable> allAssociatedTables() { - return new CompositeIterator<ReadOnlyTable>(this.allAssociatedTablesLists()); - } + @Override public Iterable<ReadOnlyTable> getAllAssociatedTables() { - return CollectionTools.iterable(this.allAssociatedTables()); + return new CompositeIterable<ReadOnlyTable>(this.allAssociatedTablesLists()); } // TODO eliminate duplicate tables? - protected Iterator<Iterator<ReadOnlyTable>> allAssociatedTablesLists() { - return new TransformationIterator<TypeMapping, Iterator<ReadOnlyTable>>(this.inheritanceHierarchy(), TypeMappingTools.ASSOCIATED_TABLES_TRANSFORMER); + protected Iterable<Iterable<ReadOnlyTable>> allAssociatedTablesLists() { + return new TransformationIterable<TypeMapping, Iterable<ReadOnlyTable>>(this.getInheritanceHierarchy(), TypeMappingTools.ASSOCIATED_TABLES_TRANSFORMER); } @Override - public Iterator<String> allAssociatedTableNames() { - return this.getAllAssociatedTableNames().iterator(); - } - public Iterable<String> getAllAssociatedTableNames() { return this.convertToNames(this.getAllAssociatedTables()); } @@ -1095,21 +1080,21 @@ public abstract class AbstractJavaEntity } @Override - public Iterator<String> overridableAttributeNames() { + public Iterable<String> getOverridableAttributeNames() { return this.isTablePerClass() ? - super.overridableAttributeNames() : - EmptyIterator.<String>instance(); + super.getOverridableAttributeNames() : + EmptyIterable.<String>instance(); } @Override - public Iterator<String> overridableAssociationNames() { + public Iterable<String> getOverridableAssociationNames() { return this.isTablePerClass() ? - super.overridableAssociationNames() : - EmptyIterator.<String>instance(); + super.getOverridableAssociationNames() : + EmptyIterable.<String>instance(); } public AttributeMapping resolveAttributeMapping(String name) { - for (AttributeMapping attributeMapping : CollectionTools.iterable(this.allAttributeMappings())) { + for (AttributeMapping attributeMapping : this.getAllAttributeMappings()) { AttributeMapping resolvedMapping = attributeMapping.resolveAttributeMapping(name); if (resolvedMapping != null) { return resolvedMapping; @@ -1217,40 +1202,40 @@ public abstract class AbstractJavaEntity // ********** Java completion proposals ********** @Override - public Iterator<String> javaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) { - Iterator<String> result = super.javaCompletionProposals(pos, filter, astRoot); + public Iterable<String> getJavaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) { + Iterable<String> result = super.getJavaCompletionProposals(pos, filter, astRoot); if (result != null) { return result; } - result = this.table.javaCompletionProposals(pos, filter, astRoot); + result = this.table.getJavaCompletionProposals(pos, filter, astRoot); if (result != null) { return result; } for (JavaSecondaryTable secondaryTable : this.getSecondaryTables()) { - result = secondaryTable.javaCompletionProposals(pos, filter, astRoot); + result = secondaryTable.getJavaCompletionProposals(pos, filter, astRoot); if (result != null) { return result; } } for (JavaPrimaryKeyJoinColumn pkJoinColumn : this.getPrimaryKeyJoinColumns()) { - result = pkJoinColumn.javaCompletionProposals(pos, filter, astRoot); + result = pkJoinColumn.getJavaCompletionProposals(pos, filter, astRoot); if (result != null) { return result; } } - result = this.attributeOverrideContainer.javaCompletionProposals(pos, filter, astRoot); + result = this.attributeOverrideContainer.getJavaCompletionProposals(pos, filter, astRoot); if (result != null) { return result; } - result = this.associationOverrideContainer.javaCompletionProposals(pos, filter, astRoot); + result = this.associationOverrideContainer.getJavaCompletionProposals(pos, filter, astRoot); if (result != null) { return result; } - result = this.discriminatorColumn.javaCompletionProposals(pos, filter, astRoot); + result = this.discriminatorColumn.getJavaCompletionProposals(pos, filter, astRoot); if (result != null) { return result; } - result = this.generatorContainer.javaCompletionProposals(pos, filter, astRoot); + result = this.generatorContainer.getJavaCompletionProposals(pos, filter, astRoot); if (result != null) { return result; } @@ -1485,15 +1470,15 @@ public abstract class AbstractJavaEntity return AbstractJavaEntity.this.getOverridableTypeMapping(); } - public Iterator<String> allOverridableNames() { + public Iterable<String> getAllOverridableNames() { TypeMapping overriddenTypeMapping = this.getOverridableTypeMapping(); - return (overriddenTypeMapping != null) ? this.allOverridableNames_(overriddenTypeMapping) : EmptyIterator.<String>instance(); + return (overriddenTypeMapping != null) ? this.getAllOverridableNames_(overriddenTypeMapping) : EmptyIterable.<String>instance(); } /** * pre-condition: <code>typeMapping</code> is not <code>null</code> */ - protected abstract Iterator<String> allOverridableNames_(TypeMapping overriddenTypeMapping); + protected abstract Iterable<String> getAllOverridableNames_(TypeMapping overriddenTypeMapping); public String getDefaultTableName() { return AbstractJavaEntity.this.getPrimaryTableName(); @@ -1507,8 +1492,8 @@ public abstract class AbstractJavaEntity return AbstractJavaEntity.this.resolveDbTable(tableName); } - public Iterator<String> candidateTableNames() { - return AbstractJavaEntity.this.allAssociatedTableNames(); + public Iterable<String> getCandidateTableNames() { + return AbstractJavaEntity.this.getAllAssociatedTableNames(); } public String getPossiblePrefix() { @@ -1534,8 +1519,8 @@ public abstract class AbstractJavaEntity implements JavaAttributeOverrideContainer2_0.Owner { @Override - protected Iterator<String> allOverridableNames_(TypeMapping overriddenTypeMapping) { - return new FilteringIterator<String>(overriddenTypeMapping.allOverridableAttributeNames()) { + protected Iterable<String> getAllOverridableNames_(TypeMapping overriddenTypeMapping) { + return new FilteringIterable<String>(overriddenTypeMapping.getAllOverridableAttributeNames()) { @Override protected boolean accept(String attributeName) { return ! AttributeOverrideContainerOwner.this.getTypeMapping().attributeIsDerivedId(attributeName); @@ -1564,8 +1549,8 @@ public abstract class AbstractJavaEntity implements JavaAssociationOverrideContainer2_0.Owner { @Override - protected Iterator<String> allOverridableNames_(TypeMapping overriddenTypeMapping) { - return overriddenTypeMapping.allOverridableAssociationNames(); + protected Iterable<String> getAllOverridableNames_(TypeMapping overriddenTypeMapping) { + return overriddenTypeMapping.getAllOverridableAssociationNames(); } public Relationship resolveOverriddenRelationship(String attributeName) { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaIdMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaIdMapping.java index 43b365a49d..4aeb7d87a4 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaIdMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaIdMapping.java @@ -9,7 +9,6 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.internal.context.java; -import java.util.Iterator; import java.util.List; import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.common.core.resource.java.Annotation; @@ -379,8 +378,8 @@ public abstract class AbstractJavaIdMapping return this.getTypeMapping().tableNameIsInvalid(tableName); } - public Iterator<String> candidateTableNames() { - return this.getTypeMapping().allAssociatedTableNames(); + public Iterable<String> getCandidateTableNames() { + return this.getTypeMapping().getAllAssociatedTableNames(); } public JptValidator buildColumnValidator(ReadOnlyNamedColumn col, NamedColumnTextRangeResolver textRangeResolver) { @@ -391,30 +390,30 @@ public abstract class AbstractJavaIdMapping // ********** Java completion proposals ********** @Override - public Iterator<String> javaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) { - Iterator<String> result = super.javaCompletionProposals(pos, filter, astRoot); + public Iterable<String> getJavaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) { + Iterable<String> result = super.getJavaCompletionProposals(pos, filter, astRoot); if (result != null) { return result; } - result = this.column.javaCompletionProposals(pos, filter, astRoot); + result = this.column.getJavaCompletionProposals(pos, filter, astRoot); if (result != null) { return result; } - result = this.generatorContainer.javaCompletionProposals(pos, filter, astRoot); + result = this.generatorContainer.getJavaCompletionProposals(pos, filter, astRoot); if (result != null) { return result; } if (this.generatedValue != null) { - result = this.generatedValue.javaCompletionProposals(pos, filter, astRoot); + result = this.generatedValue.getJavaCompletionProposals(pos, filter, astRoot); if (result != null) { return result; } } - result = this.converter.javaCompletionProposals(pos, filter, astRoot); + result = this.converter.getJavaCompletionProposals(pos, filter, astRoot); if (result != null) { return result; } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaJoinColumnRelationshipStrategy.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaJoinColumnRelationshipStrategy.java index ab501c9bcf..6f63acc7c9 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaJoinColumnRelationshipStrategy.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaJoinColumnRelationshipStrategy.java @@ -9,14 +9,13 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.internal.context.java; -import java.util.Iterator; import java.util.List; import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.common.utility.Filter; +import org.eclipse.jpt.common.utility.internal.iterables.EmptyIterable; import org.eclipse.jpt.common.utility.internal.iterables.EmptyListIterable; import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; import org.eclipse.jpt.common.utility.internal.iterables.SingleElementListIterable; -import org.eclipse.jpt.common.utility.internal.iterators.EmptyIterator; import org.eclipse.jpt.jpa.core.context.JoinColumn; import org.eclipse.jpt.jpa.core.context.ReadOnlyJoinColumn; import org.eclipse.jpt.jpa.core.context.ReadOnlyJoinColumnRelationshipStrategy; @@ -260,9 +259,9 @@ public abstract class AbstractJavaJoinColumnRelationshipStrategy return (relationshipTarget == null) ? null : relationshipTarget.getPrimaryDbTable(); } - protected Iterator<String> candidateTableNames() { + protected Iterable<String> getCandidateTableNames() { TypeMapping typeMapping = this.getRelationshipSource(); - return (typeMapping != null) ? typeMapping.allAssociatedTableNames() : EmptyIterator.<String>instance(); + return (typeMapping != null) ? typeMapping.getAllAssociatedTableNames() : EmptyIterable.<String>instance(); } public void addStrategy() { @@ -281,13 +280,13 @@ public abstract class AbstractJavaJoinColumnRelationshipStrategy // ********** Java completion proposals ********** @Override - public Iterator<String> javaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) { - Iterator<String> result = super.javaCompletionProposals(pos, filter, astRoot); + public Iterable<String> getJavaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) { + Iterable<String> result = super.getJavaCompletionProposals(pos, filter, astRoot); if (result != null) { return result; } for (JavaJoinColumn joinColumn : this.getJoinColumns()) { - result = joinColumn.javaCompletionProposals(pos, filter, astRoot); + result = joinColumn.getJavaCompletionProposals(pos, filter, astRoot); if (result != null) { return result; } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaJoinTableRelationshipStrategy.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaJoinTableRelationshipStrategy.java index 4d21f98269..2b5f2622d9 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaJoinTableRelationshipStrategy.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaJoinTableRelationshipStrategy.java @@ -9,7 +9,6 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.internal.context.java; -import java.util.Iterator; import java.util.List; import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.common.utility.Filter; @@ -172,13 +171,13 @@ public abstract class AbstractJavaJoinTableRelationshipStrategy // ********** Java completion proposals ********** @Override - public Iterator<String> javaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) { - Iterator<String> result = super.javaCompletionProposals(pos, filter, astRoot); + public Iterable<String> getJavaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) { + Iterable<String> result = super.getJavaCompletionProposals(pos, filter, astRoot); if (result != null) { return result; } if (this.joinTable != null) { - result = this.joinTable.javaCompletionProposals(pos, filter, astRoot); + result = this.joinTable.getJavaCompletionProposals(pos, filter, astRoot); } return result; } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaJpaContextNode.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaJpaContextNode.java index 2227ae5256..965f34f8f2 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaJpaContextNode.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaJpaContextNode.java @@ -9,7 +9,6 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.internal.context.java; -import java.util.Iterator; import java.util.List; import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.common.core.JptCommonCorePlugin; @@ -36,9 +35,9 @@ public abstract class AbstractJavaJpaContextNode return JptCommonCorePlugin.JAVA_SOURCE_RESOURCE_TYPE; } - public Iterator<String> javaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) { + public Iterable<String> getJavaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) { if (this.connectionProfileIsActive()) { - Iterator<String> result = this.connectedJavaCompletionProposals(pos, filter, astRoot); + Iterable<String> result = this.getConnectedJavaCompletionProposals(pos, filter, astRoot); if (result != null) { return result; } @@ -51,10 +50,10 @@ public abstract class AbstractJavaJpaContextNode * get candidates from the various database tables etc. * This method should <em>not</em> be cascaded to "child" objects; it should * only return candidates for the current object. The cascading is - * handled by {@link #javaCompletionProposals(int, Filter, CompilationUnit)}. + * handled by {@link #getJavaCompletionProposals(int, Filter, CompilationUnit)}. */ @SuppressWarnings("unused") - protected Iterator<String> connectedJavaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) { + protected Iterable<String> getConnectedJavaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) { return null; } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaMultiRelationshipMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaMultiRelationshipMapping.java index 8f0bb6b60c..e0c2467a91 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaMultiRelationshipMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaMultiRelationshipMapping.java @@ -10,7 +10,6 @@ package org.eclipse.jpt.jpa.core.internal.context.java; import java.util.ArrayList; -import java.util.Iterator; import java.util.List; import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.common.core.resource.java.JavaResourceAttribute; @@ -18,8 +17,8 @@ import org.eclipse.jpt.common.core.utility.TextRange; import org.eclipse.jpt.common.utility.Filter; import org.eclipse.jpt.common.utility.internal.StringTools; import org.eclipse.jpt.common.utility.internal.Tools; -import org.eclipse.jpt.common.utility.internal.iterators.EmptyIterator; -import org.eclipse.jpt.common.utility.internal.iterators.FilteringIterator; +import org.eclipse.jpt.common.utility.internal.iterables.EmptyIterable; +import org.eclipse.jpt.common.utility.internal.iterables.FilteringIterable; import org.eclipse.jpt.jpa.core.context.AttributeOverrideContainer; import org.eclipse.jpt.jpa.core.context.Column; import org.eclipse.jpt.jpa.core.context.Embeddable; @@ -564,13 +563,13 @@ public abstract class AbstractJavaMultiRelationshipMapping<A extends Relationshi // ********** Java completion proposals ********** @Override - public Iterator<String> javaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) { - Iterator<String> result = super.javaCompletionProposals(pos, filter, astRoot); + public Iterable<String> getJavaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) { + Iterable<String> result = super.getJavaCompletionProposals(pos, filter, astRoot); if (result != null) { return result; } - result = this.orderable.javaCompletionProposals(pos, filter, astRoot); + result = this.orderable.getJavaCompletionProposals(pos, filter, astRoot); if (result != null) { return result; } @@ -579,12 +578,12 @@ public abstract class AbstractJavaMultiRelationshipMapping<A extends Relationshi return this.javaCandidateMapKeyNames(filter); } - result = this.mapKeyColumn.javaCompletionProposals(pos, filter, astRoot); + result = this.mapKeyColumn.getJavaCompletionProposals(pos, filter, astRoot); if (result != null) { return result; } - result = this.mapKeyAttributeOverrideContainer.javaCompletionProposals(pos, filter, astRoot); + result = this.mapKeyAttributeOverrideContainer.getJavaCompletionProposals(pos, filter, astRoot); if (result != null) { return result; } @@ -597,16 +596,16 @@ public abstract class AbstractJavaMultiRelationshipMapping<A extends Relationshi return (mapKeyAnnotation != null) && mapKeyAnnotation.nameTouches(pos, astRoot); } - protected Iterator<String> javaCandidateMapKeyNames(Filter<String> filter) { - return StringTools.convertToJavaStringLiterals(this.candidateMapKeyNames(filter)); + protected Iterable<String> javaCandidateMapKeyNames(Filter<String> filter) { + return StringTools.convertToJavaStringLiterals(this.getCandidateMapKeyNames(filter)); } - protected Iterator<String> candidateMapKeyNames(Filter<String> filter) { - return new FilteringIterator<String>(this.candidateMapKeyNames(), filter); + protected Iterable<String> getCandidateMapKeyNames(Filter<String> filter) { + return new FilteringIterable<String>(this.getCandidateMapKeyNames(), filter); } - public Iterator<String> candidateMapKeyNames() { - return this.allTargetEntityAttributeNames(); + public Iterable<String> getCandidateMapKeyNames() { + return this.getAllTargetEntityAttributeNames(); } @@ -682,8 +681,8 @@ public abstract class AbstractJavaMultiRelationshipMapping<A extends Relationshi return this.getRelationshipStrategy().resolveDbTable(tableName); } - public Iterator<String> candidateTableNames() { - return EmptyIterator.instance(); + public Iterable<String> getCandidateTableNames() { + return EmptyIterable.instance(); } public TextRange getValidationTextRange(CompilationUnit astRoot) { @@ -750,9 +749,9 @@ public abstract class AbstractJavaMultiRelationshipMapping<A extends Relationshi return Tools.valuesAreDifferent(this.getDefaultTableName(), tableName); } - public Iterator<String> allOverridableNames() { + public Iterable<String> getAllOverridableNames() { TypeMapping overriddenTypeMapping = this.getOverridableTypeMapping(); - return (overriddenTypeMapping != null) ? overriddenTypeMapping.allOverridableAttributeNames() : EmptyIterator.<String>instance(); + return (overriddenTypeMapping != null) ? overriddenTypeMapping.getAllOverridableAttributeNames() : EmptyIterable.<String>instance(); } protected static final String POSSIBLE_PREFIX = "key"; //$NON-NLS-1$ diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaNamedColumn.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaNamedColumn.java index 8d91e29352..9fe01f4fd0 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaNamedColumn.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaNamedColumn.java @@ -9,7 +9,6 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.internal.context.java; -import java.util.Iterator; import java.util.List; import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.common.core.utility.TextRange; @@ -210,13 +209,13 @@ public abstract class AbstractJavaNamedColumn<A extends NamedColumnAnnotation, O // ********** Java completion proposals ********** @Override - protected Iterator<String> connectedJavaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) { - Iterator<String> result = super.connectedJavaCompletionProposals(pos, filter, astRoot); + protected Iterable<String> getConnectedJavaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) { + Iterable<String> result = super.getConnectedJavaCompletionProposals(pos, filter, astRoot); if (result != null) { return result; } if (this.nameTouches(pos, astRoot)) { - return this.getJavaCandidateNames(filter).iterator(); + return this.getJavaCandidateNames(filter); } return null; } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaOverride.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaOverride.java index 288f549190..fa8f332a56 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaOverride.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaOverride.java @@ -9,17 +9,16 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.internal.context.java; -import java.util.Iterator; import java.util.List; import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.common.core.utility.TextRange; import org.eclipse.jpt.common.utility.Filter; import org.eclipse.jpt.common.utility.internal.StringTools; -import org.eclipse.jpt.common.utility.internal.iterators.FilteringIterator; +import org.eclipse.jpt.common.utility.internal.iterables.FilteringIterable; import org.eclipse.jpt.jpa.core.context.ReadOnlyBaseColumn; +import org.eclipse.jpt.jpa.core.context.ReadOnlyBaseColumn.Owner; import org.eclipse.jpt.jpa.core.context.ReadOnlyOverride; import org.eclipse.jpt.jpa.core.context.TypeMapping; -import org.eclipse.jpt.jpa.core.context.ReadOnlyBaseColumn.Owner; import org.eclipse.jpt.jpa.core.context.java.JavaOverride; import org.eclipse.jpt.jpa.core.context.java.JavaOverrideContainer; import org.eclipse.jpt.jpa.core.context.java.JavaVirtualOverride; @@ -187,13 +186,13 @@ public abstract class AbstractJavaOverride<C extends JavaOverrideContainer, A ex // ********** Java completion proposals ********** @Override - public Iterator<String> javaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) { - Iterator<String> result = super.javaCompletionProposals(pos, filter, astRoot); + public Iterable<String> getJavaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) { + Iterable<String> result = super.getJavaCompletionProposals(pos, filter, astRoot); if (result != null) { return result; } if (this.nameTouches(pos, astRoot)) { - return this.javaCandidateNames(filter); + return this.getJavaCandidateNames(filter); } return null; } @@ -202,15 +201,15 @@ public abstract class AbstractJavaOverride<C extends JavaOverrideContainer, A ex return this.overrideAnnotation.nameTouches(pos, astRoot); } - protected Iterator<String> javaCandidateNames(Filter<String> filter) { - return StringTools.convertToJavaStringLiterals(this.candidateNames(filter)); + protected Iterable<String> getJavaCandidateNames(Filter<String> filter) { + return StringTools.convertToJavaStringLiterals(this.getCandidateNames(filter)); } - private Iterator<String> candidateNames(Filter<String> filter) { - return new FilteringIterator<String>(this.candidateNames(), filter); + private Iterable<String> getCandidateNames(Filter<String> filter) { + return new FilteringIterable<String>(this.getCandidateNames(), filter); } - protected abstract Iterator<String> candidateNames(); + protected abstract Iterable<String> getCandidateNames(); // ********** validation ********** @@ -242,7 +241,7 @@ public abstract class AbstractJavaOverride<C extends JavaOverrideContainer, A ex return this.getContainer().tableNameIsInvalid(tableName); } - public Iterator<String> candidateTableNames() { - return this.getContainer().candidateTableNames(); + public Iterable<String> getCandidateTableNames() { + return this.getContainer().getCandidateTableNames(); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaPersistentAttribute.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaPersistentAttribute.java index 2914c80041..cd439bddd0 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaPersistentAttribute.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaPersistentAttribute.java @@ -9,7 +9,6 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.internal.context.java; -import java.util.Iterator; import java.util.List; import org.eclipse.core.runtime.content.IContentType; import org.eclipse.jdt.core.dom.CompilationUnit; @@ -654,12 +653,12 @@ public abstract class AbstractJavaPersistentAttribute // ********** Java completion proposals ********** @Override - public Iterator<String> javaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) { - Iterator<String> result = super.javaCompletionProposals(pos, filter, astRoot); + public Iterable<String> getJavaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) { + Iterable<String> result = super.getJavaCompletionProposals(pos, filter, astRoot); if (result != null) { return result; } - return this.mapping.javaCompletionProposals(pos, filter, astRoot); + return this.mapping.getJavaCompletionProposals(pos, filter, astRoot); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaPersistentType.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaPersistentType.java index 8d59c6a8c2..eac3f48a8e 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaPersistentType.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaPersistentType.java @@ -41,7 +41,6 @@ import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; import org.eclipse.jpt.common.utility.internal.iterables.LiveCloneListIterable; import org.eclipse.jpt.common.utility.internal.iterables.SuperListIterableWrapper; import org.eclipse.jpt.common.utility.internal.iterables.TransformationIterable; -import org.eclipse.jpt.common.utility.internal.iterators.EmptyIterator; import org.eclipse.jpt.jpa.core.JpaFile; import org.eclipse.jpt.jpa.core.JpaStructureNode; import org.eclipse.jpt.jpa.core.JptJpaCorePlugin; @@ -158,7 +157,7 @@ public abstract class AbstractJavaPersistentType if (spt == null) { return null; } - if (CollectionTools.contains(spt.inheritanceHierarchy(), this)) { + if (CollectionTools.contains(spt.getInheritanceHierarchy(), this)) { return null; // short-circuit in this case, we have circular inheritance } return spt.isMapped() ? spt : spt.getSuperPersistentType(); @@ -871,18 +870,10 @@ public abstract class AbstractJavaPersistentType // ********** inheritance ********** - public Iterator<PersistentType> inheritanceHierarchy() { - return this.getInheritanceHierarchy().iterator(); - } - public Iterable<PersistentType> getInheritanceHierarchy() { return this.getInheritanceHierarchyOf(this); } - public Iterator<PersistentType> ancestors() { - return this.getAncestors().iterator(); - } - public Iterable<PersistentType> getAncestors() { return this.getInheritanceHierarchyOf(this.superPersistentType); } @@ -962,22 +953,22 @@ public abstract class AbstractJavaPersistentType // ********** Java completion proposals ********** @Override - public Iterator<String> javaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) { - Iterator<String> result = super.javaCompletionProposals(pos, filter, astRoot); + public Iterable<String> getJavaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) { + Iterable<String> result = super.getJavaCompletionProposals(pos, filter, astRoot); if (result != null) { return result; } - Iterator<String> values = this.mapping.javaCompletionProposals(pos, filter, astRoot); + Iterable<String> values = this.mapping.getJavaCompletionProposals(pos, filter, astRoot); if (values != null) { return values; } for (JavaPersistentAttribute attribute : this.getAttributes()) { - values = attribute.javaCompletionProposals(pos, filter, astRoot); + values = attribute.getJavaCompletionProposals(pos, filter, astRoot); if (values != null) { return values; } } - return EmptyIterator.instance(); + return EmptyIterable.instance(); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaRelationshipMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaRelationshipMapping.java index 19d80b6abb..aece5971f3 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaRelationshipMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaRelationshipMapping.java @@ -9,14 +9,13 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.internal.context.java; -import java.util.Iterator; import java.util.List; import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.common.core.utility.TextRange; import org.eclipse.jpt.common.utility.Filter; -import org.eclipse.jpt.common.utility.internal.iterators.CompositeIterator; -import org.eclipse.jpt.common.utility.internal.iterators.EmptyIterator; -import org.eclipse.jpt.common.utility.internal.iterators.TransformationIterator; +import org.eclipse.jpt.common.utility.internal.iterables.CompositeIterable; +import org.eclipse.jpt.common.utility.internal.iterables.EmptyIterable; +import org.eclipse.jpt.common.utility.internal.iterables.TransformationIterable; import org.eclipse.jpt.jpa.core.context.AttributeMapping; import org.eclipse.jpt.jpa.core.context.Entity; import org.eclipse.jpt.jpa.core.context.FetchType; @@ -251,17 +250,17 @@ public abstract class AbstractJavaRelationshipMapping<A extends RelationshipMapp return this.relationship.isOverridable(); } - public Iterator<String> allTargetEntityAttributeNames() { - return new CompositeIterator<String>(this.allTargetEntityAttributeNamesLists()); + public Iterable<String> getAllTargetEntityAttributeNames() { + return new CompositeIterable<String>(this.getAllTargetEntityAttributeNamesLists()); } - protected Iterator<Iterator<String>> allTargetEntityAttributeNamesLists() { - return new TransformationIterator<AttributeMapping, Iterator<String>>(this.allTargetEntityAttributeMappings(), AttributeMappingTools.ALL_MAPPING_NAMES_TRANSFORMER); + protected Iterable<Iterable<String>> getAllTargetEntityAttributeNamesLists() { + return new TransformationIterable<AttributeMapping, Iterable<String>>(this.getAllTargetEntityAttributeMappings(), AttributeMappingTools.ALL_MAPPING_NAMES_TRANSFORMER); } - protected Iterator<AttributeMapping> allTargetEntityAttributeMappings() { + protected Iterable<AttributeMapping> getAllTargetEntityAttributeMappings() { Entity entity = this.getResolvedTargetEntity(); - return (entity != null) ? entity.allAttributeMappings() : EmptyIterator.<AttributeMapping> instance(); + return (entity != null) ? entity.getAllAttributeMappings() : EmptyIterable.<AttributeMapping> instance(); } protected String getTargetEntityIdAttributeName() { @@ -278,13 +277,13 @@ public abstract class AbstractJavaRelationshipMapping<A extends RelationshipMapp // ********** Java completion proposals ********** @Override - public Iterator<String> javaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) { - Iterator<String> result = super.javaCompletionProposals(pos, filter, astRoot); + public Iterable<String> getJavaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) { + Iterable<String> result = super.getJavaCompletionProposals(pos, filter, astRoot); if (result != null) { return result; } - result = this.relationship.javaCompletionProposals(pos, filter, astRoot); + result = this.relationship.getJavaCompletionProposals(pos, filter, astRoot); if (result != null) { return result; } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaSequenceGenerator.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaSequenceGenerator.java index 0400ace268..d6c8ab4277 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaSequenceGenerator.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaSequenceGenerator.java @@ -9,8 +9,6 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.internal.context.java; -import java.util.Iterator; - import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.common.utility.Filter; import org.eclipse.jpt.common.utility.internal.StringTools; @@ -104,13 +102,13 @@ public abstract class AbstractJavaSequenceGenerator<A extends SequenceGeneratorA * sequenceName */ @Override - protected Iterator<String> connectedJavaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) { - Iterator<String> result = super.connectedJavaCompletionProposals(pos, filter, astRoot); + protected Iterable<String> getConnectedJavaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) { + Iterable<String> result = super.getConnectedJavaCompletionProposals(pos, filter, astRoot); if (result != null) { return result; } if (this.sequenceNameTouches(pos, astRoot)) { - return this.getJavaCandidateSequences(filter).iterator(); + return this.getJavaCandidateSequences(filter); } return null; } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaSingleRelationshipMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaSingleRelationshipMapping.java index 38ee6dc2c2..314a3c74b5 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaSingleRelationshipMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaSingleRelationshipMapping.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2006, 2010 Oracle. All rights reserved. + * Copyright (c) 2006, 2011 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html. @@ -9,7 +9,6 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.internal.context.java; -import java.util.Iterator; import java.util.List; import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.common.utility.Filter; @@ -131,13 +130,13 @@ public abstract class AbstractJavaSingleRelationshipMapping<A extends SingleRela // ********** Java completion proposals ********** @Override - public Iterator<String> javaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) { - Iterator<String> result = super.javaCompletionProposals(pos, filter, astRoot); + public Iterable<String> getJavaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) { + Iterable<String> result = super.getJavaCompletionProposals(pos, filter, astRoot); if (result != null) { return result; } - result = this.derivedIdentity.javaCompletionProposals(pos, filter, astRoot); + result = this.derivedIdentity.getJavaCompletionProposals(pos, filter, astRoot); if (result != null) { return result; } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaTable.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaTable.java index 36f512874d..5ade84862b 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaTable.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaTable.java @@ -9,7 +9,6 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.internal.context.java; -import java.util.Iterator; import java.util.List; import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.common.core.utility.TextRange; @@ -19,7 +18,6 @@ import org.eclipse.jpt.common.utility.internal.StringTools; import org.eclipse.jpt.common.utility.internal.iterables.EmptyIterable; import org.eclipse.jpt.common.utility.internal.iterables.FilteringIterable; import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; -import org.eclipse.jpt.common.utility.internal.iterators.EmptyIterator; import org.eclipse.jpt.jpa.core.context.ReadOnlyTable; import org.eclipse.jpt.jpa.core.context.ReadOnlyUniqueConstraint; import org.eclipse.jpt.jpa.core.context.UniqueConstraint; @@ -389,22 +387,22 @@ public abstract class AbstractJavaTable<A extends BaseTableAnnotation> // ********** UniqueConstraint.Owner implementation ********** - public Iterator<String> candidateUniqueConstraintColumnNames() { + public Iterable<String> getCandidateUniqueConstraintColumnNames() { org.eclipse.jpt.jpa.db.Table dbTable = this.getDbTable(); - return (dbTable != null) ? dbTable.getSortedColumnIdentifiers().iterator() : EmptyIterator.<String>instance(); + return (dbTable != null) ? dbTable.getSortedColumnIdentifiers() : EmptyIterable.<String>instance(); } // ********** Java completion proposals ********** @Override - public Iterator<String> javaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) { - Iterator<String> result = super.javaCompletionProposals(pos, filter, astRoot); + public Iterable<String> getJavaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) { + Iterable<String> result = super.getJavaCompletionProposals(pos, filter, astRoot); if (result != null) { return result; } for (JavaUniqueConstraint constraint : this.getUniqueConstraints()) { - result = constraint.javaCompletionProposals(pos, filter, astRoot); + result = constraint.getJavaCompletionProposals(pos, filter, astRoot); if (result != null) { return result; } @@ -417,19 +415,19 @@ public abstract class AbstractJavaTable<A extends BaseTableAnnotation> * name, schema, catalog */ @Override - protected Iterator<String> connectedJavaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) { - Iterator<String> result = super.connectedJavaCompletionProposals(pos, filter, astRoot); + protected Iterable<String> getConnectedJavaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) { + Iterable<String> result = super.getConnectedJavaCompletionProposals(pos, filter, astRoot); if (result != null) { return result; } if (this.nameTouches(pos, astRoot)) { - return this.getJavaCandidateNames(filter).iterator(); + return this.getJavaCandidateNames(filter); } if (this.schemaTouches(pos, astRoot)) { - return this.getJavaCandidateSchemata(filter).iterator(); + return this.getJavaCandidateSchemata(filter); } if (this.catalogTouches(pos, astRoot)) { - return this.getJavaCandidateCatalogs(filter).iterator(); + return this.getJavaCandidateCatalogs(filter); } return null; } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaTypeMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaTypeMapping.java index e50ca4a733..cf4f409fed 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaTypeMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaTypeMapping.java @@ -9,7 +9,6 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.internal.context.java; -import java.util.Iterator; import java.util.List; import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.common.core.resource.java.Annotation; @@ -18,11 +17,10 @@ import org.eclipse.jpt.common.core.utility.TextRange; import org.eclipse.jpt.common.utility.internal.CollectionTools; import org.eclipse.jpt.common.utility.internal.NotNullFilter; import org.eclipse.jpt.common.utility.internal.Tools; +import org.eclipse.jpt.common.utility.internal.iterables.CompositeIterable; +import org.eclipse.jpt.common.utility.internal.iterables.EmptyIterable; import org.eclipse.jpt.common.utility.internal.iterables.FilteringIterable; -import org.eclipse.jpt.common.utility.internal.iterators.CompositeIterator; -import org.eclipse.jpt.common.utility.internal.iterators.EmptyIterator; -import org.eclipse.jpt.common.utility.internal.iterators.FilteringIterator; -import org.eclipse.jpt.common.utility.internal.iterators.TransformationIterator; +import org.eclipse.jpt.common.utility.internal.iterables.TransformationIterable; import org.eclipse.jpt.jpa.core.context.AttributeMapping; import org.eclipse.jpt.jpa.core.context.Column; import org.eclipse.jpt.jpa.core.context.PersistentType; @@ -106,16 +104,16 @@ public abstract class AbstractJavaTypeMapping<A extends Annotation> return null; } - public Iterator<ReadOnlyTable> associatedTables() { - return EmptyIterator.instance(); + public Iterable<ReadOnlyTable> getAssociatedTables() { + return EmptyIterable.instance(); } - public Iterator<ReadOnlyTable> allAssociatedTables() { - return EmptyIterator.instance(); + public Iterable<ReadOnlyTable> getAllAssociatedTables() { + return EmptyIterable.instance(); } - public Iterator<String> allAssociatedTableNames() { - return EmptyIterator.instance(); + public Iterable<String> getAllAssociatedTableNames() { + return EmptyIterable.instance(); } public org.eclipse.jpt.jpa.db.Table resolveDbTable(String tableName) { @@ -130,12 +128,8 @@ public abstract class AbstractJavaTypeMapping<A extends Annotation> return (superPersistentType == null) ? null : superPersistentType.getMapping(); } - public Iterator<TypeMapping> inheritanceHierarchy() { - return this.convertToMappings(this.getPersistentType().inheritanceHierarchy()); - } - - protected Iterable<TypeMapping> getInheritanceHierarchy() { - return CollectionTools.iterable(this.inheritanceHierarchy()); + public Iterable<TypeMapping> getInheritanceHierarchy() { + return this.convertToMappings(this.getPersistentType().getInheritanceHierarchy()); } /** @@ -144,16 +138,12 @@ public abstract class AbstractJavaTypeMapping<A extends Annotation> * The returned iterator will return elements infinitely if the hierarchy * has a loop. */ - protected Iterator<TypeMapping> ancestors() { - return this.convertToMappings(this.getPersistentType().ancestors()); - } - protected Iterable<TypeMapping> getAncestors() { - return CollectionTools.iterable(this.ancestors()); + return this.convertToMappings(this.getPersistentType().getAncestors()); } - protected Iterator<TypeMapping> convertToMappings(Iterator<PersistentType> types) { - return new TransformationIterator<PersistentType, TypeMapping>(types) { + protected Iterable<TypeMapping> convertToMappings(Iterable<PersistentType> types) { + return new TransformationIterable<PersistentType, TypeMapping>(types) { @Override protected TypeMapping transform(PersistentType type) { return type.getMapping(); @@ -164,8 +154,8 @@ public abstract class AbstractJavaTypeMapping<A extends Annotation> // ********** attribute mappings ********** - public Iterator<JavaAttributeMapping> attributeMappings() { - return new TransformationIterator<JavaPersistentAttribute, JavaAttributeMapping>(this.getPersistentType().getAttributes()) { + public Iterable<JavaAttributeMapping> getAttributeMappings() { + return new TransformationIterable<JavaPersistentAttribute, JavaAttributeMapping>(this.getPersistentType().getAttributes()) { @Override protected JavaAttributeMapping transform(JavaPersistentAttribute attribute) { return attribute.getMapping(); @@ -174,7 +164,7 @@ public abstract class AbstractJavaTypeMapping<A extends Annotation> } public Iterable<JavaAttributeMapping> getAttributeMappings(final String mappingKey) { - return new FilteringIterable<JavaAttributeMapping>(CollectionTools.collection(this.attributeMappings())) { + return new FilteringIterable<JavaAttributeMapping>(this.getAttributeMappings()) { @Override protected boolean accept(JavaAttributeMapping o) { return Tools.valuesAreEqual(o.getKey(), mappingKey); @@ -182,20 +172,20 @@ public abstract class AbstractJavaTypeMapping<A extends Annotation> }; } - public Iterator<AttributeMapping> allAttributeMappings() { - return new CompositeIterator<AttributeMapping>(this.allAttributeMappingsLists()); + public Iterable<AttributeMapping> getAllAttributeMappings() { + return new CompositeIterable<AttributeMapping>(this.getAllAttributeMappingsLists()); } - protected Iterator<Iterator<AttributeMapping>> allAttributeMappingsLists() { - return new TransformationIterator<TypeMapping, Iterator<AttributeMapping>>(this.nonNullInheritanceHierarchy(), TypeMappingTools.ATTRIBUTE_MAPPINGS_TRANSFORMER); + protected Iterable<Iterable<AttributeMapping>> getAllAttributeMappingsLists() { + return new TransformationIterable<TypeMapping, Iterable<AttributeMapping>>(this.getNonNullInheritanceHierarchy(), TypeMappingTools.ATTRIBUTE_MAPPINGS_TRANSFORMER); } - protected Iterator<TypeMapping> nonNullInheritanceHierarchy() { - return new FilteringIterator<TypeMapping>(this.inheritanceHierarchy(), NotNullFilter.<TypeMapping>instance()); + protected Iterable<TypeMapping> getNonNullInheritanceHierarchy() { + return new FilteringIterable<TypeMapping>(this.getInheritanceHierarchy(), NotNullFilter.<TypeMapping>instance()); } public Iterable<AttributeMapping> getAllAttributeMappings(final String mappingKey) { - return new FilteringIterable<AttributeMapping>(CollectionTools.collection(this.allAttributeMappings())) { + return new FilteringIterable<AttributeMapping>(CollectionTools.collection(this.getAllAttributeMappings())) { @Override protected boolean accept(AttributeMapping o) { return Tools.valuesAreEqual(o.getKey(), mappingKey); @@ -210,24 +200,24 @@ public abstract class AbstractJavaTypeMapping<A extends Annotation> // ********** attribute overrides ********** - public Iterator<String> overridableAttributeNames() { - return new CompositeIterator<String>(this.overridableAttributeNamesLists()); + public Iterable<String> getOverridableAttributeNames() { + return new CompositeIterable<String>(this.getOverridableAttributeNamesLists()); } - protected Iterator<Iterator<String>> overridableAttributeNamesLists() { - return new TransformationIterator<AttributeMapping, Iterator<String>>(this.attributeMappings(), AttributeMappingTools.ALL_OVERRIDABLE_ATTRIBUTE_MAPPING_NAMES_TRANSFORMER); + protected Iterable<Iterable<String>> getOverridableAttributeNamesLists() { + return new TransformationIterable<AttributeMapping, Iterable<String>>(this.getAttributeMappings(), AttributeMappingTools.ALL_OVERRIDABLE_ATTRIBUTE_MAPPING_NAMES_TRANSFORMER); } - public Iterator<String> allOverridableAttributeNames() { - return new CompositeIterator<String>(this.allOverridableAttributeNamesLists()); + public Iterable<String> getAllOverridableAttributeNames() { + return new CompositeIterable<String>(this.allOverridableAttributeNamesLists()); } - protected Iterator<Iterator<String>> allOverridableAttributeNamesLists() { - return new TransformationIterator<TypeMapping, Iterator<String>>(this.inheritanceHierarchy(), TypeMappingTools.OVERRIDABLE_ATTRIBUTE_NAMES_TRANSFORMER); + protected Iterable<Iterable<String>> allOverridableAttributeNamesLists() { + return new TransformationIterable<TypeMapping, Iterable<String>>(this.getInheritanceHierarchy(), TypeMappingTools.OVERRIDABLE_ATTRIBUTE_NAMES_TRANSFORMER); } public Column resolveOverriddenColumn(String attributeName) { - for (AttributeMapping attributeMapping : CollectionTools.iterable(this.attributeMappings())) { + for (AttributeMapping attributeMapping : this.getAttributeMappings()) { Column column = attributeMapping.resolveOverriddenColumn(attributeName); if (column != null) { return column; @@ -239,24 +229,24 @@ public abstract class AbstractJavaTypeMapping<A extends Annotation> // ********** association overrides ********** - public Iterator<String> overridableAssociationNames() { - return new CompositeIterator<String>(this.overridableAssociationNamesLists()); + public Iterable<String> getOverridableAssociationNames() { + return new CompositeIterable<String>(this.getOverridableAssociationNamesLists()); } - protected Iterator<Iterator<String>> overridableAssociationNamesLists() { - return new TransformationIterator<AttributeMapping, Iterator<String>>(this.attributeMappings(), AttributeMappingTools.ALL_OVERRIDABLE_ASSOCIATION_MAPPING_NAMES_TRANSFORMER); + protected Iterable<Iterable<String>> getOverridableAssociationNamesLists() { + return new TransformationIterable<AttributeMapping, Iterable<String>>(this.getAttributeMappings(), AttributeMappingTools.ALL_OVERRIDABLE_ASSOCIATION_MAPPING_NAMES_TRANSFORMER); } - public Iterator<String> allOverridableAssociationNames() { - return new CompositeIterator<String>(this.allOverridableAssociationNamesLists()); + public Iterable<String> getAllOverridableAssociationNames() { + return new CompositeIterable<String>(this.getAllOverridableAssociationNamesLists()); } - protected Iterator<Iterator<String>> allOverridableAssociationNamesLists() { - return new TransformationIterator<TypeMapping, Iterator<String>>(this.inheritanceHierarchy(), TypeMappingTools.OVERRIDABLE_ASSOCIATION_NAMES_TRANSFORMER); + protected Iterable<Iterable<String>> getAllOverridableAssociationNamesLists() { + return new TransformationIterable<TypeMapping, Iterable<String>>(this.getInheritanceHierarchy(), TypeMappingTools.OVERRIDABLE_ASSOCIATION_NAMES_TRANSFORMER); } public Relationship resolveOverriddenRelationship(String attributeName) { - for (AttributeMapping attributeMapping : CollectionTools.iterable(this.attributeMappings())) { + for (AttributeMapping attributeMapping : this.getAttributeMappings()) { Relationship relationship = attributeMapping.resolveOverriddenRelationship(attributeName); if (relationship != null) { return relationship; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaVersionMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaVersionMapping.java index 0ca7807a09..28d8530aa3 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaVersionMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaVersionMapping.java @@ -9,7 +9,6 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.internal.context.java; -import java.util.Iterator; import java.util.List; import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.common.core.resource.java.Annotation; @@ -240,8 +239,8 @@ public abstract class AbstractJavaVersionMapping return this.getTypeMapping().tableNameIsInvalid(tableName); } - public Iterator<String> candidateTableNames() { - return this.getTypeMapping().allAssociatedTableNames(); + public Iterable<String> getCandidateTableNames() { + return this.getTypeMapping().getAllAssociatedTableNames(); } public JptValidator buildColumnValidator(ReadOnlyNamedColumn col, NamedColumnTextRangeResolver textRangeResolver) { @@ -252,16 +251,16 @@ public abstract class AbstractJavaVersionMapping // ********** Java completion proposals ********** @Override - public Iterator<String> javaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) { - Iterator<String> result = super.javaCompletionProposals(pos, filter, astRoot); + public Iterable<String> getJavaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) { + Iterable<String> result = super.getJavaCompletionProposals(pos, filter, astRoot); if (result != null) { return result; } - result = this.column.javaCompletionProposals(pos, filter, astRoot); + result = this.column.getJavaCompletionProposals(pos, filter, astRoot); if (result != null) { return result; } - result = this.converter.javaCompletionProposals(pos, filter, astRoot); + result = this.converter.getJavaCompletionProposals(pos, filter, astRoot); if (result != null) { return result; } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaVirtualBaseColumn.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaVirtualBaseColumn.java index 37511ba623..67fa2d9cae 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaVirtualBaseColumn.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaVirtualBaseColumn.java @@ -9,7 +9,6 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.internal.context.java; -import java.util.Iterator; import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.common.core.utility.TextRange; import org.eclipse.jpt.jpa.core.context.ReadOnlyBaseColumn; @@ -248,8 +247,8 @@ public abstract class AbstractJavaVirtualBaseColumn<O extends JavaReadOnlyBaseCo return this.owner.tableNameIsInvalid(this.getTable()); } - public Iterator<String> candidateTableNames() { - return this.owner.candidateTableNames(); + public Iterable<String> getCandidateTableNames() { + return this.owner.getCandidateTableNames(); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaVirtualOverride.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaVirtualOverride.java index b934a9d676..023cc4efef 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaVirtualOverride.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaVirtualOverride.java @@ -9,13 +9,12 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.internal.context.java; -import java.util.Iterator; import java.util.List; import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.common.core.utility.TextRange; import org.eclipse.jpt.jpa.core.context.ReadOnlyBaseColumn; -import org.eclipse.jpt.jpa.core.context.TypeMapping; import org.eclipse.jpt.jpa.core.context.ReadOnlyBaseColumn.Owner; +import org.eclipse.jpt.jpa.core.context.TypeMapping; import org.eclipse.jpt.jpa.core.context.java.JavaOverride; import org.eclipse.jpt.jpa.core.context.java.JavaOverrideContainer; import org.eclipse.jpt.jpa.core.context.java.JavaVirtualOverride; @@ -113,7 +112,7 @@ public abstract class AbstractJavaVirtualOverride<C extends JavaOverrideContaine return this.getContainer().tableNameIsInvalid(tableName); } - public Iterator<String> candidateTableNames() { - return this.getContainer().candidateTableNames(); + public Iterable<String> getCandidateTableNames() { + return this.getContainer().getCandidateTableNames(); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaManyToManyRelationship.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaManyToManyRelationship.java index 0bfd8eec6e..efbf688c40 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaManyToManyRelationship.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaManyToManyRelationship.java @@ -9,7 +9,6 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.internal.context.java; -import java.util.Iterator; import java.util.List; import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.common.utility.Filter; @@ -174,18 +173,18 @@ public class GenericJavaManyToManyRelationship // ********** Java completion proposals ********** @Override - public Iterator<String> javaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) { - Iterator<String> result = super.javaCompletionProposals(pos, filter, astRoot); + public Iterable<String> getJavaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) { + Iterable<String> result = super.getJavaCompletionProposals(pos, filter, astRoot); if (result != null) { return result; } - result = this.mappedByStrategy.javaCompletionProposals(pos, filter, astRoot); + result = this.mappedByStrategy.getJavaCompletionProposals(pos, filter, astRoot); if (result != null) { return result; } - return this.joinTableStrategy.javaCompletionProposals(pos, filter, astRoot); + return this.joinTableStrategy.getJavaCompletionProposals(pos, filter, astRoot); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaManyToOneRelationship.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaManyToOneRelationship.java index cbe1e39b02..d2a4bff421 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaManyToOneRelationship.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaManyToOneRelationship.java @@ -9,7 +9,6 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.internal.context.java; -import java.util.Iterator; import java.util.List; import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.common.utility.Filter; @@ -170,18 +169,18 @@ public class GenericJavaManyToOneRelationship // ********** Java completion proposals ********** @Override - public Iterator<String> javaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) { - Iterator<String> result = super.javaCompletionProposals(pos, filter, astRoot); + public Iterable<String> getJavaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) { + Iterable<String> result = super.getJavaCompletionProposals(pos, filter, astRoot); if (result != null) { return result; } - result = this.joinColumnStrategy.javaCompletionProposals(pos, filter, astRoot); + result = this.joinColumnStrategy.getJavaCompletionProposals(pos, filter, astRoot); if (result != null) { return result; } - return this.joinTableStrategy.javaCompletionProposals(pos, filter, astRoot); + return this.joinTableStrategy.getJavaCompletionProposals(pos, filter, astRoot); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaMappedByRelationshipStrategy.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaMappedByRelationshipStrategy.java index 498f7aaa26..9189b3bfe6 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaMappedByRelationshipStrategy.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaMappedByRelationshipStrategy.java @@ -9,7 +9,6 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.internal.context.java; -import java.util.Iterator; import java.util.List; import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.common.core.utility.TextRange; @@ -17,7 +16,7 @@ import org.eclipse.jpt.common.utility.Filter; import org.eclipse.jpt.common.utility.internal.ArrayTools; import org.eclipse.jpt.common.utility.internal.StringTools; import org.eclipse.jpt.common.utility.internal.Tools; -import org.eclipse.jpt.common.utility.internal.iterators.FilteringIterator; +import org.eclipse.jpt.common.utility.internal.iterables.FilteringIterable; import org.eclipse.jpt.jpa.core.context.AttributeMapping; import org.eclipse.jpt.jpa.core.context.Entity; import org.eclipse.jpt.jpa.core.context.MappedByRelationshipStrategy; @@ -171,28 +170,28 @@ public class GenericJavaMappedByRelationshipStrategy // ********** java completion proposals ********** @Override - public Iterator<String> javaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) { - Iterator<String> result = super.javaCompletionProposals(pos, filter, astRoot); + public Iterable<String> getJavaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) { + Iterable<String> result = super.getJavaCompletionProposals(pos, filter, astRoot); if (result != null) { return result; } OwnableRelationshipMappingAnnotation annotation = this.getMappingAnnotation(); if ((annotation != null) && annotation.mappedByTouches(pos, astRoot)) { - result = this.javaCandidateMappedByAttributeNames(filter); + result = this.getJavaCandidateMappedByAttributeNames(filter); } return result; } - public Iterator<String> candidateMappedByAttributeNames() { - return this.getRelationshipMapping().allTargetEntityAttributeNames(); + public Iterable<String> getCandidateMappedByAttributeNames() { + return this.getRelationshipMapping().getAllTargetEntityAttributeNames(); } - protected Iterator<String> candidateMappedByAttributeNames(Filter<String> filter) { - return new FilteringIterator<String>(this.candidateMappedByAttributeNames(), filter); + protected Iterable<String> getCandidateMappedByAttributeNames(Filter<String> filter) { + return new FilteringIterable<String>(this.getCandidateMappedByAttributeNames(), filter); } - protected Iterator<String> javaCandidateMappedByAttributeNames(Filter<String> filter) { - return StringTools.convertToJavaStringLiterals(this.candidateMappedByAttributeNames(filter)); + protected Iterable<String> getJavaCandidateMappedByAttributeNames(Filter<String> filter) { + return StringTools.convertToJavaStringLiterals(this.getCandidateMappedByAttributeNames(filter)); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaMappingJoinColumnRelationshipStrategy.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaMappingJoinColumnRelationshipStrategy.java index 87b9567cb8..d1e6577889 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaMappingJoinColumnRelationshipStrategy.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaMappingJoinColumnRelationshipStrategy.java @@ -9,7 +9,6 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.internal.context.java; -import java.util.Iterator; import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.common.core.resource.java.JavaResourceAttribute; import org.eclipse.jpt.common.core.resource.java.NestableAnnotation; @@ -193,8 +192,8 @@ public class GenericJavaMappingJoinColumnRelationshipStrategy /** * the join column can be on a secondary table */ - public Iterator<String> candidateTableNames() { - return GenericJavaMappingJoinColumnRelationshipStrategy.this.candidateTableNames(); + public Iterable<String> getCandidateTableNames() { + return GenericJavaMappingJoinColumnRelationshipStrategy.this.getCandidateTableNames(); } public Table resolveDbTable(String tableName) { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaOneToManyRelationship.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaOneToManyRelationship.java index 58298524af..e49cb1576d 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaOneToManyRelationship.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaOneToManyRelationship.java @@ -9,7 +9,6 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.internal.context.java; -import java.util.Iterator; import java.util.List; import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.common.utility.Filter; @@ -243,23 +242,23 @@ public class GenericJavaOneToManyRelationship // ********** Java completion proposals ********** @Override - public Iterator<String> javaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) { - Iterator<String> result = super.javaCompletionProposals(pos, filter, astRoot); + public Iterable<String> getJavaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) { + Iterable<String> result = super.getJavaCompletionProposals(pos, filter, astRoot); if (result != null) { return result; } - result = this.mappedByStrategy.javaCompletionProposals(pos, filter, astRoot); + result = this.mappedByStrategy.getJavaCompletionProposals(pos, filter, astRoot); if (result != null) { return result; } - result = this.joinTableStrategy.javaCompletionProposals(pos, filter, astRoot); + result = this.joinTableStrategy.getJavaCompletionProposals(pos, filter, astRoot); if (result != null) { return result; } - return this.joinColumnStrategy.javaCompletionProposals(pos, filter, astRoot); + return this.joinColumnStrategy.getJavaCompletionProposals(pos, filter, astRoot); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaOneToOneRelationship.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaOneToOneRelationship.java index f714d20f49..c0335f4611 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaOneToOneRelationship.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaOneToOneRelationship.java @@ -9,7 +9,6 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.internal.context.java; -import java.util.Iterator; import java.util.List; import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.common.utility.Filter; @@ -266,28 +265,28 @@ public class GenericJavaOneToOneRelationship // ********** Java completion proposals ********** @Override - public Iterator<String> javaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) { - Iterator<String> result = super.javaCompletionProposals(pos, filter, astRoot); + public Iterable<String> getJavaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) { + Iterable<String> result = super.getJavaCompletionProposals(pos, filter, astRoot); if (result != null) { return result; } - result = this.mappedByStrategy.javaCompletionProposals(pos, filter, astRoot); + result = this.mappedByStrategy.getJavaCompletionProposals(pos, filter, astRoot); if (result != null) { return result; } - result = this.primaryKeyJoinColumnStrategy.javaCompletionProposals(pos, filter, astRoot); + result = this.primaryKeyJoinColumnStrategy.getJavaCompletionProposals(pos, filter, astRoot); if (result != null) { return result; } - result = this.joinTableStrategy.javaCompletionProposals(pos, filter, astRoot); + result = this.joinTableStrategy.getJavaCompletionProposals(pos, filter, astRoot); if (result != null) { return result; } - return this.joinColumnStrategy.javaCompletionProposals(pos, filter, astRoot); + return this.joinColumnStrategy.getJavaCompletionProposals(pos, filter, astRoot); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaOverrideJoinColumnRelationshipStrategy.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaOverrideJoinColumnRelationshipStrategy.java index 4b794b9329..9f2506df95 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaOverrideJoinColumnRelationshipStrategy.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaOverrideJoinColumnRelationshipStrategy.java @@ -9,7 +9,6 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.internal.context.java; -import java.util.Iterator; import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.common.core.utility.TextRange; import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; @@ -136,10 +135,10 @@ public class GenericJavaOverrideJoinColumnRelationshipStrategy } @Override - public Iterator<String> candidateTableNames() { + public Iterable<String> getCandidateTableNames() { return this.isTargetForeignKey() ? - super.candidateTableNames() : - this.getRelationship().candidateTableNames(); + super.getCandidateTableNames() : + this.getRelationship().getCandidateTableNames(); } public String getColumnTableNotValidDescription() { @@ -202,8 +201,8 @@ public class GenericJavaOverrideJoinColumnRelationshipStrategy return GenericJavaOverrideJoinColumnRelationshipStrategy.this.tableNameIsInvalid(tableName); } - public Iterator<String> candidateTableNames() { - return GenericJavaOverrideJoinColumnRelationshipStrategy.this.candidateTableNames(); + public Iterable<String> getCandidateTableNames() { + return GenericJavaOverrideJoinColumnRelationshipStrategy.this.getCandidateTableNames(); } public Table resolveDbTable(String tableName) { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaPrimaryKeyJoinColumnRelationshipStrategy.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaPrimaryKeyJoinColumnRelationshipStrategy.java index 0f0e3c6e0e..c7906299ff 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaPrimaryKeyJoinColumnRelationshipStrategy.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaPrimaryKeyJoinColumnRelationshipStrategy.java @@ -9,7 +9,6 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.internal.context.java; -import java.util.Iterator; import java.util.List; import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.common.core.resource.java.JavaResourceAttribute; @@ -243,13 +242,13 @@ public class GenericJavaPrimaryKeyJoinColumnRelationshipStrategy // ********** Java completion proposals ********** @Override - public Iterator<String> javaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) { - Iterator<String> result = super.javaCompletionProposals(pos, filter, astRoot); + public Iterable<String> getJavaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) { + Iterable<String> result = super.getJavaCompletionProposals(pos, filter, astRoot); if (result != null) { return result; } for (JavaPrimaryKeyJoinColumn column : this.getPrimaryKeyJoinColumns()) { - result = column.javaCompletionProposals(pos, filter, astRoot); + result = column.getJavaCompletionProposals(pos, filter, astRoot); if (result != null) { return result; } @@ -308,8 +307,8 @@ public class GenericJavaPrimaryKeyJoinColumnRelationshipStrategy /** * the join column can be on a secondary table */ - public Iterator<String> candidateTableNames() { - return this.getTypeMapping().allAssociatedTableNames(); + public Iterable<String> getCandidateTableNames() { + return this.getTypeMapping().getAllAssociatedTableNames(); } public TypeMapping getTypeMapping() { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaVirtualJoinTable.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaVirtualJoinTable.java index e7d23ce94a..be5755ae9d 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaVirtualJoinTable.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaVirtualJoinTable.java @@ -9,16 +9,15 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.internal.context.java; -import java.util.Iterator; import java.util.List; import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.common.core.utility.TextRange; import org.eclipse.jpt.common.utility.internal.Tools; +import org.eclipse.jpt.common.utility.internal.iterables.EmptyIterable; import org.eclipse.jpt.common.utility.internal.iterables.EmptyListIterable; import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; import org.eclipse.jpt.common.utility.internal.iterables.SingleElementListIterable; import org.eclipse.jpt.common.utility.internal.iterables.SuperListIterableWrapper; -import org.eclipse.jpt.common.utility.internal.iterators.EmptyIterator; import org.eclipse.jpt.jpa.core.context.Entity; import org.eclipse.jpt.jpa.core.context.PersistentAttribute; import org.eclipse.jpt.jpa.core.context.ReadOnlyBaseJoinColumn; @@ -272,8 +271,8 @@ public class GenericJavaVirtualJoinTable /** * the join column can only be on the join table itself */ - public Iterator<String> candidateTableNames() { - return EmptyIterator.instance(); + public Iterable<String> getCandidateTableNames() { + return EmptyIterable.instance(); } public org.eclipse.jpt.jpa.db.Table resolveDbTable(String tableName) { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmAttributeMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmAttributeMapping.java index e59a7af66c..dc03374687 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmAttributeMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmAttributeMapping.java @@ -10,7 +10,6 @@ package org.eclipse.jpt.jpa.core.internal.context.orm; import java.util.ArrayList; -import java.util.Iterator; import java.util.List; import org.eclipse.jdt.core.IPackageFragment; import org.eclipse.jdt.core.IType; @@ -19,8 +18,7 @@ import org.eclipse.jpt.common.utility.internal.StringTools; import org.eclipse.jpt.common.utility.internal.Tools; import org.eclipse.jpt.common.utility.internal.Transformer; import org.eclipse.jpt.common.utility.internal.iterables.EmptyIterable; -import org.eclipse.jpt.common.utility.internal.iterators.EmptyIterator; -import org.eclipse.jpt.common.utility.internal.iterators.SingleElementIterator; +import org.eclipse.jpt.common.utility.internal.iterables.SingleElementIterable; import org.eclipse.jpt.jpa.core.context.AttributeMapping; import org.eclipse.jpt.jpa.core.context.Column; import org.eclipse.jpt.jpa.core.context.ColumnMapping; @@ -259,22 +257,22 @@ public abstract class AbstractOrmAttributeMapping<X extends XmlAttributeMapping> // ********** embedded mappings ********** - public Iterator<String> allMappingNames() { + public Iterable<String> getAllMappingNames() { return (this.name != null) ? - new SingleElementIterator<String>(this.name) : - EmptyIterator.<String>instance(); + new SingleElementIterable<String>(this.name) : + EmptyIterable.<String>instance(); } - public Iterator<String> allOverridableAttributeMappingNames() { + public Iterable<String> getAllOverridableAttributeMappingNames() { return ((this.name != null) && this.isOverridableAttributeMapping()) ? - new SingleElementIterator<String>(this.name) : - EmptyIterator.<String>instance(); + new SingleElementIterable<String>(this.name) : + EmptyIterable.<String>instance(); } - public Iterator<String> allOverridableAssociationMappingNames() { + public Iterable<String> getAllOverridableAssociationMappingNames() { return ((this.name != null) && this.isOverridableAssociationMapping()) ? - new SingleElementIterator<String>(this.name) : - EmptyIterator.<String>instance(); + new SingleElementIterable<String>(this.name) : + EmptyIterable.<String>instance(); } public Column resolveOverriddenColumn(String attributeName) { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmBaseColumn.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmBaseColumn.java index a671215769..cdf0085147 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmBaseColumn.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmBaseColumn.java @@ -9,7 +9,6 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.internal.context.orm; -import java.util.Iterator; import org.eclipse.jpt.common.core.utility.TextRange; import org.eclipse.jpt.jpa.core.context.ReadOnlyBaseColumn; import org.eclipse.jpt.jpa.core.context.XmlContextNode; @@ -280,8 +279,8 @@ public abstract class AbstractOrmBaseColumn<X extends AbstractXmlColumn, O exten return this.owner.tableNameIsInvalid(this.getTable()); } - public Iterator<String> candidateTableNames() { - return this.owner.candidateTableNames(); + public Iterable<String> getCandidateTableNames() { + return this.owner.getCandidateTableNames(); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmBaseEmbeddedMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmBaseEmbeddedMapping.java index 3d0109dfad..73213dc38a 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmBaseEmbeddedMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmBaseEmbeddedMapping.java @@ -9,14 +9,13 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.internal.context.orm; -import java.util.Iterator; import java.util.List; import org.eclipse.emf.common.util.EList; import org.eclipse.jpt.common.core.utility.TextRange; import org.eclipse.jpt.common.utility.internal.Transformer; -import org.eclipse.jpt.common.utility.internal.iterators.CompositeIterator; -import org.eclipse.jpt.common.utility.internal.iterators.EmptyIterator; -import org.eclipse.jpt.common.utility.internal.iterators.TransformationIterator; +import org.eclipse.jpt.common.utility.internal.iterables.CompositeIterable; +import org.eclipse.jpt.common.utility.internal.iterables.EmptyIterable; +import org.eclipse.jpt.common.utility.internal.iterables.TransformationIterable; import org.eclipse.jpt.jpa.core.context.AttributeMapping; import org.eclipse.jpt.jpa.core.context.AttributeOverride; import org.eclipse.jpt.jpa.core.context.AttributeOverrideContainer; @@ -117,33 +116,33 @@ public abstract class AbstractOrmBaseEmbeddedMapping<X extends AbstractXmlEmbedd // ********** embedded mappings ********** @Override - public Iterator<String> allOverridableAttributeMappingNames() { + public Iterable<String> getAllOverridableAttributeMappingNames() { return this.isJpa2_0Compatible() ? - this.embeddableOverridableAttributeMappingNames() : - super.allOverridableAttributeMappingNames(); + this.getEmbeddableOverridableAttributeMappingNames() : + super.getAllOverridableAttributeMappingNames(); } - protected Iterator<String> embeddableOverridableAttributeMappingNames() { - return this.qualifiedEmbeddableOverridableMappingNames(AttributeMappingTools.ALL_OVERRIDABLE_ATTRIBUTE_MAPPING_NAMES_TRANSFORMER); + protected Iterable<String> getEmbeddableOverridableAttributeMappingNames() { + return this.getQualifiedEmbeddableOverridableMappingNames(AttributeMappingTools.ALL_OVERRIDABLE_ATTRIBUTE_MAPPING_NAMES_TRANSFORMER); } @Override - public Iterator<String> allOverridableAssociationMappingNames() { + public Iterable<String> getAllOverridableAssociationMappingNames() { return this.isJpa2_0Compatible() ? - this.embeddableOverridableAssociationMappingNames() : - super.allOverridableAssociationMappingNames(); + this.getEmbeddableOverridableAssociationMappingNames() : + super.getAllOverridableAssociationMappingNames(); } - protected Iterator<String> embeddableOverridableAssociationMappingNames() { - return this.qualifiedEmbeddableOverridableMappingNames(AttributeMappingTools.ALL_OVERRIDABLE_ASSOCIATION_MAPPING_NAMES_TRANSFORMER); + protected Iterable<String> getEmbeddableOverridableAssociationMappingNames() { + return this.getQualifiedEmbeddableOverridableMappingNames(AttributeMappingTools.ALL_OVERRIDABLE_ASSOCIATION_MAPPING_NAMES_TRANSFORMER); } - protected Iterator<String> qualifiedEmbeddableOverridableMappingNames(Transformer<AttributeMapping, Iterator<String>> transformer) { - return new TransformationIterator<String, String>(this.embeddableAttributeMappingNames(transformer), this.buildQualifierTransformer()); + protected Iterable<String> getQualifiedEmbeddableOverridableMappingNames(Transformer<AttributeMapping, Iterable<String>> transformer) { + return new TransformationIterable<String, String>(this.getEmbeddableAttributeMappingNames(transformer), this.buildQualifierTransformer()); } - protected Iterator<String> embeddableAttributeMappingNames(Transformer<AttributeMapping, Iterator<String>> transformer) { - return new CompositeIterator<String>(this.embeddableAttributeMappingNamesLists(transformer)); + protected Iterable<String> getEmbeddableAttributeMappingNames(Transformer<AttributeMapping, Iterable<String>> transformer) { + return new CompositeIterable<String>(this.getEmbeddableAttributeMappingNamesLists(transformer)); } /** @@ -151,17 +150,17 @@ public abstract class AbstractOrmBaseEmbeddedMapping<X extends AbstractXmlEmbedd * embedded mapping's target embeddable type mapping's attribute mappings * (attribute or association mappings, depending on the specified transformer). */ - protected Iterator<Iterator<String>> embeddableAttributeMappingNamesLists(Transformer<AttributeMapping, Iterator<String>> transformer) { - return new TransformationIterator<AttributeMapping, Iterator<String>>(this.embeddableAttributeMappings(), transformer); + protected Iterable<Iterable<String>> getEmbeddableAttributeMappingNamesLists(Transformer<AttributeMapping, Iterable<String>> transformer) { + return new TransformationIterable<AttributeMapping, Iterable<String>>(this.getEmbeddableAttributeMappings(), transformer); } /** * Return the target embeddable's attribute mappings. */ - protected Iterator<AttributeMapping> embeddableAttributeMappings() { + protected Iterable<AttributeMapping> getEmbeddableAttributeMappings() { return ((this.targetEmbeddable != null) && (this.targetEmbeddable != this.getTypeMapping())) ? - this.targetEmbeddable.attributeMappings() : - EmptyIterator.<AttributeMapping>instance(); + this.targetEmbeddable.getAttributeMappings() : + EmptyIterable.<AttributeMapping>instance(); } @@ -241,9 +240,9 @@ public abstract class AbstractOrmBaseEmbeddedMapping<X extends AbstractXmlEmbedd return AbstractOrmBaseEmbeddedMapping.this.getTargetEmbeddable(); } - public Iterator<String> allOverridableNames() { + public Iterable<String> getAllOverridableNames() { TypeMapping overriddenTypeMapping = this.getOverridableTypeMapping(); - return (overriddenTypeMapping != null) ? this.allOverridableAttributeNames_(overriddenTypeMapping) : EmptyIterator.<String>instance(); + return (overriddenTypeMapping != null) ? this.getAllOverridableAttributeNames_(overriddenTypeMapping) : EmptyIterable.<String>instance(); } /** @@ -251,8 +250,8 @@ public abstract class AbstractOrmBaseEmbeddedMapping<X extends AbstractXmlEmbedd * <p> * NB: Overridden in {@link GenericOrmEmbeddedIdMapping.AttributeOverrideContainerOwner} */ - protected Iterator<String> allOverridableAttributeNames_(TypeMapping overriddenTypeMapping) { - return overriddenTypeMapping.allOverridableAttributeNames(); + protected Iterable<String> getAllOverridableAttributeNames_(TypeMapping overriddenTypeMapping) { + return overriddenTypeMapping.getAllOverridableAttributeNames(); } public Iterable<String> getJavaOverrideNames() { @@ -271,8 +270,8 @@ public abstract class AbstractOrmBaseEmbeddedMapping<X extends AbstractXmlEmbedd return this.getTypeMapping().tableNameIsInvalid(tableName); } - public Iterator<String> candidateTableNames() { - return this.getTypeMapping().allAssociatedTableNames(); + public Iterable<String> getCandidateTableNames() { + return this.getTypeMapping().getAllAssociatedTableNames(); } public org.eclipse.jpt.jpa.db.Table resolveDbTable(String tableName) { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmBasicMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmBasicMapping.java index 1ee7c0a032..cec4aa4f4d 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmBasicMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmBasicMapping.java @@ -9,7 +9,6 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.internal.context.orm; -import java.util.Iterator; import java.util.List; import org.eclipse.jdt.core.IPackageFragment; import org.eclipse.jdt.core.IType; @@ -343,8 +342,8 @@ public abstract class AbstractOrmBasicMapping<X extends XmlBasic> return this.getTypeMapping().tableNameIsInvalid(tableName); } - public Iterator<String> candidateTableNames() { - return this.getTypeMapping().allAssociatedTableNames(); + public Iterable<String> getCandidateTableNames() { + return this.getTypeMapping().getAllAssociatedTableNames(); } public XmlColumn getXmlColumn() { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmEmbeddable.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmEmbeddable.java index e2883a2d88..c71e572580 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmEmbeddable.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmEmbeddable.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2006, 2010 Oracle. All rights reserved. + * Copyright (c) 2006, 2011 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html. @@ -9,8 +9,7 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.internal.context.orm; -import java.util.Iterator; -import org.eclipse.jpt.common.utility.internal.iterators.EmptyIterator; +import org.eclipse.jpt.common.utility.internal.iterables.EmptyIterable; import org.eclipse.jpt.jpa.core.MappingKeys; import org.eclipse.jpt.jpa.core.context.ReadOnlyTable; import org.eclipse.jpt.jpa.core.context.java.JavaEmbeddable; @@ -48,16 +47,16 @@ public abstract class AbstractOrmEmbeddable<X extends XmlEmbeddable> // ********** tables ********** - public Iterator<ReadOnlyTable> associatedTables() { - return EmptyIterator.instance(); + public Iterable<ReadOnlyTable> getAssociatedTables() { + return EmptyIterable.instance(); } - public Iterator<ReadOnlyTable> allAssociatedTables() { - return EmptyIterator.instance(); + public Iterable<ReadOnlyTable> getAllAssociatedTables() { + return EmptyIterable.instance(); } - public Iterator<String> allAssociatedTableNames() { - return EmptyIterator.instance(); + public Iterable<String> getAllAssociatedTableNames() { + return EmptyIterable.instance(); } public boolean tableNameIsInvalid(String tableName) { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmEntity.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmEntity.java index d6a318600d..f898a0df1d 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmEntity.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmEntity.java @@ -23,6 +23,7 @@ import org.eclipse.jpt.common.utility.internal.NotNullFilter; import org.eclipse.jpt.common.utility.internal.StringTools; import org.eclipse.jpt.common.utility.internal.Tools; import org.eclipse.jpt.common.utility.internal.iterables.CompositeIterable; +import org.eclipse.jpt.common.utility.internal.iterables.EmptyIterable; import org.eclipse.jpt.common.utility.internal.iterables.EmptyListIterable; import org.eclipse.jpt.common.utility.internal.iterables.FilteringIterable; import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; @@ -31,9 +32,6 @@ import org.eclipse.jpt.common.utility.internal.iterables.SingleElementListIterab import org.eclipse.jpt.common.utility.internal.iterables.SuperListIterableWrapper; import org.eclipse.jpt.common.utility.internal.iterables.TransformationIterable; import org.eclipse.jpt.common.utility.internal.iterators.CompositeIterator; -import org.eclipse.jpt.common.utility.internal.iterators.EmptyIterator; -import org.eclipse.jpt.common.utility.internal.iterators.FilteringIterator; -import org.eclipse.jpt.common.utility.internal.iterators.TransformationIterator; import org.eclipse.jpt.jpa.core.JpaPlatformVariation.Supported; import org.eclipse.jpt.jpa.core.MappingKeys; import org.eclipse.jpt.jpa.core.context.AssociationOverride; @@ -1371,29 +1369,21 @@ public abstract class AbstractOrmEntity<X extends XmlEntity> // ********** associated tables ********** - public Iterator<ReadOnlyTable> associatedTables() { - return this.getAssociatedTables().iterator(); - } - public Iterable<ReadOnlyTable> getAssociatedTables() { return new CompositeIterable<ReadOnlyTable>(this.table, this.getSecondaryTables()); } - public Iterator<ReadOnlyTable> allAssociatedTables() { - return new CompositeIterator<ReadOnlyTable>(this.allAssociatedTablesLists()); - } - public Iterable<ReadOnlyTable> getAllAssociatedTables() { return CollectionTools.iterable(this.allAssociatedTables()); } - // TODO eliminate duplicate tables? - protected Iterator<Iterator<ReadOnlyTable>> allAssociatedTablesLists() { - return new TransformationIterator<TypeMapping, Iterator<ReadOnlyTable>>(this.inheritanceHierarchy(), TypeMappingTools.ASSOCIATED_TABLES_TRANSFORMER); + public Iterator<ReadOnlyTable> allAssociatedTables() { + return new CompositeIterator<ReadOnlyTable>(this.allAssociatedTablesLists()); } - public Iterator<String> allAssociatedTableNames() { - return this.getAllAssociatedTableNames().iterator(); + // TODO eliminate duplicate tables? + protected Iterable<Iterable<ReadOnlyTable>> allAssociatedTablesLists() { + return new TransformationIterable<TypeMapping, Iterable<ReadOnlyTable>>(this.getInheritanceHierarchy(), TypeMappingTools.ASSOCIATED_TABLES_TRANSFORMER); } public Iterable<String> getAllAssociatedTableNames() { @@ -1540,21 +1530,21 @@ public abstract class AbstractOrmEntity<X extends XmlEntity> } @Override - public Iterator<String> overridableAttributeNames() { + public Iterable<String> getOverridableAttributeNames() { return this.isTablePerClass() ? - super.overridableAttributeNames() : - EmptyIterator.<String>instance(); + super.getOverridableAttributeNames() : + EmptyIterable.<String>instance(); } @Override - public Iterator<String> overridableAssociationNames() { + public Iterable<String> getOverridableAssociationNames() { return this.isTablePerClass() ? - super.overridableAssociationNames() : - EmptyIterator.<String>instance(); + super.getOverridableAssociationNames() : + EmptyIterable.<String>instance(); } public AttributeMapping resolveAttributeMapping(String name) { - for (AttributeMapping attributeMapping : CollectionTools.iterable(this.allAttributeMappings())) { + for (AttributeMapping attributeMapping : this.getAllAttributeMappings()) { AttributeMapping resolvedMapping = attributeMapping.resolveAttributeMapping(name); if (resolvedMapping != null) { return resolvedMapping; @@ -1946,15 +1936,15 @@ public abstract class AbstractOrmEntity<X extends XmlEntity> protected abstract JavaOverrideContainer getOverrideContainer(JavaEntity javaEntity); - public Iterator<String> allOverridableNames() { + public Iterable<String> getAllOverridableNames() { TypeMapping overriddenTypeMapping = this.getOverridableTypeMapping(); - return (overriddenTypeMapping != null) ? this.allOverridableNames_(overriddenTypeMapping) : EmptyIterator.<String>instance(); + return (overriddenTypeMapping != null) ? this.getAllOverridableNames_(overriddenTypeMapping) : EmptyIterable.<String>instance(); } /** * pre-condition: <code>typeMapping</code> is not <code>null</code> */ - protected abstract Iterator<String> allOverridableNames_(TypeMapping overriddenTypeMapping); + protected abstract Iterable<String> getAllOverridableNames_(TypeMapping overriddenTypeMapping); public String getDefaultTableName() { return AbstractOrmEntity.this.getPrimaryTableName(); @@ -1968,8 +1958,8 @@ public abstract class AbstractOrmEntity<X extends XmlEntity> return AbstractOrmEntity.this.resolveDbTable(tableName); } - public Iterator<String> candidateTableNames() { - return AbstractOrmEntity.this.allAssociatedTableNames(); + public Iterable<String> getCandidateTableNames() { + return AbstractOrmEntity.this.getAllAssociatedTableNames(); } } @@ -1986,8 +1976,8 @@ public abstract class AbstractOrmEntity<X extends XmlEntity> } @Override - protected Iterator<String> allOverridableNames_(TypeMapping overriddenTypeMapping) { - return new FilteringIterator<String>(overriddenTypeMapping.allOverridableAttributeNames()) { + protected Iterable<String> getAllOverridableNames_(TypeMapping overriddenTypeMapping) { + return new FilteringIterable<String>(overriddenTypeMapping.getAllOverridableAttributeNames()) { @Override protected boolean accept(String attributeName) { return ! AttributeOverrideContainerOwner.this.getTypeMapping().attributeIsDerivedId(attributeName); @@ -2028,8 +2018,8 @@ public abstract class AbstractOrmEntity<X extends XmlEntity> } @Override - protected Iterator<String> allOverridableNames_(TypeMapping typeMapping) { - return typeMapping.allOverridableAssociationNames(); + protected Iterable<String> getAllOverridableNames_(TypeMapping typeMapping) { + return typeMapping.getAllOverridableAssociationNames(); } public EList<XmlAssociationOverride> getXmlOverrides() { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmIdMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmIdMapping.java index d2ab3a23e4..b41cf8db22 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmIdMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmIdMapping.java @@ -9,7 +9,6 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.internal.context.orm; -import java.util.Iterator; import java.util.List; import org.eclipse.jdt.core.IPackageFragment; import org.eclipse.jdt.core.IType; @@ -369,8 +368,8 @@ public abstract class AbstractOrmIdMapping<X extends XmlId> return this.getTypeMapping().tableNameIsInvalid(tableName); } - public Iterator<String> candidateTableNames() { - return this.getTypeMapping().allAssociatedTableNames(); + public Iterable<String> getCandidateTableNames() { + return this.getTypeMapping().getAllAssociatedTableNames(); } public XmlColumn getXmlColumn() { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmJoinColumnRelationshipStrategy.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmJoinColumnRelationshipStrategy.java index 50adca2b83..29a0097be1 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmJoinColumnRelationshipStrategy.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmJoinColumnRelationshipStrategy.java @@ -9,13 +9,12 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.internal.context.orm; -import java.util.Iterator; import java.util.List; +import org.eclipse.jpt.common.utility.internal.iterables.EmptyIterable; import org.eclipse.jpt.common.utility.internal.iterables.EmptyListIterable; import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; import org.eclipse.jpt.common.utility.internal.iterables.LiveCloneListIterable; import org.eclipse.jpt.common.utility.internal.iterables.SingleElementListIterable; -import org.eclipse.jpt.common.utility.internal.iterators.EmptyIterator; import org.eclipse.jpt.jpa.core.context.JoinColumn; import org.eclipse.jpt.jpa.core.context.ReadOnlyJoinColumn; import org.eclipse.jpt.jpa.core.context.ReadOnlyJoinColumnRelationshipStrategy; @@ -262,9 +261,9 @@ public abstract class AbstractOrmJoinColumnRelationshipStrategy return (relationshipTarget == null) ? null : relationshipTarget.getPrimaryDbTable(); } - protected Iterator<String> candidateTableNames() { + protected Iterable<String> getCandidateTableNames() { TypeMapping typeMapping = this.getRelationshipSource(); - return (typeMapping != null) ? typeMapping.allAssociatedTableNames() : EmptyIterator.<String>instance(); + return (typeMapping != null) ? typeMapping.getAllAssociatedTableNames() : EmptyIterable.<String>instance(); } public void addStrategy() { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmMappedSuperclass.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmMappedSuperclass.java index a67569ccdb..c2c3ee2a22 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmMappedSuperclass.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmMappedSuperclass.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2006, 2010 Oracle. All rights reserved. + * Copyright (c) 2006, 2011 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html. @@ -9,12 +9,11 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.internal.context.orm; -import java.util.Iterator; import java.util.List; import org.eclipse.jdt.core.IPackageFragment; import org.eclipse.jdt.core.IType; import org.eclipse.jpt.common.utility.internal.iterables.CompositeIterable; -import org.eclipse.jpt.common.utility.internal.iterators.EmptyIterator; +import org.eclipse.jpt.common.utility.internal.iterables.EmptyIterable; import org.eclipse.jpt.jpa.core.MappingKeys; import org.eclipse.jpt.jpa.core.context.ReadOnlyTable; import org.eclipse.jpt.jpa.core.context.java.JavaIdClassReference; @@ -125,16 +124,16 @@ public abstract class AbstractOrmMappedSuperclass<X extends XmlMappedSuperclass> // ********** tables ********** - public Iterator<ReadOnlyTable> associatedTables() { - return EmptyIterator.instance(); + public Iterable<ReadOnlyTable> getAssociatedTables() { + return EmptyIterable.instance(); } - public Iterator<ReadOnlyTable> allAssociatedTables() { - return EmptyIterator.instance(); + public Iterable<ReadOnlyTable> getAllAssociatedTables() { + return EmptyIterable.instance(); } - public Iterator<String> allAssociatedTableNames() { - return EmptyIterator.instance(); + public Iterable<String> getAllAssociatedTableNames() { + return EmptyIterable.instance(); } public boolean tableNameIsInvalid(String tableName) { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmMultiRelationshipMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmMultiRelationshipMapping.java index 1f2dbc3b9b..eabf1c41cd 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmMultiRelationshipMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmMultiRelationshipMapping.java @@ -10,7 +10,6 @@ package org.eclipse.jpt.jpa.core.internal.context.orm; import java.util.ArrayList; -import java.util.Iterator; import java.util.List; import org.eclipse.emf.common.util.EList; import org.eclipse.jdt.core.IPackageFragment; @@ -20,7 +19,6 @@ import org.eclipse.jpt.common.utility.internal.Tools; import org.eclipse.jpt.common.utility.internal.iterables.CompositeIterable; import org.eclipse.jpt.common.utility.internal.iterables.EmptyIterable; import org.eclipse.jpt.common.utility.internal.iterables.SingleElementIterable; -import org.eclipse.jpt.common.utility.internal.iterators.EmptyIterator; import org.eclipse.jpt.jpa.core.context.AttributeMapping; import org.eclipse.jpt.jpa.core.context.AttributeOverrideContainer; import org.eclipse.jpt.jpa.core.context.Column; @@ -558,8 +556,8 @@ public abstract class AbstractOrmMultiRelationshipMapping<X extends AbstractXmlM return DEFAULT_FETCH_TYPE; } - public Iterator<String> candidateMapKeyNames() { - return this.allTargetEntityAttributeNames(); + public Iterable<String> getCandidateMapKeyNames() { + return this.getAllTargetEntityAttributeNames(); } @@ -703,8 +701,8 @@ public abstract class AbstractOrmMultiRelationshipMapping<X extends AbstractXmlM return this.getRelationshipStrategy().resolveDbTable(tableName); } - public Iterator<String> candidateTableNames() { - return EmptyIterator.instance(); + public Iterable<String> getCandidateTableNames() { + return EmptyIterable.instance(); } public TextRange getValidationTextRange() { @@ -763,9 +761,9 @@ public abstract class AbstractOrmMultiRelationshipMapping<X extends AbstractXmlM return AbstractOrmMultiRelationshipMapping.this.getResolvedMapKeyEmbeddable(); } - public Iterator<String> allOverridableNames() { + public Iterable<String> getAllOverridableNames() { TypeMapping overriddenTypeMapping = this.getOverridableTypeMapping(); - return (overriddenTypeMapping != null) ? overriddenTypeMapping.allOverridableAttributeNames() : EmptyIterator.<String>instance(); + return (overriddenTypeMapping != null) ? overriddenTypeMapping.getAllOverridableAttributeNames() : EmptyIterable.<String>instance(); } protected JavaAttributeOverride getSpecifiedJavaAttributeOverrideNamed(String attributeName) { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmRelationshipMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmRelationshipMapping.java index 796208c1c7..156abf1809 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmRelationshipMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmRelationshipMapping.java @@ -9,7 +9,6 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.internal.context.orm; -import java.util.Iterator; import java.util.List; import org.eclipse.jdt.core.IPackageFragment; import org.eclipse.jdt.core.IType; @@ -17,9 +16,7 @@ import org.eclipse.jpt.common.core.utility.TextRange; import org.eclipse.jpt.common.utility.internal.iterables.CompositeIterable; import org.eclipse.jpt.common.utility.internal.iterables.EmptyIterable; import org.eclipse.jpt.common.utility.internal.iterables.SingleElementIterable; -import org.eclipse.jpt.common.utility.internal.iterators.CompositeIterator; -import org.eclipse.jpt.common.utility.internal.iterators.EmptyIterator; -import org.eclipse.jpt.common.utility.internal.iterators.TransformationIterator; +import org.eclipse.jpt.common.utility.internal.iterables.TransformationIterable; import org.eclipse.jpt.jpa.core.context.AttributeMapping; import org.eclipse.jpt.jpa.core.context.Entity; import org.eclipse.jpt.jpa.core.context.FetchType; @@ -252,17 +249,17 @@ public abstract class AbstractOrmRelationshipMapping<X extends AbstractXmlRelati //TODO should we set the fetch type from a BasicMapping?? } - public Iterator<String> allTargetEntityAttributeNames() { - return new CompositeIterator<String>(this.allTargetEntityAttributeNamesLists()); + public Iterable<String> getAllTargetEntityAttributeNames() { + return new CompositeIterable<String>(this.getAllTargetEntityAttributeNamesLists()); } - protected Iterator<Iterator<String>> allTargetEntityAttributeNamesLists() { - return new TransformationIterator<AttributeMapping, Iterator<String>>(this.allTargetEntityAttributeMappings(), AttributeMappingTools.ALL_MAPPING_NAMES_TRANSFORMER); + protected Iterable<Iterable<String>> getAllTargetEntityAttributeNamesLists() { + return new TransformationIterable<AttributeMapping, Iterable<String>>(this.getAllTargetEntityAttributeMappings(), AttributeMappingTools.ALL_MAPPING_NAMES_TRANSFORMER); } - protected Iterator<AttributeMapping> allTargetEntityAttributeMappings() { + protected Iterable<AttributeMapping> getAllTargetEntityAttributeMappings() { Entity entity = this.getResolvedTargetEntity(); - return (entity != null) ? entity.allAttributeMappings() : EmptyIterator.<AttributeMapping>instance(); + return (entity != null) ? entity.getAllAttributeMappings() : EmptyIterable.<AttributeMapping>instance(); } protected String getTargetEntityIdAttributeName() { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmTable.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmTable.java index 49f3494e1e..a5b3997bbd 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmTable.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmTable.java @@ -9,14 +9,13 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.internal.context.orm; -import java.util.Iterator; import java.util.List; import org.eclipse.jpt.common.core.utility.TextRange; import org.eclipse.jpt.common.utility.internal.NameTools; +import org.eclipse.jpt.common.utility.internal.iterables.EmptyIterable; import org.eclipse.jpt.common.utility.internal.iterables.EmptyListIterable; import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; import org.eclipse.jpt.common.utility.internal.iterables.LiveCloneListIterable; -import org.eclipse.jpt.common.utility.internal.iterators.EmptyIterator; import org.eclipse.jpt.jpa.core.context.ReadOnlyTable; import org.eclipse.jpt.jpa.core.context.ReadOnlyUniqueConstraint; import org.eclipse.jpt.jpa.core.context.UniqueConstraint; @@ -405,9 +404,9 @@ public abstract class AbstractOrmTable<X extends AbstractXmlTable> // ********** UniqueConstraint.Owner implementation ********** - public Iterator<String> candidateUniqueConstraintColumnNames() { + public Iterable<String> getCandidateUniqueConstraintColumnNames() { org.eclipse.jpt.jpa.db.Table dbTable = this.getDbTable(); - return (dbTable != null) ? dbTable.getSortedColumnIdentifiers().iterator() : EmptyIterator.<String>instance(); + return (dbTable != null) ? dbTable.getSortedColumnIdentifiers() : EmptyIterable.<String>instance(); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmTypeMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmTypeMapping.java index f0931efcdf..c2125fd97b 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmTypeMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmTypeMapping.java @@ -9,7 +9,6 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.internal.context.orm; -import java.util.Iterator; import java.util.List; import org.eclipse.jdt.core.IPackageFragment; import org.eclipse.jdt.core.IType; @@ -18,11 +17,11 @@ import org.eclipse.jpt.common.core.utility.TextRange; import org.eclipse.jpt.common.utility.internal.CollectionTools; import org.eclipse.jpt.common.utility.internal.StringTools; import org.eclipse.jpt.common.utility.internal.Tools; +import org.eclipse.jpt.common.utility.internal.iterables.CompositeIterable; import org.eclipse.jpt.common.utility.internal.iterables.EmptyIterable; import org.eclipse.jpt.common.utility.internal.iterables.FilteringIterable; import org.eclipse.jpt.common.utility.internal.iterables.SingleElementIterable; -import org.eclipse.jpt.common.utility.internal.iterators.CompositeIterator; -import org.eclipse.jpt.common.utility.internal.iterators.TransformationIterator; +import org.eclipse.jpt.common.utility.internal.iterables.TransformationIterable; import org.eclipse.jpt.jpa.core.JpaStructureNode; import org.eclipse.jpt.jpa.core.context.AttributeMapping; import org.eclipse.jpt.jpa.core.context.Column; @@ -244,8 +243,8 @@ public abstract class AbstractOrmTypeMapping<X extends XmlTypeMapping> return true; } - public Iterator<AttributeMapping> attributeMappings() { - return new TransformationIterator<OrmReadOnlyPersistentAttribute, AttributeMapping>(this.getPersistentType().getAttributes()) { + public Iterable<AttributeMapping> getAttributeMappings() { + return new TransformationIterable<OrmReadOnlyPersistentAttribute, AttributeMapping>(this.getPersistentType().getAttributes()) { @Override protected AttributeMapping transform(OrmReadOnlyPersistentAttribute attribute) { return attribute.getMapping(); @@ -253,32 +252,32 @@ public abstract class AbstractOrmTypeMapping<X extends XmlTypeMapping> }; } - public Iterator<AttributeMapping> allAttributeMappings() { - return new CompositeIterator<AttributeMapping>(this.allAttributeMappingsLists()); + public Iterable<AttributeMapping> getAllAttributeMappings() { + return new CompositeIterable<AttributeMapping>(this.getAllAttributeMappingsLists()); } - protected Iterator<Iterator<AttributeMapping>> allAttributeMappingsLists() { - return new TransformationIterator<TypeMapping, Iterator<AttributeMapping>>(this.inheritanceHierarchy(), TypeMappingTools.ATTRIBUTE_MAPPINGS_TRANSFORMER); + protected Iterable<Iterable<AttributeMapping>> getAllAttributeMappingsLists() { + return new TransformationIterable<TypeMapping, Iterable<AttributeMapping>>(this.getInheritanceHierarchy(), TypeMappingTools.ATTRIBUTE_MAPPINGS_TRANSFORMER); } - public Iterator<String> overridableAttributeNames() { - return new CompositeIterator<String>(this.overridableAttributeNamesLists()); + public Iterable<String> getOverridableAttributeNames() { + return new CompositeIterable<String>(this.getOverridableAttributeNamesLists()); } - protected Iterator<Iterator<String>> overridableAttributeNamesLists() { - return new TransformationIterator<AttributeMapping, Iterator<String>>(this.attributeMappings(), AttributeMappingTools.ALL_OVERRIDABLE_ATTRIBUTE_MAPPING_NAMES_TRANSFORMER); + protected Iterable<Iterable<String>> getOverridableAttributeNamesLists() { + return new TransformationIterable<AttributeMapping, Iterable<String>>(this.getAttributeMappings(), AttributeMappingTools.ALL_OVERRIDABLE_ATTRIBUTE_MAPPING_NAMES_TRANSFORMER); } - public Iterator<String> allOverridableAttributeNames() { - return new CompositeIterator<String>(this.allOverridableAttributeNamesLists()); + public Iterable<String> getAllOverridableAttributeNames() { + return new CompositeIterable<String>(this.getAllOverridableAttributeNamesLists()); } - protected Iterator<Iterator<String>> allOverridableAttributeNamesLists() { - return new TransformationIterator<TypeMapping, Iterator<String>>(this.inheritanceHierarchy(), TypeMappingTools.OVERRIDABLE_ATTRIBUTE_NAMES_TRANSFORMER); + protected Iterable<Iterable<String>> getAllOverridableAttributeNamesLists() { + return new TransformationIterable<TypeMapping, Iterable<String>>(this.getInheritanceHierarchy(), TypeMappingTools.OVERRIDABLE_ATTRIBUTE_NAMES_TRANSFORMER); } public Iterable<AttributeMapping> getAttributeMappings(final String mappingKey) { - return new FilteringIterable<AttributeMapping>(CollectionTools.collection(this.attributeMappings())) { + return new FilteringIterable<AttributeMapping>(CollectionTools.collection(this.getAttributeMappings())) { @Override protected boolean accept(AttributeMapping o) { return Tools.valuesAreEqual(o.getKey(), mappingKey); @@ -287,7 +286,7 @@ public abstract class AbstractOrmTypeMapping<X extends XmlTypeMapping> } public Iterable<AttributeMapping> getAllAttributeMappings(final String mappingKey) { - return new FilteringIterable<AttributeMapping>(CollectionTools.collection(this.allAttributeMappings())) { + return new FilteringIterable<AttributeMapping>(CollectionTools.collection(this.getAllAttributeMappings())) { @Override protected boolean accept(AttributeMapping o) { return Tools.valuesAreEqual(o.getKey(), mappingKey); @@ -296,7 +295,7 @@ public abstract class AbstractOrmTypeMapping<X extends XmlTypeMapping> } public Column resolveOverriddenColumn(String attributeName) { - for (AttributeMapping attributeMapping : CollectionTools.iterable(this.attributeMappings())) { + for (AttributeMapping attributeMapping : this.getAttributeMappings()) { Column column = attributeMapping.resolveOverriddenColumn(attributeName); if (column != null) { return column; @@ -311,24 +310,24 @@ public abstract class AbstractOrmTypeMapping<X extends XmlTypeMapping> return null; } - public Iterator<String> overridableAssociationNames() { - return new CompositeIterator<String>(this.overridableAssociationNamesLists()); + public Iterable<String> getOverridableAssociationNames() { + return new CompositeIterable<String>(this.getOverridableAssociationNamesLists()); } - protected Iterator<Iterator<String>> overridableAssociationNamesLists() { - return new TransformationIterator<AttributeMapping, Iterator<String>>(this.attributeMappings(), AttributeMappingTools.ALL_OVERRIDABLE_ASSOCIATION_MAPPING_NAMES_TRANSFORMER); + protected Iterable<Iterable<String>> getOverridableAssociationNamesLists() { + return new TransformationIterable<AttributeMapping, Iterable<String>>(this.getAttributeMappings(), AttributeMappingTools.ALL_OVERRIDABLE_ASSOCIATION_MAPPING_NAMES_TRANSFORMER); } - public Iterator<String> allOverridableAssociationNames() { - return new CompositeIterator<String>(this.allOverridableAssociationNamesLists()); + public Iterable<String> getAllOverridableAssociationNames() { + return new CompositeIterable<String>(this.getAllOverridableAssociationNamesLists()); } - protected Iterator<Iterator<String>> allOverridableAssociationNamesLists() { - return new TransformationIterator<TypeMapping, Iterator<String>>(this.inheritanceHierarchy(), TypeMappingTools.OVERRIDABLE_ASSOCIATION_NAMES_TRANSFORMER); + protected Iterable<Iterable<String>> getAllOverridableAssociationNamesLists() { + return new TransformationIterable<TypeMapping, Iterable<String>>(this.getInheritanceHierarchy(), TypeMappingTools.OVERRIDABLE_ASSOCIATION_NAMES_TRANSFORMER); } public Relationship resolveOverriddenRelationship(String attributeName) { - for (AttributeMapping attributeMapping : CollectionTools.iterable(this.attributeMappings())) { + for (AttributeMapping attributeMapping : this.getAttributeMappings()) { Relationship relationship = attributeMapping.resolveOverriddenRelationship(attributeName); if (relationship != null) { return relationship; @@ -351,12 +350,8 @@ public abstract class AbstractOrmTypeMapping<X extends XmlTypeMapping> return (superPersistentType == null) ? null : superPersistentType.getMapping(); } - public Iterator<TypeMapping> inheritanceHierarchy() { - return this.convertToMappings(this.getPersistentType().inheritanceHierarchy()); - } - - protected Iterable<TypeMapping> getInheritanceHierarchy() { - return CollectionTools.iterable(this.inheritanceHierarchy()); + public Iterable<TypeMapping> getInheritanceHierarchy() { + return this.convertToMappings(this.getPersistentType().getInheritanceHierarchy()); } /** @@ -365,16 +360,12 @@ public abstract class AbstractOrmTypeMapping<X extends XmlTypeMapping> * The returned iterator will return elements infinitely if the hierarchy * has a loop. */ - protected Iterator<TypeMapping> ancestors() { - return this.convertToMappings(this.getPersistentType().ancestors()); - } - protected Iterable<TypeMapping> getAncestors() { - return CollectionTools.iterable(this.ancestors()); + return this.convertToMappings(this.getPersistentType().getAncestors()); } - protected Iterator<TypeMapping> convertToMappings(Iterator<PersistentType> types) { - return new TransformationIterator<PersistentType, TypeMapping>(types) { + protected Iterable<TypeMapping> convertToMappings(Iterable<PersistentType> types) { + return new TransformationIterable<PersistentType, TypeMapping>(types) { @Override protected TypeMapping transform(PersistentType type) { return type.getMapping(); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmVersionMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmVersionMapping.java index 7b49b8fb6f..d2c9d40b6b 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmVersionMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmVersionMapping.java @@ -9,7 +9,6 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.internal.context.orm; -import java.util.Iterator; import java.util.List; import org.eclipse.jdt.core.IPackageFragment; import org.eclipse.jdt.core.IType; @@ -246,8 +245,8 @@ public abstract class AbstractOrmVersionMapping<X extends XmlVersion> return this.getTypeMapping().tableNameIsInvalid(tableName); } - public Iterator<String> candidateTableNames() { - return this.getTypeMapping().allAssociatedTableNames(); + public Iterable<String> getCandidateTableNames() { + return this.getTypeMapping().getAllAssociatedTableNames(); } public XmlColumn getXmlColumn() { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmVirtualBaseColumn.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmVirtualBaseColumn.java index 513e186bbd..85933e2db2 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmVirtualBaseColumn.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmVirtualBaseColumn.java @@ -9,7 +9,6 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.internal.context.orm; -import java.util.Iterator; import org.eclipse.jpt.common.core.utility.TextRange; import org.eclipse.jpt.jpa.core.context.ReadOnlyBaseColumn; import org.eclipse.jpt.jpa.core.context.VirtualBaseColumn; @@ -246,8 +245,8 @@ public abstract class AbstractOrmVirtualBaseColumn<O extends OrmReadOnlyBaseColu return this.owner.tableNameIsInvalid(this.getTable()); } - public Iterator<String> candidateTableNames() { - return this.owner.candidateTableNames(); + public Iterable<String> getCandidateTableNames() { + return this.owner.getCandidateTableNames(); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/GenericOrmMappedByRelationshipStrategy.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/GenericOrmMappedByRelationshipStrategy.java index 9443c3f0cc..77a8eb8aa0 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/GenericOrmMappedByRelationshipStrategy.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/GenericOrmMappedByRelationshipStrategy.java @@ -9,7 +9,6 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.internal.context.orm; -import java.util.Iterator; import java.util.List; import org.eclipse.jpt.common.core.utility.TextRange; import org.eclipse.jpt.common.utility.internal.ArrayTools; @@ -152,8 +151,8 @@ public class GenericOrmMappedByRelationshipStrategy } } - public Iterator<String> candidateMappedByAttributeNames() { - return this.getRelationshipMapping().allTargetEntityAttributeNames(); + public Iterable<String> getCandidateMappedByAttributeNames() { + return this.getRelationshipMapping().getAllTargetEntityAttributeNames(); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/GenericOrmMappingJoinColumnRelationshipStrategy.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/GenericOrmMappingJoinColumnRelationshipStrategy.java index d05d1c81fb..2cbba2264a 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/GenericOrmMappingJoinColumnRelationshipStrategy.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/GenericOrmMappingJoinColumnRelationshipStrategy.java @@ -9,7 +9,6 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.internal.context.orm; -import java.util.Iterator; import org.eclipse.jpt.common.core.utility.TextRange; import org.eclipse.jpt.jpa.core.context.Entity; import org.eclipse.jpt.jpa.core.context.PersistentAttribute; @@ -140,8 +139,8 @@ public class GenericOrmMappingJoinColumnRelationshipStrategy return GenericOrmMappingJoinColumnRelationshipStrategy.this.tableNameIsInvalid(tableName); } - public Iterator<String> candidateTableNames() { - return GenericOrmMappingJoinColumnRelationshipStrategy.this.candidateTableNames(); + public Iterable<String> getCandidateTableNames() { + return GenericOrmMappingJoinColumnRelationshipStrategy.this.getCandidateTableNames(); } public Table resolveDbTable(String tableName) { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/GenericOrmOverrideJoinColumnRelationshipStrategy.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/GenericOrmOverrideJoinColumnRelationshipStrategy.java index 00be65dc16..c08686c22b 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/GenericOrmOverrideJoinColumnRelationshipStrategy.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/GenericOrmOverrideJoinColumnRelationshipStrategy.java @@ -9,7 +9,6 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.internal.context.orm; -import java.util.Iterator; import org.eclipse.jpt.common.core.utility.TextRange; import org.eclipse.jpt.jpa.core.context.Entity; import org.eclipse.jpt.jpa.core.context.PersistentAttribute; @@ -96,10 +95,10 @@ public class GenericOrmOverrideJoinColumnRelationshipStrategy } @Override - public Iterator<String> candidateTableNames() { + public Iterable<String> getCandidateTableNames() { return this.isTargetForeignKey() ? - super.candidateTableNames() : - this.getRelationship().candidateTableNames(); + super.getCandidateTableNames() : + this.getRelationship().getCandidateTableNames(); } public String getColumnTableNotValidDescription() { @@ -159,8 +158,8 @@ public class GenericOrmOverrideJoinColumnRelationshipStrategy return GenericOrmOverrideJoinColumnRelationshipStrategy.this.tableNameIsInvalid(tableName); } - public Iterator<String> candidateTableNames() { - return GenericOrmOverrideJoinColumnRelationshipStrategy.this.candidateTableNames(); + public Iterable<String> getCandidateTableNames() { + return GenericOrmOverrideJoinColumnRelationshipStrategy.this.getCandidateTableNames(); } public Table resolveDbTable(String tableName) { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/GenericOrmPrimaryKeyJoinColumnRelationshipStrategy.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/GenericOrmPrimaryKeyJoinColumnRelationshipStrategy.java index 8112e55410..bcbe5ac2d1 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/GenericOrmPrimaryKeyJoinColumnRelationshipStrategy.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/GenericOrmPrimaryKeyJoinColumnRelationshipStrategy.java @@ -9,7 +9,6 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.internal.context.orm; -import java.util.Iterator; import java.util.List; import org.eclipse.jpt.common.core.utility.TextRange; import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; @@ -266,8 +265,8 @@ public class GenericOrmPrimaryKeyJoinColumnRelationshipStrategy return this.getTypeMapping().tableNameIsInvalid(tableName); } - public Iterator<String> candidateTableNames() { - return this.getTypeMapping().allAssociatedTableNames(); + public Iterable<String> getCandidateTableNames() { + return this.getTypeMapping().getAllAssociatedTableNames(); } public TypeMapping getTypeMapping() { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/GenericOrmVirtualJoinTable.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/GenericOrmVirtualJoinTable.java index ebc7ca07dc..ca3dfd563b 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/GenericOrmVirtualJoinTable.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/GenericOrmVirtualJoinTable.java @@ -9,15 +9,14 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.internal.context.orm; -import java.util.Iterator; import java.util.List; import org.eclipse.jpt.common.core.utility.TextRange; import org.eclipse.jpt.common.utility.internal.Tools; +import org.eclipse.jpt.common.utility.internal.iterables.EmptyIterable; import org.eclipse.jpt.common.utility.internal.iterables.EmptyListIterable; import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; import org.eclipse.jpt.common.utility.internal.iterables.SingleElementListIterable; import org.eclipse.jpt.common.utility.internal.iterables.SuperListIterableWrapper; -import org.eclipse.jpt.common.utility.internal.iterators.EmptyIterator; import org.eclipse.jpt.jpa.core.context.Entity; import org.eclipse.jpt.jpa.core.context.PersistentAttribute; import org.eclipse.jpt.jpa.core.context.ReadOnlyBaseJoinColumn; @@ -271,8 +270,8 @@ public class GenericOrmVirtualJoinTable /** * the join column can only be on the join table itself */ - public Iterator<String> candidateTableNames() { - return EmptyIterator.instance(); + public Iterable<String> getCandidateTableNames() { + return EmptyIterable.instance(); } public org.eclipse.jpt.jpa.db.Table resolveDbTable(String tableName) { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/GenericOrmVirtualOverrideJoinColumnRelationshipStrategy.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/GenericOrmVirtualOverrideJoinColumnRelationshipStrategy.java index 5a190d553b..95a79ea5dc 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/GenericOrmVirtualOverrideJoinColumnRelationshipStrategy.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/GenericOrmVirtualOverrideJoinColumnRelationshipStrategy.java @@ -9,14 +9,13 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.internal.context.orm; -import java.util.Iterator; import java.util.List; import org.eclipse.jpt.common.core.utility.TextRange; +import org.eclipse.jpt.common.utility.internal.iterables.EmptyIterable; import org.eclipse.jpt.common.utility.internal.iterables.EmptyListIterable; import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; import org.eclipse.jpt.common.utility.internal.iterables.SingleElementListIterable; import org.eclipse.jpt.common.utility.internal.iterables.SuperListIterableWrapper; -import org.eclipse.jpt.common.utility.internal.iterators.EmptyIterator; import org.eclipse.jpt.jpa.core.context.Entity; import org.eclipse.jpt.jpa.core.context.ReadOnlyBaseColumn; import org.eclipse.jpt.jpa.core.context.ReadOnlyBaseJoinColumn; @@ -290,15 +289,15 @@ public class GenericOrmVirtualOverrideJoinColumnRelationshipStrategy return (relationshipTarget == null) ? null : relationshipTarget.getPrimaryDbTable(); } - protected Iterator<String> candidateTableNames() { + protected Iterable<String> getCandidateTableNames() { return this.isTargetForeignKey() ? - this.targetCandidateTableNames() : - this.getRelationship().candidateTableNames(); + this.getTargetCandidateTableNames() : + this.getRelationship().getCandidateTableNames(); } - protected Iterator<String> targetCandidateTableNames() { + protected Iterable<String> getTargetCandidateTableNames() { TypeMapping typeMapping = this.getRelationshipMapping().getResolvedTargetEntity(); - return (typeMapping != null) ? typeMapping.allAssociatedTableNames() : EmptyIterator.<String>instance(); + return (typeMapping != null) ? typeMapping.getAllAssociatedTableNames() : EmptyIterable.<String>instance(); } public TextRange getValidationTextRange() { @@ -359,8 +358,8 @@ public class GenericOrmVirtualOverrideJoinColumnRelationshipStrategy return GenericOrmVirtualOverrideJoinColumnRelationshipStrategy.this.tableNameIsInvalid(tableName); } - public Iterator<String> candidateTableNames() { - return GenericOrmVirtualOverrideJoinColumnRelationshipStrategy.this.candidateTableNames(); + public Iterable<String> getCandidateTableNames() { + return GenericOrmVirtualOverrideJoinColumnRelationshipStrategy.this.getCandidateTableNames(); } public Table resolveDbTable(String tableName) { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/AbstractPrimaryKeyValidator.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/AbstractPrimaryKeyValidator.java index e2dfa83259..20333cca33 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/AbstractPrimaryKeyValidator.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/AbstractPrimaryKeyValidator.java @@ -10,7 +10,6 @@ package org.eclipse.jpt.jpa.core.internal.jpa1.context; import java.util.Collection; -import java.util.Iterator; import java.util.List; import org.eclipse.jpt.common.utility.internal.ClassName; import org.eclipse.jpt.common.utility.internal.CollectionTools; @@ -268,7 +267,7 @@ public abstract class AbstractPrimaryKeyValidator * Return whether an ancestor class has defined any aspect of the primary key */ protected boolean definesPrimaryKeyOnAncestor(TypeMapping typeMapping) { - for (TypeMapping each : CollectionTools.iterable(typeMapping.inheritanceHierarchy())) { + for (TypeMapping each : typeMapping.getInheritanceHierarchy()) { if (each != typeMapping && definesPrimaryKey(each)) { return true; } @@ -375,7 +374,7 @@ public abstract class AbstractPrimaryKeyValidator * Return whether an ancestor class has defined an id class */ protected boolean definesIdClassOnAncestor(TypeMapping typeMapping) { - for (TypeMapping each : CollectionTools.iterable(typeMapping.inheritanceHierarchy())) { + for (TypeMapping each : typeMapping.getInheritanceHierarchy()) { if (each != typeMapping && definesIdClass(each)) { return true; } @@ -388,10 +387,9 @@ public abstract class AbstractPrimaryKeyValidator * or on an ancestor */ protected JavaPersistentType getIdClass(TypeMapping typeMapping) { - for (Iterator<TypeMapping> stream = typeMapping.inheritanceHierarchy(); stream.hasNext(); ) { - TypeMapping next = stream.next(); - if (next.getIdClass() != null) { - return next.getIdClass(); + for (TypeMapping each : typeMapping.getInheritanceHierarchy()) { + if (each.getIdClass() != null) { + return each.getIdClass(); } } return null; @@ -401,7 +399,7 @@ public abstract class AbstractPrimaryKeyValidator // **************** attribute mappings in general ************************* protected Iterable<AttributeMapping> getAttributeMappings(TypeMapping typeMapping) { - return CollectionTools.collection(typeMapping.allAttributeMappings()); + return CollectionTools.collection(typeMapping.getAllAttributeMappings()); } /** diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/OverrideValidator.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/OverrideValidator.java index b247a5d664..30605494ce 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/OverrideValidator.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/OverrideValidator.java @@ -94,7 +94,7 @@ public abstract class OverrideValidator } protected boolean validateName(List<IMessage> messages) { - if ( ! CollectionTools.contains(this.container.allOverridableNames(), this.override.getName())) { + if ( ! CollectionTools.contains(this.container.getAllOverridableNames(), this.override.getName())) { messages.add(this.buildUnresolvedNameMessage()); return false; } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/AbstractJavaOverrideContainer.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/AbstractJavaOverrideContainer.java index e9de36ba5b..1ad90725e3 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/AbstractJavaOverrideContainer.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/AbstractJavaOverrideContainer.java @@ -27,7 +27,6 @@ import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; import org.eclipse.jpt.common.utility.internal.iterables.LiveCloneListIterable; import org.eclipse.jpt.common.utility.internal.iterables.SubIterableWrapper; import org.eclipse.jpt.common.utility.internal.iterables.TransformationIterable; -import org.eclipse.jpt.common.utility.internal.iterators.EmptyIterator; import org.eclipse.jpt.common.utility.internal.iterators.FilteringIterator; import org.eclipse.jpt.jpa.core.context.Override_; import org.eclipse.jpt.jpa.core.context.ReadOnlyBaseColumn; @@ -181,7 +180,7 @@ public abstract class AbstractJavaOverrideContainer< * remaining specified overrides. */ protected boolean overrideWillBeVirtual(String overrideName, S specifiedOverrideToBeRemoved) { - return CollectionTools.contains(this.allOverridableNames(), overrideName) && + return CollectionTools.contains(this.getAllOverridableNames(), overrideName) && (this.getSpecifiedOverrideNamed(overrideName, specifiedOverrideToBeRemoved) == null); } @@ -422,7 +421,7 @@ public abstract class AbstractJavaOverrideContainer< } protected Iterator<String> virtualOverrideNames() { - return new FilteringIterator<String>(this.allOverridableNames()) { + return new FilteringIterator<String>(this.getAllOverridableNames()) { @Override protected boolean accept(String name) { return AbstractJavaOverrideContainer.this.overrideIsVirtual(name); @@ -496,16 +495,16 @@ public abstract class AbstractJavaOverrideContainer< return this.owner.getOverridableTypeMapping(); } - public Iterator<String> allOverridableNames() { - return (this.owner != null) ? this.owner.allOverridableNames() : EmptyIterator.<String>instance(); + public Iterable<String> getAllOverridableNames() { + return (this.owner != null) ? this.owner.getAllOverridableNames() : EmptyIterable.<String>instance(); } public boolean tableNameIsInvalid(String tableName) { return this.owner.tableNameIsInvalid(tableName); } - public Iterator<String> candidateTableNames() { - return this.owner.candidateTableNames(); + public Iterable<String> getCandidateTableNames() { + return this.owner.getCandidateTableNames(); } public Table resolveDbTable(String tableName) { @@ -552,13 +551,13 @@ public abstract class AbstractJavaOverrideContainer< // ********** code completion ********** @Override - public Iterator<String> javaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) { - Iterator<String> result = super.javaCompletionProposals(pos, filter, astRoot); + public Iterable<String> getJavaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) { + Iterable<String> result = super.getJavaCompletionProposals(pos, filter, astRoot); if (result != null) { return result; } for (R override : this.getOverrides()) { - result = override.javaCompletionProposals(pos, filter, astRoot); + result = override.getJavaCompletionProposals(pos, filter, astRoot); if (result != null) { return result; } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaAssociationOverride.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaAssociationOverride.java index 947adfac86..55f80de86c 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaAssociationOverride.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaAssociationOverride.java @@ -9,7 +9,6 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.internal.jpa1.context.java; -import java.util.Iterator; import java.util.List; import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.common.utility.Filter; @@ -105,12 +104,12 @@ public class GenericJavaAssociationOverride // ********** Java completion proposals ********** @Override - public Iterator<String> javaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) { - Iterator<String> result = super.javaCompletionProposals(pos, filter, astRoot); + public Iterable<String> getJavaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) { + Iterable<String> result = super.getJavaCompletionProposals(pos, filter, astRoot); if (result != null) { return result; } - result = this.relationship.javaCompletionProposals(pos, filter, astRoot); + result = this.relationship.getJavaCompletionProposals(pos, filter, astRoot); if (result != null) { return result; } @@ -118,8 +117,8 @@ public class GenericJavaAssociationOverride } @Override - protected Iterator<String> candidateNames() { - return this.getContainer().allOverridableNames(); + protected Iterable<String> getCandidateNames() { + return this.getContainer().getAllOverridableNames(); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaAttributeOverride.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaAttributeOverride.java index 7147fa7423..b59988143a 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaAttributeOverride.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaAttributeOverride.java @@ -9,7 +9,6 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.internal.jpa1.context.java; -import java.util.Iterator; import java.util.List; import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.common.utility.Filter; @@ -123,12 +122,12 @@ public class GenericJavaAttributeOverride // ********** Java completion proposals ********** @Override - public Iterator<String> javaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) { - Iterator<String> result = super.javaCompletionProposals(pos, filter, astRoot); + public Iterable<String> getJavaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) { + Iterable<String> result = super.getJavaCompletionProposals(pos, filter, astRoot); if (result != null) { return result; } - result = this.column.javaCompletionProposals(pos, filter, astRoot); + result = this.column.getJavaCompletionProposals(pos, filter, astRoot); if (result != null) { return result; } @@ -136,8 +135,8 @@ public class GenericJavaAttributeOverride } @Override - protected Iterator<String> candidateNames() { - return this.getContainer().allOverridableNames(); + protected Iterable<String> getCandidateNames() { + return this.getContainer().getAllOverridableNames(); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaEmbeddedIdMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaEmbeddedIdMapping.java index ff6de341bd..f77e44ff23 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaEmbeddedIdMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaEmbeddedIdMapping.java @@ -9,11 +9,10 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.internal.jpa1.context.java; -import java.util.Iterator; import java.util.List; import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jpt.common.utility.internal.iterators.EmptyIterator; -import org.eclipse.jpt.common.utility.internal.iterators.FilteringIterator; +import org.eclipse.jpt.common.utility.internal.iterables.EmptyIterable; +import org.eclipse.jpt.common.utility.internal.iterables.FilteringIterable; import org.eclipse.jpt.jpa.core.MappingKeys; import org.eclipse.jpt.jpa.core.context.TypeMapping; import org.eclipse.jpt.jpa.core.context.java.JavaAttributeOverrideContainer; @@ -85,10 +84,10 @@ public class GenericJavaEmbeddedIdMapping } @Override - protected Iterator<String> embeddableOverridableAttributeMappingNames() { + protected Iterable<String> getEmbeddableOverridableAttributeMappingNames() { return (this.derived) ? - EmptyIterator.<String>instance() : - super.embeddableOverridableAttributeMappingNames(); + EmptyIterable.<String>instance() : + super.getEmbeddableOverridableAttributeMappingNames(); } @Override @@ -127,15 +126,15 @@ public class GenericJavaEmbeddedIdMapping extends AbstractJavaBaseEmbeddedMapping<EmbeddedIdAnnotation>.AttributeOverrideContainerOwner { @Override - public Iterator<String> allOverridableNames() { + public Iterable<String> getAllOverridableNames() { return GenericJavaEmbeddedIdMapping.this.isDerived() ? - EmptyIterator.<String>instance() : - super.allOverridableNames(); + EmptyIterable.<String>instance() : + super.getAllOverridableNames(); } @Override - protected Iterator<String> allOverridableAttributeNames_(TypeMapping overriddenTypeMapping) { - return new FilteringIterator<String>(super.allOverridableAttributeNames_(overriddenTypeMapping)) { + protected Iterable<String> getAllOverridableAttributeNames_(TypeMapping overriddenTypeMapping) { + return new FilteringIterable<String>(super.getAllOverridableAttributeNames_(overriddenTypeMapping)) { @Override protected boolean accept(String attributeName) { return ! AttributeOverrideContainerOwner.this.getTypeMapping().attributeIsDerivedId(attributeName); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaEmbeddedMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaEmbeddedMapping.java index eefe8e76e2..80c6ec58a7 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaEmbeddedMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaEmbeddedMapping.java @@ -9,15 +9,13 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.internal.jpa1.context.java; -import java.util.Iterator; import java.util.List; import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.common.core.resource.java.JavaResourceAttribute; import org.eclipse.jpt.common.core.utility.TextRange; import org.eclipse.jpt.common.utility.Filter; -import org.eclipse.jpt.common.utility.internal.CollectionTools; -import org.eclipse.jpt.common.utility.internal.iterators.CompositeIterator; -import org.eclipse.jpt.common.utility.internal.iterators.EmptyIterator; +import org.eclipse.jpt.common.utility.internal.iterables.CompositeIterable; +import org.eclipse.jpt.common.utility.internal.iterables.EmptyIterable; import org.eclipse.jpt.jpa.core.MappingKeys; import org.eclipse.jpt.jpa.core.context.AssociationOverride; import org.eclipse.jpt.jpa.core.context.AssociationOverrideContainer; @@ -112,14 +110,14 @@ public class GenericJavaEmbeddedMapping */ @Override @SuppressWarnings("unchecked") - public Iterator<String> allMappingNames() { + public Iterable<String> getAllMappingNames() { return this.isJpa2_0Compatible() ? - new CompositeIterator<String>(super.allMappingNames(), this.allEmbeddableAttributeMappingNames()) : - super.allMappingNames(); + new CompositeIterable<String>(super.getAllMappingNames(), this.getAllEmbeddableAttributeMappingNames()) : + super.getAllMappingNames(); } - protected Iterator<String> allEmbeddableAttributeMappingNames() { - return this.qualifiedEmbeddableOverridableMappingNames(AttributeMappingTools.ALL_MAPPING_NAMES_TRANSFORMER); + protected Iterable<String> getAllEmbeddableAttributeMappingNames() { + return this.getQualifiedEmbeddableOverridableMappingNames(AttributeMappingTools.ALL_MAPPING_NAMES_TRANSFORMER); } @Override @@ -137,7 +135,7 @@ public class GenericJavaEmbeddedMapping return null; } // recurse into the embeddable mappings - for (AttributeMapping mapping : CollectionTools.iterable(this.embeddableAttributeMappings())) { + for (AttributeMapping mapping : this.getEmbeddableAttributeMappings()) { AttributeMapping resolvedMapping = mapping.resolveAttributeMapping(attributeName); if (resolvedMapping != null) { return resolvedMapping; @@ -186,13 +184,13 @@ public class GenericJavaEmbeddedMapping // ********** Java completion proposals ********** @Override - public Iterator<String> javaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) { - Iterator<String> result = super.javaCompletionProposals(pos, filter, astRoot); + public Iterable<String> getJavaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) { + Iterable<String> result = super.getJavaCompletionProposals(pos, filter, astRoot); if (result != null) { return result; } - result = this.associationOverrideContainer.javaCompletionProposals(pos, filter, astRoot); + result = this.associationOverrideContainer.getJavaCompletionProposals(pos, filter, astRoot); if (result != null) { return result; } @@ -236,9 +234,9 @@ public class GenericJavaEmbeddedMapping return GenericJavaEmbeddedMapping.this.getTargetEmbeddable(); } - public Iterator<String> allOverridableNames() { + public Iterable<String> getAllOverridableNames() { TypeMapping typeMapping = this.getOverridableTypeMapping(); - return (typeMapping != null) ? typeMapping.allOverridableAssociationNames() : EmptyIterator.<String>instance(); + return (typeMapping != null) ? typeMapping.getAllOverridableAssociationNames() : EmptyIterable.<String>instance(); } public Relationship resolveOverriddenRelationship(String attributeName) { @@ -249,8 +247,8 @@ public class GenericJavaEmbeddedMapping return this.getTypeMapping().tableNameIsInvalid(tableName); } - public Iterator<String> candidateTableNames() { - return this.getTypeMapping().allAssociatedTableNames(); + public Iterable<String> getCandidateTableNames() { + return this.getTypeMapping().getAllAssociatedTableNames(); } public org.eclipse.jpt.jpa.db.Table resolveDbTable(String tableName) { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaGeneratedValue.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaGeneratedValue.java index 4ef75043af..6e91d7e198 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaGeneratedValue.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaGeneratedValue.java @@ -9,13 +9,12 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.internal.jpa1.context.java; -import java.util.Iterator; import java.util.List; import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.common.core.utility.TextRange; import org.eclipse.jpt.common.utility.Filter; import org.eclipse.jpt.common.utility.internal.StringTools; -import org.eclipse.jpt.common.utility.internal.iterators.FilteringIterator; +import org.eclipse.jpt.common.utility.internal.iterables.FilteringIterable; import org.eclipse.jpt.jpa.core.context.GenerationType; import org.eclipse.jpt.jpa.core.context.Generator; import org.eclipse.jpt.jpa.core.context.java.JavaGeneratedValue; @@ -163,13 +162,13 @@ public class GenericJavaGeneratedValue // ********** Java completion proposals ********** @Override - public Iterator<String> javaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) { - Iterator<String> result = super.javaCompletionProposals(pos, filter, astRoot); + public Iterable<String> getJavaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) { + Iterable<String> result = super.getJavaCompletionProposals(pos, filter, astRoot); if (result != null) { return result; } if (this.generatorTouches(pos, astRoot)) { - return this.javaCandidateGeneratorNames(filter); + return this.getJavaCandidateGeneratorNames(filter); } return null; } @@ -178,16 +177,16 @@ public class GenericJavaGeneratedValue return this.generatedValueAnnotation.generatorTouches(pos, astRoot); } - protected Iterator<String> javaCandidateGeneratorNames(Filter<String> filter) { - return StringTools.convertToJavaStringLiterals(this.candidateGeneratorNames(filter)); + protected Iterable<String> getJavaCandidateGeneratorNames(Filter<String> filter) { + return StringTools.convertToJavaStringLiterals(this.getCandidateGeneratorNames(filter)); } - protected Iterator<String> candidateGeneratorNames(Filter<String> filter) { - return new FilteringIterator<String>(this.candidateGeneratorNames(), filter); + protected Iterable<String> getCandidateGeneratorNames(Filter<String> filter) { + return new FilteringIterable<String>(this.getCandidateGeneratorNames(), filter); } - protected Iterator<String> candidateGeneratorNames() { - return this.getPersistenceUnit().getUniqueGeneratorNames().iterator(); + protected Iterable<String> getCandidateGeneratorNames() { + return this.getPersistenceUnit().getUniqueGeneratorNames(); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaGeneratorContainer.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaGeneratorContainer.java index 9ea0c679a5..9b330f4e25 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaGeneratorContainer.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaGeneratorContainer.java @@ -9,7 +9,6 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.internal.jpa1.context.java; -import java.util.Iterator; import java.util.List; import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.common.core.utility.TextRange; @@ -194,19 +193,19 @@ public class GenericJavaGeneratorContainer // ********** code completion ********** @Override - public Iterator<String> javaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) { - Iterator<String> result = super.javaCompletionProposals(pos, filter, astRoot); + public Iterable<String> getJavaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) { + Iterable<String> result = super.getJavaCompletionProposals(pos, filter, astRoot); if (result != null) { return result; } if (this.tableGenerator != null) { - result = this.tableGenerator.javaCompletionProposals(pos, filter, astRoot); + result = this.tableGenerator.getJavaCompletionProposals(pos, filter, astRoot); if (result != null) { return result; } } if (this.sequenceGenerator != null) { - result = this.sequenceGenerator.javaCompletionProposals(pos, filter, astRoot); + result = this.sequenceGenerator.getJavaCompletionProposals(pos, filter, astRoot); if (result != null) { return result; } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaJoinColumn.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaJoinColumn.java index d945316c69..2c6dbbeafb 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaJoinColumn.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaJoinColumn.java @@ -9,7 +9,6 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.internal.jpa1.context.java; -import java.util.Iterator; import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.common.core.utility.TextRange; import org.eclipse.jpt.common.utility.Filter; @@ -170,13 +169,13 @@ public class GenericJavaJoinColumn // ********** Java completion proposals ********** @Override - protected Iterator<String> connectedJavaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) { - Iterator<String> result = super.connectedJavaCompletionProposals(pos, filter, astRoot); + protected Iterable<String> getConnectedJavaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) { + Iterable<String> result = super.getConnectedJavaCompletionProposals(pos, filter, astRoot); if (result != null) { return result; } if (this.referencedColumnNameTouches(pos, astRoot)) { - return this.getJavaCandidateReferencedColumnNames(filter).iterator(); + return this.getJavaCandidateReferencedColumnNames(filter); } return null; } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaJoinTable.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaJoinTable.java index 7712a12b19..5f26bd42de 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaJoinTable.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaJoinTable.java @@ -9,16 +9,15 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.internal.jpa1.context.java; -import java.util.Iterator; import java.util.List; import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.common.core.utility.TextRange; import org.eclipse.jpt.common.utility.Filter; import org.eclipse.jpt.common.utility.internal.Tools; +import org.eclipse.jpt.common.utility.internal.iterables.EmptyIterable; import org.eclipse.jpt.common.utility.internal.iterables.EmptyListIterable; import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; import org.eclipse.jpt.common.utility.internal.iterables.SingleElementListIterable; -import org.eclipse.jpt.common.utility.internal.iterators.EmptyIterator; import org.eclipse.jpt.jpa.core.context.Entity; import org.eclipse.jpt.jpa.core.context.JoinColumn; import org.eclipse.jpt.jpa.core.context.PersistentAttribute; @@ -294,13 +293,13 @@ public class GenericJavaJoinTable // ********** Java completion proposals ********** @Override - public Iterator<String> javaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) { - Iterator<String> result = super.javaCompletionProposals(pos, filter, astRoot); + public Iterable<String> getJavaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) { + Iterable<String> result = super.getJavaCompletionProposals(pos, filter, astRoot); if (result != null) { return result; } for (JavaJoinColumn column : this.getInverseJoinColumns()) { - result = column.javaCompletionProposals(pos, filter, astRoot); + result = column.getJavaCompletionProposals(pos, filter, astRoot); if (result != null) { return result; } @@ -356,8 +355,8 @@ public class GenericJavaJoinTable /** * the join column can only be on the join table itself */ - public Iterator<String> candidateTableNames() { - return EmptyIterator.instance(); + public Iterable<String> getCandidateTableNames() { + return EmptyIterable.instance(); } public org.eclipse.jpt.jpa.db.Table resolveDbTable(String tableName) { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaOrderable.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaOrderable.java index 443be27767..62922210b2 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaOrderable.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaOrderable.java @@ -9,7 +9,6 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.internal.jpa1.context.java; -import java.util.Iterator; import java.util.List; import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.common.core.resource.java.JavaResourceAttribute; @@ -407,13 +406,13 @@ public class GenericJavaOrderable // ********** Java completion proposals ********** @Override - public Iterator<String> javaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) { - Iterator<String> result = super.javaCompletionProposals(pos, filter, astRoot); + public Iterable<String> getJavaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) { + Iterable<String> result = super.getJavaCompletionProposals(pos, filter, astRoot); if (result != null) { return result; } - return this.orderColumn.javaCompletionProposals(pos, filter, astRoot); + return this.orderColumn.getJavaCompletionProposals(pos, filter, astRoot); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaOverrideRelationship.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaOverrideRelationship.java index f6547648bb..12382f0f46 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaOverrideRelationship.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaOverrideRelationship.java @@ -9,7 +9,6 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.internal.jpa1.context.java; -import java.util.Iterator; import java.util.List; import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.common.core.utility.TextRange; @@ -248,8 +247,8 @@ public class GenericJavaOverrideRelationship return this.getAssociationOverride().tableNameIsInvalid(tableName); } - public Iterator<String> candidateTableNames() { - return this.getAssociationOverride().candidateTableNames(); + public Iterable<String> getCandidateTableNames() { + return this.getAssociationOverride().getCandidateTableNames(); } public Table resolveDbTable(String tableName) { @@ -285,13 +284,13 @@ public class GenericJavaOverrideRelationship // ********** Java completion proposals ********** @Override - public Iterator<String> javaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) { - Iterator<String> result = super.javaCompletionProposals(pos, filter, astRoot); + public Iterable<String> getJavaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) { + Iterable<String> result = super.getJavaCompletionProposals(pos, filter, astRoot); if (result != null) { return result; } - return this.strategy.javaCompletionProposals(pos, filter, astRoot); + return this.strategy.getJavaCompletionProposals(pos, filter, astRoot); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaPrimaryKeyJoinColumn.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaPrimaryKeyJoinColumn.java index faee3b1904..c21453765e 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaPrimaryKeyJoinColumn.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaPrimaryKeyJoinColumn.java @@ -9,7 +9,6 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.internal.jpa1.context.java; -import java.util.Iterator; import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.common.core.utility.TextRange; import org.eclipse.jpt.common.utility.Filter; @@ -155,13 +154,13 @@ public class GenericJavaPrimaryKeyJoinColumn // ********** Java completion proposals ********** @Override - protected Iterator<String> connectedJavaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) { - Iterator<String> result = super.connectedJavaCompletionProposals(pos, filter, astRoot); + protected Iterable<String> getConnectedJavaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) { + Iterable<String> result = super.getConnectedJavaCompletionProposals(pos, filter, astRoot); if (result != null) { return result; } if (this.referencedColumnNameTouches(pos, astRoot)) { - return this.getJavaCandidateReferencedColumnNames(filter).iterator(); + return this.getJavaCandidateReferencedColumnNames(filter); } return null; } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaReferenceTable.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaReferenceTable.java index 52d5280d24..c216dd5b76 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaReferenceTable.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaReferenceTable.java @@ -9,7 +9,6 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.internal.jpa1.context.java; -import java.util.Iterator; import java.util.List; import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.common.utility.Filter; @@ -241,13 +240,13 @@ public abstract class GenericJavaReferenceTable<A extends ReferenceTableAnnotati // ********** Java completion proposals ********** @Override - public Iterator<String> javaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) { - Iterator<String> result = super.javaCompletionProposals(pos, filter, astRoot); + public Iterable<String> getJavaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) { + Iterable<String> result = super.getJavaCompletionProposals(pos, filter, astRoot); if (result != null) { return result; } for (JavaJoinColumn column : this.getJoinColumns()) { - result = column.javaCompletionProposals(pos, filter, astRoot); + result = column.getJavaCompletionProposals(pos, filter, astRoot); if (result != null) { return result; } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaSecondaryTable.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaSecondaryTable.java index a16f4f3067..c470731b07 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaSecondaryTable.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaSecondaryTable.java @@ -9,7 +9,6 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.internal.jpa1.context.java; -import java.util.Iterator; import java.util.List; import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.common.core.utility.TextRange; @@ -277,13 +276,13 @@ public class GenericJavaSecondaryTable // ********** code completion ********** @Override - public Iterator<String> javaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) { - Iterator<String> result = super.javaCompletionProposals(pos, filter, astRoot); + public Iterable<String> getJavaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) { + Iterable<String> result = super.getJavaCompletionProposals(pos, filter, astRoot); if (result != null) { return result; } for (JavaPrimaryKeyJoinColumn column : this.getPrimaryKeyJoinColumns()) { - result = column.javaCompletionProposals(pos, filter, astRoot); + result = column.getJavaCompletionProposals(pos, filter, astRoot); if (result != null) { return result; } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaTableGenerator.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaTableGenerator.java index db4131d47c..c1c3476c2c 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaTableGenerator.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaTableGenerator.java @@ -9,14 +9,12 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.internal.jpa1.context.java; -import java.util.Iterator; import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.common.utility.Filter; import org.eclipse.jpt.common.utility.internal.StringTools; import org.eclipse.jpt.common.utility.internal.iterables.EmptyIterable; import org.eclipse.jpt.common.utility.internal.iterables.FilteringIterable; import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; -import org.eclipse.jpt.common.utility.internal.iterators.EmptyIterator; import org.eclipse.jpt.jpa.core.context.UniqueConstraint; import org.eclipse.jpt.jpa.core.context.java.JavaJpaContextNode; import org.eclipse.jpt.jpa.core.context.java.JavaTableGenerator; @@ -409,22 +407,22 @@ public class GenericJavaTableGenerator // ********** UniqueConstraint.Owner implementation ********** - public Iterator<String> candidateUniqueConstraintColumnNames() { + public Iterable<String> getCandidateUniqueConstraintColumnNames() { org.eclipse.jpt.jpa.db.Table dbTable = this.getDbTable(); - return (dbTable != null) ? dbTable.getSortedColumnIdentifiers().iterator() : EmptyIterator.<String>instance(); + return (dbTable != null) ? dbTable.getSortedColumnIdentifiers() : EmptyIterable.<String>instance(); } // ********** Java completion proposals ********** @Override - public Iterator<String> javaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) { - Iterator<String> result = super.javaCompletionProposals(pos, filter, astRoot); + public Iterable<String> getJavaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) { + Iterable<String> result = super.getJavaCompletionProposals(pos, filter, astRoot); if (result != null) { return result; } for (JavaUniqueConstraint constraint : this.getUniqueConstraints()) { - result = constraint.javaCompletionProposals(pos, filter, astRoot); + result = constraint.getJavaCompletionProposals(pos, filter, astRoot); if (result != null) { return result; } @@ -437,25 +435,22 @@ public class GenericJavaTableGenerator * table, schema, catalog, pkColumnName, valueColumnName */ @Override - protected Iterator<String> connectedJavaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) { - Iterator<String> result = super.connectedJavaCompletionProposals(pos, filter, astRoot); + protected Iterable<String> getConnectedJavaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) { + Iterable<String> result = super.getConnectedJavaCompletionProposals(pos, filter, astRoot); if (result != null) { return result; } if (this.tableTouches(pos, astRoot)) { - return this.getJavaCandidateTables(filter).iterator(); + return this.getJavaCandidateTables(filter); } if (this.schemaTouches(pos, astRoot)) { - return this.getJavaCandidateSchemata(filter).iterator(); - } - if (this.catalogTouches(pos, astRoot)) { - return this.getJavaCandidateCatalogs(filter).iterator(); + return this.getJavaCandidateSchemata(filter); } if (this.pkColumnNameTouches(pos, astRoot)) { - return this.getJavaCandidateColumnNames(filter).iterator(); + return this.getJavaCandidateColumnNames(filter); } if (this.valueColumnNameTouches(pos, astRoot)) { - return this.getJavaCandidateColumnNames(filter).iterator(); + return this.getJavaCandidateColumnNames(filter); } return null; } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaUniqueConstraint.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaUniqueConstraint.java index 90e13c3b56..22b291ccca 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaUniqueConstraint.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaUniqueConstraint.java @@ -9,12 +9,11 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.internal.jpa1.context.java; -import java.util.Iterator; import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.common.core.utility.TextRange; import org.eclipse.jpt.common.utility.Filter; import org.eclipse.jpt.common.utility.internal.StringTools; -import org.eclipse.jpt.common.utility.internal.iterators.FilteringIterator; +import org.eclipse.jpt.common.utility.internal.iterables.FilteringIterable; import org.eclipse.jpt.jpa.core.context.ReadOnlyUniqueConstraint; import org.eclipse.jpt.jpa.core.context.java.JavaJpaContextNode; import org.eclipse.jpt.jpa.core.context.java.JavaUniqueConstraint; @@ -85,8 +84,8 @@ public class GenericJavaUniqueConstraint // ********** Java completion proposals ********** @Override - protected Iterator<String> connectedJavaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) { - Iterator<String> result = super.connectedJavaCompletionProposals(pos, filter, astRoot); + protected Iterable<String> getConnectedJavaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) { + Iterable<String> result = super.getConnectedJavaCompletionProposals(pos, filter, astRoot); if (result != null) { return result; } @@ -100,16 +99,16 @@ public class GenericJavaUniqueConstraint return this.uniqueConstraintAnnotation.columnNamesTouches(pos, astRoot); } - protected Iterator<String> javaCandidateColumnNames(Filter<String> filter) { - return StringTools.convertToJavaStringLiterals(this.candidateColumnNames(filter)); + protected Iterable<String> javaCandidateColumnNames(Filter<String> filter) { + return StringTools.convertToJavaStringLiterals(this.getCandidateColumnNames(filter)); } - protected Iterator<String> candidateColumnNames(Filter<String> filter) { - return new FilteringIterator<String>(this.candidateColumnNames(), filter); + protected Iterable<String> getCandidateColumnNames(Filter<String> filter) { + return new FilteringIterable<String>(this.getCandidateColumnNames(), filter); } - protected Iterator<String> candidateColumnNames() { - return this.owner.candidateUniqueConstraintColumnNames(); + protected Iterable<String> getCandidateColumnNames() { + return this.owner.getCandidateUniqueConstraintColumnNames(); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaVirtualOverrideJoinColumnRelationshipStrategy.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaVirtualOverrideJoinColumnRelationshipStrategy.java index e91f4040e3..aed2b6c106 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaVirtualOverrideJoinColumnRelationshipStrategy.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaVirtualOverrideJoinColumnRelationshipStrategy.java @@ -9,15 +9,14 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.internal.jpa1.context.java; -import java.util.Iterator; import java.util.List; import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.common.core.utility.TextRange; +import org.eclipse.jpt.common.utility.internal.iterables.EmptyIterable; import org.eclipse.jpt.common.utility.internal.iterables.EmptyListIterable; import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; import org.eclipse.jpt.common.utility.internal.iterables.SingleElementListIterable; import org.eclipse.jpt.common.utility.internal.iterables.SuperListIterableWrapper; -import org.eclipse.jpt.common.utility.internal.iterators.EmptyIterator; import org.eclipse.jpt.jpa.core.context.Entity; import org.eclipse.jpt.jpa.core.context.ReadOnlyBaseColumn; import org.eclipse.jpt.jpa.core.context.ReadOnlyBaseJoinColumn; @@ -289,15 +288,15 @@ public class GenericJavaVirtualOverrideJoinColumnRelationshipStrategy return (relationshipTarget == null) ? null : relationshipTarget.getPrimaryDbTable(); } - protected Iterator<String> candidateTableNames() { + protected Iterable<String> getCandidateTableNames() { return this.isTargetForeignKey() ? - this.targetCandidateTableNames() : - this.getRelationship().candidateTableNames(); + this.getTargetCandidateTableNames() : + this.getRelationship().getCandidateTableNames(); } - protected Iterator<String> targetCandidateTableNames() { + protected Iterable<String> getTargetCandidateTableNames() { TypeMapping typeMapping = this.getRelationshipMapping().getResolvedTargetEntity(); - return (typeMapping != null) ? typeMapping.allAssociatedTableNames() : EmptyIterator.<String>instance(); + return (typeMapping != null) ? typeMapping.getAllAssociatedTableNames() : EmptyIterable.<String>instance(); } public TextRange getValidationTextRange(CompilationUnit astRoot) { @@ -358,8 +357,8 @@ public class GenericJavaVirtualOverrideJoinColumnRelationshipStrategy return GenericJavaVirtualOverrideJoinColumnRelationshipStrategy.this.tableNameIsInvalid(tableName); } - public Iterator<String> candidateTableNames() { - return GenericJavaVirtualOverrideJoinColumnRelationshipStrategy.this.candidateTableNames(); + public Iterable<String> getCandidateTableNames() { + return GenericJavaVirtualOverrideJoinColumnRelationshipStrategy.this.getCandidateTableNames(); } public Table resolveDbTable(String tableName) { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaVirtualOverrideRelationship.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaVirtualOverrideRelationship.java index d7bbcb2482..66377b4259 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaVirtualOverrideRelationship.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaVirtualOverrideRelationship.java @@ -9,7 +9,6 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.internal.jpa1.context.java; -import java.util.Iterator; import java.util.List; import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.common.core.utility.TextRange; @@ -197,8 +196,8 @@ public class GenericJavaVirtualOverrideRelationship return this.getAssociationOverride().tableNameIsInvalid(tableName); } - public Iterator<String> candidateTableNames() { - return this.getAssociationOverride().candidateTableNames(); + public Iterable<String> getCandidateTableNames() { + return this.getAssociationOverride().getCandidateTableNames(); } public Table resolveDbTable(String tableName) { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/AbstractOrmOverride.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/AbstractOrmOverride.java index efbae863fa..fb81f2581e 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/AbstractOrmOverride.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/AbstractOrmOverride.java @@ -9,7 +9,6 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.internal.jpa1.context.orm; -import java.util.Iterator; import java.util.List; import org.eclipse.jpt.common.core.utility.TextRange; import org.eclipse.jpt.jpa.core.context.ReadOnlyBaseColumn; @@ -168,7 +167,7 @@ public abstract class AbstractOrmOverride<C extends OrmOverrideContainer, X exte } - public Iterator<String> candidateTableNames() { - return this.getContainer().candidateTableNames(); + public Iterable<String> getCandidateTableNames() { + return this.getContainer().getCandidateTableNames(); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/AbstractOrmOverrideContainer.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/AbstractOrmOverrideContainer.java index af65063f3b..35d55a481f 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/AbstractOrmOverrideContainer.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/AbstractOrmOverrideContainer.java @@ -9,17 +9,15 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.internal.jpa1.context.orm; -import java.util.Iterator; import java.util.List; import java.util.Vector; import org.eclipse.jpt.common.core.utility.TextRange; import org.eclipse.jpt.common.utility.internal.CollectionTools; import org.eclipse.jpt.common.utility.internal.iterables.CompositeListIterable; import org.eclipse.jpt.common.utility.internal.iterables.EmptyIterable; +import org.eclipse.jpt.common.utility.internal.iterables.FilteringIterable; import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; import org.eclipse.jpt.common.utility.internal.iterables.LiveCloneListIterable; -import org.eclipse.jpt.common.utility.internal.iterators.EmptyIterator; -import org.eclipse.jpt.common.utility.internal.iterators.FilteringIterator; import org.eclipse.jpt.jpa.core.context.Override_; import org.eclipse.jpt.jpa.core.context.ReadOnlyBaseColumn; import org.eclipse.jpt.jpa.core.context.ReadOnlyOverride; @@ -141,7 +139,7 @@ public abstract class AbstractOrmOverrideContainer< * remaining specified overrides. */ protected boolean overrideWillBeVirtual(String overrideName, S specifiedOverrideToBeRemoved) { - return CollectionTools.contains(this.possibleVirtualOverrideNames(), overrideName) && + return CollectionTools.contains(this.getPossibleVirtualOverrideNames(), overrideName) && (this.getSpecifiedOverrideNamed(overrideName, specifiedOverrideToBeRemoved) == null); } @@ -326,11 +324,7 @@ public abstract class AbstractOrmOverrideContainer< * specified overrides. */ protected Iterable<String> getVirtualOverrideNames() { - return CollectionTools.iterable(this.virtualOverrideNames()); - } - - protected Iterator<String> virtualOverrideNames() { - return new FilteringIterator<String>(this.possibleVirtualOverrideNames()) { + return new FilteringIterable<String>(this.getPossibleVirtualOverrideNames()) { @Override protected boolean accept(String name) { return AbstractOrmOverrideContainer.this.overrideIsVirtual(name); @@ -409,24 +403,24 @@ public abstract class AbstractOrmOverrideContainer< * corresponding Java entity, take the override names directly from the * type. */ - protected Iterator<String> possibleVirtualOverrideNames() { + protected Iterable<String> getPossibleVirtualOverrideNames() { if (this.owner == null) { - return EmptyIterator.instance(); + return EmptyIterable.instance(); } Iterable<String> javaNames = this.owner.getJavaOverrideNames(); - return (javaNames != null) ? javaNames.iterator() : this.owner.allOverridableNames(); + return (javaNames != null) ? javaNames : this.owner.getAllOverridableNames(); } - public Iterator<String> allOverridableNames() { - return (this.owner != null) ? this.owner.allOverridableNames() : EmptyIterator.<String>instance(); + public Iterable<String> getAllOverridableNames() { + return (this.owner != null) ? this.owner.getAllOverridableNames() : EmptyIterable.<String>instance(); } public boolean tableNameIsInvalid(String tableName) { return this.owner.tableNameIsInvalid(tableName); } - public Iterator<String> candidateTableNames() { - return this.owner.candidateTableNames(); + public Iterable<String> getCandidateTableNames() { + return this.owner.getCandidateTableNames(); } public org.eclipse.jpt.jpa.db.Table resolveDbTable(String tableName) { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/AbstractOrmVirtualOverride.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/AbstractOrmVirtualOverride.java index c8a4c77cbe..ec9acf34bd 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/AbstractOrmVirtualOverride.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/AbstractOrmVirtualOverride.java @@ -9,7 +9,6 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.internal.jpa1.context.orm; -import java.util.Iterator; import java.util.List; import org.eclipse.jpt.common.core.utility.TextRange; import org.eclipse.jpt.jpa.core.context.ReadOnlyBaseColumn; @@ -114,7 +113,7 @@ public abstract class AbstractOrmVirtualOverride<C extends OrmOverrideContainer> return this.getContainer().tableNameIsInvalid(tableName); } - public Iterator<String> candidateTableNames() { - return this.getContainer().candidateTableNames(); + public Iterable<String> getCandidateTableNames() { + return this.getContainer().getCandidateTableNames(); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmEmbeddedIdMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmEmbeddedIdMapping.java index ea2deb17e8..51937340cb 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmEmbeddedIdMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmEmbeddedIdMapping.java @@ -9,10 +9,9 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.internal.jpa1.context.orm; -import java.util.Iterator; import java.util.List; -import org.eclipse.jpt.common.utility.internal.iterators.EmptyIterator; -import org.eclipse.jpt.common.utility.internal.iterators.FilteringIterator; +import org.eclipse.jpt.common.utility.internal.iterables.EmptyIterable; +import org.eclipse.jpt.common.utility.internal.iterables.FilteringIterable; import org.eclipse.jpt.jpa.core.MappingKeys; import org.eclipse.jpt.jpa.core.context.TypeMapping; import org.eclipse.jpt.jpa.core.context.orm.OrmAttributeMapping; @@ -97,10 +96,10 @@ public class GenericOrmEmbeddedIdMapping } @Override - protected Iterator<String> embeddableOverridableAttributeMappingNames() { + protected Iterable<String> getEmbeddableOverridableAttributeMappingNames() { return this.derived ? - EmptyIterator.<String>instance() : - super.embeddableOverridableAttributeMappingNames(); + EmptyIterable.<String>instance() : + super.getEmbeddableOverridableAttributeMappingNames(); } @Override @@ -139,18 +138,18 @@ public class GenericOrmEmbeddedIdMapping extends AbstractOrmBaseEmbeddedMapping<XmlEmbeddedId>.AttributeOverrideContainerOwner { @Override - public Iterator<String> allOverridableNames() { + public Iterable<String> getAllOverridableNames() { return GenericOrmEmbeddedIdMapping.this.isDerived() ? - EmptyIterator.<String>instance() : - super.allOverridableNames(); + EmptyIterable.<String>instance() : + super.getAllOverridableNames(); } /** * pre-condition: type mapping is not <code>null</code> */ @Override - protected Iterator<String> allOverridableAttributeNames_(TypeMapping overriddenTypeMapping) { - return new FilteringIterator<String>(super.allOverridableAttributeNames_(overriddenTypeMapping)) { + protected Iterable<String> getAllOverridableAttributeNames_(TypeMapping overriddenTypeMapping) { + return new FilteringIterable<String>(super.getAllOverridableAttributeNames_(overriddenTypeMapping)) { @Override protected boolean accept(String attributeName) { return ! AttributeOverrideContainerOwner.this.getTypeMapping().attributeIsDerivedId(attributeName); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmEmbeddedMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmEmbeddedMapping.java index 80be1c096a..91ea572a05 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmEmbeddedMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmEmbeddedMapping.java @@ -9,15 +9,13 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.internal.jpa1.context.orm; -import java.util.Iterator; import java.util.List; import org.eclipse.emf.common.util.EList; import org.eclipse.jpt.common.core.utility.TextRange; -import org.eclipse.jpt.common.utility.internal.CollectionTools; -import org.eclipse.jpt.common.utility.internal.iterators.CompositeIterator; -import org.eclipse.jpt.common.utility.internal.iterators.EmptyIterator; -import org.eclipse.jpt.common.utility.internal.iterators.FilteringIterator; -import org.eclipse.jpt.common.utility.internal.iterators.SubIteratorWrapper; +import org.eclipse.jpt.common.utility.internal.iterables.CompositeIterable; +import org.eclipse.jpt.common.utility.internal.iterables.EmptyIterable; +import org.eclipse.jpt.common.utility.internal.iterables.FilteringIterable; +import org.eclipse.jpt.common.utility.internal.iterables.SubIterableWrapper; import org.eclipse.jpt.jpa.core.MappingKeys; import org.eclipse.jpt.jpa.core.context.AssociationOverride; import org.eclipse.jpt.jpa.core.context.AssociationOverrideContainer; @@ -117,24 +115,24 @@ public class GenericOrmEmbeddedMapping */ @Override @SuppressWarnings("unchecked") - public Iterator<String> allMappingNames() { + public Iterable<String> getAllMappingNames() { return this.isJpa2_0Compatible() ? - new CompositeIterator<String>(super.allMappingNames(), this.allEmbeddableAttributeMappingNames()) : - super.allMappingNames(); + new CompositeIterable<String>(super.getAllMappingNames(), this.getAllEmbeddableAttributeMappingNames()) : + super.getAllMappingNames(); } - protected Iterator<String> allEmbeddableAttributeMappingNames() { - return this.qualifiedEmbeddableOverridableMappingNames(AttributeMappingTools.ALL_MAPPING_NAMES_TRANSFORMER); + protected Iterable<String> getAllEmbeddableAttributeMappingNames() { + return this.getQualifiedEmbeddableOverridableMappingNames(AttributeMappingTools.ALL_MAPPING_NAMES_TRANSFORMER); } - protected Iterator<RelationshipMapping> allOverridableAssociations() { + protected Iterable<RelationshipMapping> allOverridableAssociations() { return (this.targetEmbeddable != null) ? - new SubIteratorWrapper<AttributeMapping, RelationshipMapping>(this.allOverridableAssociations_()) : - EmptyIterator.<RelationshipMapping>instance(); + new SubIterableWrapper<AttributeMapping, RelationshipMapping>(this.getAllOverridableAssociations_()) : + EmptyIterable.<RelationshipMapping>instance(); } - protected Iterator<AttributeMapping> allOverridableAssociations_() { - return new FilteringIterator<AttributeMapping>(this.targetEmbeddable.attributeMappings()) { + protected Iterable<AttributeMapping> getAllOverridableAssociations_() { + return new FilteringIterable<AttributeMapping>(this.targetEmbeddable.getAttributeMappings()) { @Override protected boolean accept(AttributeMapping attributeMapping) { return attributeMapping.isOverridableAssociationMapping(); @@ -157,7 +155,7 @@ public class GenericOrmEmbeddedMapping return null; } // recurse into the embeddable mappings - for (AttributeMapping mapping : CollectionTools.iterable(this.embeddableAttributeMappings())) { + for (AttributeMapping mapping : this.getEmbeddableAttributeMappings()) { AttributeMapping resolvedMapping = mapping.resolveAttributeMapping(attributeName); if (resolvedMapping != null) { return resolvedMapping; @@ -249,9 +247,9 @@ public class GenericOrmEmbeddedMapping return GenericOrmEmbeddedMapping.this.getTargetEmbeddable(); } - public Iterator<String> allOverridableNames() { + public Iterable<String> getAllOverridableNames() { TypeMapping typeMapping = this.getOverridableTypeMapping(); - return (typeMapping != null) ? typeMapping.allOverridableAssociationNames() : EmptyIterator.<String>instance(); + return (typeMapping != null) ? typeMapping.getAllOverridableAssociationNames() : EmptyIterable.<String>instance(); } public Iterable<String> getJavaOverrideNames() { @@ -270,8 +268,8 @@ public class GenericOrmEmbeddedMapping return this.getTypeMapping().tableNameIsInvalid(tableName); } - public Iterator<String> candidateTableNames() { - return this.getTypeMapping().allAssociatedTableNames(); + public Iterable<String> getCandidateTableNames() { + return this.getTypeMapping().getAllAssociatedTableNames(); } public org.eclipse.jpt.jpa.db.Table resolveDbTable(String tableName) { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmJoinTable.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmJoinTable.java index 454384b2d8..d83705a457 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmJoinTable.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmJoinTable.java @@ -9,15 +9,14 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.internal.jpa1.context.orm; -import java.util.Iterator; import java.util.List; import org.eclipse.jpt.common.core.utility.TextRange; import org.eclipse.jpt.common.utility.internal.Tools; +import org.eclipse.jpt.common.utility.internal.iterables.EmptyIterable; import org.eclipse.jpt.common.utility.internal.iterables.EmptyListIterable; import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; import org.eclipse.jpt.common.utility.internal.iterables.LiveCloneListIterable; import org.eclipse.jpt.common.utility.internal.iterables.SingleElementListIterable; -import org.eclipse.jpt.common.utility.internal.iterators.EmptyIterator; import org.eclipse.jpt.jpa.core.context.Entity; import org.eclipse.jpt.jpa.core.context.JoinColumn; import org.eclipse.jpt.jpa.core.context.PersistentAttribute; @@ -342,8 +341,8 @@ public class GenericOrmJoinTable /** * the join column can only be on the join table itself */ - public Iterator<String> candidateTableNames() { - return EmptyIterator.instance(); + public Iterable<String> getCandidateTableNames() { + return EmptyIterable.instance(); } public org.eclipse.jpt.jpa.db.Table resolveDbTable(String tableName) { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmOverrideRelationship.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmOverrideRelationship.java index 6540fea64d..8ab30f8a51 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmOverrideRelationship.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmOverrideRelationship.java @@ -9,7 +9,6 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.internal.jpa1.context.orm; -import java.util.Iterator; import java.util.List; import org.eclipse.jpt.common.core.utility.TextRange; import org.eclipse.jpt.jpa.core.context.Entity; @@ -253,8 +252,8 @@ public class GenericOrmOverrideRelationship return this.getAssociationOverride().tableNameIsInvalid(tableName); } - public Iterator<String> candidateTableNames() { - return this.getAssociationOverride().candidateTableNames(); + public Iterable<String> getCandidateTableNames() { + return this.getAssociationOverride().getCandidateTableNames(); } public Table resolveDbTable(String tableName) { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmPersistentType.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmPersistentType.java index 8dffda9e17..4bea56ba53 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmPersistentType.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmPersistentType.java @@ -1043,7 +1043,7 @@ public class GenericOrmPersistentType return null; } // check for circular inheritance - return CollectionTools.contains(spt.inheritanceHierarchy(), this) ? null : spt; + return CollectionTools.contains(spt.getInheritanceHierarchy(), this) ? null : spt; } protected PersistentType buildSuperPersistentType_() { @@ -1053,18 +1053,10 @@ public class GenericOrmPersistentType // ********** inheritance ********** - public Iterator<PersistentType> inheritanceHierarchy() { - return this.getInheritanceHierarchy().iterator(); - } - public Iterable<PersistentType> getInheritanceHierarchy() { return this.getInheritanceHierarchyOf(this); } - public Iterator<PersistentType> ancestors() { - return this.getAncestors().iterator(); - } - public Iterable<PersistentType> getAncestors() { return this.getInheritanceHierarchyOf(this.superPersistentType); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmTableGenerator.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmTableGenerator.java index 0516dff51b..7b51aa3b13 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmTableGenerator.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmTableGenerator.java @@ -9,10 +9,9 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.internal.jpa1.context.orm; -import java.util.Iterator; +import org.eclipse.jpt.common.utility.internal.iterables.EmptyIterable; import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; import org.eclipse.jpt.common.utility.internal.iterables.LiveCloneListIterable; -import org.eclipse.jpt.common.utility.internal.iterators.EmptyIterator; import org.eclipse.jpt.jpa.core.context.UniqueConstraint; import org.eclipse.jpt.jpa.core.context.XmlContextNode; import org.eclipse.jpt.jpa.core.context.orm.OrmTableGenerator; @@ -407,9 +406,9 @@ public class GenericOrmTableGenerator // ********** UniqueConstraint.Owner implementation ********** - public Iterator<String> candidateUniqueConstraintColumnNames() { + public Iterable<String> getCandidateUniqueConstraintColumnNames() { org.eclipse.jpt.jpa.db.Table dbTable = this.getDbTable(); - return (dbTable != null) ? dbTable.getSortedColumnIdentifiers().iterator() : EmptyIterator.<String>instance(); + return (dbTable != null) ? dbTable.getSortedColumnIdentifiers() : EmptyIterable.<String>instance(); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmVirtualOverrideRelationship.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmVirtualOverrideRelationship.java index 1cf15a2f43..91200aea95 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmVirtualOverrideRelationship.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmVirtualOverrideRelationship.java @@ -9,7 +9,6 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.internal.jpa1.context.orm; -import java.util.Iterator; import java.util.List; import org.eclipse.jpt.common.core.utility.TextRange; import org.eclipse.jpt.jpa.core.context.Entity; @@ -197,8 +196,8 @@ public class GenericOrmVirtualOverrideRelationship return this.getAssociationOverride().tableNameIsInvalid(tableName); } - public Iterator<String> candidateTableNames() { - return this.getAssociationOverride().candidateTableNames(); + public Iterable<String> getCandidateTableNames() { + return this.getAssociationOverride().getCandidateTableNames(); } public Table resolveDbTable(String tableName) { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/AbstractJavaElementCollectionMapping2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/AbstractJavaElementCollectionMapping2_0.java index 7f82627bcc..2f0edb9941 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/AbstractJavaElementCollectionMapping2_0.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/AbstractJavaElementCollectionMapping2_0.java @@ -10,7 +10,6 @@ package org.eclipse.jpt.jpa.core.internal.jpa2.context.java; import java.util.ArrayList; -import java.util.Iterator; import java.util.List; import org.eclipse.jdt.core.IJavaProject; import org.eclipse.jdt.core.dom.CompilationUnit; @@ -21,16 +20,15 @@ import org.eclipse.jpt.common.core.resource.java.JavaResourceMember; import org.eclipse.jpt.common.core.utility.TextRange; import org.eclipse.jpt.common.utility.Filter; import org.eclipse.jpt.common.utility.internal.Association; -import org.eclipse.jpt.common.utility.internal.CollectionTools; import org.eclipse.jpt.common.utility.internal.SimpleAssociation; import org.eclipse.jpt.common.utility.internal.StringTools; import org.eclipse.jpt.common.utility.internal.Tools; import org.eclipse.jpt.common.utility.internal.Transformer; import org.eclipse.jpt.common.utility.internal.iterables.ArrayIterable; -import org.eclipse.jpt.common.utility.internal.iterators.CompositeIterator; -import org.eclipse.jpt.common.utility.internal.iterators.EmptyIterator; -import org.eclipse.jpt.common.utility.internal.iterators.FilteringIterator; -import org.eclipse.jpt.common.utility.internal.iterators.TransformationIterator; +import org.eclipse.jpt.common.utility.internal.iterables.CompositeIterable; +import org.eclipse.jpt.common.utility.internal.iterables.EmptyIterable; +import org.eclipse.jpt.common.utility.internal.iterables.FilteringIterable; +import org.eclipse.jpt.common.utility.internal.iterables.TransformationIterable; import org.eclipse.jpt.jpa.core.JpaFactory; import org.eclipse.jpt.jpa.core.context.AssociationOverride; import org.eclipse.jpt.jpa.core.context.AssociationOverrideContainer; @@ -923,12 +921,12 @@ public abstract class AbstractJavaElementCollectionMapping2_0 // ********** embedded mappings ********** - public Iterator<String> candidateMapKeyNames() { - return this.allTargetEmbeddableAttributeNames(); + public Iterable<String> getCandidateMapKeyNames() { + return this.getAllTargetEmbeddableAttributeNames(); } - protected Iterator<String> allTargetEmbeddableAttributeNames() { - return new CompositeIterator<String>(this.allTargetEmbeddableAttributeNamesLists()); + protected Iterable<String> getAllTargetEmbeddableAttributeNames() { + return new CompositeIterable<String>(this.getAllTargetEmbeddableAttributeNamesLists()); } /** @@ -936,41 +934,41 @@ public abstract class AbstractJavaElementCollectionMapping2_0 * embedded mapping's target embeddable type mapping's attribute mappings * (attribute or association mappings, depending on the specified transformer). */ - protected Iterator<Iterator<String>> allTargetEmbeddableAttributeNamesLists() { - return new TransformationIterator<AttributeMapping, Iterator<String>>(this.allTargetEmbeddableAttributeMappings(), AttributeMappingTools.ALL_MAPPING_NAMES_TRANSFORMER); + protected Iterable<Iterable<String>> getAllTargetEmbeddableAttributeNamesLists() { + return new TransformationIterable<AttributeMapping, Iterable<String>>(this.getAllTargetEmbeddableAttributeMappings(), AttributeMappingTools.ALL_MAPPING_NAMES_TRANSFORMER); } - protected Iterator<AttributeMapping> allTargetEmbeddableAttributeMappings() { + protected Iterable<AttributeMapping> getAllTargetEmbeddableAttributeMappings() { Embeddable targetEmbeddable = this.getResolvedTargetEmbeddable(); - return (targetEmbeddable != null) ? targetEmbeddable.allAttributeMappings() : EmptyIterator.<AttributeMapping> instance(); + return (targetEmbeddable != null) ? targetEmbeddable.getAllAttributeMappings() : EmptyIterable.<AttributeMapping> instance(); } @Override @SuppressWarnings("unchecked") - public Iterator<String> allMappingNames() { - return new CompositeIterator<String>(super.allMappingNames(), this.allEmbeddableAttributeMappingNames()); + public Iterable<String> getAllMappingNames() { + return new CompositeIterable<String>(super.getAllMappingNames(), this.getAllEmbeddableAttributeMappingNames()); } - protected Iterator<String> allEmbeddableAttributeMappingNames() { - return this.qualifiedEmbeddableOverridableMappingNames(AttributeMappingTools.ALL_MAPPING_NAMES_TRANSFORMER); + protected Iterable<String> getAllEmbeddableAttributeMappingNames() { + return this.getQualifiedEmbeddableOverridableMappingNames(AttributeMappingTools.ALL_MAPPING_NAMES_TRANSFORMER); } @Override - public Iterator<String> allOverridableAttributeMappingNames() { - return this.qualifiedEmbeddableOverridableMappingNames(AttributeMappingTools.ALL_OVERRIDABLE_ATTRIBUTE_MAPPING_NAMES_TRANSFORMER); + public Iterable<String> getAllOverridableAttributeMappingNames() { + return this.getQualifiedEmbeddableOverridableMappingNames(AttributeMappingTools.ALL_OVERRIDABLE_ATTRIBUTE_MAPPING_NAMES_TRANSFORMER); } @Override - public Iterator<String> allOverridableAssociationMappingNames() { - return this.qualifiedEmbeddableOverridableMappingNames(AttributeMappingTools.ALL_OVERRIDABLE_ASSOCIATION_MAPPING_NAMES_TRANSFORMER); + public Iterable<String> getAllOverridableAssociationMappingNames() { + return this.getQualifiedEmbeddableOverridableMappingNames(AttributeMappingTools.ALL_OVERRIDABLE_ASSOCIATION_MAPPING_NAMES_TRANSFORMER); } - protected Iterator<String> qualifiedEmbeddableOverridableMappingNames(Transformer<AttributeMapping, Iterator<String>> transformer) { - return new TransformationIterator<String, String>(this.embeddableOverridableMappingNames(transformer), this.buildQualifierTransformer()); + protected Iterable<String> getQualifiedEmbeddableOverridableMappingNames(Transformer<AttributeMapping, Iterable<String>> transformer) { + return new TransformationIterable<String, String>(this.getEmbeddableOverridableMappingNames(transformer), this.buildQualifierTransformer()); } - protected Iterator<String> embeddableOverridableMappingNames(Transformer<AttributeMapping, Iterator<String>> transformer) { - return new CompositeIterator<String>(this.embeddableOverridableMappingNamesLists(transformer)); + protected Iterable<String> getEmbeddableOverridableMappingNames(Transformer<AttributeMapping, Iterable<String>> transformer) { + return new CompositeIterable<String>(this.getEmbeddableOverridableMappingNamesLists(transformer)); } /** @@ -978,8 +976,8 @@ public abstract class AbstractJavaElementCollectionMapping2_0 * embedded mapping's target embeddable type mapping's attribute mappings * (attribute or association mappings, depending on the specified transformer). */ - protected Iterator<Iterator<String>> embeddableOverridableMappingNamesLists(Transformer<AttributeMapping, Iterator<String>> transformer) { - return new TransformationIterator<AttributeMapping, Iterator<String>>(this.embeddableAttributeMappings(), transformer); + protected Iterable<Iterable<String>> getEmbeddableOverridableMappingNamesLists(Transformer<AttributeMapping, Iterable<String>> transformer) { + return new TransformationIterable<AttributeMapping, Iterable<String>>(this.getEmbeddableAttributeMappings(), transformer); } @Override @@ -993,7 +991,7 @@ public abstract class AbstractJavaElementCollectionMapping2_0 return null; } // recurse into the embeddable mappings - for (AttributeMapping mapping : CollectionTools.iterable(this.embeddableAttributeMappings())) { + for (AttributeMapping mapping : this.getEmbeddableAttributeMappings()) { resolvedMapping = mapping.resolveAttributeMapping(attributeName); if (resolvedMapping != null) { return resolvedMapping; @@ -1002,11 +1000,11 @@ public abstract class AbstractJavaElementCollectionMapping2_0 return null; } - protected Iterator<AttributeMapping> embeddableAttributeMappings() { + protected Iterable<AttributeMapping> getEmbeddableAttributeMappings() { Embeddable targetEmbeddable = this.getResolvedTargetEmbeddable(); return ((targetEmbeddable != null) && (targetEmbeddable != this.getTypeMapping())) ? - targetEmbeddable.attributeMappings() : - EmptyIterator.<AttributeMapping>instance(); + targetEmbeddable.getAttributeMappings() : + EmptyIterable.<AttributeMapping>instance(); } @Override @@ -1077,55 +1075,55 @@ public abstract class AbstractJavaElementCollectionMapping2_0 // ********** Java completion proposals ********** @Override - public Iterator<String> javaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) { - Iterator<String> result = super.javaCompletionProposals(pos, filter, astRoot); + public Iterable<String> getJavaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) { + Iterable<String> result = super.getJavaCompletionProposals(pos, filter, astRoot); if (result != null) { return result; } - result = this.collectionTable.javaCompletionProposals(pos, filter, astRoot); + result = this.collectionTable.getJavaCompletionProposals(pos, filter, astRoot); if (result != null) { return result; } - result = this.valueColumn.javaCompletionProposals(pos, filter, astRoot); + result = this.valueColumn.getJavaCompletionProposals(pos, filter, astRoot); if (result != null) { return result; } - result = this.converter.javaCompletionProposals(pos, filter, astRoot); + result = this.converter.getJavaCompletionProposals(pos, filter, astRoot); if (result != null) { return result; } - result = this.orderable.javaCompletionProposals(pos, filter, astRoot); + result = this.orderable.getJavaCompletionProposals(pos, filter, astRoot); if (result != null) { return result; } - result = this.valueAttributeOverrideContainer.javaCompletionProposals(pos, filter, astRoot); + result = this.valueAttributeOverrideContainer.getJavaCompletionProposals(pos, filter, astRoot); if (result != null) { return result; } - result = this.valueAssociationOverrideContainer.javaCompletionProposals(pos, filter, astRoot); + result = this.valueAssociationOverrideContainer.getJavaCompletionProposals(pos, filter, astRoot); if (result != null) { return result; } if (this.mapKeyNameTouches(pos, astRoot)) { - return this.javaCandidateMapKeyNames(filter); + return this.getJavaCandidateMapKeyNames(filter); } - result = this.mapKeyColumn.javaCompletionProposals(pos, filter, astRoot); + result = this.mapKeyColumn.getJavaCompletionProposals(pos, filter, astRoot); if (result != null) { return result; } - result = this.mapKeyAttributeOverrideContainer.javaCompletionProposals(pos, filter, astRoot); + result = this.mapKeyAttributeOverrideContainer.getJavaCompletionProposals(pos, filter, astRoot); if (result != null) { return result; } return null; } - protected Iterator<String> javaCandidateMapKeyNames(Filter<String> filter) { - return StringTools.convertToJavaStringLiterals(this.candidateMapKeyNames(filter)); + protected Iterable<String> getJavaCandidateMapKeyNames(Filter<String> filter) { + return StringTools.convertToJavaStringLiterals(this.getCandidateMapKeyNames(filter)); } - protected Iterator<String> candidateMapKeyNames(Filter<String> filter) { - return new FilteringIterator<String>(this.candidateMapKeyNames(), filter); + protected Iterable<String> getCandidateMapKeyNames(Filter<String> filter) { + return new FilteringIterable<String>(this.getCandidateMapKeyNames(), filter); } @@ -1337,8 +1335,8 @@ public abstract class AbstractJavaElementCollectionMapping2_0 return Tools.valuesAreEqual(table.getName(), tableName) ? table.getDbTable() : null; } - public java.util.Iterator<String> candidateTableNames() { - return EmptyIterator.instance(); + public Iterable<String> getCandidateTableNames() { + return EmptyIterable.instance(); } /** @@ -1452,9 +1450,9 @@ public abstract class AbstractJavaElementCollectionMapping2_0 extends ValueOverrideContainerOwner implements JavaAttributeOverrideContainer2_0.Owner { - public Iterator<String> allOverridableNames() { + public Iterable<String> getAllOverridableNames() { TypeMapping overriddenTypeMapping = this.getOverridableTypeMapping(); - return (overriddenTypeMapping != null) ? overriddenTypeMapping.allOverridableAttributeNames() : EmptyIterator.<String>instance(); + return (overriddenTypeMapping != null) ? overriddenTypeMapping.getAllOverridableAttributeNames() : EmptyIterable.<String>instance(); } public Column resolveOverriddenColumn(String attributeName) { @@ -1477,9 +1475,9 @@ public abstract class AbstractJavaElementCollectionMapping2_0 extends ValueOverrideContainerOwner implements JavaAssociationOverrideContainer2_0.Owner { - public Iterator<String> allOverridableNames() { + public Iterable<String> getAllOverridableNames() { TypeMapping typeMapping = this.getOverridableTypeMapping(); - return (typeMapping != null) ? typeMapping.allOverridableAssociationNames() : EmptyIterator.<String>instance(); + return (typeMapping != null) ? typeMapping.getAllOverridableAssociationNames() : EmptyIterable.<String>instance(); } public Relationship resolveOverriddenRelationship(String attributeName) { @@ -1525,9 +1523,9 @@ public abstract class AbstractJavaElementCollectionMapping2_0 return AbstractJavaElementCollectionMapping2_0.this.getResolvedMapKeyEmbeddable(); } - public Iterator<String> allOverridableNames() { + public Iterable<String> getAllOverridableNames() { TypeMapping overriddenTypeMapping = this.getOverridableTypeMapping(); - return (overriddenTypeMapping != null) ? overriddenTypeMapping.allOverridableAttributeNames() : EmptyIterator.<String>instance(); + return (overriddenTypeMapping != null) ? overriddenTypeMapping.getAllOverridableAttributeNames() : EmptyIterable.<String>instance(); } public String getPossiblePrefix() { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/GenericJavaCollectionTable2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/GenericJavaCollectionTable2_0.java index 92cac35863..aa6c20a7fe 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/GenericJavaCollectionTable2_0.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/GenericJavaCollectionTable2_0.java @@ -9,12 +9,11 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.internal.jpa2.context.java; -import java.util.Iterator; import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.common.core.utility.TextRange; import org.eclipse.jpt.common.utility.internal.StringTools; import org.eclipse.jpt.common.utility.internal.Tools; -import org.eclipse.jpt.common.utility.internal.iterators.EmptyIterator; +import org.eclipse.jpt.common.utility.internal.iterables.EmptyIterable; import org.eclipse.jpt.jpa.core.context.Entity; import org.eclipse.jpt.jpa.core.context.PersistentAttribute; import org.eclipse.jpt.jpa.core.context.ReadOnlyBaseJoinColumn; @@ -150,8 +149,8 @@ public class GenericJavaCollectionTable2_0 /** * the join column can only be on the collection table itself */ - public Iterator<String> candidateTableNames() { - return EmptyIterator.instance(); + public Iterable<String> getCandidateTableNames() { + return EmptyIterable.instance(); } public Entity getRelationshipTarget() { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/GenericJavaDerivedIdentity2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/GenericJavaDerivedIdentity2_0.java index 457757fde9..6050364ba3 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/GenericJavaDerivedIdentity2_0.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/GenericJavaDerivedIdentity2_0.java @@ -9,7 +9,6 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.internal.jpa2.context.java; -import java.util.Iterator; import java.util.List; import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.common.core.utility.TextRange; @@ -158,13 +157,13 @@ public class GenericJavaDerivedIdentity2_0 // ********** java completion proposals ********** @Override - public Iterator<String> javaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) { - Iterator<String> result = super.javaCompletionProposals(pos, filter, astRoot); + public Iterable<String> getJavaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) { + Iterable<String> result = super.getJavaCompletionProposals(pos, filter, astRoot); if (result != null) { return result; } if (this.strategy != null) { - result = ((JavaJpaContextNode) this.strategy).javaCompletionProposals(pos, filter, astRoot); + result = ((JavaJpaContextNode) this.strategy).getJavaCompletionProposals(pos, filter, astRoot); if (result != null) { return result; } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/GenericJavaMapsIdDerivedIdentityStrategy2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/GenericJavaMapsIdDerivedIdentityStrategy2_0.java index 66b865e88e..77283f7102 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/GenericJavaMapsIdDerivedIdentityStrategy2_0.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/GenericJavaMapsIdDerivedIdentityStrategy2_0.java @@ -24,7 +24,6 @@ import org.eclipse.jpt.common.utility.internal.iterables.CompositeIterable; import org.eclipse.jpt.common.utility.internal.iterables.FilteringIterable; import org.eclipse.jpt.common.utility.internal.iterables.SingleElementIterable; import org.eclipse.jpt.common.utility.internal.iterables.TransformationIterable; -import org.eclipse.jpt.common.utility.internal.iterators.FilteringIterator; import org.eclipse.jpt.jpa.core.MappingKeys; import org.eclipse.jpt.jpa.core.context.AttributeMapping; import org.eclipse.jpt.jpa.core.context.Embeddable; @@ -177,7 +176,7 @@ public class GenericJavaMapsIdDerivedIdentityStrategy2_0 } protected Iterable<AttributeMapping> getAllAttributeMappings() { - return CollectionTools.collection(this.getPersistentAttribute().getOwningTypeMapping().allAttributeMappings()); + return CollectionTools.collection(this.getPersistentAttribute().getOwningTypeMapping().getAllAttributeMappings()); } public Iterable<String> getSortedCandidateIdAttributeNames() { @@ -229,7 +228,7 @@ public class GenericJavaMapsIdDerivedIdentityStrategy2_0 } return new CompositeIterable<AttributeMapping>( mapping, - CollectionTools.collection(embeddable.allAttributeMappings()) + CollectionTools.collection(embeddable.getAllAttributeMappings()) ); } @@ -265,19 +264,19 @@ public class GenericJavaMapsIdDerivedIdentityStrategy2_0 // ********** Java completion proposals ********** @Override - public Iterator<String> javaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) { - Iterator<String> result = super.javaCompletionProposals(pos, filter, astRoot); + public Iterable<String> getJavaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) { + Iterable<String> result = super.getJavaCompletionProposals(pos, filter, astRoot); if (result != null) { return result; } if (this.getAnnotation().valueTouches(pos, astRoot)) { - result = this.sortedJavaValueChoices(filter); + result = this.getSortedJavaValueChoices(filter); } return result; } - protected Iterator<String> sortedJavaValueChoices(Filter<String> filter) { - return StringTools.convertToJavaStringLiterals(new FilteringIterator<String>(this.getSortedCandidateIdAttributeNames(), filter)); + protected Iterable<String> getSortedJavaValueChoices(Filter<String> filter) { + return StringTools.convertToJavaStringLiterals(new FilteringIterable<String>(this.getSortedCandidateIdAttributeNames(), filter)); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/NullJavaMapKeyColumn2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/NullJavaMapKeyColumn2_0.java index 59eacabc11..d3fd955510 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/NullJavaMapKeyColumn2_0.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/NullJavaMapKeyColumn2_0.java @@ -9,10 +9,9 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.internal.jpa2.context.java; -import java.util.Iterator; import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.common.core.utility.TextRange; -import org.eclipse.jpt.common.utility.internal.iterators.EmptyIterator; +import org.eclipse.jpt.common.utility.internal.iterables.EmptyIterable; import org.eclipse.jpt.jpa.core.context.ReadOnlyColumn; import org.eclipse.jpt.jpa.core.context.java.JavaColumn; import org.eclipse.jpt.jpa.core.context.java.JavaMultiRelationshipMapping; @@ -236,8 +235,8 @@ public class NullJavaMapKeyColumn2_0 // NOP } - public Iterator<String> candidateTableNames() { - return EmptyIterator.instance(); + public Iterable<String> getCandidateTableNames() { + return EmptyIterable.instance(); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/AbstractOrmElementCollectionMapping2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/AbstractOrmElementCollectionMapping2_0.java index eeaa64aed1..a403705e59 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/AbstractOrmElementCollectionMapping2_0.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/AbstractOrmElementCollectionMapping2_0.java @@ -10,7 +10,6 @@ package org.eclipse.jpt.jpa.core.internal.jpa2.context.orm; import java.util.ArrayList; -import java.util.Iterator; import java.util.List; import org.eclipse.emf.common.util.EList; import org.eclipse.jdt.core.IJavaProject; @@ -18,7 +17,6 @@ import org.eclipse.jdt.core.IPackageFragment; import org.eclipse.jdt.core.IType; import org.eclipse.jpt.common.core.internal.utility.JDTTools; import org.eclipse.jpt.common.core.utility.TextRange; -import org.eclipse.jpt.common.utility.internal.CollectionTools; import org.eclipse.jpt.common.utility.internal.StringTools; import org.eclipse.jpt.common.utility.internal.Tools; import org.eclipse.jpt.common.utility.internal.Transformer; @@ -26,9 +24,7 @@ import org.eclipse.jpt.common.utility.internal.iterables.ArrayIterable; import org.eclipse.jpt.common.utility.internal.iterables.CompositeIterable; import org.eclipse.jpt.common.utility.internal.iterables.EmptyIterable; import org.eclipse.jpt.common.utility.internal.iterables.SingleElementIterable; -import org.eclipse.jpt.common.utility.internal.iterators.CompositeIterator; -import org.eclipse.jpt.common.utility.internal.iterators.EmptyIterator; -import org.eclipse.jpt.common.utility.internal.iterators.TransformationIterator; +import org.eclipse.jpt.common.utility.internal.iterables.TransformationIterable; import org.eclipse.jpt.jpa.core.context.AssociationOverride; import org.eclipse.jpt.jpa.core.context.AssociationOverrideContainer; import org.eclipse.jpt.jpa.core.context.AttributeMapping; @@ -934,8 +930,8 @@ public abstract class AbstractOrmElementCollectionMapping2_0<X extends XmlElemen // ********** embedded mappings ********** - public Iterator<String> candidateMapKeyNames() { - return new CompositeIterator<String>(this.allTargetEmbeddableAttributeNamesLists()); + public Iterable<String> getCandidateMapKeyNames() { + return new CompositeIterable<String>(this.getAllTargetEmbeddableAttributeNamesLists()); } /** @@ -943,41 +939,41 @@ public abstract class AbstractOrmElementCollectionMapping2_0<X extends XmlElemen * embedded mapping's target embeddable type mapping's attribute mappings * (attribute or association mappings, depending on the specified transformer). */ - protected Iterator<Iterator<String>> allTargetEmbeddableAttributeNamesLists() { - return new TransformationIterator<AttributeMapping, Iterator<String>>(this.allTargetEmbeddableAttributeMappings(), AttributeMappingTools.ALL_MAPPING_NAMES_TRANSFORMER); + protected Iterable<Iterable<String>> getAllTargetEmbeddableAttributeNamesLists() { + return new TransformationIterable<AttributeMapping, Iterable<String>>(this.getAllTargetEmbeddableAttributeMappings(), AttributeMappingTools.ALL_MAPPING_NAMES_TRANSFORMER); } - protected Iterator<AttributeMapping> allTargetEmbeddableAttributeMappings() { + protected Iterable<AttributeMapping> getAllTargetEmbeddableAttributeMappings() { Embeddable targetEmbeddable = this.getResolvedTargetEmbeddable(); - return (targetEmbeddable != null) ? targetEmbeddable.allAttributeMappings() : EmptyIterator.<AttributeMapping> instance(); + return (targetEmbeddable != null) ? targetEmbeddable.getAllAttributeMappings() : EmptyIterable.<AttributeMapping> instance(); } @Override @SuppressWarnings("unchecked") - public Iterator<String> allMappingNames() { - return new CompositeIterator<String>(super.allMappingNames(), this.allEmbeddableAttributeMappingNames()); + public Iterable<String> getAllMappingNames() { + return new CompositeIterable<String>(super.getAllMappingNames(), this.getAllEmbeddableAttributeMappingNames()); } - protected Iterator<String> allEmbeddableAttributeMappingNames() { - return this.qualifiedEmbeddableOverridableMappingNames(AttributeMappingTools.ALL_MAPPING_NAMES_TRANSFORMER); + protected Iterable<String> getAllEmbeddableAttributeMappingNames() { + return this.getQualifiedEmbeddableOverridableMappingNames(AttributeMappingTools.ALL_MAPPING_NAMES_TRANSFORMER); } @Override - public Iterator<String> allOverridableAttributeMappingNames() { - return this.qualifiedEmbeddableOverridableMappingNames(AttributeMappingTools.ALL_OVERRIDABLE_ATTRIBUTE_MAPPING_NAMES_TRANSFORMER); + public Iterable<String> getAllOverridableAttributeMappingNames() { + return this.getQualifiedEmbeddableOverridableMappingNames(AttributeMappingTools.ALL_OVERRIDABLE_ATTRIBUTE_MAPPING_NAMES_TRANSFORMER); } @Override - public Iterator<String> allOverridableAssociationMappingNames() { - return this.qualifiedEmbeddableOverridableMappingNames(AttributeMappingTools.ALL_OVERRIDABLE_ASSOCIATION_MAPPING_NAMES_TRANSFORMER); + public Iterable<String> getAllOverridableAssociationMappingNames() { + return this.getQualifiedEmbeddableOverridableMappingNames(AttributeMappingTools.ALL_OVERRIDABLE_ASSOCIATION_MAPPING_NAMES_TRANSFORMER); } - protected Iterator<String> qualifiedEmbeddableOverridableMappingNames(Transformer<AttributeMapping, Iterator<String>> transformer) { - return new TransformationIterator<String, String>(this.embeddableOverridableMappingNames(transformer), this.buildQualifierTransformer()); + protected Iterable<String> getQualifiedEmbeddableOverridableMappingNames(Transformer<AttributeMapping, Iterable<String>> transformer) { + return new TransformationIterable<String, String>(this.getEmbeddableOverridableMappingNames(transformer), this.buildQualifierTransformer()); } - protected Iterator<String> embeddableOverridableMappingNames(Transformer<AttributeMapping, Iterator<String>> transformer) { - return new CompositeIterator<String>(this.embeddableOverridableMappingNamesLists(transformer)); + protected Iterable<String> getEmbeddableOverridableMappingNames(Transformer<AttributeMapping, Iterable<String>> transformer) { + return new CompositeIterable<String>(this.getEmbeddableOverridableMappingNamesLists(transformer)); } /** @@ -985,8 +981,8 @@ public abstract class AbstractOrmElementCollectionMapping2_0<X extends XmlElemen * embedded mapping's target embeddable type mapping's attribute mappings * (attribute or association mappings, depending on the specified transformer). */ - protected Iterator<Iterator<String>> embeddableOverridableMappingNamesLists(Transformer<AttributeMapping, Iterator<String>> transformer) { - return new TransformationIterator<AttributeMapping, Iterator<String>>(this.embeddableAttributeMappings(), transformer); + protected Iterable<Iterable<String>> getEmbeddableOverridableMappingNamesLists(Transformer<AttributeMapping, Iterable<String>> transformer) { + return new TransformationIterable<AttributeMapping, Iterable<String>>(this.getEmbeddableAttributeMappings(), transformer); } @Override @@ -1000,7 +996,7 @@ public abstract class AbstractOrmElementCollectionMapping2_0<X extends XmlElemen return null; } // recurse into the embeddable mappings - for (AttributeMapping mapping : CollectionTools.iterable(this.embeddableAttributeMappings())) { + for (AttributeMapping mapping : this.getEmbeddableAttributeMappings()) { resolvedMapping = mapping.resolveAttributeMapping(attributeName); if (resolvedMapping != null) { return resolvedMapping; @@ -1009,11 +1005,11 @@ public abstract class AbstractOrmElementCollectionMapping2_0<X extends XmlElemen return null; } - protected Iterator<AttributeMapping> embeddableAttributeMappings() { + protected Iterable<AttributeMapping> getEmbeddableAttributeMappings() { Embeddable targetEmbeddable = this.getResolvedTargetEmbeddable(); return ((targetEmbeddable != null) && (targetEmbeddable != this.getTypeMapping())) ? - targetEmbeddable.attributeMappings() : - EmptyIterator.<AttributeMapping>instance(); + targetEmbeddable.getAttributeMappings() : + EmptyIterable.<AttributeMapping>instance(); } @Override @@ -1316,8 +1312,8 @@ public abstract class AbstractOrmElementCollectionMapping2_0<X extends XmlElemen return Tools.valuesAreEqual(table.getName(), tableName) ? table.getDbTable() : null; } - public Iterator<String> candidateTableNames() { - return EmptyIterator.instance(); + public Iterable<String> getCandidateTableNames() { + return EmptyIterable.instance(); } /** @@ -1424,9 +1420,9 @@ public abstract class AbstractOrmElementCollectionMapping2_0<X extends XmlElemen return AbstractOrmElementCollectionMapping2_0.this.getResolvedTargetEmbeddable(); } - public Iterator<String> allOverridableNames() { + public Iterable<String> getAllOverridableNames() { TypeMapping typeMapping = this.getOverridableTypeMapping(); - return (typeMapping != null) ? typeMapping.allOverridableAssociationNames() : EmptyIterator.<String>instance(); + return (typeMapping != null) ? typeMapping.getAllOverridableAssociationNames() : EmptyIterable.<String>instance(); } public EList<XmlAssociationOverride> getXmlOverrides() { @@ -1473,9 +1469,9 @@ public abstract class AbstractOrmElementCollectionMapping2_0<X extends XmlElemen return AbstractOrmElementCollectionMapping2_0.this.getResolvedTargetEmbeddable(); } - public Iterator<String> allOverridableNames() { + public Iterable<String> getAllOverridableNames() { TypeMapping overriddenTypeMapping = this.getOverridableTypeMapping(); - return (overriddenTypeMapping != null) ? overriddenTypeMapping.allOverridableAttributeNames() : EmptyIterator.<String>instance(); + return (overriddenTypeMapping != null) ? overriddenTypeMapping.getAllOverridableAttributeNames() : EmptyIterable.<String>instance(); } public EList<XmlAttributeOverride> getXmlOverrides() { @@ -1506,9 +1502,9 @@ public abstract class AbstractOrmElementCollectionMapping2_0<X extends XmlElemen return AbstractOrmElementCollectionMapping2_0.this.getResolvedMapKeyEmbeddable(); } - public Iterator<String> allOverridableNames() { + public Iterable<String> getAllOverridableNames() { TypeMapping overriddenTypeMapping = this.getOverridableTypeMapping(); - return (overriddenTypeMapping != null) ? overriddenTypeMapping.allOverridableAttributeNames() : EmptyIterator.<String>instance(); + return (overriddenTypeMapping != null) ? overriddenTypeMapping.getAllOverridableAttributeNames() : EmptyIterable.<String>instance(); } public EList<XmlAttributeOverride> getXmlOverrides() { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/GenericOrmCollectionTable2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/GenericOrmCollectionTable2_0.java index e6f4d9f4c2..88adf54660 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/GenericOrmCollectionTable2_0.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/GenericOrmCollectionTable2_0.java @@ -9,10 +9,9 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.internal.jpa2.context.orm; -import java.util.Iterator; import org.eclipse.jpt.common.core.utility.TextRange; import org.eclipse.jpt.common.utility.internal.Tools; -import org.eclipse.jpt.common.utility.internal.iterators.EmptyIterator; +import org.eclipse.jpt.common.utility.internal.iterables.EmptyIterable; import org.eclipse.jpt.jpa.core.context.Entity; import org.eclipse.jpt.jpa.core.context.PersistentAttribute; import org.eclipse.jpt.jpa.core.context.ReadOnlyBaseJoinColumn; @@ -163,8 +162,8 @@ public class GenericOrmCollectionTable2_0 return false; } - public Iterator<String> candidateTableNames() { - return EmptyIterator.instance(); + public Iterable<String> getCandidateTableNames() { + return EmptyIterable.instance(); } public Entity getRelationshipTarget() { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/GenericOrmMapsIdDerivedIdentityStrategy2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/GenericOrmMapsIdDerivedIdentityStrategy2_0.java index 3b41082bab..6432e46e11 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/GenericOrmMapsIdDerivedIdentityStrategy2_0.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/GenericOrmMapsIdDerivedIdentityStrategy2_0.java @@ -116,7 +116,7 @@ public class GenericOrmMapsIdDerivedIdentityStrategy2_0 } protected Iterable<AttributeMapping> getAllAttributeMappings() { - return CollectionTools.collection(this.getPersistentAttribute().getOwningTypeMapping().allAttributeMappings()); + return CollectionTools.collection(this.getPersistentAttribute().getOwningTypeMapping().getAllAttributeMappings()); } public Iterable<String> getSortedCandidateIdAttributeNames() { @@ -168,7 +168,7 @@ public class GenericOrmMapsIdDerivedIdentityStrategy2_0 } return new CompositeIterable<AttributeMapping>( mapping, - CollectionTools.collection(embeddable.allAttributeMappings()) + CollectionTools.collection(embeddable.getAllAttributeMappings()) ); } }; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/persistence/options/GenericOptions2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/persistence/options/GenericOptions2_0.java index b432df0d5b..48cf290337 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/persistence/options/GenericOptions2_0.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/persistence/options/GenericOptions2_0.java @@ -1,5 +1,5 @@ /******************************************************************************* -* Copyright (c) 2009, 2010 Oracle. All rights reserved. +* Copyright (c) 2009, 2011 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html. @@ -10,10 +10,9 @@ package org.eclipse.jpt.jpa.core.internal.jpa2.context.persistence.options; import java.util.List; -import java.util.ListIterator; import java.util.Map; - -import org.eclipse.jpt.common.utility.internal.iterators.CloneListIterator; +import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; +import org.eclipse.jpt.common.utility.internal.iterables.LiveCloneListIterable; import org.eclipse.jpt.jpa.core.context.persistence.PersistenceUnit; import org.eclipse.jpt.jpa.core.internal.context.persistence.AbstractPersistenceUnitProperties; import org.eclipse.jpt.jpa.core.jpa2.context.persistence.PersistenceUnit2_0; @@ -170,11 +169,11 @@ public class GenericOptions2_0 extends AbstractPersistenceUnitProperties } // ********** ValidationGroupPrePersists ********** - public ListIterator<String> validationGroupPrePersists(){ - return new CloneListIterator<String>(this.validationGroupPrePersists); + public ListIterable<String> getValidationGroupPrePersists(){ + return new LiveCloneListIterable<String>(this.validationGroupPrePersists); } - public int validationGroupPrePersistsSize(){ + public int getValidationGroupPrePersistsSize(){ return this.validationGroupPrePersists.size(); } @@ -208,8 +207,7 @@ public class GenericOptions2_0 extends AbstractPersistenceUnitProperties private String removeValidationGroupPrePersist_(String className){ - for ( ListIterator<String> i = this.validationGroupPrePersists(); i.hasNext();) { - String validationGroupPrePersist = i.next(); + for ( String validationGroupPrePersist : this.getValidationGroupPrePersists()) { if(validationGroupPrePersist.equals(className)) { this.validationGroupPrePersists.remove(validationGroupPrePersist); return validationGroupPrePersist; @@ -225,11 +223,11 @@ public class GenericOptions2_0 extends AbstractPersistenceUnitProperties // ********** ValidationGroupPreUpdates ********** - public ListIterator<String> validationGroupPreUpdates(){ - return new CloneListIterator<String>(this.validationGroupPreUpdates); + public ListIterable<String> getValidationGroupPreUpdates(){ + return new LiveCloneListIterable<String>(this.validationGroupPreUpdates); } - public int validationGroupPreUpdatesSize(){ + public int getValidationGroupPreUpdatesSize(){ return this.validationGroupPreUpdates.size(); } @@ -264,8 +262,7 @@ public class GenericOptions2_0 extends AbstractPersistenceUnitProperties private String removeValidationGroupPreUpdate_(String className){ - for(ListIterator<String> i = this.validationGroupPreUpdates(); i.hasNext();) { - String validationGroupPreUpdate = i.next(); + for(String validationGroupPreUpdate : this.getValidationGroupPreUpdates()) { if(validationGroupPreUpdate.equals(className)) { this.validationGroupPreUpdates.remove(validationGroupPreUpdate); return validationGroupPreUpdate; @@ -281,11 +278,11 @@ public class GenericOptions2_0 extends AbstractPersistenceUnitProperties // ********** ValidationGroupPreRemoves ********** - public ListIterator<String> validationGroupPreRemoves(){ - return new CloneListIterator<String>(this.validationGroupPreRemoves); + public ListIterable<String> getValidationGroupPreRemoves(){ + return new LiveCloneListIterable<String>(this.validationGroupPreRemoves); } - public int validationGroupPreRemovesSize(){ + public int getValidationGroupPreRemovesSize(){ return this.validationGroupPreRemoves.size(); } @@ -320,8 +317,7 @@ public class GenericOptions2_0 extends AbstractPersistenceUnitProperties private String removeValidationGroupPreRemove_(String className){ - for(ListIterator<String> i = this.validationGroupPreRemoves(); i.hasNext();) { - String validationGroupPreRemove = i.next(); + for(String validationGroupPreRemove : this.getValidationGroupPreRemoves()) { if(validationGroupPreRemove.equals(className)) { this.validationGroupPreRemoves.remove(validationGroupPreRemove); return validationGroupPreRemove; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/persistence/options/NullOptions2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/persistence/options/NullOptions2_0.java index b7625ed94f..4ef13a055e 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/persistence/options/NullOptions2_0.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/persistence/options/NullOptions2_0.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. @@ -9,10 +9,9 @@ *******************************************************************************/ package org.eclipse.jpt.jpa.core.internal.jpa2.context.persistence.options; -import java.util.ListIterator; import java.util.Map; - -import org.eclipse.jpt.common.utility.internal.iterators.EmptyListIterator; +import org.eclipse.jpt.common.utility.internal.iterables.EmptyListIterable; +import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; import org.eclipse.jpt.jpa.core.context.persistence.PersistenceUnit; import org.eclipse.jpt.jpa.core.internal.context.persistence.AbstractPersistenceUnitProperties; import org.eclipse.jpt.jpa.core.jpa2.context.persistence.options.JpaOptions2_0; @@ -87,11 +86,11 @@ public class NullOptions2_0 extends AbstractPersistenceUnitProperties // ********** ValidationGroupPrePersists ********** - public ListIterator<String> validationGroupPrePersists() { - return EmptyListIterator.instance(); + public ListIterable<String> getValidationGroupPrePersists() { + return EmptyListIterable.instance(); } - public int validationGroupPrePersistsSize() { + public int getValidationGroupPrePersistsSize() { return 0; } @@ -108,11 +107,11 @@ public class NullOptions2_0 extends AbstractPersistenceUnitProperties } // ********** ValidationGroupPreUpdates ********** - public ListIterator<String> validationGroupPreUpdates() { - return EmptyListIterator.instance(); + public ListIterable<String> getValidationGroupPreUpdates() { + return EmptyListIterable.instance(); } - public int validationGroupPreUpdatesSize() { + public int getValidationGroupPreUpdatesSize() { return 0; } @@ -129,11 +128,11 @@ public class NullOptions2_0 extends AbstractPersistenceUnitProperties } // ********** ValidationGroupPreRemoves ********** - public ListIterator<String> validationGroupPreRemoves() { - return EmptyListIterator.instance(); + public ListIterable<String> getValidationGroupPreRemoves() { + return EmptyListIterable.instance(); } - public int validationGroupPreRemovesSize() { + public int getValidationGroupPreRemovesSize() { return 0; } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpql/JpaManagedType.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpql/JpaManagedType.java index a9722d3cc9..57d78884bc 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpql/JpaManagedType.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpql/JpaManagedType.java @@ -15,7 +15,6 @@ package org.eclipse.jpt.jpa.core.internal.jpql; import java.util.Collections; import java.util.HashMap; -import java.util.Iterator; import java.util.Map; import org.eclipse.jpt.jpa.core.context.AttributeMapping; import org.eclipse.jpt.jpa.core.context.TypeMapping; @@ -72,8 +71,7 @@ abstract class JpaManagedType implements IManagedType { private Map<String, IMapping> buildMappings() { Map<String, IMapping> mappings = new HashMap<String, IMapping>(); - for (Iterator<AttributeMapping> iter = managedType.allAttributeMappings(); iter.hasNext(); ) { - AttributeMapping mapping = iter.next(); + for (AttributeMapping mapping : managedType.getAllAttributeMappings()) { mappings.put(mapping.getName(), buildMapping(mapping)); } return mappings; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/persistence/options/JpaOptions2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/persistence/options/JpaOptions2_0.java index 2f841e139b..bde433ca8c 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/persistence/options/JpaOptions2_0.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/persistence/options/JpaOptions2_0.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. @@ -9,8 +9,7 @@ *******************************************************************************/ package org.eclipse.jpt.jpa.core.jpa2.context.persistence.options; -import java.util.ListIterator; - +import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; import org.eclipse.jpt.jpa.core.context.persistence.PersistenceUnitProperties; /** @@ -42,8 +41,8 @@ public interface JpaOptions2_0 static final String PERSISTENCE_QUERY_TIMEOUT = "javax.persistence.query.timeout"; //$NON-NLS-1$ static final Integer DEFAULT_QUERY_TIMEOUT = Integer.valueOf(5); - ListIterator<String> validationGroupPrePersists(); - int validationGroupPrePersistsSize(); + ListIterable<String> getValidationGroupPrePersists(); + int getValidationGroupPrePersistsSize(); boolean validationGroupPrePersistExists(String validationGroupPrePersistClassName); String addValidationGroupPrePersist(String newValidationGroupPrePersistClassName); void removeValidationGroupPrePersist(String validationGroupPrePersistClassName); @@ -52,8 +51,8 @@ public interface JpaOptions2_0 // Property key static final String PERSISTENCE_VALIDATION_GROUP_PRE_PERSIST = "javax.persistence.validation.group.pre-persist"; //$NON-NLS-1$ - ListIterator<String> validationGroupPreUpdates(); - int validationGroupPreUpdatesSize(); + ListIterable<String> getValidationGroupPreUpdates(); + int getValidationGroupPreUpdatesSize(); boolean validationGroupPreUpdateExists(String validationGroupPreUpdateClassName); String addValidationGroupPreUpdate(String newValidationGroupPreUpdateClassName); void removeValidationGroupPreUpdate(String validationGroupPreUpdateClassName); @@ -62,8 +61,8 @@ public interface JpaOptions2_0 // Property key static final String PERSISTENCE_VALIDATION_GROUP_PRE_UPDATE = "javax.persistence.validation.group.pre-update"; //$NON-NLS-1$ - ListIterator<String> validationGroupPreRemoves(); - int validationGroupPreRemovesSize(); + ListIterable<String> getValidationGroupPreRemoves(); + int getValidationGroupPreRemovesSize(); boolean validationGroupPreRemoveExists(String validationGroupPreRemoveClassName); String addValidationGroupPreRemove(String newValidationGroupPreRemoveClassName); void removeValidationGroupPreRemove(String validationGroupPreRemoveClassName); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/persistence/EclipseLinkPersistenceUnit.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/persistence/EclipseLinkPersistenceUnit.java index 337971cad8..b755b627bd 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/persistence/EclipseLinkPersistenceUnit.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/persistence/EclipseLinkPersistenceUnit.java @@ -12,7 +12,6 @@ package org.eclipse.jpt.jpa.eclipselink.core.context.persistence; import java.util.ArrayList; import java.util.HashMap; import java.util.HashSet; -import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Set; @@ -347,23 +346,18 @@ public class EclipseLinkPersistenceUnit * "metadata complete" is ignored. */ // TODO bjv change to getConverterNames() etc. - public Iterator<EclipseLinkConverter> allConverters() { - return this.getConverters().iterator(); + public Iterable<EclipseLinkConverter> getAllConverters() { + return this.getConverters(); } public Iterable<EclipseLinkConverter> getConverters() { return new LiveCloneIterable<EclipseLinkConverter>(this.converters); } - public int convertersSize() { + public int getConvertersSize() { return this.converters.size(); } - // TODO bjv remove - public void addConverter(EclipseLinkConverter converter) { - this.converters.add(converter); - } - /** * Return the names of the "active" converters defined in the persistence * unit's scope, with duplicates removed. diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/persistence/caching/Caching.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/persistence/caching/Caching.java index 6d26cbc6f1..7aa948dce4 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/persistence/caching/Caching.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/persistence/caching/Caching.java @@ -9,9 +9,7 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.eclipselink.core.context.persistence.caching; -import java.util.Iterator; -import java.util.ListIterator; - +import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; import org.eclipse.jpt.jpa.core.context.persistence.PersistenceUnitProperties; /** @@ -78,9 +76,9 @@ public interface Caching extends PersistenceUnitProperties void removeDefaultCachingProperties(); - ListIterator<Entity> entities(); - Iterator<String> entityNames(); - int entitiesSize(); + ListIterable<Entity> getEntities(); + Iterable<String> getEntityNames(); + int getEntitiesSize(); boolean entityExists(String entity); Entity addEntity(String entity); void removeEntity(String entity); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/persistence/customization/Customization.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/persistence/customization/Customization.java index 642df24ec6..4c11af9478 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/persistence/customization/Customization.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/persistence/customization/Customization.java @@ -9,9 +9,7 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.eclipselink.core.context.persistence.customization; -import java.util.Iterator; -import java.util.ListIterator; - +import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; import org.eclipse.jpt.jpa.core.context.persistence.PersistenceUnitProperties; import org.eclipse.jpt.jpa.core.internal.context.persistence.AbstractPersistenceUnitProperties; @@ -84,8 +82,8 @@ public interface Customization extends PersistenceUnitProperties static final String ECLIPSELINK_DESCRIPTOR_CUSTOMIZER = "eclipselink.descriptor.customizer."; //$NON-NLS-1$ static final String DEFAULT_DESCRIPTOR_CUSTOMIZER = null; // no default - ListIterator<String> sessionCustomizers(); - int sessionCustomizersSize(); + ListIterable<String> getSessionCustomizers(); + int getSessionCustomizersSize(); boolean sessionCustomizerExists(String sessionCustomizerClassName); String addSessionCustomizer(String newSessionCustomizerClassName); void removeSessionCustomizer(String sessionCustomizerClassName); @@ -95,9 +93,9 @@ public interface Customization extends PersistenceUnitProperties static final String ECLIPSELINK_SESSION_CUSTOMIZER = "eclipselink.session.customizer"; //$NON-NLS-1$ String ECLIPSELINK_SESSION_CUSTOMIZER_CLASS_NAME = "org.eclipse.persistence.config.SessionCustomizer"; //$NON-NLS-1$ - ListIterator<Entity> entities(); - Iterator<String> entityNames(); - int entitiesSize(); + ListIterable<Entity> getEntities(); + Iterable<String> getEntityNames(); + int getEntitiesSize(); boolean entityExists(String entity); Entity addEntity(String entity); void removeEntity(String entity); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkConvert.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkConvert.java index 83e14d210d..79b516aead 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkConvert.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkConvert.java @@ -9,7 +9,6 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.eclipselink.core.internal.context.java; -import java.util.Iterator; import java.util.List; import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.common.core.resource.java.Annotation; @@ -22,7 +21,7 @@ import org.eclipse.jpt.common.utility.internal.CollectionTools; import org.eclipse.jpt.common.utility.internal.SimpleAssociation; import org.eclipse.jpt.common.utility.internal.StringTools; import org.eclipse.jpt.common.utility.internal.iterables.ArrayIterable; -import org.eclipse.jpt.common.utility.internal.iterators.FilteringIterator; +import org.eclipse.jpt.common.utility.internal.iterables.FilteringIterable; import org.eclipse.jpt.jpa.core.JpaFactory; import org.eclipse.jpt.jpa.core.context.Converter; import org.eclipse.jpt.jpa.core.context.java.JavaAttributeMapping; @@ -268,13 +267,13 @@ public class JavaEclipseLinkConvert // ********** Java completion proposals ********** @Override - public Iterator<String> javaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) { - Iterator<String> result = super.javaCompletionProposals(pos, filter, astRoot); + public Iterable<String> getJavaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) { + Iterable<String> result = super.getJavaCompletionProposals(pos, filter, astRoot); if (result != null) { return result; } if (this.convertValueTouches(pos, astRoot)) { - result = this.javaCandidateConverterNames(filter); + result = this.getJavaCandidateConverterNames(filter); if (result != null) { return result; } @@ -286,16 +285,16 @@ public class JavaEclipseLinkConvert return this.convertAnnotation.valueTouches(pos, astRoot); } - protected Iterator<String> javaCandidateConverterNames(Filter<String> filter) { - return StringTools.convertToJavaStringLiterals(this.candidateConverterNames(filter)); + protected Iterable<String> getJavaCandidateConverterNames(Filter<String> filter) { + return StringTools.convertToJavaStringLiterals(this.getCandidateConverterNames(filter)); } - protected Iterator<String> candidateConverterNames(Filter<String> filter) { - return new FilteringIterator<String>(this.converterNames(), filter); + protected Iterable<String> getCandidateConverterNames(Filter<String> filter) { + return new FilteringIterable<String>(this.getConverterNames(), filter); } - protected Iterator<String> converterNames() { - return this.getEclipseLinkPersistenceUnit().getUniqueConverterNames().iterator(); + protected Iterable<String> getConverterNames() { + return this.getEclipseLinkPersistenceUnit().getUniqueConverterNames(); } protected EclipseLinkPersistenceUnit getEclipseLinkPersistenceUnit() { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/persistence/caching/EclipseLinkCaching.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/persistence/caching/EclipseLinkCaching.java index d198b41c44..98c215de96 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/persistence/caching/EclipseLinkCaching.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/persistence/caching/EclipseLinkCaching.java @@ -10,15 +10,13 @@ package org.eclipse.jpt.jpa.eclipselink.core.internal.context.persistence.caching; import java.util.ArrayList; -import java.util.Iterator; import java.util.List; -import java.util.ListIterator; import java.util.Map; import java.util.Set; - import org.eclipse.jpt.common.utility.internal.StringTools; -import org.eclipse.jpt.common.utility.internal.iterators.CloneListIterator; -import org.eclipse.jpt.common.utility.internal.iterators.TransformationIterator; +import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; +import org.eclipse.jpt.common.utility.internal.iterables.LiveCloneListIterable; +import org.eclipse.jpt.common.utility.internal.iterables.TransformationIterable; import org.eclipse.jpt.jpa.core.context.persistence.PersistenceUnit; import org.eclipse.jpt.jpa.eclipselink.core.context.persistence.caching.CacheType; import org.eclipse.jpt.jpa.eclipselink.core.context.persistence.caching.Caching; @@ -570,12 +568,12 @@ public class EclipseLinkCaching extends EclipseLinkPersistenceUnitProperties // ****** entities list ******* - public ListIterator<Entity> entities() { - return new CloneListIterator<Entity>(this.entities); + public ListIterable<Entity> getEntities() { + return new LiveCloneListIterable<Entity>(this.entities); } - public Iterator<String> entityNames() { - return new TransformationIterator<Entity, String>(this.entities()) { + public Iterable<String> getEntityNames() { + return new TransformationIterable<Entity, String>(this.getEntities()) { @Override protected String transform(Entity entity) { return entity.getName(); @@ -583,7 +581,7 @@ public class EclipseLinkCaching extends EclipseLinkPersistenceUnitProperties }; } - public int entitiesSize() { + public int getEntitiesSize() { return this.entities.size(); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/persistence/customization/EclipseLinkCustomization.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/persistence/customization/EclipseLinkCustomization.java index 1878ff7080..10e128a30a 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/persistence/customization/EclipseLinkCustomization.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/persistence/customization/EclipseLinkCustomization.java @@ -10,21 +10,18 @@ package org.eclipse.jpt.jpa.eclipselink.core.internal.context.persistence.customization; import java.util.ArrayList; -import java.util.Iterator; import java.util.List; -import java.util.ListIterator; import java.util.Map; import java.util.Set; - import org.eclipse.jdt.core.IPackageFragment; import org.eclipse.jdt.core.IType; import org.eclipse.jpt.common.utility.internal.CollectionTools; import org.eclipse.jpt.common.utility.internal.StringTools; import org.eclipse.jpt.common.utility.internal.iterables.CompositeIterable; import org.eclipse.jpt.common.utility.internal.iterables.EmptyIterable; +import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; +import org.eclipse.jpt.common.utility.internal.iterables.LiveCloneListIterable; import org.eclipse.jpt.common.utility.internal.iterables.TransformationIterable; -import org.eclipse.jpt.common.utility.internal.iterators.CloneListIterator; -import org.eclipse.jpt.common.utility.internal.iterators.TransformationIterator; import org.eclipse.jpt.jpa.core.context.persistence.PersistenceUnit; import org.eclipse.jpt.jpa.eclipselink.core.context.persistence.customization.Customization; import org.eclipse.jpt.jpa.eclipselink.core.context.persistence.customization.Entity; @@ -512,11 +509,11 @@ public class EclipseLinkCustomization extends EclipseLinkPersistenceUnitProperti } // ********** SessionCustomizers ********** - public ListIterator<String> sessionCustomizers(){ - return new CloneListIterator<String>(this.sessionCustomizers); + public ListIterable<String> getSessionCustomizers(){ + return new LiveCloneListIterable<String>(this.sessionCustomizers); } - public int sessionCustomizersSize(){ + public int getSessionCustomizersSize(){ return this.sessionCustomizers.size(); } @@ -771,12 +768,12 @@ public class EclipseLinkCustomization extends EclipseLinkPersistenceUnitProperti // ****** entities list ******* - public ListIterator<Entity> entities() { - return new CloneListIterator<Entity>(this.entities); + public ListIterable<Entity> getEntities() { + return new LiveCloneListIterable<Entity>(this.entities); } - public Iterator<String> entityNames() { - return new TransformationIterator<Entity, String>(this.entities()) { + public Iterable<String> getEntityNames() { + return new TransformationIterable<Entity, String>(this.getEntities()) { @Override protected String transform(Entity entity) { return entity.getName(); @@ -784,7 +781,7 @@ public class EclipseLinkCustomization extends EclipseLinkPersistenceUnitProperti }; } - public int entitiesSize() { + public int getEntitiesSize() { return this.entities.size(); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v2_0/context/persistence/options/EclipseLinkOptions2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v2_0/context/persistence/options/EclipseLinkOptions2_0.java index 4a369d6962..0eb6bdcb6a 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v2_0/context/persistence/options/EclipseLinkOptions2_0.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v2_0/context/persistence/options/EclipseLinkOptions2_0.java @@ -1,5 +1,5 @@ /******************************************************************************* -* Copyright (c) 2009, 2010 Oracle. All rights reserved. +* Copyright (c) 2009, 2011 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html. @@ -10,10 +10,9 @@ package org.eclipse.jpt.jpa.eclipselink.core.internal.v2_0.context.persistence.options; import java.util.List; -import java.util.ListIterator; import java.util.Map; - -import org.eclipse.jpt.common.utility.internal.iterators.CloneListIterator; +import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; +import org.eclipse.jpt.common.utility.internal.iterables.LiveCloneListIterable; import org.eclipse.jpt.jpa.core.jpa2.context.persistence.PersistenceUnit2_0; import org.eclipse.jpt.jpa.eclipselink.core.internal.context.persistence.options.EclipseLinkOptions; import org.eclipse.jpt.jpa.eclipselink.core.v2_0.context.persistence.options.Options2_0; @@ -181,11 +180,11 @@ public class EclipseLinkOptions2_0 extends EclipseLinkOptions // ********** ValidationGroupPrePersists ********** - public ListIterator<String> validationGroupPrePersists(){ - return new CloneListIterator<String>(this.validationGroupPrePersists); + public ListIterable<String> getValidationGroupPrePersists(){ + return new LiveCloneListIterable<String>(this.validationGroupPrePersists); } - public int validationGroupPrePersistsSize(){ + public int getValidationGroupPrePersistsSize(){ return this.validationGroupPrePersists.size(); } @@ -220,8 +219,7 @@ public class EclipseLinkOptions2_0 extends EclipseLinkOptions private String removeValidationGroupPrePersist_(String className){ - for ( ListIterator<String> i = this.validationGroupPrePersists(); i.hasNext();) { - String validationGroupPrePersist = i.next(); + for (String validationGroupPrePersist : this.getValidationGroupPrePersists()) { if(validationGroupPrePersist.equals(className)) { this.validationGroupPrePersists.remove(validationGroupPrePersist); return validationGroupPrePersist; @@ -237,11 +235,11 @@ public class EclipseLinkOptions2_0 extends EclipseLinkOptions // ********** ValidationGroupPreUpdates ********** - public ListIterator<String> validationGroupPreUpdates(){ - return new CloneListIterator<String>(this.validationGroupPreUpdates); + public ListIterable<String> getValidationGroupPreUpdates(){ + return new LiveCloneListIterable<String>(this.validationGroupPreUpdates); } - public int validationGroupPreUpdatesSize(){ + public int getValidationGroupPreUpdatesSize(){ return this.validationGroupPreUpdates.size(); } @@ -276,8 +274,7 @@ public class EclipseLinkOptions2_0 extends EclipseLinkOptions private String removeValidationGroupPreUpdate_(String className){ - for(ListIterator<String> i = this.validationGroupPreUpdates(); i.hasNext();) { - String validationGroupPreUpdate = i.next(); + for(String validationGroupPreUpdate : this.getValidationGroupPreUpdates()) { if(validationGroupPreUpdate.equals(className)) { this.validationGroupPreUpdates.remove(validationGroupPreUpdate); return validationGroupPreUpdate; @@ -293,11 +290,11 @@ public class EclipseLinkOptions2_0 extends EclipseLinkOptions // ********** ValidationGroupPreRemoves ********** - public ListIterator<String> validationGroupPreRemoves(){ - return new CloneListIterator<String>(this.validationGroupPreRemoves); + public ListIterable<String> getValidationGroupPreRemoves(){ + return new LiveCloneListIterable<String>(this.validationGroupPreRemoves); } - public int validationGroupPreRemovesSize(){ + public int getValidationGroupPreRemovesSize(){ return this.validationGroupPreRemoves.size(); } @@ -332,8 +329,7 @@ public class EclipseLinkOptions2_0 extends EclipseLinkOptions private String removeValidationGroupPreRemove_(String className){ - for(ListIterator<String> i = this.validationGroupPreRemoves(); i.hasNext();) { - String validationGroupPreRemove = i.next(); + for(String validationGroupPreRemove : this.getValidationGroupPreRemoves()) { if(validationGroupPreRemove.equals(className)) { this.validationGroupPreRemoves.remove(validationGroupPreRemove); return validationGroupPreRemove; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkConvertComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkConvertComposite.java index 2857a2879d..d05c5281a0 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkConvertComposite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkConvertComposite.java @@ -292,7 +292,7 @@ public class EclipseLinkConvertComposite } @Override protected int size_() { - return this.subject.convertersSize(); + return this.subject.getConvertersSize(); } }; } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkConverterStateObject.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkConverterStateObject.java index 5355867a06..94eb469753 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkConverterStateObject.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkConverterStateObject.java @@ -10,7 +10,6 @@ package org.eclipse.jpt.jpa.eclipselink.ui.internal.details.orm; import java.util.ArrayList; -import java.util.Iterator; import java.util.List; import org.eclipse.jface.dialogs.IMessageProvider; import org.eclipse.jpt.common.utility.internal.ArrayTools; @@ -96,8 +95,8 @@ final class EclipseLinkConverterStateObject extends AbstractNode private List<String> names() { List<String> names = new ArrayList<String>(); - for (Iterator<EclipseLinkConverter> converters = this.pUnit.allConverters(); converters.hasNext();){ - names.add(converters.next().getName()); + for (EclipseLinkConverter converter : this.pUnit.getAllConverters()){ + names.add(converter.getName()); } return names ; } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkConvert1_0Composite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkConvert1_0Composite.java index 03b3ed3691..a80b77fc3e 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkConvert1_0Composite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkConvert1_0Composite.java @@ -228,7 +228,7 @@ public class OrmEclipseLinkConvert1_0Composite extends Pane<EclipseLinkConvert> } @Override protected int size_() { - return this.subject.convertersSize(); + return this.subject.getConvertersSize(); } }; } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/caching/EntityListComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/caching/EntityListComposite.java index cd233bb720..3a162dc5bc 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/caching/EntityListComposite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/caching/EntityListComposite.java @@ -9,7 +9,6 @@ *******************************************************************************/ package org.eclipse.jpt.jpa.eclipselink.ui.internal.persistence.caching; -import java.util.ListIterator; import org.eclipse.jdt.core.IJavaElement; import org.eclipse.jdt.core.IJavaProject; import org.eclipse.jdt.core.IType; @@ -25,6 +24,7 @@ import org.eclipse.jpt.common.ui.internal.util.PaneEnabler; import org.eclipse.jpt.common.ui.internal.widgets.AddRemoveListPane; import org.eclipse.jpt.common.ui.internal.widgets.Pane; import org.eclipse.jpt.common.utility.internal.CollectionTools; +import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; import org.eclipse.jpt.common.utility.internal.model.value.ListAspectAdapter; import org.eclipse.jpt.common.utility.internal.model.value.SimplePropertyValueModel; import org.eclipse.jpt.common.utility.internal.model.value.TransformationPropertyValueModel; @@ -116,7 +116,7 @@ public class EntityListComposite<T extends Caching> extends Pane<T> if( ! this.getSubject().entityExists(entityName)) { this.getSubject().addEntity(entityName); - int index = CollectionTools.indexOf(this.getSubject().entityNames(), entityName); + int index = CollectionTools.indexOf(this.getSubject().getEntityNames(), entityName); Entity entity = (Entity) listSelectionModel.getListModel().getElementAt(index); listSelectionModel.setSelectedValue(entity); this.entityHolder.setValue(entity); @@ -182,12 +182,12 @@ public class EntityListComposite<T extends Caching> extends Pane<T> return new ListAspectAdapter<Caching, Entity>( this.getSubjectHolder(), Caching.ENTITIES_LIST) { @Override - protected ListIterator<Entity> listIterator_() { - return this.subject.entities(); + protected ListIterable<Entity> getListIterable() { + return this.subject.getEntities(); } @Override protected int size_() { - return this.subject.entitiesSize(); + return this.subject.getEntitiesSize(); } }; } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/customization/EntityListComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/customization/EntityListComposite.java index 479b8ef52c..74805d36de 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/customization/EntityListComposite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/customization/EntityListComposite.java @@ -9,7 +9,6 @@ *******************************************************************************/ package org.eclipse.jpt.jpa.eclipselink.ui.internal.persistence.customization; -import java.util.ListIterator; import org.eclipse.jdt.core.IJavaElement; import org.eclipse.jdt.core.IJavaProject; import org.eclipse.jdt.core.IType; @@ -25,6 +24,7 @@ import org.eclipse.jpt.common.ui.internal.util.PaneEnabler; import org.eclipse.jpt.common.ui.internal.widgets.AddRemoveListPane; import org.eclipse.jpt.common.ui.internal.widgets.Pane; import org.eclipse.jpt.common.utility.internal.CollectionTools; +import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; import org.eclipse.jpt.common.utility.internal.model.value.ListAspectAdapter; import org.eclipse.jpt.common.utility.internal.model.value.SimplePropertyValueModel; import org.eclipse.jpt.common.utility.internal.model.value.TransformationPropertyValueModel; @@ -116,7 +116,7 @@ public class EntityListComposite extends Pane<Customization> if( ! this.getSubject().entityExists(entityName)) { this.getSubject().addEntity(entityName); - int index = CollectionTools.indexOf(this.getSubject().entityNames(), entityName); + int index = CollectionTools.indexOf(this.getSubject().getEntityNames(), entityName); Entity entity = (Entity) listSelectionModel.getListModel().getElementAt(index); listSelectionModel.setSelectedValue(entity); this.entityHolder.setValue(entity); @@ -182,12 +182,12 @@ public class EntityListComposite extends Pane<Customization> return new ListAspectAdapter<Customization, Entity>( this.getSubjectHolder(), Customization.ENTITIES_LIST) { @Override - protected ListIterator<Entity> listIterator_() { - return this.subject.entities(); + protected ListIterable<Entity> getListIterable() { + return this.subject.getEntities(); } @Override protected int size_() { - return this.subject.entitiesSize(); + return this.subject.getEntitiesSize(); } }; } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/customization/SessionCustomizersComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/customization/SessionCustomizersComposite.java index 805cc8b9af..5557ceaedc 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/customization/SessionCustomizersComposite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/customization/SessionCustomizersComposite.java @@ -1,5 +1,5 @@ /******************************************************************************* -* Copyright (c) 2008, 2010 Oracle. All rights reserved. +* Copyright (c) 2008, 2011 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html. @@ -9,7 +9,6 @@ *******************************************************************************/ package org.eclipse.jpt.jpa.eclipselink.ui.internal.persistence.customization; -import java.util.ListIterator; import org.eclipse.jdt.core.IJavaElement; import org.eclipse.jdt.core.IJavaProject; import org.eclipse.jdt.core.IType; @@ -25,6 +24,7 @@ import org.eclipse.jpt.common.ui.internal.JptCommonUiMessages; import org.eclipse.jpt.common.ui.internal.widgets.AddRemoveListPane; import org.eclipse.jpt.common.ui.internal.widgets.AddRemovePane.Adapter; import org.eclipse.jpt.common.ui.internal.widgets.Pane; +import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; import org.eclipse.jpt.common.utility.internal.model.value.ListAspectAdapter; import org.eclipse.jpt.common.utility.internal.model.value.SimplePropertyValueModel; import org.eclipse.jpt.common.utility.internal.model.value.swing.ObjectListSelectionModel; @@ -104,13 +104,13 @@ public class SessionCustomizersComposite extends Pane<Customization> private ListValueModel<String> buildListHolder() { return new ListAspectAdapter<Customization, String>(getSubjectHolder(), Customization.SESSION_CUSTOMIZER_LIST) { @Override - protected ListIterator<String> listIterator_() { - return subject.sessionCustomizers(); + protected ListIterable<String> getListIterable() { + return subject.getSessionCustomizers(); } @Override protected int size_() { - return subject.sessionCustomizersSize(); + return subject.getSessionCustomizersSize(); } }; } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/v2_0/persistence/options/ValidationConfigurationComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/v2_0/persistence/options/ValidationConfigurationComposite.java index 7bca899baa..c72fcbc5af 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/v2_0/persistence/options/ValidationConfigurationComposite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/v2_0/persistence/options/ValidationConfigurationComposite.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. @@ -9,7 +9,6 @@ *******************************************************************************/ package org.eclipse.jpt.jpa.eclipselink.ui.internal.v2_0.persistence.options; -import java.util.ListIterator; import org.eclipse.jdt.core.IJavaElement; import org.eclipse.jdt.core.IJavaProject; import org.eclipse.jdt.core.IType; @@ -25,6 +24,7 @@ import org.eclipse.jpt.common.ui.internal.JptCommonUiMessages; import org.eclipse.jpt.common.ui.internal.widgets.AddRemoveListPane; import org.eclipse.jpt.common.ui.internal.widgets.AddRemovePane.Adapter; import org.eclipse.jpt.common.ui.internal.widgets.Pane; +import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; import org.eclipse.jpt.common.utility.internal.model.value.ListAspectAdapter; import org.eclipse.jpt.common.utility.internal.model.value.SimplePropertyValueModel; import org.eclipse.jpt.common.utility.internal.model.value.TransformationPropertyValueModel; @@ -132,13 +132,13 @@ public class ValidationConfigurationComposite extends Pane<Options2_0> private ListValueModel<String> buildPrePersistListHolder() { return new ListAspectAdapter<Options2_0, String>(getSubjectHolder(), Options2_0.VALIDATION_GROUP_PRE_PERSIST_LIST) { @Override - protected ListIterator<String> listIterator_() { - return subject.validationGroupPrePersists(); + protected ListIterable<String> getListIterable() { + return subject.getValidationGroupPrePersists(); } @Override protected int size_() { - return subject.validationGroupPrePersistsSize(); + return subject.getValidationGroupPrePersistsSize(); } }; } @@ -209,13 +209,13 @@ public class ValidationConfigurationComposite extends Pane<Options2_0> private ListValueModel<String> buildPreUpdateListHolder() { return new ListAspectAdapter<Options2_0, String>(getSubjectHolder(), Options2_0.VALIDATION_GROUP_PRE_UPDATE_LIST) { @Override - protected ListIterator<String> listIterator_() { - return subject.validationGroupPreUpdates(); + protected ListIterable<String> getListIterable() { + return subject.getValidationGroupPreUpdates(); } @Override protected int size_() { - return subject.validationGroupPreUpdatesSize(); + return subject.getValidationGroupPreUpdatesSize(); } }; } @@ -286,13 +286,13 @@ public class ValidationConfigurationComposite extends Pane<Options2_0> private ListValueModel<String> buildPreRemoveListHolder() { return new ListAspectAdapter<Options2_0, String>(getSubjectHolder(), Options2_0.VALIDATION_GROUP_PRE_REMOVE_LIST) { @Override - protected ListIterator<String> listIterator_() { - return subject.validationGroupPreRemoves(); + protected ListIterable<String> getListIterable() { + return subject.getValidationGroupPreRemoves(); } @Override protected int size_() { - return subject.validationGroupPreRemovesSize(); + return subject.getValidationGroupPreRemovesSize(); } }; } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/JpaJavaCompletionProposalComputer.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/JpaJavaCompletionProposalComputer.java index 4b271ef922..8e49cc725e 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/JpaJavaCompletionProposalComputer.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/JpaJavaCompletionProposalComputer.java @@ -12,7 +12,6 @@ package org.eclipse.jpt.jpa.ui.internal; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; -import java.util.Iterator; import java.util.List; import org.eclipse.core.resources.IFile; import org.eclipse.core.runtime.IProgressMonitor; @@ -143,8 +142,7 @@ public class JpaJavaCompletionProposalComputer implements IJavaCompletionProposa CompilationUnit astRoot = ASTTools.buildASTRoot(cu); List<ICompletionProposal> proposals = new ArrayList<ICompletionProposal>(); for (JpaStructureNode structureNode : rootStructureNodes) { - for (Iterator<String> stream = ((JavaPersistentType) structureNode).javaCompletionProposals(context.getInvocationOffset(), filter, astRoot); stream.hasNext(); ) { - String s = stream.next(); + for (String s : ((JavaPersistentType) structureNode).getJavaCompletionProposals(context.getInvocationOffset(), filter, astRoot)) { proposals.add(new CompletionProposal(s, tokenStart, tokenEnd - tokenStart + 1, s.length())); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/ColumnComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/ColumnComposite.java index 3003fb8e4e..f9257b25ef 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/ColumnComposite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/ColumnComposite.java @@ -13,7 +13,6 @@ import java.util.Collection; import org.eclipse.jpt.common.ui.internal.JptCommonUiMessages; import org.eclipse.jpt.common.ui.internal.widgets.IntegerCombo; import org.eclipse.jpt.common.ui.internal.widgets.Pane; -import org.eclipse.jpt.common.utility.internal.CollectionTools; import org.eclipse.jpt.common.utility.internal.iterables.EmptyIterable; import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter; import org.eclipse.jpt.common.utility.internal.model.value.SimplePropertyValueModel; @@ -236,7 +235,7 @@ public class ColumnComposite @Override protected Iterable<String> getValues_() { ReadOnlyColumn column = this.getSubject(); - return (column != null) ? CollectionTools.iterable(column.candidateTableNames()) : EmptyIterable.<String> instance(); + return (column != null) ? column.getCandidateTableNames() : EmptyIterable.<String> instance(); } @Override diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/MappedByPane.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/MappedByPane.java index 913fb2dfa2..4240d57902 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/MappedByPane.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/MappedByPane.java @@ -9,7 +9,6 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.ui.internal.details; -import java.util.Iterator; import org.eclipse.jpt.common.core.internal.utility.ICUStringCollator; import org.eclipse.jpt.common.ui.internal.widgets.Pane; import org.eclipse.jpt.common.utility.internal.model.value.CollectionAspectAdapter; @@ -71,8 +70,8 @@ public class MappedByPane new CollectionAspectAdapter<MappedByRelationshipStrategy, String>( getSubjectHolder()) { @Override - protected Iterator<String> iterator_() { - return this.subject.candidateMappedByAttributeNames(); + protected Iterable<String> getIterable() { + return this.subject.getCandidateMappedByAttributeNames(); } }, new ICUStringCollator() diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/persistence/options/ValidationConfigurationComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/persistence/options/ValidationConfigurationComposite.java index f6f6fce40f..7954724376 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/persistence/options/ValidationConfigurationComposite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/persistence/options/ValidationConfigurationComposite.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. @@ -9,8 +9,6 @@ *******************************************************************************/ package org.eclipse.jpt.jpa.ui.internal.jpa2.persistence.options; -import java.util.ListIterator; - import org.eclipse.jdt.core.IJavaElement; import org.eclipse.jdt.core.IJavaProject; import org.eclipse.jdt.core.IType; @@ -26,6 +24,7 @@ import org.eclipse.jpt.common.ui.internal.JptCommonUiMessages; import org.eclipse.jpt.common.ui.internal.widgets.AddRemoveListPane; import org.eclipse.jpt.common.ui.internal.widgets.Pane; import org.eclipse.jpt.common.ui.internal.widgets.AddRemovePane.Adapter; +import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; import org.eclipse.jpt.common.utility.internal.model.value.ListAspectAdapter; import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter; import org.eclipse.jpt.common.utility.internal.model.value.SimplePropertyValueModel; @@ -135,13 +134,13 @@ public class ValidationConfigurationComposite extends Pane<JpaOptions2_0> private ListValueModel<String> buildPrePersistListHolder() { return new ListAspectAdapter<JpaOptions2_0, String>(getSubjectHolder(), JpaOptions2_0.VALIDATION_GROUP_PRE_PERSIST_LIST) { @Override - protected ListIterator<String> listIterator_() { - return subject.validationGroupPrePersists(); + protected ListIterable<String> getListIterable() { + return subject.getValidationGroupPrePersists(); } @Override protected int size_() { - return subject.validationGroupPrePersistsSize(); + return subject.getValidationGroupPrePersistsSize(); } }; } @@ -212,13 +211,13 @@ public class ValidationConfigurationComposite extends Pane<JpaOptions2_0> private ListValueModel<String> buildPreUpdateListHolder() { return new ListAspectAdapter<JpaOptions2_0, String>(getSubjectHolder(), JpaOptions2_0.VALIDATION_GROUP_PRE_UPDATE_LIST) { @Override - protected ListIterator<String> listIterator_() { - return subject.validationGroupPreUpdates(); + protected ListIterable<String> getListIterable() { + return subject.getValidationGroupPreUpdates(); } @Override protected int size_() { - return subject.validationGroupPreUpdatesSize(); + return subject.getValidationGroupPreUpdatesSize(); } }; } @@ -289,13 +288,13 @@ public class ValidationConfigurationComposite extends Pane<JpaOptions2_0> private ListValueModel<String> buildPreRemoveListHolder() { return new ListAspectAdapter<JpaOptions2_0, String>(getSubjectHolder(), JpaOptions2_0.VALIDATION_GROUP_PRE_REMOVE_LIST) { @Override - protected ListIterator<String> listIterator_() { - return subject.validationGroupPreRemoves(); + protected ListIterable<String> getListIterable() { + return subject.getValidationGroupPreRemoves(); } @Override protected int size_() { - return subject.validationGroupPreRemovesSize(); + return subject.getValidationGroupPreRemovesSize(); } }; } 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; diff --git a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLinkEntityMappingsTests.java b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLinkEntityMappingsTests.java index dd6d7d1567..98c7627066 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLinkEntityMappingsTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLinkEntityMappingsTests.java @@ -41,7 +41,7 @@ public class EclipseLinkEntityMappingsTests extends EclipseLinkOrmContextModelTe assertEquals(0, ormContextConverterHolder.getCustomConvertersSize()); assertEquals(0, resourceEntityMappings.getConverters().size()); - assertEquals(0, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(0, CollectionTools.size(persistenceUnit.getAllConverters())); //add a converter to the resource model, check context model XmlConverter resourceConverter = EclipseLinkOrmFactory.eINSTANCE.createXmlConverter(); @@ -55,7 +55,7 @@ public class EclipseLinkEntityMappingsTests extends EclipseLinkOrmContextModelTe assertEquals("Foo", ormContextConverter.getConverterClass()); assertEquals("myConverter", ormContextConverter.getName()); assertEquals(1, resourceEntityMappings.getConverters().size()); - assertEquals(1, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(1, CollectionTools.size(persistenceUnit.getAllConverters())); //add another converter to the resource model, check context model XmlConverter resourceConverter2 = EclipseLinkOrmFactory.eINSTANCE.createXmlConverter(); @@ -72,7 +72,7 @@ public class EclipseLinkEntityMappingsTests extends EclipseLinkOrmContextModelTe assertEquals("Foo", ormContextConverter.getConverterClass()); assertEquals("myConverter", ormContextConverter.getName()); assertEquals(2, resourceEntityMappings.getConverters().size()); - assertEquals(2, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(2, CollectionTools.size(persistenceUnit.getAllConverters())); //move a converter in the resource model, check context model resourceEntityMappings.getConverters().move(0, 1); @@ -86,7 +86,7 @@ public class EclipseLinkEntityMappingsTests extends EclipseLinkOrmContextModelTe assertEquals("Foo2", ormContextConverter.getConverterClass()); assertEquals("myConverter2", ormContextConverter.getName()); assertEquals(2, resourceEntityMappings.getConverters().size()); - assertEquals(2, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(2, CollectionTools.size(persistenceUnit.getAllConverters())); //remove a converter from the resource model, check context model resourceEntityMappings.getConverters().remove(0); @@ -97,7 +97,7 @@ public class EclipseLinkEntityMappingsTests extends EclipseLinkOrmContextModelTe assertEquals("Foo2", ormContextConverter.getConverterClass()); assertEquals("myConverter2", ormContextConverter.getName()); assertEquals(1, resourceEntityMappings.getConverters().size()); - assertEquals(1, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(1, CollectionTools.size(persistenceUnit.getAllConverters())); //remove a converter from the resource model, check context model resourceEntityMappings.getConverters().remove(resourceConverter2); @@ -105,7 +105,7 @@ public class EclipseLinkEntityMappingsTests extends EclipseLinkOrmContextModelTe assertEquals(0, ormContextConverterHolder.getCustomConvertersSize()); assertFalse(ormContextConverterHolder.getCustomConverters().iterator().hasNext()); assertEquals(0, resourceEntityMappings.getConverters().size()); - assertEquals(0, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(0, CollectionTools.size(persistenceUnit.getAllConverters())); } public void testModifyCustomConverters() throws Exception { @@ -116,7 +116,7 @@ public class EclipseLinkEntityMappingsTests extends EclipseLinkOrmContextModelTe assertEquals(0, ormContextConverterHolder.getCustomConvertersSize()); assertEquals(0, resourceEntityMappings.getConverters().size()); - assertEquals(0, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(0, CollectionTools.size(persistenceUnit.getAllConverters())); //add a converter to the context model, check resource model EclipseLinkCustomConverter contextConverter = ormContextConverterHolder.addCustomConverter(0); @@ -131,7 +131,7 @@ public class EclipseLinkEntityMappingsTests extends EclipseLinkOrmContextModelTe EclipseLinkCustomConverter ormContextConverter = ormContextConverters.next(); assertEquals("Foo", ormContextConverter.getConverterClass()); assertEquals("myConverter", ormContextConverter.getName()); - assertEquals(1, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(1, CollectionTools.size(persistenceUnit.getAllConverters())); //add another converter to the context model, check resource model EclipseLinkCustomConverter contextConverter2 = ormContextConverterHolder.addCustomConverter(0); @@ -151,7 +151,7 @@ public class EclipseLinkEntityMappingsTests extends EclipseLinkOrmContextModelTe ormContextConverter = ormContextConverters.next(); assertEquals("Foo", ormContextConverter.getConverterClass()); assertEquals("myConverter", ormContextConverter.getName()); - assertEquals(2, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(2, CollectionTools.size(persistenceUnit.getAllConverters())); //move a converter in the context model, check resource model ormContextConverterHolder.moveCustomConverter(0, 1); @@ -169,7 +169,7 @@ public class EclipseLinkEntityMappingsTests extends EclipseLinkOrmContextModelTe ormContextConverter = ormContextConverters.next(); assertEquals("Foo2", ormContextConverter.getConverterClass()); assertEquals("myConverter2", ormContextConverter.getName()); - assertEquals(2, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(2, CollectionTools.size(persistenceUnit.getAllConverters())); //remove a converter from the context model, check resource model ormContextConverterHolder.removeCustomConverter(0); @@ -182,7 +182,7 @@ public class EclipseLinkEntityMappingsTests extends EclipseLinkOrmContextModelTe ormContextConverter = ormContextConverters.next(); assertEquals("Foo2", ormContextConverter.getConverterClass()); assertEquals("myConverter2", ormContextConverter.getName()); - assertEquals(1, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(1, CollectionTools.size(persistenceUnit.getAllConverters())); //remove a converter from the context model, check resource model ormContextConverterHolder.removeCustomConverter(contextConverter2); @@ -190,7 +190,7 @@ public class EclipseLinkEntityMappingsTests extends EclipseLinkOrmContextModelTe assertEquals(0, ormContextConverterHolder.getCustomConvertersSize()); assertFalse(ormContextConverterHolder.getCustomConverters().iterator().hasNext()); assertEquals(0, resourceEntityMappings.getConverters().size()); - assertEquals(0, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(0, CollectionTools.size(persistenceUnit.getAllConverters())); } public void testUpdateTypeConverters() throws Exception { @@ -201,7 +201,7 @@ public class EclipseLinkEntityMappingsTests extends EclipseLinkOrmContextModelTe assertEquals(0, ormContextConverterHolder.getTypeConvertersSize()); assertEquals(0, resourceEntityMappings.getTypeConverters().size()); - assertEquals(0, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(0, CollectionTools.size(persistenceUnit.getAllConverters())); //add a converter to the resource model, check context model XmlTypeConverter resourceTypeConverter = EclipseLinkOrmFactory.eINSTANCE.createXmlTypeConverter(); @@ -215,7 +215,7 @@ public class EclipseLinkEntityMappingsTests extends EclipseLinkOrmContextModelTe assertEquals("Foo", ormContextTypeConverter.getDataType()); assertEquals("myTypeConverter", ormContextTypeConverter.getName()); assertEquals(1, resourceEntityMappings.getTypeConverters().size()); - assertEquals(1, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(1, CollectionTools.size(persistenceUnit.getAllConverters())); //add another converter to the resource model, check context model XmlTypeConverter resourceTypeConverter2 = EclipseLinkOrmFactory.eINSTANCE.createXmlTypeConverter(); @@ -232,7 +232,7 @@ public class EclipseLinkEntityMappingsTests extends EclipseLinkOrmContextModelTe assertEquals("Foo", ormContextTypeConverter.getDataType()); assertEquals("myTypeConverter", ormContextTypeConverter.getName()); assertEquals(2, resourceEntityMappings.getTypeConverters().size()); - assertEquals(2, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(2, CollectionTools.size(persistenceUnit.getAllConverters())); //move a converter in the resource model, check context model resourceEntityMappings.getTypeConverters().move(0, 1); @@ -246,7 +246,7 @@ public class EclipseLinkEntityMappingsTests extends EclipseLinkOrmContextModelTe assertEquals("Foo2", ormContextTypeConverter.getDataType()); assertEquals("myTypeConverter2", ormContextTypeConverter.getName()); assertEquals(2, resourceEntityMappings.getTypeConverters().size()); - assertEquals(2, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(2, CollectionTools.size(persistenceUnit.getAllConverters())); //remove a converter from the resource model, check context model resourceEntityMappings.getTypeConverters().remove(0); @@ -257,7 +257,7 @@ public class EclipseLinkEntityMappingsTests extends EclipseLinkOrmContextModelTe assertEquals("Foo2", ormContextTypeConverter.getDataType()); assertEquals("myTypeConverter2", ormContextTypeConverter.getName()); assertEquals(1, resourceEntityMappings.getTypeConverters().size()); - assertEquals(1, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(1, CollectionTools.size(persistenceUnit.getAllConverters())); //remove a converter from the resource model, check context model resourceEntityMappings.getTypeConverters().remove(resourceTypeConverter2); @@ -265,7 +265,7 @@ public class EclipseLinkEntityMappingsTests extends EclipseLinkOrmContextModelTe assertEquals(0, ormContextConverterHolder.getTypeConvertersSize()); assertFalse(ormContextConverterHolder.getTypeConverters().iterator().hasNext()); assertEquals(0, resourceEntityMappings.getTypeConverters().size()); - assertEquals(0, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(0, CollectionTools.size(persistenceUnit.getAllConverters())); } public void testModifyTypeConverters() throws Exception { @@ -276,7 +276,7 @@ public class EclipseLinkEntityMappingsTests extends EclipseLinkOrmContextModelTe assertEquals(0, ormContextConverterHolder.getTypeConvertersSize()); assertEquals(0, resourceEntityMappings.getTypeConverters().size()); - assertEquals(0, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(0, CollectionTools.size(persistenceUnit.getAllConverters())); //add a converter to the context model, check resource model EclipseLinkTypeConverter contextTypeConverter = ormContextConverterHolder.addTypeConverter(0); @@ -291,7 +291,7 @@ public class EclipseLinkEntityMappingsTests extends EclipseLinkOrmContextModelTe EclipseLinkTypeConverter ormContextTypeConverter = ormContextTypeConverters.next(); assertEquals("Foo", ormContextTypeConverter.getDataType()); assertEquals("myTypeConverter", ormContextTypeConverter.getName()); - assertEquals(1, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(1, CollectionTools.size(persistenceUnit.getAllConverters())); //add another converter to the context model, check resource model EclipseLinkTypeConverter contextTypeConverter2 = ormContextConverterHolder.addTypeConverter(0); @@ -311,7 +311,7 @@ public class EclipseLinkEntityMappingsTests extends EclipseLinkOrmContextModelTe ormContextTypeConverter = ormContextTypeConverters.next(); assertEquals("Foo", ormContextTypeConverter.getDataType()); assertEquals("myTypeConverter", ormContextTypeConverter.getName()); - assertEquals(2, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(2, CollectionTools.size(persistenceUnit.getAllConverters())); //move a converter in the context model, check resource model ormContextConverterHolder.moveTypeConverter(0, 1); @@ -329,7 +329,7 @@ public class EclipseLinkEntityMappingsTests extends EclipseLinkOrmContextModelTe ormContextTypeConverter = ormContextTypeConverters.next(); assertEquals("Foo2", ormContextTypeConverter.getDataType()); assertEquals("myTypeConverter2", ormContextTypeConverter.getName()); - assertEquals(2, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(2, CollectionTools.size(persistenceUnit.getAllConverters())); //remove a converter from the context model, check resource model ormContextConverterHolder.removeTypeConverter(0); @@ -342,7 +342,7 @@ public class EclipseLinkEntityMappingsTests extends EclipseLinkOrmContextModelTe ormContextTypeConverter = ormContextTypeConverters.next(); assertEquals("Foo2", ormContextTypeConverter.getDataType()); assertEquals("myTypeConverter2", ormContextTypeConverter.getName()); - assertEquals(1, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(1, CollectionTools.size(persistenceUnit.getAllConverters())); //remove a converter from the context model, check resource model ormContextConverterHolder.removeTypeConverter(contextTypeConverter2); @@ -350,7 +350,7 @@ public class EclipseLinkEntityMappingsTests extends EclipseLinkOrmContextModelTe assertEquals(0, ormContextConverterHolder.getTypeConvertersSize()); assertFalse(ormContextConverterHolder.getTypeConverters().iterator().hasNext()); assertEquals(0, resourceEntityMappings.getTypeConverters().size()); - assertEquals(0, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(0, CollectionTools.size(persistenceUnit.getAllConverters())); } public void testUpdateObjectTypeConverters() throws Exception { @@ -361,7 +361,7 @@ public class EclipseLinkEntityMappingsTests extends EclipseLinkOrmContextModelTe assertEquals(0, ormContextConverterHolder.getObjectTypeConvertersSize()); assertEquals(0, resourceEntityMappings.getObjectTypeConverters().size()); - assertEquals(0, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(0, CollectionTools.size(persistenceUnit.getAllConverters())); //add a converter to the resource model, check context model XmlObjectTypeConverter resourceObjectTypeConverter = EclipseLinkOrmFactory.eINSTANCE.createXmlObjectTypeConverter(); @@ -375,7 +375,7 @@ public class EclipseLinkEntityMappingsTests extends EclipseLinkOrmContextModelTe assertEquals("Foo", ormContextObjectTypeConverter.getDataType()); assertEquals("myObjectTypeConverter", ormContextObjectTypeConverter.getName()); assertEquals(1, resourceEntityMappings.getObjectTypeConverters().size()); - assertEquals(1, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(1, CollectionTools.size(persistenceUnit.getAllConverters())); //add another converter to the resource model, check context model XmlObjectTypeConverter resourceObjectTypeConverter2 = EclipseLinkOrmFactory.eINSTANCE.createXmlObjectTypeConverter(); @@ -392,7 +392,7 @@ public class EclipseLinkEntityMappingsTests extends EclipseLinkOrmContextModelTe assertEquals("Foo", ormContextObjectTypeConverter.getDataType()); assertEquals("myObjectTypeConverter", ormContextObjectTypeConverter.getName()); assertEquals(2, resourceEntityMappings.getObjectTypeConverters().size()); - assertEquals(2, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(2, CollectionTools.size(persistenceUnit.getAllConverters())); //move a converter in the resource model, check context model resourceEntityMappings.getObjectTypeConverters().move(0, 1); @@ -406,7 +406,7 @@ public class EclipseLinkEntityMappingsTests extends EclipseLinkOrmContextModelTe assertEquals("Foo2", ormContextObjectTypeConverter.getDataType()); assertEquals("myObjectTypeConverter2", ormContextObjectTypeConverter.getName()); assertEquals(2, resourceEntityMappings.getObjectTypeConverters().size()); - assertEquals(2, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(2, CollectionTools.size(persistenceUnit.getAllConverters())); //remove a converter from the resource model, check context model resourceEntityMappings.getObjectTypeConverters().remove(0); @@ -417,7 +417,7 @@ public class EclipseLinkEntityMappingsTests extends EclipseLinkOrmContextModelTe assertEquals("Foo2", ormContextObjectTypeConverter.getDataType()); assertEquals("myObjectTypeConverter2", ormContextObjectTypeConverter.getName()); assertEquals(1, resourceEntityMappings.getObjectTypeConverters().size()); - assertEquals(1, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(1, CollectionTools.size(persistenceUnit.getAllConverters())); //remove a converter from the resource model, check context model resourceEntityMappings.getObjectTypeConverters().remove(resourceObjectTypeConverter2); @@ -425,7 +425,7 @@ public class EclipseLinkEntityMappingsTests extends EclipseLinkOrmContextModelTe assertEquals(0, ormContextConverterHolder.getObjectTypeConvertersSize()); assertFalse(ormContextConverterHolder.getObjectTypeConverters().iterator().hasNext()); assertEquals(0, resourceEntityMappings.getObjectTypeConverters().size()); - assertEquals(0, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(0, CollectionTools.size(persistenceUnit.getAllConverters())); } public void testModifyObjectTypeConverters() throws Exception { @@ -436,7 +436,7 @@ public class EclipseLinkEntityMappingsTests extends EclipseLinkOrmContextModelTe assertEquals(0, ormContextConverterHolder.getObjectTypeConvertersSize()); assertEquals(0, resourceEntityMappings.getObjectTypeConverters().size()); - assertEquals(0, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(0, CollectionTools.size(persistenceUnit.getAllConverters())); //add a converter to the context model, check resource model EclipseLinkObjectTypeConverter contextObjectTypeConverter = ormContextConverterHolder.addObjectTypeConverter(0); @@ -451,7 +451,7 @@ public class EclipseLinkEntityMappingsTests extends EclipseLinkOrmContextModelTe EclipseLinkObjectTypeConverter ormContextObjectTypeConverter = ormContextObjectTypeConverters.next(); assertEquals("Foo", ormContextObjectTypeConverter.getDataType()); assertEquals("myObjectTypeConverter", ormContextObjectTypeConverter.getName()); - assertEquals(1, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(1, CollectionTools.size(persistenceUnit.getAllConverters())); //add another converter to the context model, check resource model EclipseLinkObjectTypeConverter contextObjectTypeConverter2 = ormContextConverterHolder.addObjectTypeConverter(0); @@ -471,7 +471,7 @@ public class EclipseLinkEntityMappingsTests extends EclipseLinkOrmContextModelTe ormContextObjectTypeConverter = ormContextObjectTypeConverters.next(); assertEquals("Foo", ormContextObjectTypeConverter.getDataType()); assertEquals("myObjectTypeConverter", ormContextObjectTypeConverter.getName()); - assertEquals(2, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(2, CollectionTools.size(persistenceUnit.getAllConverters())); //move a converter in the context model, check resource model ormContextConverterHolder.moveObjectTypeConverter(0, 1); @@ -489,7 +489,7 @@ public class EclipseLinkEntityMappingsTests extends EclipseLinkOrmContextModelTe ormContextObjectTypeConverter = ormContextObjectTypeConverters.next(); assertEquals("Foo2", ormContextObjectTypeConverter.getDataType()); assertEquals("myObjectTypeConverter2", ormContextObjectTypeConverter.getName()); - assertEquals(2, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(2, CollectionTools.size(persistenceUnit.getAllConverters())); //remove a converter from the context model, check resource model ormContextConverterHolder.removeObjectTypeConverter(0); @@ -502,7 +502,7 @@ public class EclipseLinkEntityMappingsTests extends EclipseLinkOrmContextModelTe ormContextObjectTypeConverter = ormContextObjectTypeConverters.next(); assertEquals("Foo2", ormContextObjectTypeConverter.getDataType()); assertEquals("myObjectTypeConverter2", ormContextObjectTypeConverter.getName()); - assertEquals(1, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(1, CollectionTools.size(persistenceUnit.getAllConverters())); //remove a converter from the context model, check resource model ormContextConverterHolder.removeObjectTypeConverter(contextObjectTypeConverter2); @@ -510,7 +510,7 @@ public class EclipseLinkEntityMappingsTests extends EclipseLinkOrmContextModelTe assertEquals(0, ormContextConverterHolder.getObjectTypeConvertersSize()); assertFalse(ormContextConverterHolder.getObjectTypeConverters().iterator().hasNext()); assertEquals(0, resourceEntityMappings.getObjectTypeConverters().size()); - assertEquals(0, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(0, CollectionTools.size(persistenceUnit.getAllConverters())); } public void testUpdateStructConverters() throws Exception { @@ -521,7 +521,7 @@ public class EclipseLinkEntityMappingsTests extends EclipseLinkOrmContextModelTe assertEquals(0, ormContextConverterHolder.getStructConvertersSize()); assertEquals(0, resourceEntityMappings.getStructConverters().size()); - assertEquals(0, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(0, CollectionTools.size(persistenceUnit.getAllConverters())); //add a converter to the resource model, check context model XmlStructConverter resourceStructConverter = EclipseLinkOrmFactory.eINSTANCE.createXmlStructConverter(); @@ -535,7 +535,7 @@ public class EclipseLinkEntityMappingsTests extends EclipseLinkOrmContextModelTe assertEquals("Foo", ormContextStructConverter.getConverterClass()); assertEquals("myStructConverter", ormContextStructConverter.getName()); assertEquals(1, resourceEntityMappings.getStructConverters().size()); - assertEquals(1, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(1, CollectionTools.size(persistenceUnit.getAllConverters())); //add another converter to the resource model, check context model XmlStructConverter resourceStructConverter2 = EclipseLinkOrmFactory.eINSTANCE.createXmlStructConverter(); @@ -552,7 +552,7 @@ public class EclipseLinkEntityMappingsTests extends EclipseLinkOrmContextModelTe assertEquals("Foo", ormContextStructConverter.getConverterClass()); assertEquals("myStructConverter", ormContextStructConverter.getName()); assertEquals(2, resourceEntityMappings.getStructConverters().size()); - assertEquals(2, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(2, CollectionTools.size(persistenceUnit.getAllConverters())); //move a converter in the resource model, check context model resourceEntityMappings.getStructConverters().move(0, 1); @@ -566,7 +566,7 @@ public class EclipseLinkEntityMappingsTests extends EclipseLinkOrmContextModelTe assertEquals("Foo2", ormContextStructConverter.getConverterClass()); assertEquals("myStructConverter2", ormContextStructConverter.getName()); assertEquals(2, resourceEntityMappings.getStructConverters().size()); - assertEquals(2, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(2, CollectionTools.size(persistenceUnit.getAllConverters())); //remove a converter from the resource model, check context model resourceEntityMappings.getStructConverters().remove(0); @@ -577,7 +577,7 @@ public class EclipseLinkEntityMappingsTests extends EclipseLinkOrmContextModelTe assertEquals("Foo2", ormContextStructConverter.getConverterClass()); assertEquals("myStructConverter2", ormContextStructConverter.getName()); assertEquals(1, resourceEntityMappings.getStructConverters().size()); - assertEquals(1, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(1, CollectionTools.size(persistenceUnit.getAllConverters())); //remove a converter from the resource model, check context model resourceEntityMappings.getStructConverters().remove(resourceStructConverter2); @@ -585,7 +585,7 @@ public class EclipseLinkEntityMappingsTests extends EclipseLinkOrmContextModelTe assertEquals(0, ormContextConverterHolder.getStructConvertersSize()); assertFalse(ormContextConverterHolder.getStructConverters().iterator().hasNext()); assertEquals(0, resourceEntityMappings.getStructConverters().size()); - assertEquals(0, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(0, CollectionTools.size(persistenceUnit.getAllConverters())); } public void testModifyStructConverters() throws Exception { @@ -596,7 +596,7 @@ public class EclipseLinkEntityMappingsTests extends EclipseLinkOrmContextModelTe assertEquals(0, ormContextConverterHolder.getStructConvertersSize()); assertEquals(0, resourceEntityMappings.getStructConverters().size()); - assertEquals(0, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(0, CollectionTools.size(persistenceUnit.getAllConverters())); //add a converter to the context model, check resource model EclipseLinkStructConverter contextStructConverter = ormContextConverterHolder.addStructConverter(0); @@ -611,7 +611,7 @@ public class EclipseLinkEntityMappingsTests extends EclipseLinkOrmContextModelTe EclipseLinkStructConverter ormContextStructConverter = ormContextStructConverters.next(); assertEquals("Foo", ormContextStructConverter.getConverterClass()); assertEquals("myStructConverter", ormContextStructConverter.getName()); - assertEquals(1, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(1, CollectionTools.size(persistenceUnit.getAllConverters())); //add another converter to the context model, check resource model EclipseLinkStructConverter contextStructConverter2 = ormContextConverterHolder.addStructConverter(0); @@ -631,7 +631,7 @@ public class EclipseLinkEntityMappingsTests extends EclipseLinkOrmContextModelTe ormContextStructConverter = ormContextStructConverters.next(); assertEquals("Foo", ormContextStructConverter.getConverterClass()); assertEquals("myStructConverter", ormContextStructConverter.getName()); - assertEquals(2, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(2, CollectionTools.size(persistenceUnit.getAllConverters())); //move a converter in the context model, check resource model ormContextConverterHolder.moveStructConverter(0, 1); @@ -649,7 +649,7 @@ public class EclipseLinkEntityMappingsTests extends EclipseLinkOrmContextModelTe ormContextStructConverter = ormContextStructConverters.next(); assertEquals("Foo2", ormContextStructConverter.getConverterClass()); assertEquals("myStructConverter2", ormContextStructConverter.getName()); - assertEquals(2, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(2, CollectionTools.size(persistenceUnit.getAllConverters())); //remove a converter from the context model, check resource model ormContextConverterHolder.removeStructConverter(0); @@ -662,7 +662,7 @@ public class EclipseLinkEntityMappingsTests extends EclipseLinkOrmContextModelTe ormContextStructConverter = ormContextStructConverters.next(); assertEquals("Foo2", ormContextStructConverter.getConverterClass()); assertEquals("myStructConverter2", ormContextStructConverter.getName()); - assertEquals(1, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(1, CollectionTools.size(persistenceUnit.getAllConverters())); //remove a converter from the context model, check resource model ormContextConverterHolder.removeStructConverter(contextStructConverter2); @@ -670,6 +670,6 @@ public class EclipseLinkEntityMappingsTests extends EclipseLinkOrmContextModelTe assertEquals(0, ormContextConverterHolder.getStructConvertersSize()); assertFalse(ormContextConverterHolder.getStructConverters().iterator().hasNext()); assertEquals(0, resourceEntityMappings.getStructConverters().size()); - assertEquals(0, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(0, CollectionTools.size(persistenceUnit.getAllConverters())); } }
\ No newline at end of file diff --git a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmEmbeddableTests.java b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmEmbeddableTests.java index ef2d770104..7bbfb71487 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmEmbeddableTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmEmbeddableTests.java @@ -393,7 +393,7 @@ public class EclipseLinkOrmEmbeddableTests extends EclipseLinkOrmContextModelTes assertEquals(0, ormContextConverterHolder.getCustomConvertersSize()); assertEquals(0, resourceEmbeddable.getConverters().size()); - assertEquals(0, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(0, CollectionTools.size(persistenceUnit.getAllConverters())); //add a converter to the resource model, check context model XmlConverter resourceConverter = EclipseLinkOrmFactory.eINSTANCE.createXmlConverter(); @@ -407,7 +407,7 @@ public class EclipseLinkOrmEmbeddableTests extends EclipseLinkOrmContextModelTes assertEquals("Foo", ormContextConverter.getConverterClass()); assertEquals("myConverter", ormContextConverter.getName()); assertEquals(1, resourceEmbeddable.getConverters().size()); - assertEquals(1, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(1, CollectionTools.size(persistenceUnit.getAllConverters())); //add another converter to the resource model, check context model XmlConverter resourceConverter2 = EclipseLinkOrmFactory.eINSTANCE.createXmlConverter(); @@ -424,7 +424,7 @@ public class EclipseLinkOrmEmbeddableTests extends EclipseLinkOrmContextModelTes assertEquals("Foo", ormContextConverter.getConverterClass()); assertEquals("myConverter", ormContextConverter.getName()); assertEquals(2, resourceEmbeddable.getConverters().size()); - assertEquals(2, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(2, CollectionTools.size(persistenceUnit.getAllConverters())); //move a converter in the resource model, check context model resourceEmbeddable.getConverters().move(0, 1); @@ -438,7 +438,7 @@ public class EclipseLinkOrmEmbeddableTests extends EclipseLinkOrmContextModelTes assertEquals("Foo2", ormContextConverter.getConverterClass()); assertEquals("myConverter2", ormContextConverter.getName()); assertEquals(2, resourceEmbeddable.getConverters().size()); - assertEquals(2, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(2, CollectionTools.size(persistenceUnit.getAllConverters())); //remove a converter from the resource model, check context model resourceEmbeddable.getConverters().remove(0); @@ -449,7 +449,7 @@ public class EclipseLinkOrmEmbeddableTests extends EclipseLinkOrmContextModelTes assertEquals("Foo2", ormContextConverter.getConverterClass()); assertEquals("myConverter2", ormContextConverter.getName()); assertEquals(1, resourceEmbeddable.getConverters().size()); - assertEquals(1, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(1, CollectionTools.size(persistenceUnit.getAllConverters())); //remove a converter from the resource model, check context model resourceEmbeddable.getConverters().remove(resourceConverter2); @@ -457,7 +457,7 @@ public class EclipseLinkOrmEmbeddableTests extends EclipseLinkOrmContextModelTes assertEquals(0, ormContextConverterHolder.getCustomConvertersSize()); assertFalse(ormContextConverterHolder.getCustomConverters().iterator().hasNext()); assertEquals(0, resourceEmbeddable.getConverters().size()); - assertEquals(0, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(0, CollectionTools.size(persistenceUnit.getAllConverters())); } public void testModifyCustomConverters() throws Exception { @@ -551,7 +551,7 @@ public class EclipseLinkOrmEmbeddableTests extends EclipseLinkOrmContextModelTes assertEquals(0, ormContextConverterHolder.getTypeConvertersSize()); assertEquals(0, resourceEmbeddable.getTypeConverters().size()); - assertEquals(0, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(0, CollectionTools.size(persistenceUnit.getAllConverters())); //add a converter to the resource model, check context model XmlTypeConverter resourceTypeConverter = EclipseLinkOrmFactory.eINSTANCE.createXmlTypeConverter(); @@ -565,7 +565,7 @@ public class EclipseLinkOrmEmbeddableTests extends EclipseLinkOrmContextModelTes assertEquals("Foo", ormContextTypeConverter.getDataType()); assertEquals("myTypeConverter", ormContextTypeConverter.getName()); assertEquals(1, resourceEmbeddable.getTypeConverters().size()); - assertEquals(1, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(1, CollectionTools.size(persistenceUnit.getAllConverters())); //add another converter to the resource model, check context model XmlTypeConverter resourceTypeConverter2 = EclipseLinkOrmFactory.eINSTANCE.createXmlTypeConverter(); @@ -582,7 +582,7 @@ public class EclipseLinkOrmEmbeddableTests extends EclipseLinkOrmContextModelTes assertEquals("Foo", ormContextTypeConverter.getDataType()); assertEquals("myTypeConverter", ormContextTypeConverter.getName()); assertEquals(2, resourceEmbeddable.getTypeConverters().size()); - assertEquals(2, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(2, CollectionTools.size(persistenceUnit.getAllConverters())); //move a converter in the resource model, check context model resourceEmbeddable.getTypeConverters().move(0, 1); @@ -596,7 +596,7 @@ public class EclipseLinkOrmEmbeddableTests extends EclipseLinkOrmContextModelTes assertEquals("Foo2", ormContextTypeConverter.getDataType()); assertEquals("myTypeConverter2", ormContextTypeConverter.getName()); assertEquals(2, resourceEmbeddable.getTypeConverters().size()); - assertEquals(2, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(2, CollectionTools.size(persistenceUnit.getAllConverters())); //remove a converter from the resource model, check context model resourceEmbeddable.getTypeConverters().remove(0); @@ -607,7 +607,7 @@ public class EclipseLinkOrmEmbeddableTests extends EclipseLinkOrmContextModelTes assertEquals("Foo2", ormContextTypeConverter.getDataType()); assertEquals("myTypeConverter2", ormContextTypeConverter.getName()); assertEquals(1, resourceEmbeddable.getTypeConverters().size()); - assertEquals(1, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(1, CollectionTools.size(persistenceUnit.getAllConverters())); //remove a converter from the resource model, check context model resourceEmbeddable.getTypeConverters().remove(resourceTypeConverter2); @@ -615,7 +615,7 @@ public class EclipseLinkOrmEmbeddableTests extends EclipseLinkOrmContextModelTes assertEquals(0, ormContextConverterHolder.getTypeConvertersSize()); assertFalse(ormContextConverterHolder.getTypeConverters().iterator().hasNext()); assertEquals(0, resourceEmbeddable.getTypeConverters().size()); - assertEquals(0, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(0, CollectionTools.size(persistenceUnit.getAllConverters())); } public void testModifyTypeConverters() throws Exception { @@ -628,7 +628,7 @@ public class EclipseLinkOrmEmbeddableTests extends EclipseLinkOrmContextModelTes assertEquals(0, ormContextConverterHolder.getTypeConvertersSize()); assertEquals(0, resourceEmbeddable.getTypeConverters().size()); - assertEquals(0, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(0, CollectionTools.size(persistenceUnit.getAllConverters())); //add a converter to the context model, check resource model EclipseLinkTypeConverter contextTypeConverter = ormContextConverterHolder.addTypeConverter(0); @@ -643,7 +643,7 @@ public class EclipseLinkOrmEmbeddableTests extends EclipseLinkOrmContextModelTes EclipseLinkTypeConverter ormContextTypeConverter = ormContextTypeConverters.next(); assertEquals("Foo", ormContextTypeConverter.getDataType()); assertEquals("myTypeConverter", ormContextTypeConverter.getName()); - assertEquals(1, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(1, CollectionTools.size(persistenceUnit.getAllConverters())); //add another converter to the context model, check resource model EclipseLinkTypeConverter contextTypeConverter2 = ormContextConverterHolder.addTypeConverter(0); @@ -663,7 +663,7 @@ public class EclipseLinkOrmEmbeddableTests extends EclipseLinkOrmContextModelTes ormContextTypeConverter = ormContextTypeConverters.next(); assertEquals("Foo", ormContextTypeConverter.getDataType()); assertEquals("myTypeConverter", ormContextTypeConverter.getName()); - assertEquals(2, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(2, CollectionTools.size(persistenceUnit.getAllConverters())); //move a converter in the context model, check resource model ormContextConverterHolder.moveTypeConverter(0, 1); @@ -681,7 +681,7 @@ public class EclipseLinkOrmEmbeddableTests extends EclipseLinkOrmContextModelTes ormContextTypeConverter = ormContextTypeConverters.next(); assertEquals("Foo2", ormContextTypeConverter.getDataType()); assertEquals("myTypeConverter2", ormContextTypeConverter.getName()); - assertEquals(2, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(2, CollectionTools.size(persistenceUnit.getAllConverters())); //remove a converter from the context model, check resource model ormContextConverterHolder.removeTypeConverter(0); @@ -694,7 +694,7 @@ public class EclipseLinkOrmEmbeddableTests extends EclipseLinkOrmContextModelTes ormContextTypeConverter = ormContextTypeConverters.next(); assertEquals("Foo2", ormContextTypeConverter.getDataType()); assertEquals("myTypeConverter2", ormContextTypeConverter.getName()); - assertEquals(1, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(1, CollectionTools.size(persistenceUnit.getAllConverters())); //remove a converter from the context model, check resource model ormContextConverterHolder.removeTypeConverter(contextTypeConverter2); @@ -702,7 +702,7 @@ public class EclipseLinkOrmEmbeddableTests extends EclipseLinkOrmContextModelTes assertEquals(0, ormContextConverterHolder.getTypeConvertersSize()); assertFalse(ormContextConverterHolder.getTypeConverters().iterator().hasNext()); assertEquals(0, resourceEmbeddable.getTypeConverters().size()); - assertEquals(0, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(0, CollectionTools.size(persistenceUnit.getAllConverters())); } public void testUpdateObjectTypeConverters() throws Exception { @@ -715,7 +715,7 @@ public class EclipseLinkOrmEmbeddableTests extends EclipseLinkOrmContextModelTes assertEquals(0, ormContextConverterHolder.getObjectTypeConvertersSize()); assertEquals(0, resourceEmbeddable.getObjectTypeConverters().size()); - assertEquals(0, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(0, CollectionTools.size(persistenceUnit.getAllConverters())); //add a converter to the resource model, check context model XmlObjectTypeConverter resourceObjectTypeConverter = EclipseLinkOrmFactory.eINSTANCE.createXmlObjectTypeConverter(); @@ -729,7 +729,7 @@ public class EclipseLinkOrmEmbeddableTests extends EclipseLinkOrmContextModelTes assertEquals("Foo", ormContextObjectTypeConverter.getDataType()); assertEquals("myObjectTypeConverter", ormContextObjectTypeConverter.getName()); assertEquals(1, resourceEmbeddable.getObjectTypeConverters().size()); - assertEquals(1, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(1, CollectionTools.size(persistenceUnit.getAllConverters())); //add another converter to the resource model, check context model XmlObjectTypeConverter resourceObjectTypeConverter2 = EclipseLinkOrmFactory.eINSTANCE.createXmlObjectTypeConverter(); @@ -746,7 +746,7 @@ public class EclipseLinkOrmEmbeddableTests extends EclipseLinkOrmContextModelTes assertEquals("Foo", ormContextObjectTypeConverter.getDataType()); assertEquals("myObjectTypeConverter", ormContextObjectTypeConverter.getName()); assertEquals(2, resourceEmbeddable.getObjectTypeConverters().size()); - assertEquals(2, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(2, CollectionTools.size(persistenceUnit.getAllConverters())); //move a converter in the resource model, check context model resourceEmbeddable.getObjectTypeConverters().move(0, 1); @@ -760,7 +760,7 @@ public class EclipseLinkOrmEmbeddableTests extends EclipseLinkOrmContextModelTes assertEquals("Foo2", ormContextObjectTypeConverter.getDataType()); assertEquals("myObjectTypeConverter2", ormContextObjectTypeConverter.getName()); assertEquals(2, resourceEmbeddable.getObjectTypeConverters().size()); - assertEquals(2, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(2, CollectionTools.size(persistenceUnit.getAllConverters())); //remove a converter from the resource model, check context model resourceEmbeddable.getObjectTypeConverters().remove(0); @@ -771,7 +771,7 @@ public class EclipseLinkOrmEmbeddableTests extends EclipseLinkOrmContextModelTes assertEquals("Foo2", ormContextObjectTypeConverter.getDataType()); assertEquals("myObjectTypeConverter2", ormContextObjectTypeConverter.getName()); assertEquals(1, resourceEmbeddable.getObjectTypeConverters().size()); - assertEquals(1, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(1, CollectionTools.size(persistenceUnit.getAllConverters())); //remove a converter from the resource model, check context model resourceEmbeddable.getObjectTypeConverters().remove(resourceObjectTypeConverter2); @@ -779,7 +779,7 @@ public class EclipseLinkOrmEmbeddableTests extends EclipseLinkOrmContextModelTes assertEquals(0, ormContextConverterHolder.getObjectTypeConvertersSize()); assertFalse(ormContextConverterHolder.getObjectTypeConverters().iterator().hasNext()); assertEquals(0, resourceEmbeddable.getObjectTypeConverters().size()); - assertEquals(0, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(0, CollectionTools.size(persistenceUnit.getAllConverters())); } public void testModifyObjectTypeConverters() throws Exception { @@ -792,7 +792,7 @@ public class EclipseLinkOrmEmbeddableTests extends EclipseLinkOrmContextModelTes assertEquals(0, ormContextConverterHolder.getObjectTypeConvertersSize()); assertEquals(0, resourceEmbeddable.getObjectTypeConverters().size()); - assertEquals(0, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(0, CollectionTools.size(persistenceUnit.getAllConverters())); //add a converter to the context model, check resource model EclipseLinkObjectTypeConverter contextObjectTypeConverter = ormContextConverterHolder.addObjectTypeConverter(0); @@ -807,7 +807,7 @@ public class EclipseLinkOrmEmbeddableTests extends EclipseLinkOrmContextModelTes EclipseLinkObjectTypeConverter ormContextObjectTypeConverter = ormContextObjectTypeConverters.next(); assertEquals("Foo", ormContextObjectTypeConverter.getDataType()); assertEquals("myObjectTypeConverter", ormContextObjectTypeConverter.getName()); - assertEquals(1, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(1, CollectionTools.size(persistenceUnit.getAllConverters())); //add another converter to the context model, check resource model EclipseLinkObjectTypeConverter contextObjectTypeConverter2 = ormContextConverterHolder.addObjectTypeConverter(0); @@ -827,7 +827,7 @@ public class EclipseLinkOrmEmbeddableTests extends EclipseLinkOrmContextModelTes ormContextObjectTypeConverter = ormContextObjectTypeConverters.next(); assertEquals("Foo", ormContextObjectTypeConverter.getDataType()); assertEquals("myObjectTypeConverter", ormContextObjectTypeConverter.getName()); - assertEquals(2, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(2, CollectionTools.size(persistenceUnit.getAllConverters())); //move a converter in the context model, check resource model ormContextConverterHolder.moveObjectTypeConverter(0, 1); @@ -845,7 +845,7 @@ public class EclipseLinkOrmEmbeddableTests extends EclipseLinkOrmContextModelTes ormContextObjectTypeConverter = ormContextObjectTypeConverters.next(); assertEquals("Foo2", ormContextObjectTypeConverter.getDataType()); assertEquals("myObjectTypeConverter2", ormContextObjectTypeConverter.getName()); - assertEquals(2, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(2, CollectionTools.size(persistenceUnit.getAllConverters())); //remove a converter from the context model, check resource model ormContextConverterHolder.removeObjectTypeConverter(0); @@ -858,7 +858,7 @@ public class EclipseLinkOrmEmbeddableTests extends EclipseLinkOrmContextModelTes ormContextObjectTypeConverter = ormContextObjectTypeConverters.next(); assertEquals("Foo2", ormContextObjectTypeConverter.getDataType()); assertEquals("myObjectTypeConverter2", ormContextObjectTypeConverter.getName()); - assertEquals(1, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(1, CollectionTools.size(persistenceUnit.getAllConverters())); //remove a converter from the context model, check resource model ormContextConverterHolder.removeObjectTypeConverter(contextObjectTypeConverter2); @@ -866,7 +866,7 @@ public class EclipseLinkOrmEmbeddableTests extends EclipseLinkOrmContextModelTes assertEquals(0, ormContextConverterHolder.getObjectTypeConvertersSize()); assertFalse(ormContextConverterHolder.getObjectTypeConverters().iterator().hasNext()); assertEquals(0, resourceEmbeddable.getObjectTypeConverters().size()); - assertEquals(0, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(0, CollectionTools.size(persistenceUnit.getAllConverters())); } public void testUpdateStructConverters() throws Exception { @@ -879,7 +879,7 @@ public class EclipseLinkOrmEmbeddableTests extends EclipseLinkOrmContextModelTes assertEquals(0, ormContextConverterHolder.getStructConvertersSize()); assertEquals(0, resourceEmbeddable.getStructConverters().size()); - assertEquals(0, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(0, CollectionTools.size(persistenceUnit.getAllConverters())); //add a converter to the resource model, check context model XmlStructConverter resourceStructConverter = EclipseLinkOrmFactory.eINSTANCE.createXmlStructConverter(); @@ -893,7 +893,7 @@ public class EclipseLinkOrmEmbeddableTests extends EclipseLinkOrmContextModelTes assertEquals("Foo", ormContextStructConverter.getConverterClass()); assertEquals("myStructConverter", ormContextStructConverter.getName()); assertEquals(1, resourceEmbeddable.getStructConverters().size()); - assertEquals(1, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(1, CollectionTools.size(persistenceUnit.getAllConverters())); //add another converter to the resource model, check context model XmlStructConverter resourceStructConverter2 = EclipseLinkOrmFactory.eINSTANCE.createXmlStructConverter(); @@ -910,7 +910,7 @@ public class EclipseLinkOrmEmbeddableTests extends EclipseLinkOrmContextModelTes assertEquals("Foo", ormContextStructConverter.getConverterClass()); assertEquals("myStructConverter", ormContextStructConverter.getName()); assertEquals(2, resourceEmbeddable.getStructConverters().size()); - assertEquals(2, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(2, CollectionTools.size(persistenceUnit.getAllConverters())); //move a converter in the resource model, check context model resourceEmbeddable.getStructConverters().move(0, 1); @@ -924,7 +924,7 @@ public class EclipseLinkOrmEmbeddableTests extends EclipseLinkOrmContextModelTes assertEquals("Foo2", ormContextStructConverter.getConverterClass()); assertEquals("myStructConverter2", ormContextStructConverter.getName()); assertEquals(2, resourceEmbeddable.getStructConverters().size()); - assertEquals(2, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(2, CollectionTools.size(persistenceUnit.getAllConverters())); //remove a converter from the resource model, check context model resourceEmbeddable.getStructConverters().remove(0); @@ -935,7 +935,7 @@ public class EclipseLinkOrmEmbeddableTests extends EclipseLinkOrmContextModelTes assertEquals("Foo2", ormContextStructConverter.getConverterClass()); assertEquals("myStructConverter2", ormContextStructConverter.getName()); assertEquals(1, resourceEmbeddable.getStructConverters().size()); - assertEquals(1, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(1, CollectionTools.size(persistenceUnit.getAllConverters())); //remove a converter from the resource model, check context model resourceEmbeddable.getStructConverters().remove(resourceStructConverter2); @@ -943,7 +943,7 @@ public class EclipseLinkOrmEmbeddableTests extends EclipseLinkOrmContextModelTes assertEquals(0, ormContextConverterHolder.getStructConvertersSize()); assertFalse(ormContextConverterHolder.getStructConverters().iterator().hasNext()); assertEquals(0, resourceEmbeddable.getStructConverters().size()); - assertEquals(0, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(0, CollectionTools.size(persistenceUnit.getAllConverters())); } public void testModifyStructConverters() throws Exception { @@ -956,7 +956,7 @@ public class EclipseLinkOrmEmbeddableTests extends EclipseLinkOrmContextModelTes assertEquals(0, ormContextConverterHolder.getStructConvertersSize()); assertEquals(0, resourceEmbeddable.getStructConverters().size()); - assertEquals(0, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(0, CollectionTools.size(persistenceUnit.getAllConverters())); //add a converter to the context model, check resource model EclipseLinkStructConverter contextStructConverter = ormContextConverterHolder.addStructConverter(0); @@ -971,7 +971,7 @@ public class EclipseLinkOrmEmbeddableTests extends EclipseLinkOrmContextModelTes EclipseLinkStructConverter ormContextStructConverter = ormContextStructConverters.next(); assertEquals("Foo", ormContextStructConverter.getConverterClass()); assertEquals("myStructConverter", ormContextStructConverter.getName()); - assertEquals(1, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(1, CollectionTools.size(persistenceUnit.getAllConverters())); //add another converter to the context model, check resource model EclipseLinkStructConverter contextStructConverter2 = ormContextConverterHolder.addStructConverter(0); @@ -991,7 +991,7 @@ public class EclipseLinkOrmEmbeddableTests extends EclipseLinkOrmContextModelTes ormContextStructConverter = ormContextStructConverters.next(); assertEquals("Foo", ormContextStructConverter.getConverterClass()); assertEquals("myStructConverter", ormContextStructConverter.getName()); - assertEquals(2, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(2, CollectionTools.size(persistenceUnit.getAllConverters())); //move a converter in the context model, check resource model ormContextConverterHolder.moveStructConverter(0, 1); @@ -1009,7 +1009,7 @@ public class EclipseLinkOrmEmbeddableTests extends EclipseLinkOrmContextModelTes ormContextStructConverter = ormContextStructConverters.next(); assertEquals("Foo2", ormContextStructConverter.getConverterClass()); assertEquals("myStructConverter2", ormContextStructConverter.getName()); - assertEquals(2, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(2, CollectionTools.size(persistenceUnit.getAllConverters())); //remove a converter from the context model, check resource model ormContextConverterHolder.removeStructConverter(0); @@ -1022,7 +1022,7 @@ public class EclipseLinkOrmEmbeddableTests extends EclipseLinkOrmContextModelTes ormContextStructConverter = ormContextStructConverters.next(); assertEquals("Foo2", ormContextStructConverter.getConverterClass()); assertEquals("myStructConverter2", ormContextStructConverter.getName()); - assertEquals(1, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(1, CollectionTools.size(persistenceUnit.getAllConverters())); //remove a converter from the context model, check resource model ormContextConverterHolder.removeStructConverter(contextStructConverter2); @@ -1030,6 +1030,6 @@ public class EclipseLinkOrmEmbeddableTests extends EclipseLinkOrmContextModelTes assertEquals(0, ormContextConverterHolder.getStructConvertersSize()); assertFalse(ormContextConverterHolder.getStructConverters().iterator().hasNext()); assertEquals(0, resourceEmbeddable.getStructConverters().size()); - assertEquals(0, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(0, CollectionTools.size(persistenceUnit.getAllConverters())); } }
\ No newline at end of file diff --git a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmEntityTests.java b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmEntityTests.java index ac89b5cfe0..d80263af79 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmEntityTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmEntityTests.java @@ -1746,7 +1746,7 @@ public class EclipseLinkOrmEntityTests extends EclipseLinkOrmContextModelTestCas assertEquals(0, ormContextConverterHolder.getCustomConvertersSize()); assertEquals(0, resourceEntity.getConverters().size()); - assertEquals(0, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(0, CollectionTools.size(persistenceUnit.getAllConverters())); //add a converter to the resource model, check context model XmlConverter resourceConverter = EclipseLinkOrmFactory.eINSTANCE.createXmlConverter(); @@ -1760,7 +1760,7 @@ public class EclipseLinkOrmEntityTests extends EclipseLinkOrmContextModelTestCas assertEquals("Foo", ormContextConverter.getConverterClass()); assertEquals("myConverter", ormContextConverter.getName()); assertEquals(1, resourceEntity.getConverters().size()); - assertEquals(1, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(1, CollectionTools.size(persistenceUnit.getAllConverters())); //add another converter to the resource model, check context model XmlConverter resourceConverter2 = EclipseLinkOrmFactory.eINSTANCE.createXmlConverter(); @@ -1777,7 +1777,7 @@ public class EclipseLinkOrmEntityTests extends EclipseLinkOrmContextModelTestCas assertEquals("Foo", ormContextConverter.getConverterClass()); assertEquals("myConverter", ormContextConverter.getName()); assertEquals(2, resourceEntity.getConverters().size()); - assertEquals(2, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(2, CollectionTools.size(persistenceUnit.getAllConverters())); //move a converter in the resource model, check context model resourceEntity.getConverters().move(0, 1); @@ -1791,7 +1791,7 @@ public class EclipseLinkOrmEntityTests extends EclipseLinkOrmContextModelTestCas assertEquals("Foo2", ormContextConverter.getConverterClass()); assertEquals("myConverter2", ormContextConverter.getName()); assertEquals(2, resourceEntity.getConverters().size()); - assertEquals(2, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(2, CollectionTools.size(persistenceUnit.getAllConverters())); //remove a converter from the resource model, check context model resourceEntity.getConverters().remove(0); @@ -1802,7 +1802,7 @@ public class EclipseLinkOrmEntityTests extends EclipseLinkOrmContextModelTestCas assertEquals("Foo2", ormContextConverter.getConverterClass()); assertEquals("myConverter2", ormContextConverter.getName()); assertEquals(1, resourceEntity.getConverters().size()); - assertEquals(1, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(1, CollectionTools.size(persistenceUnit.getAllConverters())); //remove a converter from the resource model, check context model resourceEntity.getConverters().remove(resourceConverter2); @@ -1810,7 +1810,7 @@ public class EclipseLinkOrmEntityTests extends EclipseLinkOrmContextModelTestCas assertEquals(0, ormContextConverterHolder.getCustomConvertersSize()); assertFalse(ormContextConverterHolder.getCustomConverters().iterator().hasNext()); assertEquals(0, resourceEntity.getConverters().size()); - assertEquals(0, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(0, CollectionTools.size(persistenceUnit.getAllConverters())); } public void testModifyCustomConverters() throws Exception { @@ -1823,7 +1823,7 @@ public class EclipseLinkOrmEntityTests extends EclipseLinkOrmContextModelTestCas assertEquals(0, ormContextConverterHolder.getCustomConvertersSize()); assertEquals(0, resourceEntity.getConverters().size()); - assertEquals(0, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(0, CollectionTools.size(persistenceUnit.getAllConverters())); //add a converter to the context model, check resource model EclipseLinkCustomConverter contextConverter = ormContextConverterHolder.addCustomConverter(0); @@ -1838,7 +1838,7 @@ public class EclipseLinkOrmEntityTests extends EclipseLinkOrmContextModelTestCas EclipseLinkCustomConverter ormContextConverter = ormContextConverters.next(); assertEquals("Foo", ormContextConverter.getConverterClass()); assertEquals("myConverter", ormContextConverter.getName()); - assertEquals(1, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(1, CollectionTools.size(persistenceUnit.getAllConverters())); //add another converter to the context model, check resource model EclipseLinkCustomConverter contextConverter2 = ormContextConverterHolder.addCustomConverter(0); @@ -1858,7 +1858,7 @@ public class EclipseLinkOrmEntityTests extends EclipseLinkOrmContextModelTestCas ormContextConverter = ormContextConverters.next(); assertEquals("Foo", ormContextConverter.getConverterClass()); assertEquals("myConverter", ormContextConverter.getName()); - assertEquals(2, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(2, CollectionTools.size(persistenceUnit.getAllConverters())); //move a converter in the context model, check resource model ormContextConverterHolder.moveCustomConverter(0, 1); @@ -1876,7 +1876,7 @@ public class EclipseLinkOrmEntityTests extends EclipseLinkOrmContextModelTestCas ormContextConverter = ormContextConverters.next(); assertEquals("Foo2", ormContextConverter.getConverterClass()); assertEquals("myConverter2", ormContextConverter.getName()); - assertEquals(2, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(2, CollectionTools.size(persistenceUnit.getAllConverters())); //remove a converter from the context model, check resource model ormContextConverterHolder.removeCustomConverter(0); @@ -1889,7 +1889,7 @@ public class EclipseLinkOrmEntityTests extends EclipseLinkOrmContextModelTestCas ormContextConverter = ormContextConverters.next(); assertEquals("Foo2", ormContextConverter.getConverterClass()); assertEquals("myConverter2", ormContextConverter.getName()); - assertEquals(1, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(1, CollectionTools.size(persistenceUnit.getAllConverters())); //remove a converter from the context model, check resource model ormContextConverterHolder.removeCustomConverter(contextConverter2); @@ -1897,7 +1897,7 @@ public class EclipseLinkOrmEntityTests extends EclipseLinkOrmContextModelTestCas assertEquals(0, ormContextConverterHolder.getCustomConvertersSize()); assertFalse(ormContextConverterHolder.getCustomConverters().iterator().hasNext()); assertEquals(0, resourceEntity.getConverters().size()); - assertEquals(0, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(0, CollectionTools.size(persistenceUnit.getAllConverters())); } public void testUpdateTypeConverters() throws Exception { @@ -1910,7 +1910,7 @@ public class EclipseLinkOrmEntityTests extends EclipseLinkOrmContextModelTestCas assertEquals(0, ormContextConverterHolder.getTypeConvertersSize()); assertEquals(0, resourceEntity.getTypeConverters().size()); - assertEquals(0, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(0, CollectionTools.size(persistenceUnit.getAllConverters())); //add a converter to the resource model, check context model XmlTypeConverter resourceTypeConverter = EclipseLinkOrmFactory.eINSTANCE.createXmlTypeConverter(); @@ -1924,7 +1924,7 @@ public class EclipseLinkOrmEntityTests extends EclipseLinkOrmContextModelTestCas assertEquals("Foo", ormContextTypeConverter.getDataType()); assertEquals("myTypeConverter", ormContextTypeConverter.getName()); assertEquals(1, resourceEntity.getTypeConverters().size()); - assertEquals(1, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(1, CollectionTools.size(persistenceUnit.getAllConverters())); //add another converter to the resource model, check context model XmlTypeConverter resourceTypeConverter2 = EclipseLinkOrmFactory.eINSTANCE.createXmlTypeConverter(); @@ -1941,7 +1941,7 @@ public class EclipseLinkOrmEntityTests extends EclipseLinkOrmContextModelTestCas assertEquals("Foo", ormContextTypeConverter.getDataType()); assertEquals("myTypeConverter", ormContextTypeConverter.getName()); assertEquals(2, resourceEntity.getTypeConverters().size()); - assertEquals(2, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(2, CollectionTools.size(persistenceUnit.getAllConverters())); //move a converter in the resource model, check context model resourceEntity.getTypeConverters().move(0, 1); @@ -1955,7 +1955,7 @@ public class EclipseLinkOrmEntityTests extends EclipseLinkOrmContextModelTestCas assertEquals("Foo2", ormContextTypeConverter.getDataType()); assertEquals("myTypeConverter2", ormContextTypeConverter.getName()); assertEquals(2, resourceEntity.getTypeConverters().size()); - assertEquals(2, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(2, CollectionTools.size(persistenceUnit.getAllConverters())); //remove a converter from the resource model, check context model resourceEntity.getTypeConverters().remove(0); @@ -1966,7 +1966,7 @@ public class EclipseLinkOrmEntityTests extends EclipseLinkOrmContextModelTestCas assertEquals("Foo2", ormContextTypeConverter.getDataType()); assertEquals("myTypeConverter2", ormContextTypeConverter.getName()); assertEquals(1, resourceEntity.getTypeConverters().size()); - assertEquals(1, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(1, CollectionTools.size(persistenceUnit.getAllConverters())); //remove a converter from the resource model, check context model resourceEntity.getTypeConverters().remove(resourceTypeConverter2); @@ -1974,7 +1974,7 @@ public class EclipseLinkOrmEntityTests extends EclipseLinkOrmContextModelTestCas assertEquals(0, ormContextConverterHolder.getTypeConvertersSize()); assertFalse(ormContextConverterHolder.getTypeConverters().iterator().hasNext()); assertEquals(0, resourceEntity.getTypeConverters().size()); - assertEquals(0, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(0, CollectionTools.size(persistenceUnit.getAllConverters())); } public void testModifyTypeConverters() throws Exception { @@ -1987,7 +1987,7 @@ public class EclipseLinkOrmEntityTests extends EclipseLinkOrmContextModelTestCas assertEquals(0, ormContextConverterHolder.getTypeConvertersSize()); assertEquals(0, resourceEntity.getTypeConverters().size()); - assertEquals(0, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(0, CollectionTools.size(persistenceUnit.getAllConverters())); //add a converter to the context model, check resource model EclipseLinkTypeConverter contextTypeConverter = ormContextConverterHolder.addTypeConverter(0); @@ -2002,7 +2002,7 @@ public class EclipseLinkOrmEntityTests extends EclipseLinkOrmContextModelTestCas EclipseLinkTypeConverter ormContextTypeConverter = ormContextTypeConverters.next(); assertEquals("Foo", ormContextTypeConverter.getDataType()); assertEquals("myTypeConverter", ormContextTypeConverter.getName()); - assertEquals(1, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(1, CollectionTools.size(persistenceUnit.getAllConverters())); //add another converter to the context model, check resource model EclipseLinkTypeConverter contextTypeConverter2 = ormContextConverterHolder.addTypeConverter(0); @@ -2022,7 +2022,7 @@ public class EclipseLinkOrmEntityTests extends EclipseLinkOrmContextModelTestCas ormContextTypeConverter = ormContextTypeConverters.next(); assertEquals("Foo", ormContextTypeConverter.getDataType()); assertEquals("myTypeConverter", ormContextTypeConverter.getName()); - assertEquals(2, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(2, CollectionTools.size(persistenceUnit.getAllConverters())); //move a converter in the context model, check resource model ormContextConverterHolder.moveTypeConverter(0, 1); @@ -2040,7 +2040,7 @@ public class EclipseLinkOrmEntityTests extends EclipseLinkOrmContextModelTestCas ormContextTypeConverter = ormContextTypeConverters.next(); assertEquals("Foo2", ormContextTypeConverter.getDataType()); assertEquals("myTypeConverter2", ormContextTypeConverter.getName()); - assertEquals(2, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(2, CollectionTools.size(persistenceUnit.getAllConverters())); //remove a converter from the context model, check resource model ormContextConverterHolder.removeTypeConverter(0); @@ -2053,7 +2053,7 @@ public class EclipseLinkOrmEntityTests extends EclipseLinkOrmContextModelTestCas ormContextTypeConverter = ormContextTypeConverters.next(); assertEquals("Foo2", ormContextTypeConverter.getDataType()); assertEquals("myTypeConverter2", ormContextTypeConverter.getName()); - assertEquals(1, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(1, CollectionTools.size(persistenceUnit.getAllConverters())); //remove a converter from the context model, check resource model ormContextConverterHolder.removeTypeConverter(contextTypeConverter2); @@ -2061,7 +2061,7 @@ public class EclipseLinkOrmEntityTests extends EclipseLinkOrmContextModelTestCas assertEquals(0, ormContextConverterHolder.getTypeConvertersSize()); assertFalse(ormContextConverterHolder.getTypeConverters().iterator().hasNext()); assertEquals(0, resourceEntity.getTypeConverters().size()); - assertEquals(0, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(0, CollectionTools.size(persistenceUnit.getAllConverters())); } public void testUpdateObjectTypeConverters() throws Exception { @@ -2074,7 +2074,7 @@ public class EclipseLinkOrmEntityTests extends EclipseLinkOrmContextModelTestCas assertEquals(0, ormContextConverterHolder.getObjectTypeConvertersSize()); assertEquals(0, resourceEntity.getObjectTypeConverters().size()); - assertEquals(0, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(0, CollectionTools.size(persistenceUnit.getAllConverters())); //add a converter to the resource model, check context model XmlObjectTypeConverter resourceObjectTypeConverter = EclipseLinkOrmFactory.eINSTANCE.createXmlObjectTypeConverter(); @@ -2088,7 +2088,7 @@ public class EclipseLinkOrmEntityTests extends EclipseLinkOrmContextModelTestCas assertEquals("Foo", ormContextObjectTypeConverter.getDataType()); assertEquals("myObjectTypeConverter", ormContextObjectTypeConverter.getName()); assertEquals(1, resourceEntity.getObjectTypeConverters().size()); - assertEquals(1, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(1, CollectionTools.size(persistenceUnit.getAllConverters())); //add another converter to the resource model, check context model XmlObjectTypeConverter resourceObjectTypeConverter2 = EclipseLinkOrmFactory.eINSTANCE.createXmlObjectTypeConverter(); @@ -2105,7 +2105,7 @@ public class EclipseLinkOrmEntityTests extends EclipseLinkOrmContextModelTestCas assertEquals("Foo", ormContextObjectTypeConverter.getDataType()); assertEquals("myObjectTypeConverter", ormContextObjectTypeConverter.getName()); assertEquals(2, resourceEntity.getObjectTypeConverters().size()); - assertEquals(2, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(2, CollectionTools.size(persistenceUnit.getAllConverters())); //move a converter in the resource model, check context model resourceEntity.getObjectTypeConverters().move(0, 1); @@ -2119,7 +2119,7 @@ public class EclipseLinkOrmEntityTests extends EclipseLinkOrmContextModelTestCas assertEquals("Foo2", ormContextObjectTypeConverter.getDataType()); assertEquals("myObjectTypeConverter2", ormContextObjectTypeConverter.getName()); assertEquals(2, resourceEntity.getObjectTypeConverters().size()); - assertEquals(2, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(2, CollectionTools.size(persistenceUnit.getAllConverters())); //remove a converter from the resource model, check context model resourceEntity.getObjectTypeConverters().remove(0); @@ -2130,7 +2130,7 @@ public class EclipseLinkOrmEntityTests extends EclipseLinkOrmContextModelTestCas assertEquals("Foo2", ormContextObjectTypeConverter.getDataType()); assertEquals("myObjectTypeConverter2", ormContextObjectTypeConverter.getName()); assertEquals(1, resourceEntity.getObjectTypeConverters().size()); - assertEquals(1, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(1, CollectionTools.size(persistenceUnit.getAllConverters())); //remove a converter from the resource model, check context model resourceEntity.getObjectTypeConverters().remove(resourceObjectTypeConverter2); @@ -2138,7 +2138,7 @@ public class EclipseLinkOrmEntityTests extends EclipseLinkOrmContextModelTestCas assertEquals(0, ormContextConverterHolder.getObjectTypeConvertersSize()); assertFalse(ormContextConverterHolder.getObjectTypeConverters().iterator().hasNext()); assertEquals(0, resourceEntity.getObjectTypeConverters().size()); - assertEquals(0, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(0, CollectionTools.size(persistenceUnit.getAllConverters())); } public void testModifyObjectTypeConverters() throws Exception { @@ -2151,7 +2151,7 @@ public class EclipseLinkOrmEntityTests extends EclipseLinkOrmContextModelTestCas assertEquals(0, ormContextConverterHolder.getObjectTypeConvertersSize()); assertEquals(0, resourceEntity.getObjectTypeConverters().size()); - assertEquals(0, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(0, CollectionTools.size(persistenceUnit.getAllConverters())); //add a converter to the context model, check resource model EclipseLinkObjectTypeConverter contextObjectTypeConverter = ormContextConverterHolder.addObjectTypeConverter(0); @@ -2166,7 +2166,7 @@ public class EclipseLinkOrmEntityTests extends EclipseLinkOrmContextModelTestCas EclipseLinkObjectTypeConverter ormContextObjectTypeConverter = ormContextObjectTypeConverters.next(); assertEquals("Foo", ormContextObjectTypeConverter.getDataType()); assertEquals("myObjectTypeConverter", ormContextObjectTypeConverter.getName()); - assertEquals(1, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(1, CollectionTools.size(persistenceUnit.getAllConverters())); //add another converter to the context model, check resource model EclipseLinkObjectTypeConverter contextObjectTypeConverter2 = ormContextConverterHolder.addObjectTypeConverter(0); @@ -2186,7 +2186,7 @@ public class EclipseLinkOrmEntityTests extends EclipseLinkOrmContextModelTestCas ormContextObjectTypeConverter = ormContextObjectTypeConverters.next(); assertEquals("Foo", ormContextObjectTypeConverter.getDataType()); assertEquals("myObjectTypeConverter", ormContextObjectTypeConverter.getName()); - assertEquals(2, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(2, CollectionTools.size(persistenceUnit.getAllConverters())); //move a converter in the context model, check resource model ormContextConverterHolder.moveObjectTypeConverter(0, 1); @@ -2204,7 +2204,7 @@ public class EclipseLinkOrmEntityTests extends EclipseLinkOrmContextModelTestCas ormContextObjectTypeConverter = ormContextObjectTypeConverters.next(); assertEquals("Foo2", ormContextObjectTypeConverter.getDataType()); assertEquals("myObjectTypeConverter2", ormContextObjectTypeConverter.getName()); - assertEquals(2, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(2, CollectionTools.size(persistenceUnit.getAllConverters())); //remove a converter from the context model, check resource model ormContextConverterHolder.removeObjectTypeConverter(0); @@ -2217,7 +2217,7 @@ public class EclipseLinkOrmEntityTests extends EclipseLinkOrmContextModelTestCas ormContextObjectTypeConverter = ormContextObjectTypeConverters.next(); assertEquals("Foo2", ormContextObjectTypeConverter.getDataType()); assertEquals("myObjectTypeConverter2", ormContextObjectTypeConverter.getName()); - assertEquals(1, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(1, CollectionTools.size(persistenceUnit.getAllConverters())); //remove a converter from the context model, check resource model ormContextConverterHolder.removeObjectTypeConverter(contextObjectTypeConverter2); @@ -2225,7 +2225,7 @@ public class EclipseLinkOrmEntityTests extends EclipseLinkOrmContextModelTestCas assertEquals(0, ormContextConverterHolder.getObjectTypeConvertersSize()); assertFalse(ormContextConverterHolder.getObjectTypeConverters().iterator().hasNext()); assertEquals(0, resourceEntity.getObjectTypeConverters().size()); - assertEquals(0, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(0, CollectionTools.size(persistenceUnit.getAllConverters())); } public void testUpdateStructConverters() throws Exception { @@ -2238,7 +2238,7 @@ public class EclipseLinkOrmEntityTests extends EclipseLinkOrmContextModelTestCas assertEquals(0, ormContextConverterHolder.getStructConvertersSize()); assertEquals(0, resourceEntity.getStructConverters().size()); - assertEquals(0, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(0, CollectionTools.size(persistenceUnit.getAllConverters())); //add a converter to the resource model, check context model XmlStructConverter resourceStructConverter = EclipseLinkOrmFactory.eINSTANCE.createXmlStructConverter(); @@ -2252,7 +2252,7 @@ public class EclipseLinkOrmEntityTests extends EclipseLinkOrmContextModelTestCas assertEquals("Foo", ormContextStructConverter.getConverterClass()); assertEquals("myStructConverter", ormContextStructConverter.getName()); assertEquals(1, resourceEntity.getStructConverters().size()); - assertEquals(1, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(1, CollectionTools.size(persistenceUnit.getAllConverters())); //add another converter to the resource model, check context model XmlStructConverter resourceStructConverter2 = EclipseLinkOrmFactory.eINSTANCE.createXmlStructConverter(); @@ -2269,7 +2269,7 @@ public class EclipseLinkOrmEntityTests extends EclipseLinkOrmContextModelTestCas assertEquals("Foo", ormContextStructConverter.getConverterClass()); assertEquals("myStructConverter", ormContextStructConverter.getName()); assertEquals(2, resourceEntity.getStructConverters().size()); - assertEquals(2, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(2, CollectionTools.size(persistenceUnit.getAllConverters())); //move a converter in the resource model, check context model resourceEntity.getStructConverters().move(0, 1); @@ -2283,7 +2283,7 @@ public class EclipseLinkOrmEntityTests extends EclipseLinkOrmContextModelTestCas assertEquals("Foo2", ormContextStructConverter.getConverterClass()); assertEquals("myStructConverter2", ormContextStructConverter.getName()); assertEquals(2, resourceEntity.getStructConverters().size()); - assertEquals(2, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(2, CollectionTools.size(persistenceUnit.getAllConverters())); //remove a converter from the resource model, check context model resourceEntity.getStructConverters().remove(0); @@ -2294,7 +2294,7 @@ public class EclipseLinkOrmEntityTests extends EclipseLinkOrmContextModelTestCas assertEquals("Foo2", ormContextStructConverter.getConverterClass()); assertEquals("myStructConverter2", ormContextStructConverter.getName()); assertEquals(1, resourceEntity.getStructConverters().size()); - assertEquals(1, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(1, CollectionTools.size(persistenceUnit.getAllConverters())); //remove a converter from the resource model, check context model resourceEntity.getStructConverters().remove(resourceStructConverter2); @@ -2302,7 +2302,7 @@ public class EclipseLinkOrmEntityTests extends EclipseLinkOrmContextModelTestCas assertEquals(0, ormContextConverterHolder.getStructConvertersSize()); assertFalse(ormContextConverterHolder.getStructConverters().iterator().hasNext()); assertEquals(0, resourceEntity.getStructConverters().size()); - assertEquals(0, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(0, CollectionTools.size(persistenceUnit.getAllConverters())); } public void testModifyStructConverters() throws Exception { @@ -2315,7 +2315,7 @@ public class EclipseLinkOrmEntityTests extends EclipseLinkOrmContextModelTestCas assertEquals(0, ormContextConverterHolder.getStructConvertersSize()); assertEquals(0, resourceEntity.getStructConverters().size()); - assertEquals(0, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(0, CollectionTools.size(persistenceUnit.getAllConverters())); //add a converter to the context model, check resource model EclipseLinkStructConverter contextStructConverter = ormContextConverterHolder.addStructConverter(0); @@ -2330,7 +2330,7 @@ public class EclipseLinkOrmEntityTests extends EclipseLinkOrmContextModelTestCas EclipseLinkStructConverter ormContextStructConverter = ormContextStructConverters.next(); assertEquals("Foo", ormContextStructConverter.getConverterClass()); assertEquals("myStructConverter", ormContextStructConverter.getName()); - assertEquals(1, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(1, CollectionTools.size(persistenceUnit.getAllConverters())); //add another converter to the context model, check resource model EclipseLinkStructConverter contextStructConverter2 = ormContextConverterHolder.addStructConverter(0); @@ -2350,7 +2350,7 @@ public class EclipseLinkOrmEntityTests extends EclipseLinkOrmContextModelTestCas ormContextStructConverter = ormContextStructConverters.next(); assertEquals("Foo", ormContextStructConverter.getConverterClass()); assertEquals("myStructConverter", ormContextStructConverter.getName()); - assertEquals(2, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(2, CollectionTools.size(persistenceUnit.getAllConverters())); //move a converter in the context model, check resource model ormContextConverterHolder.moveStructConverter(0, 1); @@ -2368,7 +2368,7 @@ public class EclipseLinkOrmEntityTests extends EclipseLinkOrmContextModelTestCas ormContextStructConverter = ormContextStructConverters.next(); assertEquals("Foo2", ormContextStructConverter.getConverterClass()); assertEquals("myStructConverter2", ormContextStructConverter.getName()); - assertEquals(2, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(2, CollectionTools.size(persistenceUnit.getAllConverters())); //remove a converter from the context model, check resource model ormContextConverterHolder.removeStructConverter(0); @@ -2381,7 +2381,7 @@ public class EclipseLinkOrmEntityTests extends EclipseLinkOrmContextModelTestCas ormContextStructConverter = ormContextStructConverters.next(); assertEquals("Foo2", ormContextStructConverter.getConverterClass()); assertEquals("myStructConverter2", ormContextStructConverter.getName()); - assertEquals(1, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(1, CollectionTools.size(persistenceUnit.getAllConverters())); //remove a converter from the context model, check resource model ormContextConverterHolder.removeStructConverter(contextStructConverter2); @@ -2389,6 +2389,6 @@ public class EclipseLinkOrmEntityTests extends EclipseLinkOrmContextModelTestCas assertEquals(0, ormContextConverterHolder.getStructConvertersSize()); assertFalse(ormContextConverterHolder.getStructConverters().iterator().hasNext()); assertEquals(0, resourceEntity.getStructConverters().size()); - assertEquals(0, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(0, CollectionTools.size(persistenceUnit.getAllConverters())); } } diff --git a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmMappedSuperclassTests.java b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmMappedSuperclassTests.java index 6d90b84e77..1d5231019b 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmMappedSuperclassTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmMappedSuperclassTests.java @@ -1499,7 +1499,7 @@ public class EclipseLinkOrmMappedSuperclassTests extends EclipseLinkOrmContextMo assertEquals(0, ormContextConverterHolder.getCustomConvertersSize()); assertEquals(0, resourceMappedSuperclass.getConverters().size()); - assertEquals(0, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(0, CollectionTools.size(persistenceUnit.getAllConverters())); //add a converter to the resource model, check context model XmlConverter resourceConverter = EclipseLinkOrmFactory.eINSTANCE.createXmlConverter(); @@ -1513,7 +1513,7 @@ public class EclipseLinkOrmMappedSuperclassTests extends EclipseLinkOrmContextMo assertEquals("Foo", ormContextConverter.getConverterClass()); assertEquals("myConverter", ormContextConverter.getName()); assertEquals(1, resourceMappedSuperclass.getConverters().size()); - assertEquals(1, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(1, CollectionTools.size(persistenceUnit.getAllConverters())); //add another converter to the resource model, check context model XmlConverter resourceConverter2 = EclipseLinkOrmFactory.eINSTANCE.createXmlConverter(); @@ -1530,7 +1530,7 @@ public class EclipseLinkOrmMappedSuperclassTests extends EclipseLinkOrmContextMo assertEquals("Foo", ormContextConverter.getConverterClass()); assertEquals("myConverter", ormContextConverter.getName()); assertEquals(2, resourceMappedSuperclass.getConverters().size()); - assertEquals(2, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(2, CollectionTools.size(persistenceUnit.getAllConverters())); //move a converter in the resource model, check context model resourceMappedSuperclass.getConverters().move(0, 1); @@ -1544,7 +1544,7 @@ public class EclipseLinkOrmMappedSuperclassTests extends EclipseLinkOrmContextMo assertEquals("Foo2", ormContextConverter.getConverterClass()); assertEquals("myConverter2", ormContextConverter.getName()); assertEquals(2, resourceMappedSuperclass.getConverters().size()); - assertEquals(2, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(2, CollectionTools.size(persistenceUnit.getAllConverters())); //remove a converter from the resource model, check context model resourceMappedSuperclass.getConverters().remove(0); @@ -1555,7 +1555,7 @@ public class EclipseLinkOrmMappedSuperclassTests extends EclipseLinkOrmContextMo assertEquals("Foo2", ormContextConverter.getConverterClass()); assertEquals("myConverter2", ormContextConverter.getName()); assertEquals(1, resourceMappedSuperclass.getConverters().size()); - assertEquals(1, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(1, CollectionTools.size(persistenceUnit.getAllConverters())); //remove a converter from the resource model, check context model resourceMappedSuperclass.getConverters().remove(resourceConverter2); @@ -1563,7 +1563,7 @@ public class EclipseLinkOrmMappedSuperclassTests extends EclipseLinkOrmContextMo assertEquals(0, ormContextConverterHolder.getCustomConvertersSize()); assertFalse(ormContextConverterHolder.getCustomConverters().iterator().hasNext()); assertEquals(0, resourceMappedSuperclass.getConverters().size()); - assertEquals(0, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(0, CollectionTools.size(persistenceUnit.getAllConverters())); } public void testModifyCustomConverters() throws Exception { @@ -1576,7 +1576,7 @@ public class EclipseLinkOrmMappedSuperclassTests extends EclipseLinkOrmContextMo assertEquals(0, ormContextConverterHolder.getCustomConvertersSize()); assertEquals(0, resourceMappedSuperclass.getConverters().size()); - assertEquals(0, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(0, CollectionTools.size(persistenceUnit.getAllConverters())); //add a converter to the context model, check resource model EclipseLinkCustomConverter contextConverter = ormContextConverterHolder.addCustomConverter(0); @@ -1591,7 +1591,7 @@ public class EclipseLinkOrmMappedSuperclassTests extends EclipseLinkOrmContextMo EclipseLinkCustomConverter ormContextConverter = ormContextConverters.next(); assertEquals("Foo", ormContextConverter.getConverterClass()); assertEquals("myConverter", ormContextConverter.getName()); - assertEquals(1, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(1, CollectionTools.size(persistenceUnit.getAllConverters())); //add another converter to the context model, check resource model EclipseLinkCustomConverter contextConverter2 = ormContextConverterHolder.addCustomConverter(0); @@ -1611,7 +1611,7 @@ public class EclipseLinkOrmMappedSuperclassTests extends EclipseLinkOrmContextMo ormContextConverter = ormContextConverters.next(); assertEquals("Foo", ormContextConverter.getConverterClass()); assertEquals("myConverter", ormContextConverter.getName()); - assertEquals(2, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(2, CollectionTools.size(persistenceUnit.getAllConverters())); //move a converter in the context model, check resource model ormContextConverterHolder.moveCustomConverter(0, 1); @@ -1629,7 +1629,7 @@ public class EclipseLinkOrmMappedSuperclassTests extends EclipseLinkOrmContextMo ormContextConverter = ormContextConverters.next(); assertEquals("Foo2", ormContextConverter.getConverterClass()); assertEquals("myConverter2", ormContextConverter.getName()); - assertEquals(2, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(2, CollectionTools.size(persistenceUnit.getAllConverters())); //remove a converter from the context model, check resource model ormContextConverterHolder.removeCustomConverter(0); @@ -1642,7 +1642,7 @@ public class EclipseLinkOrmMappedSuperclassTests extends EclipseLinkOrmContextMo ormContextConverter = ormContextConverters.next(); assertEquals("Foo2", ormContextConverter.getConverterClass()); assertEquals("myConverter2", ormContextConverter.getName()); - assertEquals(1, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(1, CollectionTools.size(persistenceUnit.getAllConverters())); //remove a converter from the context model, check resource model ormContextConverterHolder.removeCustomConverter(contextConverter2); @@ -1650,7 +1650,7 @@ public class EclipseLinkOrmMappedSuperclassTests extends EclipseLinkOrmContextMo assertEquals(0, ormContextConverterHolder.getCustomConvertersSize()); assertFalse(ormContextConverterHolder.getCustomConverters().iterator().hasNext()); assertEquals(0, resourceMappedSuperclass.getConverters().size()); - assertEquals(0, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(0, CollectionTools.size(persistenceUnit.getAllConverters())); } public void testUpdateTypeConverters() throws Exception { @@ -1663,7 +1663,7 @@ public class EclipseLinkOrmMappedSuperclassTests extends EclipseLinkOrmContextMo assertEquals(0, ormContextConverterHolder.getTypeConvertersSize()); assertEquals(0, resourceMappedSuperclass.getTypeConverters().size()); - assertEquals(0, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(0, CollectionTools.size(persistenceUnit.getAllConverters())); //add a converter to the resource model, check context model XmlTypeConverter resourceTypeConverter = EclipseLinkOrmFactory.eINSTANCE.createXmlTypeConverter(); @@ -1677,7 +1677,7 @@ public class EclipseLinkOrmMappedSuperclassTests extends EclipseLinkOrmContextMo assertEquals("Foo", ormContextTypeConverter.getDataType()); assertEquals("myTypeConverter", ormContextTypeConverter.getName()); assertEquals(1, resourceMappedSuperclass.getTypeConverters().size()); - assertEquals(1, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(1, CollectionTools.size(persistenceUnit.getAllConverters())); //add another converter to the resource model, check context model XmlTypeConverter resourceTypeConverter2 = EclipseLinkOrmFactory.eINSTANCE.createXmlTypeConverter(); @@ -1694,7 +1694,7 @@ public class EclipseLinkOrmMappedSuperclassTests extends EclipseLinkOrmContextMo assertEquals("Foo", ormContextTypeConverter.getDataType()); assertEquals("myTypeConverter", ormContextTypeConverter.getName()); assertEquals(2, resourceMappedSuperclass.getTypeConverters().size()); - assertEquals(2, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(2, CollectionTools.size(persistenceUnit.getAllConverters())); //move a converter in the resource model, check context model resourceMappedSuperclass.getTypeConverters().move(0, 1); @@ -1708,7 +1708,7 @@ public class EclipseLinkOrmMappedSuperclassTests extends EclipseLinkOrmContextMo assertEquals("Foo2", ormContextTypeConverter.getDataType()); assertEquals("myTypeConverter2", ormContextTypeConverter.getName()); assertEquals(2, resourceMappedSuperclass.getTypeConverters().size()); - assertEquals(2, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(2, CollectionTools.size(persistenceUnit.getAllConverters())); //remove a converter from the resource model, check context model resourceMappedSuperclass.getTypeConverters().remove(0); @@ -1719,7 +1719,7 @@ public class EclipseLinkOrmMappedSuperclassTests extends EclipseLinkOrmContextMo assertEquals("Foo2", ormContextTypeConverter.getDataType()); assertEquals("myTypeConverter2", ormContextTypeConverter.getName()); assertEquals(1, resourceMappedSuperclass.getTypeConverters().size()); - assertEquals(1, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(1, CollectionTools.size(persistenceUnit.getAllConverters())); //remove a converter from the resource model, check context model resourceMappedSuperclass.getTypeConverters().remove(resourceTypeConverter2); @@ -1727,7 +1727,7 @@ public class EclipseLinkOrmMappedSuperclassTests extends EclipseLinkOrmContextMo assertEquals(0, ormContextConverterHolder.getTypeConvertersSize()); assertFalse(ormContextConverterHolder.getTypeConverters().iterator().hasNext()); assertEquals(0, resourceMappedSuperclass.getTypeConverters().size()); - assertEquals(0, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(0, CollectionTools.size(persistenceUnit.getAllConverters())); } public void testModifyTypeConverters() throws Exception { @@ -1740,7 +1740,7 @@ public class EclipseLinkOrmMappedSuperclassTests extends EclipseLinkOrmContextMo assertEquals(0, ormContextConverterHolder.getTypeConvertersSize()); assertEquals(0, resourceMappedSuperclass.getTypeConverters().size()); - assertEquals(0, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(0, CollectionTools.size(persistenceUnit.getAllConverters())); //add a converter to the context model, check resource model EclipseLinkTypeConverter contextTypeConverter = ormContextConverterHolder.addTypeConverter(0); @@ -1755,7 +1755,7 @@ public class EclipseLinkOrmMappedSuperclassTests extends EclipseLinkOrmContextMo EclipseLinkTypeConverter ormContextTypeConverter = ormContextTypeConverters.next(); assertEquals("Foo", ormContextTypeConverter.getDataType()); assertEquals("myTypeConverter", ormContextTypeConverter.getName()); - assertEquals(1, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(1, CollectionTools.size(persistenceUnit.getAllConverters())); //add another converter to the context model, check resource model EclipseLinkTypeConverter contextTypeConverter2 = ormContextConverterHolder.addTypeConverter(0); @@ -1775,7 +1775,7 @@ public class EclipseLinkOrmMappedSuperclassTests extends EclipseLinkOrmContextMo ormContextTypeConverter = ormContextTypeConverters.next(); assertEquals("Foo", ormContextTypeConverter.getDataType()); assertEquals("myTypeConverter", ormContextTypeConverter.getName()); - assertEquals(2, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(2, CollectionTools.size(persistenceUnit.getAllConverters())); //move a converter in the context model, check resource model ormContextConverterHolder.moveTypeConverter(0, 1); @@ -1793,7 +1793,7 @@ public class EclipseLinkOrmMappedSuperclassTests extends EclipseLinkOrmContextMo ormContextTypeConverter = ormContextTypeConverters.next(); assertEquals("Foo2", ormContextTypeConverter.getDataType()); assertEquals("myTypeConverter2", ormContextTypeConverter.getName()); - assertEquals(2, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(2, CollectionTools.size(persistenceUnit.getAllConverters())); //remove a converter from the context model, check resource model ormContextConverterHolder.removeTypeConverter(0); @@ -1806,7 +1806,7 @@ public class EclipseLinkOrmMappedSuperclassTests extends EclipseLinkOrmContextMo ormContextTypeConverter = ormContextTypeConverters.next(); assertEquals("Foo2", ormContextTypeConverter.getDataType()); assertEquals("myTypeConverter2", ormContextTypeConverter.getName()); - assertEquals(1, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(1, CollectionTools.size(persistenceUnit.getAllConverters())); //remove a converter from the context model, check resource model ormContextConverterHolder.removeTypeConverter(contextTypeConverter2); @@ -1814,7 +1814,7 @@ public class EclipseLinkOrmMappedSuperclassTests extends EclipseLinkOrmContextMo assertEquals(0, ormContextConverterHolder.getTypeConvertersSize()); assertFalse(ormContextConverterHolder.getTypeConverters().iterator().hasNext()); assertEquals(0, resourceMappedSuperclass.getTypeConverters().size()); - assertEquals(0, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(0, CollectionTools.size(persistenceUnit.getAllConverters())); } public void testUpdateObjectTypeConverters() throws Exception { @@ -1827,7 +1827,7 @@ public class EclipseLinkOrmMappedSuperclassTests extends EclipseLinkOrmContextMo assertEquals(0, ormContextConverterHolder.getObjectTypeConvertersSize()); assertEquals(0, resourceMappedSuperclass.getObjectTypeConverters().size()); - assertEquals(0, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(0, CollectionTools.size(persistenceUnit.getAllConverters())); //add a converter to the resource model, check context model XmlObjectTypeConverter resourceObjectTypeConverter = EclipseLinkOrmFactory.eINSTANCE.createXmlObjectTypeConverter(); @@ -1841,7 +1841,7 @@ public class EclipseLinkOrmMappedSuperclassTests extends EclipseLinkOrmContextMo assertEquals("Foo", ormContextObjectTypeConverter.getDataType()); assertEquals("myObjectTypeConverter", ormContextObjectTypeConverter.getName()); assertEquals(1, resourceMappedSuperclass.getObjectTypeConverters().size()); - assertEquals(1, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(1, CollectionTools.size(persistenceUnit.getAllConverters())); //add another converter to the resource model, check context model XmlObjectTypeConverter resourceObjectTypeConverter2 = EclipseLinkOrmFactory.eINSTANCE.createXmlObjectTypeConverter(); @@ -1858,7 +1858,7 @@ public class EclipseLinkOrmMappedSuperclassTests extends EclipseLinkOrmContextMo assertEquals("Foo", ormContextObjectTypeConverter.getDataType()); assertEquals("myObjectTypeConverter", ormContextObjectTypeConverter.getName()); assertEquals(2, resourceMappedSuperclass.getObjectTypeConverters().size()); - assertEquals(2, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(2, CollectionTools.size(persistenceUnit.getAllConverters())); //move a converter in the resource model, check context model resourceMappedSuperclass.getObjectTypeConverters().move(0, 1); @@ -1872,7 +1872,7 @@ public class EclipseLinkOrmMappedSuperclassTests extends EclipseLinkOrmContextMo assertEquals("Foo2", ormContextObjectTypeConverter.getDataType()); assertEquals("myObjectTypeConverter2", ormContextObjectTypeConverter.getName()); assertEquals(2, resourceMappedSuperclass.getObjectTypeConverters().size()); - assertEquals(2, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(2, CollectionTools.size(persistenceUnit.getAllConverters())); //remove a converter from the resource model, check context model resourceMappedSuperclass.getObjectTypeConverters().remove(0); @@ -1883,7 +1883,7 @@ public class EclipseLinkOrmMappedSuperclassTests extends EclipseLinkOrmContextMo assertEquals("Foo2", ormContextObjectTypeConverter.getDataType()); assertEquals("myObjectTypeConverter2", ormContextObjectTypeConverter.getName()); assertEquals(1, resourceMappedSuperclass.getObjectTypeConverters().size()); - assertEquals(1, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(1, CollectionTools.size(persistenceUnit.getAllConverters())); //remove a converter from the resource model, check context model resourceMappedSuperclass.getObjectTypeConverters().remove(resourceObjectTypeConverter2); @@ -1891,7 +1891,7 @@ public class EclipseLinkOrmMappedSuperclassTests extends EclipseLinkOrmContextMo assertEquals(0, ormContextConverterHolder.getObjectTypeConvertersSize()); assertFalse(ormContextConverterHolder.getObjectTypeConverters().iterator().hasNext()); assertEquals(0, resourceMappedSuperclass.getObjectTypeConverters().size()); - assertEquals(0, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(0, CollectionTools.size(persistenceUnit.getAllConverters())); } public void testModifyObjectTypeConverters() throws Exception { @@ -1904,7 +1904,7 @@ public class EclipseLinkOrmMappedSuperclassTests extends EclipseLinkOrmContextMo assertEquals(0, ormContextConverterHolder.getObjectTypeConvertersSize()); assertEquals(0, resourceMappedSuperclass.getObjectTypeConverters().size()); - assertEquals(0, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(0, CollectionTools.size(persistenceUnit.getAllConverters())); //add a converter to the context model, check resource model EclipseLinkObjectTypeConverter contextObjectTypeConverter = ormContextConverterHolder.addObjectTypeConverter(0); @@ -1919,7 +1919,7 @@ public class EclipseLinkOrmMappedSuperclassTests extends EclipseLinkOrmContextMo EclipseLinkObjectTypeConverter ormContextObjectTypeConverter = ormContextObjectTypeConverters.next(); assertEquals("Foo", ormContextObjectTypeConverter.getDataType()); assertEquals("myObjectTypeConverter", ormContextObjectTypeConverter.getName()); - assertEquals(1, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(1, CollectionTools.size(persistenceUnit.getAllConverters())); //add another converter to the context model, check resource model EclipseLinkObjectTypeConverter contextObjectTypeConverter2 = ormContextConverterHolder.addObjectTypeConverter(0); @@ -1939,7 +1939,7 @@ public class EclipseLinkOrmMappedSuperclassTests extends EclipseLinkOrmContextMo ormContextObjectTypeConverter = ormContextObjectTypeConverters.next(); assertEquals("Foo", ormContextObjectTypeConverter.getDataType()); assertEquals("myObjectTypeConverter", ormContextObjectTypeConverter.getName()); - assertEquals(2, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(2, CollectionTools.size(persistenceUnit.getAllConverters())); //move a converter in the context model, check resource model ormContextConverterHolder.moveObjectTypeConverter(0, 1); @@ -1957,7 +1957,7 @@ public class EclipseLinkOrmMappedSuperclassTests extends EclipseLinkOrmContextMo ormContextObjectTypeConverter = ormContextObjectTypeConverters.next(); assertEquals("Foo2", ormContextObjectTypeConverter.getDataType()); assertEquals("myObjectTypeConverter2", ormContextObjectTypeConverter.getName()); - assertEquals(2, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(2, CollectionTools.size(persistenceUnit.getAllConverters())); //remove a converter from the context model, check resource model ormContextConverterHolder.removeObjectTypeConverter(0); @@ -1970,7 +1970,7 @@ public class EclipseLinkOrmMappedSuperclassTests extends EclipseLinkOrmContextMo ormContextObjectTypeConverter = ormContextObjectTypeConverters.next(); assertEquals("Foo2", ormContextObjectTypeConverter.getDataType()); assertEquals("myObjectTypeConverter2", ormContextObjectTypeConverter.getName()); - assertEquals(1, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(1, CollectionTools.size(persistenceUnit.getAllConverters())); //remove a converter from the context model, check resource model ormContextConverterHolder.removeObjectTypeConverter(contextObjectTypeConverter2); @@ -1978,7 +1978,7 @@ public class EclipseLinkOrmMappedSuperclassTests extends EclipseLinkOrmContextMo assertEquals(0, ormContextConverterHolder.getObjectTypeConvertersSize()); assertFalse(ormContextConverterHolder.getObjectTypeConverters().iterator().hasNext()); assertEquals(0, resourceMappedSuperclass.getObjectTypeConverters().size()); - assertEquals(0, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(0, CollectionTools.size(persistenceUnit.getAllConverters())); } public void testUpdateStructConverters() throws Exception { @@ -1991,7 +1991,7 @@ public class EclipseLinkOrmMappedSuperclassTests extends EclipseLinkOrmContextMo assertEquals(0, ormContextConverterHolder.getStructConvertersSize()); assertEquals(0, resourceMappedSuperclass.getStructConverters().size()); - assertEquals(0, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(0, CollectionTools.size(persistenceUnit.getAllConverters())); //add a converter to the resource model, check context model XmlStructConverter resourceStructConverter = EclipseLinkOrmFactory.eINSTANCE.createXmlStructConverter(); @@ -2005,7 +2005,7 @@ public class EclipseLinkOrmMappedSuperclassTests extends EclipseLinkOrmContextMo assertEquals("Foo", ormContextStructConverter.getConverterClass()); assertEquals("myStructConverter", ormContextStructConverter.getName()); assertEquals(1, resourceMappedSuperclass.getStructConverters().size()); - assertEquals(1, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(1, CollectionTools.size(persistenceUnit.getAllConverters())); //add another converter to the resource model, check context model XmlStructConverter resourceStructConverter2 = EclipseLinkOrmFactory.eINSTANCE.createXmlStructConverter(); @@ -2022,7 +2022,7 @@ public class EclipseLinkOrmMappedSuperclassTests extends EclipseLinkOrmContextMo assertEquals("Foo", ormContextStructConverter.getConverterClass()); assertEquals("myStructConverter", ormContextStructConverter.getName()); assertEquals(2, resourceMappedSuperclass.getStructConverters().size()); - assertEquals(2, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(2, CollectionTools.size(persistenceUnit.getAllConverters())); //move a converter in the resource model, check context model resourceMappedSuperclass.getStructConverters().move(0, 1); @@ -2036,7 +2036,7 @@ public class EclipseLinkOrmMappedSuperclassTests extends EclipseLinkOrmContextMo assertEquals("Foo2", ormContextStructConverter.getConverterClass()); assertEquals("myStructConverter2", ormContextStructConverter.getName()); assertEquals(2, resourceMappedSuperclass.getStructConverters().size()); - assertEquals(2, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(2, CollectionTools.size(persistenceUnit.getAllConverters())); //remove a converter from the resource model, check context model resourceMappedSuperclass.getStructConverters().remove(0); @@ -2047,7 +2047,7 @@ public class EclipseLinkOrmMappedSuperclassTests extends EclipseLinkOrmContextMo assertEquals("Foo2", ormContextStructConverter.getConverterClass()); assertEquals("myStructConverter2", ormContextStructConverter.getName()); assertEquals(1, resourceMappedSuperclass.getStructConverters().size()); - assertEquals(1, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(1, CollectionTools.size(persistenceUnit.getAllConverters())); //remove a converter from the resource model, check context model resourceMappedSuperclass.getStructConverters().remove(resourceStructConverter2); @@ -2055,7 +2055,7 @@ public class EclipseLinkOrmMappedSuperclassTests extends EclipseLinkOrmContextMo assertEquals(0, ormContextConverterHolder.getStructConvertersSize()); assertFalse(ormContextConverterHolder.getStructConverters().iterator().hasNext()); assertEquals(0, resourceMappedSuperclass.getStructConverters().size()); - assertEquals(0, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(0, CollectionTools.size(persistenceUnit.getAllConverters())); } public void testModifyStructConverters() throws Exception { @@ -2068,7 +2068,7 @@ public class EclipseLinkOrmMappedSuperclassTests extends EclipseLinkOrmContextMo assertEquals(0, ormContextConverterHolder.getStructConvertersSize()); assertEquals(0, resourceMappedSuperclass.getStructConverters().size()); - assertEquals(0, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(0, CollectionTools.size(persistenceUnit.getAllConverters())); //add a converter to the context model, check resource model EclipseLinkStructConverter contextStructConverter = ormContextConverterHolder.addStructConverter(0); @@ -2083,7 +2083,7 @@ public class EclipseLinkOrmMappedSuperclassTests extends EclipseLinkOrmContextMo EclipseLinkStructConverter ormContextStructConverter = ormContextStructConverters.next(); assertEquals("Foo", ormContextStructConverter.getConverterClass()); assertEquals("myStructConverter", ormContextStructConverter.getName()); - assertEquals(1, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(1, CollectionTools.size(persistenceUnit.getAllConverters())); //add another converter to the context model, check resource model EclipseLinkStructConverter contextStructConverter2 = ormContextConverterHolder.addStructConverter(0); @@ -2103,7 +2103,7 @@ public class EclipseLinkOrmMappedSuperclassTests extends EclipseLinkOrmContextMo ormContextStructConverter = ormContextStructConverters.next(); assertEquals("Foo", ormContextStructConverter.getConverterClass()); assertEquals("myStructConverter", ormContextStructConverter.getName()); - assertEquals(2, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(2, CollectionTools.size(persistenceUnit.getAllConverters())); //move a converter in the context model, check resource model ormContextConverterHolder.moveStructConverter(0, 1); @@ -2121,7 +2121,7 @@ public class EclipseLinkOrmMappedSuperclassTests extends EclipseLinkOrmContextMo ormContextStructConverter = ormContextStructConverters.next(); assertEquals("Foo2", ormContextStructConverter.getConverterClass()); assertEquals("myStructConverter2", ormContextStructConverter.getName()); - assertEquals(2, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(2, CollectionTools.size(persistenceUnit.getAllConverters())); //remove a converter from the context model, check resource model ormContextConverterHolder.removeStructConverter(0); @@ -2134,7 +2134,7 @@ public class EclipseLinkOrmMappedSuperclassTests extends EclipseLinkOrmContextMo ormContextStructConverter = ormContextStructConverters.next(); assertEquals("Foo2", ormContextStructConverter.getConverterClass()); assertEquals("myStructConverter2", ormContextStructConverter.getName()); - assertEquals(1, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(1, CollectionTools.size(persistenceUnit.getAllConverters())); //remove a converter from the context model, check resource model ormContextConverterHolder.removeStructConverter(contextStructConverter2); @@ -2142,6 +2142,6 @@ public class EclipseLinkOrmMappedSuperclassTests extends EclipseLinkOrmContextMo assertEquals(0, ormContextConverterHolder.getStructConvertersSize()); assertFalse(ormContextConverterHolder.getStructConverters().iterator().hasNext()); assertEquals(0, resourceMappedSuperclass.getStructConverters().size()); - assertEquals(0, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(0, CollectionTools.size(persistenceUnit.getAllConverters())); } } diff --git a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmOneToManyMappingTests.java b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmOneToManyMappingTests.java index a322f9d211..fc6bb89af4 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmOneToManyMappingTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmOneToManyMappingTests.java @@ -523,7 +523,7 @@ public class EclipseLinkOrmOneToManyMappingTests OneToManyMapping oneToManyMapping = (OneToManyMapping) ormPersistentType.getAttributeNamed("addresses").getMapping(); Iterator<String> mapKeyNames = - oneToManyMapping.candidateMapKeyNames(); + oneToManyMapping.getCandidateMapKeyNames().iterator(); assertEquals("id", mapKeyNames.next()); assertEquals("city", mapKeyNames.next()); assertEquals("state", mapKeyNames.next()); @@ -543,11 +543,11 @@ public class EclipseLinkOrmOneToManyMappingTests OneToManyMapping ormOneToManyMapping = (OneToManyMapping) ormPersistentType.getAttributeNamed("addresses").getMapping(); JavaOneToManyMapping javaOneToManyMapping = (JavaOneToManyMapping) ormPersistentType.getJavaPersistentType().getAttributeNamed("addresses").getMapping(); - Iterator<String> mapKeyNames = ormOneToManyMapping.candidateMapKeyNames(); + Iterator<String> mapKeyNames = ormOneToManyMapping.getCandidateMapKeyNames().iterator(); assertEquals(false, mapKeyNames.hasNext()); javaOneToManyMapping.setSpecifiedTargetEntity("test.Address"); - mapKeyNames = ormOneToManyMapping.candidateMapKeyNames(); + mapKeyNames = ormOneToManyMapping.getCandidateMapKeyNames().iterator(); assertEquals("id", mapKeyNames.next()); assertEquals("city", mapKeyNames.next()); assertEquals("state", mapKeyNames.next()); @@ -556,11 +556,11 @@ public class EclipseLinkOrmOneToManyMappingTests ormPersistentType.getAttributeNamed("addresses").convertToSpecified(); ormOneToManyMapping = (OneToManyMapping) ormPersistentType.getAttributeNamed("addresses").getMapping(); - mapKeyNames = ormOneToManyMapping.candidateMapKeyNames(); + mapKeyNames = ormOneToManyMapping.getCandidateMapKeyNames().iterator(); assertEquals(false, mapKeyNames.hasNext()); ormOneToManyMapping.setSpecifiedTargetEntity("test.Address"); - mapKeyNames = ormOneToManyMapping.candidateMapKeyNames(); + mapKeyNames = ormOneToManyMapping.getCandidateMapKeyNames().iterator(); assertEquals("id", mapKeyNames.next()); assertEquals("city", mapKeyNames.next()); assertEquals("state", mapKeyNames.next()); @@ -568,7 +568,7 @@ public class EclipseLinkOrmOneToManyMappingTests assertFalse(mapKeyNames.hasNext()); ormOneToManyMapping.setSpecifiedTargetEntity("String"); - mapKeyNames = ormOneToManyMapping.candidateMapKeyNames(); + mapKeyNames = ormOneToManyMapping.getCandidateMapKeyNames().iterator(); assertEquals(false, mapKeyNames.hasNext()); } diff --git a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/persistence/caching/CachingAdapterTests.java b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/persistence/caching/CachingAdapterTests.java index bb2a737f6d..97bb3f7123 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/persistence/caching/CachingAdapterTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/persistence/caching/CachingAdapterTests.java @@ -159,10 +159,10 @@ public class CachingAdapterTests extends EclipseLinkPersistenceUnitTestCase public void testEntitiesList() throws Exception { // add this.clearEvent(); - int originalNumberOfEntities = this.caching.entitiesSize(); + int originalNumberOfEntities = this.caching.getEntitiesSize(); this.caching.addEntity(ENTITY_TEST_2); - assertEquals("Entity not added", this.caching.entitiesSize(), originalNumberOfEntities + 1); + assertEquals("Entity not added", this.caching.getEntitiesSize(), originalNumberOfEntities + 1); // verify event received assertNotNull("No Event Fired.", this.entitiesEvent); @@ -172,7 +172,7 @@ public class CachingAdapterTests extends EclipseLinkPersistenceUnitTestCase // remove this.clearEvent(); this.caching.removeEntity(ENTITY_TEST_2); - assertEquals("Entity not removed", this.caching.entitiesSize(), originalNumberOfEntities); + assertEquals("Entity not removed", this.caching.getEntitiesSize(), originalNumberOfEntities); // verify event received assertNotNull("No Event Fired.", this.entitiesEvent); diff --git a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/persistence/customization/EclipseLinkCustomizationTests.java b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/persistence/customization/EclipseLinkCustomizationTests.java index 76904218c8..7d4e493420 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/persistence/customization/EclipseLinkCustomizationTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/persistence/customization/EclipseLinkCustomizationTests.java @@ -306,7 +306,7 @@ public class EclipseLinkCustomizationTests extends EclipseLinkPersistenceUnitTes else if (propertyName.equals(Customization.PROFILER_PROPERTY)) modelValue = this.customization.getProfiler(); else if (propertyName.equals(Customization.SESSION_CUSTOMIZER_PROPERTY)) { - ListIterator<String> iterator = this.customization.sessionCustomizers(); + ListIterator<String> iterator = this.customization.getSessionCustomizers().iterator(); if(iterator.hasNext()) { modelValue = iterator.next(); } diff --git a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/v2_0/context/java/EclipseLink2_0JavaElementCollectionMappingTests.java b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/v2_0/context/java/EclipseLink2_0JavaElementCollectionMappingTests.java index af5ca8e731..12807cdd60 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/v2_0/context/java/EclipseLink2_0JavaElementCollectionMappingTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/v2_0/context/java/EclipseLink2_0JavaElementCollectionMappingTests.java @@ -890,7 +890,7 @@ public class EclipseLink2_0JavaElementCollectionMappingTests 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()); @@ -910,11 +910,11 @@ public class EclipseLink2_0JavaElementCollectionMappingTests 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()); @@ -923,7 +923,7 @@ public class EclipseLink2_0JavaElementCollectionMappingTests assertFalse(mapKeyNames.hasNext()); elementCollectionMapping2_0.setSpecifiedTargetClass("String"); - mapKeyNames = elementCollectionMapping2_0.candidateMapKeyNames(); + mapKeyNames = elementCollectionMapping2_0.getCandidateMapKeyNames().iterator(); assertEquals(false, mapKeyNames.hasNext()); } @@ -2067,6 +2067,6 @@ public class EclipseLink2_0JavaElementCollectionMappingTests //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.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/v2_0/context/java/EclipseLink2_0JavaEntityTests.java b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/v2_0/context/java/EclipseLink2_0JavaEntityTests.java index 1e520f001b..4b9896219d 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/v2_0/context/java/EclipseLink2_0JavaEntityTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/v2_0/context/java/EclipseLink2_0JavaEntityTests.java @@ -350,13 +350,13 @@ public class EclipseLink2_0JavaEntityTests extends EclipseLink2_0ContextModelTes 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()); @@ -366,13 +366,13 @@ public class EclipseLink2_0JavaEntityTests extends EclipseLink2_0ContextModelTes 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()); @@ -384,7 +384,7 @@ public class EclipseLink2_0JavaEntityTests extends EclipseLink2_0ContextModelTes 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()); @@ -397,7 +397,7 @@ public class EclipseLink2_0JavaEntityTests extends EclipseLink2_0ContextModelTes 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()); @@ -407,7 +407,7 @@ public class EclipseLink2_0JavaEntityTests extends EclipseLink2_0ContextModelTes 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()); @@ -420,7 +420,7 @@ public class EclipseLink2_0JavaEntityTests extends EclipseLink2_0ContextModelTes 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()); @@ -431,7 +431,7 @@ public class EclipseLink2_0JavaEntityTests extends EclipseLink2_0ContextModelTes 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()); @@ -445,7 +445,7 @@ public class EclipseLink2_0JavaEntityTests extends EclipseLink2_0ContextModelTes 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()); @@ -458,7 +458,7 @@ public class EclipseLink2_0JavaEntityTests extends EclipseLink2_0ContextModelTes 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()); @@ -923,7 +923,7 @@ public class EclipseLink2_0JavaEntityTests extends EclipseLink2_0ContextModelTes createTestEntity(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - Iterator<String> overridableAssociations = getJavaEntity().overridableAssociationNames(); + Iterator<String> overridableAssociations = getJavaEntity().getOverridableAssociationNames().iterator(); assertFalse(overridableAssociations.hasNext()); } @@ -931,7 +931,7 @@ public class EclipseLink2_0JavaEntityTests extends EclipseLink2_0ContextModelTes createTestEntity(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - Iterator<String> overridableAssociationNames = getJavaEntity().overridableAssociationNames(); + Iterator<String> overridableAssociationNames = getJavaEntity().getOverridableAssociationNames().iterator(); assertFalse(overridableAssociationNames.hasNext()); } @@ -942,7 +942,7 @@ public class EclipseLink2_0JavaEntityTests extends EclipseLink2_0ContextModelTes 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()); @@ -956,7 +956,7 @@ public class EclipseLink2_0JavaEntityTests extends EclipseLink2_0ContextModelTes 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.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/v2_0/context/java/EclipseLink2_0JavaManyToManyMappingTests.java b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/v2_0/context/java/EclipseLink2_0JavaManyToManyMappingTests.java index 4f72f0730f..8cdee1a20a 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/v2_0/context/java/EclipseLink2_0JavaManyToManyMappingTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/v2_0/context/java/EclipseLink2_0JavaManyToManyMappingTests.java @@ -442,7 +442,7 @@ public class EclipseLink2_0JavaManyToManyMappingTests 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()); @@ -454,12 +454,12 @@ public class EclipseLink2_0JavaManyToManyMappingTests 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()); @@ -485,7 +485,7 @@ public class EclipseLink2_0JavaManyToManyMappingTests 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()); @@ -496,12 +496,12 @@ public class EclipseLink2_0JavaManyToManyMappingTests 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()); @@ -590,7 +590,7 @@ public class EclipseLink2_0JavaManyToManyMappingTests 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()); @@ -612,11 +612,11 @@ public class EclipseLink2_0JavaManyToManyMappingTests 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()); @@ -627,7 +627,7 @@ public class EclipseLink2_0JavaManyToManyMappingTests 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.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/v2_0/context/java/EclipseLink2_0JavaOneToManyMappingTests.java b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/v2_0/context/java/EclipseLink2_0JavaOneToManyMappingTests.java index ccfde75502..691f934b40 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/v2_0/context/java/EclipseLink2_0JavaOneToManyMappingTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/v2_0/context/java/EclipseLink2_0JavaOneToManyMappingTests.java @@ -543,7 +543,7 @@ public class EclipseLink2_0JavaOneToManyMappingTests 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()); @@ -565,11 +565,11 @@ public class EclipseLink2_0JavaOneToManyMappingTests 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.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/v2_0/context/java/EclipseLink2_0JavaOneToOneMappingTests.java b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/v2_0/context/java/EclipseLink2_0JavaOneToOneMappingTests.java index 97a7df409a..e401729e91 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/v2_0/context/java/EclipseLink2_0JavaOneToOneMappingTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/v2_0/context/java/EclipseLink2_0JavaOneToOneMappingTests.java @@ -431,7 +431,7 @@ public class EclipseLink2_0JavaOneToOneMappingTests 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()); @@ -442,12 +442,12 @@ public class EclipseLink2_0JavaOneToOneMappingTests 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()); @@ -472,7 +472,7 @@ public class EclipseLink2_0JavaOneToOneMappingTests 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()); @@ -483,12 +483,12 @@ public class EclipseLink2_0JavaOneToOneMappingTests 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.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/v2_0/context/orm/EclipseLink2_0OrmElementCollectionMappingTests.java b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/v2_0/context/orm/EclipseLink2_0OrmElementCollectionMappingTests.java index a92ff3cfb2..675815dc1a 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/v2_0/context/orm/EclipseLink2_0OrmElementCollectionMappingTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/v2_0/context/orm/EclipseLink2_0OrmElementCollectionMappingTests.java @@ -784,7 +784,7 @@ public class EclipseLink2_0OrmElementCollectionMappingTests extends EclipseLink2 ElementCollectionMapping2_0 virtualElementCollectionMapping = (ElementCollectionMapping2_0) ormPersistentType.getAttributeNamed("addresses").getMapping(); Iterator<String> mapKeyNames = - virtualElementCollectionMapping.candidateMapKeyNames(); + virtualElementCollectionMapping.getCandidateMapKeyNames().iterator(); assertEquals("city", mapKeyNames.next()); assertEquals("state", mapKeyNames.next()); assertEquals("state.name", mapKeyNames.next()); @@ -805,11 +805,11 @@ public class EclipseLink2_0OrmElementCollectionMappingTests extends EclipseLink2 ElementCollectionMapping2_0 virtualElementCollectionMapping = (ElementCollectionMapping2_0) attribute.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()); @@ -819,11 +819,11 @@ public class EclipseLink2_0OrmElementCollectionMappingTests extends EclipseLink2 attribute.convertToSpecified(); OrmElementCollectionMapping2_0 ormElementCollectionMapping = (OrmElementCollectionMapping2_0) ormPersistentType.getAttributeNamed("addresses").getMapping(); - mapKeyNames = ormElementCollectionMapping.candidateMapKeyNames(); + mapKeyNames = ormElementCollectionMapping.getCandidateMapKeyNames().iterator(); assertEquals(false, mapKeyNames.hasNext()); ormElementCollectionMapping.setSpecifiedTargetClass("test.Address"); - mapKeyNames = ormElementCollectionMapping.candidateMapKeyNames(); + mapKeyNames = ormElementCollectionMapping.getCandidateMapKeyNames().iterator(); assertEquals("city", mapKeyNames.next()); assertEquals("state", mapKeyNames.next()); assertEquals("state.name", mapKeyNames.next()); @@ -832,7 +832,7 @@ public class EclipseLink2_0OrmElementCollectionMappingTests extends EclipseLink2 assertFalse(mapKeyNames.hasNext()); ormElementCollectionMapping.setSpecifiedTargetClass("String"); - mapKeyNames = ormElementCollectionMapping.candidateMapKeyNames(); + mapKeyNames = ormElementCollectionMapping.getCandidateMapKeyNames().iterator(); assertEquals(false, mapKeyNames.hasNext()); } @@ -1441,6 +1441,6 @@ public class EclipseLink2_0OrmElementCollectionMappingTests extends EclipseLink2 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.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/v2_0/context/orm/EclipseLink2_0OrmEntityTests.java b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/v2_0/context/orm/EclipseLink2_0OrmEntityTests.java index 2ee3a207bb..b005c63f7f 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/v2_0/context/orm/EclipseLink2_0OrmEntityTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/v2_0/context/orm/EclipseLink2_0OrmEntityTests.java @@ -340,13 +340,13 @@ public class EclipseLink2_0OrmEntityTests extends EclipseLink2_0OrmContextModelT 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()); @@ -357,13 +357,13 @@ public class EclipseLink2_0OrmEntityTests extends EclipseLink2_0OrmContextModelT 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()); @@ -375,7 +375,7 @@ public class EclipseLink2_0OrmEntityTests extends EclipseLink2_0OrmContextModelT 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()); @@ -389,7 +389,7 @@ public class EclipseLink2_0OrmEntityTests extends EclipseLink2_0OrmContextModelT 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()); @@ -397,7 +397,7 @@ public class EclipseLink2_0OrmEntityTests extends EclipseLink2_0OrmContextModelT OrmEntity abstractEntity = (OrmEntity) ormEntity.getParentEntity(); - overridableAttributes = abstractEntity.allOverridableAttributeNames(); + overridableAttributes = abstractEntity.getAllOverridableAttributeNames().iterator(); assertEquals("id", overridableAttributes.next()); assertEquals("name", overridableAttributes.next()); assertEquals("foo", overridableAttributes.next()); @@ -411,7 +411,7 @@ public class EclipseLink2_0OrmEntityTests extends EclipseLink2_0OrmContextModelT 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()); @@ -420,7 +420,7 @@ public class EclipseLink2_0OrmEntityTests extends EclipseLink2_0OrmContextModelT OrmEntity abstractEntity = (OrmEntity) ormEntity.getParentEntity(); - overridableAssociations = abstractEntity.allOverridableAssociationNames(); + overridableAssociations = abstractEntity.getAllOverridableAssociationNames().iterator(); assertEquals("address", overridableAssociations.next()); assertEquals("address2", overridableAssociations.next()); assertEquals("address3", overridableAssociations.next()); @@ -448,7 +448,7 @@ public class EclipseLink2_0OrmEntityTests extends EclipseLink2_0OrmContextModelT 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()); @@ -886,7 +886,7 @@ public class EclipseLink2_0OrmEntityTests extends EclipseLink2_0OrmContextModelT 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()); } @@ -898,7 +898,7 @@ public class EclipseLink2_0OrmEntityTests extends EclipseLink2_0OrmContextModelT 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()); @@ -913,7 +913,7 @@ public class EclipseLink2_0OrmEntityTests extends EclipseLink2_0OrmContextModelT 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.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/v2_0/context/orm/EclipseLink2_0OrmManyToManyMappingTests.java b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/v2_0/context/orm/EclipseLink2_0OrmManyToManyMappingTests.java index eb4a17332c..3b016d2ef4 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/v2_0/context/orm/EclipseLink2_0OrmManyToManyMappingTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/v2_0/context/orm/EclipseLink2_0OrmManyToManyMappingTests.java @@ -255,7 +255,7 @@ public class EclipseLink2_0OrmManyToManyMappingTests 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()); @@ -266,12 +266,12 @@ public class EclipseLink2_0OrmManyToManyMappingTests 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()); @@ -301,7 +301,7 @@ public class EclipseLink2_0OrmManyToManyMappingTests 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()); @@ -312,12 +312,12 @@ public class EclipseLink2_0OrmManyToManyMappingTests 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()); @@ -427,7 +427,7 @@ public class EclipseLink2_0OrmManyToManyMappingTests ManyToManyMapping virtualManyToManyMapping = (ManyToManyMapping) ormPersistentType.getAttributeNamed("addresses").getMapping(); Iterator<String> mapKeyNames = - virtualManyToManyMapping.candidateMapKeyNames(); + virtualManyToManyMapping.getCandidateMapKeyNames().iterator(); assertEquals("id", mapKeyNames.next()); assertEquals("city", mapKeyNames.next()); assertEquals("state", mapKeyNames.next()); @@ -449,11 +449,11 @@ public class EclipseLink2_0OrmManyToManyMappingTests 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()); @@ -464,11 +464,11 @@ public class EclipseLink2_0OrmManyToManyMappingTests 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()); @@ -478,7 +478,7 @@ public class EclipseLink2_0OrmManyToManyMappingTests 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.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/v2_0/context/orm/EclipseLink2_0OrmMappedSuperclassTests.java b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/v2_0/context/orm/EclipseLink2_0OrmMappedSuperclassTests.java index 99ea27f12a..92809bac2b 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/v2_0/context/orm/EclipseLink2_0OrmMappedSuperclassTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/v2_0/context/orm/EclipseLink2_0OrmMappedSuperclassTests.java @@ -1526,7 +1526,7 @@ public class EclipseLink2_0OrmMappedSuperclassTests extends EclipseLink2_0OrmCon assertEquals(0, ormContextConverterHolder.getCustomConvertersSize()); assertEquals(0, resourceMappedSuperclass.getConverters().size()); - assertEquals(0, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(0, CollectionTools.size(persistenceUnit.getAllConverters())); //add a converter to the resource model, check context model XmlConverter resourceConverter = EclipseLinkOrmFactory.eINSTANCE.createXmlConverter(); @@ -1540,7 +1540,7 @@ public class EclipseLink2_0OrmMappedSuperclassTests extends EclipseLink2_0OrmCon assertEquals("Foo", ormContextConverter.getConverterClass()); assertEquals("myConverter", ormContextConverter.getName()); assertEquals(1, resourceMappedSuperclass.getConverters().size()); - assertEquals(1, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(1, CollectionTools.size(persistenceUnit.getAllConverters())); //add another converter to the resource model, check context model XmlConverter resourceConverter2 = EclipseLinkOrmFactory.eINSTANCE.createXmlConverter(); @@ -1557,7 +1557,7 @@ public class EclipseLink2_0OrmMappedSuperclassTests extends EclipseLink2_0OrmCon assertEquals("Foo", ormContextConverter.getConverterClass()); assertEquals("myConverter", ormContextConverter.getName()); assertEquals(2, resourceMappedSuperclass.getConverters().size()); - assertEquals(2, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(2, CollectionTools.size(persistenceUnit.getAllConverters())); //move a converter in the resource model, check context model resourceMappedSuperclass.getConverters().move(0, 1); @@ -1571,7 +1571,7 @@ public class EclipseLink2_0OrmMappedSuperclassTests extends EclipseLink2_0OrmCon assertEquals("Foo2", ormContextConverter.getConverterClass()); assertEquals("myConverter2", ormContextConverter.getName()); assertEquals(2, resourceMappedSuperclass.getConverters().size()); - assertEquals(2, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(2, CollectionTools.size(persistenceUnit.getAllConverters())); //remove a converter from the resource model, check context model resourceMappedSuperclass.getConverters().remove(0); @@ -1582,7 +1582,7 @@ public class EclipseLink2_0OrmMappedSuperclassTests extends EclipseLink2_0OrmCon assertEquals("Foo2", ormContextConverter.getConverterClass()); assertEquals("myConverter2", ormContextConverter.getName()); assertEquals(1, resourceMappedSuperclass.getConverters().size()); - assertEquals(1, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(1, CollectionTools.size(persistenceUnit.getAllConverters())); //remove a converter from the resource model, check context model resourceMappedSuperclass.getConverters().remove(resourceConverter2); @@ -1590,7 +1590,7 @@ public class EclipseLink2_0OrmMappedSuperclassTests extends EclipseLink2_0OrmCon assertEquals(0, ormContextConverterHolder.getCustomConvertersSize()); assertFalse(ormContextConverterHolder.getCustomConverters().iterator().hasNext()); assertEquals(0, resourceMappedSuperclass.getConverters().size()); - assertEquals(0, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(0, CollectionTools.size(persistenceUnit.getAllConverters())); } public void testModifyCustomConverters() throws Exception { @@ -1603,7 +1603,7 @@ public class EclipseLink2_0OrmMappedSuperclassTests extends EclipseLink2_0OrmCon assertEquals(0, ormContextConverterHolder.getCustomConvertersSize()); assertEquals(0, resourceMappedSuperclass.getConverters().size()); - assertEquals(0, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(0, CollectionTools.size(persistenceUnit.getAllConverters())); //add a converter to the context model, check resource model EclipseLinkCustomConverter contextConverter = ormContextConverterHolder.addCustomConverter(0); @@ -1618,7 +1618,7 @@ public class EclipseLink2_0OrmMappedSuperclassTests extends EclipseLink2_0OrmCon EclipseLinkCustomConverter ormContextConverter = ormContextConverters.next(); assertEquals("Foo", ormContextConverter.getConverterClass()); assertEquals("myConverter", ormContextConverter.getName()); - assertEquals(1, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(1, CollectionTools.size(persistenceUnit.getAllConverters())); //add another converter to the context model, check resource model EclipseLinkCustomConverter contextConverter2 = ormContextConverterHolder.addCustomConverter(0); @@ -1638,7 +1638,7 @@ public class EclipseLink2_0OrmMappedSuperclassTests extends EclipseLink2_0OrmCon ormContextConverter = ormContextConverters.next(); assertEquals("Foo", ormContextConverter.getConverterClass()); assertEquals("myConverter", ormContextConverter.getName()); - assertEquals(2, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(2, CollectionTools.size(persistenceUnit.getAllConverters())); //move a converter in the context model, check resource model ormContextConverterHolder.moveCustomConverter(0, 1); @@ -1656,7 +1656,7 @@ public class EclipseLink2_0OrmMappedSuperclassTests extends EclipseLink2_0OrmCon ormContextConverter = ormContextConverters.next(); assertEquals("Foo2", ormContextConverter.getConverterClass()); assertEquals("myConverter2", ormContextConverter.getName()); - assertEquals(2, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(2, CollectionTools.size(persistenceUnit.getAllConverters())); //remove a converter from the context model, check resource model ormContextConverterHolder.removeCustomConverter(0); @@ -1669,7 +1669,7 @@ public class EclipseLink2_0OrmMappedSuperclassTests extends EclipseLink2_0OrmCon ormContextConverter = ormContextConverters.next(); assertEquals("Foo2", ormContextConverter.getConverterClass()); assertEquals("myConverter2", ormContextConverter.getName()); - assertEquals(1, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(1, CollectionTools.size(persistenceUnit.getAllConverters())); //remove a converter from the context model, check resource model ormContextConverterHolder.removeCustomConverter(contextConverter2); @@ -1677,7 +1677,7 @@ public class EclipseLink2_0OrmMappedSuperclassTests extends EclipseLink2_0OrmCon assertEquals(0, ormContextConverterHolder.getCustomConvertersSize()); assertFalse(ormContextConverterHolder.getCustomConverters().iterator().hasNext()); assertEquals(0, resourceMappedSuperclass.getConverters().size()); - assertEquals(0, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(0, CollectionTools.size(persistenceUnit.getAllConverters())); } public void testUpdateTypeConverters() throws Exception { @@ -1690,7 +1690,7 @@ public class EclipseLink2_0OrmMappedSuperclassTests extends EclipseLink2_0OrmCon assertEquals(0, ormContextConverterHolder.getTypeConvertersSize()); assertEquals(0, resourceMappedSuperclass.getTypeConverters().size()); - assertEquals(0, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(0, CollectionTools.size(persistenceUnit.getAllConverters())); //add a converter to the resource model, check context model XmlTypeConverter resourceTypeConverter = EclipseLinkOrmFactory.eINSTANCE.createXmlTypeConverter(); @@ -1704,7 +1704,7 @@ public class EclipseLink2_0OrmMappedSuperclassTests extends EclipseLink2_0OrmCon assertEquals("Foo", ormContextTypeConverter.getDataType()); assertEquals("myTypeConverter", ormContextTypeConverter.getName()); assertEquals(1, resourceMappedSuperclass.getTypeConverters().size()); - assertEquals(1, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(1, CollectionTools.size(persistenceUnit.getAllConverters())); //add another converter to the resource model, check context model XmlTypeConverter resourceTypeConverter2 = EclipseLinkOrmFactory.eINSTANCE.createXmlTypeConverter(); @@ -1721,7 +1721,7 @@ public class EclipseLink2_0OrmMappedSuperclassTests extends EclipseLink2_0OrmCon assertEquals("Foo", ormContextTypeConverter.getDataType()); assertEquals("myTypeConverter", ormContextTypeConverter.getName()); assertEquals(2, resourceMappedSuperclass.getTypeConverters().size()); - assertEquals(2, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(2, CollectionTools.size(persistenceUnit.getAllConverters())); //move a converter in the resource model, check context model resourceMappedSuperclass.getTypeConverters().move(0, 1); @@ -1735,7 +1735,7 @@ public class EclipseLink2_0OrmMappedSuperclassTests extends EclipseLink2_0OrmCon assertEquals("Foo2", ormContextTypeConverter.getDataType()); assertEquals("myTypeConverter2", ormContextTypeConverter.getName()); assertEquals(2, resourceMappedSuperclass.getTypeConverters().size()); - assertEquals(2, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(2, CollectionTools.size(persistenceUnit.getAllConverters())); //remove a converter from the resource model, check context model resourceMappedSuperclass.getTypeConverters().remove(0); @@ -1746,7 +1746,7 @@ public class EclipseLink2_0OrmMappedSuperclassTests extends EclipseLink2_0OrmCon assertEquals("Foo2", ormContextTypeConverter.getDataType()); assertEquals("myTypeConverter2", ormContextTypeConverter.getName()); assertEquals(1, resourceMappedSuperclass.getTypeConverters().size()); - assertEquals(1, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(1, CollectionTools.size(persistenceUnit.getAllConverters())); //remove a converter from the resource model, check context model resourceMappedSuperclass.getTypeConverters().remove(resourceTypeConverter2); @@ -1754,7 +1754,7 @@ public class EclipseLink2_0OrmMappedSuperclassTests extends EclipseLink2_0OrmCon assertEquals(0, ormContextConverterHolder.getTypeConvertersSize()); assertFalse(ormContextConverterHolder.getTypeConverters().iterator().hasNext()); assertEquals(0, resourceMappedSuperclass.getTypeConverters().size()); - assertEquals(0, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(0, CollectionTools.size(persistenceUnit.getAllConverters())); } public void testModifyTypeConverters() throws Exception { @@ -1767,7 +1767,7 @@ public class EclipseLink2_0OrmMappedSuperclassTests extends EclipseLink2_0OrmCon assertEquals(0, ormContextConverterHolder.getTypeConvertersSize()); assertEquals(0, resourceMappedSuperclass.getTypeConverters().size()); - assertEquals(0, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(0, CollectionTools.size(persistenceUnit.getAllConverters())); //add a converter to the context model, check resource model EclipseLinkTypeConverter contextTypeConverter = ormContextConverterHolder.addTypeConverter(0); @@ -1782,7 +1782,7 @@ public class EclipseLink2_0OrmMappedSuperclassTests extends EclipseLink2_0OrmCon EclipseLinkTypeConverter ormContextTypeConverter = ormContextTypeConverters.next(); assertEquals("Foo", ormContextTypeConverter.getDataType()); assertEquals("myTypeConverter", ormContextTypeConverter.getName()); - assertEquals(1, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(1, CollectionTools.size(persistenceUnit.getAllConverters())); //add another converter to the context model, check resource model EclipseLinkTypeConverter contextTypeConverter2 = ormContextConverterHolder.addTypeConverter(0); @@ -1802,7 +1802,7 @@ public class EclipseLink2_0OrmMappedSuperclassTests extends EclipseLink2_0OrmCon ormContextTypeConverter = ormContextTypeConverters.next(); assertEquals("Foo", ormContextTypeConverter.getDataType()); assertEquals("myTypeConverter", ormContextTypeConverter.getName()); - assertEquals(2, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(2, CollectionTools.size(persistenceUnit.getAllConverters())); //move a converter in the context model, check resource model ormContextConverterHolder.moveTypeConverter(0, 1); @@ -1820,7 +1820,7 @@ public class EclipseLink2_0OrmMappedSuperclassTests extends EclipseLink2_0OrmCon ormContextTypeConverter = ormContextTypeConverters.next(); assertEquals("Foo2", ormContextTypeConverter.getDataType()); assertEquals("myTypeConverter2", ormContextTypeConverter.getName()); - assertEquals(2, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(2, CollectionTools.size(persistenceUnit.getAllConverters())); //remove a converter from the context model, check resource model ormContextConverterHolder.removeTypeConverter(0); @@ -1833,7 +1833,7 @@ public class EclipseLink2_0OrmMappedSuperclassTests extends EclipseLink2_0OrmCon ormContextTypeConverter = ormContextTypeConverters.next(); assertEquals("Foo2", ormContextTypeConverter.getDataType()); assertEquals("myTypeConverter2", ormContextTypeConverter.getName()); - assertEquals(1, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(1, CollectionTools.size(persistenceUnit.getAllConverters())); //remove a converter from the context model, check resource model ormContextConverterHolder.removeTypeConverter(contextTypeConverter2); @@ -1841,7 +1841,7 @@ public class EclipseLink2_0OrmMappedSuperclassTests extends EclipseLink2_0OrmCon assertEquals(0, ormContextConverterHolder.getTypeConvertersSize()); assertFalse(ormContextConverterHolder.getTypeConverters().iterator().hasNext()); assertEquals(0, resourceMappedSuperclass.getTypeConverters().size()); - assertEquals(0, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(0, CollectionTools.size(persistenceUnit.getAllConverters())); } public void testUpdateObjectTypeConverters() throws Exception { @@ -1854,7 +1854,7 @@ public class EclipseLink2_0OrmMappedSuperclassTests extends EclipseLink2_0OrmCon assertEquals(0, ormContextConverterHolder.getObjectTypeConvertersSize()); assertEquals(0, resourceMappedSuperclass.getObjectTypeConverters().size()); - assertEquals(0, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(0, CollectionTools.size(persistenceUnit.getAllConverters())); //add a converter to the resource model, check context model XmlObjectTypeConverter resourceObjectTypeConverter = EclipseLinkOrmFactory.eINSTANCE.createXmlObjectTypeConverter(); @@ -1868,7 +1868,7 @@ public class EclipseLink2_0OrmMappedSuperclassTests extends EclipseLink2_0OrmCon assertEquals("Foo", ormContextObjectTypeConverter.getDataType()); assertEquals("myObjectTypeConverter", ormContextObjectTypeConverter.getName()); assertEquals(1, resourceMappedSuperclass.getObjectTypeConverters().size()); - assertEquals(1, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(1, CollectionTools.size(persistenceUnit.getAllConverters())); //add another converter to the resource model, check context model XmlObjectTypeConverter resourceObjectTypeConverter2 = EclipseLinkOrmFactory.eINSTANCE.createXmlObjectTypeConverter(); @@ -1885,7 +1885,7 @@ public class EclipseLink2_0OrmMappedSuperclassTests extends EclipseLink2_0OrmCon assertEquals("Foo", ormContextObjectTypeConverter.getDataType()); assertEquals("myObjectTypeConverter", ormContextObjectTypeConverter.getName()); assertEquals(2, resourceMappedSuperclass.getObjectTypeConverters().size()); - assertEquals(2, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(2, CollectionTools.size(persistenceUnit.getAllConverters())); //move a converter in the resource model, check context model resourceMappedSuperclass.getObjectTypeConverters().move(0, 1); @@ -1899,7 +1899,7 @@ public class EclipseLink2_0OrmMappedSuperclassTests extends EclipseLink2_0OrmCon assertEquals("Foo2", ormContextObjectTypeConverter.getDataType()); assertEquals("myObjectTypeConverter2", ormContextObjectTypeConverter.getName()); assertEquals(2, resourceMappedSuperclass.getObjectTypeConverters().size()); - assertEquals(2, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(2, CollectionTools.size(persistenceUnit.getAllConverters())); //remove a converter from the resource model, check context model resourceMappedSuperclass.getObjectTypeConverters().remove(0); @@ -1910,7 +1910,7 @@ public class EclipseLink2_0OrmMappedSuperclassTests extends EclipseLink2_0OrmCon assertEquals("Foo2", ormContextObjectTypeConverter.getDataType()); assertEquals("myObjectTypeConverter2", ormContextObjectTypeConverter.getName()); assertEquals(1, resourceMappedSuperclass.getObjectTypeConverters().size()); - assertEquals(1, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(1, CollectionTools.size(persistenceUnit.getAllConverters())); //remove a converter from the resource model, check context model resourceMappedSuperclass.getObjectTypeConverters().remove(resourceObjectTypeConverter2); @@ -1918,7 +1918,7 @@ public class EclipseLink2_0OrmMappedSuperclassTests extends EclipseLink2_0OrmCon assertEquals(0, ormContextConverterHolder.getObjectTypeConvertersSize()); assertFalse(ormContextConverterHolder.getObjectTypeConverters().iterator().hasNext()); assertEquals(0, resourceMappedSuperclass.getObjectTypeConverters().size()); - assertEquals(0, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(0, CollectionTools.size(persistenceUnit.getAllConverters())); } public void testModifyObjectTypeConverters() throws Exception { @@ -1931,7 +1931,7 @@ public class EclipseLink2_0OrmMappedSuperclassTests extends EclipseLink2_0OrmCon assertEquals(0, ormContextConverterHolder.getObjectTypeConvertersSize()); assertEquals(0, resourceMappedSuperclass.getObjectTypeConverters().size()); - assertEquals(0, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(0, CollectionTools.size(persistenceUnit.getAllConverters())); //add a converter to the context model, check resource model EclipseLinkObjectTypeConverter contextObjectTypeConverter = ormContextConverterHolder.addObjectTypeConverter(0); @@ -1946,7 +1946,7 @@ public class EclipseLink2_0OrmMappedSuperclassTests extends EclipseLink2_0OrmCon EclipseLinkObjectTypeConverter ormContextObjectTypeConverter = ormContextObjectTypeConverters.next(); assertEquals("Foo", ormContextObjectTypeConverter.getDataType()); assertEquals("myObjectTypeConverter", ormContextObjectTypeConverter.getName()); - assertEquals(1, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(1, CollectionTools.size(persistenceUnit.getAllConverters())); //add another converter to the context model, check resource model EclipseLinkObjectTypeConverter contextObjectTypeConverter2 = ormContextConverterHolder.addObjectTypeConverter(0); @@ -1966,7 +1966,7 @@ public class EclipseLink2_0OrmMappedSuperclassTests extends EclipseLink2_0OrmCon ormContextObjectTypeConverter = ormContextObjectTypeConverters.next(); assertEquals("Foo", ormContextObjectTypeConverter.getDataType()); assertEquals("myObjectTypeConverter", ormContextObjectTypeConverter.getName()); - assertEquals(2, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(2, CollectionTools.size(persistenceUnit.getAllConverters())); //move a converter in the context model, check resource model ormContextConverterHolder.moveObjectTypeConverter(0, 1); @@ -1984,7 +1984,7 @@ public class EclipseLink2_0OrmMappedSuperclassTests extends EclipseLink2_0OrmCon ormContextObjectTypeConverter = ormContextObjectTypeConverters.next(); assertEquals("Foo2", ormContextObjectTypeConverter.getDataType()); assertEquals("myObjectTypeConverter2", ormContextObjectTypeConverter.getName()); - assertEquals(2, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(2, CollectionTools.size(persistenceUnit.getAllConverters())); //remove a converter from the context model, check resource model ormContextConverterHolder.removeObjectTypeConverter(0); @@ -1997,7 +1997,7 @@ public class EclipseLink2_0OrmMappedSuperclassTests extends EclipseLink2_0OrmCon ormContextObjectTypeConverter = ormContextObjectTypeConverters.next(); assertEquals("Foo2", ormContextObjectTypeConverter.getDataType()); assertEquals("myObjectTypeConverter2", ormContextObjectTypeConverter.getName()); - assertEquals(1, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(1, CollectionTools.size(persistenceUnit.getAllConverters())); //remove a converter from the context model, check resource model ormContextConverterHolder.removeObjectTypeConverter(contextObjectTypeConverter2); @@ -2005,7 +2005,7 @@ public class EclipseLink2_0OrmMappedSuperclassTests extends EclipseLink2_0OrmCon assertEquals(0, ormContextConverterHolder.getObjectTypeConvertersSize()); assertFalse(ormContextConverterHolder.getObjectTypeConverters().iterator().hasNext()); assertEquals(0, resourceMappedSuperclass.getObjectTypeConverters().size()); - assertEquals(0, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(0, CollectionTools.size(persistenceUnit.getAllConverters())); } public void testUpdateStructConverters() throws Exception { @@ -2018,7 +2018,7 @@ public class EclipseLink2_0OrmMappedSuperclassTests extends EclipseLink2_0OrmCon assertEquals(0, ormContextConverterHolder.getStructConvertersSize()); assertEquals(0, resourceMappedSuperclass.getStructConverters().size()); - assertEquals(0, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(0, CollectionTools.size(persistenceUnit.getAllConverters())); //add a converter to the resource model, check context model XmlStructConverter resourceStructConverter = EclipseLinkOrmFactory.eINSTANCE.createXmlStructConverter(); @@ -2032,7 +2032,7 @@ public class EclipseLink2_0OrmMappedSuperclassTests extends EclipseLink2_0OrmCon assertEquals("Foo", ormContextStructConverter.getConverterClass()); assertEquals("myStructConverter", ormContextStructConverter.getName()); assertEquals(1, resourceMappedSuperclass.getStructConverters().size()); - assertEquals(1, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(1, CollectionTools.size(persistenceUnit.getAllConverters())); //add another converter to the resource model, check context model XmlStructConverter resourceStructConverter2 = EclipseLinkOrmFactory.eINSTANCE.createXmlStructConverter(); @@ -2049,7 +2049,7 @@ public class EclipseLink2_0OrmMappedSuperclassTests extends EclipseLink2_0OrmCon assertEquals("Foo", ormContextStructConverter.getConverterClass()); assertEquals("myStructConverter", ormContextStructConverter.getName()); assertEquals(2, resourceMappedSuperclass.getStructConverters().size()); - assertEquals(2, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(2, CollectionTools.size(persistenceUnit.getAllConverters())); //move a converter in the resource model, check context model resourceMappedSuperclass.getStructConverters().move(0, 1); @@ -2063,7 +2063,7 @@ public class EclipseLink2_0OrmMappedSuperclassTests extends EclipseLink2_0OrmCon assertEquals("Foo2", ormContextStructConverter.getConverterClass()); assertEquals("myStructConverter2", ormContextStructConverter.getName()); assertEquals(2, resourceMappedSuperclass.getStructConverters().size()); - assertEquals(2, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(2, CollectionTools.size(persistenceUnit.getAllConverters())); //remove a converter from the resource model, check context model resourceMappedSuperclass.getStructConverters().remove(0); @@ -2074,7 +2074,7 @@ public class EclipseLink2_0OrmMappedSuperclassTests extends EclipseLink2_0OrmCon assertEquals("Foo2", ormContextStructConverter.getConverterClass()); assertEquals("myStructConverter2", ormContextStructConverter.getName()); assertEquals(1, resourceMappedSuperclass.getStructConverters().size()); - assertEquals(1, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(1, CollectionTools.size(persistenceUnit.getAllConverters())); //remove a converter from the resource model, check context model resourceMappedSuperclass.getStructConverters().remove(resourceStructConverter2); @@ -2082,7 +2082,7 @@ public class EclipseLink2_0OrmMappedSuperclassTests extends EclipseLink2_0OrmCon assertEquals(0, ormContextConverterHolder.getStructConvertersSize()); assertFalse(ormContextConverterHolder.getStructConverters().iterator().hasNext()); assertEquals(0, resourceMappedSuperclass.getStructConverters().size()); - assertEquals(0, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(0, CollectionTools.size(persistenceUnit.getAllConverters())); } public void testModifyStructConverters() throws Exception { @@ -2095,7 +2095,7 @@ public class EclipseLink2_0OrmMappedSuperclassTests extends EclipseLink2_0OrmCon assertEquals(0, ormContextConverterHolder.getStructConvertersSize()); assertEquals(0, resourceMappedSuperclass.getStructConverters().size()); - assertEquals(0, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(0, CollectionTools.size(persistenceUnit.getAllConverters())); //add a converter to the context model, check resource model EclipseLinkStructConverter contextStructConverter = ormContextConverterHolder.addStructConverter(0); @@ -2110,7 +2110,7 @@ public class EclipseLink2_0OrmMappedSuperclassTests extends EclipseLink2_0OrmCon EclipseLinkStructConverter ormContextStructConverter = ormContextStructConverters.next(); assertEquals("Foo", ormContextStructConverter.getConverterClass()); assertEquals("myStructConverter", ormContextStructConverter.getName()); - assertEquals(1, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(1, CollectionTools.size(persistenceUnit.getAllConverters())); //add another converter to the context model, check resource model EclipseLinkStructConverter contextStructConverter2 = ormContextConverterHolder.addStructConverter(0); @@ -2130,7 +2130,7 @@ public class EclipseLink2_0OrmMappedSuperclassTests extends EclipseLink2_0OrmCon ormContextStructConverter = ormContextStructConverters.next(); assertEquals("Foo", ormContextStructConverter.getConverterClass()); assertEquals("myStructConverter", ormContextStructConverter.getName()); - assertEquals(2, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(2, CollectionTools.size(persistenceUnit.getAllConverters())); //move a converter in the context model, check resource model ormContextConverterHolder.moveStructConverter(0, 1); @@ -2148,7 +2148,7 @@ public class EclipseLink2_0OrmMappedSuperclassTests extends EclipseLink2_0OrmCon ormContextStructConverter = ormContextStructConverters.next(); assertEquals("Foo2", ormContextStructConverter.getConverterClass()); assertEquals("myStructConverter2", ormContextStructConverter.getName()); - assertEquals(2, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(2, CollectionTools.size(persistenceUnit.getAllConverters())); //remove a converter from the context model, check resource model ormContextConverterHolder.removeStructConverter(0); @@ -2161,7 +2161,7 @@ public class EclipseLink2_0OrmMappedSuperclassTests extends EclipseLink2_0OrmCon ormContextStructConverter = ormContextStructConverters.next(); assertEquals("Foo2", ormContextStructConverter.getConverterClass()); assertEquals("myStructConverter2", ormContextStructConverter.getName()); - assertEquals(1, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(1, CollectionTools.size(persistenceUnit.getAllConverters())); //remove a converter from the context model, check resource model ormContextConverterHolder.removeStructConverter(contextStructConverter2); @@ -2169,7 +2169,7 @@ public class EclipseLink2_0OrmMappedSuperclassTests extends EclipseLink2_0OrmCon assertEquals(0, ormContextConverterHolder.getStructConvertersSize()); assertFalse(ormContextConverterHolder.getStructConverters().iterator().hasNext()); assertEquals(0, resourceMappedSuperclass.getStructConverters().size()); - assertEquals(0, CollectionTools.size(persistenceUnit.allConverters())); + assertEquals(0, CollectionTools.size(persistenceUnit.getAllConverters())); } public void testSetSpecifiedCacheable() throws Exception { diff --git a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/v2_0/context/orm/EclipseLink2_0OrmOneToManyMappingTests.java b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/v2_0/context/orm/EclipseLink2_0OrmOneToManyMappingTests.java index 7e36b6f41c..3642b60abc 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/v2_0/context/orm/EclipseLink2_0OrmOneToManyMappingTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/v2_0/context/orm/EclipseLink2_0OrmOneToManyMappingTests.java @@ -336,7 +336,7 @@ public class EclipseLink2_0OrmOneToManyMappingTests OneToManyMapping virtualOneToManyMapping = (OneToManyMapping) ormPersistentType.getAttributeNamed("addresses").getMapping(); Iterator<String> mapKeyNames = - virtualOneToManyMapping.candidateMapKeyNames(); + virtualOneToManyMapping.getCandidateMapKeyNames().iterator(); assertEquals("id", mapKeyNames.next()); assertEquals("city", mapKeyNames.next()); assertEquals("state", mapKeyNames.next()); @@ -358,11 +358,11 @@ public class EclipseLink2_0OrmOneToManyMappingTests OneToManyMapping virtualOneToManyMapping = (OneToManyMapping) ormPersistentType.getAttributeNamed("addresses").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()); @@ -373,11 +373,11 @@ public class EclipseLink2_0OrmOneToManyMappingTests ormPersistentType.getAttributeNamed("addresses").convertToSpecified(); OrmOneToManyMapping ormOneToManyMapping = (OrmOneToManyMapping) ormPersistentType.getAttributeNamed("addresses").getMapping(); - mapKeyNames = ormOneToManyMapping.candidateMapKeyNames(); + mapKeyNames = ormOneToManyMapping.getCandidateMapKeyNames().iterator(); assertEquals(false, mapKeyNames.hasNext()); ormOneToManyMapping.setSpecifiedTargetEntity("test.Address"); - mapKeyNames = ormOneToManyMapping.candidateMapKeyNames(); + mapKeyNames = ormOneToManyMapping.getCandidateMapKeyNames().iterator(); assertEquals("id", mapKeyNames.next()); assertEquals("city", mapKeyNames.next()); assertEquals("state", mapKeyNames.next()); @@ -387,7 +387,7 @@ public class EclipseLink2_0OrmOneToManyMappingTests assertFalse(mapKeyNames.hasNext()); ormOneToManyMapping.setSpecifiedTargetEntity("String"); - mapKeyNames = ormOneToManyMapping.candidateMapKeyNames(); + mapKeyNames = ormOneToManyMapping.getCandidateMapKeyNames().iterator(); assertEquals(false, mapKeyNames.hasNext()); } diff --git a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/v2_0/context/orm/EclipseLink2_0OrmOneToOneMappingTests.java b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/v2_0/context/orm/EclipseLink2_0OrmOneToOneMappingTests.java index 8a36665aa1..5cae3a36dd 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/v2_0/context/orm/EclipseLink2_0OrmOneToOneMappingTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/v2_0/context/orm/EclipseLink2_0OrmOneToOneMappingTests.java @@ -419,7 +419,7 @@ public class EclipseLink2_0OrmOneToOneMappingTests 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()); @@ -430,12 +430,12 @@ public class EclipseLink2_0OrmOneToOneMappingTests 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()); @@ -465,7 +465,7 @@ public class EclipseLink2_0OrmOneToOneMappingTests 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()); @@ -476,12 +476,12 @@ public class EclipseLink2_0OrmOneToOneMappingTests 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.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/v2_0/context/persistence/EclipseLink2_0OptionsTests.java b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/v2_0/context/persistence/EclipseLink2_0OptionsTests.java index f1e676a7b8..dfee68d6ec 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/v2_0/context/persistence/EclipseLink2_0OptionsTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/v2_0/context/persistence/EclipseLink2_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. @@ -110,15 +110,15 @@ public class EclipseLink2_0OptionsTests extends EclipseLink2_0PersistenceUnitTes else if (propertyName.equals(Options2_0.QUERY_TIMEOUT_PROPERTY)) modelValue = this.options.getQueryTimeout(); else if (propertyName.equals(Options2_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(Options2_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(Options2_0.VALIDATION_GROUP_PRE_REMOVE_PROPERTY)) { - ListIterator<String> iterator = this.options.validationGroupPreRemoves(); + ListIterator<String> iterator = this.options.getValidationGroupPreRemoves().iterator(); modelValue = this.getFirstElement(iterator); } else @@ -493,11 +493,11 @@ public class EclipseLink2_0OptionsTests extends EclipseLink2_0PersistenceUnitTes private int getValidationGroupSize(String propertyName) throws NoSuchFieldException { int result = 0; if (propertyName.equals(Options2_0.VALIDATION_GROUP_PRE_PERSIST_PROPERTY)) - result = this.options.validationGroupPrePersistsSize(); + result = this.options.getValidationGroupPrePersistsSize(); else if (propertyName.equals(Options2_0.VALIDATION_GROUP_PRE_UPDATE_PROPERTY)) - result = this.options.validationGroupPreUpdatesSize(); + result = this.options.getValidationGroupPreUpdatesSize(); else if (propertyName.equals(Options2_0.VALIDATION_GROUP_PRE_REMOVE_PROPERTY)) - result = this.options.validationGroupPreRemovesSize(); + result = this.options.getValidationGroupPreRemovesSize(); else this.throwMissingDefinition("verifyValidationGroupSize", propertyName); return result; diff --git a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/AddJPAEntityFeature.java b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/AddJPAEntityFeature.java index 55e69113e6..a263937836 100644 --- a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/AddJPAEntityFeature.java +++ b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/AddJPAEntityFeature.java @@ -17,7 +17,6 @@ package org.eclipse.jpt.jpadiagrameditor.ui.internal.feature; import java.util.ArrayList; import java.util.HashSet; -import java.util.Iterator; import java.util.List; import org.eclipse.graphiti.features.IFeatureProvider; import org.eclipse.graphiti.features.context.IAddContext; @@ -201,10 +200,8 @@ public class AddJPAEntityFeature extends AbstractAddShapeFeature { private boolean hasMappedSuperclassPrimaryKeyAttribute( JavaPersistentType jpt) { - Iterator<AttributeMapping> iter = ((JavaMappedSuperclass) jpt - .getMapping()).allAttributeMappings(); - while (iter.hasNext()) { - AttributeMapping map = iter.next(); + + for (AttributeMapping map : ((JavaMappedSuperclass) jpt.getMapping()).getAllAttributeMappings()) { if (map.getPrimaryKeyColumnName() != null) { return true; } diff --git a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/util/JpaArtifactFactory.java b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/util/JpaArtifactFactory.java index 3a9e40eabd..cbedab6479 100644 --- a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/util/JpaArtifactFactory.java +++ b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/util/JpaArtifactFactory.java @@ -271,9 +271,7 @@ public class JpaArtifactFactory { PersistenceUnit pu = getPersistenceUnit(jpt); String embeddableTypeName = ids[0].getTypeName(); Embeddable emb = pu.getEmbeddable(embeddableTypeName); - Iterator<AttributeMapping> amIt = emb.allAttributeMappings(); - while (amIt.hasNext()) { - AttributeMapping am = amIt.next(); + for (AttributeMapping am : emb.getAllAttributeMappings()) { JoinColumnAnnotation jc = (JoinColumnAnnotation) jpa.getResourceAttribute().addAnnotation(jpa.getResourceAttribute().getAnnotationsSize(JoinColumnAnnotation.ANNOTATION_NAME), JoinColumnAnnotation.ANNOTATION_NAME); JavaPersistentAttribute at = (JavaPersistentAttribute) am .getPersistentAttribute(); diff --git a/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/relation/CreateRelationsTest.java b/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/relation/CreateRelationsTest.java index 28eeb8ebe0..ffcc157fed 100644 --- a/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/relation/CreateRelationsTest.java +++ b/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/relation/CreateRelationsTest.java @@ -502,13 +502,13 @@ public class CreateRelationsTest { Embeddable emb = JpaArtifactFactory.instance().getPersistenceUnit(t1).getEmbeddable("com.test.EmployeerId"); - Iterator<AttributeMapping> embIt = emb.allAttributeMappings(); + Iterator<AttributeMapping> embIt = emb.getAllAttributeMappings().iterator(); int c1 = 0; while ((embIt.hasNext() == false) && (c1 < MAX_NUM_OF_ITERATIONS)) { Thread.sleep(200); jpa20Project.update(null); emb.update(); - embIt = emb.allAttributeMappings(); + embIt = emb.getAllAttributeMappings().iterator(); c1++; } |