diff options
author | pfullbright | 2009-08-21 21:03:02 +0000 |
---|---|---|
committer | pfullbright | 2009-08-21 21:03:02 +0000 |
commit | bde928793a90c6824b2449e0402bc47f026ec89f (patch) | |
tree | d7a669410327ea178e854803588be3938a3f73b1 /jpa/tests/org.eclipse.jpt.core.tests/src | |
parent | a84f3f1800af29e2cd54c9cf20f1c650bb59d1bd (diff) | |
download | webtools.dali-bde928793a90c6824b2449e0402bc47f026ec89f.tar.gz webtools.dali-bde928793a90c6824b2449e0402bc47f026ec89f.tar.xz webtools.dali-bde928793a90c6824b2449e0402bc47f026ec89f.zip |
Big hunk of derived id prework - small tweaks to follow
Diffstat (limited to 'jpa/tests/org.eclipse.jpt.core.tests/src')
88 files changed, 2229 insertions, 2199 deletions
diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/GenericJavaPersistentAttributeTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/GenericJavaPersistentAttributeTests.java index 0b1d6092be..1eb04af10c 100644 --- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/GenericJavaPersistentAttributeTests.java +++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/GenericJavaPersistentAttributeTests.java @@ -145,8 +145,7 @@ public class GenericJavaPersistentAttributeTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - assertNotNull(attributeResource.getMappingAnnotation()); - assertTrue(attributeResource.getMappingAnnotation() instanceof EmbeddedAnnotation); + assertNotNull(attributeResource.getAnnotation(EmbeddedAnnotation.ANNOTATION_NAME)); assertEquals(MappingKeys.EMBEDDED_ATTRIBUTE_MAPPING_KEY, persistentAttribute.getMappingKey()); assertTrue(persistentAttribute.getSpecifiedMapping() instanceof JavaEmbeddedMapping); @@ -163,8 +162,7 @@ public class GenericJavaPersistentAttributeTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - assertNotNull(attributeResource.getMappingAnnotation()); - assertTrue(attributeResource.getMappingAnnotation() instanceof EmbeddedAnnotation); + assertNotNull(attributeResource.getAnnotation(EmbeddedAnnotation.ANNOTATION_NAME)); assertEquals(MappingKeys.EMBEDDED_ATTRIBUTE_MAPPING_KEY, persistentAttribute.getMappingKey()); assertTrue(persistentAttribute.getSpecifiedMapping() instanceof JavaEmbeddedMapping); @@ -181,8 +179,7 @@ public class GenericJavaPersistentAttributeTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - assertNull(attributeResource.getMappingAnnotation()); - assertNull(attributeResource.getMappingAnnotation(IdAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(IdAnnotation.ANNOTATION_NAME)); assertNull(persistentAttribute.getSpecifiedMapping()); } @@ -196,8 +193,8 @@ public class GenericJavaPersistentAttributeTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - attributeResource.setMappingAnnotation(EmbeddedAnnotation.ANNOTATION_NAME); - + attributeResource.setPrimaryAnnotation(EmbeddedAnnotation.ANNOTATION_NAME, new String[0]); + assertEquals(MappingKeys.EMBEDDED_ATTRIBUTE_MAPPING_KEY, persistentAttribute.getMappingKey()); } @@ -210,7 +207,7 @@ public class GenericJavaPersistentAttributeTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - attributeResource.setMappingAnnotation(BasicAnnotation.ANNOTATION_NAME); + attributeResource.setPrimaryAnnotation(BasicAnnotation.ANNOTATION_NAME, new String[0]); assertEquals(MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY, persistentAttribute.getSpecifiedMapping().getKey()); } diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/GenericJavaPersistentTypeTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/GenericJavaPersistentTypeTests.java index 65484b8879..ab2dc13a4c 100644 --- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/GenericJavaPersistentTypeTests.java +++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/GenericJavaPersistentTypeTests.java @@ -558,8 +558,7 @@ public class GenericJavaPersistentTypeTests extends ContextModelTestCase getJavaPersistentType().setMappingKey(MappingKeys.ENTITY_TYPE_MAPPING_KEY); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - assertNotNull(typeResource.getMappingAnnotation()); - assertTrue(typeResource.getMappingAnnotation() instanceof EntityAnnotation); + assertNotNull(typeResource.getAnnotation(EntityAnnotation.ANNOTATION_NAME)); assertEquals(MappingKeys.ENTITY_TYPE_MAPPING_KEY, getJavaPersistentType().getMappingKey()); } @@ -573,8 +572,7 @@ public class GenericJavaPersistentTypeTests extends ContextModelTestCase getJavaPersistentType().setMappingKey(MappingKeys.EMBEDDABLE_TYPE_MAPPING_KEY); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - assertNotNull(typeResource.getMappingAnnotation()); - assertTrue(typeResource.getMappingAnnotation() instanceof EmbeddableAnnotation); + assertNotNull(typeResource.getAnnotation(EmbeddableAnnotation.ANNOTATION_NAME)); assertEquals(MappingKeys.EMBEDDABLE_TYPE_MAPPING_KEY, getJavaPersistentType().getMappingKey()); } @@ -588,8 +586,7 @@ public class GenericJavaPersistentTypeTests extends ContextModelTestCase getJavaPersistentType().setMappingKey(MappingKeys.NULL_TYPE_MAPPING_KEY); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - assertNull(typeResource.getMappingAnnotation()); - assertNull(typeResource.getMappingAnnotation(EntityAnnotation.ANNOTATION_NAME)); + assertNull(typeResource.getAnnotation(EntityAnnotation.ANNOTATION_NAME)); assertEquals(MappingKeys.NULL_TYPE_MAPPING_KEY, getJavaPersistentType().getMappingKey()); } @@ -601,7 +598,7 @@ public class GenericJavaPersistentTypeTests extends ContextModelTestCase assertEquals(MappingKeys.ENTITY_TYPE_MAPPING_KEY, getJavaPersistentType().getMappingKey()); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - typeResource.setMappingAnnotation(EmbeddableAnnotation.ANNOTATION_NAME); + typeResource.setPrimaryAnnotation(EmbeddableAnnotation.ANNOTATION_NAME, new String[0]); assertEquals(MappingKeys.EMBEDDABLE_TYPE_MAPPING_KEY, getJavaPersistentType().getMappingKey()); } @@ -613,7 +610,7 @@ public class GenericJavaPersistentTypeTests extends ContextModelTestCase assertEquals(MappingKeys.NULL_TYPE_MAPPING_KEY, getJavaPersistentType().getMappingKey()); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - typeResource.setMappingAnnotation(EntityAnnotation.ANNOTATION_NAME); + typeResource.setPrimaryAnnotation(EntityAnnotation.ANNOTATION_NAME, new String[0]); assertEquals(MappingKeys.ENTITY_TYPE_MAPPING_KEY, getJavaPersistentType().getMappingKey()); } diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/JavaAssociationOverrideTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/JavaAssociationOverrideTests.java index d175df20c4..864cc5c23f 100644 --- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/JavaAssociationOverrideTests.java +++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/JavaAssociationOverrideTests.java @@ -104,7 +104,7 @@ public class JavaAssociationOverrideTests extends ContextModelTestCase javaAssociationOverride = javaAssociationOverride.setVirtual(false); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(PACKAGE_NAME + ".AnnotationTestTypeChild"); - AssociationOverrideAnnotation associationOverrideResource = (AssociationOverrideAnnotation) typeResource.getSupportingAnnotation(JPA.ASSOCIATION_OVERRIDE); + AssociationOverrideAnnotation associationOverrideResource = (AssociationOverrideAnnotation) typeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDE); assertEquals("address", javaAssociationOverride.getName()); assertEquals("address", associationOverrideResource.getName()); @@ -124,9 +124,9 @@ public class JavaAssociationOverrideTests extends ContextModelTestCase assertEquals("FOO", javaAssociationOverride.getName()); assertEquals("FOO", associationOverrideResource.getName()); - typeResource.removeSupportingAnnotation(0, JPA.ASSOCIATION_OVERRIDE, JPA.ASSOCIATION_OVERRIDES); + typeResource.removeAnnotation(0, JPA.ASSOCIATION_OVERRIDE, JPA.ASSOCIATION_OVERRIDES); assertFalse(getJavaEntity().specifiedAssociationOverrides().hasNext()); - assertFalse(typeResource.supportingAnnotations(JPA.ASSOCIATION_OVERRIDE, JPA.ASSOCIATION_OVERRIDES).hasNext()); + assertFalse(typeResource.annotations(JPA.ASSOCIATION_OVERRIDE, JPA.ASSOCIATION_OVERRIDES).hasNext()); } public void testModifyName() throws Exception { @@ -140,7 +140,7 @@ public class JavaAssociationOverrideTests extends ContextModelTestCase javaAssociationOverride = javaAssociationOverride.setVirtual(false); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(PACKAGE_NAME + ".AnnotationTestTypeChild"); - AssociationOverrideAnnotation associationOverrideResource = (AssociationOverrideAnnotation) typeResource.getSupportingAnnotation(JPA.ASSOCIATION_OVERRIDE); + AssociationOverrideAnnotation associationOverrideResource = (AssociationOverrideAnnotation) typeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDE); assertEquals("address", javaAssociationOverride.getName()); assertEquals("address", associationOverrideResource.getName()); @@ -154,7 +154,7 @@ public class JavaAssociationOverrideTests extends ContextModelTestCase //set name to null in the context model javaAssociationOverride.setName(null); assertNull(javaAssociationOverride.getName()); - associationOverrideResource = (AssociationOverrideAnnotation) typeResource.getSupportingAnnotation(JPA.ASSOCIATION_OVERRIDE); + associationOverrideResource = (AssociationOverrideAnnotation) typeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDE); assertNull(associationOverrideResource.getName()); } @@ -170,7 +170,7 @@ public class JavaAssociationOverrideTests extends ContextModelTestCase JavaJoinColumnJoiningStrategy joiningStrategy = javaAssociationOverride.getRelationshipReference().getJoinColumnJoiningStrategy(); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(PACKAGE_NAME + ".AnnotationTestTypeChild"); - AssociationOverrideAnnotation associationOverrideResource = (AssociationOverrideAnnotation) typeResource.getSupportingAnnotation(JPA.ASSOCIATION_OVERRIDE); + AssociationOverrideAnnotation associationOverrideResource = (AssociationOverrideAnnotation) typeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDE); JavaJoinColumn joinColumn = joiningStrategy.addSpecifiedJoinColumn(0); @@ -214,7 +214,7 @@ public class JavaAssociationOverrideTests extends ContextModelTestCase JoinColumnJoiningStrategy joiningStrategy = javaAssociationOverride.getRelationshipReference().getJoinColumnJoiningStrategy(); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(PACKAGE_NAME + ".AnnotationTestTypeChild"); - AssociationOverrideAnnotation associationOverrideResource = (AssociationOverrideAnnotation) typeResource.getSupportingAnnotation(JPA.ASSOCIATION_OVERRIDE); + AssociationOverrideAnnotation associationOverrideResource = (AssociationOverrideAnnotation) typeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDE); assertEquals(1, associationOverrideResource.joinColumnsSize()); @@ -252,7 +252,7 @@ public class JavaAssociationOverrideTests extends ContextModelTestCase JavaJoinColumnJoiningStrategy joiningStrategy = javaAssociationOverride.getRelationshipReference().getJoinColumnJoiningStrategy(); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(PACKAGE_NAME + ".AnnotationTestTypeChild"); - AssociationOverrideAnnotation associationOverrideResource = (AssociationOverrideAnnotation) typeResource.getSupportingAnnotation(JPA.ASSOCIATION_OVERRIDE); + AssociationOverrideAnnotation associationOverrideResource = (AssociationOverrideAnnotation) typeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDE); joiningStrategy.addSpecifiedJoinColumn(0).setSpecifiedName("FOO"); joiningStrategy.addSpecifiedJoinColumn(1).setSpecifiedName("BAR"); @@ -295,7 +295,7 @@ public class JavaAssociationOverrideTests extends ContextModelTestCase JavaJoinColumnJoiningStrategy joiningStrategy = javaAssociationOverride.getRelationshipReference().getJoinColumnJoiningStrategy(); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(PACKAGE_NAME + ".AnnotationTestTypeChild"); - AssociationOverrideAnnotation associationOverrideResource = (AssociationOverrideAnnotation) typeResource.getSupportingAnnotation(JPA.ASSOCIATION_OVERRIDE); + AssociationOverrideAnnotation associationOverrideResource = (AssociationOverrideAnnotation) typeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDE); ListIterator<JavaJoinColumn> joinColumns = joiningStrategy.specifiedJoinColumns(); JoinColumn joinColumn = joinColumns.next(); @@ -364,7 +364,7 @@ public class JavaAssociationOverrideTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - AssociationOverrideAnnotation associationOverrideResource = (AssociationOverrideAnnotation) typeResource.getSupportingAnnotation(JPA.ASSOCIATION_OVERRIDE); + AssociationOverrideAnnotation associationOverrideResource = (AssociationOverrideAnnotation) typeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDE); associationOverrideResource.setName("FOO"); specifiedAssociationOverride = getJavaEntity().specifiedAssociationOverrides().next(); @@ -381,7 +381,7 @@ public class JavaAssociationOverrideTests extends ContextModelTestCase specifiedAssociationOverride.setName("FOO"); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - AssociationOverrideAnnotation associationOverrideResource = (AssociationOverrideAnnotation) typeResource.getSupportingAnnotation(JPA.ASSOCIATION_OVERRIDE); + AssociationOverrideAnnotation associationOverrideResource = (AssociationOverrideAnnotation) typeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDE); assertEquals("FOO", associationOverrideResource.getName()); } diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/JavaAttributeOverrideTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/JavaAttributeOverrideTests.java index 7edb9406a7..1f4d501c2c 100644 --- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/JavaAttributeOverrideTests.java +++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/JavaAttributeOverrideTests.java @@ -90,7 +90,7 @@ public class JavaAttributeOverrideTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - AttributeOverrideAnnotation attributeOverrideResource = (AttributeOverrideAnnotation) typeResource.getSupportingAnnotation(JPA.ATTRIBUTE_OVERRIDE); + AttributeOverrideAnnotation attributeOverrideResource = (AttributeOverrideAnnotation) typeResource.getAnnotation(JPA.ATTRIBUTE_OVERRIDE); attributeOverrideResource.setName("FOO"); specifiedAttributeOverride = getJavaEntity().specifiedAttributeOverrides().next(); @@ -107,7 +107,7 @@ public class JavaAttributeOverrideTests extends ContextModelTestCase specifiedAttributeOverride.setName("FOO"); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - AttributeOverrideAnnotation attributeOverrideResource = (AttributeOverrideAnnotation) typeResource.getSupportingAnnotation(JPA.ATTRIBUTE_OVERRIDE); + AttributeOverrideAnnotation attributeOverrideResource = (AttributeOverrideAnnotation) typeResource.getAnnotation(JPA.ATTRIBUTE_OVERRIDE); assertEquals("FOO", attributeOverrideResource.getName()); } @@ -122,7 +122,7 @@ public class JavaAttributeOverrideTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - AttributeOverrideAnnotation attributeOverrideResource = (AttributeOverrideAnnotation) typeResource.getSupportingAnnotation(JPA.ATTRIBUTE_OVERRIDE); + AttributeOverrideAnnotation attributeOverrideResource = (AttributeOverrideAnnotation) typeResource.getAnnotation(JPA.ATTRIBUTE_OVERRIDE); ColumnAnnotation columnResource = attributeOverrideResource.getColumn(); columnResource.setName("FOO"); @@ -141,14 +141,14 @@ public class JavaAttributeOverrideTests extends ContextModelTestCase column.setSpecifiedName("FOO"); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - AttributeOverrideAnnotation attributeOverrideResource = (AttributeOverrideAnnotation) typeResource.getSupportingAnnotation(JPA.ATTRIBUTE_OVERRIDE); + AttributeOverrideAnnotation attributeOverrideResource = (AttributeOverrideAnnotation) typeResource.getAnnotation(JPA.ATTRIBUTE_OVERRIDE); ColumnAnnotation columnResource = attributeOverrideResource.getColumn(); assertEquals("FOO", columnResource.getName()); column.setSpecifiedName(null); - attributeOverrideResource = (AttributeOverrideAnnotation) typeResource.getSupportingAnnotation(JPA.ATTRIBUTE_OVERRIDE); + attributeOverrideResource = (AttributeOverrideAnnotation) typeResource.getAnnotation(JPA.ATTRIBUTE_OVERRIDE); assertNull(attributeOverrideResource.getColumn()); assertNotNull(specifiedAttributeOverride.getColumn()); } @@ -238,7 +238,7 @@ public class JavaAttributeOverrideTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(PACKAGE_NAME + ".AnnotationTestTypeChild"); - AttributeOverrideAnnotation attributeOverrideResource = (AttributeOverrideAnnotation) typeResource.getSupportingAnnotation(JPA.ATTRIBUTE_OVERRIDE); + AttributeOverrideAnnotation attributeOverrideResource = (AttributeOverrideAnnotation) typeResource.getAnnotation(JPA.ATTRIBUTE_OVERRIDE); assertEquals("FOO", attributeOverrideResource.getColumn().getName()); assertEquals("FOO", entity.specifiedAttributeOverrides().next().getColumn().getSpecifiedName()); diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/JavaBasicMappingTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/JavaBasicMappingTests.java index 6847910211..646ea24cb6 100644 --- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/JavaBasicMappingTests.java +++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/JavaBasicMappingTests.java @@ -10,7 +10,6 @@ package org.eclipse.jpt.core.tests.internal.context.java; import java.util.Iterator; - import org.eclipse.jdt.core.ICompilationUnit; import org.eclipse.jpt.core.JptCorePlugin; import org.eclipse.jpt.core.MappingKeys; @@ -205,7 +204,7 @@ public class JavaBasicMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - BasicAnnotation basic = (BasicAnnotation) attributeResource.getMappingAnnotation(JPA.BASIC); + BasicAnnotation basic = (BasicAnnotation) attributeResource.getAnnotation(JPA.BASIC); basic.setFetch(org.eclipse.jpt.core.resource.java.FetchType.LAZY); assertEquals(FetchType.LAZY, basicMapping.getSpecifiedFetch()); @@ -233,12 +232,12 @@ public class JavaBasicMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - BasicAnnotation basic = (BasicAnnotation) attributeResource.getMappingAnnotation(JPA.BASIC); + BasicAnnotation basic = (BasicAnnotation) attributeResource.getAnnotation(JPA.BASIC); assertEquals(org.eclipse.jpt.core.resource.java.FetchType.LAZY, basic.getFetch()); basicMapping.setSpecifiedFetch(null); - assertNotNull(attributeResource.getMappingAnnotation(JPA.BASIC)); + assertNotNull(attributeResource.getAnnotation(JPA.BASIC)); } public void testSetSpecifiedFetch2() throws Exception { @@ -256,7 +255,7 @@ public class JavaBasicMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableProperties().next(); - BasicAnnotation basic = (BasicAnnotation) attributeResource.getMappingAnnotation(JPA.BASIC); + BasicAnnotation basic = (BasicAnnotation) attributeResource.getAnnotation(JPA.BASIC); assertEquals(org.eclipse.jpt.core.resource.java.FetchType.LAZY, basic.getFetch()); @@ -265,7 +264,7 @@ public class JavaBasicMappingTests extends ContextModelTestCase assertFalse(basicMapping.isDefault()); basicMapping.setSpecifiedFetch(null); - assertNotNull(attributeResource.getMappingAnnotation(JPA.BASIC)); + assertNotNull(attributeResource.getAnnotation(JPA.BASIC)); basicMapping = (BasicMapping) persistentAttribute.getMapping(); assertFalse(basicMapping.isDefault()); @@ -278,7 +277,7 @@ public class JavaBasicMappingTests extends ContextModelTestCase getPersistenceXmlResource().save(null); } - public void testSetBasicRemovedFromResourceModel() throws Exception { + public void testSetBasicToDefault() throws Exception { createTestEntityWithBasicMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); @@ -286,26 +285,28 @@ public class JavaBasicMappingTests extends ContextModelTestCase BasicMapping basicMapping = (BasicMapping) persistentAttribute.getMapping(); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); + assertFalse(basicMapping.isDefault()); + basicMapping.getColumn().setSpecifiedName("FOO"); - attributeResource.addSupportingAnnotation(TemporalAnnotation.ANNOTATION_NAME); - attributeResource.addSupportingAnnotation(LobAnnotation.ANNOTATION_NAME); - attributeResource.addSupportingAnnotation(EnumeratedAnnotation.ANNOTATION_NAME); + attributeResource.addAnnotation(TemporalAnnotation.ANNOTATION_NAME); + attributeResource.addAnnotation(LobAnnotation.ANNOTATION_NAME); + attributeResource.addAnnotation(EnumeratedAnnotation.ANNOTATION_NAME); + assertFalse(basicMapping.isDefault()); - attributeResource.setMappingAnnotation(null); + persistentAttribute.setSpecifiedMappingKey(MappingKeys.NULL_ATTRIBUTE_MAPPING_KEY); assertNotSame(basicMapping, persistentAttribute.getMapping()); basicMapping = (BasicMapping) persistentAttribute.getMapping(); + assertTrue(basicMapping.isDefault()); assertEquals("FOO", basicMapping.getColumn().getSpecifiedName()); - - - assertNotNull(attributeResource.getSupportingAnnotation(ColumnAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getSupportingAnnotation(TemporalAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getSupportingAnnotation(LobAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getSupportingAnnotation(EnumeratedAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getAnnotation(ColumnAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getAnnotation(TemporalAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getAnnotation(LobAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getAnnotation(EnumeratedAnnotation.ANNOTATION_NAME)); } public void testBasicMorphToDefaultBasic() throws Exception { @@ -320,8 +321,8 @@ public class JavaBasicMappingTests extends ContextModelTestCase basicMapping.getColumn().setSpecifiedName("FOO"); basicMapping.setSpecifiedConverter(Converter.ENUMERATED_CONVERTER); ((EnumeratedConverter) basicMapping.getSpecifiedConverter()).setSpecifiedEnumType(EnumType.STRING); - attributeResource.addSupportingAnnotation(LobAnnotation.ANNOTATION_NAME); - attributeResource.addSupportingAnnotation(TemporalAnnotation.ANNOTATION_NAME); + attributeResource.addAnnotation(LobAnnotation.ANNOTATION_NAME); + attributeResource.addAnnotation(TemporalAnnotation.ANNOTATION_NAME); basicMapping.setSpecifiedFetch(FetchType.EAGER); basicMapping.setSpecifiedOptional(Boolean.FALSE); assertFalse(basicMapping.isDefault()); @@ -332,11 +333,11 @@ public class JavaBasicMappingTests extends ContextModelTestCase assertNull(((BasicMapping) persistentAttribute.getMapping()).getSpecifiedFetch()); assertNull(((BasicMapping) persistentAttribute.getMapping()).getSpecifiedOptional()); - assertNull(attributeResource.getMappingAnnotation(BasicAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getSupportingAnnotation(ColumnAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getSupportingAnnotation(TemporalAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getSupportingAnnotation(LobAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getSupportingAnnotation(EnumeratedAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(BasicAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getAnnotation(ColumnAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getAnnotation(TemporalAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getAnnotation(LobAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getAnnotation(EnumeratedAnnotation.ANNOTATION_NAME)); } public void testBasicMorphToId() throws Exception { @@ -351,8 +352,8 @@ public class JavaBasicMappingTests extends ContextModelTestCase basicMapping.getColumn().setSpecifiedName("FOO"); basicMapping.setSpecifiedConverter(Converter.TEMPORAL_CONVERTER); ((TemporalConverter) basicMapping.getSpecifiedConverter()).setTemporalType(TemporalType.TIME); - attributeResource.addSupportingAnnotation(LobAnnotation.ANNOTATION_NAME); - attributeResource.addSupportingAnnotation(EnumeratedAnnotation.ANNOTATION_NAME); + attributeResource.addAnnotation(LobAnnotation.ANNOTATION_NAME); + attributeResource.addAnnotation(EnumeratedAnnotation.ANNOTATION_NAME); basicMapping.setSpecifiedFetch(FetchType.EAGER); basicMapping.setSpecifiedOptional(Boolean.FALSE); assertFalse(basicMapping.isDefault()); @@ -361,12 +362,12 @@ public class JavaBasicMappingTests extends ContextModelTestCase assertEquals("FOO", ((IdMapping) persistentAttribute.getMapping()).getColumn().getSpecifiedName()); assertEquals(TemporalType.TIME, ((TemporalConverter) ((IdMapping) persistentAttribute.getMapping()).getSpecifiedConverter()).getTemporalType()); - assertNull(attributeResource.getMappingAnnotation(BasicAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getMappingAnnotation(IdAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getSupportingAnnotation(ColumnAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getSupportingAnnotation(TemporalAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getSupportingAnnotation(LobAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getSupportingAnnotation(EnumeratedAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(BasicAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getAnnotation(IdAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getAnnotation(ColumnAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getAnnotation(TemporalAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(LobAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(EnumeratedAnnotation.ANNOTATION_NAME)); } public void testBasicMorphToVersion() throws Exception { @@ -381,20 +382,20 @@ public class JavaBasicMappingTests extends ContextModelTestCase basicMapping.getColumn().setSpecifiedName("FOO"); basicMapping.setSpecifiedConverter(Converter.TEMPORAL_CONVERTER); ((TemporalConverter) basicMapping.getSpecifiedConverter()).setTemporalType(TemporalType.TIME); - attributeResource.addSupportingAnnotation(LobAnnotation.ANNOTATION_NAME); - attributeResource.addSupportingAnnotation(EnumeratedAnnotation.ANNOTATION_NAME); + attributeResource.addAnnotation(LobAnnotation.ANNOTATION_NAME); + attributeResource.addAnnotation(EnumeratedAnnotation.ANNOTATION_NAME); assertFalse(basicMapping.isDefault()); persistentAttribute.setSpecifiedMappingKey(MappingKeys.VERSION_ATTRIBUTE_MAPPING_KEY); assertEquals("FOO", ((VersionMapping) persistentAttribute.getMapping()).getColumn().getSpecifiedName()); assertEquals(TemporalType.TIME, ((TemporalConverter) ((VersionMapping) persistentAttribute.getMapping()).getSpecifiedConverter()).getTemporalType()); - assertNull(attributeResource.getMappingAnnotation(BasicAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getMappingAnnotation(VersionAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getSupportingAnnotation(ColumnAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getSupportingAnnotation(TemporalAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getSupportingAnnotation(LobAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getSupportingAnnotation(EnumeratedAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(BasicAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getAnnotation(VersionAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getAnnotation(ColumnAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getAnnotation(TemporalAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(LobAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(EnumeratedAnnotation.ANNOTATION_NAME)); } public void testBasicMorphToEmbedded() throws Exception { @@ -407,20 +408,20 @@ public class JavaBasicMappingTests extends ContextModelTestCase JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); assertFalse(basicMapping.isDefault()); basicMapping.getColumn().setSpecifiedName("FOO"); - attributeResource.addSupportingAnnotation(TemporalAnnotation.ANNOTATION_NAME); - attributeResource.addSupportingAnnotation(LobAnnotation.ANNOTATION_NAME); - attributeResource.addSupportingAnnotation(EnumeratedAnnotation.ANNOTATION_NAME); + attributeResource.addAnnotation(TemporalAnnotation.ANNOTATION_NAME); + attributeResource.addAnnotation(LobAnnotation.ANNOTATION_NAME); + attributeResource.addAnnotation(EnumeratedAnnotation.ANNOTATION_NAME); assertFalse(basicMapping.isDefault()); persistentAttribute.setSpecifiedMappingKey(MappingKeys.EMBEDDED_ATTRIBUTE_MAPPING_KEY); assertTrue(persistentAttribute.getMapping() instanceof EmbeddedMapping); - assertNull(attributeResource.getMappingAnnotation(BasicAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getMappingAnnotation(EmbeddedAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getSupportingAnnotation(ColumnAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getSupportingAnnotation(TemporalAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getSupportingAnnotation(LobAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getSupportingAnnotation(EnumeratedAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(BasicAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getAnnotation(EmbeddedAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(ColumnAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(TemporalAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(LobAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(EnumeratedAnnotation.ANNOTATION_NAME)); } public void testBasicMorphToEmbeddedId() throws Exception { @@ -433,20 +434,20 @@ public class JavaBasicMappingTests extends ContextModelTestCase JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); assertFalse(basicMapping.isDefault()); basicMapping.getColumn().setSpecifiedName("FOO"); - attributeResource.addSupportingAnnotation(TemporalAnnotation.ANNOTATION_NAME); - attributeResource.addSupportingAnnotation(LobAnnotation.ANNOTATION_NAME); - attributeResource.addSupportingAnnotation(EnumeratedAnnotation.ANNOTATION_NAME); + attributeResource.addAnnotation(TemporalAnnotation.ANNOTATION_NAME); + attributeResource.addAnnotation(LobAnnotation.ANNOTATION_NAME); + attributeResource.addAnnotation(EnumeratedAnnotation.ANNOTATION_NAME); assertFalse(basicMapping.isDefault()); persistentAttribute.setSpecifiedMappingKey(MappingKeys.EMBEDDED_ID_ATTRIBUTE_MAPPING_KEY); assertTrue(persistentAttribute.getMapping() instanceof EmbeddedIdMapping); - assertNull(attributeResource.getMappingAnnotation(BasicAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getMappingAnnotation(EmbeddedIdAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getSupportingAnnotation(ColumnAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getSupportingAnnotation(TemporalAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getSupportingAnnotation(LobAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getSupportingAnnotation(EnumeratedAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(BasicAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getAnnotation(EmbeddedIdAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(ColumnAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(TemporalAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(LobAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(EnumeratedAnnotation.ANNOTATION_NAME)); } public void testBasicMorphToTransient() throws Exception { @@ -459,20 +460,20 @@ public class JavaBasicMappingTests extends ContextModelTestCase JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); assertFalse(basicMapping.isDefault()); basicMapping.getColumn().setSpecifiedName("FOO"); - attributeResource.addSupportingAnnotation(TemporalAnnotation.ANNOTATION_NAME); - attributeResource.addSupportingAnnotation(LobAnnotation.ANNOTATION_NAME); - attributeResource.addSupportingAnnotation(EnumeratedAnnotation.ANNOTATION_NAME); + attributeResource.addAnnotation(TemporalAnnotation.ANNOTATION_NAME); + attributeResource.addAnnotation(LobAnnotation.ANNOTATION_NAME); + attributeResource.addAnnotation(EnumeratedAnnotation.ANNOTATION_NAME); assertFalse(basicMapping.isDefault()); persistentAttribute.setSpecifiedMappingKey(MappingKeys.TRANSIENT_ATTRIBUTE_MAPPING_KEY); assertTrue(persistentAttribute.getMapping() instanceof TransientMapping); - assertNull(attributeResource.getMappingAnnotation(BasicAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getMappingAnnotation(TransientAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getSupportingAnnotation(ColumnAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getSupportingAnnotation(TemporalAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getSupportingAnnotation(LobAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getSupportingAnnotation(EnumeratedAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(BasicAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getAnnotation(TransientAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(ColumnAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(TemporalAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(LobAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(EnumeratedAnnotation.ANNOTATION_NAME)); } public void testBasicMorphToOneToOne() throws Exception { @@ -485,9 +486,9 @@ public class JavaBasicMappingTests extends ContextModelTestCase JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); assertFalse(basicMapping.isDefault()); basicMapping.getColumn().setSpecifiedName("FOO"); - attributeResource.addSupportingAnnotation(TemporalAnnotation.ANNOTATION_NAME); - attributeResource.addSupportingAnnotation(LobAnnotation.ANNOTATION_NAME); - attributeResource.addSupportingAnnotation(EnumeratedAnnotation.ANNOTATION_NAME); + attributeResource.addAnnotation(TemporalAnnotation.ANNOTATION_NAME); + attributeResource.addAnnotation(LobAnnotation.ANNOTATION_NAME); + attributeResource.addAnnotation(EnumeratedAnnotation.ANNOTATION_NAME); basicMapping.setSpecifiedFetch(FetchType.EAGER); basicMapping.setSpecifiedOptional(Boolean.FALSE); assertFalse(basicMapping.isDefault()); @@ -497,12 +498,12 @@ public class JavaBasicMappingTests extends ContextModelTestCase //TODO assertEquals(FetchType.EAGER, ((IOneToOneMapping) persistentAttribute.getMapping()).getSpecifiedFetch()); // assertEquals(Boolean.FALSE, ((IOneToOneMapping) persistentAttribute.getMapping()).getSpecifiedOptional()); - assertNotNull(attributeResource.getMappingAnnotation(OneToOneAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getMappingAnnotation(BasicAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getSupportingAnnotation(ColumnAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getSupportingAnnotation(TemporalAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getSupportingAnnotation(LobAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getSupportingAnnotation(EnumeratedAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getAnnotation(OneToOneAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(BasicAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(ColumnAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(TemporalAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(LobAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(EnumeratedAnnotation.ANNOTATION_NAME)); } public void testBasicMorphToOneToMany() throws Exception { @@ -515,9 +516,9 @@ public class JavaBasicMappingTests extends ContextModelTestCase JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); assertFalse(basicMapping.isDefault()); basicMapping.getColumn().setSpecifiedName("FOO"); - attributeResource.addSupportingAnnotation(TemporalAnnotation.ANNOTATION_NAME); - attributeResource.addSupportingAnnotation(LobAnnotation.ANNOTATION_NAME); - attributeResource.addSupportingAnnotation(EnumeratedAnnotation.ANNOTATION_NAME); + attributeResource.addAnnotation(TemporalAnnotation.ANNOTATION_NAME); + attributeResource.addAnnotation(LobAnnotation.ANNOTATION_NAME); + attributeResource.addAnnotation(EnumeratedAnnotation.ANNOTATION_NAME); basicMapping.setSpecifiedFetch(FetchType.EAGER); basicMapping.setSpecifiedOptional(Boolean.FALSE); assertFalse(basicMapping.isDefault()); @@ -527,11 +528,11 @@ public class JavaBasicMappingTests extends ContextModelTestCase //TODO assertEquals(FetchType.EAGER, ((IOneToManyMapping) persistentAttribute.getMapping()).getSpecifiedFetch()); // assertNotNull(attributeResource.mappingAnnotation(OneToMany.ANNOTATION_NAME)); - assertNull(attributeResource.getMappingAnnotation(BasicAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getSupportingAnnotation(ColumnAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getSupportingAnnotation(TemporalAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getSupportingAnnotation(LobAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getSupportingAnnotation(EnumeratedAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(BasicAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(ColumnAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(TemporalAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(LobAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(EnumeratedAnnotation.ANNOTATION_NAME)); } public void testBasicMorphToManyToOne() throws Exception { createTestEntityWithBasicMapping(); @@ -543,9 +544,9 @@ public class JavaBasicMappingTests extends ContextModelTestCase JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); assertFalse(basicMapping.isDefault()); basicMapping.getColumn().setSpecifiedName("FOO"); - attributeResource.addSupportingAnnotation(TemporalAnnotation.ANNOTATION_NAME); - attributeResource.addSupportingAnnotation(LobAnnotation.ANNOTATION_NAME); - attributeResource.addSupportingAnnotation(EnumeratedAnnotation.ANNOTATION_NAME); + attributeResource.addAnnotation(TemporalAnnotation.ANNOTATION_NAME); + attributeResource.addAnnotation(LobAnnotation.ANNOTATION_NAME); + attributeResource.addAnnotation(EnumeratedAnnotation.ANNOTATION_NAME); basicMapping.setSpecifiedFetch(FetchType.EAGER); basicMapping.setSpecifiedOptional(Boolean.FALSE); assertFalse(basicMapping.isDefault()); @@ -555,12 +556,12 @@ public class JavaBasicMappingTests extends ContextModelTestCase //TODO assertEquals(FetchType.EAGER, ((IManyToOneMapping) persistentAttribute.getMapping()).getSpecifiedFetch()); // assertEquals(Boolean.FALSE, ((IManyToOneMapping) persistentAttribute.getMapping()).getSpecifiedOptional()); - assertNotNull(attributeResource.getMappingAnnotation(ManyToOneAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getMappingAnnotation(BasicAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getSupportingAnnotation(ColumnAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getSupportingAnnotation(TemporalAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getSupportingAnnotation(LobAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getSupportingAnnotation(EnumeratedAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getAnnotation(ManyToOneAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(BasicAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(ColumnAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(TemporalAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(LobAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(EnumeratedAnnotation.ANNOTATION_NAME)); } public void testBasicMorphToManyToMany() throws Exception { @@ -573,9 +574,9 @@ public class JavaBasicMappingTests extends ContextModelTestCase JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); assertFalse(basicMapping.isDefault()); basicMapping.getColumn().setSpecifiedName("FOO"); - attributeResource.addSupportingAnnotation(TemporalAnnotation.ANNOTATION_NAME); - attributeResource.addSupportingAnnotation(LobAnnotation.ANNOTATION_NAME); - attributeResource.addSupportingAnnotation(EnumeratedAnnotation.ANNOTATION_NAME); + attributeResource.addAnnotation(TemporalAnnotation.ANNOTATION_NAME); + attributeResource.addAnnotation(LobAnnotation.ANNOTATION_NAME); + attributeResource.addAnnotation(EnumeratedAnnotation.ANNOTATION_NAME); basicMapping.setSpecifiedFetch(FetchType.EAGER); basicMapping.setSpecifiedOptional(Boolean.FALSE); assertFalse(basicMapping.isDefault()); @@ -585,11 +586,11 @@ public class JavaBasicMappingTests extends ContextModelTestCase //TODO assertEquals(FetchType.EAGER, ((IManyToManyMapping) persistentAttribute.getMapping()).getSpecifiedFetch()); // assertNotNull(attributeResource.mappingAnnotation(ManyToMany.ANNOTATION_NAME)); - assertNull(attributeResource.getMappingAnnotation(BasicAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getSupportingAnnotation(ColumnAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getSupportingAnnotation(TemporalAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getSupportingAnnotation(LobAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getSupportingAnnotation(EnumeratedAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(BasicAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(ColumnAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(TemporalAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(LobAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(EnumeratedAnnotation.ANNOTATION_NAME)); } public void testDefaultBasicGetDefaultOptional() throws Exception { @@ -635,7 +636,7 @@ public class JavaBasicMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - BasicAnnotation basic = (BasicAnnotation) attributeResource.getMappingAnnotation(JPA.BASIC); + BasicAnnotation basic = (BasicAnnotation) attributeResource.getAnnotation(JPA.BASIC); basic.setOptional(Boolean.FALSE); assertEquals(Boolean.FALSE, basicMapping.getSpecifiedOptional()); @@ -663,12 +664,12 @@ public class JavaBasicMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - BasicAnnotation basic = (BasicAnnotation) attributeResource.getMappingAnnotation(JPA.BASIC); + BasicAnnotation basic = (BasicAnnotation) attributeResource.getAnnotation(JPA.BASIC); assertEquals(Boolean.FALSE, basic.getOptional()); basicMapping.setSpecifiedOptional(null); - assertNotNull(attributeResource.getMappingAnnotation(JPA.BASIC)); + assertNotNull(attributeResource.getAnnotation(JPA.BASIC)); } public void testSetSpecifiedOptional2() throws Exception { @@ -684,7 +685,7 @@ public class JavaBasicMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - BasicAnnotation basic = (BasicAnnotation) attributeResource.getMappingAnnotation(JPA.BASIC); + BasicAnnotation basic = (BasicAnnotation) attributeResource.getAnnotation(JPA.BASIC); assertEquals(Boolean.TRUE, basic.getOptional()); @@ -693,7 +694,7 @@ public class JavaBasicMappingTests extends ContextModelTestCase assertFalse(basicMapping.isDefault()); basicMapping.setSpecifiedOptional(null); - assertNotNull(attributeResource.getMappingAnnotation(JPA.BASIC)); + assertNotNull(attributeResource.getAnnotation(JPA.BASIC)); basicMapping = (BasicMapping) persistentAttribute.getMapping(); assertFalse(basicMapping.isDefault()); @@ -712,7 +713,7 @@ public class JavaBasicMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - BasicAnnotation basic = (BasicAnnotation) attributeResource.getMappingAnnotation(JPA.BASIC); + BasicAnnotation basic = (BasicAnnotation) attributeResource.getAnnotation(JPA.BASIC); basic.setOptional(Boolean.FALSE); assertEquals(Boolean.FALSE, basicMapping.getSpecifiedOptional()); @@ -723,7 +724,7 @@ public class JavaBasicMappingTests extends ContextModelTestCase assertSame(basicMapping, persistentAttribute.getSpecifiedMapping()); basic.setOptional(Boolean.FALSE); - attributeResource.setMappingAnnotation(null); + attributeResource.setPrimaryAnnotation(null, new String[0]); assertNull(persistentAttribute.getSpecifiedMapping()); assertEquals(true, ((BasicMapping) persistentAttribute.getMapping()).isOptional()); @@ -761,10 +762,10 @@ public class JavaBasicMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - assertNotNull(attributeResource.getSupportingAnnotation(LobAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getAnnotation(LobAnnotation.ANNOTATION_NAME)); basicMapping.setSpecifiedConverter(null); - assertNull(attributeResource.getSupportingAnnotation(LobAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(LobAnnotation.ANNOTATION_NAME)); } public void testIsLobUpdatesFromResourceModelChange() throws Exception { @@ -778,11 +779,11 @@ public class JavaBasicMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - attributeResource.addSupportingAnnotation(LobAnnotation.ANNOTATION_NAME); + attributeResource.addAnnotation(LobAnnotation.ANNOTATION_NAME); assertTrue(basicMapping.getConverter().getType() == Converter.LOB_CONVERTER); - attributeResource.removeSupportingAnnotation(LobAnnotation.ANNOTATION_NAME); + attributeResource.removeAnnotation(LobAnnotation.ANNOTATION_NAME); assertFalse(basicMapping.getConverter().getType() == Converter.LOB_CONVERTER); } @@ -816,7 +817,7 @@ public class JavaBasicMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - EnumeratedAnnotation enumeratedAnnotation = (EnumeratedAnnotation) attributeResource.addSupportingAnnotation(EnumeratedAnnotation.ANNOTATION_NAME); + EnumeratedAnnotation enumeratedAnnotation = (EnumeratedAnnotation) attributeResource.addAnnotation(EnumeratedAnnotation.ANNOTATION_NAME); assertEquals(EnumType.ORDINAL, ((EnumeratedConverter) basicMapping.getConverter()).getDefaultEnumType()); enumeratedAnnotation.setValue(org.eclipse.jpt.core.resource.java.EnumType.STRING); @@ -845,7 +846,7 @@ public class JavaBasicMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - EnumeratedAnnotation enumerated = (EnumeratedAnnotation) attributeResource.getSupportingAnnotation(EnumeratedAnnotation.ANNOTATION_NAME); + EnumeratedAnnotation enumerated = (EnumeratedAnnotation) attributeResource.getAnnotation(EnumeratedAnnotation.ANNOTATION_NAME); assertNotNull(enumerated); assertEquals(null, enumerated.getValue()); @@ -854,11 +855,11 @@ public class JavaBasicMappingTests extends ContextModelTestCase assertEquals(org.eclipse.jpt.core.resource.java.EnumType.STRING, enumerated.getValue()); ((EnumeratedConverter) basicMapping.getConverter()).setSpecifiedEnumType(null); - assertNotNull(attributeResource.getSupportingAnnotation(EnumeratedAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getAnnotation(EnumeratedAnnotation.ANNOTATION_NAME)); assertNull(enumerated.getValue()); basicMapping.setSpecifiedConverter(Converter.NO_CONVERTER); - assertNull(attributeResource.getSupportingAnnotation(EnumeratedAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(EnumeratedAnnotation.ANNOTATION_NAME)); } public void testGetSpecifiedEnumeratedUpdatesFromResourceModelChange() throws Exception { @@ -873,13 +874,13 @@ public class JavaBasicMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - EnumeratedAnnotation enumerated = (EnumeratedAnnotation) attributeResource.addSupportingAnnotation(EnumeratedAnnotation.ANNOTATION_NAME); + EnumeratedAnnotation enumerated = (EnumeratedAnnotation) attributeResource.addAnnotation(EnumeratedAnnotation.ANNOTATION_NAME); enumerated.setValue(org.eclipse.jpt.core.resource.java.EnumType.STRING); assertEquals(EnumType.STRING, ((EnumeratedConverter) basicMapping.getConverter()).getSpecifiedEnumType()); enumerated.setValue(null); - assertNotNull(attributeResource.getSupportingAnnotation(EnumeratedAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getAnnotation(EnumeratedAnnotation.ANNOTATION_NAME)); assertNull(((EnumeratedConverter) basicMapping.getConverter()).getSpecifiedEnumType()); assertFalse(basicMapping.isDefault()); assertSame(basicMapping, persistentAttribute.getSpecifiedMapping()); @@ -891,7 +892,7 @@ public class JavaBasicMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - attributeResource.addSupportingAnnotation(TemporalAnnotation.ANNOTATION_NAME); + attributeResource.addAnnotation(TemporalAnnotation.ANNOTATION_NAME); PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); BasicMapping basicMapping = (BasicMapping) persistentAttribute.getSpecifiedMapping(); @@ -923,12 +924,12 @@ public class JavaBasicMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - TemporalAnnotation temporal = (TemporalAnnotation) attributeResource.getSupportingAnnotation(TemporalAnnotation.ANNOTATION_NAME); + TemporalAnnotation temporal = (TemporalAnnotation) attributeResource.getAnnotation(TemporalAnnotation.ANNOTATION_NAME); assertEquals(org.eclipse.jpt.core.resource.java.TemporalType.TIME, temporal.getValue()); basicMapping.setSpecifiedConverter(null); - assertNull(attributeResource.getSupportingAnnotation(TemporalAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(TemporalAnnotation.ANNOTATION_NAME)); } public void testGetTemporalUpdatesFromResourceModelChange() throws Exception { @@ -943,13 +944,13 @@ public class JavaBasicMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - TemporalAnnotation temporal = (TemporalAnnotation) attributeResource.addSupportingAnnotation(TemporalAnnotation.ANNOTATION_NAME); + TemporalAnnotation temporal = (TemporalAnnotation) attributeResource.addAnnotation(TemporalAnnotation.ANNOTATION_NAME); temporal.setValue(org.eclipse.jpt.core.resource.java.TemporalType.DATE); assertEquals(Converter.TEMPORAL_CONVERTER, basicMapping.getConverter().getType()); assertEquals(TemporalType.DATE, ((TemporalConverter) basicMapping.getConverter()).getTemporalType()); - attributeResource.removeSupportingAnnotation(TemporalAnnotation.ANNOTATION_NAME); + attributeResource.removeAnnotation(TemporalAnnotation.ANNOTATION_NAME); assertEquals(Converter.NO_CONVERTER, basicMapping.getConverter().getType()); assertFalse(basicMapping.isDefault()); @@ -968,7 +969,7 @@ public class JavaBasicMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - ColumnAnnotation column = (ColumnAnnotation) attributeResource.addSupportingAnnotation(JPA.COLUMN); + ColumnAnnotation column = (ColumnAnnotation) attributeResource.addAnnotation(JPA.COLUMN); column.setName("foo"); assertEquals("foo", basicMapping.getColumn().getSpecifiedName()); diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/JavaColumnTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/JavaColumnTests.java index 057325483f..8edb76390d 100644 --- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/JavaColumnTests.java +++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/JavaColumnTests.java @@ -168,7 +168,7 @@ public class JavaColumnTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - ColumnAnnotation column = (ColumnAnnotation) attributeResource.getSupportingAnnotation(JPA.COLUMN); + ColumnAnnotation column = (ColumnAnnotation) attributeResource.getAnnotation(JPA.COLUMN); assertEquals("foo", column.getName()); } @@ -185,7 +185,7 @@ public class JavaColumnTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - assertNull(attributeResource.getSupportingAnnotation(JPA.COLUMN)); + assertNull(attributeResource.getAnnotation(JPA.COLUMN)); } public void testGetNameUpdatesFromResourceChange() throws Exception { @@ -197,7 +197,7 @@ public class JavaColumnTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - ColumnAnnotation column = (ColumnAnnotation) attributeResource.addSupportingAnnotation(JPA.COLUMN); + ColumnAnnotation column = (ColumnAnnotation) attributeResource.addAnnotation(JPA.COLUMN); column.setName("foo"); assertEquals("foo", basicMapping.getColumn().getSpecifiedName()); @@ -276,7 +276,7 @@ public class JavaColumnTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - ColumnAnnotation column = (ColumnAnnotation) attributeResource.getSupportingAnnotation(JPA.COLUMN); + ColumnAnnotation column = (ColumnAnnotation) attributeResource.getAnnotation(JPA.COLUMN); assertEquals("foo", column.getTable()); } @@ -293,7 +293,7 @@ public class JavaColumnTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - assertNull(attributeResource.getSupportingAnnotation(JPA.COLUMN)); + assertNull(attributeResource.getAnnotation(JPA.COLUMN)); } public void testGetTableUpdatesFromResourceChange() throws Exception { @@ -305,7 +305,7 @@ public class JavaColumnTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - ColumnAnnotation column = (ColumnAnnotation) attributeResource.addSupportingAnnotation(JPA.COLUMN); + ColumnAnnotation column = (ColumnAnnotation) attributeResource.addAnnotation(JPA.COLUMN); column.setTable("foo"); assertEquals("foo", basicMapping.getColumn().getSpecifiedTable()); @@ -332,7 +332,7 @@ public class JavaColumnTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - ColumnAnnotation column = (ColumnAnnotation) attributeResource.getSupportingAnnotation(JPA.COLUMN); + ColumnAnnotation column = (ColumnAnnotation) attributeResource.getAnnotation(JPA.COLUMN); assertEquals("foo", column.getColumnDefinition()); @@ -349,7 +349,7 @@ public class JavaColumnTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - ColumnAnnotation column = (ColumnAnnotation) attributeResource.addSupportingAnnotation(JPA.COLUMN); + ColumnAnnotation column = (ColumnAnnotation) attributeResource.addAnnotation(JPA.COLUMN); column.setColumnDefinition("foo"); assertEquals("foo", basicMapping.getColumn().getColumnDefinition()); @@ -391,7 +391,7 @@ public class JavaColumnTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - ColumnAnnotation column = (ColumnAnnotation) attributeResource.addSupportingAnnotation(JPA.COLUMN); + ColumnAnnotation column = (ColumnAnnotation) attributeResource.addAnnotation(JPA.COLUMN); column.setLength(Integer.valueOf(66)); assertEquals(Integer.valueOf(66), basicMapping.getColumn().getSpecifiedLength()); @@ -399,7 +399,7 @@ public class JavaColumnTests extends ContextModelTestCase column.setLength(null); - assertNull(attributeResource.getSupportingAnnotation(JPA.COLUMN)); + assertNull(attributeResource.getAnnotation(JPA.COLUMN)); assertNull(basicMapping.getColumn().getSpecifiedLength()); } @@ -415,7 +415,7 @@ public class JavaColumnTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - ColumnAnnotation column = (ColumnAnnotation) attributeResource.getSupportingAnnotation(JPA.COLUMN); + ColumnAnnotation column = (ColumnAnnotation) attributeResource.getAnnotation(JPA.COLUMN); assertEquals(Integer.valueOf(100), column.getLength()); @@ -456,7 +456,7 @@ public class JavaColumnTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - ColumnAnnotation column = (ColumnAnnotation) attributeResource.addSupportingAnnotation(JPA.COLUMN); + ColumnAnnotation column = (ColumnAnnotation) attributeResource.addAnnotation(JPA.COLUMN); column.setPrecision(Integer.valueOf(66)); assertEquals(Integer.valueOf(66), basicMapping.getColumn().getSpecifiedPrecision()); @@ -464,7 +464,7 @@ public class JavaColumnTests extends ContextModelTestCase column.setPrecision(null); - assertNull(attributeResource.getSupportingAnnotation(JPA.COLUMN)); + assertNull(attributeResource.getAnnotation(JPA.COLUMN)); assertNull(basicMapping.getColumn().getSpecifiedPrecision()); } @@ -480,7 +480,7 @@ public class JavaColumnTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - ColumnAnnotation column = (ColumnAnnotation) attributeResource.getSupportingAnnotation(JPA.COLUMN); + ColumnAnnotation column = (ColumnAnnotation) attributeResource.getAnnotation(JPA.COLUMN); assertEquals(Integer.valueOf(100), column.getPrecision()); @@ -521,7 +521,7 @@ public class JavaColumnTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - ColumnAnnotation column = (ColumnAnnotation) attributeResource.addSupportingAnnotation(JPA.COLUMN); + ColumnAnnotation column = (ColumnAnnotation) attributeResource.addAnnotation(JPA.COLUMN); column.setScale(Integer.valueOf(66)); assertEquals(Integer.valueOf(66), basicMapping.getColumn().getSpecifiedScale()); @@ -529,7 +529,7 @@ public class JavaColumnTests extends ContextModelTestCase column.setScale(null); - assertNull(attributeResource.getSupportingAnnotation(JPA.COLUMN)); + assertNull(attributeResource.getAnnotation(JPA.COLUMN)); assertNull(basicMapping.getColumn().getSpecifiedScale()); } @@ -545,7 +545,7 @@ public class JavaColumnTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - ColumnAnnotation column = (ColumnAnnotation) attributeResource.getSupportingAnnotation(JPA.COLUMN); + ColumnAnnotation column = (ColumnAnnotation) attributeResource.getAnnotation(JPA.COLUMN); assertEquals(Integer.valueOf(100), column.getScale()); @@ -586,7 +586,7 @@ public class JavaColumnTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - ColumnAnnotation column = (ColumnAnnotation) attributeResource.addSupportingAnnotation(JPA.COLUMN); + ColumnAnnotation column = (ColumnAnnotation) attributeResource.addAnnotation(JPA.COLUMN); column.setUnique(Boolean.TRUE); assertEquals(Boolean.TRUE, basicMapping.getColumn().getSpecifiedUnique()); @@ -594,7 +594,7 @@ public class JavaColumnTests extends ContextModelTestCase column.setUnique(null); - assertNull(attributeResource.getSupportingAnnotation(JPA.COLUMN)); + assertNull(attributeResource.getAnnotation(JPA.COLUMN)); assertNull(basicMapping.getColumn().getSpecifiedUnique()); } @@ -610,7 +610,7 @@ public class JavaColumnTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - ColumnAnnotation column = (ColumnAnnotation) attributeResource.getSupportingAnnotation(JPA.COLUMN); + ColumnAnnotation column = (ColumnAnnotation) attributeResource.getAnnotation(JPA.COLUMN); assertEquals(Boolean.FALSE, column.getUnique()); @@ -651,7 +651,7 @@ public class JavaColumnTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - ColumnAnnotation column = (ColumnAnnotation) attributeResource.addSupportingAnnotation(JPA.COLUMN); + ColumnAnnotation column = (ColumnAnnotation) attributeResource.addAnnotation(JPA.COLUMN); column.setInsertable(Boolean.TRUE); assertEquals(Boolean.TRUE, basicMapping.getColumn().getSpecifiedInsertable()); @@ -659,7 +659,7 @@ public class JavaColumnTests extends ContextModelTestCase column.setInsertable(null); - assertNull(attributeResource.getSupportingAnnotation(JPA.COLUMN)); + assertNull(attributeResource.getAnnotation(JPA.COLUMN)); assertNull(basicMapping.getColumn().getSpecifiedInsertable()); } @@ -675,7 +675,7 @@ public class JavaColumnTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - ColumnAnnotation column = (ColumnAnnotation) attributeResource.getSupportingAnnotation(JPA.COLUMN); + ColumnAnnotation column = (ColumnAnnotation) attributeResource.getAnnotation(JPA.COLUMN); assertEquals(Boolean.FALSE, column.getInsertable()); @@ -716,7 +716,7 @@ public class JavaColumnTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - ColumnAnnotation column = (ColumnAnnotation) attributeResource.addSupportingAnnotation(JPA.COLUMN); + ColumnAnnotation column = (ColumnAnnotation) attributeResource.addAnnotation(JPA.COLUMN); column.setNullable(Boolean.TRUE); assertEquals(Boolean.TRUE, basicMapping.getColumn().getSpecifiedNullable()); @@ -724,7 +724,7 @@ public class JavaColumnTests extends ContextModelTestCase column.setNullable(null); - assertNull(attributeResource.getSupportingAnnotation(JPA.COLUMN)); + assertNull(attributeResource.getAnnotation(JPA.COLUMN)); assertNull(basicMapping.getColumn().getSpecifiedNullable()); } @@ -740,7 +740,7 @@ public class JavaColumnTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - ColumnAnnotation column = (ColumnAnnotation) attributeResource.getSupportingAnnotation(JPA.COLUMN); + ColumnAnnotation column = (ColumnAnnotation) attributeResource.getAnnotation(JPA.COLUMN); assertEquals(Boolean.FALSE, column.getNullable()); @@ -781,7 +781,7 @@ public class JavaColumnTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - ColumnAnnotation column = (ColumnAnnotation) attributeResource.addSupportingAnnotation(JPA.COLUMN); + ColumnAnnotation column = (ColumnAnnotation) attributeResource.addAnnotation(JPA.COLUMN); column.setUpdatable(Boolean.TRUE); assertEquals(Boolean.TRUE, basicMapping.getColumn().getSpecifiedUpdatable()); @@ -789,7 +789,7 @@ public class JavaColumnTests extends ContextModelTestCase column.setUpdatable(null); - assertNull(attributeResource.getSupportingAnnotation(JPA.COLUMN)); + assertNull(attributeResource.getAnnotation(JPA.COLUMN)); assertNull(basicMapping.getColumn().getSpecifiedUpdatable()); } @@ -805,7 +805,7 @@ public class JavaColumnTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - ColumnAnnotation column = (ColumnAnnotation) attributeResource.getSupportingAnnotation(JPA.COLUMN); + ColumnAnnotation column = (ColumnAnnotation) attributeResource.getAnnotation(JPA.COLUMN); assertEquals(Boolean.FALSE, column.getUpdatable()); diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/JavaDiscriminatorColumnTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/JavaDiscriminatorColumnTests.java index 9abd19c687..a007aee983 100644 --- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/JavaDiscriminatorColumnTests.java +++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/JavaDiscriminatorColumnTests.java @@ -164,7 +164,7 @@ public class JavaDiscriminatorColumnTests extends ContextModelTestCase assertEquals("foo", getJavaEntity().getDiscriminatorColumn().getSpecifiedName()); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - DiscriminatorColumnAnnotation discriminatorColumn = (DiscriminatorColumnAnnotation) typeResource.getSupportingAnnotation(JPA.DISCRIMINATOR_COLUMN); + DiscriminatorColumnAnnotation discriminatorColumn = (DiscriminatorColumnAnnotation) typeResource.getAnnotation(JPA.DISCRIMINATOR_COLUMN); assertEquals("foo", discriminatorColumn.getName()); } @@ -178,7 +178,7 @@ public class JavaDiscriminatorColumnTests extends ContextModelTestCase assertNull(getJavaEntity().getDiscriminatorColumn().getSpecifiedName()); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - DiscriminatorColumnAnnotation discriminatorColumn = (DiscriminatorColumnAnnotation) typeResource.getSupportingAnnotation(JPA.DISCRIMINATOR_COLUMN); + DiscriminatorColumnAnnotation discriminatorColumn = (DiscriminatorColumnAnnotation) typeResource.getAnnotation(JPA.DISCRIMINATOR_COLUMN); assertNull(discriminatorColumn); } @@ -217,7 +217,7 @@ public class JavaDiscriminatorColumnTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - DiscriminatorColumnAnnotation discriminatorColumn = (DiscriminatorColumnAnnotation) typeResource.getSupportingAnnotation(JPA.DISCRIMINATOR_COLUMN); + DiscriminatorColumnAnnotation discriminatorColumn = (DiscriminatorColumnAnnotation) typeResource.getAnnotation(JPA.DISCRIMINATOR_COLUMN); discriminatorColumn.setDiscriminatorType(org.eclipse.jpt.core.resource.java.DiscriminatorType.CHAR); assertEquals(DiscriminatorType.CHAR, getJavaEntity().getDiscriminatorColumn().getSpecifiedDiscriminatorType()); @@ -232,13 +232,13 @@ public class JavaDiscriminatorColumnTests extends ContextModelTestCase getJavaEntity().getDiscriminatorColumn().setSpecifiedDiscriminatorType(DiscriminatorType.CHAR); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - DiscriminatorColumnAnnotation discriminatorColumn = (DiscriminatorColumnAnnotation) typeResource.getSupportingAnnotation(JPA.DISCRIMINATOR_COLUMN); + DiscriminatorColumnAnnotation discriminatorColumn = (DiscriminatorColumnAnnotation) typeResource.getAnnotation(JPA.DISCRIMINATOR_COLUMN); assertEquals(org.eclipse.jpt.core.resource.java.DiscriminatorType.CHAR, discriminatorColumn.getDiscriminatorType()); getJavaEntity().getDiscriminatorColumn().setSpecifiedName(null); getJavaEntity().getDiscriminatorColumn().setSpecifiedDiscriminatorType(null); - assertNull(typeResource.getSupportingAnnotation(JPA.DISCRIMINATOR_COLUMN)); + assertNull(typeResource.getAnnotation(JPA.DISCRIMINATOR_COLUMN)); } public void testGetDiscriminatorTypeUpdatesFromResourceChange() throws Exception { @@ -248,7 +248,7 @@ public class JavaDiscriminatorColumnTests extends ContextModelTestCase assertNull(getJavaEntity().getDiscriminatorColumn().getSpecifiedDiscriminatorType()); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - DiscriminatorColumnAnnotation column = (DiscriminatorColumnAnnotation) typeResource.addSupportingAnnotation(JPA.DISCRIMINATOR_COLUMN); + DiscriminatorColumnAnnotation column = (DiscriminatorColumnAnnotation) typeResource.addAnnotation(JPA.DISCRIMINATOR_COLUMN); column.setDiscriminatorType(org.eclipse.jpt.core.resource.java.DiscriminatorType.INTEGER); assertEquals(DiscriminatorType.INTEGER, getJavaEntity().getDiscriminatorColumn().getSpecifiedDiscriminatorType()); @@ -299,7 +299,7 @@ public class JavaDiscriminatorColumnTests extends ContextModelTestCase assertNull(getJavaEntity().getDiscriminatorColumn().getSpecifiedLength()); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - DiscriminatorColumnAnnotation discriminatorColumn = (DiscriminatorColumnAnnotation) typeResource.getSupportingAnnotation(JPA.DISCRIMINATOR_COLUMN); + DiscriminatorColumnAnnotation discriminatorColumn = (DiscriminatorColumnAnnotation) typeResource.getAnnotation(JPA.DISCRIMINATOR_COLUMN); discriminatorColumn.setLength(Integer.valueOf(66)); assertEquals(Integer.valueOf(66), getJavaEntity().getDiscriminatorColumn().getSpecifiedLength()); @@ -307,7 +307,7 @@ public class JavaDiscriminatorColumnTests extends ContextModelTestCase discriminatorColumn.setName(null); discriminatorColumn.setLength(null); - assertNull(typeResource.getSupportingAnnotation(JPA.DISCRIMINATOR_COLUMN)); + assertNull(typeResource.getAnnotation(JPA.DISCRIMINATOR_COLUMN)); assertNull(getJavaEntity().getDiscriminatorColumn().getSpecifiedLength()); } @@ -320,13 +320,13 @@ public class JavaDiscriminatorColumnTests extends ContextModelTestCase getJavaEntity().getDiscriminatorColumn().setSpecifiedLength(Integer.valueOf(100)); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - DiscriminatorColumnAnnotation discriminatorColumn = (DiscriminatorColumnAnnotation) typeResource.getSupportingAnnotation(JPA.DISCRIMINATOR_COLUMN); + DiscriminatorColumnAnnotation discriminatorColumn = (DiscriminatorColumnAnnotation) typeResource.getAnnotation(JPA.DISCRIMINATOR_COLUMN); assertEquals(Integer.valueOf(100), discriminatorColumn.getLength()); getJavaEntity().getDiscriminatorColumn().setSpecifiedName(null); getJavaEntity().getDiscriminatorColumn().setSpecifiedLength(null); - assertNull(typeResource.getSupportingAnnotation(JPA.DISCRIMINATOR_COLUMN)); + assertNull(typeResource.getAnnotation(JPA.DISCRIMINATOR_COLUMN)); } public void testGetLengthUpdatesFromResourceChange() throws Exception { @@ -336,7 +336,7 @@ public class JavaDiscriminatorColumnTests extends ContextModelTestCase assertNull(getJavaEntity().getDiscriminatorColumn().getSpecifiedLength()); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - DiscriminatorColumnAnnotation column = (DiscriminatorColumnAnnotation) typeResource.addSupportingAnnotation(JPA.DISCRIMINATOR_COLUMN); + DiscriminatorColumnAnnotation column = (DiscriminatorColumnAnnotation) typeResource.addAnnotation(JPA.DISCRIMINATOR_COLUMN); column.setLength(Integer.valueOf(78)); assertEquals(Integer.valueOf(78), getJavaEntity().getDiscriminatorColumn().getSpecifiedLength()); @@ -359,7 +359,7 @@ public class JavaDiscriminatorColumnTests extends ContextModelTestCase assertNull(getJavaEntity().getDiscriminatorColumn().getColumnDefinition()); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - DiscriminatorColumnAnnotation column = (DiscriminatorColumnAnnotation) typeResource.getSupportingAnnotation(JPA.DISCRIMINATOR_COLUMN); + DiscriminatorColumnAnnotation column = (DiscriminatorColumnAnnotation) typeResource.getAnnotation(JPA.DISCRIMINATOR_COLUMN); column.setColumnDefinition(COLUMN_DEFINITION); assertEquals(COLUMN_DEFINITION, getJavaEntity().getDiscriminatorColumn().getColumnDefinition()); @@ -368,7 +368,7 @@ public class JavaDiscriminatorColumnTests extends ContextModelTestCase assertNull(getJavaEntity().getDiscriminatorColumn().getColumnDefinition()); - typeResource.removeSupportingAnnotation(JPA.DISCRIMINATOR_COLUMN); + typeResource.removeAnnotation(JPA.DISCRIMINATOR_COLUMN); } public void testSetColumnDefinition() throws Exception { @@ -378,12 +378,12 @@ public class JavaDiscriminatorColumnTests extends ContextModelTestCase getJavaEntity().getDiscriminatorColumn().setColumnDefinition("foo"); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - DiscriminatorColumnAnnotation column = (DiscriminatorColumnAnnotation) typeResource.getSupportingAnnotation(JPA.DISCRIMINATOR_COLUMN); + DiscriminatorColumnAnnotation column = (DiscriminatorColumnAnnotation) typeResource.getAnnotation(JPA.DISCRIMINATOR_COLUMN); assertEquals("foo", column.getColumnDefinition()); getJavaEntity().getDiscriminatorColumn().setColumnDefinition(null); - column = (DiscriminatorColumnAnnotation) typeResource.getSupportingAnnotation(JPA.DISCRIMINATOR_COLUMN); + column = (DiscriminatorColumnAnnotation) typeResource.getAnnotation(JPA.DISCRIMINATOR_COLUMN); assertNull(column.getColumnDefinition()); } diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/JavaEmbeddableTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/JavaEmbeddableTests.java index 176178bb91..796dffa632 100644 --- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/JavaEmbeddableTests.java +++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/JavaEmbeddableTests.java @@ -51,7 +51,7 @@ public class JavaEmbeddableTests extends ContextModelTestCase assertTrue(getJavaPersistentType().getMapping() instanceof Entity); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - assertNull(typeResource.getMappingAnnotation(EmbeddableAnnotation.ANNOTATION_NAME)); + assertNull(typeResource.getAnnotation(EmbeddableAnnotation.ANNOTATION_NAME)); } public void testMorphToMappedSuperclass() throws Exception { @@ -62,7 +62,7 @@ public class JavaEmbeddableTests extends ContextModelTestCase assertTrue(getJavaPersistentType().getMapping() instanceof MappedSuperclass); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - assertNull(typeResource.getMappingAnnotation(EmbeddableAnnotation.ANNOTATION_NAME)); + assertNull(typeResource.getAnnotation(EmbeddableAnnotation.ANNOTATION_NAME)); } public void testMorphToNull() throws Exception { @@ -73,7 +73,7 @@ public class JavaEmbeddableTests extends ContextModelTestCase assertTrue(getJavaPersistentType().getMapping() instanceof JavaNullTypeMapping); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - assertNull(typeResource.getMappingAnnotation(EmbeddableAnnotation.ANNOTATION_NAME)); + assertNull(typeResource.getAnnotation(EmbeddableAnnotation.ANNOTATION_NAME)); } public void testEmbeddable() throws Exception { diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/JavaEmbeddedIdMappingTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/JavaEmbeddedIdMappingTests.java index 22da3d88d4..49be5b1e16 100644 --- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/JavaEmbeddedIdMappingTests.java +++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/JavaEmbeddedIdMappingTests.java @@ -115,16 +115,16 @@ public class JavaEmbeddedIdMappingTests extends ContextModelTestCase EmbeddedIdMapping embeddedIdMapping = (EmbeddedIdMapping) persistentAttribute.getMapping(); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - attributeResource.addSupportingAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + attributeResource.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); assertFalse(embeddedIdMapping.isDefault()); persistentAttribute.setSpecifiedMappingKey(MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY); assertTrue(persistentAttribute.getMapping() instanceof BasicMapping); assertFalse(persistentAttribute.getMapping().isDefault()); - assertNull(attributeResource.getMappingAnnotation(EmbeddedIdAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getMappingAnnotation(BasicAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getSupportingAnnotation(AttributeOverrideAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(EmbeddedIdAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getAnnotation(BasicAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(AttributeOverrideAnnotation.ANNOTATION_NAME)); } public void testMorphToDefault() throws Exception { @@ -137,15 +137,15 @@ public class JavaEmbeddedIdMappingTests extends ContextModelTestCase EmbeddedIdMapping embeddedIdMapping = (EmbeddedIdMapping) persistentAttribute.getMapping(); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - attributeResource.addSupportingAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + attributeResource.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); assertFalse(embeddedIdMapping.isDefault()); persistentAttribute.setSpecifiedMappingKey(MappingKeys.NULL_ATTRIBUTE_MAPPING_KEY); assertTrue(((EmbeddedMapping) persistentAttribute.getMapping()).attributeOverrides().hasNext()); assertTrue(persistentAttribute.getMapping().isDefault()); - assertNull(attributeResource.getMappingAnnotation(EmbeddedIdAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getSupportingAnnotation(AttributeOverrideAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(EmbeddedIdAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getAnnotation(AttributeOverrideAnnotation.ANNOTATION_NAME)); } public void testDefaultEmbeddedIdMapping() throws Exception { @@ -175,15 +175,15 @@ public class JavaEmbeddedIdMappingTests extends ContextModelTestCase EmbeddedIdMapping embeddedIdMapping = (EmbeddedIdMapping) persistentAttribute.getMapping(); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - attributeResource.addSupportingAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + attributeResource.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); assertFalse(embeddedIdMapping.isDefault()); persistentAttribute.setSpecifiedMappingKey(MappingKeys.VERSION_ATTRIBUTE_MAPPING_KEY); assertTrue(persistentAttribute.getMapping() instanceof VersionMapping); - assertNull(attributeResource.getMappingAnnotation(EmbeddedIdAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getMappingAnnotation(VersionAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getSupportingAnnotation(AttributeOverrideAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(EmbeddedIdAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getAnnotation(VersionAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(AttributeOverrideAnnotation.ANNOTATION_NAME)); } public void testMorphToTransientMapping() throws Exception { @@ -195,15 +195,15 @@ public class JavaEmbeddedIdMappingTests extends ContextModelTestCase EmbeddedIdMapping embeddedIdMapping = (EmbeddedIdMapping) persistentAttribute.getMapping(); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - attributeResource.addSupportingAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + attributeResource.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); assertFalse(embeddedIdMapping.isDefault()); persistentAttribute.setSpecifiedMappingKey(MappingKeys.TRANSIENT_ATTRIBUTE_MAPPING_KEY); assertTrue(persistentAttribute.getMapping() instanceof TransientMapping); - assertNull(attributeResource.getMappingAnnotation(EmbeddedIdAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getMappingAnnotation(TransientAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getSupportingAnnotation(AttributeOverrideAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(EmbeddedIdAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getAnnotation(TransientAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(AttributeOverrideAnnotation.ANNOTATION_NAME)); } public void testMorphToIdMapping() throws Exception { @@ -215,15 +215,15 @@ public class JavaEmbeddedIdMappingTests extends ContextModelTestCase EmbeddedIdMapping embeddedIdMapping = (EmbeddedIdMapping) persistentAttribute.getMapping(); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - attributeResource.addSupportingAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + attributeResource.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); assertFalse(embeddedIdMapping.isDefault()); persistentAttribute.setSpecifiedMappingKey(MappingKeys.ID_ATTRIBUTE_MAPPING_KEY); assertTrue(persistentAttribute.getMapping() instanceof IdMapping); - assertNull(attributeResource.getMappingAnnotation(EmbeddedIdAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getMappingAnnotation(IdAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getSupportingAnnotation(AttributeOverrideAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(EmbeddedIdAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getAnnotation(IdAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(AttributeOverrideAnnotation.ANNOTATION_NAME)); } public void testMorphToEmbeddedMapping() throws Exception { @@ -235,15 +235,15 @@ public class JavaEmbeddedIdMappingTests extends ContextModelTestCase EmbeddedIdMapping embeddedIdMapping = (EmbeddedIdMapping) persistentAttribute.getMapping(); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - attributeResource.addSupportingAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + attributeResource.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); assertFalse(embeddedIdMapping.isDefault()); persistentAttribute.setSpecifiedMappingKey(MappingKeys.EMBEDDED_ATTRIBUTE_MAPPING_KEY); assertTrue(persistentAttribute.getMapping() instanceof EmbeddedMapping); - assertNull(attributeResource.getMappingAnnotation(EmbeddedIdAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getMappingAnnotation(EmbeddedAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getSupportingAnnotation(AttributeOverrideAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(EmbeddedIdAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getAnnotation(EmbeddedAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getAnnotation(AttributeOverrideAnnotation.ANNOTATION_NAME)); } public void testMorphToOneToOneMapping() throws Exception { @@ -255,15 +255,15 @@ public class JavaEmbeddedIdMappingTests extends ContextModelTestCase EmbeddedIdMapping embeddedIdMapping = (EmbeddedIdMapping) persistentAttribute.getMapping(); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - attributeResource.addSupportingAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + attributeResource.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); assertFalse(embeddedIdMapping.isDefault()); persistentAttribute.setSpecifiedMappingKey(MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY); assertTrue(persistentAttribute.getMapping() instanceof OneToOneMapping); - assertNull(attributeResource.getMappingAnnotation(EmbeddedIdAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getMappingAnnotation(OneToOneAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getSupportingAnnotation(AttributeOverrideAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(EmbeddedIdAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getAnnotation(OneToOneAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(AttributeOverrideAnnotation.ANNOTATION_NAME)); } public void testMorphToOneToManyMapping() throws Exception { @@ -275,15 +275,15 @@ public class JavaEmbeddedIdMappingTests extends ContextModelTestCase EmbeddedIdMapping embeddedIdMapping = (EmbeddedIdMapping) persistentAttribute.getMapping(); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - attributeResource.addSupportingAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + attributeResource.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); assertFalse(embeddedIdMapping.isDefault()); persistentAttribute.setSpecifiedMappingKey(MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY); assertTrue(persistentAttribute.getMapping() instanceof OneToManyMapping); - assertNull(attributeResource.getMappingAnnotation(EmbeddedIdAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getMappingAnnotation(OneToManyAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getSupportingAnnotation(AttributeOverrideAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(EmbeddedIdAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getAnnotation(OneToManyAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(AttributeOverrideAnnotation.ANNOTATION_NAME)); } public void testMorphToManyToOneMapping() throws Exception { @@ -295,15 +295,15 @@ public class JavaEmbeddedIdMappingTests extends ContextModelTestCase EmbeddedIdMapping embeddedIdMapping = (EmbeddedIdMapping) persistentAttribute.getMapping(); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - attributeResource.addSupportingAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + attributeResource.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); assertFalse(embeddedIdMapping.isDefault()); persistentAttribute.setSpecifiedMappingKey(MappingKeys.MANY_TO_ONE_ATTRIBUTE_MAPPING_KEY); assertTrue(persistentAttribute.getMapping() instanceof ManyToOneMapping); - assertNull(attributeResource.getMappingAnnotation(EmbeddedIdAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getMappingAnnotation(ManyToOneAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getSupportingAnnotation(AttributeOverrideAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(EmbeddedIdAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getAnnotation(ManyToOneAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(AttributeOverrideAnnotation.ANNOTATION_NAME)); } public void testMorphToManyToManyMapping() throws Exception { @@ -315,15 +315,15 @@ public class JavaEmbeddedIdMappingTests extends ContextModelTestCase EmbeddedIdMapping embeddedIdMapping = (EmbeddedIdMapping) persistentAttribute.getMapping(); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - attributeResource.addSupportingAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + attributeResource.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); assertFalse(embeddedIdMapping.isDefault()); persistentAttribute.setSpecifiedMappingKey(MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); assertTrue(persistentAttribute.getMapping() instanceof ManyToManyMapping); - assertNull(attributeResource.getMappingAnnotation(EmbeddedIdAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getMappingAnnotation(ManyToManyAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getSupportingAnnotation(AttributeOverrideAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(EmbeddedIdAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getAnnotation(ManyToManyAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(AttributeOverrideAnnotation.ANNOTATION_NAME)); } public void testSpecifiedAttributeOverrides() throws Exception { @@ -342,13 +342,13 @@ public class JavaEmbeddedIdMappingTests extends ContextModelTestCase JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); //add an annotation to the resource model and verify the context model is updated - AttributeOverrideAnnotation attributeOverride = (AttributeOverrideAnnotation) attributeResource.addSupportingAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + AttributeOverrideAnnotation attributeOverride = (AttributeOverrideAnnotation) attributeResource.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); attributeOverride.setName("FOO"); specifiedAttributeOverrides = embeddedIdMapping.specifiedAttributeOverrides(); assertEquals("FOO", specifiedAttributeOverrides.next().getName()); assertFalse(specifiedAttributeOverrides.hasNext()); - attributeOverride = (AttributeOverrideAnnotation) attributeResource.addSupportingAnnotation(1, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + attributeOverride = (AttributeOverrideAnnotation) attributeResource.addAnnotation(1, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); attributeOverride.setName("BAR"); specifiedAttributeOverrides = embeddedIdMapping.specifiedAttributeOverrides(); assertEquals("FOO", specifiedAttributeOverrides.next().getName()); @@ -356,7 +356,7 @@ public class JavaEmbeddedIdMappingTests extends ContextModelTestCase assertFalse(specifiedAttributeOverrides.hasNext()); - attributeOverride = (AttributeOverrideAnnotation) attributeResource.addSupportingAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + attributeOverride = (AttributeOverrideAnnotation) attributeResource.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); attributeOverride.setName("BAZ"); specifiedAttributeOverrides = embeddedIdMapping.specifiedAttributeOverrides(); assertEquals("BAZ", specifiedAttributeOverrides.next().getName()); @@ -365,26 +365,26 @@ public class JavaEmbeddedIdMappingTests extends ContextModelTestCase assertFalse(specifiedAttributeOverrides.hasNext()); //move an annotation to the resource model and verify the context model is updated - attributeResource.moveSupportingAnnotation(1, 0, JPA.ATTRIBUTE_OVERRIDES); + attributeResource.moveAnnotation(1, 0, JPA.ATTRIBUTE_OVERRIDES); specifiedAttributeOverrides = embeddedIdMapping.specifiedAttributeOverrides(); assertEquals("FOO", specifiedAttributeOverrides.next().getName()); assertEquals("BAZ", specifiedAttributeOverrides.next().getName()); assertEquals("BAR", specifiedAttributeOverrides.next().getName()); assertFalse(specifiedAttributeOverrides.hasNext()); - attributeResource.removeSupportingAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + attributeResource.removeAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); specifiedAttributeOverrides = embeddedIdMapping.specifiedAttributeOverrides(); assertEquals("BAZ", specifiedAttributeOverrides.next().getName()); assertEquals("BAR", specifiedAttributeOverrides.next().getName()); assertFalse(specifiedAttributeOverrides.hasNext()); - attributeResource.removeSupportingAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + attributeResource.removeAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); specifiedAttributeOverrides = embeddedIdMapping.specifiedAttributeOverrides(); assertEquals("BAR", specifiedAttributeOverrides.next().getName()); assertFalse(specifiedAttributeOverrides.hasNext()); - attributeResource.removeSupportingAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + attributeResource.removeAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); specifiedAttributeOverrides = embeddedIdMapping.specifiedAttributeOverrides(); assertFalse(specifiedAttributeOverrides.hasNext()); } @@ -400,8 +400,8 @@ public class JavaEmbeddedIdMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); assertEquals("myEmbeddedId", attributeResource.getName()); - assertNull(attributeResource.getSupportingAnnotation(AttributeOverrideAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getSupportingAnnotation(AttributeOverridesAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(AttributeOverrideAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(AttributeOverridesAnnotation.ANNOTATION_NAME)); assertEquals(2, embeddedMapping.virtualAttributeOverridesSize()); AttributeOverride defaultAttributeOverride = embeddedMapping.virtualAttributeOverrides().next(); @@ -435,8 +435,8 @@ public class JavaEmbeddedIdMappingTests extends ContextModelTestCase cityMapping.getColumn().setSpecifiedScale(Integer.valueOf(7)); assertEquals("myEmbeddedId", attributeResource.getName()); - assertNull(attributeResource.getSupportingAnnotation(AttributeOverrideAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getSupportingAnnotation(AttributeOverridesAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(AttributeOverrideAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(AttributeOverridesAnnotation.ANNOTATION_NAME)); assertEquals(2, embeddedMapping.virtualAttributeOverridesSize()); defaultAttributeOverride = embeddedMapping.virtualAttributeOverrides().next(); @@ -475,7 +475,7 @@ public class JavaEmbeddedIdMappingTests extends ContextModelTestCase assertEquals(0, defaultAttributeOverride.getColumn().getPrecision()); assertEquals(0, defaultAttributeOverride.getColumn().getScale()); - AttributeOverrideAnnotation annotation = (AttributeOverrideAnnotation) attributeResource.addSupportingAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + AttributeOverrideAnnotation annotation = (AttributeOverrideAnnotation) attributeResource.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); annotation.setName("city"); assertEquals(1, embeddedMapping.virtualAttributeOverridesSize()); } @@ -493,9 +493,9 @@ public class JavaEmbeddedIdMappingTests extends ContextModelTestCase JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); //add an annotation to the resource model and verify the context model is updated - AttributeOverrideAnnotation attributeOverride = (AttributeOverrideAnnotation) attributeResource.addSupportingAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + AttributeOverrideAnnotation attributeOverride = (AttributeOverrideAnnotation) attributeResource.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); attributeOverride.setName("FOO"); - attributeOverride = (AttributeOverrideAnnotation) attributeResource.addSupportingAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + attributeOverride = (AttributeOverrideAnnotation) attributeResource.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); attributeOverride.setName("BAR"); assertEquals(2, embeddedIdMapping.specifiedAttributeOverridesSize()); @@ -514,14 +514,14 @@ public class JavaEmbeddedIdMappingTests extends ContextModelTestCase JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); //add an annotation to the resource model and verify the context model is updated - AttributeOverrideAnnotation attributeOverride = (AttributeOverrideAnnotation) attributeResource.addSupportingAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + AttributeOverrideAnnotation attributeOverride = (AttributeOverrideAnnotation) attributeResource.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); attributeOverride.setName("FOO"); - attributeOverride = (AttributeOverrideAnnotation) attributeResource.addSupportingAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + attributeOverride = (AttributeOverrideAnnotation) attributeResource.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); attributeOverride.setName("BAR"); assertEquals(4, embeddedIdMapping.attributeOverridesSize()); - attributeOverride = (AttributeOverrideAnnotation) attributeResource.addSupportingAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + attributeOverride = (AttributeOverrideAnnotation) attributeResource.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); attributeOverride.setName("city"); assertEquals(4, embeddedIdMapping.attributeOverridesSize()); } @@ -539,16 +539,16 @@ public class JavaEmbeddedIdMappingTests extends ContextModelTestCase JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); //add an annotation to the resource model and verify the context model is updated - AttributeOverrideAnnotation attributeOverride = (AttributeOverrideAnnotation) attributeResource.addSupportingAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + AttributeOverrideAnnotation attributeOverride = (AttributeOverrideAnnotation) attributeResource.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); attributeOverride.setName("FOO"); assertEquals(2, embeddedIdMapping.virtualAttributeOverridesSize()); - attributeOverride = (AttributeOverrideAnnotation) attributeResource.addSupportingAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + attributeOverride = (AttributeOverrideAnnotation) attributeResource.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); attributeOverride.setName("city"); assertEquals(1, embeddedIdMapping.virtualAttributeOverridesSize()); - attributeOverride = (AttributeOverrideAnnotation) attributeResource.addSupportingAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + attributeOverride = (AttributeOverrideAnnotation) attributeResource.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); attributeOverride.setName("state"); assertEquals(0, embeddedIdMapping.virtualAttributeOverridesSize()); } @@ -565,14 +565,14 @@ public class JavaEmbeddedIdMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - Iterator<NestableAnnotation> attributeOverrides = attributeResource.supportingAnnotations(AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverridesAnnotation.ANNOTATION_NAME); + Iterator<NestableAnnotation> attributeOverrides = attributeResource.annotations(AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverridesAnnotation.ANNOTATION_NAME); assertEquals("city", ((AttributeOverrideAnnotation) attributeOverrides.next()).getName()); assertEquals("state", ((AttributeOverrideAnnotation) attributeOverrides.next()).getName()); assertFalse(attributeOverrides.hasNext()); embeddedIdMapping.specifiedAttributeOverrides().next().setVirtual(true); - attributeOverrides = attributeResource.supportingAnnotations(AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverridesAnnotation.ANNOTATION_NAME); + attributeOverrides = attributeResource.annotations(AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverridesAnnotation.ANNOTATION_NAME); assertEquals("state", ((AttributeOverrideAnnotation) attributeOverrides.next()).getName()); assertFalse(attributeOverrides.hasNext()); @@ -580,7 +580,7 @@ public class JavaEmbeddedIdMappingTests extends ContextModelTestCase assertEquals(1, embeddedIdMapping.virtualAttributeOverridesSize()); embeddedIdMapping.specifiedAttributeOverrides().next().setVirtual(true); - attributeOverrides = attributeResource.supportingAnnotations(AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverridesAnnotation.ANNOTATION_NAME); + attributeOverrides = attributeResource.annotations(AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverridesAnnotation.ANNOTATION_NAME); assertFalse(attributeOverrides.hasNext()); Iterator<AttributeOverride> virtualAttributeOverrides = embeddedIdMapping.virtualAttributeOverrides(); @@ -603,7 +603,7 @@ public class JavaEmbeddedIdMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - Iterator<NestableAnnotation> attributeOverrides = attributeResource.supportingAnnotations(AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverridesAnnotation.ANNOTATION_NAME); + Iterator<NestableAnnotation> attributeOverrides = attributeResource.annotations(AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverridesAnnotation.ANNOTATION_NAME); assertEquals("state", ((AttributeOverrideAnnotation) attributeOverrides.next()).getName()); assertEquals("city", ((AttributeOverrideAnnotation) attributeOverrides.next()).getName()); @@ -624,9 +624,9 @@ public class JavaEmbeddedIdMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - attributeResource.moveSupportingAnnotation(1, 0, AttributeOverridesAnnotation.ANNOTATION_NAME); + attributeResource.moveAnnotation(1, 0, AttributeOverridesAnnotation.ANNOTATION_NAME); - Iterator<NestableAnnotation> attributeOverrides = attributeResource.supportingAnnotations(AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverridesAnnotation.ANNOTATION_NAME); + Iterator<NestableAnnotation> attributeOverrides = attributeResource.annotations(AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverridesAnnotation.ANNOTATION_NAME); assertEquals("state", ((AttributeOverrideAnnotation) attributeOverrides.next()).getName()); assertEquals("city", ((AttributeOverrideAnnotation) attributeOverrides.next()).getName()); diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/JavaEmbeddedMappingTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/JavaEmbeddedMappingTests.java index b6d0b47c3d..3ba811aae2 100644 --- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/JavaEmbeddedMappingTests.java +++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/JavaEmbeddedMappingTests.java @@ -121,9 +121,9 @@ public class JavaEmbeddedMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - assertNull(attributeResource.getMappingAnnotation(EmbeddedAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getMappingAnnotation(BasicAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getSupportingAnnotation(AttributeOverrideAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(EmbeddedAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getAnnotation(BasicAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(AttributeOverrideAnnotation.ANNOTATION_NAME)); } public void testMorphToDefault() throws Exception { @@ -136,15 +136,15 @@ public class JavaEmbeddedMappingTests extends ContextModelTestCase EmbeddedMapping embeddedMapping = (EmbeddedMapping) persistentAttribute.getMapping(); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - attributeResource.addSupportingAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + attributeResource.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); assertFalse(embeddedMapping.isDefault()); persistentAttribute.setSpecifiedMappingKey(MappingKeys.NULL_ATTRIBUTE_MAPPING_KEY); assertTrue(((EmbeddedMapping) persistentAttribute.getMapping()).attributeOverrides().hasNext()); assertTrue(persistentAttribute.getMapping().isDefault()); - assertNull(attributeResource.getMappingAnnotation(EmbeddedAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getSupportingAnnotation(AttributeOverrideAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(EmbeddedAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getAnnotation(AttributeOverrideAnnotation.ANNOTATION_NAME)); } public void testDefaultEmbeddedMapping() throws Exception { @@ -221,15 +221,15 @@ public class JavaEmbeddedMappingTests extends ContextModelTestCase EmbeddedMapping embeddedMapping = (EmbeddedMapping) persistentAttribute.getMapping(); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - attributeResource.addSupportingAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + attributeResource.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); assertFalse(embeddedMapping.isDefault()); persistentAttribute.setSpecifiedMappingKey(MappingKeys.VERSION_ATTRIBUTE_MAPPING_KEY); assertTrue(persistentAttribute.getMapping() instanceof VersionMapping); - assertNull(attributeResource.getMappingAnnotation(EmbeddedAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getMappingAnnotation(VersionAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getSupportingAnnotation(AttributeOverrideAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(EmbeddedAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getAnnotation(VersionAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(AttributeOverrideAnnotation.ANNOTATION_NAME)); } public void testMorphToTransientMapping() throws Exception { @@ -241,15 +241,15 @@ public class JavaEmbeddedMappingTests extends ContextModelTestCase EmbeddedMapping embeddedMapping = (EmbeddedMapping) persistentAttribute.getMapping(); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - attributeResource.addSupportingAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + attributeResource.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); assertFalse(embeddedMapping.isDefault()); persistentAttribute.setSpecifiedMappingKey(MappingKeys.TRANSIENT_ATTRIBUTE_MAPPING_KEY); assertTrue(persistentAttribute.getMapping() instanceof TransientMapping); - assertNull(attributeResource.getMappingAnnotation(EmbeddedAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getMappingAnnotation(TransientAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getSupportingAnnotation(AttributeOverrideAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(EmbeddedAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getAnnotation(TransientAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(AttributeOverrideAnnotation.ANNOTATION_NAME)); } public void testMorphToIdMapping() throws Exception { @@ -261,15 +261,15 @@ public class JavaEmbeddedMappingTests extends ContextModelTestCase EmbeddedMapping embeddedMapping = (EmbeddedMapping) persistentAttribute.getMapping(); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - attributeResource.addSupportingAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + attributeResource.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); assertFalse(embeddedMapping.isDefault()); persistentAttribute.setSpecifiedMappingKey(MappingKeys.ID_ATTRIBUTE_MAPPING_KEY); assertTrue(persistentAttribute.getMapping() instanceof IdMapping); - assertNull(attributeResource.getMappingAnnotation(EmbeddedAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getMappingAnnotation(IdAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getSupportingAnnotation(AttributeOverrideAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(EmbeddedAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getAnnotation(IdAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(AttributeOverrideAnnotation.ANNOTATION_NAME)); } public void testMorphToEmbeddedIdMapping() throws Exception { @@ -281,15 +281,15 @@ public class JavaEmbeddedMappingTests extends ContextModelTestCase EmbeddedMapping embeddedMapping = (EmbeddedMapping) persistentAttribute.getMapping(); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - attributeResource.addSupportingAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + attributeResource.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); assertFalse(embeddedMapping.isDefault()); persistentAttribute.setSpecifiedMappingKey(MappingKeys.EMBEDDED_ID_ATTRIBUTE_MAPPING_KEY); assertTrue(persistentAttribute.getMapping() instanceof EmbeddedIdMapping); - assertNull(attributeResource.getMappingAnnotation(EmbeddedAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getMappingAnnotation(EmbeddedIdAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getSupportingAnnotation(AttributeOverrideAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(EmbeddedAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getAnnotation(EmbeddedIdAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getAnnotation(AttributeOverrideAnnotation.ANNOTATION_NAME)); } public void testMorphToOneToOneMapping() throws Exception { @@ -301,15 +301,15 @@ public class JavaEmbeddedMappingTests extends ContextModelTestCase EmbeddedMapping embeddedMapping = (EmbeddedMapping) persistentAttribute.getMapping(); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - attributeResource.addSupportingAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + attributeResource.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); assertFalse(embeddedMapping.isDefault()); persistentAttribute.setSpecifiedMappingKey(MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY); assertTrue(persistentAttribute.getMapping() instanceof OneToOneMapping); - assertNull(attributeResource.getMappingAnnotation(EmbeddedAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getMappingAnnotation(OneToOneAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getSupportingAnnotation(AttributeOverrideAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(EmbeddedAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getAnnotation(OneToOneAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(AttributeOverrideAnnotation.ANNOTATION_NAME)); } public void testMorphToOneToManyMapping() throws Exception { @@ -321,15 +321,15 @@ public class JavaEmbeddedMappingTests extends ContextModelTestCase EmbeddedMapping embeddedMapping = (EmbeddedMapping) persistentAttribute.getMapping(); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - attributeResource.addSupportingAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + attributeResource.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); assertFalse(embeddedMapping.isDefault()); persistentAttribute.setSpecifiedMappingKey(MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY); assertTrue(persistentAttribute.getMapping() instanceof OneToManyMapping); - assertNull(attributeResource.getMappingAnnotation(EmbeddedAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getMappingAnnotation(OneToManyAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getSupportingAnnotation(AttributeOverrideAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(EmbeddedAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getAnnotation(OneToManyAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(AttributeOverrideAnnotation.ANNOTATION_NAME)); } public void testMorphToManyToOneMapping() throws Exception { @@ -341,15 +341,15 @@ public class JavaEmbeddedMappingTests extends ContextModelTestCase EmbeddedMapping embeddedMapping = (EmbeddedMapping) persistentAttribute.getMapping(); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - attributeResource.addSupportingAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + attributeResource.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); assertFalse(embeddedMapping.isDefault()); persistentAttribute.setSpecifiedMappingKey(MappingKeys.MANY_TO_ONE_ATTRIBUTE_MAPPING_KEY); assertTrue(persistentAttribute.getMapping() instanceof ManyToOneMapping); - assertNull(attributeResource.getMappingAnnotation(EmbeddedAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getMappingAnnotation(ManyToOneAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getSupportingAnnotation(AttributeOverrideAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(EmbeddedAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getAnnotation(ManyToOneAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(AttributeOverrideAnnotation.ANNOTATION_NAME)); } public void testMorphToManyToManyMapping() throws Exception { @@ -361,15 +361,15 @@ public class JavaEmbeddedMappingTests extends ContextModelTestCase EmbeddedMapping embeddedMapping = (EmbeddedMapping) persistentAttribute.getMapping(); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - attributeResource.addSupportingAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + attributeResource.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); assertFalse(embeddedMapping.isDefault()); persistentAttribute.setSpecifiedMappingKey(MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); assertTrue(persistentAttribute.getMapping() instanceof ManyToManyMapping); - assertNull(attributeResource.getMappingAnnotation(EmbeddedAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getMappingAnnotation(ManyToManyAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getSupportingAnnotation(AttributeOverrideAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(EmbeddedAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getAnnotation(ManyToManyAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(AttributeOverrideAnnotation.ANNOTATION_NAME)); } public void testSpecifiedAttributeOverrides() throws Exception { @@ -388,13 +388,13 @@ public class JavaEmbeddedMappingTests extends ContextModelTestCase JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); //add an annotation to the resource model and verify the context model is updated - AttributeOverrideAnnotation attributeOverride = (AttributeOverrideAnnotation) attributeResource.addSupportingAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + AttributeOverrideAnnotation attributeOverride = (AttributeOverrideAnnotation) attributeResource.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); attributeOverride.setName("FOO"); specifiedAttributeOverrides = embeddedMapping.specifiedAttributeOverrides(); assertEquals("FOO", specifiedAttributeOverrides.next().getName()); assertFalse(specifiedAttributeOverrides.hasNext()); - attributeOverride = (AttributeOverrideAnnotation) attributeResource.addSupportingAnnotation(1, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + attributeOverride = (AttributeOverrideAnnotation) attributeResource.addAnnotation(1, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); attributeOverride.setName("BAR"); specifiedAttributeOverrides = embeddedMapping.specifiedAttributeOverrides(); assertEquals("FOO", specifiedAttributeOverrides.next().getName()); @@ -402,7 +402,7 @@ public class JavaEmbeddedMappingTests extends ContextModelTestCase assertFalse(specifiedAttributeOverrides.hasNext()); - attributeOverride = (AttributeOverrideAnnotation) attributeResource.addSupportingAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + attributeOverride = (AttributeOverrideAnnotation) attributeResource.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); attributeOverride.setName("BAZ"); specifiedAttributeOverrides = embeddedMapping.specifiedAttributeOverrides(); assertEquals("BAZ", specifiedAttributeOverrides.next().getName()); @@ -411,26 +411,26 @@ public class JavaEmbeddedMappingTests extends ContextModelTestCase assertFalse(specifiedAttributeOverrides.hasNext()); //move an annotation to the resource model and verify the context model is updated - attributeResource.moveSupportingAnnotation(1, 0, JPA.ATTRIBUTE_OVERRIDES); + attributeResource.moveAnnotation(1, 0, JPA.ATTRIBUTE_OVERRIDES); specifiedAttributeOverrides = embeddedMapping.specifiedAttributeOverrides(); assertEquals("FOO", specifiedAttributeOverrides.next().getName()); assertEquals("BAZ", specifiedAttributeOverrides.next().getName()); assertEquals("BAR", specifiedAttributeOverrides.next().getName()); assertFalse(specifiedAttributeOverrides.hasNext()); - attributeResource.removeSupportingAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + attributeResource.removeAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); specifiedAttributeOverrides = embeddedMapping.specifiedAttributeOverrides(); assertEquals("BAZ", specifiedAttributeOverrides.next().getName()); assertEquals("BAR", specifiedAttributeOverrides.next().getName()); assertFalse(specifiedAttributeOverrides.hasNext()); - attributeResource.removeSupportingAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + attributeResource.removeAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); specifiedAttributeOverrides = embeddedMapping.specifiedAttributeOverrides(); assertEquals("BAR", specifiedAttributeOverrides.next().getName()); assertFalse(specifiedAttributeOverrides.hasNext()); - attributeResource.removeSupportingAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + attributeResource.removeAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); specifiedAttributeOverrides = embeddedMapping.specifiedAttributeOverrides(); assertFalse(specifiedAttributeOverrides.hasNext()); } @@ -446,8 +446,8 @@ public class JavaEmbeddedMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); assertEquals("myEmbedded", attributeResource.getName()); - assertNull(attributeResource.getSupportingAnnotation(AttributeOverrideAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getSupportingAnnotation(AttributeOverridesAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(AttributeOverrideAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(AttributeOverridesAnnotation.ANNOTATION_NAME)); assertEquals(2, embeddedMapping.virtualAttributeOverridesSize()); AttributeOverride defaultAttributeOverride = embeddedMapping.virtualAttributeOverrides().next(); @@ -481,8 +481,8 @@ public class JavaEmbeddedMappingTests extends ContextModelTestCase cityMapping.getColumn().setSpecifiedScale(Integer.valueOf(7)); assertEquals("myEmbedded", attributeResource.getName()); - assertNull(attributeResource.getSupportingAnnotation(AttributeOverrideAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getSupportingAnnotation(AttributeOverridesAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(AttributeOverrideAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(AttributeOverridesAnnotation.ANNOTATION_NAME)); assertEquals(2, embeddedMapping.virtualAttributeOverridesSize()); defaultAttributeOverride = embeddedMapping.virtualAttributeOverrides().next(); @@ -521,7 +521,7 @@ public class JavaEmbeddedMappingTests extends ContextModelTestCase assertEquals(0, defaultAttributeOverride.getColumn().getPrecision()); assertEquals(0, defaultAttributeOverride.getColumn().getScale()); - AttributeOverrideAnnotation annotation = (AttributeOverrideAnnotation) attributeResource.addSupportingAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + AttributeOverrideAnnotation annotation = (AttributeOverrideAnnotation) attributeResource.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); annotation.setName("city"); assertEquals(1, embeddedMapping.virtualAttributeOverridesSize()); } @@ -539,9 +539,9 @@ public class JavaEmbeddedMappingTests extends ContextModelTestCase JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); //add an annotation to the resource model and verify the context model is updated - AttributeOverrideAnnotation attributeOverride = (AttributeOverrideAnnotation) attributeResource.addSupportingAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + AttributeOverrideAnnotation attributeOverride = (AttributeOverrideAnnotation) attributeResource.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); attributeOverride.setName("FOO"); - attributeOverride = (AttributeOverrideAnnotation) attributeResource.addSupportingAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + attributeOverride = (AttributeOverrideAnnotation) attributeResource.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); attributeOverride.setName("BAR"); assertEquals(2, embeddedMapping.specifiedAttributeOverridesSize()); @@ -560,14 +560,14 @@ public class JavaEmbeddedMappingTests extends ContextModelTestCase JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); //add an annotation to the resource model and verify the context model is updated - AttributeOverrideAnnotation attributeOverride = (AttributeOverrideAnnotation) attributeResource.addSupportingAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + AttributeOverrideAnnotation attributeOverride = (AttributeOverrideAnnotation) attributeResource.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); attributeOverride.setName("FOO"); - attributeOverride = (AttributeOverrideAnnotation) attributeResource.addSupportingAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + attributeOverride = (AttributeOverrideAnnotation) attributeResource.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); attributeOverride.setName("BAR"); assertEquals(4, embeddedMapping.attributeOverridesSize()); - attributeOverride = (AttributeOverrideAnnotation) attributeResource.addSupportingAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + attributeOverride = (AttributeOverrideAnnotation) attributeResource.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); attributeOverride.setName("city"); assertEquals(4, embeddedMapping.attributeOverridesSize()); } @@ -585,16 +585,16 @@ public class JavaEmbeddedMappingTests extends ContextModelTestCase JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); //add an annotation to the resource model and verify the context model is updated - AttributeOverrideAnnotation attributeOverride = (AttributeOverrideAnnotation) attributeResource.addSupportingAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + AttributeOverrideAnnotation attributeOverride = (AttributeOverrideAnnotation) attributeResource.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); attributeOverride.setName("FOO"); assertEquals(2, embeddedMapping.virtualAttributeOverridesSize()); - attributeOverride = (AttributeOverrideAnnotation) attributeResource.addSupportingAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + attributeOverride = (AttributeOverrideAnnotation) attributeResource.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); attributeOverride.setName("city"); assertEquals(1, embeddedMapping.virtualAttributeOverridesSize()); - attributeOverride = (AttributeOverrideAnnotation) attributeResource.addSupportingAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + attributeOverride = (AttributeOverrideAnnotation) attributeResource.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); attributeOverride.setName("state"); assertEquals(0, embeddedMapping.virtualAttributeOverridesSize()); } @@ -611,14 +611,14 @@ public class JavaEmbeddedMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - Iterator<NestableAnnotation> attributeOverrides = attributeResource.supportingAnnotations(AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverridesAnnotation.ANNOTATION_NAME); + Iterator<NestableAnnotation> attributeOverrides = attributeResource.annotations(AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverridesAnnotation.ANNOTATION_NAME); assertEquals("city", ((AttributeOverrideAnnotation) attributeOverrides.next()).getName()); assertEquals("state", ((AttributeOverrideAnnotation) attributeOverrides.next()).getName()); assertFalse(attributeOverrides.hasNext()); embeddedMapping.specifiedAttributeOverrides().next().setVirtual(true); - attributeOverrides = attributeResource.supportingAnnotations(AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverridesAnnotation.ANNOTATION_NAME); + attributeOverrides = attributeResource.annotations(AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverridesAnnotation.ANNOTATION_NAME); assertEquals("state", ((AttributeOverrideAnnotation) attributeOverrides.next()).getName()); assertFalse(attributeOverrides.hasNext()); @@ -626,7 +626,7 @@ public class JavaEmbeddedMappingTests extends ContextModelTestCase assertEquals(1, embeddedMapping.virtualAttributeOverridesSize()); embeddedMapping.specifiedAttributeOverrides().next().setVirtual(true); - attributeOverrides = attributeResource.supportingAnnotations(AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverridesAnnotation.ANNOTATION_NAME); + attributeOverrides = attributeResource.annotations(AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverridesAnnotation.ANNOTATION_NAME); assertFalse(attributeOverrides.hasNext()); Iterator<AttributeOverride> virtualAttributeOverrides = embeddedMapping.virtualAttributeOverrides(); @@ -649,7 +649,7 @@ public class JavaEmbeddedMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - Iterator<NestableAnnotation> attributeOverrides = attributeResource.supportingAnnotations(AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverridesAnnotation.ANNOTATION_NAME); + Iterator<NestableAnnotation> attributeOverrides = attributeResource.annotations(AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverridesAnnotation.ANNOTATION_NAME); assertEquals("state", ((AttributeOverrideAnnotation) attributeOverrides.next()).getName()); assertEquals("city", ((AttributeOverrideAnnotation) attributeOverrides.next()).getName()); @@ -669,9 +669,9 @@ public class JavaEmbeddedMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - attributeResource.moveSupportingAnnotation(1, 0, AttributeOverridesAnnotation.ANNOTATION_NAME); + attributeResource.moveAnnotation(1, 0, AttributeOverridesAnnotation.ANNOTATION_NAME); - Iterator<NestableAnnotation> attributeOverrides = attributeResource.supportingAnnotations(AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverridesAnnotation.ANNOTATION_NAME); + Iterator<NestableAnnotation> attributeOverrides = attributeResource.annotations(AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverridesAnnotation.ANNOTATION_NAME); assertEquals("state", ((AttributeOverrideAnnotation) attributeOverrides.next()).getName()); assertEquals("city", ((AttributeOverrideAnnotation) attributeOverrides.next()).getName()); diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/JavaEntityTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/JavaEntityTests.java index 9ba9a0328f..bed199e186 100644 --- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/JavaEntityTests.java +++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/JavaEntityTests.java @@ -361,8 +361,8 @@ public class JavaEntityTests extends ContextModelTestCase entity.addSpecifiedSecondaryTable(0); entity.addSpecifiedPrimaryKeyJoinColumn(0); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - typeResource.addSupportingAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); - typeResource.addSupportingAnnotation(0, JPA.ASSOCIATION_OVERRIDE, JPA.ASSOCIATION_OVERRIDES); + typeResource.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + typeResource.addAnnotation(0, JPA.ASSOCIATION_OVERRIDE, JPA.ASSOCIATION_OVERRIDES); entity.setSpecifiedInheritanceStrategy(InheritanceType.JOINED); entity.setSpecifiedDiscriminatorValue("asdf"); entity.getDiscriminatorColumn().setSpecifiedName("BAR"); @@ -375,20 +375,20 @@ public class JavaEntityTests extends ContextModelTestCase getJavaPersistentType().setMappingKey(MappingKeys.MAPPED_SUPERCLASS_TYPE_MAPPING_KEY); assertTrue(getJavaPersistentType().getMapping() instanceof MappedSuperclass); - assertNull(typeResource.getMappingAnnotation(EntityAnnotation.ANNOTATION_NAME)); - assertNull(typeResource.getSupportingAnnotation(TableAnnotation.ANNOTATION_NAME)); - assertNull(typeResource.getSupportingAnnotation(SecondaryTableAnnotation.ANNOTATION_NAME)); - assertNull(typeResource.getSupportingAnnotation(PrimaryKeyJoinColumnAnnotation.ANNOTATION_NAME)); - assertNull(typeResource.getSupportingAnnotation(AttributeOverrideAnnotation.ANNOTATION_NAME)); - assertNull(typeResource.getSupportingAnnotation(AssociationOverrideAnnotation.ANNOTATION_NAME)); - assertNull(typeResource.getSupportingAnnotation(InheritanceAnnotation.ANNOTATION_NAME)); - assertNull(typeResource.getSupportingAnnotation(DiscriminatorValueAnnotation.ANNOTATION_NAME)); - assertNull(typeResource.getSupportingAnnotation(DiscriminatorColumnAnnotation.ANNOTATION_NAME)); - assertNull(typeResource.getSupportingAnnotation(TableGeneratorAnnotation.ANNOTATION_NAME)); - assertNull(typeResource.getSupportingAnnotation(SequenceGeneratorAnnotation.ANNOTATION_NAME)); - assertNotNull(typeResource.getSupportingAnnotation(IdClassAnnotation.ANNOTATION_NAME)); - assertNull(typeResource.getSupportingAnnotation(NamedQueryAnnotation.ANNOTATION_NAME)); - assertNull(typeResource.getSupportingAnnotation(NamedNativeQueryAnnotation.ANNOTATION_NAME)); + assertNull(typeResource.getAnnotation(EntityAnnotation.ANNOTATION_NAME)); + assertNull(typeResource.getAnnotation(TableAnnotation.ANNOTATION_NAME)); + assertNull(typeResource.getAnnotation(SecondaryTableAnnotation.ANNOTATION_NAME)); + assertNull(typeResource.getAnnotation(PrimaryKeyJoinColumnAnnotation.ANNOTATION_NAME)); + assertNull(typeResource.getAnnotation(AttributeOverrideAnnotation.ANNOTATION_NAME)); + assertNull(typeResource.getAnnotation(AssociationOverrideAnnotation.ANNOTATION_NAME)); + assertNull(typeResource.getAnnotation(InheritanceAnnotation.ANNOTATION_NAME)); + assertNull(typeResource.getAnnotation(DiscriminatorValueAnnotation.ANNOTATION_NAME)); + assertNull(typeResource.getAnnotation(DiscriminatorColumnAnnotation.ANNOTATION_NAME)); + assertNull(typeResource.getAnnotation(TableGeneratorAnnotation.ANNOTATION_NAME)); + assertNull(typeResource.getAnnotation(SequenceGeneratorAnnotation.ANNOTATION_NAME)); + assertNotNull(typeResource.getAnnotation(IdClassAnnotation.ANNOTATION_NAME)); + assertNull(typeResource.getAnnotation(NamedQueryAnnotation.ANNOTATION_NAME)); + assertNull(typeResource.getAnnotation(NamedNativeQueryAnnotation.ANNOTATION_NAME)); } public void testMorphToEmbeddable() throws Exception { @@ -400,8 +400,8 @@ public class JavaEntityTests extends ContextModelTestCase entity.addSpecifiedSecondaryTable(0); entity.addSpecifiedPrimaryKeyJoinColumn(0); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - typeResource.addSupportingAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); - typeResource.addSupportingAnnotation(0, JPA.ASSOCIATION_OVERRIDE, JPA.ASSOCIATION_OVERRIDES); + typeResource.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + typeResource.addAnnotation(0, JPA.ASSOCIATION_OVERRIDE, JPA.ASSOCIATION_OVERRIDES); entity.setSpecifiedInheritanceStrategy(InheritanceType.JOINED); entity.setSpecifiedDiscriminatorValue("asdf"); entity.getDiscriminatorColumn().setSpecifiedName("BAR"); @@ -414,20 +414,20 @@ public class JavaEntityTests extends ContextModelTestCase getJavaPersistentType().setMappingKey(MappingKeys.EMBEDDABLE_TYPE_MAPPING_KEY); assertTrue(getJavaPersistentType().getMapping() instanceof Embeddable); - assertNull(typeResource.getMappingAnnotation(EntityAnnotation.ANNOTATION_NAME)); - assertNull(typeResource.getSupportingAnnotation(TableAnnotation.ANNOTATION_NAME)); - assertNull(typeResource.getSupportingAnnotation(SecondaryTableAnnotation.ANNOTATION_NAME)); - assertNull(typeResource.getSupportingAnnotation(PrimaryKeyJoinColumnAnnotation.ANNOTATION_NAME)); - assertNull(typeResource.getSupportingAnnotation(AttributeOverrideAnnotation.ANNOTATION_NAME)); - assertNull(typeResource.getSupportingAnnotation(AssociationOverrideAnnotation.ANNOTATION_NAME)); - assertNull(typeResource.getSupportingAnnotation(InheritanceAnnotation.ANNOTATION_NAME)); - assertNull(typeResource.getSupportingAnnotation(DiscriminatorValueAnnotation.ANNOTATION_NAME)); - assertNull(typeResource.getSupportingAnnotation(DiscriminatorColumnAnnotation.ANNOTATION_NAME)); - assertNull(typeResource.getSupportingAnnotation(TableGeneratorAnnotation.ANNOTATION_NAME)); - assertNull(typeResource.getSupportingAnnotation(SequenceGeneratorAnnotation.ANNOTATION_NAME)); - assertNull(typeResource.getSupportingAnnotation(IdClassAnnotation.ANNOTATION_NAME)); - assertNull(typeResource.getSupportingAnnotation(NamedQueryAnnotation.ANNOTATION_NAME)); - assertNull(typeResource.getSupportingAnnotation(NamedNativeQueryAnnotation.ANNOTATION_NAME)); + assertNull(typeResource.getAnnotation(EntityAnnotation.ANNOTATION_NAME)); + assertNull(typeResource.getAnnotation(TableAnnotation.ANNOTATION_NAME)); + assertNull(typeResource.getAnnotation(SecondaryTableAnnotation.ANNOTATION_NAME)); + assertNull(typeResource.getAnnotation(PrimaryKeyJoinColumnAnnotation.ANNOTATION_NAME)); + assertNull(typeResource.getAnnotation(AttributeOverrideAnnotation.ANNOTATION_NAME)); + assertNull(typeResource.getAnnotation(AssociationOverrideAnnotation.ANNOTATION_NAME)); + assertNull(typeResource.getAnnotation(InheritanceAnnotation.ANNOTATION_NAME)); + assertNull(typeResource.getAnnotation(DiscriminatorValueAnnotation.ANNOTATION_NAME)); + assertNull(typeResource.getAnnotation(DiscriminatorColumnAnnotation.ANNOTATION_NAME)); + assertNull(typeResource.getAnnotation(TableGeneratorAnnotation.ANNOTATION_NAME)); + assertNull(typeResource.getAnnotation(SequenceGeneratorAnnotation.ANNOTATION_NAME)); + assertNull(typeResource.getAnnotation(IdClassAnnotation.ANNOTATION_NAME)); + assertNull(typeResource.getAnnotation(NamedQueryAnnotation.ANNOTATION_NAME)); + assertNull(typeResource.getAnnotation(NamedNativeQueryAnnotation.ANNOTATION_NAME)); } public void testMorphToNull() throws Exception { @@ -439,8 +439,8 @@ public class JavaEntityTests extends ContextModelTestCase entity.addSpecifiedSecondaryTable(0); entity.addSpecifiedPrimaryKeyJoinColumn(0); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - typeResource.addSupportingAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); - typeResource.addSupportingAnnotation(0, JPA.ASSOCIATION_OVERRIDE, JPA.ASSOCIATION_OVERRIDES); + typeResource.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + typeResource.addAnnotation(0, JPA.ASSOCIATION_OVERRIDE, JPA.ASSOCIATION_OVERRIDES); entity.setSpecifiedInheritanceStrategy(InheritanceType.JOINED); entity.setSpecifiedDiscriminatorValue("asdf"); entity.getDiscriminatorColumn().setSpecifiedName("BAR"); @@ -453,20 +453,20 @@ public class JavaEntityTests extends ContextModelTestCase getJavaPersistentType().setMappingKey(MappingKeys.NULL_TYPE_MAPPING_KEY); assertTrue(getJavaPersistentType().getMapping() instanceof JavaNullTypeMapping); - assertNull(typeResource.getMappingAnnotation(EntityAnnotation.ANNOTATION_NAME)); - assertNull(typeResource.getSupportingAnnotation(TableAnnotation.ANNOTATION_NAME)); - assertNull(typeResource.getSupportingAnnotation(SecondaryTableAnnotation.ANNOTATION_NAME)); - assertNull(typeResource.getSupportingAnnotation(PrimaryKeyJoinColumnAnnotation.ANNOTATION_NAME)); - assertNull(typeResource.getSupportingAnnotation(AttributeOverrideAnnotation.ANNOTATION_NAME)); - assertNull(typeResource.getSupportingAnnotation(AssociationOverrideAnnotation.ANNOTATION_NAME)); - assertNull(typeResource.getSupportingAnnotation(InheritanceAnnotation.ANNOTATION_NAME)); - assertNull(typeResource.getSupportingAnnotation(DiscriminatorValueAnnotation.ANNOTATION_NAME)); - assertNull(typeResource.getSupportingAnnotation(DiscriminatorColumnAnnotation.ANNOTATION_NAME)); - assertNull(typeResource.getSupportingAnnotation(TableGeneratorAnnotation.ANNOTATION_NAME)); - assertNull(typeResource.getSupportingAnnotation(SequenceGeneratorAnnotation.ANNOTATION_NAME)); - assertNull(typeResource.getSupportingAnnotation(IdClassAnnotation.ANNOTATION_NAME)); - assertNull(typeResource.getSupportingAnnotation(NamedQueryAnnotation.ANNOTATION_NAME)); - assertNull(typeResource.getSupportingAnnotation(NamedNativeQueryAnnotation.ANNOTATION_NAME)); + assertNull(typeResource.getAnnotation(EntityAnnotation.ANNOTATION_NAME)); + assertNull(typeResource.getAnnotation(TableAnnotation.ANNOTATION_NAME)); + assertNull(typeResource.getAnnotation(SecondaryTableAnnotation.ANNOTATION_NAME)); + assertNull(typeResource.getAnnotation(PrimaryKeyJoinColumnAnnotation.ANNOTATION_NAME)); + assertNull(typeResource.getAnnotation(AttributeOverrideAnnotation.ANNOTATION_NAME)); + assertNull(typeResource.getAnnotation(AssociationOverrideAnnotation.ANNOTATION_NAME)); + assertNull(typeResource.getAnnotation(InheritanceAnnotation.ANNOTATION_NAME)); + assertNull(typeResource.getAnnotation(DiscriminatorValueAnnotation.ANNOTATION_NAME)); + assertNull(typeResource.getAnnotation(DiscriminatorColumnAnnotation.ANNOTATION_NAME)); + assertNull(typeResource.getAnnotation(TableGeneratorAnnotation.ANNOTATION_NAME)); + assertNull(typeResource.getAnnotation(SequenceGeneratorAnnotation.ANNOTATION_NAME)); + assertNull(typeResource.getAnnotation(IdClassAnnotation.ANNOTATION_NAME)); + assertNull(typeResource.getAnnotation(NamedQueryAnnotation.ANNOTATION_NAME)); + assertNull(typeResource.getAnnotation(NamedNativeQueryAnnotation.ANNOTATION_NAME)); } public void testAccessNoAnnotations() throws Exception { @@ -492,7 +492,8 @@ public class JavaEntityTests extends ContextModelTestCase ((IdMapping) parentPersistentType.getAttributeNamed("id").getMapping()).getColumn().setSpecifiedName("FOO"); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - typeResource.persistableProperties().next().setMappingAnnotation(null); + + typeResource.persistableProperties().next().removeAnnotation(JPA.ID); //no mapping(Id) annotation, but still a Column annotation, so access should still be property assertEquals(AccessType.PROPERTY, parentPersistentType.getAccess()); assertEquals(AccessType.PROPERTY, childPersistentType.getAccess()); @@ -534,10 +535,11 @@ public class JavaEntityTests extends ContextModelTestCase ((IdMapping) getJavaPersistentType().getAttributeNamed("id").getMapping()).getColumn().setSpecifiedName("FOO"); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - typeResource.persistableProperties().next().setMappingAnnotation(null); + + typeResource.persistableProperties().next().removeAnnotation(JPA.ID); //no mapping(Id) annotation, but still a Column annotation, so access should still be property assertEquals(AccessType.PROPERTY, getJavaPersistentType().getAccess()); - + ((BasicMapping) getJavaPersistentType().getAttributeNamed("id").getMapping()).getColumn().setSpecifiedName(null); assertEquals(AccessType.FIELD, getJavaPersistentType().getAccess()); @@ -611,7 +613,7 @@ public class JavaEntityTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - assertEquals("foo", ((EntityAnnotation) typeResource.getMappingAnnotation()).getName()); + assertEquals("foo", ((EntityAnnotation) typeResource.getAnnotation(EntityAnnotation.ANNOTATION_NAME)).getName()); } public void testSetSpecifiedNameNull() throws Exception { @@ -624,7 +626,7 @@ public class JavaEntityTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - assertNull(((EntityAnnotation) typeResource.getMappingAnnotation()).getName()); + assertNull(((EntityAnnotation) typeResource.getAnnotation(EntityAnnotation.ANNOTATION_NAME)).getName()); } public void testUpdateFromSpecifiedNameChangeInResourceModel() throws Exception { @@ -632,7 +634,7 @@ public class JavaEntityTests extends ContextModelTestCase addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - EntityAnnotation entity = (EntityAnnotation) typeResource.getMappingAnnotation(); + EntityAnnotation entity = (EntityAnnotation) typeResource.getAnnotation(EntityAnnotation.ANNOTATION_NAME); entity.setName("foo"); assertEquals("foo", getJavaEntity().getSpecifiedName()); @@ -713,7 +715,7 @@ public class JavaEntityTests extends ContextModelTestCase assertEquals(InheritanceType.TABLE_PER_CLASS, getJavaEntity().getSpecifiedInheritanceStrategy()); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - InheritanceAnnotation inheritance = (InheritanceAnnotation) typeResource.getSupportingAnnotation(InheritanceAnnotation.ANNOTATION_NAME); + InheritanceAnnotation inheritance = (InheritanceAnnotation) typeResource.getAnnotation(InheritanceAnnotation.ANNOTATION_NAME); inheritance.setStrategy(org.eclipse.jpt.core.resource.java.InheritanceType.JOINED); @@ -734,7 +736,7 @@ public class JavaEntityTests extends ContextModelTestCase assertEquals(InheritanceType.JOINED, getJavaEntity().getSpecifiedInheritanceStrategy()); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - InheritanceAnnotation inheritance = (InheritanceAnnotation) typeResource.getSupportingAnnotation(InheritanceAnnotation.ANNOTATION_NAME); + InheritanceAnnotation inheritance = (InheritanceAnnotation) typeResource.getAnnotation(InheritanceAnnotation.ANNOTATION_NAME); assertEquals(org.eclipse.jpt.core.resource.java.InheritanceType.JOINED, inheritance.getStrategy()); } @@ -768,7 +770,7 @@ public class JavaEntityTests extends ContextModelTestCase assertEquals(DISCRIMINATOR_VALUE, getJavaEntity().getSpecifiedDiscriminatorValue()); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - DiscriminatorValueAnnotation discriminatorValue = (DiscriminatorValueAnnotation) typeResource.getSupportingAnnotation(DiscriminatorValueAnnotation.ANNOTATION_NAME); + DiscriminatorValueAnnotation discriminatorValue = (DiscriminatorValueAnnotation) typeResource.getAnnotation(DiscriminatorValueAnnotation.ANNOTATION_NAME); discriminatorValue.setValue("foo"); @@ -777,7 +779,7 @@ public class JavaEntityTests extends ContextModelTestCase discriminatorValue.setValue(null); assertNull(getJavaEntity().getSpecifiedDiscriminatorValue()); - assertNull(typeResource.getSupportingAnnotation(DiscriminatorValueAnnotation.ANNOTATION_NAME)); + assertNull(typeResource.getAnnotation(DiscriminatorValueAnnotation.ANNOTATION_NAME)); } public void testSetSpecifiedDiscriminatorValue() throws Exception { @@ -790,7 +792,7 @@ public class JavaEntityTests extends ContextModelTestCase assertEquals("foo", getJavaEntity().getSpecifiedDiscriminatorValue()); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - DiscriminatorValueAnnotation discriminatorValue = (DiscriminatorValueAnnotation) typeResource.getSupportingAnnotation(DiscriminatorValueAnnotation.ANNOTATION_NAME); + DiscriminatorValueAnnotation discriminatorValue = (DiscriminatorValueAnnotation) typeResource.getAnnotation(DiscriminatorValueAnnotation.ANNOTATION_NAME); assertEquals("foo", discriminatorValue.getValue()); } @@ -814,9 +816,9 @@ public class JavaEntityTests extends ContextModelTestCase assertEquals(0, entity.secondaryTablesSize()); - ((SecondaryTableAnnotation) typeResource.addSupportingAnnotation(0, SecondaryTableAnnotation.ANNOTATION_NAME, SecondaryTablesAnnotation.ANNOTATION_NAME)).setName("FOO"); - ((SecondaryTableAnnotation) typeResource.addSupportingAnnotation(1, SecondaryTableAnnotation.ANNOTATION_NAME, SecondaryTablesAnnotation.ANNOTATION_NAME)).setName("BAR"); - ((SecondaryTableAnnotation) typeResource.addSupportingAnnotation(2, SecondaryTableAnnotation.ANNOTATION_NAME, SecondaryTablesAnnotation.ANNOTATION_NAME)).setName("BAZ"); + ((SecondaryTableAnnotation) typeResource.addAnnotation(0, SecondaryTableAnnotation.ANNOTATION_NAME, SecondaryTablesAnnotation.ANNOTATION_NAME)).setName("FOO"); + ((SecondaryTableAnnotation) typeResource.addAnnotation(1, SecondaryTableAnnotation.ANNOTATION_NAME, SecondaryTablesAnnotation.ANNOTATION_NAME)).setName("BAR"); + ((SecondaryTableAnnotation) typeResource.addAnnotation(2, SecondaryTableAnnotation.ANNOTATION_NAME, SecondaryTablesAnnotation.ANNOTATION_NAME)).setName("BAZ"); assertEquals(3, entity.secondaryTablesSize()); } @@ -842,9 +844,9 @@ public class JavaEntityTests extends ContextModelTestCase assertEquals(0, entity.specifiedSecondaryTablesSize()); - ((SecondaryTableAnnotation) typeResource.addSupportingAnnotation(0, SecondaryTableAnnotation.ANNOTATION_NAME, SecondaryTablesAnnotation.ANNOTATION_NAME)).setName("FOO"); - ((SecondaryTableAnnotation) typeResource.addSupportingAnnotation(1, SecondaryTableAnnotation.ANNOTATION_NAME, SecondaryTablesAnnotation.ANNOTATION_NAME)).setName("BAR"); - ((SecondaryTableAnnotation) typeResource.addSupportingAnnotation(2, SecondaryTableAnnotation.ANNOTATION_NAME, SecondaryTablesAnnotation.ANNOTATION_NAME)).setName("BAZ"); + ((SecondaryTableAnnotation) typeResource.addAnnotation(0, SecondaryTableAnnotation.ANNOTATION_NAME, SecondaryTablesAnnotation.ANNOTATION_NAME)).setName("FOO"); + ((SecondaryTableAnnotation) typeResource.addAnnotation(1, SecondaryTableAnnotation.ANNOTATION_NAME, SecondaryTablesAnnotation.ANNOTATION_NAME)).setName("BAR"); + ((SecondaryTableAnnotation) typeResource.addAnnotation(2, SecondaryTableAnnotation.ANNOTATION_NAME, SecondaryTablesAnnotation.ANNOTATION_NAME)).setName("BAZ"); assertEquals(3, entity.specifiedSecondaryTablesSize()); } @@ -858,7 +860,7 @@ public class JavaEntityTests extends ContextModelTestCase getJavaEntity().addSpecifiedSecondaryTable(0).setSpecifiedName("BAZ"); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - Iterator<NestableAnnotation> secondaryTables = typeResource.supportingAnnotations(SecondaryTableAnnotation.ANNOTATION_NAME, SecondaryTablesAnnotation.ANNOTATION_NAME); + Iterator<NestableAnnotation> secondaryTables = typeResource.annotations(SecondaryTableAnnotation.ANNOTATION_NAME, SecondaryTablesAnnotation.ANNOTATION_NAME); assertEquals("BAZ", ((SecondaryTableAnnotation) secondaryTables.next()).getName()); assertEquals("BAR", ((SecondaryTableAnnotation) secondaryTables.next()).getName()); @@ -875,7 +877,7 @@ public class JavaEntityTests extends ContextModelTestCase getJavaEntity().addSpecifiedSecondaryTable(0).setSpecifiedName("BAZ"); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - Iterator<NestableAnnotation> secondaryTables = typeResource.supportingAnnotations(SecondaryTableAnnotation.ANNOTATION_NAME, SecondaryTablesAnnotation.ANNOTATION_NAME); + Iterator<NestableAnnotation> secondaryTables = typeResource.annotations(SecondaryTableAnnotation.ANNOTATION_NAME, SecondaryTablesAnnotation.ANNOTATION_NAME); assertEquals("BAZ", ((SecondaryTableAnnotation) secondaryTables.next()).getName()); assertEquals("FOO", ((SecondaryTableAnnotation) secondaryTables.next()).getName()); @@ -925,11 +927,11 @@ public class JavaEntityTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - assertEquals(3, CollectionTools.size(typeResource.supportingAnnotations(SecondaryTableAnnotation.ANNOTATION_NAME, SecondaryTablesAnnotation.ANNOTATION_NAME))); + assertEquals(3, CollectionTools.size(typeResource.annotations(SecondaryTableAnnotation.ANNOTATION_NAME, SecondaryTablesAnnotation.ANNOTATION_NAME))); getJavaEntity().removeSpecifiedSecondaryTable(1); - Iterator<NestableAnnotation> secondaryTableResources = typeResource.supportingAnnotations(SecondaryTableAnnotation.ANNOTATION_NAME, SecondaryTablesAnnotation.ANNOTATION_NAME); + Iterator<NestableAnnotation> secondaryTableResources = typeResource.annotations(SecondaryTableAnnotation.ANNOTATION_NAME, SecondaryTablesAnnotation.ANNOTATION_NAME); assertEquals("FOO", ((SecondaryTableAnnotation) secondaryTableResources.next()).getName()); assertEquals("BAZ", ((SecondaryTableAnnotation) secondaryTableResources.next()).getName()); assertFalse(secondaryTableResources.hasNext()); @@ -941,7 +943,7 @@ public class JavaEntityTests extends ContextModelTestCase getJavaEntity().removeSpecifiedSecondaryTable(1); - secondaryTableResources = typeResource.supportingAnnotations(SecondaryTableAnnotation.ANNOTATION_NAME, SecondaryTablesAnnotation.ANNOTATION_NAME); + secondaryTableResources = typeResource.annotations(SecondaryTableAnnotation.ANNOTATION_NAME, SecondaryTablesAnnotation.ANNOTATION_NAME); assertEquals("FOO", ((SecondaryTableAnnotation) secondaryTableResources.next()).getName()); assertFalse(secondaryTableResources.hasNext()); @@ -951,12 +953,12 @@ public class JavaEntityTests extends ContextModelTestCase getJavaEntity().removeSpecifiedSecondaryTable(0); - secondaryTableResources = typeResource.supportingAnnotations(SecondaryTableAnnotation.ANNOTATION_NAME, SecondaryTablesAnnotation.ANNOTATION_NAME); + secondaryTableResources = typeResource.annotations(SecondaryTableAnnotation.ANNOTATION_NAME, SecondaryTablesAnnotation.ANNOTATION_NAME); assertFalse(secondaryTableResources.hasNext()); secondaryTables = getJavaEntity().secondaryTables(); assertFalse(secondaryTables.hasNext()); - assertNull(typeResource.getSupportingAnnotation(SecondaryTablesAnnotation.ANNOTATION_NAME)); + assertNull(typeResource.getAnnotation(SecondaryTablesAnnotation.ANNOTATION_NAME)); } public void testMoveSpecifiedSecondaryTable() throws Exception { @@ -970,7 +972,7 @@ public class JavaEntityTests extends ContextModelTestCase entity.addSpecifiedSecondaryTable(1).setSpecifiedName("BAR"); entity.addSpecifiedSecondaryTable(2).setSpecifiedName("BAZ"); - ListIterator<NestableAnnotation> javaSecondaryTables = typeResource.supportingAnnotations(SecondaryTableAnnotation.ANNOTATION_NAME, SecondaryTablesAnnotation.ANNOTATION_NAME); + Iterator<NestableAnnotation> javaSecondaryTables = typeResource.annotations(SecondaryTableAnnotation.ANNOTATION_NAME, SecondaryTablesAnnotation.ANNOTATION_NAME); assertEquals(3, CollectionTools.size(javaSecondaryTables)); @@ -980,7 +982,7 @@ public class JavaEntityTests extends ContextModelTestCase assertEquals("BAZ", secondaryTables.next().getSpecifiedName()); assertEquals("FOO", secondaryTables.next().getSpecifiedName()); - javaSecondaryTables = typeResource.supportingAnnotations(SecondaryTableAnnotation.ANNOTATION_NAME, SecondaryTablesAnnotation.ANNOTATION_NAME); + javaSecondaryTables = typeResource.annotations(SecondaryTableAnnotation.ANNOTATION_NAME, SecondaryTablesAnnotation.ANNOTATION_NAME); assertEquals("BAR", ((SecondaryTableAnnotation) javaSecondaryTables.next()).getName()); assertEquals("BAZ", ((SecondaryTableAnnotation) javaSecondaryTables.next()).getName()); assertEquals("FOO", ((SecondaryTableAnnotation) javaSecondaryTables.next()).getName()); @@ -992,7 +994,7 @@ public class JavaEntityTests extends ContextModelTestCase assertEquals("BAR", secondaryTables.next().getSpecifiedName()); assertEquals("FOO", secondaryTables.next().getSpecifiedName()); - javaSecondaryTables = typeResource.supportingAnnotations(SecondaryTableAnnotation.ANNOTATION_NAME, SecondaryTablesAnnotation.ANNOTATION_NAME); + javaSecondaryTables = typeResource.annotations(SecondaryTableAnnotation.ANNOTATION_NAME, SecondaryTablesAnnotation.ANNOTATION_NAME); assertEquals("BAZ", ((SecondaryTableAnnotation) javaSecondaryTables.next()).getName()); assertEquals("BAR", ((SecondaryTableAnnotation) javaSecondaryTables.next()).getName()); assertEquals("FOO", ((SecondaryTableAnnotation) javaSecondaryTables.next()).getName()); @@ -1005,9 +1007,9 @@ public class JavaEntityTests extends ContextModelTestCase Entity entity = getJavaEntity(); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - ((SecondaryTableAnnotation) typeResource.addSupportingAnnotation(0, SecondaryTableAnnotation.ANNOTATION_NAME, SecondaryTablesAnnotation.ANNOTATION_NAME)).setName("FOO"); - ((SecondaryTableAnnotation) typeResource.addSupportingAnnotation(1, SecondaryTableAnnotation.ANNOTATION_NAME, SecondaryTablesAnnotation.ANNOTATION_NAME)).setName("BAR"); - ((SecondaryTableAnnotation) typeResource.addSupportingAnnotation(2, SecondaryTableAnnotation.ANNOTATION_NAME, SecondaryTablesAnnotation.ANNOTATION_NAME)).setName("BAZ"); + ((SecondaryTableAnnotation) typeResource.addAnnotation(0, SecondaryTableAnnotation.ANNOTATION_NAME, SecondaryTablesAnnotation.ANNOTATION_NAME)).setName("FOO"); + ((SecondaryTableAnnotation) typeResource.addAnnotation(1, SecondaryTableAnnotation.ANNOTATION_NAME, SecondaryTablesAnnotation.ANNOTATION_NAME)).setName("BAR"); + ((SecondaryTableAnnotation) typeResource.addAnnotation(2, SecondaryTableAnnotation.ANNOTATION_NAME, SecondaryTablesAnnotation.ANNOTATION_NAME)).setName("BAZ"); ListIterator<SecondaryTable> secondaryTables = entity.specifiedSecondaryTables(); assertEquals("FOO", secondaryTables.next().getName()); @@ -1015,32 +1017,32 @@ public class JavaEntityTests extends ContextModelTestCase assertEquals("BAZ", secondaryTables.next().getName()); assertFalse(secondaryTables.hasNext()); - typeResource.moveSupportingAnnotation(2, 0, SecondaryTablesAnnotation.ANNOTATION_NAME); + typeResource.moveAnnotation(2, 0, SecondaryTablesAnnotation.ANNOTATION_NAME); secondaryTables = entity.specifiedSecondaryTables(); assertEquals("BAR", secondaryTables.next().getName()); assertEquals("BAZ", secondaryTables.next().getName()); assertEquals("FOO", secondaryTables.next().getName()); assertFalse(secondaryTables.hasNext()); - typeResource.moveSupportingAnnotation(0, 1, SecondaryTablesAnnotation.ANNOTATION_NAME); + typeResource.moveAnnotation(0, 1, SecondaryTablesAnnotation.ANNOTATION_NAME); secondaryTables = entity.specifiedSecondaryTables(); assertEquals("BAZ", secondaryTables.next().getName()); assertEquals("BAR", secondaryTables.next().getName()); assertEquals("FOO", secondaryTables.next().getName()); assertFalse(secondaryTables.hasNext()); - typeResource.removeSupportingAnnotation(1, SecondaryTableAnnotation.ANNOTATION_NAME, SecondaryTablesAnnotation.ANNOTATION_NAME); + typeResource.removeAnnotation(1, SecondaryTableAnnotation.ANNOTATION_NAME, SecondaryTablesAnnotation.ANNOTATION_NAME); secondaryTables = entity.specifiedSecondaryTables(); assertEquals("BAZ", secondaryTables.next().getName()); assertEquals("FOO", secondaryTables.next().getName()); assertFalse(secondaryTables.hasNext()); - typeResource.removeSupportingAnnotation(1, SecondaryTableAnnotation.ANNOTATION_NAME, SecondaryTablesAnnotation.ANNOTATION_NAME); + typeResource.removeAnnotation(1, SecondaryTableAnnotation.ANNOTATION_NAME, SecondaryTablesAnnotation.ANNOTATION_NAME); secondaryTables = entity.specifiedSecondaryTables(); assertEquals("BAZ", secondaryTables.next().getName()); assertFalse(secondaryTables.hasNext()); - typeResource.removeSupportingAnnotation(0, SecondaryTableAnnotation.ANNOTATION_NAME, SecondaryTablesAnnotation.ANNOTATION_NAME); + typeResource.removeAnnotation(0, SecondaryTableAnnotation.ANNOTATION_NAME, SecondaryTablesAnnotation.ANNOTATION_NAME); secondaryTables = entity.specifiedSecondaryTables(); assertFalse(secondaryTables.hasNext()); } @@ -1112,14 +1114,14 @@ public class JavaEntityTests extends ContextModelTestCase addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - SecondaryTableAnnotation secondaryTable = (SecondaryTableAnnotation) typeResource.addSupportingAnnotation(0, JPA.SECONDARY_TABLE, JPA.SECONDARY_TABLES); + SecondaryTableAnnotation secondaryTable = (SecondaryTableAnnotation) typeResource.addAnnotation(0, JPA.SECONDARY_TABLE, JPA.SECONDARY_TABLES); secondaryTable.setName("FOO"); assertEquals(1, getJavaEntity().secondaryTablesSize()); assertEquals("FOO", getJavaEntity().secondaryTables().next().getSpecifiedName()); assertEquals("FOO", getJavaEntity().secondaryTables().next().getName()); - SecondaryTableAnnotation secondaryTable2 = (SecondaryTableAnnotation) typeResource.addSupportingAnnotation(1, JPA.SECONDARY_TABLE, JPA.SECONDARY_TABLES); + SecondaryTableAnnotation secondaryTable2 = (SecondaryTableAnnotation) typeResource.addAnnotation(1, JPA.SECONDARY_TABLE, JPA.SECONDARY_TABLES); secondaryTable2.setName("BAR"); assertEquals(2, getJavaEntity().secondaryTablesSize()); @@ -1127,7 +1129,7 @@ public class JavaEntityTests extends ContextModelTestCase assertEquals("FOO", secondaryTables.next().getSpecifiedName()); assertEquals("BAR", secondaryTables.next().getSpecifiedName()); - SecondaryTableAnnotation secondaryTable3 = (SecondaryTableAnnotation) typeResource.addSupportingAnnotation(0, JPA.SECONDARY_TABLE, JPA.SECONDARY_TABLES); + SecondaryTableAnnotation secondaryTable3 = (SecondaryTableAnnotation) typeResource.addAnnotation(0, JPA.SECONDARY_TABLE, JPA.SECONDARY_TABLES); secondaryTable3.setName("BAZ"); assertEquals(3, getJavaEntity().secondaryTablesSize()); @@ -1150,21 +1152,21 @@ public class JavaEntityTests extends ContextModelTestCase assertEquals("baz", secondaryTables.next().getSpecifiedName()); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - typeResource.removeSupportingAnnotation(0, JPA.SECONDARY_TABLE, JPA.SECONDARY_TABLES); + typeResource.removeAnnotation(0, JPA.SECONDARY_TABLE, JPA.SECONDARY_TABLES); secondaryTables = getJavaEntity().secondaryTables(); assertEquals(2, getJavaEntity().secondaryTablesSize()); assertEquals("bar", secondaryTables.next().getSpecifiedName()); assertEquals("baz", secondaryTables.next().getSpecifiedName()); - typeResource.removeSupportingAnnotation(0, JPA.SECONDARY_TABLE, JPA.SECONDARY_TABLES); + typeResource.removeAnnotation(0, JPA.SECONDARY_TABLE, JPA.SECONDARY_TABLES); secondaryTables = getJavaEntity().secondaryTables(); assertEquals(1, getJavaEntity().secondaryTablesSize()); assertEquals("baz", secondaryTables.next().getSpecifiedName()); - typeResource.removeSupportingAnnotation(0, JPA.SECONDARY_TABLE, JPA.SECONDARY_TABLES); + typeResource.removeAnnotation(0, JPA.SECONDARY_TABLE, JPA.SECONDARY_TABLES); secondaryTables = getJavaEntity().secondaryTables(); assertEquals(0, getJavaEntity().secondaryTablesSize()); @@ -1179,10 +1181,10 @@ public class JavaEntityTests extends ContextModelTestCase assertEquals(0, getJavaEntity().getPersistenceUnit().generatorsSize()); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - typeResource.addSupportingAnnotation(JPA.SEQUENCE_GENERATOR); + typeResource.addAnnotation(JPA.SEQUENCE_GENERATOR); assertNotNull(getJavaEntity().getGeneratorContainer().getSequenceGenerator()); - assertEquals(1, typeResource.supportingAnnotationsSize()); + assertEquals(2, typeResource.annotationsSize()); assertEquals(1, getJavaEntity().getPersistenceUnit().generatorsSize()); getJavaEntity().getGeneratorContainer().getSequenceGenerator().setName("foo"); @@ -1199,7 +1201,7 @@ public class JavaEntityTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - assertNotNull(typeResource.getSupportingAnnotation(JPA.SEQUENCE_GENERATOR)); + assertNotNull(typeResource.getAnnotation(JPA.SEQUENCE_GENERATOR)); assertNotNull(getJavaEntity().getGeneratorContainer().getSequenceGenerator()); //try adding another sequence generator, should get an IllegalStateException @@ -1216,12 +1218,12 @@ public class JavaEntityTests extends ContextModelTestCase addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - typeResource.addSupportingAnnotation(JPA.SEQUENCE_GENERATOR); + typeResource.addAnnotation(JPA.SEQUENCE_GENERATOR); getJavaEntity().getGeneratorContainer().removeSequenceGenerator(); assertNull(getJavaEntity().getGeneratorContainer().getSequenceGenerator()); - assertNull(typeResource.getSupportingAnnotation(JPA.SEQUENCE_GENERATOR)); + assertNull(typeResource.getAnnotation(JPA.SEQUENCE_GENERATOR)); //try removing the sequence generator again, should get an IllegalStateException try { @@ -1240,10 +1242,10 @@ public class JavaEntityTests extends ContextModelTestCase assertEquals(0, getJavaEntity().getPersistenceUnit().generatorsSize()); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - typeResource.addSupportingAnnotation(JPA.TABLE_GENERATOR); + typeResource.addAnnotation(JPA.TABLE_GENERATOR); assertNotNull(getJavaEntity().getGeneratorContainer().getTableGenerator()); - assertEquals(1, typeResource.supportingAnnotationsSize()); + assertEquals(2, typeResource.annotationsSize()); assertEquals(1, getJavaEntity().getPersistenceUnit().generatorsSize()); getJavaEntity().getGeneratorContainer().getTableGenerator().setName("foo"); @@ -1260,7 +1262,7 @@ public class JavaEntityTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - assertNotNull(typeResource.getSupportingAnnotation(JPA.TABLE_GENERATOR)); + assertNotNull(typeResource.getAnnotation(JPA.TABLE_GENERATOR)); assertNotNull(getJavaEntity().getGeneratorContainer().getTableGenerator()); //try adding another table generator, should get an IllegalStateException @@ -1277,12 +1279,12 @@ public class JavaEntityTests extends ContextModelTestCase addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - typeResource.addSupportingAnnotation(JPA.TABLE_GENERATOR); + typeResource.addAnnotation(JPA.TABLE_GENERATOR); getJavaEntity().getGeneratorContainer().removeTableGenerator(); assertNull(getJavaEntity().getGeneratorContainer().getTableGenerator()); - assertNull(typeResource.getSupportingAnnotation(JPA.TABLE_GENERATOR)); + assertNull(typeResource.getAnnotation(JPA.TABLE_GENERATOR)); //try removing the table generator again, should get an IllegalStateException try { @@ -1300,7 +1302,7 @@ public class JavaEntityTests extends ContextModelTestCase assertNotNull(getJavaEntity().getDiscriminatorColumn()); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - DiscriminatorColumnAnnotation column = (DiscriminatorColumnAnnotation) typeResource.addSupportingAnnotation(JPA.DISCRIMINATOR_COLUMN); + DiscriminatorColumnAnnotation column = (DiscriminatorColumnAnnotation) typeResource.addAnnotation(JPA.DISCRIMINATOR_COLUMN); column.setName("foo"); assertEquals("foo", getJavaEntity().getDiscriminatorColumn().getSpecifiedName()); @@ -1309,7 +1311,7 @@ public class JavaEntityTests extends ContextModelTestCase assertNull(getJavaEntity().getDiscriminatorColumn().getSpecifiedName()); - typeResource.removeSupportingAnnotation(JPA.DISCRIMINATOR_COLUMN); + typeResource.removeAnnotation(JPA.DISCRIMINATOR_COLUMN); assertNotNull(getJavaEntity().getDiscriminatorColumn()); } @@ -1325,13 +1327,13 @@ public class JavaEntityTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); //add an annotation to the resource model and verify the context model is updated - PrimaryKeyJoinColumnAnnotation pkJoinColumn = (PrimaryKeyJoinColumnAnnotation) typeResource.addSupportingAnnotation(0, JPA.PRIMARY_KEY_JOIN_COLUMN, JPA.PRIMARY_KEY_JOIN_COLUMNS); + PrimaryKeyJoinColumnAnnotation pkJoinColumn = (PrimaryKeyJoinColumnAnnotation) typeResource.addAnnotation(0, JPA.PRIMARY_KEY_JOIN_COLUMN, JPA.PRIMARY_KEY_JOIN_COLUMNS); pkJoinColumn.setName("FOO"); specifiedPkJoinColumns = getJavaEntity().specifiedPrimaryKeyJoinColumns(); assertEquals("FOO", specifiedPkJoinColumns.next().getName()); assertFalse(specifiedPkJoinColumns.hasNext()); - pkJoinColumn = (PrimaryKeyJoinColumnAnnotation) typeResource.addSupportingAnnotation(0, JPA.PRIMARY_KEY_JOIN_COLUMN, JPA.PRIMARY_KEY_JOIN_COLUMNS); + pkJoinColumn = (PrimaryKeyJoinColumnAnnotation) typeResource.addAnnotation(0, JPA.PRIMARY_KEY_JOIN_COLUMN, JPA.PRIMARY_KEY_JOIN_COLUMNS); pkJoinColumn.setName("BAR"); specifiedPkJoinColumns = getJavaEntity().specifiedPrimaryKeyJoinColumns(); assertEquals("BAR", specifiedPkJoinColumns.next().getName()); @@ -1339,7 +1341,7 @@ public class JavaEntityTests extends ContextModelTestCase assertFalse(specifiedPkJoinColumns.hasNext()); - pkJoinColumn = (PrimaryKeyJoinColumnAnnotation) typeResource.addSupportingAnnotation(0, JPA.PRIMARY_KEY_JOIN_COLUMN, JPA.PRIMARY_KEY_JOIN_COLUMNS); + pkJoinColumn = (PrimaryKeyJoinColumnAnnotation) typeResource.addAnnotation(0, JPA.PRIMARY_KEY_JOIN_COLUMN, JPA.PRIMARY_KEY_JOIN_COLUMNS); pkJoinColumn.setName("BAZ"); specifiedPkJoinColumns = getJavaEntity().specifiedPrimaryKeyJoinColumns(); assertEquals("BAZ", specifiedPkJoinColumns.next().getName()); @@ -1348,26 +1350,26 @@ public class JavaEntityTests extends ContextModelTestCase assertFalse(specifiedPkJoinColumns.hasNext()); //move an annotation to the resource model and verify the context model is updated - typeResource.moveSupportingAnnotation(1, 0, JPA.PRIMARY_KEY_JOIN_COLUMNS); + typeResource.moveAnnotation(1, 0, JPA.PRIMARY_KEY_JOIN_COLUMNS); specifiedPkJoinColumns = getJavaEntity().specifiedPrimaryKeyJoinColumns(); assertEquals("BAR", specifiedPkJoinColumns.next().getName()); assertEquals("BAZ", specifiedPkJoinColumns.next().getName()); assertEquals("FOO", specifiedPkJoinColumns.next().getName()); assertFalse(specifiedPkJoinColumns.hasNext()); - typeResource.removeSupportingAnnotation(0, JPA.PRIMARY_KEY_JOIN_COLUMN, JPA.PRIMARY_KEY_JOIN_COLUMNS); + typeResource.removeAnnotation(0, JPA.PRIMARY_KEY_JOIN_COLUMN, JPA.PRIMARY_KEY_JOIN_COLUMNS); specifiedPkJoinColumns = getJavaEntity().specifiedPrimaryKeyJoinColumns(); assertEquals("BAZ", specifiedPkJoinColumns.next().getName()); assertEquals("FOO", specifiedPkJoinColumns.next().getName()); assertFalse(specifiedPkJoinColumns.hasNext()); - typeResource.removeSupportingAnnotation(0, JPA.PRIMARY_KEY_JOIN_COLUMN, JPA.PRIMARY_KEY_JOIN_COLUMNS); + typeResource.removeAnnotation(0, JPA.PRIMARY_KEY_JOIN_COLUMN, JPA.PRIMARY_KEY_JOIN_COLUMNS); specifiedPkJoinColumns = getJavaEntity().specifiedPrimaryKeyJoinColumns(); assertEquals("FOO", specifiedPkJoinColumns.next().getName()); assertFalse(specifiedPkJoinColumns.hasNext()); - typeResource.removeSupportingAnnotation(0, JPA.PRIMARY_KEY_JOIN_COLUMN, JPA.PRIMARY_KEY_JOIN_COLUMNS); + typeResource.removeAnnotation(0, JPA.PRIMARY_KEY_JOIN_COLUMN, JPA.PRIMARY_KEY_JOIN_COLUMNS); specifiedPkJoinColumns = getJavaEntity().specifiedPrimaryKeyJoinColumns(); assertFalse(specifiedPkJoinColumns.hasNext()); } @@ -1422,7 +1424,7 @@ public class JavaEntityTests extends ContextModelTestCase getJavaEntity().addSpecifiedPrimaryKeyJoinColumn(0).setSpecifiedName("BAZ"); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - Iterator<NestableAnnotation> pkJoinColumns = typeResource.supportingAnnotations(PrimaryKeyJoinColumnAnnotation.ANNOTATION_NAME, PrimaryKeyJoinColumnsAnnotation.ANNOTATION_NAME); + Iterator<NestableAnnotation> pkJoinColumns = typeResource.annotations(PrimaryKeyJoinColumnAnnotation.ANNOTATION_NAME, PrimaryKeyJoinColumnsAnnotation.ANNOTATION_NAME); assertEquals("BAZ", ((PrimaryKeyJoinColumnAnnotation) pkJoinColumns.next()).getName()); assertEquals("BAR", ((PrimaryKeyJoinColumnAnnotation) pkJoinColumns.next()).getName()); @@ -1439,7 +1441,7 @@ public class JavaEntityTests extends ContextModelTestCase getJavaEntity().addSpecifiedPrimaryKeyJoinColumn(2).setSpecifiedName("BAZ"); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - Iterator<NestableAnnotation> pkJoinColumns = typeResource.supportingAnnotations(PrimaryKeyJoinColumnAnnotation.ANNOTATION_NAME, PrimaryKeyJoinColumnsAnnotation.ANNOTATION_NAME); + Iterator<NestableAnnotation> pkJoinColumns = typeResource.annotations(PrimaryKeyJoinColumnAnnotation.ANNOTATION_NAME, PrimaryKeyJoinColumnsAnnotation.ANNOTATION_NAME); assertEquals("FOO", ((PrimaryKeyJoinColumnAnnotation) pkJoinColumns.next()).getName()); assertEquals("BAR", ((PrimaryKeyJoinColumnAnnotation) pkJoinColumns.next()).getName()); @@ -1456,11 +1458,11 @@ public class JavaEntityTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - assertEquals(3, CollectionTools.size(typeResource.supportingAnnotations(PrimaryKeyJoinColumnAnnotation.ANNOTATION_NAME, PrimaryKeyJoinColumnsAnnotation.ANNOTATION_NAME))); + assertEquals(3, CollectionTools.size(typeResource.annotations(PrimaryKeyJoinColumnAnnotation.ANNOTATION_NAME, PrimaryKeyJoinColumnsAnnotation.ANNOTATION_NAME))); getJavaEntity().removeSpecifiedPrimaryKeyJoinColumn(1); - Iterator<NestableAnnotation> pkJoinColumnResources = typeResource.supportingAnnotations(PrimaryKeyJoinColumnAnnotation.ANNOTATION_NAME, PrimaryKeyJoinColumnsAnnotation.ANNOTATION_NAME); + Iterator<NestableAnnotation> pkJoinColumnResources = typeResource.annotations(PrimaryKeyJoinColumnAnnotation.ANNOTATION_NAME, PrimaryKeyJoinColumnsAnnotation.ANNOTATION_NAME); assertEquals("FOO", ((PrimaryKeyJoinColumnAnnotation) pkJoinColumnResources.next()).getName()); assertEquals("BAZ", ((PrimaryKeyJoinColumnAnnotation) pkJoinColumnResources.next()).getName()); assertFalse(pkJoinColumnResources.hasNext()); @@ -1472,7 +1474,7 @@ public class JavaEntityTests extends ContextModelTestCase getJavaEntity().removeSpecifiedPrimaryKeyJoinColumn(1); - pkJoinColumnResources = typeResource.supportingAnnotations(PrimaryKeyJoinColumnAnnotation.ANNOTATION_NAME, PrimaryKeyJoinColumnsAnnotation.ANNOTATION_NAME); + pkJoinColumnResources = typeResource.annotations(PrimaryKeyJoinColumnAnnotation.ANNOTATION_NAME, PrimaryKeyJoinColumnsAnnotation.ANNOTATION_NAME); assertEquals("FOO", ((PrimaryKeyJoinColumnAnnotation) pkJoinColumnResources.next()).getName()); assertFalse(pkJoinColumnResources.hasNext()); @@ -1482,12 +1484,12 @@ public class JavaEntityTests extends ContextModelTestCase getJavaEntity().removeSpecifiedPrimaryKeyJoinColumn(0); - pkJoinColumnResources = typeResource.supportingAnnotations(PrimaryKeyJoinColumnAnnotation.ANNOTATION_NAME, PrimaryKeyJoinColumnsAnnotation.ANNOTATION_NAME); + pkJoinColumnResources = typeResource.annotations(PrimaryKeyJoinColumnAnnotation.ANNOTATION_NAME, PrimaryKeyJoinColumnsAnnotation.ANNOTATION_NAME); assertFalse(pkJoinColumnResources.hasNext()); pkJoinColumns = getJavaEntity().specifiedPrimaryKeyJoinColumns(); assertFalse(pkJoinColumns.hasNext()); - assertNull(typeResource.getSupportingAnnotation(PrimaryKeyJoinColumnsAnnotation.ANNOTATION_NAME)); + assertNull(typeResource.getAnnotation(PrimaryKeyJoinColumnsAnnotation.ANNOTATION_NAME)); } public void testMoveSpecifiedPrimaryKeyJoinColumn() throws Exception { @@ -1501,7 +1503,7 @@ public class JavaEntityTests extends ContextModelTestCase entity.addSpecifiedPrimaryKeyJoinColumn(1).setSpecifiedName("BAR"); entity.addSpecifiedPrimaryKeyJoinColumn(2).setSpecifiedName("BAZ"); - ListIterator<NestableAnnotation> javaPrimaryKeyJoinColumns = typeResource.supportingAnnotations(PrimaryKeyJoinColumnAnnotation.ANNOTATION_NAME, PrimaryKeyJoinColumnsAnnotation.ANNOTATION_NAME); + Iterator<NestableAnnotation> javaPrimaryKeyJoinColumns = typeResource.annotations(PrimaryKeyJoinColumnAnnotation.ANNOTATION_NAME, PrimaryKeyJoinColumnsAnnotation.ANNOTATION_NAME); assertEquals(3, CollectionTools.size(javaPrimaryKeyJoinColumns)); @@ -1511,7 +1513,7 @@ public class JavaEntityTests extends ContextModelTestCase assertEquals("BAZ", primaryKeyJoinColumns.next().getSpecifiedName()); assertEquals("FOO", primaryKeyJoinColumns.next().getSpecifiedName()); - javaPrimaryKeyJoinColumns = typeResource.supportingAnnotations(PrimaryKeyJoinColumnAnnotation.ANNOTATION_NAME, PrimaryKeyJoinColumnsAnnotation.ANNOTATION_NAME); + javaPrimaryKeyJoinColumns = typeResource.annotations(PrimaryKeyJoinColumnAnnotation.ANNOTATION_NAME, PrimaryKeyJoinColumnsAnnotation.ANNOTATION_NAME); assertEquals("BAR", ((PrimaryKeyJoinColumnAnnotation) javaPrimaryKeyJoinColumns.next()).getName()); assertEquals("BAZ", ((PrimaryKeyJoinColumnAnnotation) javaPrimaryKeyJoinColumns.next()).getName()); assertEquals("FOO", ((PrimaryKeyJoinColumnAnnotation) javaPrimaryKeyJoinColumns.next()).getName()); @@ -1523,7 +1525,7 @@ public class JavaEntityTests extends ContextModelTestCase assertEquals("BAR", primaryKeyJoinColumns.next().getSpecifiedName()); assertEquals("FOO", primaryKeyJoinColumns.next().getSpecifiedName()); - javaPrimaryKeyJoinColumns = typeResource.supportingAnnotations(PrimaryKeyJoinColumnAnnotation.ANNOTATION_NAME, PrimaryKeyJoinColumnsAnnotation.ANNOTATION_NAME); + javaPrimaryKeyJoinColumns = typeResource.annotations(PrimaryKeyJoinColumnAnnotation.ANNOTATION_NAME, PrimaryKeyJoinColumnsAnnotation.ANNOTATION_NAME); assertEquals("BAZ", ((PrimaryKeyJoinColumnAnnotation) javaPrimaryKeyJoinColumns.next()).getName()); assertEquals("BAR", ((PrimaryKeyJoinColumnAnnotation) javaPrimaryKeyJoinColumns.next()).getName()); assertEquals("FOO", ((PrimaryKeyJoinColumnAnnotation) javaPrimaryKeyJoinColumns.next()).getName()); @@ -1536,9 +1538,9 @@ public class JavaEntityTests extends ContextModelTestCase Entity entity = getJavaEntity(); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - ((PrimaryKeyJoinColumnAnnotation) typeResource.addSupportingAnnotation(0, PrimaryKeyJoinColumnAnnotation.ANNOTATION_NAME, PrimaryKeyJoinColumnsAnnotation.ANNOTATION_NAME)).setName("FOO"); - ((PrimaryKeyJoinColumnAnnotation) typeResource.addSupportingAnnotation(1, PrimaryKeyJoinColumnAnnotation.ANNOTATION_NAME, PrimaryKeyJoinColumnsAnnotation.ANNOTATION_NAME)).setName("BAR"); - ((PrimaryKeyJoinColumnAnnotation) typeResource.addSupportingAnnotation(2, PrimaryKeyJoinColumnAnnotation.ANNOTATION_NAME, PrimaryKeyJoinColumnsAnnotation.ANNOTATION_NAME)).setName("BAZ"); + ((PrimaryKeyJoinColumnAnnotation) typeResource.addAnnotation(0, PrimaryKeyJoinColumnAnnotation.ANNOTATION_NAME, PrimaryKeyJoinColumnsAnnotation.ANNOTATION_NAME)).setName("FOO"); + ((PrimaryKeyJoinColumnAnnotation) typeResource.addAnnotation(1, PrimaryKeyJoinColumnAnnotation.ANNOTATION_NAME, PrimaryKeyJoinColumnsAnnotation.ANNOTATION_NAME)).setName("BAR"); + ((PrimaryKeyJoinColumnAnnotation) typeResource.addAnnotation(2, PrimaryKeyJoinColumnAnnotation.ANNOTATION_NAME, PrimaryKeyJoinColumnsAnnotation.ANNOTATION_NAME)).setName("BAZ"); ListIterator<PrimaryKeyJoinColumn> primaryKeyJoinColumns = entity.specifiedPrimaryKeyJoinColumns(); assertEquals("FOO", primaryKeyJoinColumns.next().getName()); @@ -1546,32 +1548,32 @@ public class JavaEntityTests extends ContextModelTestCase assertEquals("BAZ", primaryKeyJoinColumns.next().getName()); assertFalse(primaryKeyJoinColumns.hasNext()); - typeResource.moveSupportingAnnotation(2, 0, PrimaryKeyJoinColumnsAnnotation.ANNOTATION_NAME); + typeResource.moveAnnotation(2, 0, PrimaryKeyJoinColumnsAnnotation.ANNOTATION_NAME); primaryKeyJoinColumns = entity.specifiedPrimaryKeyJoinColumns(); assertEquals("BAR", primaryKeyJoinColumns.next().getName()); assertEquals("BAZ", primaryKeyJoinColumns.next().getName()); assertEquals("FOO", primaryKeyJoinColumns.next().getName()); assertFalse(primaryKeyJoinColumns.hasNext()); - typeResource.moveSupportingAnnotation(0, 1, PrimaryKeyJoinColumnsAnnotation.ANNOTATION_NAME); + typeResource.moveAnnotation(0, 1, PrimaryKeyJoinColumnsAnnotation.ANNOTATION_NAME); primaryKeyJoinColumns = entity.specifiedPrimaryKeyJoinColumns(); assertEquals("BAZ", primaryKeyJoinColumns.next().getName()); assertEquals("BAR", primaryKeyJoinColumns.next().getName()); assertEquals("FOO", primaryKeyJoinColumns.next().getName()); assertFalse(primaryKeyJoinColumns.hasNext()); - typeResource.removeSupportingAnnotation(1, PrimaryKeyJoinColumnAnnotation.ANNOTATION_NAME, PrimaryKeyJoinColumnsAnnotation.ANNOTATION_NAME); + typeResource.removeAnnotation(1, PrimaryKeyJoinColumnAnnotation.ANNOTATION_NAME, PrimaryKeyJoinColumnsAnnotation.ANNOTATION_NAME); primaryKeyJoinColumns = entity.specifiedPrimaryKeyJoinColumns(); assertEquals("BAZ", primaryKeyJoinColumns.next().getName()); assertEquals("FOO", primaryKeyJoinColumns.next().getName()); assertFalse(primaryKeyJoinColumns.hasNext()); - typeResource.removeSupportingAnnotation(1, PrimaryKeyJoinColumnAnnotation.ANNOTATION_NAME, PrimaryKeyJoinColumnsAnnotation.ANNOTATION_NAME); + typeResource.removeAnnotation(1, PrimaryKeyJoinColumnAnnotation.ANNOTATION_NAME, PrimaryKeyJoinColumnsAnnotation.ANNOTATION_NAME); primaryKeyJoinColumns = entity.specifiedPrimaryKeyJoinColumns(); assertEquals("BAZ", primaryKeyJoinColumns.next().getName()); assertFalse(primaryKeyJoinColumns.hasNext()); - typeResource.removeSupportingAnnotation(0, PrimaryKeyJoinColumnAnnotation.ANNOTATION_NAME, PrimaryKeyJoinColumnsAnnotation.ANNOTATION_NAME); + typeResource.removeAnnotation(0, PrimaryKeyJoinColumnAnnotation.ANNOTATION_NAME, PrimaryKeyJoinColumnsAnnotation.ANNOTATION_NAME); primaryKeyJoinColumns = entity.specifiedPrimaryKeyJoinColumns(); assertFalse(primaryKeyJoinColumns.hasNext()); } @@ -1742,13 +1744,13 @@ public class JavaEntityTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); //add an annotation to the resource model and verify the context model is updated - AttributeOverrideAnnotation attributeOverride = (AttributeOverrideAnnotation) typeResource.addSupportingAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + AttributeOverrideAnnotation attributeOverride = (AttributeOverrideAnnotation) typeResource.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); attributeOverride.setName("FOO"); specifiedAttributeOverrides = getJavaEntity().specifiedAttributeOverrides(); assertEquals("FOO", specifiedAttributeOverrides.next().getName()); assertFalse(specifiedAttributeOverrides.hasNext()); - attributeOverride = (AttributeOverrideAnnotation) typeResource.addSupportingAnnotation(1, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + attributeOverride = (AttributeOverrideAnnotation) typeResource.addAnnotation(1, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); attributeOverride.setName("BAR"); specifiedAttributeOverrides = getJavaEntity().specifiedAttributeOverrides(); assertEquals("FOO", specifiedAttributeOverrides.next().getName()); @@ -1756,7 +1758,7 @@ public class JavaEntityTests extends ContextModelTestCase assertFalse(specifiedAttributeOverrides.hasNext()); - attributeOverride = (AttributeOverrideAnnotation) typeResource.addSupportingAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + attributeOverride = (AttributeOverrideAnnotation) typeResource.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); attributeOverride.setName("BAZ"); specifiedAttributeOverrides = getJavaEntity().specifiedAttributeOverrides(); assertEquals("BAZ", specifiedAttributeOverrides.next().getName()); @@ -1765,26 +1767,26 @@ public class JavaEntityTests extends ContextModelTestCase assertFalse(specifiedAttributeOverrides.hasNext()); //move an annotation to the resource model and verify the context model is updated - typeResource.moveSupportingAnnotation(1, 0, JPA.ATTRIBUTE_OVERRIDES); + typeResource.moveAnnotation(1, 0, JPA.ATTRIBUTE_OVERRIDES); specifiedAttributeOverrides = getJavaEntity().specifiedAttributeOverrides(); assertEquals("FOO", specifiedAttributeOverrides.next().getName()); assertEquals("BAZ", specifiedAttributeOverrides.next().getName()); assertEquals("BAR", specifiedAttributeOverrides.next().getName()); assertFalse(specifiedAttributeOverrides.hasNext()); - typeResource.removeSupportingAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + typeResource.removeAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); specifiedAttributeOverrides = getJavaEntity().specifiedAttributeOverrides(); assertEquals("BAZ", specifiedAttributeOverrides.next().getName()); assertEquals("BAR", specifiedAttributeOverrides.next().getName()); assertFalse(specifiedAttributeOverrides.hasNext()); - typeResource.removeSupportingAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + typeResource.removeAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); specifiedAttributeOverrides = getJavaEntity().specifiedAttributeOverrides(); assertEquals("BAR", specifiedAttributeOverrides.next().getName()); assertFalse(specifiedAttributeOverrides.hasNext()); - typeResource.removeSupportingAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + typeResource.removeAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); specifiedAttributeOverrides = getJavaEntity().specifiedAttributeOverrides(); assertFalse(specifiedAttributeOverrides.hasNext()); } @@ -1802,8 +1804,8 @@ public class JavaEntityTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_SUB_TYPE_NAME); assertEquals(SUB_TYPE_NAME, typeResource.getName()); - assertNull(typeResource.getSupportingAnnotation(AttributeOverrideAnnotation.ANNOTATION_NAME)); - assertNull(typeResource.getSupportingAnnotation(AttributeOverridesAnnotation.ANNOTATION_NAME)); + assertNull(typeResource.getAnnotation(AttributeOverrideAnnotation.ANNOTATION_NAME)); + assertNull(typeResource.getAnnotation(AttributeOverridesAnnotation.ANNOTATION_NAME)); assertEquals(4, javaEntity.virtualAttributeOverridesSize()); AttributeOverride virtualAttributeOverride = javaEntity.virtualAttributeOverrides().next(); @@ -1835,8 +1837,8 @@ public class JavaEntityTests extends ContextModelTestCase fooMapping.getColumn().setSpecifiedScale(Integer.valueOf(7)); assertEquals(SUB_TYPE_NAME, typeResource.getName()); - assertNull(typeResource.getSupportingAnnotation(AttributeOverrideAnnotation.ANNOTATION_NAME)); - assertNull(typeResource.getSupportingAnnotation(AttributeOverridesAnnotation.ANNOTATION_NAME)); + assertNull(typeResource.getAnnotation(AttributeOverrideAnnotation.ANNOTATION_NAME)); + assertNull(typeResource.getAnnotation(AttributeOverridesAnnotation.ANNOTATION_NAME)); assertEquals(4, javaEntity.virtualAttributeOverridesSize()); virtualAttributeOverride = javaEntity.virtualAttributeOverrides().next(); @@ -1863,8 +1865,8 @@ public class JavaEntityTests extends ContextModelTestCase fooMapping.getColumn().setSpecifiedPrecision(null); fooMapping.getColumn().setSpecifiedScale(null); assertEquals(SUB_TYPE_NAME, typeResource.getName()); - assertNull(typeResource.getSupportingAnnotation(AttributeOverrideAnnotation.ANNOTATION_NAME)); - assertNull(typeResource.getSupportingAnnotation(AttributeOverridesAnnotation.ANNOTATION_NAME)); + assertNull(typeResource.getAnnotation(AttributeOverrideAnnotation.ANNOTATION_NAME)); + assertNull(typeResource.getAnnotation(AttributeOverridesAnnotation.ANNOTATION_NAME)); virtualAttributeOverride = javaEntity.virtualAttributeOverrides().next(); assertEquals("foo", virtualAttributeOverride.getName()); @@ -1896,8 +1898,8 @@ public class JavaEntityTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_SUB_TYPE_NAME); assertEquals(SUB_TYPE_NAME, typeResource.getName()); - assertNull(typeResource.getSupportingAnnotation(AttributeOverrideAnnotation.ANNOTATION_NAME)); - assertNull(typeResource.getSupportingAnnotation(AttributeOverridesAnnotation.ANNOTATION_NAME)); + assertNull(typeResource.getAnnotation(AttributeOverrideAnnotation.ANNOTATION_NAME)); + assertNull(typeResource.getAnnotation(AttributeOverridesAnnotation.ANNOTATION_NAME)); assertEquals(3, javaEntity.virtualAttributeOverridesSize()); AttributeOverride virtualAttributeOverride = javaEntity.virtualAttributeOverrides().next(); @@ -1913,8 +1915,8 @@ public class JavaEntityTests extends ContextModelTestCase idMapping.getColumn().setSpecifiedTable("BAR"); assertEquals(SUB_TYPE_NAME, typeResource.getName()); - assertNull(typeResource.getSupportingAnnotation(AttributeOverrideAnnotation.ANNOTATION_NAME)); - assertNull(typeResource.getSupportingAnnotation(AttributeOverridesAnnotation.ANNOTATION_NAME)); + assertNull(typeResource.getAnnotation(AttributeOverrideAnnotation.ANNOTATION_NAME)); + assertNull(typeResource.getAnnotation(AttributeOverridesAnnotation.ANNOTATION_NAME)); assertEquals(3, javaEntity.virtualAttributeOverridesSize()); virtualAttributeOverride = javaEntity.virtualAttributeOverrides().next(); @@ -1925,8 +1927,8 @@ public class JavaEntityTests extends ContextModelTestCase idMapping.getColumn().setSpecifiedName(null); idMapping.getColumn().setSpecifiedTable(null); assertEquals(SUB_TYPE_NAME, typeResource.getName()); - assertNull(typeResource.getSupportingAnnotation(AttributeOverrideAnnotation.ANNOTATION_NAME)); - assertNull(typeResource.getSupportingAnnotation(AttributeOverridesAnnotation.ANNOTATION_NAME)); + assertNull(typeResource.getAnnotation(AttributeOverrideAnnotation.ANNOTATION_NAME)); + assertNull(typeResource.getAnnotation(AttributeOverridesAnnotation.ANNOTATION_NAME)); virtualAttributeOverride = javaEntity.virtualAttributeOverrides().next(); assertEquals("id", virtualAttributeOverride.getName()); @@ -1946,9 +1948,9 @@ public class JavaEntityTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); //add an annotation to the resource model and verify the context model is updated - AttributeOverrideAnnotation attributeOverride = (AttributeOverrideAnnotation) typeResource.addSupportingAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + AttributeOverrideAnnotation attributeOverride = (AttributeOverrideAnnotation) typeResource.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); attributeOverride.setName("FOO"); - attributeOverride = (AttributeOverrideAnnotation) typeResource.addSupportingAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + attributeOverride = (AttributeOverrideAnnotation) typeResource.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); attributeOverride.setName("BAR"); assertEquals(2, getJavaEntity().specifiedAttributeOverridesSize()); @@ -1995,7 +1997,7 @@ public class JavaEntityTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_SUB_TYPE_NAME); - AttributeOverrideAnnotation annotation = (AttributeOverrideAnnotation) typeResource.addSupportingAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + AttributeOverrideAnnotation annotation = (AttributeOverrideAnnotation) typeResource.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); annotation.setName("bar"); assertEquals(5, javaEntity.attributeOverridesSize()); } @@ -2011,7 +2013,7 @@ public class JavaEntityTests extends ContextModelTestCase getJavaEntity().virtualAttributeOverrides().next().setVirtual(false); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_SUB_TYPE_NAME); - Iterator<NestableAnnotation> attributeOverrides = typeResource.supportingAnnotations(AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverridesAnnotation.ANNOTATION_NAME); + Iterator<NestableAnnotation> attributeOverrides = typeResource.annotations(AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverridesAnnotation.ANNOTATION_NAME); assertEquals("foo", ((AttributeOverrideAnnotation) attributeOverrides.next()).getName()); assertEquals("basic", ((AttributeOverrideAnnotation) attributeOverrides.next()).getName()); @@ -2031,7 +2033,7 @@ public class JavaEntityTests extends ContextModelTestCase getJavaEntity().virtualAttributeOverrides().next().setVirtual(false); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_SUB_TYPE_NAME); - Iterator<NestableAnnotation> attributeOverrides = typeResource.supportingAnnotations(AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverridesAnnotation.ANNOTATION_NAME); + Iterator<NestableAnnotation> attributeOverrides = typeResource.annotations(AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverridesAnnotation.ANNOTATION_NAME); assertEquals("basic", ((AttributeOverrideAnnotation) attributeOverrides.next()).getName()); assertEquals("foo", ((AttributeOverrideAnnotation) attributeOverrides.next()).getName()); @@ -2050,11 +2052,11 @@ public class JavaEntityTests extends ContextModelTestCase getJavaEntity().virtualAttributeOverrides().next().setVirtual(false); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_SUB_TYPE_NAME); - assertEquals(3, CollectionTools.size(typeResource.supportingAnnotations(AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverridesAnnotation.ANNOTATION_NAME))); + assertEquals(3, CollectionTools.size(typeResource.annotations(AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverridesAnnotation.ANNOTATION_NAME))); getJavaEntity().specifiedAttributeOverrides().next().setVirtual(true); - Iterator<NestableAnnotation> attributeOverrideResources = typeResource.supportingAnnotations(AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverridesAnnotation.ANNOTATION_NAME); + Iterator<NestableAnnotation> attributeOverrideResources = typeResource.annotations(AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverridesAnnotation.ANNOTATION_NAME); assertEquals("basic", ((AttributeOverrideAnnotation) attributeOverrideResources.next()).getName()); assertEquals("id", ((AttributeOverrideAnnotation) attributeOverrideResources.next()).getName()); assertFalse(attributeOverrideResources.hasNext()); @@ -2066,7 +2068,7 @@ public class JavaEntityTests extends ContextModelTestCase getJavaEntity().specifiedAttributeOverrides().next().setVirtual(true); - attributeOverrideResources = typeResource.supportingAnnotations(AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverridesAnnotation.ANNOTATION_NAME); + attributeOverrideResources = typeResource.annotations(AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverridesAnnotation.ANNOTATION_NAME); assertEquals("id", ((AttributeOverrideAnnotation) attributeOverrideResources.next()).getName()); assertFalse(attributeOverrideResources.hasNext()); @@ -2076,12 +2078,12 @@ public class JavaEntityTests extends ContextModelTestCase getJavaEntity().specifiedAttributeOverrides().next().setVirtual(true); - attributeOverrideResources = typeResource.supportingAnnotations(AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverridesAnnotation.ANNOTATION_NAME); + attributeOverrideResources = typeResource.annotations(AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverridesAnnotation.ANNOTATION_NAME); assertFalse(attributeOverrideResources.hasNext()); attributeOverrides = getJavaEntity().specifiedAttributeOverrides(); assertFalse(attributeOverrides.hasNext()); - assertNull(typeResource.getSupportingAnnotation(AttributeOverridesAnnotation.ANNOTATION_NAME)); + assertNull(typeResource.getAnnotation(AttributeOverridesAnnotation.ANNOTATION_NAME)); } public void testMoveSpecifiedAttributeOverride() throws Exception { @@ -2099,7 +2101,7 @@ public class JavaEntityTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_SUB_TYPE_NAME); - ListIterator<NestableAnnotation> javaAttributeOverrides = typeResource.supportingAnnotations(AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverridesAnnotation.ANNOTATION_NAME); + Iterator<NestableAnnotation> javaAttributeOverrides = typeResource.annotations(AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverridesAnnotation.ANNOTATION_NAME); assertEquals(3, CollectionTools.size(javaAttributeOverrides)); entity.moveSpecifiedAttributeOverride(2, 0); @@ -2108,7 +2110,7 @@ public class JavaEntityTests extends ContextModelTestCase assertEquals("id", attributeOverrides.next().getName()); assertEquals("foo", attributeOverrides.next().getName()); - javaAttributeOverrides = typeResource.supportingAnnotations(AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverridesAnnotation.ANNOTATION_NAME); + javaAttributeOverrides = typeResource.annotations(AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverridesAnnotation.ANNOTATION_NAME); assertEquals("basic", ((AttributeOverrideAnnotation) javaAttributeOverrides.next()).getName()); assertEquals("id", ((AttributeOverrideAnnotation) javaAttributeOverrides.next()).getName()); assertEquals("foo", ((AttributeOverrideAnnotation) javaAttributeOverrides.next()).getName()); @@ -2120,7 +2122,7 @@ public class JavaEntityTests extends ContextModelTestCase assertEquals("basic", attributeOverrides.next().getName()); assertEquals("foo", attributeOverrides.next().getName()); - javaAttributeOverrides = typeResource.supportingAnnotations(AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverridesAnnotation.ANNOTATION_NAME); + javaAttributeOverrides = typeResource.annotations(AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverridesAnnotation.ANNOTATION_NAME); assertEquals("id", ((AttributeOverrideAnnotation) javaAttributeOverrides.next()).getName()); assertEquals("basic", ((AttributeOverrideAnnotation) javaAttributeOverrides.next()).getName()); assertEquals("foo", ((AttributeOverrideAnnotation) javaAttributeOverrides.next()).getName()); @@ -2133,9 +2135,9 @@ public class JavaEntityTests extends ContextModelTestCase Entity entity = getJavaEntity(); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - ((AttributeOverrideAnnotation) typeResource.addSupportingAnnotation(0, AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverridesAnnotation.ANNOTATION_NAME)).setName("FOO"); - ((AttributeOverrideAnnotation) typeResource.addSupportingAnnotation(1, AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverridesAnnotation.ANNOTATION_NAME)).setName("BAR"); - ((AttributeOverrideAnnotation) typeResource.addSupportingAnnotation(2, AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverridesAnnotation.ANNOTATION_NAME)).setName("BAZ"); + ((AttributeOverrideAnnotation) typeResource.addAnnotation(0, AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverridesAnnotation.ANNOTATION_NAME)).setName("FOO"); + ((AttributeOverrideAnnotation) typeResource.addAnnotation(1, AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverridesAnnotation.ANNOTATION_NAME)).setName("BAR"); + ((AttributeOverrideAnnotation) typeResource.addAnnotation(2, AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverridesAnnotation.ANNOTATION_NAME)).setName("BAZ"); ListIterator<AttributeOverride> attributeOverrides = entity.specifiedAttributeOverrides(); assertEquals("FOO", attributeOverrides.next().getName()); @@ -2143,32 +2145,32 @@ public class JavaEntityTests extends ContextModelTestCase assertEquals("BAZ", attributeOverrides.next().getName()); assertFalse(attributeOverrides.hasNext()); - typeResource.moveSupportingAnnotation(2, 0, AttributeOverridesAnnotation.ANNOTATION_NAME); + typeResource.moveAnnotation(2, 0, AttributeOverridesAnnotation.ANNOTATION_NAME); attributeOverrides = entity.specifiedAttributeOverrides(); assertEquals("BAR", attributeOverrides.next().getName()); assertEquals("BAZ", attributeOverrides.next().getName()); assertEquals("FOO", attributeOverrides.next().getName()); assertFalse(attributeOverrides.hasNext()); - typeResource.moveSupportingAnnotation(0, 1, AttributeOverridesAnnotation.ANNOTATION_NAME); + typeResource.moveAnnotation(0, 1, AttributeOverridesAnnotation.ANNOTATION_NAME); attributeOverrides = entity.specifiedAttributeOverrides(); assertEquals("BAZ", attributeOverrides.next().getName()); assertEquals("BAR", attributeOverrides.next().getName()); assertEquals("FOO", attributeOverrides.next().getName()); assertFalse(attributeOverrides.hasNext()); - typeResource.removeSupportingAnnotation(1, AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverridesAnnotation.ANNOTATION_NAME); + typeResource.removeAnnotation(1, AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverridesAnnotation.ANNOTATION_NAME); attributeOverrides = entity.specifiedAttributeOverrides(); assertEquals("BAZ", attributeOverrides.next().getName()); assertEquals("FOO", attributeOverrides.next().getName()); assertFalse(attributeOverrides.hasNext()); - typeResource.removeSupportingAnnotation(1, AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverridesAnnotation.ANNOTATION_NAME); + typeResource.removeAnnotation(1, AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverridesAnnotation.ANNOTATION_NAME); attributeOverrides = entity.specifiedAttributeOverrides(); assertEquals("BAZ", attributeOverrides.next().getName()); assertFalse(attributeOverrides.hasNext()); - typeResource.removeSupportingAnnotation(0, AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverridesAnnotation.ANNOTATION_NAME); + typeResource.removeAnnotation(0, AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverridesAnnotation.ANNOTATION_NAME); attributeOverrides = entity.specifiedAttributeOverrides(); assertFalse(attributeOverrides.hasNext()); } @@ -2281,13 +2283,13 @@ public class JavaEntityTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); //add an annotation to the resource model and verify the context model is updated - AssociationOverrideAnnotation associationOverride = (AssociationOverrideAnnotation) typeResource.addSupportingAnnotation(0, JPA.ASSOCIATION_OVERRIDE, JPA.ASSOCIATION_OVERRIDES); + AssociationOverrideAnnotation associationOverride = (AssociationOverrideAnnotation) typeResource.addAnnotation(0, JPA.ASSOCIATION_OVERRIDE, JPA.ASSOCIATION_OVERRIDES); associationOverride.setName("FOO"); specifiedAssociationOverrides = getJavaEntity().specifiedAssociationOverrides(); assertEquals("FOO", specifiedAssociationOverrides.next().getName()); assertFalse(specifiedAssociationOverrides.hasNext()); - associationOverride = (AssociationOverrideAnnotation) typeResource.addSupportingAnnotation(1, JPA.ASSOCIATION_OVERRIDE, JPA.ASSOCIATION_OVERRIDES); + associationOverride = (AssociationOverrideAnnotation) typeResource.addAnnotation(1, JPA.ASSOCIATION_OVERRIDE, JPA.ASSOCIATION_OVERRIDES); associationOverride.setName("BAR"); specifiedAssociationOverrides = getJavaEntity().specifiedAssociationOverrides(); assertEquals("FOO", specifiedAssociationOverrides.next().getName()); @@ -2295,7 +2297,7 @@ public class JavaEntityTests extends ContextModelTestCase assertFalse(specifiedAssociationOverrides.hasNext()); - associationOverride = (AssociationOverrideAnnotation) typeResource.addSupportingAnnotation(0, JPA.ASSOCIATION_OVERRIDE, JPA.ASSOCIATION_OVERRIDES); + associationOverride = (AssociationOverrideAnnotation) typeResource.addAnnotation(0, JPA.ASSOCIATION_OVERRIDE, JPA.ASSOCIATION_OVERRIDES); associationOverride.setName("BAZ"); specifiedAssociationOverrides = getJavaEntity().specifiedAssociationOverrides(); assertEquals("BAZ", specifiedAssociationOverrides.next().getName()); @@ -2304,26 +2306,26 @@ public class JavaEntityTests extends ContextModelTestCase assertFalse(specifiedAssociationOverrides.hasNext()); //move an annotation to the resource model and verify the context model is updated - typeResource.moveSupportingAnnotation(1, 0, JPA.ASSOCIATION_OVERRIDES); + typeResource.moveAnnotation(1, 0, JPA.ASSOCIATION_OVERRIDES); specifiedAssociationOverrides = getJavaEntity().specifiedAssociationOverrides(); assertEquals("FOO", specifiedAssociationOverrides.next().getName()); assertEquals("BAZ", specifiedAssociationOverrides.next().getName()); assertEquals("BAR", specifiedAssociationOverrides.next().getName()); assertFalse(specifiedAssociationOverrides.hasNext()); - typeResource.removeSupportingAnnotation(0, JPA.ASSOCIATION_OVERRIDE, JPA.ASSOCIATION_OVERRIDES); + typeResource.removeAnnotation(0, JPA.ASSOCIATION_OVERRIDE, JPA.ASSOCIATION_OVERRIDES); specifiedAssociationOverrides = getJavaEntity().specifiedAssociationOverrides(); assertEquals("BAZ", specifiedAssociationOverrides.next().getName()); assertEquals("BAR", specifiedAssociationOverrides.next().getName()); assertFalse(specifiedAssociationOverrides.hasNext()); - typeResource.removeSupportingAnnotation(0, JPA.ASSOCIATION_OVERRIDE, JPA.ASSOCIATION_OVERRIDES); + typeResource.removeAnnotation(0, JPA.ASSOCIATION_OVERRIDE, JPA.ASSOCIATION_OVERRIDES); specifiedAssociationOverrides = getJavaEntity().specifiedAssociationOverrides(); assertEquals("BAR", specifiedAssociationOverrides.next().getName()); assertFalse(specifiedAssociationOverrides.hasNext()); - typeResource.removeSupportingAnnotation(0, JPA.ASSOCIATION_OVERRIDE, JPA.ASSOCIATION_OVERRIDES); + typeResource.removeAnnotation(0, JPA.ASSOCIATION_OVERRIDE, JPA.ASSOCIATION_OVERRIDES); specifiedAssociationOverrides = getJavaEntity().specifiedAssociationOverrides(); assertFalse(specifiedAssociationOverrides.hasNext()); } @@ -2341,8 +2343,8 @@ public class JavaEntityTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_SUB_TYPE_NAME); assertEquals(SUB_TYPE_NAME, typeResource.getName()); - assertNull(typeResource.getSupportingAnnotation(AssociationOverrideAnnotation.ANNOTATION_NAME)); - assertNull(typeResource.getSupportingAnnotation(AssociationOverridesAnnotation.ANNOTATION_NAME)); + assertNull(typeResource.getAnnotation(AssociationOverrideAnnotation.ANNOTATION_NAME)); + assertNull(typeResource.getAnnotation(AssociationOverridesAnnotation.ANNOTATION_NAME)); assertEquals(2, javaEntity.virtualAssociationOverridesSize()); AssociationOverride virtualAssociationOverride = javaEntity.virtualAssociationOverrides().next(); @@ -2372,8 +2374,8 @@ public class JavaEntityTests extends ContextModelTestCase joinColumn.setSpecifiedNullable(Boolean.FALSE); assertEquals(SUB_TYPE_NAME, typeResource.getName()); - assertNull(typeResource.getSupportingAnnotation(AssociationOverrideAnnotation.ANNOTATION_NAME)); - assertNull(typeResource.getSupportingAnnotation(AssociationOverridesAnnotation.ANNOTATION_NAME)); + assertNull(typeResource.getAnnotation(AssociationOverrideAnnotation.ANNOTATION_NAME)); + assertNull(typeResource.getAnnotation(AssociationOverridesAnnotation.ANNOTATION_NAME)); assertEquals(2, javaEntity.virtualAssociationOverridesSize()); virtualAssociationOverride = javaEntity.virtualAssociationOverrides().next(); @@ -2401,8 +2403,8 @@ public class JavaEntityTests extends ContextModelTestCase //idMapping.getColumn().setSpecifiedName(null); //idMapping.getColumn().setSpecifiedTable(null); assertEquals(SUB_TYPE_NAME, typeResource.getName()); - assertNull(typeResource.getSupportingAnnotation(AssociationOverrideAnnotation.ANNOTATION_NAME)); - assertNull(typeResource.getSupportingAnnotation(AssociationOverridesAnnotation.ANNOTATION_NAME)); + assertNull(typeResource.getAnnotation(AssociationOverrideAnnotation.ANNOTATION_NAME)); + assertNull(typeResource.getAnnotation(AssociationOverridesAnnotation.ANNOTATION_NAME)); virtualAssociationOverride = javaEntity.virtualAssociationOverrides().next(); assertEquals("oneToOne", virtualAssociationOverride.getName()); @@ -2464,9 +2466,9 @@ public class JavaEntityTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); //add an annotation to the resource model and verify the context model is updated - AssociationOverrideAnnotation associationOverride = (AssociationOverrideAnnotation) typeResource.addSupportingAnnotation(0, JPA.ASSOCIATION_OVERRIDE, JPA.ASSOCIATION_OVERRIDES); + AssociationOverrideAnnotation associationOverride = (AssociationOverrideAnnotation) typeResource.addAnnotation(0, JPA.ASSOCIATION_OVERRIDE, JPA.ASSOCIATION_OVERRIDES); associationOverride.setName("FOO"); - associationOverride = (AssociationOverrideAnnotation) typeResource.addSupportingAnnotation(0, JPA.ASSOCIATION_OVERRIDE, JPA.ASSOCIATION_OVERRIDES); + associationOverride = (AssociationOverrideAnnotation) typeResource.addAnnotation(0, JPA.ASSOCIATION_OVERRIDE, JPA.ASSOCIATION_OVERRIDES); associationOverride.setName("BAR"); assertEquals(2, getJavaEntity().specifiedAssociationOverridesSize()); @@ -2507,7 +2509,7 @@ public class JavaEntityTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_SUB_TYPE_NAME); - AssociationOverrideAnnotation annotation = (AssociationOverrideAnnotation) typeResource.addSupportingAnnotation(0, JPA.ASSOCIATION_OVERRIDE, JPA.ASSOCIATION_OVERRIDES); + AssociationOverrideAnnotation annotation = (AssociationOverrideAnnotation) typeResource.addAnnotation(0, JPA.ASSOCIATION_OVERRIDE, JPA.ASSOCIATION_OVERRIDES); annotation.setName("bar"); assertEquals(3, javaEntity.associationOverridesSize()); } @@ -2523,7 +2525,7 @@ public class JavaEntityTests extends ContextModelTestCase getJavaEntity().virtualAssociationOverrides().next().setVirtual(false); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_SUB_TYPE_NAME); - Iterator<NestableAnnotation> associationOverrides = typeResource.supportingAnnotations(AssociationOverrideAnnotation.ANNOTATION_NAME, AssociationOverridesAnnotation.ANNOTATION_NAME); + Iterator<NestableAnnotation> associationOverrides = typeResource.annotations(AssociationOverrideAnnotation.ANNOTATION_NAME, AssociationOverridesAnnotation.ANNOTATION_NAME); assertEquals("oneToOne", ((AssociationOverrideAnnotation) associationOverrides.next()).getName()); assertEquals("manyToOne", ((AssociationOverrideAnnotation) associationOverrides.next()).getName()); @@ -2543,7 +2545,7 @@ public class JavaEntityTests extends ContextModelTestCase getJavaEntity().virtualAssociationOverrides().next().setVirtual(false); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_SUB_TYPE_NAME); - Iterator<NestableAnnotation> associationOverrides = typeResource.supportingAnnotations(AssociationOverrideAnnotation.ANNOTATION_NAME, AssociationOverridesAnnotation.ANNOTATION_NAME); + Iterator<NestableAnnotation> associationOverrides = typeResource.annotations(AssociationOverrideAnnotation.ANNOTATION_NAME, AssociationOverridesAnnotation.ANNOTATION_NAME); assertEquals("manyToOne", ((AssociationOverrideAnnotation) associationOverrides.next()).getName()); assertEquals("oneToOne", ((AssociationOverrideAnnotation) associationOverrides.next()).getName()); @@ -2561,11 +2563,11 @@ public class JavaEntityTests extends ContextModelTestCase getJavaEntity().virtualAssociationOverrides().next().setVirtual(false); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_SUB_TYPE_NAME); - assertEquals(2, CollectionTools.size(typeResource.supportingAnnotations(AssociationOverrideAnnotation.ANNOTATION_NAME, AssociationOverridesAnnotation.ANNOTATION_NAME))); + assertEquals(2, CollectionTools.size(typeResource.annotations(AssociationOverrideAnnotation.ANNOTATION_NAME, AssociationOverridesAnnotation.ANNOTATION_NAME))); getJavaEntity().specifiedAssociationOverrides().next().setVirtual(true); - Iterator<NestableAnnotation> associationOverrideResources = typeResource.supportingAnnotations(AssociationOverrideAnnotation.ANNOTATION_NAME, AssociationOverridesAnnotation.ANNOTATION_NAME); + Iterator<NestableAnnotation> associationOverrideResources = typeResource.annotations(AssociationOverrideAnnotation.ANNOTATION_NAME, AssociationOverridesAnnotation.ANNOTATION_NAME); assertEquals("manyToOne", ((AssociationOverrideAnnotation) associationOverrideResources.next()).getName()); assertFalse(associationOverrideResources.hasNext()); @@ -2575,12 +2577,12 @@ public class JavaEntityTests extends ContextModelTestCase getJavaEntity().specifiedAssociationOverrides().next().setVirtual(true); - associationOverrideResources = typeResource.supportingAnnotations(AssociationOverrideAnnotation.ANNOTATION_NAME, AssociationOverridesAnnotation.ANNOTATION_NAME); + associationOverrideResources = typeResource.annotations(AssociationOverrideAnnotation.ANNOTATION_NAME, AssociationOverridesAnnotation.ANNOTATION_NAME); assertFalse(associationOverrideResources.hasNext()); associationOverrides = getJavaEntity().specifiedAssociationOverrides(); assertFalse(associationOverrides.hasNext()); - assertNull(typeResource.getSupportingAnnotation(AssociationOverridesAnnotation.ANNOTATION_NAME)); + assertNull(typeResource.getAnnotation(AssociationOverridesAnnotation.ANNOTATION_NAME)); } public void testMoveSpecifiedAssociationOverride() throws Exception { @@ -2597,7 +2599,7 @@ public class JavaEntityTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_SUB_TYPE_NAME); - ListIterator<NestableAnnotation> javaAssociationOverrides = typeResource.supportingAnnotations(AssociationOverrideAnnotation.ANNOTATION_NAME, AssociationOverridesAnnotation.ANNOTATION_NAME); + Iterator<NestableAnnotation> javaAssociationOverrides = typeResource.annotations(AssociationOverrideAnnotation.ANNOTATION_NAME, AssociationOverridesAnnotation.ANNOTATION_NAME); assertEquals(2, CollectionTools.size(javaAssociationOverrides)); @@ -2606,7 +2608,7 @@ public class JavaEntityTests extends ContextModelTestCase assertEquals("manyToOne", associationOverrides.next().getName()); assertEquals("oneToOne", associationOverrides.next().getName()); - javaAssociationOverrides = typeResource.supportingAnnotations(AssociationOverrideAnnotation.ANNOTATION_NAME, AssociationOverridesAnnotation.ANNOTATION_NAME); + javaAssociationOverrides = typeResource.annotations(AssociationOverrideAnnotation.ANNOTATION_NAME, AssociationOverridesAnnotation.ANNOTATION_NAME); assertEquals("manyToOne", ((AssociationOverrideAnnotation) javaAssociationOverrides.next()).getName()); assertEquals("oneToOne", ((AssociationOverrideAnnotation) javaAssociationOverrides.next()).getName()); @@ -2616,7 +2618,7 @@ public class JavaEntityTests extends ContextModelTestCase assertEquals("oneToOne", associationOverrides.next().getName()); assertEquals("manyToOne", associationOverrides.next().getName()); - javaAssociationOverrides = typeResource.supportingAnnotations(AssociationOverrideAnnotation.ANNOTATION_NAME, AssociationOverridesAnnotation.ANNOTATION_NAME); + javaAssociationOverrides = typeResource.annotations(AssociationOverrideAnnotation.ANNOTATION_NAME, AssociationOverridesAnnotation.ANNOTATION_NAME); assertEquals("oneToOne", ((AssociationOverrideAnnotation) javaAssociationOverrides.next()).getName()); assertEquals("manyToOne", ((AssociationOverrideAnnotation) javaAssociationOverrides.next()).getName()); } @@ -2628,9 +2630,9 @@ public class JavaEntityTests extends ContextModelTestCase Entity entity = getJavaEntity(); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - ((AssociationOverrideAnnotation) typeResource.addSupportingAnnotation(0, AssociationOverrideAnnotation.ANNOTATION_NAME, AssociationOverridesAnnotation.ANNOTATION_NAME)).setName("FOO"); - ((AssociationOverrideAnnotation) typeResource.addSupportingAnnotation(1, AssociationOverrideAnnotation.ANNOTATION_NAME, AssociationOverridesAnnotation.ANNOTATION_NAME)).setName("BAR"); - ((AssociationOverrideAnnotation) typeResource.addSupportingAnnotation(2, AssociationOverrideAnnotation.ANNOTATION_NAME, AssociationOverridesAnnotation.ANNOTATION_NAME)).setName("BAZ"); + ((AssociationOverrideAnnotation) typeResource.addAnnotation(0, AssociationOverrideAnnotation.ANNOTATION_NAME, AssociationOverridesAnnotation.ANNOTATION_NAME)).setName("FOO"); + ((AssociationOverrideAnnotation) typeResource.addAnnotation(1, AssociationOverrideAnnotation.ANNOTATION_NAME, AssociationOverridesAnnotation.ANNOTATION_NAME)).setName("BAR"); + ((AssociationOverrideAnnotation) typeResource.addAnnotation(2, AssociationOverrideAnnotation.ANNOTATION_NAME, AssociationOverridesAnnotation.ANNOTATION_NAME)).setName("BAZ"); ListIterator<AssociationOverride> associationOverrides = entity.specifiedAssociationOverrides(); assertEquals("FOO", associationOverrides.next().getName()); @@ -2638,32 +2640,32 @@ public class JavaEntityTests extends ContextModelTestCase assertEquals("BAZ", associationOverrides.next().getName()); assertFalse(associationOverrides.hasNext()); - typeResource.moveSupportingAnnotation(2, 0, AssociationOverridesAnnotation.ANNOTATION_NAME); + typeResource.moveAnnotation(2, 0, AssociationOverridesAnnotation.ANNOTATION_NAME); associationOverrides = entity.specifiedAssociationOverrides(); assertEquals("BAR", associationOverrides.next().getName()); assertEquals("BAZ", associationOverrides.next().getName()); assertEquals("FOO", associationOverrides.next().getName()); assertFalse(associationOverrides.hasNext()); - typeResource.moveSupportingAnnotation(0, 1, AssociationOverridesAnnotation.ANNOTATION_NAME); + typeResource.moveAnnotation(0, 1, AssociationOverridesAnnotation.ANNOTATION_NAME); associationOverrides = entity.specifiedAssociationOverrides(); assertEquals("BAZ", associationOverrides.next().getName()); assertEquals("BAR", associationOverrides.next().getName()); assertEquals("FOO", associationOverrides.next().getName()); assertFalse(associationOverrides.hasNext()); - typeResource.removeSupportingAnnotation(1, AssociationOverrideAnnotation.ANNOTATION_NAME, AssociationOverridesAnnotation.ANNOTATION_NAME); + typeResource.removeAnnotation(1, AssociationOverrideAnnotation.ANNOTATION_NAME, AssociationOverridesAnnotation.ANNOTATION_NAME); associationOverrides = entity.specifiedAssociationOverrides(); assertEquals("BAZ", associationOverrides.next().getName()); assertEquals("FOO", associationOverrides.next().getName()); assertFalse(associationOverrides.hasNext()); - typeResource.removeSupportingAnnotation(1, AssociationOverrideAnnotation.ANNOTATION_NAME, AssociationOverridesAnnotation.ANNOTATION_NAME); + typeResource.removeAnnotation(1, AssociationOverrideAnnotation.ANNOTATION_NAME, AssociationOverridesAnnotation.ANNOTATION_NAME); associationOverrides = entity.specifiedAssociationOverrides(); assertEquals("BAZ", associationOverrides.next().getName()); assertFalse(associationOverrides.hasNext()); - typeResource.removeSupportingAnnotation(0, AssociationOverrideAnnotation.ANNOTATION_NAME, AssociationOverridesAnnotation.ANNOTATION_NAME); + typeResource.removeAnnotation(0, AssociationOverrideAnnotation.ANNOTATION_NAME, AssociationOverridesAnnotation.ANNOTATION_NAME); associationOverrides = entity.specifiedAssociationOverrides(); assertFalse(associationOverrides.hasNext()); } @@ -2706,20 +2708,20 @@ public class JavaEntityTests extends ContextModelTestCase NamedQuery namedQuery1 = entity.getQueryContainer().addNamedQuery(0); namedQuery1.setName("FOO"); - ListIterator<NestableAnnotation> javaNamedQueries = typeResource.supportingAnnotations(NamedQueryAnnotation.ANNOTATION_NAME, NamedQueriesAnnotation.ANNOTATION_NAME); + Iterator<NestableAnnotation> javaNamedQueries = typeResource.annotations(NamedQueryAnnotation.ANNOTATION_NAME, NamedQueriesAnnotation.ANNOTATION_NAME); assertEquals("FOO", ((NamedQueryAnnotation) javaNamedQueries.next()).getName()); NamedQuery namedQuery2 = entity.getQueryContainer().addNamedQuery(0); namedQuery2.setName("BAR"); - javaNamedQueries = typeResource.supportingAnnotations(NamedQueryAnnotation.ANNOTATION_NAME, NamedQueriesAnnotation.ANNOTATION_NAME); + javaNamedQueries = typeResource.annotations(NamedQueryAnnotation.ANNOTATION_NAME, NamedQueriesAnnotation.ANNOTATION_NAME); assertEquals("BAR", ((NamedQueryAnnotation) javaNamedQueries.next()).getName()); assertEquals("FOO", ((NamedQueryAnnotation) javaNamedQueries.next()).getName()); NamedQuery namedQuery3 = entity.getQueryContainer().addNamedQuery(1); namedQuery3.setName("BAZ"); - javaNamedQueries = typeResource.supportingAnnotations(NamedQueryAnnotation.ANNOTATION_NAME, NamedQueriesAnnotation.ANNOTATION_NAME); + javaNamedQueries = typeResource.annotations(NamedQueryAnnotation.ANNOTATION_NAME, NamedQueriesAnnotation.ANNOTATION_NAME); assertEquals("BAR", ((NamedQueryAnnotation) javaNamedQueries.next()).getName()); assertEquals("BAZ", ((NamedQueryAnnotation) javaNamedQueries.next()).getName()); assertEquals("FOO", ((NamedQueryAnnotation) javaNamedQueries.next()).getName()); @@ -2748,24 +2750,24 @@ public class JavaEntityTests extends ContextModelTestCase entity.getQueryContainer().addNamedQuery(1).setName("BAR"); entity.getQueryContainer().addNamedQuery(2).setName("BAZ"); - ListIterator<NestableAnnotation> javaNamedQueries = typeResource.supportingAnnotations(NamedQueryAnnotation.ANNOTATION_NAME, NamedQueriesAnnotation.ANNOTATION_NAME); + Iterator<NestableAnnotation> javaNamedQueries = typeResource.annotations(NamedQueryAnnotation.ANNOTATION_NAME, NamedQueriesAnnotation.ANNOTATION_NAME); assertEquals(3, CollectionTools.size(javaNamedQueries)); entity.getQueryContainer().removeNamedQuery(0); - javaNamedQueries = typeResource.supportingAnnotations(NamedQueryAnnotation.ANNOTATION_NAME, NamedQueriesAnnotation.ANNOTATION_NAME); + javaNamedQueries = typeResource.annotations(NamedQueryAnnotation.ANNOTATION_NAME, NamedQueriesAnnotation.ANNOTATION_NAME); assertEquals(2, CollectionTools.size(javaNamedQueries)); - javaNamedQueries = typeResource.supportingAnnotations(NamedQueryAnnotation.ANNOTATION_NAME, NamedQueriesAnnotation.ANNOTATION_NAME); + javaNamedQueries = typeResource.annotations(NamedQueryAnnotation.ANNOTATION_NAME, NamedQueriesAnnotation.ANNOTATION_NAME); assertEquals("BAR", ((NamedQueryAnnotation) javaNamedQueries.next()).getName()); assertEquals("BAZ", ((NamedQueryAnnotation) javaNamedQueries.next()).getName()); entity.getQueryContainer().removeNamedQuery(0); - javaNamedQueries = typeResource.supportingAnnotations(NamedQueryAnnotation.ANNOTATION_NAME, NamedQueriesAnnotation.ANNOTATION_NAME); + javaNamedQueries = typeResource.annotations(NamedQueryAnnotation.ANNOTATION_NAME, NamedQueriesAnnotation.ANNOTATION_NAME); assertEquals(1, CollectionTools.size(javaNamedQueries)); - javaNamedQueries = typeResource.supportingAnnotations(NamedQueryAnnotation.ANNOTATION_NAME, NamedQueriesAnnotation.ANNOTATION_NAME); + javaNamedQueries = typeResource.annotations(NamedQueryAnnotation.ANNOTATION_NAME, NamedQueriesAnnotation.ANNOTATION_NAME); assertEquals("BAZ", ((NamedQueryAnnotation) javaNamedQueries.next()).getName()); entity.getQueryContainer().removeNamedQuery(0); - javaNamedQueries = typeResource.supportingAnnotations(NamedQueryAnnotation.ANNOTATION_NAME, NamedQueriesAnnotation.ANNOTATION_NAME); + javaNamedQueries = typeResource.annotations(NamedQueryAnnotation.ANNOTATION_NAME, NamedQueriesAnnotation.ANNOTATION_NAME); assertEquals(0, CollectionTools.size(javaNamedQueries)); } @@ -2779,7 +2781,7 @@ public class JavaEntityTests extends ContextModelTestCase entity.getQueryContainer().addNamedQuery(0).setName("FOO"); - NamedNativeQueryAnnotation nativeQuery = (NamedNativeQueryAnnotation) typeResource.addSupportingAnnotation(0, JPA.NAMED_NATIVE_QUERY, JPA.NAMED_NATIVE_QUERIES); + NamedNativeQueryAnnotation nativeQuery = (NamedNativeQueryAnnotation) typeResource.addAnnotation(0, JPA.NAMED_NATIVE_QUERY, JPA.NAMED_NATIVE_QUERIES); nativeQuery.setName("BAR"); assertEquals(1, entity.getQueryContainer().namedNativeQueriesSize()); @@ -2797,7 +2799,7 @@ public class JavaEntityTests extends ContextModelTestCase entity.getQueryContainer().addNamedNativeQuery(0).setName("FOO"); - NamedQueryAnnotation namedQuery = (NamedQueryAnnotation) typeResource.addSupportingAnnotation(0, JPA.NAMED_QUERY, JPA.NAMED_QUERIES); + NamedQueryAnnotation namedQuery = (NamedQueryAnnotation) typeResource.addAnnotation(0, JPA.NAMED_QUERY, JPA.NAMED_QUERIES); namedQuery.setName("BAR"); assertEquals(1, entity.getQueryContainer().namedQueriesSize()); @@ -2816,7 +2818,7 @@ public class JavaEntityTests extends ContextModelTestCase entity.getQueryContainer().addNamedQuery(1).setName("BAR"); entity.getQueryContainer().addNamedQuery(2).setName("BAZ"); - ListIterator<NestableAnnotation> javaNamedQueries = typeResource.supportingAnnotations(NamedQueryAnnotation.ANNOTATION_NAME, NamedQueriesAnnotation.ANNOTATION_NAME); + Iterator<NestableAnnotation> javaNamedQueries = typeResource.annotations(NamedQueryAnnotation.ANNOTATION_NAME, NamedQueriesAnnotation.ANNOTATION_NAME); assertEquals(3, CollectionTools.size(javaNamedQueries)); @@ -2826,7 +2828,7 @@ public class JavaEntityTests extends ContextModelTestCase assertEquals("BAZ", namedQueries.next().getName()); assertEquals("FOO", namedQueries.next().getName()); - javaNamedQueries = typeResource.supportingAnnotations(NamedQueryAnnotation.ANNOTATION_NAME, NamedQueriesAnnotation.ANNOTATION_NAME); + javaNamedQueries = typeResource.annotations(NamedQueryAnnotation.ANNOTATION_NAME, NamedQueriesAnnotation.ANNOTATION_NAME); assertEquals("BAR", ((NamedQueryAnnotation) javaNamedQueries.next()).getName()); assertEquals("BAZ", ((NamedQueryAnnotation) javaNamedQueries.next()).getName()); assertEquals("FOO", ((NamedQueryAnnotation) javaNamedQueries.next()).getName()); @@ -2838,7 +2840,7 @@ public class JavaEntityTests extends ContextModelTestCase assertEquals("BAR", namedQueries.next().getName()); assertEquals("FOO", namedQueries.next().getName()); - javaNamedQueries = typeResource.supportingAnnotations(NamedQueryAnnotation.ANNOTATION_NAME, NamedQueriesAnnotation.ANNOTATION_NAME); + javaNamedQueries = typeResource.annotations(NamedQueryAnnotation.ANNOTATION_NAME, NamedQueriesAnnotation.ANNOTATION_NAME); assertEquals("BAZ", ((NamedQueryAnnotation) javaNamedQueries.next()).getName()); assertEquals("BAR", ((NamedQueryAnnotation) javaNamedQueries.next()).getName()); assertEquals("FOO", ((NamedQueryAnnotation) javaNamedQueries.next()).getName()); @@ -2853,9 +2855,9 @@ public class JavaEntityTests extends ContextModelTestCase assertEquals(0, entity.getPersistenceUnit().queriesSize()); - ((NamedQueryAnnotation) typeResource.addSupportingAnnotation(0, NamedQueryAnnotation.ANNOTATION_NAME, NamedQueriesAnnotation.ANNOTATION_NAME)).setName("FOO"); - ((NamedQueryAnnotation) typeResource.addSupportingAnnotation(1, NamedQueryAnnotation.ANNOTATION_NAME, NamedQueriesAnnotation.ANNOTATION_NAME)).setName("BAR"); - ((NamedQueryAnnotation) typeResource.addSupportingAnnotation(2, NamedQueryAnnotation.ANNOTATION_NAME, NamedQueriesAnnotation.ANNOTATION_NAME)).setName("BAZ"); + ((NamedQueryAnnotation) typeResource.addAnnotation(0, NamedQueryAnnotation.ANNOTATION_NAME, NamedQueriesAnnotation.ANNOTATION_NAME)).setName("FOO"); + ((NamedQueryAnnotation) typeResource.addAnnotation(1, NamedQueryAnnotation.ANNOTATION_NAME, NamedQueriesAnnotation.ANNOTATION_NAME)).setName("BAR"); + ((NamedQueryAnnotation) typeResource.addAnnotation(2, NamedQueryAnnotation.ANNOTATION_NAME, NamedQueriesAnnotation.ANNOTATION_NAME)).setName("BAZ"); ListIterator<JavaNamedQuery> namedQueries = entity.getQueryContainer().namedQueries(); assertEquals("FOO", namedQueries.next().getName()); assertEquals("BAR", namedQueries.next().getName()); @@ -2863,34 +2865,34 @@ public class JavaEntityTests extends ContextModelTestCase assertFalse(namedQueries.hasNext()); assertEquals(3, entity.getPersistenceUnit().queriesSize()); - typeResource.moveSupportingAnnotation(2, 0, NamedQueriesAnnotation.ANNOTATION_NAME); + typeResource.moveAnnotation(2, 0, NamedQueriesAnnotation.ANNOTATION_NAME); namedQueries = entity.getQueryContainer().namedQueries(); assertEquals("BAR", namedQueries.next().getName()); assertEquals("BAZ", namedQueries.next().getName()); assertEquals("FOO", namedQueries.next().getName()); assertFalse(namedQueries.hasNext()); - typeResource.moveSupportingAnnotation(0, 1, NamedQueriesAnnotation.ANNOTATION_NAME); + typeResource.moveAnnotation(0, 1, NamedQueriesAnnotation.ANNOTATION_NAME); namedQueries = entity.getQueryContainer().namedQueries(); assertEquals("BAZ", namedQueries.next().getName()); assertEquals("BAR", namedQueries.next().getName()); assertEquals("FOO", namedQueries.next().getName()); assertFalse(namedQueries.hasNext()); - typeResource.removeSupportingAnnotation(1, NamedQueryAnnotation.ANNOTATION_NAME, NamedQueriesAnnotation.ANNOTATION_NAME); + typeResource.removeAnnotation(1, NamedQueryAnnotation.ANNOTATION_NAME, NamedQueriesAnnotation.ANNOTATION_NAME); namedQueries = entity.getQueryContainer().namedQueries(); assertEquals("BAZ", namedQueries.next().getName()); assertEquals("FOO", namedQueries.next().getName()); assertFalse(namedQueries.hasNext()); assertEquals(2, entity.getPersistenceUnit().queriesSize()); - typeResource.removeSupportingAnnotation(1, NamedQueryAnnotation.ANNOTATION_NAME, NamedQueriesAnnotation.ANNOTATION_NAME); + typeResource.removeAnnotation(1, NamedQueryAnnotation.ANNOTATION_NAME, NamedQueriesAnnotation.ANNOTATION_NAME); namedQueries = entity.getQueryContainer().namedQueries(); assertEquals("BAZ", namedQueries.next().getName()); assertFalse(namedQueries.hasNext()); assertEquals(1, entity.getPersistenceUnit().queriesSize()); - typeResource.removeSupportingAnnotation(0, NamedQueryAnnotation.ANNOTATION_NAME, NamedQueriesAnnotation.ANNOTATION_NAME); + typeResource.removeAnnotation(0, NamedQueryAnnotation.ANNOTATION_NAME, NamedQueriesAnnotation.ANNOTATION_NAME); namedQueries = entity.getQueryContainer().namedQueries(); assertFalse(namedQueries.hasNext()); assertEquals(0, entity.getPersistenceUnit().queriesSize()); @@ -2905,9 +2907,9 @@ public class JavaEntityTests extends ContextModelTestCase assertEquals(0, entity.getQueryContainer().namedQueriesSize()); - ((NamedQueryAnnotation) typeResource.addSupportingAnnotation(0, NamedQueryAnnotation.ANNOTATION_NAME, NamedQueriesAnnotation.ANNOTATION_NAME)).setName("FOO"); - ((NamedQueryAnnotation) typeResource.addSupportingAnnotation(1, NamedQueryAnnotation.ANNOTATION_NAME, NamedQueriesAnnotation.ANNOTATION_NAME)).setName("BAR"); - ((NamedQueryAnnotation) typeResource.addSupportingAnnotation(2, NamedQueryAnnotation.ANNOTATION_NAME, NamedQueriesAnnotation.ANNOTATION_NAME)).setName("BAZ"); + ((NamedQueryAnnotation) typeResource.addAnnotation(0, NamedQueryAnnotation.ANNOTATION_NAME, NamedQueriesAnnotation.ANNOTATION_NAME)).setName("FOO"); + ((NamedQueryAnnotation) typeResource.addAnnotation(1, NamedQueryAnnotation.ANNOTATION_NAME, NamedQueriesAnnotation.ANNOTATION_NAME)).setName("BAR"); + ((NamedQueryAnnotation) typeResource.addAnnotation(2, NamedQueryAnnotation.ANNOTATION_NAME, NamedQueriesAnnotation.ANNOTATION_NAME)).setName("BAZ"); assertEquals(3, entity.getQueryContainer().namedQueriesSize()); } @@ -2922,20 +2924,20 @@ public class JavaEntityTests extends ContextModelTestCase NamedNativeQuery namedNativeQuery = entity.getQueryContainer().addNamedNativeQuery(0); namedNativeQuery.setName("FOO"); - ListIterator<NestableAnnotation> javaNamedQueries = typeResource.supportingAnnotations(NamedNativeQueryAnnotation.ANNOTATION_NAME, NamedNativeQueriesAnnotation.ANNOTATION_NAME); + Iterator<NestableAnnotation> javaNamedQueries = typeResource.annotations(NamedNativeQueryAnnotation.ANNOTATION_NAME, NamedNativeQueriesAnnotation.ANNOTATION_NAME); assertEquals("FOO", ((NamedNativeQueryAnnotation) javaNamedQueries.next()).getName()); NamedNativeQuery namedNativeQuery2 = entity.getQueryContainer().addNamedNativeQuery(0); namedNativeQuery2.setName("BAR"); - javaNamedQueries = typeResource.supportingAnnotations(NamedNativeQueryAnnotation.ANNOTATION_NAME, NamedNativeQueriesAnnotation.ANNOTATION_NAME); + javaNamedQueries = typeResource.annotations(NamedNativeQueryAnnotation.ANNOTATION_NAME, NamedNativeQueriesAnnotation.ANNOTATION_NAME); assertEquals("BAR", ((NamedNativeQueryAnnotation) javaNamedQueries.next()).getName()); assertEquals("FOO", ((NamedNativeQueryAnnotation) javaNamedQueries.next()).getName()); NamedNativeQuery namedNativeQuery3 = entity.getQueryContainer().addNamedNativeQuery(1); namedNativeQuery3.setName("BAZ"); - javaNamedQueries = typeResource.supportingAnnotations(NamedNativeQueryAnnotation.ANNOTATION_NAME, NamedNativeQueriesAnnotation.ANNOTATION_NAME); + javaNamedQueries = typeResource.annotations(NamedNativeQueryAnnotation.ANNOTATION_NAME, NamedNativeQueriesAnnotation.ANNOTATION_NAME); assertEquals("BAR", ((NamedNativeQueryAnnotation) javaNamedQueries.next()).getName()); assertEquals("BAZ", ((NamedNativeQueryAnnotation) javaNamedQueries.next()).getName()); assertEquals("FOO", ((NamedNativeQueryAnnotation) javaNamedQueries.next()).getName()); @@ -2962,24 +2964,24 @@ public class JavaEntityTests extends ContextModelTestCase entity.getQueryContainer().addNamedNativeQuery(1).setName("BAR"); entity.getQueryContainer().addNamedNativeQuery(2).setName("BAZ"); - ListIterator<NestableAnnotation> javaNamedQueries = typeResource.supportingAnnotations(NamedNativeQueryAnnotation.ANNOTATION_NAME, NamedNativeQueriesAnnotation.ANNOTATION_NAME); + Iterator<NestableAnnotation> javaNamedQueries = typeResource.annotations(NamedNativeQueryAnnotation.ANNOTATION_NAME, NamedNativeQueriesAnnotation.ANNOTATION_NAME); assertEquals(3, CollectionTools.size(javaNamedQueries)); entity.getQueryContainer().removeNamedNativeQuery(0); - javaNamedQueries = typeResource.supportingAnnotations(NamedNativeQueryAnnotation.ANNOTATION_NAME, NamedNativeQueriesAnnotation.ANNOTATION_NAME); + javaNamedQueries = typeResource.annotations(NamedNativeQueryAnnotation.ANNOTATION_NAME, NamedNativeQueriesAnnotation.ANNOTATION_NAME); assertEquals(2, CollectionTools.size(javaNamedQueries)); - javaNamedQueries = typeResource.supportingAnnotations(NamedNativeQueryAnnotation.ANNOTATION_NAME, NamedNativeQueriesAnnotation.ANNOTATION_NAME); + javaNamedQueries = typeResource.annotations(NamedNativeQueryAnnotation.ANNOTATION_NAME, NamedNativeQueriesAnnotation.ANNOTATION_NAME); assertEquals("BAR", ((NamedNativeQueryAnnotation) javaNamedQueries.next()).getName()); assertEquals("BAZ", ((NamedNativeQueryAnnotation) javaNamedQueries.next()).getName()); entity.getQueryContainer().removeNamedNativeQuery(0); - javaNamedQueries = typeResource.supportingAnnotations(NamedNativeQueryAnnotation.ANNOTATION_NAME, NamedNativeQueriesAnnotation.ANNOTATION_NAME); + javaNamedQueries = typeResource.annotations(NamedNativeQueryAnnotation.ANNOTATION_NAME, NamedNativeQueriesAnnotation.ANNOTATION_NAME); assertEquals(1, CollectionTools.size(javaNamedQueries)); - javaNamedQueries = typeResource.supportingAnnotations(NamedNativeQueryAnnotation.ANNOTATION_NAME, NamedNativeQueriesAnnotation.ANNOTATION_NAME); + javaNamedQueries = typeResource.annotations(NamedNativeQueryAnnotation.ANNOTATION_NAME, NamedNativeQueriesAnnotation.ANNOTATION_NAME); assertEquals("BAZ", ((NamedNativeQueryAnnotation) javaNamedQueries.next()).getName()); entity.getQueryContainer().removeNamedNativeQuery(0); - javaNamedQueries = typeResource.supportingAnnotations(NamedNativeQueryAnnotation.ANNOTATION_NAME, NamedNativeQueriesAnnotation.ANNOTATION_NAME); + javaNamedQueries = typeResource.annotations(NamedNativeQueryAnnotation.ANNOTATION_NAME, NamedNativeQueriesAnnotation.ANNOTATION_NAME); assertEquals(0, CollectionTools.size(javaNamedQueries)); } @@ -2994,17 +2996,16 @@ public class JavaEntityTests extends ContextModelTestCase entity.getQueryContainer().addNamedNativeQuery(1).setName("BAR"); entity.getQueryContainer().addNamedNativeQuery(2).setName("BAZ"); - ListIterator<NestableAnnotation> javaNamedQueries = typeResource.supportingAnnotations(NamedNativeQueryAnnotation.ANNOTATION_NAME, NamedNativeQueriesAnnotation.ANNOTATION_NAME); + Iterator<NestableAnnotation> javaNamedQueries = typeResource.annotations(NamedNativeQueryAnnotation.ANNOTATION_NAME, NamedNativeQueriesAnnotation.ANNOTATION_NAME); assertEquals(3, CollectionTools.size(javaNamedQueries)); - entity.getQueryContainer().moveNamedNativeQuery(2, 0); ListIterator<JavaNamedNativeQuery> namedQueries = entity.getQueryContainer().namedNativeQueries(); assertEquals("BAR", namedQueries.next().getName()); assertEquals("BAZ", namedQueries.next().getName()); assertEquals("FOO", namedQueries.next().getName()); - javaNamedQueries = typeResource.supportingAnnotations(NamedNativeQueryAnnotation.ANNOTATION_NAME, NamedNativeQueriesAnnotation.ANNOTATION_NAME); + javaNamedQueries = typeResource.annotations(NamedNativeQueryAnnotation.ANNOTATION_NAME, NamedNativeQueriesAnnotation.ANNOTATION_NAME); assertEquals("BAR", ((NamedNativeQueryAnnotation) javaNamedQueries.next()).getName()); assertEquals("BAZ", ((NamedNativeQueryAnnotation) javaNamedQueries.next()).getName()); assertEquals("FOO", ((NamedNativeQueryAnnotation) javaNamedQueries.next()).getName()); @@ -3016,7 +3017,7 @@ public class JavaEntityTests extends ContextModelTestCase assertEquals("BAR", namedQueries.next().getName()); assertEquals("FOO", namedQueries.next().getName()); - javaNamedQueries = typeResource.supportingAnnotations(NamedNativeQueryAnnotation.ANNOTATION_NAME, NamedNativeQueriesAnnotation.ANNOTATION_NAME); + javaNamedQueries = typeResource.annotations(NamedNativeQueryAnnotation.ANNOTATION_NAME, NamedNativeQueriesAnnotation.ANNOTATION_NAME); assertEquals("BAZ", ((NamedNativeQueryAnnotation) javaNamedQueries.next()).getName()); assertEquals("BAR", ((NamedNativeQueryAnnotation) javaNamedQueries.next()).getName()); assertEquals("FOO", ((NamedNativeQueryAnnotation) javaNamedQueries.next()).getName()); @@ -3031,9 +3032,9 @@ public class JavaEntityTests extends ContextModelTestCase assertEquals(0, entity.getPersistenceUnit().queriesSize()); - ((NamedNativeQueryAnnotation) typeResource.addSupportingAnnotation(0, NamedNativeQueryAnnotation.ANNOTATION_NAME, NamedNativeQueriesAnnotation.ANNOTATION_NAME)).setName("FOO"); - ((NamedNativeQueryAnnotation) typeResource.addSupportingAnnotation(1, NamedNativeQueryAnnotation.ANNOTATION_NAME, NamedNativeQueriesAnnotation.ANNOTATION_NAME)).setName("BAR"); - ((NamedNativeQueryAnnotation) typeResource.addSupportingAnnotation(2, NamedNativeQueryAnnotation.ANNOTATION_NAME, NamedNativeQueriesAnnotation.ANNOTATION_NAME)).setName("BAZ"); + ((NamedNativeQueryAnnotation) typeResource.addAnnotation(0, NamedNativeQueryAnnotation.ANNOTATION_NAME, NamedNativeQueriesAnnotation.ANNOTATION_NAME)).setName("FOO"); + ((NamedNativeQueryAnnotation) typeResource.addAnnotation(1, NamedNativeQueryAnnotation.ANNOTATION_NAME, NamedNativeQueriesAnnotation.ANNOTATION_NAME)).setName("BAR"); + ((NamedNativeQueryAnnotation) typeResource.addAnnotation(2, NamedNativeQueryAnnotation.ANNOTATION_NAME, NamedNativeQueriesAnnotation.ANNOTATION_NAME)).setName("BAZ"); ListIterator<JavaNamedNativeQuery> namedQueries = entity.getQueryContainer().namedNativeQueries(); assertEquals("FOO", namedQueries.next().getName()); assertEquals("BAR", namedQueries.next().getName()); @@ -3041,34 +3042,34 @@ public class JavaEntityTests extends ContextModelTestCase assertFalse(namedQueries.hasNext()); assertEquals(3, entity.getPersistenceUnit().queriesSize()); - typeResource.moveSupportingAnnotation(2, 0, NamedNativeQueriesAnnotation.ANNOTATION_NAME); + typeResource.moveAnnotation(2, 0, NamedNativeQueriesAnnotation.ANNOTATION_NAME); namedQueries = entity.getQueryContainer().namedNativeQueries(); assertEquals("BAR", namedQueries.next().getName()); assertEquals("BAZ", namedQueries.next().getName()); assertEquals("FOO", namedQueries.next().getName()); assertFalse(namedQueries.hasNext()); - typeResource.moveSupportingAnnotation(0, 1, NamedNativeQueriesAnnotation.ANNOTATION_NAME); + typeResource.moveAnnotation(0, 1, NamedNativeQueriesAnnotation.ANNOTATION_NAME); namedQueries = entity.getQueryContainer().namedNativeQueries(); assertEquals("BAZ", namedQueries.next().getName()); assertEquals("BAR", namedQueries.next().getName()); assertEquals("FOO", namedQueries.next().getName()); assertFalse(namedQueries.hasNext()); - typeResource.removeSupportingAnnotation(1, NamedNativeQueryAnnotation.ANNOTATION_NAME, NamedNativeQueriesAnnotation.ANNOTATION_NAME); + typeResource.removeAnnotation(1, NamedNativeQueryAnnotation.ANNOTATION_NAME, NamedNativeQueriesAnnotation.ANNOTATION_NAME); namedQueries = entity.getQueryContainer().namedNativeQueries(); assertEquals("BAZ", namedQueries.next().getName()); assertEquals("FOO", namedQueries.next().getName()); assertFalse(namedQueries.hasNext()); assertEquals(2, entity.getPersistenceUnit().queriesSize()); - typeResource.removeSupportingAnnotation(1, NamedNativeQueryAnnotation.ANNOTATION_NAME, NamedNativeQueriesAnnotation.ANNOTATION_NAME); + typeResource.removeAnnotation(1, NamedNativeQueryAnnotation.ANNOTATION_NAME, NamedNativeQueriesAnnotation.ANNOTATION_NAME); namedQueries = entity.getQueryContainer().namedNativeQueries(); assertEquals("BAZ", namedQueries.next().getName()); assertFalse(namedQueries.hasNext()); assertEquals(1, entity.getPersistenceUnit().queriesSize()); - typeResource.removeSupportingAnnotation(0, NamedNativeQueryAnnotation.ANNOTATION_NAME, NamedNativeQueriesAnnotation.ANNOTATION_NAME); + typeResource.removeAnnotation(0, NamedNativeQueryAnnotation.ANNOTATION_NAME, NamedNativeQueriesAnnotation.ANNOTATION_NAME); namedQueries = entity.getQueryContainer().namedNativeQueries(); assertFalse(namedQueries.hasNext()); assertEquals(0, entity.getPersistenceUnit().queriesSize()); @@ -3083,9 +3084,9 @@ public class JavaEntityTests extends ContextModelTestCase assertEquals(0, entity.getQueryContainer().namedNativeQueriesSize()); - ((NamedNativeQueryAnnotation) typeResource.addSupportingAnnotation(0, NamedNativeQueryAnnotation.ANNOTATION_NAME, NamedNativeQueriesAnnotation.ANNOTATION_NAME)).setName("FOO"); - ((NamedNativeQueryAnnotation) typeResource.addSupportingAnnotation(1, NamedNativeQueryAnnotation.ANNOTATION_NAME, NamedNativeQueriesAnnotation.ANNOTATION_NAME)).setName("BAR"); - ((NamedNativeQueryAnnotation) typeResource.addSupportingAnnotation(2, NamedNativeQueryAnnotation.ANNOTATION_NAME, NamedNativeQueriesAnnotation.ANNOTATION_NAME)).setName("BAZ"); + ((NamedNativeQueryAnnotation) typeResource.addAnnotation(0, NamedNativeQueryAnnotation.ANNOTATION_NAME, NamedNativeQueriesAnnotation.ANNOTATION_NAME)).setName("FOO"); + ((NamedNativeQueryAnnotation) typeResource.addAnnotation(1, NamedNativeQueryAnnotation.ANNOTATION_NAME, NamedNativeQueriesAnnotation.ANNOTATION_NAME)).setName("BAR"); + ((NamedNativeQueryAnnotation) typeResource.addAnnotation(2, NamedNativeQueryAnnotation.ANNOTATION_NAME, NamedNativeQueriesAnnotation.ANNOTATION_NAME)).setName("BAZ"); assertEquals(3, entity.getQueryContainer().namedNativeQueriesSize()); } @@ -3097,28 +3098,28 @@ public class JavaEntityTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); assertNull(getJavaEntity().getIdClass()); - assertNull(typeResource.getSupportingAnnotation(IdClassAnnotation.ANNOTATION_NAME)); + assertNull(typeResource.getAnnotation(IdClassAnnotation.ANNOTATION_NAME)); - IdClassAnnotation idClass = (IdClassAnnotation) typeResource.addSupportingAnnotation(IdClassAnnotation.ANNOTATION_NAME); + IdClassAnnotation idClass = (IdClassAnnotation) typeResource.addAnnotation(IdClassAnnotation.ANNOTATION_NAME); assertNull(getJavaEntity().getIdClass()); - assertNotNull(typeResource.getSupportingAnnotation(IdClassAnnotation.ANNOTATION_NAME)); + assertNotNull(typeResource.getAnnotation(IdClassAnnotation.ANNOTATION_NAME)); idClass.setValue("model.Foo"); assertEquals("model.Foo", getJavaEntity().getIdClass()); - assertEquals("model.Foo", ((IdClassAnnotation) typeResource.getSupportingAnnotation(IdClassAnnotation.ANNOTATION_NAME)).getValue()); + assertEquals("model.Foo", ((IdClassAnnotation) typeResource.getAnnotation(IdClassAnnotation.ANNOTATION_NAME)).getValue()); //test setting @IdClass value to null, IdClass annotation is removed idClass.setValue(null); assertNull(getJavaEntity().getIdClass()); - assertNull(typeResource.getSupportingAnnotation(IdClassAnnotation.ANNOTATION_NAME)); + assertNull(typeResource.getAnnotation(IdClassAnnotation.ANNOTATION_NAME)); //reset @IdClass value and then remove @IdClass - idClass = (IdClassAnnotation) typeResource.addSupportingAnnotation(IdClassAnnotation.ANNOTATION_NAME); + idClass = (IdClassAnnotation) typeResource.addAnnotation(IdClassAnnotation.ANNOTATION_NAME); idClass.setValue("model.Foo"); - typeResource.removeSupportingAnnotation(IdClassAnnotation.ANNOTATION_NAME); + typeResource.removeAnnotation(IdClassAnnotation.ANNOTATION_NAME); assertNull(getJavaEntity().getIdClass()); - assertNull(typeResource.getSupportingAnnotation(IdClassAnnotation.ANNOTATION_NAME)); + assertNull(typeResource.getAnnotation(IdClassAnnotation.ANNOTATION_NAME)); } public void testModifyIdClass() throws Exception { @@ -3128,15 +3129,15 @@ public class JavaEntityTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); assertNull(getJavaEntity().getIdClass()); - assertNull(typeResource.getSupportingAnnotation(IdClassAnnotation.ANNOTATION_NAME)); + assertNull(typeResource.getAnnotation(IdClassAnnotation.ANNOTATION_NAME)); getJavaEntity().setIdClass("model.Foo"); - assertEquals("model.Foo", ((IdClassAnnotation) typeResource.getSupportingAnnotation(IdClassAnnotation.ANNOTATION_NAME)).getValue()); + assertEquals("model.Foo", ((IdClassAnnotation) typeResource.getAnnotation(IdClassAnnotation.ANNOTATION_NAME)).getValue()); assertEquals("model.Foo", getJavaEntity().getIdClass()); getJavaEntity().setIdClass(null); assertNull(getJavaEntity().getIdClass()); - assertNull(typeResource.getSupportingAnnotation(IdClassAnnotation.ANNOTATION_NAME)); + assertNull(typeResource.getAnnotation(IdClassAnnotation.ANNOTATION_NAME)); } public void testGetPrimaryKeyColumnNameWithAttributeOverride() throws Exception { diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/JavaGeneratedValueTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/JavaGeneratedValueTests.java index 38f306f140..74be9b8315 100644 --- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/JavaGeneratedValueTests.java +++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/JavaGeneratedValueTests.java @@ -59,7 +59,7 @@ public class JavaGeneratedValueTests extends ContextModelTestCase //change resource model sequenceGenerator name, verify the context model is updated JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - GeneratedValueAnnotation generatedValue = (GeneratedValueAnnotation) attributeResource.getSupportingAnnotation(JPA.GENERATED_VALUE); + GeneratedValueAnnotation generatedValue = (GeneratedValueAnnotation) attributeResource.getAnnotation(JPA.GENERATED_VALUE); generatedValue.setGenerator("foo"); @@ -79,7 +79,7 @@ public class JavaGeneratedValueTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - GeneratedValueAnnotation generatedValue = (GeneratedValueAnnotation) attributeResource.getSupportingAnnotation(JPA.GENERATED_VALUE); + GeneratedValueAnnotation generatedValue = (GeneratedValueAnnotation) attributeResource.getAnnotation(JPA.GENERATED_VALUE); assertEquals("foo", generatedValue.getGenerator()); } @@ -97,7 +97,7 @@ public class JavaGeneratedValueTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - GeneratedValueAnnotation generatedValue = (GeneratedValueAnnotation) attributeResource.getSupportingAnnotation(JPA.GENERATED_VALUE); + GeneratedValueAnnotation generatedValue = (GeneratedValueAnnotation) attributeResource.getAnnotation(JPA.GENERATED_VALUE); assertNotNull(generatedValue); } @@ -112,7 +112,7 @@ public class JavaGeneratedValueTests extends ContextModelTestCase //change resource model sequenceGenerator name, verify the context model is updated JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - GeneratedValueAnnotation generatedValue = (GeneratedValueAnnotation) attributeResource.getSupportingAnnotation(JPA.GENERATED_VALUE); + GeneratedValueAnnotation generatedValue = (GeneratedValueAnnotation) attributeResource.getAnnotation(JPA.GENERATED_VALUE); generatedValue.setStrategy(org.eclipse.jpt.core.resource.java.GenerationType.IDENTITY); @@ -133,14 +133,14 @@ public class JavaGeneratedValueTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - GeneratedValueAnnotation generatedValue = (GeneratedValueAnnotation) attributeResource.getSupportingAnnotation(JPA.GENERATED_VALUE); + GeneratedValueAnnotation generatedValue = (GeneratedValueAnnotation) attributeResource.getAnnotation(JPA.GENERATED_VALUE); assertEquals(org.eclipse.jpt.core.resource.java.GenerationType.IDENTITY, generatedValue.getStrategy()); idMapping.getGeneratedValue().setSpecifiedStrategy(null); assertEquals(GeneratedValue.DEFAULT_STRATEGY, idMapping.getGeneratedValue().getStrategy()); - generatedValue = (GeneratedValueAnnotation) attributeResource.getSupportingAnnotation(JPA.GENERATED_VALUE); + generatedValue = (GeneratedValueAnnotation) attributeResource.getAnnotation(JPA.GENERATED_VALUE); assertNotNull(generatedValue); assertNull(generatedValue.getStrategy()); } diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/JavaIdMappingTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/JavaIdMappingTests.java index 7065b047ae..e5642f5dee 100644 --- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/JavaIdMappingTests.java +++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/JavaIdMappingTests.java @@ -132,13 +132,13 @@ public class JavaIdMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - assertNull(attributeResource.getMappingAnnotation(IdAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getMappingAnnotation(BasicAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getSupportingAnnotation(ColumnAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getSupportingAnnotation(TemporalAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getSupportingAnnotation(TableGeneratorAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getSupportingAnnotation(SequenceGeneratorAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getSupportingAnnotation(GeneratedValueAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(IdAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getAnnotation(BasicAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getAnnotation(ColumnAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getAnnotation(TemporalAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(TableGeneratorAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(SequenceGeneratorAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(GeneratedValueAnnotation.ANNOTATION_NAME)); } public void testMorphToDefault() throws Exception { @@ -162,12 +162,12 @@ public class JavaIdMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - assertNull(attributeResource.getMappingAnnotation(IdAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getSupportingAnnotation(ColumnAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getSupportingAnnotation(TemporalAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getSupportingAnnotation(TableGeneratorAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getSupportingAnnotation(SequenceGeneratorAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getSupportingAnnotation(GeneratedValueAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(IdAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getAnnotation(ColumnAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getAnnotation(TemporalAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(TableGeneratorAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(SequenceGeneratorAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(GeneratedValueAnnotation.ANNOTATION_NAME)); } public void testMorphToVersionMapping() throws Exception { @@ -191,13 +191,13 @@ public class JavaIdMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - assertNull(attributeResource.getMappingAnnotation(IdAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getMappingAnnotation(VersionAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getSupportingAnnotation(ColumnAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getSupportingAnnotation(TemporalAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getSupportingAnnotation(TableGeneratorAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getSupportingAnnotation(SequenceGeneratorAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getSupportingAnnotation(GeneratedValueAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(IdAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getAnnotation(VersionAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getAnnotation(ColumnAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getAnnotation(TemporalAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(TableGeneratorAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(SequenceGeneratorAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(GeneratedValueAnnotation.ANNOTATION_NAME)); } public void testMorphToEmbeddedMapping() throws Exception { @@ -220,13 +220,13 @@ public class JavaIdMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - assertNull(attributeResource.getMappingAnnotation(IdAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getMappingAnnotation(EmbeddedAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getSupportingAnnotation(ColumnAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getSupportingAnnotation(TemporalAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getSupportingAnnotation(TableGeneratorAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getSupportingAnnotation(SequenceGeneratorAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getSupportingAnnotation(GeneratedValueAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(IdAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getAnnotation(EmbeddedAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(ColumnAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(TemporalAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(TableGeneratorAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(SequenceGeneratorAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(GeneratedValueAnnotation.ANNOTATION_NAME)); } public void testMorphToTransientMapping() throws Exception { @@ -249,13 +249,13 @@ public class JavaIdMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - assertNull(attributeResource.getMappingAnnotation(IdAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getMappingAnnotation(TransientAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getSupportingAnnotation(ColumnAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getSupportingAnnotation(TemporalAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getSupportingAnnotation(TableGeneratorAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getSupportingAnnotation(SequenceGeneratorAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getSupportingAnnotation(GeneratedValueAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(IdAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getAnnotation(TransientAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(ColumnAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(TemporalAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(TableGeneratorAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(SequenceGeneratorAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(GeneratedValueAnnotation.ANNOTATION_NAME)); } public void testMorphToEmbeddedIdMapping() throws Exception { @@ -278,13 +278,13 @@ public class JavaIdMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - assertNull(attributeResource.getMappingAnnotation(IdAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getMappingAnnotation(EmbeddedIdAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getSupportingAnnotation(ColumnAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getSupportingAnnotation(TemporalAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getSupportingAnnotation(TableGeneratorAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getSupportingAnnotation(SequenceGeneratorAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getSupportingAnnotation(GeneratedValueAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(IdAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getAnnotation(EmbeddedIdAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(ColumnAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(TemporalAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(TableGeneratorAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(SequenceGeneratorAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(GeneratedValueAnnotation.ANNOTATION_NAME)); } public void testMorphToOneToOneMapping() throws Exception { @@ -307,13 +307,13 @@ public class JavaIdMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - assertNull(attributeResource.getMappingAnnotation(IdAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getMappingAnnotation(OneToOneAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getSupportingAnnotation(ColumnAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getSupportingAnnotation(TemporalAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getSupportingAnnotation(TableGeneratorAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getSupportingAnnotation(SequenceGeneratorAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getSupportingAnnotation(GeneratedValueAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(IdAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getAnnotation(OneToOneAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(ColumnAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(TemporalAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(TableGeneratorAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(SequenceGeneratorAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(GeneratedValueAnnotation.ANNOTATION_NAME)); } public void testMorphToOneToManyMapping() throws Exception { @@ -336,13 +336,13 @@ public class JavaIdMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - assertNull(attributeResource.getMappingAnnotation(IdAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getMappingAnnotation(OneToManyAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getSupportingAnnotation(ColumnAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getSupportingAnnotation(TemporalAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getSupportingAnnotation(TableGeneratorAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getSupportingAnnotation(SequenceGeneratorAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getSupportingAnnotation(GeneratedValueAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(IdAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getAnnotation(OneToManyAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(ColumnAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(TemporalAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(TableGeneratorAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(SequenceGeneratorAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(GeneratedValueAnnotation.ANNOTATION_NAME)); } public void testMorphToManyToOneMapping() throws Exception { @@ -365,13 +365,13 @@ public class JavaIdMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - assertNull(attributeResource.getMappingAnnotation(IdAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getMappingAnnotation(ManyToOneAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getSupportingAnnotation(ColumnAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getSupportingAnnotation(TemporalAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getSupportingAnnotation(TableGeneratorAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getSupportingAnnotation(SequenceGeneratorAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getSupportingAnnotation(GeneratedValueAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(IdAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getAnnotation(ManyToOneAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(ColumnAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(TemporalAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(TableGeneratorAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(SequenceGeneratorAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(GeneratedValueAnnotation.ANNOTATION_NAME)); } public void testMorphToManyToManyMapping() throws Exception { @@ -394,13 +394,13 @@ public class JavaIdMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - assertNull(attributeResource.getMappingAnnotation(IdAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getMappingAnnotation(ManyToManyAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getSupportingAnnotation(ColumnAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getSupportingAnnotation(TemporalAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getSupportingAnnotation(TableGeneratorAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getSupportingAnnotation(SequenceGeneratorAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getSupportingAnnotation(GeneratedValueAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(IdAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getAnnotation(ManyToManyAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(ColumnAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(TemporalAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(TableGeneratorAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(SequenceGeneratorAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(GeneratedValueAnnotation.ANNOTATION_NAME)); } public void testGetTemporal() throws Exception { @@ -426,12 +426,12 @@ public class JavaIdMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - TemporalAnnotation temporal = (TemporalAnnotation) attributeResource.getSupportingAnnotation(TemporalAnnotation.ANNOTATION_NAME); + TemporalAnnotation temporal = (TemporalAnnotation) attributeResource.getAnnotation(TemporalAnnotation.ANNOTATION_NAME); assertEquals(org.eclipse.jpt.core.resource.java.TemporalType.TIME, temporal.getValue()); idMapping.setSpecifiedConverter(null); - assertNull(attributeResource.getSupportingAnnotation(TemporalAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(TemporalAnnotation.ANNOTATION_NAME)); } public void testGetTemporalUpdatesFromResourceModelChange() throws Exception { @@ -446,12 +446,12 @@ public class JavaIdMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - TemporalAnnotation temporal = (TemporalAnnotation) attributeResource.addSupportingAnnotation(TemporalAnnotation.ANNOTATION_NAME); + TemporalAnnotation temporal = (TemporalAnnotation) attributeResource.addAnnotation(TemporalAnnotation.ANNOTATION_NAME); temporal.setValue(org.eclipse.jpt.core.resource.java.TemporalType.DATE); assertEquals(TemporalType.DATE, ((TemporalConverter) idMapping.getConverter()).getTemporalType()); - attributeResource.removeSupportingAnnotation(TemporalAnnotation.ANNOTATION_NAME); + attributeResource.removeAnnotation(TemporalAnnotation.ANNOTATION_NAME); assertEquals(Converter.NO_CONVERTER, idMapping.getConverter().getType()); assertFalse(idMapping.isDefault()); @@ -470,7 +470,7 @@ public class JavaIdMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - ColumnAnnotation column = (ColumnAnnotation) attributeResource.addSupportingAnnotation(JPA.COLUMN); + ColumnAnnotation column = (ColumnAnnotation) attributeResource.addAnnotation(JPA.COLUMN); column.setName("foo"); assertEquals("foo", idMapping.getColumn().getSpecifiedName()); @@ -489,9 +489,9 @@ public class JavaIdMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - attributeResource.addSupportingAnnotation(JPA.SEQUENCE_GENERATOR); + attributeResource.addAnnotation(JPA.SEQUENCE_GENERATOR); assertNotNull(idMapping.getGeneratorContainer().getSequenceGenerator()); - assertEquals(1, attributeResource.supportingAnnotationsSize()); + assertEquals(2, attributeResource.annotationsSize()); assertEquals(1, idMapping.getPersistenceUnit().generatorsSize()); idMapping.getGeneratorContainer().getSequenceGenerator().setName("foo"); @@ -512,7 +512,7 @@ public class JavaIdMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - assertNotNull(attributeResource.getSupportingAnnotation(JPA.SEQUENCE_GENERATOR)); + assertNotNull(attributeResource.getAnnotation(JPA.SEQUENCE_GENERATOR)); assertNotNull(idMapping.getGeneratorContainer().getSequenceGenerator()); //try adding another sequence generator, should get an IllegalStateException @@ -533,13 +533,13 @@ public class JavaIdMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - attributeResource.addSupportingAnnotation(JPA.SEQUENCE_GENERATOR); + attributeResource.addAnnotation(JPA.SEQUENCE_GENERATOR); idMapping.getGeneratorContainer().removeSequenceGenerator(); assertNull(idMapping.getGeneratorContainer().getSequenceGenerator()); - assertNull(attributeResource.getSupportingAnnotation(JPA.SEQUENCE_GENERATOR)); + assertNull(attributeResource.getAnnotation(JPA.SEQUENCE_GENERATOR)); //try removing the sequence generator again, should get an IllegalStateException try { @@ -561,9 +561,9 @@ public class JavaIdMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - attributeResource.addSupportingAnnotation(JPA.TABLE_GENERATOR); + attributeResource.addAnnotation(JPA.TABLE_GENERATOR); assertNotNull(idMapping.getGeneratorContainer().getTableGenerator()); - assertEquals(1, attributeResource.supportingAnnotationsSize()); + assertEquals(2, attributeResource.annotationsSize()); assertEquals(1, idMapping.getPersistenceUnit().generatorsSize()); idMapping.getGeneratorContainer().getTableGenerator().setName("foo"); @@ -584,7 +584,7 @@ public class JavaIdMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - assertNotNull(attributeResource.getSupportingAnnotation(JPA.TABLE_GENERATOR)); + assertNotNull(attributeResource.getAnnotation(JPA.TABLE_GENERATOR)); assertNotNull(idMapping.getGeneratorContainer().getTableGenerator()); //try adding another table generator, should get an IllegalStateException @@ -605,13 +605,13 @@ public class JavaIdMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - attributeResource.addSupportingAnnotation(JPA.TABLE_GENERATOR); + attributeResource.addAnnotation(JPA.TABLE_GENERATOR); idMapping.getGeneratorContainer().removeTableGenerator(); assertNull(idMapping.getGeneratorContainer().getTableGenerator()); - assertNull(attributeResource.getSupportingAnnotation(JPA.TABLE_GENERATOR)); + assertNull(attributeResource.getAnnotation(JPA.TABLE_GENERATOR)); //try removing the table generator again, should get an IllegalStateException try { @@ -633,10 +633,10 @@ public class JavaIdMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - attributeResource.addSupportingAnnotation(JPA.GENERATED_VALUE); + attributeResource.addAnnotation(JPA.GENERATED_VALUE); assertNotNull(idMapping.getGeneratedValue()); - assertEquals(1, attributeResource.supportingAnnotationsSize()); + assertEquals(2, attributeResource.annotationsSize()); } public void testGetGeneratedValue2() throws Exception { @@ -650,7 +650,7 @@ public class JavaIdMappingTests extends ContextModelTestCase JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); assertNotNull(idMapping.getGeneratedValue()); - assertEquals(1, attributeResource.supportingAnnotationsSize()); + assertEquals(2, attributeResource.annotationsSize()); } public void testAddGeneratedValue() throws Exception { @@ -667,7 +667,7 @@ public class JavaIdMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - assertNotNull(attributeResource.getSupportingAnnotation(JPA.GENERATED_VALUE)); + assertNotNull(attributeResource.getAnnotation(JPA.GENERATED_VALUE)); assertNotNull(idMapping.getGeneratedValue()); //try adding another generated value, should get an IllegalStateException @@ -688,13 +688,13 @@ public class JavaIdMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - attributeResource.addSupportingAnnotation(JPA.GENERATED_VALUE); + attributeResource.addAnnotation(JPA.GENERATED_VALUE); idMapping.removeGeneratedValue(); assertNull(idMapping.getGeneratedValue()); - assertNull(attributeResource.getSupportingAnnotation(JPA.GENERATED_VALUE)); + assertNull(attributeResource.getAnnotation(JPA.GENERATED_VALUE)); //try removing the generatedValue again, should get an IllegalStateException try { diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/JavaJoinColumnTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/JavaJoinColumnTests.java index 9e74ee7051..356a7dfaa0 100644 --- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/JavaJoinColumnTests.java +++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/JavaJoinColumnTests.java @@ -98,14 +98,14 @@ public class JavaJoinColumnTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - JoinColumnAnnotation javaJoinColumn = (JoinColumnAnnotation) attributeResource.getSupportingAnnotation(JoinColumnAnnotation.ANNOTATION_NAME); + JoinColumnAnnotation javaJoinColumn = (JoinColumnAnnotation) attributeResource.getAnnotation(JoinColumnAnnotation.ANNOTATION_NAME); assertEquals(0, joinColumns.specifiedJoinColumnsSize()); assertNull(javaJoinColumn); //set name in the resource model, verify context model updated - javaJoinColumn = (JoinColumnAnnotation) attributeResource.addSupportingAnnotation(JoinColumnAnnotation.ANNOTATION_NAME); + javaJoinColumn = (JoinColumnAnnotation) attributeResource.addAnnotation(JoinColumnAnnotation.ANNOTATION_NAME); javaJoinColumn.setName("FOO"); JavaJoinColumn joinColumn = joinColumns.specifiedJoinColumns().next(); assertEquals("FOO", joinColumn.getSpecifiedName()); @@ -114,7 +114,7 @@ public class JavaJoinColumnTests extends ContextModelTestCase //set name to null in the resource model, annotation removed, specified join column removed javaJoinColumn.setName(null); assertEquals(0, joinColumns.specifiedJoinColumnsSize()); - assertNull(attributeResource.getSupportingAnnotation(JoinColumnAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(JoinColumnAnnotation.ANNOTATION_NAME)); } public void testModifySpecifiedName() throws Exception { @@ -131,14 +131,14 @@ public class JavaJoinColumnTests extends ContextModelTestCase JavaJoinColumn joinColumn = joinColumns.addSpecifiedJoinColumn(0); //set name in the context model, verify resource model modified joinColumn.setSpecifiedName("foo"); - JoinColumnAnnotation javaJoinColumn = (JoinColumnAnnotation) attributeResource.getSupportingAnnotation(JoinColumnAnnotation.ANNOTATION_NAME); + JoinColumnAnnotation javaJoinColumn = (JoinColumnAnnotation) attributeResource.getAnnotation(JoinColumnAnnotation.ANNOTATION_NAME); assertEquals("foo", joinColumn.getSpecifiedName()); assertEquals("foo", javaJoinColumn.getName()); //set name to null in the context model joinColumn.setSpecifiedName(null); assertNull(joinColumn.getSpecifiedName()); - assertNull(attributeResource.getSupportingAnnotation(JoinColumnAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(JoinColumnAnnotation.ANNOTATION_NAME)); } // <attribute name>_<referenced column name> @@ -196,14 +196,14 @@ public class JavaJoinColumnTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - JoinColumnAnnotation javaJoinColumn = (JoinColumnAnnotation) attributeResource.getSupportingAnnotation(JoinColumnAnnotation.ANNOTATION_NAME); + JoinColumnAnnotation javaJoinColumn = (JoinColumnAnnotation) attributeResource.getAnnotation(JoinColumnAnnotation.ANNOTATION_NAME); assertEquals(0, joinColumns.specifiedJoinColumnsSize()); assertNull(javaJoinColumn); //set referenced column name in the resource model, verify context model updated - javaJoinColumn = (JoinColumnAnnotation) attributeResource.addSupportingAnnotation(JoinColumnAnnotation.ANNOTATION_NAME); + javaJoinColumn = (JoinColumnAnnotation) attributeResource.addAnnotation(JoinColumnAnnotation.ANNOTATION_NAME); javaJoinColumn.setName("FOO"); javaJoinColumn.setReferencedColumnName("BAR"); JavaJoinColumn joinColumn = joinColumns.specifiedJoinColumns().next(); @@ -231,7 +231,7 @@ public class JavaJoinColumnTests extends ContextModelTestCase joinColumn.setSpecifiedName("foo"); joinColumn.setSpecifiedReferencedColumnName("BAR"); - JoinColumnAnnotation javaJoinColumn = (JoinColumnAnnotation) attributeResource.getSupportingAnnotation(JoinColumnAnnotation.ANNOTATION_NAME); + JoinColumnAnnotation javaJoinColumn = (JoinColumnAnnotation) attributeResource.getAnnotation(JoinColumnAnnotation.ANNOTATION_NAME); assertEquals("BAR", joinColumn.getSpecifiedReferencedColumnName()); assertEquals("BAR", javaJoinColumn.getReferencedColumnName()); @@ -256,14 +256,14 @@ public class JavaJoinColumnTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - JoinColumnAnnotation javaJoinColumn = (JoinColumnAnnotation) attributeResource.getSupportingAnnotation(JoinColumnAnnotation.ANNOTATION_NAME); + JoinColumnAnnotation javaJoinColumn = (JoinColumnAnnotation) attributeResource.getAnnotation(JoinColumnAnnotation.ANNOTATION_NAME); assertEquals(0, joinColumns.specifiedJoinColumnsSize()); assertNull(javaJoinColumn); //set table in the resource model, verify context model updated - javaJoinColumn = (JoinColumnAnnotation) attributeResource.addSupportingAnnotation(JoinColumnAnnotation.ANNOTATION_NAME); + javaJoinColumn = (JoinColumnAnnotation) attributeResource.addAnnotation(JoinColumnAnnotation.ANNOTATION_NAME); javaJoinColumn.setName("FOO"); javaJoinColumn.setTable("BAR"); JavaJoinColumn joinColumn = joinColumns.specifiedJoinColumns().next(); @@ -292,7 +292,7 @@ public class JavaJoinColumnTests extends ContextModelTestCase joinColumn.setSpecifiedName("foo"); joinColumn.setSpecifiedTable("BAR"); - JoinColumnAnnotation javaJoinColumn = (JoinColumnAnnotation) attributeResource.getSupportingAnnotation(JoinColumnAnnotation.ANNOTATION_NAME); + JoinColumnAnnotation javaJoinColumn = (JoinColumnAnnotation) attributeResource.getAnnotation(JoinColumnAnnotation.ANNOTATION_NAME); assertEquals("BAR", joinColumn.getSpecifiedTable()); assertEquals("BAR", javaJoinColumn.getTable()); @@ -317,14 +317,14 @@ public class JavaJoinColumnTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - JoinColumnAnnotation javaJoinColumn = (JoinColumnAnnotation) attributeResource.getSupportingAnnotation(JoinColumnAnnotation.ANNOTATION_NAME); + JoinColumnAnnotation javaJoinColumn = (JoinColumnAnnotation) attributeResource.getAnnotation(JoinColumnAnnotation.ANNOTATION_NAME); assertEquals(0, joinColumns.specifiedJoinColumnsSize()); assertNull(javaJoinColumn); //set unique in the resource model, verify context model updated - javaJoinColumn = (JoinColumnAnnotation) attributeResource.addSupportingAnnotation(JoinColumnAnnotation.ANNOTATION_NAME); + javaJoinColumn = (JoinColumnAnnotation) attributeResource.addAnnotation(JoinColumnAnnotation.ANNOTATION_NAME); javaJoinColumn.setName("FOO"); javaJoinColumn.setUnique(Boolean.TRUE); JavaJoinColumn joinColumn = joinColumns.specifiedJoinColumns().next(); @@ -353,7 +353,7 @@ public class JavaJoinColumnTests extends ContextModelTestCase joinColumn.setSpecifiedName("foo"); joinColumn.setSpecifiedUnique(Boolean.TRUE); - JoinColumnAnnotation javaJoinColumn = (JoinColumnAnnotation) attributeResource.getSupportingAnnotation(JoinColumnAnnotation.ANNOTATION_NAME); + JoinColumnAnnotation javaJoinColumn = (JoinColumnAnnotation) attributeResource.getAnnotation(JoinColumnAnnotation.ANNOTATION_NAME); assertEquals(Boolean.TRUE, joinColumn.getSpecifiedUnique()); assertEquals(Boolean.TRUE, javaJoinColumn.getUnique()); @@ -373,14 +373,14 @@ public class JavaJoinColumnTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - JoinColumnAnnotation javaJoinColumn = (JoinColumnAnnotation) attributeResource.getSupportingAnnotation(JoinColumnAnnotation.ANNOTATION_NAME); + JoinColumnAnnotation javaJoinColumn = (JoinColumnAnnotation) attributeResource.getAnnotation(JoinColumnAnnotation.ANNOTATION_NAME); assertEquals(0, joinColumns.specifiedJoinColumnsSize()); assertNull(javaJoinColumn); //set nullable in the resource model, verify context model updated - javaJoinColumn = (JoinColumnAnnotation) attributeResource.addSupportingAnnotation(JoinColumnAnnotation.ANNOTATION_NAME); + javaJoinColumn = (JoinColumnAnnotation) attributeResource.addAnnotation(JoinColumnAnnotation.ANNOTATION_NAME); javaJoinColumn.setName("FOO"); javaJoinColumn.setNullable(Boolean.FALSE); JavaJoinColumn joinColumn = joinColumns.specifiedJoinColumns().next(); @@ -409,7 +409,7 @@ public class JavaJoinColumnTests extends ContextModelTestCase joinColumn.setSpecifiedName("foo"); joinColumn.setSpecifiedNullable(Boolean.FALSE); - JoinColumnAnnotation javaJoinColumn = (JoinColumnAnnotation) attributeResource.getSupportingAnnotation(JoinColumnAnnotation.ANNOTATION_NAME); + JoinColumnAnnotation javaJoinColumn = (JoinColumnAnnotation) attributeResource.getAnnotation(JoinColumnAnnotation.ANNOTATION_NAME); assertEquals(Boolean.FALSE, joinColumn.getSpecifiedNullable()); assertEquals(Boolean.FALSE, javaJoinColumn.getNullable()); @@ -429,14 +429,14 @@ public class JavaJoinColumnTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - JoinColumnAnnotation javaJoinColumn = (JoinColumnAnnotation) attributeResource.getSupportingAnnotation(JoinColumnAnnotation.ANNOTATION_NAME); + JoinColumnAnnotation javaJoinColumn = (JoinColumnAnnotation) attributeResource.getAnnotation(JoinColumnAnnotation.ANNOTATION_NAME); assertEquals(0, joinColumns.specifiedJoinColumnsSize()); assertNull(javaJoinColumn); //set insertable in the resource model, verify context model updated - javaJoinColumn = (JoinColumnAnnotation) attributeResource.addSupportingAnnotation(JoinColumnAnnotation.ANNOTATION_NAME); + javaJoinColumn = (JoinColumnAnnotation) attributeResource.addAnnotation(JoinColumnAnnotation.ANNOTATION_NAME); javaJoinColumn.setName("FOO"); javaJoinColumn.setInsertable(Boolean.FALSE); JavaJoinColumn joinColumn = joinColumns.specifiedJoinColumns().next(); @@ -465,7 +465,7 @@ public class JavaJoinColumnTests extends ContextModelTestCase joinColumn.setSpecifiedName("foo"); joinColumn.setSpecifiedInsertable(Boolean.FALSE); - JoinColumnAnnotation javaJoinColumn = (JoinColumnAnnotation) attributeResource.getSupportingAnnotation(JoinColumnAnnotation.ANNOTATION_NAME); + JoinColumnAnnotation javaJoinColumn = (JoinColumnAnnotation) attributeResource.getAnnotation(JoinColumnAnnotation.ANNOTATION_NAME); assertEquals(Boolean.FALSE, joinColumn.getSpecifiedInsertable()); assertEquals(Boolean.FALSE, javaJoinColumn.getInsertable()); @@ -485,14 +485,14 @@ public class JavaJoinColumnTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - JoinColumnAnnotation javaJoinColumn = (JoinColumnAnnotation) attributeResource.getSupportingAnnotation(JoinColumnAnnotation.ANNOTATION_NAME); + JoinColumnAnnotation javaJoinColumn = (JoinColumnAnnotation) attributeResource.getAnnotation(JoinColumnAnnotation.ANNOTATION_NAME); assertEquals(0, joinColumns.specifiedJoinColumnsSize()); assertNull(javaJoinColumn); //set updatable in the resource model, verify context model updated - javaJoinColumn = (JoinColumnAnnotation) attributeResource.addSupportingAnnotation(JoinColumnAnnotation.ANNOTATION_NAME); + javaJoinColumn = (JoinColumnAnnotation) attributeResource.addAnnotation(JoinColumnAnnotation.ANNOTATION_NAME); javaJoinColumn.setName("FOO"); javaJoinColumn.setUpdatable(Boolean.FALSE); JavaJoinColumn joinColumn = joinColumns.specifiedJoinColumns().next(); @@ -521,7 +521,7 @@ public class JavaJoinColumnTests extends ContextModelTestCase joinColumn.setSpecifiedName("foo"); joinColumn.setSpecifiedUpdatable(Boolean.FALSE); - JoinColumnAnnotation javaJoinColumn = (JoinColumnAnnotation) attributeResource.getSupportingAnnotation(JoinColumnAnnotation.ANNOTATION_NAME); + JoinColumnAnnotation javaJoinColumn = (JoinColumnAnnotation) attributeResource.getAnnotation(JoinColumnAnnotation.ANNOTATION_NAME); assertEquals(Boolean.FALSE, joinColumn.getSpecifiedUpdatable()); assertEquals(Boolean.FALSE, javaJoinColumn.getUpdatable()); diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/JavaJoinTableTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/JavaJoinTableTests.java index 45f636e707..9665063442 100644 --- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/JavaJoinTableTests.java +++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/JavaJoinTableTests.java @@ -101,15 +101,15 @@ public class JavaJoinTableTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - JoinTableAnnotation javaJoinTable = (JoinTableAnnotation) attributeResource.getSupportingAnnotation(JoinTableAnnotation.ANNOTATION_NAME); + JoinTableAnnotation javaJoinTable = (JoinTableAnnotation) attributeResource.getAnnotation(JoinTableAnnotation.ANNOTATION_NAME); assertNull(joinTable.getSpecifiedName()); assertNull(javaJoinTable); //set name in the resource model, verify context model updated - attributeResource.addSupportingAnnotation(JoinTableAnnotation.ANNOTATION_NAME); - javaJoinTable = (JoinTableAnnotation) attributeResource.getSupportingAnnotation(JoinTableAnnotation.ANNOTATION_NAME); + attributeResource.addAnnotation(JoinTableAnnotation.ANNOTATION_NAME); + javaJoinTable = (JoinTableAnnotation) attributeResource.getAnnotation(JoinTableAnnotation.ANNOTATION_NAME); javaJoinTable.setName("FOO"); assertEquals("FOO", joinTable.getSpecifiedName()); assertEquals("FOO", javaJoinTable.getName()); @@ -123,9 +123,9 @@ public class JavaJoinTableTests extends ContextModelTestCase assertEquals("FOO", joinTable.getSpecifiedName()); assertEquals("FOO", javaJoinTable.getName()); - attributeResource.removeSupportingAnnotation(JoinTableAnnotation.ANNOTATION_NAME); + attributeResource.removeAnnotation(JoinTableAnnotation.ANNOTATION_NAME); assertNull(joinTable.getSpecifiedName()); - assertNull(attributeResource.getSupportingAnnotation(JoinTableAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(JoinTableAnnotation.ANNOTATION_NAME)); } public void testModifySpecifiedName() throws Exception { @@ -138,21 +138,21 @@ public class JavaJoinTableTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - JoinTableAnnotation javaJoinTable = (JoinTableAnnotation) attributeResource.getSupportingAnnotation(JoinTableAnnotation.ANNOTATION_NAME); + JoinTableAnnotation javaJoinTable = (JoinTableAnnotation) attributeResource.getAnnotation(JoinTableAnnotation.ANNOTATION_NAME); assertNull(joinTable.getSpecifiedName()); assertNull(javaJoinTable); //set name in the context model, verify resource model modified joinTable.setSpecifiedName("foo"); - javaJoinTable = (JoinTableAnnotation) attributeResource.getSupportingAnnotation(JoinTableAnnotation.ANNOTATION_NAME); + javaJoinTable = (JoinTableAnnotation) attributeResource.getAnnotation(JoinTableAnnotation.ANNOTATION_NAME); assertEquals("foo", joinTable.getSpecifiedName()); assertEquals("foo", javaJoinTable.getName()); //set name to null in the context model joinTable.setSpecifiedName(null); assertNull(joinTable.getSpecifiedName()); - assertNull(attributeResource.getSupportingAnnotation(JoinTableAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(JoinTableAnnotation.ANNOTATION_NAME)); } public void testDefaultName() throws Exception { @@ -173,7 +173,7 @@ public class JavaJoinTableTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - assertNull(attributeResource.getSupportingAnnotation(JoinTableAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(JoinTableAnnotation.ANNOTATION_NAME)); //target entity does not resolve, default name is null manyToManyMapping.setSpecifiedTargetEntity("Foo"); @@ -184,9 +184,9 @@ public class JavaJoinTableTests extends ContextModelTestCase assertEquals(TYPE_NAME + "_Project", joinTable.getDefaultName()); //add the join table annotation, verify default join table name is the same - attributeResource.addSupportingAnnotation(JoinTableAnnotation.ANNOTATION_NAME); + attributeResource.addAnnotation(JoinTableAnnotation.ANNOTATION_NAME); assertEquals(TYPE_NAME + "_Project", joinTable.getDefaultName()); - assertNotNull(attributeResource.getSupportingAnnotation(JoinTableAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getAnnotation(JoinTableAnnotation.ANNOTATION_NAME)); //set a table on the target entity, very default join table name updates manyToManyMapping.getResolvedTargetEntity().getTable().setSpecifiedName("FOO"); @@ -207,15 +207,15 @@ public class JavaJoinTableTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - JoinTableAnnotation javaJoinTable = (JoinTableAnnotation) attributeResource.getSupportingAnnotation(JoinTableAnnotation.ANNOTATION_NAME); + JoinTableAnnotation javaJoinTable = (JoinTableAnnotation) attributeResource.getAnnotation(JoinTableAnnotation.ANNOTATION_NAME); assertNull(joinTable.getSpecifiedSchema()); assertNull(javaJoinTable); //set schema in the resource model, verify context model updated - attributeResource.addSupportingAnnotation(JoinTableAnnotation.ANNOTATION_NAME); - javaJoinTable = (JoinTableAnnotation) attributeResource.getSupportingAnnotation(JoinTableAnnotation.ANNOTATION_NAME); + attributeResource.addAnnotation(JoinTableAnnotation.ANNOTATION_NAME); + javaJoinTable = (JoinTableAnnotation) attributeResource.getAnnotation(JoinTableAnnotation.ANNOTATION_NAME); javaJoinTable.setSchema("FOO"); assertEquals("FOO", joinTable.getSpecifiedSchema()); assertEquals("FOO", javaJoinTable.getSchema()); @@ -229,9 +229,9 @@ public class JavaJoinTableTests extends ContextModelTestCase assertEquals("FOO", joinTable.getSpecifiedSchema()); assertEquals("FOO", javaJoinTable.getSchema()); - attributeResource.removeSupportingAnnotation(JoinTableAnnotation.ANNOTATION_NAME); + attributeResource.removeAnnotation(JoinTableAnnotation.ANNOTATION_NAME); assertNull(joinTable.getSpecifiedSchema()); - assertNull(attributeResource.getSupportingAnnotation(JoinTableAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(JoinTableAnnotation.ANNOTATION_NAME)); } public void testModifySpecifiedSchema() throws Exception { @@ -244,21 +244,21 @@ public class JavaJoinTableTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - JoinTableAnnotation javaJoinTable = (JoinTableAnnotation) attributeResource.getSupportingAnnotation(JoinTableAnnotation.ANNOTATION_NAME); + JoinTableAnnotation javaJoinTable = (JoinTableAnnotation) attributeResource.getAnnotation(JoinTableAnnotation.ANNOTATION_NAME); assertNull(joinTable.getSpecifiedSchema()); assertNull(javaJoinTable); //set schema in the context model, verify resource model modified joinTable.setSpecifiedSchema("foo"); - javaJoinTable = (JoinTableAnnotation) attributeResource.getSupportingAnnotation(JoinTableAnnotation.ANNOTATION_NAME); + javaJoinTable = (JoinTableAnnotation) attributeResource.getAnnotation(JoinTableAnnotation.ANNOTATION_NAME); assertEquals("foo", joinTable.getSpecifiedSchema()); assertEquals("foo", javaJoinTable.getSchema()); //set schema to null in the context model joinTable.setSpecifiedSchema(null); assertNull(joinTable.getSpecifiedSchema()); - assertNull(attributeResource.getSupportingAnnotation(JoinTableAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(JoinTableAnnotation.ANNOTATION_NAME)); } public void testUpdateSpecifiedCatalog() throws Exception { @@ -271,15 +271,15 @@ public class JavaJoinTableTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - JoinTableAnnotation javaJoinTable = (JoinTableAnnotation) attributeResource.getSupportingAnnotation(JoinTableAnnotation.ANNOTATION_NAME); + JoinTableAnnotation javaJoinTable = (JoinTableAnnotation) attributeResource.getAnnotation(JoinTableAnnotation.ANNOTATION_NAME); assertNull(joinTable.getSpecifiedCatalog()); assertNull(javaJoinTable); //set catalog in the resource model, verify context model updated - attributeResource.addSupportingAnnotation(JoinTableAnnotation.ANNOTATION_NAME); - javaJoinTable = (JoinTableAnnotation) attributeResource.getSupportingAnnotation(JoinTableAnnotation.ANNOTATION_NAME); + attributeResource.addAnnotation(JoinTableAnnotation.ANNOTATION_NAME); + javaJoinTable = (JoinTableAnnotation) attributeResource.getAnnotation(JoinTableAnnotation.ANNOTATION_NAME); javaJoinTable.setCatalog("FOO"); assertEquals("FOO", joinTable.getSpecifiedCatalog()); assertEquals("FOO", javaJoinTable.getCatalog()); @@ -293,9 +293,9 @@ public class JavaJoinTableTests extends ContextModelTestCase assertEquals("FOO", joinTable.getSpecifiedCatalog()); assertEquals("FOO", javaJoinTable.getCatalog()); - attributeResource.removeSupportingAnnotation(JoinTableAnnotation.ANNOTATION_NAME); + attributeResource.removeAnnotation(JoinTableAnnotation.ANNOTATION_NAME); assertNull(joinTable.getSpecifiedCatalog()); - assertNull(attributeResource.getSupportingAnnotation(JoinTableAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(JoinTableAnnotation.ANNOTATION_NAME)); } public void testModifySpecifiedCatalog() throws Exception { @@ -308,21 +308,21 @@ public class JavaJoinTableTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - JoinTableAnnotation javaJoinTable = (JoinTableAnnotation) attributeResource.getSupportingAnnotation(JoinTableAnnotation.ANNOTATION_NAME); + JoinTableAnnotation javaJoinTable = (JoinTableAnnotation) attributeResource.getAnnotation(JoinTableAnnotation.ANNOTATION_NAME); assertNull(joinTable.getSpecifiedCatalog()); assertNull(javaJoinTable); //set catalog in the context model, verify resource model modified joinTable.setSpecifiedCatalog("foo"); - javaJoinTable = (JoinTableAnnotation) attributeResource.getSupportingAnnotation(JoinTableAnnotation.ANNOTATION_NAME); + javaJoinTable = (JoinTableAnnotation) attributeResource.getAnnotation(JoinTableAnnotation.ANNOTATION_NAME); assertEquals("foo", joinTable.getSpecifiedCatalog()); assertEquals("foo", javaJoinTable.getCatalog()); //set catalog to null in the context model joinTable.setSpecifiedCatalog(null); assertNull(joinTable.getSpecifiedCatalog()); - assertNull(attributeResource.getSupportingAnnotation(JoinTableAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(JoinTableAnnotation.ANNOTATION_NAME)); } public void testAddSpecifiedJoinColumn() throws Exception { @@ -339,7 +339,7 @@ public class JavaJoinTableTests extends ContextModelTestCase JoinColumn joinColumn = joinTable.addSpecifiedJoinColumn(0); joinColumn.setSpecifiedName("FOO"); - JoinTableAnnotation joinTableResource = (JoinTableAnnotation) attributeResource.getSupportingAnnotation(JoinTableAnnotation.ANNOTATION_NAME); + JoinTableAnnotation joinTableResource = (JoinTableAnnotation) attributeResource.getAnnotation(JoinTableAnnotation.ANNOTATION_NAME); assertEquals("FOO", joinTableResource.joinColumnAt(0).getName()); @@ -381,7 +381,7 @@ public class JavaJoinTableTests extends ContextModelTestCase joinTable.addSpecifiedJoinColumn(1).setSpecifiedName("BAR"); joinTable.addSpecifiedJoinColumn(2).setSpecifiedName("BAZ"); - JoinTableAnnotation joinTableResource = (JoinTableAnnotation) attributeResource.getSupportingAnnotation(JoinTableAnnotation.ANNOTATION_NAME); + JoinTableAnnotation joinTableResource = (JoinTableAnnotation) attributeResource.getAnnotation(JoinTableAnnotation.ANNOTATION_NAME); assertEquals(3, joinTableResource.joinColumnsSize()); joinTable.removeSpecifiedJoinColumn(0); @@ -411,7 +411,7 @@ public class JavaJoinTableTests extends ContextModelTestCase joinTable.addSpecifiedJoinColumn(1).setSpecifiedName("BAR"); joinTable.addSpecifiedJoinColumn(2).setSpecifiedName("BAZ"); - JoinTableAnnotation joinTableResource = (JoinTableAnnotation) attributeResource.getSupportingAnnotation(JoinTableAnnotation.ANNOTATION_NAME); + JoinTableAnnotation joinTableResource = (JoinTableAnnotation) attributeResource.getAnnotation(JoinTableAnnotation.ANNOTATION_NAME); assertEquals(3, joinTableResource.joinColumnsSize()); @@ -447,7 +447,7 @@ public class JavaJoinTableTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - JoinTableAnnotation joinTableResource = (JoinTableAnnotation) attributeResource.addSupportingAnnotation(JoinTableAnnotation.ANNOTATION_NAME); + JoinTableAnnotation joinTableResource = (JoinTableAnnotation) attributeResource.addAnnotation(JoinTableAnnotation.ANNOTATION_NAME); joinTableResource.addJoinColumn(0); joinTableResource.addJoinColumn(1); @@ -550,7 +550,7 @@ public class JavaJoinTableTests extends ContextModelTestCase JoinColumn inverseJoinColumn = joinTable.addSpecifiedInverseJoinColumn(0); inverseJoinColumn.setSpecifiedName("FOO"); - JoinTableAnnotation joinTableResource = (JoinTableAnnotation) attributeResource.getSupportingAnnotation(JoinTableAnnotation.ANNOTATION_NAME); + JoinTableAnnotation joinTableResource = (JoinTableAnnotation) attributeResource.getAnnotation(JoinTableAnnotation.ANNOTATION_NAME); assertEquals("FOO", joinTableResource.inverseJoinColumnAt(0).getName()); @@ -592,7 +592,7 @@ public class JavaJoinTableTests extends ContextModelTestCase joinTable.addSpecifiedInverseJoinColumn(1).setSpecifiedName("BAR"); joinTable.addSpecifiedInverseJoinColumn(2).setSpecifiedName("BAZ"); - JoinTableAnnotation joinTableResource = (JoinTableAnnotation) attributeResource.getSupportingAnnotation(JoinTableAnnotation.ANNOTATION_NAME); + JoinTableAnnotation joinTableResource = (JoinTableAnnotation) attributeResource.getAnnotation(JoinTableAnnotation.ANNOTATION_NAME); assertEquals(3, joinTableResource.inverseJoinColumnsSize()); joinTable.removeSpecifiedInverseJoinColumn(0); @@ -622,7 +622,7 @@ public class JavaJoinTableTests extends ContextModelTestCase joinTable.addSpecifiedInverseJoinColumn(1).setSpecifiedName("BAR"); joinTable.addSpecifiedInverseJoinColumn(2).setSpecifiedName("BAZ"); - JoinTableAnnotation joinTableResource = (JoinTableAnnotation) attributeResource.getSupportingAnnotation(JoinTableAnnotation.ANNOTATION_NAME); + JoinTableAnnotation joinTableResource = (JoinTableAnnotation) attributeResource.getAnnotation(JoinTableAnnotation.ANNOTATION_NAME); assertEquals(3, joinTableResource.inverseJoinColumnsSize()); @@ -658,7 +658,7 @@ public class JavaJoinTableTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - JoinTableAnnotation joinTableResource = (JoinTableAnnotation) attributeResource.addSupportingAnnotation(JoinTableAnnotation.ANNOTATION_NAME); + JoinTableAnnotation joinTableResource = (JoinTableAnnotation) attributeResource.addAnnotation(JoinTableAnnotation.ANNOTATION_NAME); joinTableResource.addInverseJoinColumn(0); joinTableResource.addInverseJoinColumn(1); @@ -759,7 +759,7 @@ public class JavaJoinTableTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - JoinTableAnnotation joinTableAnnotation = (JoinTableAnnotation) attributeResource.addSupportingAnnotation(JoinTableAnnotation.ANNOTATION_NAME); + JoinTableAnnotation joinTableAnnotation = (JoinTableAnnotation) attributeResource.addAnnotation(JoinTableAnnotation.ANNOTATION_NAME); joinTableAnnotation.addUniqueConstraint(0).addColumnName(0, "foo"); joinTableAnnotation.addUniqueConstraint(0).addColumnName(0, "bar"); @@ -781,7 +781,7 @@ public class JavaJoinTableTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - JoinTableAnnotation joinTableAnnotation = (JoinTableAnnotation) attributeResource.addSupportingAnnotation(JoinTableAnnotation.ANNOTATION_NAME); + JoinTableAnnotation joinTableAnnotation = (JoinTableAnnotation) attributeResource.addAnnotation(JoinTableAnnotation.ANNOTATION_NAME); joinTableAnnotation.addUniqueConstraint(0).addColumnName(0, "foo"); joinTableAnnotation.addUniqueConstraint(1).addColumnName(0, "bar"); @@ -800,7 +800,7 @@ public class JavaJoinTableTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - JoinTableAnnotation joinTableAnnotation = (JoinTableAnnotation) attributeResource.getSupportingAnnotation(JoinTableAnnotation.ANNOTATION_NAME); + JoinTableAnnotation joinTableAnnotation = (JoinTableAnnotation) attributeResource.getAnnotation(JoinTableAnnotation.ANNOTATION_NAME); ListIterator<UniqueConstraintAnnotation> uniqueConstraints = joinTableAnnotation.uniqueConstraints(); assertEquals("BAZ", uniqueConstraints.next().columnNames().next()); @@ -821,7 +821,7 @@ public class JavaJoinTableTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - JoinTableAnnotation joinTableAnnotation = (JoinTableAnnotation) attributeResource.getSupportingAnnotation(JoinTableAnnotation.ANNOTATION_NAME); + JoinTableAnnotation joinTableAnnotation = (JoinTableAnnotation) attributeResource.getAnnotation(JoinTableAnnotation.ANNOTATION_NAME); ListIterator<UniqueConstraintAnnotation> uniqueConstraints = joinTableAnnotation.uniqueConstraints(); assertEquals("BAZ", uniqueConstraints.next().columnNames().next()); @@ -842,7 +842,7 @@ public class JavaJoinTableTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - JoinTableAnnotation joinTableAnnotation = (JoinTableAnnotation) attributeResource.getSupportingAnnotation(JoinTableAnnotation.ANNOTATION_NAME); + JoinTableAnnotation joinTableAnnotation = (JoinTableAnnotation) attributeResource.getAnnotation(JoinTableAnnotation.ANNOTATION_NAME); assertEquals(3, joinTableAnnotation.uniqueConstraintsSize()); @@ -888,7 +888,7 @@ public class JavaJoinTableTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - JoinTableAnnotation joinTableAnnotation = (JoinTableAnnotation) attributeResource.getSupportingAnnotation(JoinTableAnnotation.ANNOTATION_NAME); + JoinTableAnnotation joinTableAnnotation = (JoinTableAnnotation) attributeResource.getAnnotation(JoinTableAnnotation.ANNOTATION_NAME); assertEquals(3, joinTableAnnotation.uniqueConstraintsSize()); @@ -925,7 +925,7 @@ public class JavaJoinTableTests extends ContextModelTestCase JoinTable joinTable = manyToManyMapping.getRelationshipReference().getJoinTableJoiningStrategy().getJoinTable(); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - JoinTableAnnotation joinTableAnnotation = (JoinTableAnnotation) attributeResource.addSupportingAnnotation(JoinTableAnnotation.ANNOTATION_NAME); + JoinTableAnnotation joinTableAnnotation = (JoinTableAnnotation) attributeResource.addAnnotation(JoinTableAnnotation.ANNOTATION_NAME); joinTableAnnotation.addUniqueConstraint(0).addColumnName("FOO"); joinTableAnnotation.addUniqueConstraint(1).addColumnName("BAR"); diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/JavaManyToManyMappingTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/JavaManyToManyMappingTests.java index 06dfe5cd18..269dd9c643 100644 --- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/JavaManyToManyMappingTests.java +++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/JavaManyToManyMappingTests.java @@ -236,10 +236,10 @@ public class JavaManyToManyMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - assertNull(attributeResource.getMappingAnnotation(ManyToManyAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getMappingAnnotation(BasicAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getSupportingAnnotation(JoinTableAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getSupportingAnnotation(OrderByAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(ManyToManyAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getAnnotation(BasicAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(JoinTableAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(OrderByAnnotation.ANNOTATION_NAME)); } public void testMorphToDefault() throws Exception { @@ -258,9 +258,9 @@ public class JavaManyToManyMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - assertNull(attributeResource.getMappingAnnotation(ManyToManyAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getSupportingAnnotation(JoinTableAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getSupportingAnnotation(OrderByAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(ManyToManyAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(JoinTableAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(OrderByAnnotation.ANNOTATION_NAME)); } public void testMorphToVersionMapping() throws Exception { @@ -279,10 +279,10 @@ public class JavaManyToManyMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - assertNull(attributeResource.getMappingAnnotation(ManyToManyAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getMappingAnnotation(VersionAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getSupportingAnnotation(JoinTableAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getSupportingAnnotation(OrderByAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(ManyToManyAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getAnnotation(VersionAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(JoinTableAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(OrderByAnnotation.ANNOTATION_NAME)); } public void testMorphToIdMapping() throws Exception { @@ -301,10 +301,10 @@ public class JavaManyToManyMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - assertNull(attributeResource.getMappingAnnotation(ManyToManyAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getMappingAnnotation(IdAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getSupportingAnnotation(JoinTableAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getSupportingAnnotation(OrderByAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(ManyToManyAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getAnnotation(IdAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(JoinTableAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(OrderByAnnotation.ANNOTATION_NAME)); } public void testMorphToEmbeddedMapping() throws Exception { @@ -323,10 +323,10 @@ public class JavaManyToManyMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - assertNull(attributeResource.getMappingAnnotation(ManyToManyAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getMappingAnnotation(EmbeddedAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getSupportingAnnotation(JoinTableAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getSupportingAnnotation(OrderByAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(ManyToManyAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getAnnotation(EmbeddedAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(JoinTableAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(OrderByAnnotation.ANNOTATION_NAME)); } public void testMorphToEmbeddedIdMapping() throws Exception { @@ -345,10 +345,10 @@ public class JavaManyToManyMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - assertNull(attributeResource.getMappingAnnotation(ManyToManyAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getMappingAnnotation(EmbeddedIdAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getSupportingAnnotation(JoinTableAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getSupportingAnnotation(OrderByAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(ManyToManyAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getAnnotation(EmbeddedIdAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(JoinTableAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(OrderByAnnotation.ANNOTATION_NAME)); } public void testMorphToTransientMapping() throws Exception { @@ -367,10 +367,10 @@ public class JavaManyToManyMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - assertNull(attributeResource.getMappingAnnotation(ManyToManyAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getMappingAnnotation(TransientAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getSupportingAnnotation(JoinTableAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getSupportingAnnotation(OrderByAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(ManyToManyAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getAnnotation(TransientAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(JoinTableAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(OrderByAnnotation.ANNOTATION_NAME)); } public void testMorphToOneToOneMapping() throws Exception { @@ -389,10 +389,10 @@ public class JavaManyToManyMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - assertNull(attributeResource.getMappingAnnotation(ManyToManyAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getMappingAnnotation(OneToOneAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getSupportingAnnotation(JoinTableAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getSupportingAnnotation(OrderByAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(ManyToManyAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getAnnotation(OneToOneAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getAnnotation(JoinTableAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(OrderByAnnotation.ANNOTATION_NAME)); } public void testMorphToOneToManyMapping() throws Exception { @@ -411,10 +411,10 @@ public class JavaManyToManyMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - assertNull(attributeResource.getMappingAnnotation(ManyToManyAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getMappingAnnotation(OneToManyAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getSupportingAnnotation(JoinTableAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getSupportingAnnotation(OrderByAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(ManyToManyAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getAnnotation(OneToManyAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getAnnotation(JoinTableAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getAnnotation(OrderByAnnotation.ANNOTATION_NAME)); } public void testMorphToManyToOneMapping() throws Exception { @@ -433,10 +433,10 @@ public class JavaManyToManyMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - assertNull(attributeResource.getMappingAnnotation(ManyToManyAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getMappingAnnotation(ManyToOneAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getSupportingAnnotation(JoinTableAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getSupportingAnnotation(OrderByAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(ManyToManyAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getAnnotation(ManyToOneAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getAnnotation(JoinTableAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(OrderByAnnotation.ANNOTATION_NAME)); } public void testUpdateSpecifiedTargetEntity() throws Exception { @@ -448,7 +448,7 @@ public class JavaManyToManyMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - ManyToManyAnnotation manyToMany = (ManyToManyAnnotation) attributeResource.getMappingAnnotation(); + ManyToManyAnnotation manyToMany = (ManyToManyAnnotation) attributeResource.getAnnotation(ManyToManyAnnotation.ANNOTATION_NAME); assertNull(manyToManyMapping.getSpecifiedTargetEntity()); assertNull(manyToMany.getTargetEntity()); @@ -473,7 +473,7 @@ public class JavaManyToManyMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - ManyToManyAnnotation manyToMany = (ManyToManyAnnotation) attributeResource.getMappingAnnotation(); + ManyToManyAnnotation manyToMany = (ManyToManyAnnotation) attributeResource.getAnnotation(ManyToManyAnnotation.ANNOTATION_NAME); assertNull(manyToManyMapping.getSpecifiedTargetEntity()); assertNull(manyToMany.getTargetEntity()); @@ -498,7 +498,7 @@ public class JavaManyToManyMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - ManyToManyAnnotation manyToMany = (ManyToManyAnnotation) attributeResource.getMappingAnnotation(); + ManyToManyAnnotation manyToMany = (ManyToManyAnnotation) attributeResource.getAnnotation(ManyToManyAnnotation.ANNOTATION_NAME); assertNull(manyToManyMapping.getSpecifiedFetch()); assertNull(manyToMany.getFetch()); @@ -528,7 +528,7 @@ public class JavaManyToManyMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - ManyToManyAnnotation manyToMany = (ManyToManyAnnotation) attributeResource.getMappingAnnotation(); + ManyToManyAnnotation manyToMany = (ManyToManyAnnotation) attributeResource.getAnnotation(ManyToManyAnnotation.ANNOTATION_NAME); assertNull(manyToManyMapping.getSpecifiedFetch()); assertNull(manyToMany.getFetch()); @@ -537,11 +537,10 @@ public class JavaManyToManyMappingTests extends ContextModelTestCase manyToManyMapping.setSpecifiedFetch(FetchType.EAGER); assertEquals(FetchType.EAGER, manyToManyMapping.getSpecifiedFetch()); assertEquals(org.eclipse.jpt.core.resource.java.FetchType.EAGER, manyToMany.getFetch()); - + manyToManyMapping.setSpecifiedFetch(FetchType.LAZY); assertEquals(FetchType.LAZY, manyToManyMapping.getSpecifiedFetch()); assertEquals(org.eclipse.jpt.core.resource.java.FetchType.LAZY, manyToMany.getFetch()); - //set fetch to null in the context model manyToManyMapping.setSpecifiedFetch(null); @@ -558,7 +557,7 @@ public class JavaManyToManyMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - ManyToManyAnnotation manyToMany = (ManyToManyAnnotation) attributeResource.getMappingAnnotation(); + ManyToManyAnnotation manyToMany = (ManyToManyAnnotation) attributeResource.getAnnotation(ManyToManyAnnotation.ANNOTATION_NAME); assertNull(manyToManyMapping.getRelationshipReference().getMappedByJoiningStrategy().getMappedByAttribute()); assertNull(manyToMany.getMappedBy()); @@ -583,7 +582,7 @@ public class JavaManyToManyMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - ManyToManyAnnotation manyToMany = (ManyToManyAnnotation) attributeResource.getMappingAnnotation(); + ManyToManyAnnotation manyToMany = (ManyToManyAnnotation) attributeResource.getAnnotation(ManyToManyAnnotation.ANNOTATION_NAME); assertNull(manyToManyMapping.getRelationshipReference().getMappedByJoiningStrategy().getMappedByAttribute()); assertNull(manyToMany.getMappedBy()); @@ -746,12 +745,12 @@ public class JavaManyToManyMappingTests extends ContextModelTestCase JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); assertNull(manyToManyMapping.getMapKey()); - assertNull(attributeResource.getSupportingAnnotation(MapKeyAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(MapKeyAnnotation.ANNOTATION_NAME)); //set mapKey in the resource model, verify context model does not change - attributeResource.addSupportingAnnotation(MapKeyAnnotation.ANNOTATION_NAME); + attributeResource.addAnnotation(MapKeyAnnotation.ANNOTATION_NAME); assertNull(manyToManyMapping.getMapKey()); - MapKeyAnnotation mapKey = (MapKeyAnnotation) attributeResource.getSupportingAnnotation(MapKeyAnnotation.ANNOTATION_NAME); + MapKeyAnnotation mapKey = (MapKeyAnnotation) attributeResource.getAnnotation(MapKeyAnnotation.ANNOTATION_NAME); assertNotNull(mapKey); //set mapKey name in the resource model, verify context model updated @@ -765,9 +764,9 @@ public class JavaManyToManyMappingTests extends ContextModelTestCase assertNull(mapKey.getName()); mapKey.setName("myMapKey"); - attributeResource.removeSupportingAnnotation(MapKeyAnnotation.ANNOTATION_NAME); + attributeResource.removeAnnotation(MapKeyAnnotation.ANNOTATION_NAME); assertNull(manyToManyMapping.getMapKey()); - assertNull(attributeResource.getSupportingAnnotation(MapKeyAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(MapKeyAnnotation.ANNOTATION_NAME)); } public void testModifyMapKey() throws Exception { @@ -781,18 +780,18 @@ public class JavaManyToManyMappingTests extends ContextModelTestCase JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); assertNull(manyToManyMapping.getMapKey()); - assertNull(attributeResource.getSupportingAnnotation(MapKeyAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(MapKeyAnnotation.ANNOTATION_NAME)); //set mapKey in the context model, verify resource model updated manyToManyMapping.setMapKey("myMapKey"); - MapKeyAnnotation mapKey = (MapKeyAnnotation) attributeResource.getSupportingAnnotation(MapKeyAnnotation.ANNOTATION_NAME); + MapKeyAnnotation mapKey = (MapKeyAnnotation) attributeResource.getAnnotation(MapKeyAnnotation.ANNOTATION_NAME); assertEquals("myMapKey", manyToManyMapping.getMapKey()); assertEquals("myMapKey", mapKey.getName()); //set mapKey to null in the context model manyToManyMapping.setMapKey(null); assertNull(manyToManyMapping.getMapKey()); - assertNull(attributeResource.getSupportingAnnotation(MapKeyAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(MapKeyAnnotation.ANNOTATION_NAME)); } public void testUpdateOrderBy() throws Exception { @@ -806,19 +805,19 @@ public class JavaManyToManyMappingTests extends ContextModelTestCase JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); assertNull(manyToManyMapping.getOrderBy()); - assertNull(attributeResource.getSupportingAnnotation(OrderByAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(OrderByAnnotation.ANNOTATION_NAME)); //set orderBy in the resource model, verify context model updated - attributeResource.addSupportingAnnotation(OrderByAnnotation.ANNOTATION_NAME); - OrderByAnnotation orderBy = (OrderByAnnotation) attributeResource.getSupportingAnnotation(OrderByAnnotation.ANNOTATION_NAME); + attributeResource.addAnnotation(OrderByAnnotation.ANNOTATION_NAME); + OrderByAnnotation orderBy = (OrderByAnnotation) attributeResource.getAnnotation(OrderByAnnotation.ANNOTATION_NAME); orderBy.setValue("newOrderBy"); assertEquals("newOrderBy", manyToManyMapping.getOrderBy()); assertEquals("newOrderBy", orderBy.getValue()); //set orderBy to null in the resource model - attributeResource.removeSupportingAnnotation(OrderByAnnotation.ANNOTATION_NAME); + attributeResource.removeAnnotation(OrderByAnnotation.ANNOTATION_NAME); assertNull(manyToManyMapping.getOrderBy()); - assertNull(attributeResource.getSupportingAnnotation(OrderByAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(OrderByAnnotation.ANNOTATION_NAME)); } public void testModifyOrderBy() throws Exception { @@ -832,18 +831,18 @@ public class JavaManyToManyMappingTests extends ContextModelTestCase JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); assertNull(manyToManyMapping.getOrderBy()); - assertNull(attributeResource.getSupportingAnnotation(OrderByAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(OrderByAnnotation.ANNOTATION_NAME)); //set mappedBy in the context model, verify resource model updated manyToManyMapping.setOrderBy("newOrderBy"); assertEquals("newOrderBy", manyToManyMapping.getOrderBy()); - OrderByAnnotation orderBy = (OrderByAnnotation) attributeResource.getSupportingAnnotation(OrderByAnnotation.ANNOTATION_NAME); + OrderByAnnotation orderBy = (OrderByAnnotation) attributeResource.getAnnotation(OrderByAnnotation.ANNOTATION_NAME); assertEquals("newOrderBy", orderBy.getValue()); //set mappedBy to null in the context model manyToManyMapping.setOrderBy(null); assertNull(manyToManyMapping.getOrderBy()); - assertNull(attributeResource.getSupportingAnnotation(OrderByAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(OrderByAnnotation.ANNOTATION_NAME)); } public void testUpdateNoOrdering() throws Exception { @@ -857,20 +856,20 @@ public class JavaManyToManyMappingTests extends ContextModelTestCase JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); assertTrue(manyToManyMapping.isNoOrdering()); - assertNull(attributeResource.getSupportingAnnotation(OrderByAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(OrderByAnnotation.ANNOTATION_NAME)); //set orderBy in the resource model, verify context model updated - attributeResource.addSupportingAnnotation(OrderByAnnotation.ANNOTATION_NAME); + attributeResource.addAnnotation(OrderByAnnotation.ANNOTATION_NAME); assertFalse(manyToManyMapping.isNoOrdering()); - OrderByAnnotation orderBy = (OrderByAnnotation) attributeResource.getSupportingAnnotation(OrderByAnnotation.ANNOTATION_NAME); + OrderByAnnotation orderBy = (OrderByAnnotation) attributeResource.getAnnotation(OrderByAnnotation.ANNOTATION_NAME); orderBy.setValue("newOrderBy"); assertFalse(manyToManyMapping.isNoOrdering()); //set orderBy to null in the resource model - attributeResource.removeSupportingAnnotation(OrderByAnnotation.ANNOTATION_NAME); + attributeResource.removeAnnotation(OrderByAnnotation.ANNOTATION_NAME); assertTrue(manyToManyMapping.isNoOrdering()); - assertNull(attributeResource.getSupportingAnnotation(OrderByAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(OrderByAnnotation.ANNOTATION_NAME)); } public void testModifyNoOrdering() throws Exception { @@ -884,7 +883,7 @@ public class JavaManyToManyMappingTests extends ContextModelTestCase JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); assertTrue(manyToManyMapping.isNoOrdering()); - assertNull(attributeResource.getSupportingAnnotation(OrderByAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(OrderByAnnotation.ANNOTATION_NAME)); // manyToManyMapping.setNoOrdering(false); //this does nothing // //set mappedBy in the context model, verify resource model updated @@ -910,20 +909,20 @@ public class JavaManyToManyMappingTests extends ContextModelTestCase JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); assertFalse(manyToManyMapping.isPkOrdering()); - assertNull(attributeResource.getSupportingAnnotation(OrderByAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(OrderByAnnotation.ANNOTATION_NAME)); //set orderBy in the resource model, verify context model updated - attributeResource.addSupportingAnnotation(OrderByAnnotation.ANNOTATION_NAME); + attributeResource.addAnnotation(OrderByAnnotation.ANNOTATION_NAME); assertTrue(manyToManyMapping.isPkOrdering()); - OrderByAnnotation orderBy = (OrderByAnnotation) attributeResource.getSupportingAnnotation(OrderByAnnotation.ANNOTATION_NAME); + OrderByAnnotation orderBy = (OrderByAnnotation) attributeResource.getAnnotation(OrderByAnnotation.ANNOTATION_NAME); orderBy.setValue("newOrderBy"); assertFalse(manyToManyMapping.isPkOrdering()); //set orderBy to null in the resource model - attributeResource.removeSupportingAnnotation(OrderByAnnotation.ANNOTATION_NAME); + attributeResource.removeAnnotation(OrderByAnnotation.ANNOTATION_NAME); assertFalse(manyToManyMapping.isPkOrdering()); - assertNull(attributeResource.getSupportingAnnotation(OrderByAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(OrderByAnnotation.ANNOTATION_NAME)); } public void testUpdateCustomOrdering() throws Exception { @@ -937,20 +936,20 @@ public class JavaManyToManyMappingTests extends ContextModelTestCase JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); assertFalse(manyToManyMapping.isCustomOrdering()); - assertNull(attributeResource.getSupportingAnnotation(OrderByAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(OrderByAnnotation.ANNOTATION_NAME)); //set orderBy in the resource model, verify context model updated - attributeResource.addSupportingAnnotation(OrderByAnnotation.ANNOTATION_NAME); + attributeResource.addAnnotation(OrderByAnnotation.ANNOTATION_NAME); assertFalse(manyToManyMapping.isCustomOrdering()); - OrderByAnnotation orderBy = (OrderByAnnotation) attributeResource.getSupportingAnnotation(OrderByAnnotation.ANNOTATION_NAME); + OrderByAnnotation orderBy = (OrderByAnnotation) attributeResource.getAnnotation(OrderByAnnotation.ANNOTATION_NAME); orderBy.setValue("newOrderBy"); assertTrue(manyToManyMapping.isCustomOrdering()); //set orderBy to null in the resource model - attributeResource.removeSupportingAnnotation(OrderByAnnotation.ANNOTATION_NAME); + attributeResource.removeAnnotation(OrderByAnnotation.ANNOTATION_NAME); assertFalse(manyToManyMapping.isCustomOrdering()); - assertNull(attributeResource.getSupportingAnnotation(OrderByAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(OrderByAnnotation.ANNOTATION_NAME)); } public void testDefaultTargetEntityForMap() throws Exception { diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/JavaManyToOneMappingTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/JavaManyToOneMappingTests.java index 86060f59af..ffc129348d 100644 --- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/JavaManyToOneMappingTests.java +++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/JavaManyToOneMappingTests.java @@ -190,9 +190,9 @@ public class JavaManyToOneMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - assertNull(attributeResource.getMappingAnnotation(ManyToOneAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getMappingAnnotation(BasicAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getSupportingAnnotation(JoinColumnAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(ManyToOneAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getAnnotation(BasicAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(JoinColumnAnnotation.ANNOTATION_NAME)); } public void testMorphToDefault() throws Exception { @@ -211,8 +211,8 @@ public class JavaManyToOneMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - assertNull(attributeResource.getMappingAnnotation(ManyToOneAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getSupportingAnnotation(JoinColumnAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(ManyToOneAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(JoinColumnAnnotation.ANNOTATION_NAME)); } public void testMorphToVersionMapping() throws Exception { @@ -231,9 +231,9 @@ public class JavaManyToOneMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - assertNull(attributeResource.getMappingAnnotation(ManyToOneAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getMappingAnnotation(VersionAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getSupportingAnnotation(JoinColumnAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(ManyToOneAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getAnnotation(VersionAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(JoinColumnAnnotation.ANNOTATION_NAME)); } public void testMorphToIdMapping() throws Exception { @@ -252,9 +252,9 @@ public class JavaManyToOneMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - assertNull(attributeResource.getMappingAnnotation(ManyToOneAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getMappingAnnotation(IdAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getSupportingAnnotation(JoinColumnAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(ManyToOneAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getAnnotation(IdAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(JoinColumnAnnotation.ANNOTATION_NAME)); } public void testMorphToEmbeddedMapping() throws Exception { @@ -273,9 +273,9 @@ public class JavaManyToOneMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - assertNull(attributeResource.getMappingAnnotation(ManyToOneAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getMappingAnnotation(EmbeddedAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getSupportingAnnotation(JoinColumnAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(ManyToOneAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getAnnotation(EmbeddedAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(JoinColumnAnnotation.ANNOTATION_NAME)); } public void testMorphToEmbeddedIdMapping() throws Exception { @@ -294,9 +294,9 @@ public class JavaManyToOneMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - assertNull(attributeResource.getMappingAnnotation(ManyToOneAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getMappingAnnotation(EmbeddedIdAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getSupportingAnnotation(JoinColumnAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(ManyToOneAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getAnnotation(EmbeddedIdAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(JoinColumnAnnotation.ANNOTATION_NAME)); } public void testMorphToTransientMapping() throws Exception { @@ -315,9 +315,9 @@ public class JavaManyToOneMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - assertNull(attributeResource.getMappingAnnotation(ManyToOneAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getMappingAnnotation(TransientAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getSupportingAnnotation(JoinColumnAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(ManyToOneAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getAnnotation(TransientAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(JoinColumnAnnotation.ANNOTATION_NAME)); } public void testMorphToOneToOneMapping() throws Exception { @@ -336,9 +336,9 @@ public class JavaManyToOneMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - assertNull(attributeResource.getMappingAnnotation(ManyToOneAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getMappingAnnotation(OneToOneAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getSupportingAnnotation(JoinColumnAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(ManyToOneAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getAnnotation(OneToOneAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getAnnotation(JoinColumnAnnotation.ANNOTATION_NAME)); } public void testMorphToOneToManyMapping() throws Exception { @@ -357,9 +357,9 @@ public class JavaManyToOneMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - assertNull(attributeResource.getMappingAnnotation(ManyToOneAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getMappingAnnotation(OneToManyAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getSupportingAnnotation(JoinColumnAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(ManyToOneAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getAnnotation(OneToManyAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getAnnotation(JoinColumnAnnotation.ANNOTATION_NAME)); } public void testMorphToManyToManyMapping() throws Exception { @@ -378,9 +378,9 @@ public class JavaManyToOneMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - assertNull(attributeResource.getMappingAnnotation(ManyToOneAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getMappingAnnotation(ManyToManyAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getSupportingAnnotation(JoinColumnAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(ManyToOneAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getAnnotation(ManyToManyAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(JoinColumnAnnotation.ANNOTATION_NAME)); } public void testUpdateSpecifiedTargetEntity() throws Exception { @@ -392,7 +392,7 @@ public class JavaManyToOneMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - ManyToOneAnnotation manyToOne = (ManyToOneAnnotation) attributeResource.getMappingAnnotation(); + ManyToOneAnnotation manyToOne = (ManyToOneAnnotation) attributeResource.getAnnotation(ManyToOneAnnotation.ANNOTATION_NAME); assertNull(manyToOneMapping.getSpecifiedTargetEntity()); assertNull(manyToOne.getTargetEntity()); @@ -417,7 +417,7 @@ public class JavaManyToOneMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - ManyToOneAnnotation manyToOne = (ManyToOneAnnotation) attributeResource.getMappingAnnotation(); + ManyToOneAnnotation manyToOne = (ManyToOneAnnotation) attributeResource.getAnnotation(ManyToOneAnnotation.ANNOTATION_NAME); assertNull(manyToOneMapping.getSpecifiedTargetEntity()); assertNull(manyToOne.getTargetEntity()); @@ -426,7 +426,7 @@ public class JavaManyToOneMappingTests extends ContextModelTestCase manyToOneMapping.setSpecifiedTargetEntity("newTargetEntity"); assertEquals("newTargetEntity", manyToOneMapping.getSpecifiedTargetEntity()); assertEquals("newTargetEntity", manyToOne.getTargetEntity()); - + //set target entity to null in the context model manyToOneMapping.setSpecifiedTargetEntity(null); assertNull(manyToOneMapping.getSpecifiedTargetEntity()); @@ -442,7 +442,7 @@ public class JavaManyToOneMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - ManyToOneAnnotation manyToOne = (ManyToOneAnnotation) attributeResource.getMappingAnnotation(); + ManyToOneAnnotation manyToOne = (ManyToOneAnnotation) attributeResource.getAnnotation(ManyToOneAnnotation.ANNOTATION_NAME); assertNull(manyToOneMapping.getSpecifiedOptional()); assertNull(manyToOne.getOptional()); @@ -451,11 +451,10 @@ public class JavaManyToOneMappingTests extends ContextModelTestCase manyToOne.setOptional(Boolean.TRUE); assertEquals(Boolean.TRUE, manyToOneMapping.getSpecifiedOptional()); assertEquals(Boolean.TRUE, manyToOne.getOptional()); - + manyToOne.setOptional(Boolean.FALSE); assertEquals(Boolean.FALSE, manyToOneMapping.getSpecifiedOptional()); assertEquals(Boolean.FALSE, manyToOne.getOptional()); - //set optional to null in the resource model manyToOne.setOptional(null); @@ -472,7 +471,7 @@ public class JavaManyToOneMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - ManyToOneAnnotation manyToOne = (ManyToOneAnnotation) attributeResource.getMappingAnnotation(); + ManyToOneAnnotation manyToOne = (ManyToOneAnnotation) attributeResource.getAnnotation(ManyToOneAnnotation.ANNOTATION_NAME); assertNull(manyToOneMapping.getSpecifiedOptional()); assertNull(manyToOne.getOptional()); @@ -510,13 +509,13 @@ public class JavaManyToOneMappingTests extends ContextModelTestCase JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); //add an annotation to the resource model and verify the context model is updated - JoinColumnAnnotation joinColumn = (JoinColumnAnnotation) attributeResource.addSupportingAnnotation(0, JPA.JOIN_COLUMN, JPA.JOIN_COLUMNS); + JoinColumnAnnotation joinColumn = (JoinColumnAnnotation) attributeResource.addAnnotation(0, JPA.JOIN_COLUMN, JPA.JOIN_COLUMNS); joinColumn.setName("FOO"); specifiedJoinColumns = joinColumns.specifiedJoinColumns(); assertEquals("FOO", specifiedJoinColumns.next().getName()); assertFalse(specifiedJoinColumns.hasNext()); - joinColumn = (JoinColumnAnnotation) attributeResource.addSupportingAnnotation(0, JPA.JOIN_COLUMN, JPA.JOIN_COLUMNS); + joinColumn = (JoinColumnAnnotation) attributeResource.addAnnotation(0, JPA.JOIN_COLUMN, JPA.JOIN_COLUMNS); joinColumn.setName("BAR"); specifiedJoinColumns = joinColumns.specifiedJoinColumns(); assertEquals("BAR", specifiedJoinColumns.next().getName()); @@ -524,7 +523,7 @@ public class JavaManyToOneMappingTests extends ContextModelTestCase assertFalse(specifiedJoinColumns.hasNext()); - joinColumn = (JoinColumnAnnotation) attributeResource.addSupportingAnnotation(0, JPA.JOIN_COLUMN, JPA.JOIN_COLUMNS); + joinColumn = (JoinColumnAnnotation) attributeResource.addAnnotation(0, JPA.JOIN_COLUMN, JPA.JOIN_COLUMNS); joinColumn.setName("BAZ"); specifiedJoinColumns = joinColumns.specifiedJoinColumns(); assertEquals("BAZ", specifiedJoinColumns.next().getName()); @@ -533,26 +532,26 @@ public class JavaManyToOneMappingTests extends ContextModelTestCase assertFalse(specifiedJoinColumns.hasNext()); //move an annotation to the resource model and verify the context model is updated - attributeResource.moveSupportingAnnotation(1, 0, JPA.JOIN_COLUMNS); + attributeResource.moveAnnotation(1, 0, JPA.JOIN_COLUMNS); specifiedJoinColumns = joinColumns.specifiedJoinColumns(); assertEquals("BAR", specifiedJoinColumns.next().getName()); assertEquals("BAZ", specifiedJoinColumns.next().getName()); assertEquals("FOO", specifiedJoinColumns.next().getName()); assertFalse(specifiedJoinColumns.hasNext()); - attributeResource.removeSupportingAnnotation(0, JPA.JOIN_COLUMN, JPA.JOIN_COLUMNS); + attributeResource.removeAnnotation(0, JPA.JOIN_COLUMN, JPA.JOIN_COLUMNS); specifiedJoinColumns = joinColumns.specifiedJoinColumns(); assertEquals("BAZ", specifiedJoinColumns.next().getName()); assertEquals("FOO", specifiedJoinColumns.next().getName()); assertFalse(specifiedJoinColumns.hasNext()); - attributeResource.removeSupportingAnnotation(0, JPA.JOIN_COLUMN, JPA.JOIN_COLUMNS); + attributeResource.removeAnnotation(0, JPA.JOIN_COLUMN, JPA.JOIN_COLUMNS); specifiedJoinColumns = joinColumns.specifiedJoinColumns(); assertEquals("FOO", specifiedJoinColumns.next().getName()); assertFalse(specifiedJoinColumns.hasNext()); - attributeResource.removeSupportingAnnotation(0, JPA.JOIN_COLUMN, JPA.JOIN_COLUMNS); + attributeResource.removeAnnotation(0, JPA.JOIN_COLUMN, JPA.JOIN_COLUMNS); specifiedJoinColumns = joinColumns.specifiedJoinColumns(); assertFalse(specifiedJoinColumns.hasNext()); } @@ -613,7 +612,7 @@ public class JavaManyToOneMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - Iterator<NestableAnnotation> joinColumnsIterator = attributeResource.supportingAnnotations(JoinColumnAnnotation.ANNOTATION_NAME, JoinColumnsAnnotation.ANNOTATION_NAME); + Iterator<NestableAnnotation> joinColumnsIterator = attributeResource.annotations(JoinColumnAnnotation.ANNOTATION_NAME, JoinColumnsAnnotation.ANNOTATION_NAME); assertEquals("BAZ", ((JoinColumnAnnotation) joinColumnsIterator.next()).getName()); assertEquals("BAR", ((JoinColumnAnnotation) joinColumnsIterator.next()).getName()); @@ -635,7 +634,7 @@ public class JavaManyToOneMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - Iterator<NestableAnnotation> joinColumnsIterator = attributeResource.supportingAnnotations(JoinColumnAnnotation.ANNOTATION_NAME, JoinColumnsAnnotation.ANNOTATION_NAME); + Iterator<NestableAnnotation> joinColumnsIterator = attributeResource.annotations(JoinColumnAnnotation.ANNOTATION_NAME, JoinColumnsAnnotation.ANNOTATION_NAME); assertEquals("FOO", ((JoinColumnAnnotation) joinColumnsIterator.next()).getName()); assertEquals("BAR", ((JoinColumnAnnotation) joinColumnsIterator.next()).getName()); @@ -657,11 +656,11 @@ public class JavaManyToOneMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - assertEquals(3, CollectionTools.size(attributeResource.supportingAnnotations(JoinColumnAnnotation.ANNOTATION_NAME, JoinColumnsAnnotation.ANNOTATION_NAME))); + assertEquals(3, CollectionTools.size(attributeResource.annotations(JoinColumnAnnotation.ANNOTATION_NAME, JoinColumnsAnnotation.ANNOTATION_NAME))); joinColumns.removeSpecifiedJoinColumn(1); - Iterator<NestableAnnotation> joinColumnResources = attributeResource.supportingAnnotations(JoinColumnAnnotation.ANNOTATION_NAME, JoinColumnsAnnotation.ANNOTATION_NAME); + Iterator<NestableAnnotation> joinColumnResources = attributeResource.annotations(JoinColumnAnnotation.ANNOTATION_NAME, JoinColumnsAnnotation.ANNOTATION_NAME); assertEquals("FOO", ((JoinColumnAnnotation) joinColumnResources.next()).getName()); assertEquals("BAZ", ((JoinColumnAnnotation) joinColumnResources.next()).getName()); assertFalse(joinColumnResources.hasNext()); @@ -673,7 +672,7 @@ public class JavaManyToOneMappingTests extends ContextModelTestCase joinColumns.removeSpecifiedJoinColumn(1); - joinColumnResources = attributeResource.supportingAnnotations(JoinColumnAnnotation.ANNOTATION_NAME, JoinColumnsAnnotation.ANNOTATION_NAME); + joinColumnResources = attributeResource.annotations(JoinColumnAnnotation.ANNOTATION_NAME, JoinColumnsAnnotation.ANNOTATION_NAME); assertEquals("FOO", ((JoinColumnAnnotation) joinColumnResources.next()).getName()); assertFalse(joinColumnResources.hasNext()); @@ -683,12 +682,12 @@ public class JavaManyToOneMappingTests extends ContextModelTestCase joinColumns.removeSpecifiedJoinColumn(0); - joinColumnResources = attributeResource.supportingAnnotations(JoinColumnAnnotation.ANNOTATION_NAME, JoinColumnsAnnotation.ANNOTATION_NAME); + joinColumnResources = attributeResource.annotations(JoinColumnAnnotation.ANNOTATION_NAME, JoinColumnsAnnotation.ANNOTATION_NAME); assertFalse(joinColumnResources.hasNext()); joinColumnsIterator = joinColumns.specifiedJoinColumns(); assertFalse(joinColumnsIterator.hasNext()); - assertNull(attributeResource.getSupportingAnnotation(JoinColumnsAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(JoinColumnsAnnotation.ANNOTATION_NAME)); } public void testMoveSpecifiedJoinColumn() throws Exception { @@ -705,17 +704,16 @@ public class JavaManyToOneMappingTests extends ContextModelTestCase JavaResourcePersistentAttribute attributeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME).persistableAttributes().next(); - ListIterator<NestableAnnotation> javaJoinColumns = attributeResource.supportingAnnotations(JoinColumnAnnotation.ANNOTATION_NAME, JoinColumnsAnnotation.ANNOTATION_NAME); + Iterator<NestableAnnotation> javaJoinColumns = attributeResource.annotations(JoinColumnAnnotation.ANNOTATION_NAME, JoinColumnsAnnotation.ANNOTATION_NAME); assertEquals(3, CollectionTools.size(javaJoinColumns)); - joinColumns.moveSpecifiedJoinColumn(2, 0); ListIterator<? extends JoinColumn> primaryKeyJoinColumns = joinColumns.specifiedJoinColumns(); assertEquals("BAR", primaryKeyJoinColumns.next().getSpecifiedName()); assertEquals("BAZ", primaryKeyJoinColumns.next().getSpecifiedName()); assertEquals("FOO", primaryKeyJoinColumns.next().getSpecifiedName()); - javaJoinColumns = attributeResource.supportingAnnotations(JoinColumnAnnotation.ANNOTATION_NAME, JoinColumnsAnnotation.ANNOTATION_NAME); + javaJoinColumns = attributeResource.annotations(JoinColumnAnnotation.ANNOTATION_NAME, JoinColumnsAnnotation.ANNOTATION_NAME); assertEquals("BAR", ((JoinColumnAnnotation) javaJoinColumns.next()).getName()); assertEquals("BAZ", ((JoinColumnAnnotation) javaJoinColumns.next()).getName()); assertEquals("FOO", ((JoinColumnAnnotation) javaJoinColumns.next()).getName()); @@ -727,7 +725,7 @@ public class JavaManyToOneMappingTests extends ContextModelTestCase assertEquals("BAR", primaryKeyJoinColumns.next().getSpecifiedName()); assertEquals("FOO", primaryKeyJoinColumns.next().getSpecifiedName()); - javaJoinColumns = attributeResource.supportingAnnotations(JoinColumnAnnotation.ANNOTATION_NAME, JoinColumnsAnnotation.ANNOTATION_NAME); + javaJoinColumns = attributeResource.annotations(JoinColumnAnnotation.ANNOTATION_NAME, JoinColumnsAnnotation.ANNOTATION_NAME); assertEquals("BAZ", ((JoinColumnAnnotation) javaJoinColumns.next()).getName()); assertEquals("BAR", ((JoinColumnAnnotation) javaJoinColumns.next()).getName()); assertEquals("FOO", ((JoinColumnAnnotation) javaJoinColumns.next()).getName()); @@ -742,9 +740,9 @@ public class JavaManyToOneMappingTests extends ContextModelTestCase JoinColumnJoiningStrategy joinColumns = manyToOneMapping.getRelationshipReference().getJoinColumnJoiningStrategy(); JavaResourcePersistentAttribute attributeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME).persistableAttributes().next(); - ((JoinColumnAnnotation) attributeResource.addSupportingAnnotation(0, JoinColumnAnnotation.ANNOTATION_NAME, JoinColumnsAnnotation.ANNOTATION_NAME)).setName("FOO"); - ((JoinColumnAnnotation) attributeResource.addSupportingAnnotation(1, JoinColumnAnnotation.ANNOTATION_NAME, JoinColumnsAnnotation.ANNOTATION_NAME)).setName("BAR"); - ((JoinColumnAnnotation) attributeResource.addSupportingAnnotation(2, JoinColumnAnnotation.ANNOTATION_NAME, JoinColumnsAnnotation.ANNOTATION_NAME)).setName("BAZ"); + ((JoinColumnAnnotation) attributeResource.addAnnotation(0, JoinColumnAnnotation.ANNOTATION_NAME, JoinColumnsAnnotation.ANNOTATION_NAME)).setName("FOO"); + ((JoinColumnAnnotation) attributeResource.addAnnotation(1, JoinColumnAnnotation.ANNOTATION_NAME, JoinColumnsAnnotation.ANNOTATION_NAME)).setName("BAR"); + ((JoinColumnAnnotation) attributeResource.addAnnotation(2, JoinColumnAnnotation.ANNOTATION_NAME, JoinColumnsAnnotation.ANNOTATION_NAME)).setName("BAZ"); ListIterator<? extends JoinColumn> joinColumnsIterator = joinColumns.specifiedJoinColumns(); assertEquals("FOO", joinColumnsIterator.next().getName()); @@ -752,32 +750,32 @@ public class JavaManyToOneMappingTests extends ContextModelTestCase assertEquals("BAZ", joinColumnsIterator.next().getName()); assertFalse(joinColumnsIterator.hasNext()); - attributeResource.moveSupportingAnnotation(2, 0, JoinColumnsAnnotation.ANNOTATION_NAME); + attributeResource.moveAnnotation(2, 0, JoinColumnsAnnotation.ANNOTATION_NAME); joinColumnsIterator = joinColumns.specifiedJoinColumns(); assertEquals("BAR", joinColumnsIterator.next().getName()); assertEquals("BAZ", joinColumnsIterator.next().getName()); assertEquals("FOO", joinColumnsIterator.next().getName()); assertFalse(joinColumnsIterator.hasNext()); - attributeResource.moveSupportingAnnotation(0, 1, JoinColumnsAnnotation.ANNOTATION_NAME); + attributeResource.moveAnnotation(0, 1, JoinColumnsAnnotation.ANNOTATION_NAME); joinColumnsIterator = joinColumns.specifiedJoinColumns(); assertEquals("BAZ", joinColumnsIterator.next().getName()); assertEquals("BAR", joinColumnsIterator.next().getName()); assertEquals("FOO", joinColumnsIterator.next().getName()); assertFalse(joinColumnsIterator.hasNext()); - attributeResource.removeSupportingAnnotation(1, JoinColumnAnnotation.ANNOTATION_NAME, JoinColumnsAnnotation.ANNOTATION_NAME); + attributeResource.removeAnnotation(1, JoinColumnAnnotation.ANNOTATION_NAME, JoinColumnsAnnotation.ANNOTATION_NAME); joinColumnsIterator = joinColumns.specifiedJoinColumns(); assertEquals("BAZ", joinColumnsIterator.next().getName()); assertEquals("FOO", joinColumnsIterator.next().getName()); assertFalse(joinColumnsIterator.hasNext()); - attributeResource.removeSupportingAnnotation(1, JoinColumnAnnotation.ANNOTATION_NAME, JoinColumnsAnnotation.ANNOTATION_NAME); + attributeResource.removeAnnotation(1, JoinColumnAnnotation.ANNOTATION_NAME, JoinColumnsAnnotation.ANNOTATION_NAME); joinColumnsIterator = joinColumns.specifiedJoinColumns(); assertEquals("BAZ", joinColumnsIterator.next().getName()); assertFalse(joinColumnsIterator.hasNext()); - attributeResource.removeSupportingAnnotation(0, JoinColumnAnnotation.ANNOTATION_NAME, JoinColumnsAnnotation.ANNOTATION_NAME); + attributeResource.removeAnnotation(0, JoinColumnAnnotation.ANNOTATION_NAME, JoinColumnsAnnotation.ANNOTATION_NAME); joinColumnsIterator = joinColumns.specifiedJoinColumns(); assertFalse(joinColumnsIterator.hasNext()); } diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/JavaMappedSuperclassTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/JavaMappedSuperclassTests.java index d951c22f56..994b7d28d3 100644 --- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/JavaMappedSuperclassTests.java +++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/JavaMappedSuperclassTests.java @@ -55,8 +55,8 @@ public class JavaMappedSuperclassTests extends ContextModelTestCase assertTrue(getJavaPersistentType().getMapping() instanceof Entity); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - assertNull(typeResource.getMappingAnnotation(MappedSuperclassAnnotation.ANNOTATION_NAME)); - assertNotNull(typeResource.getSupportingAnnotation(IdClassAnnotation.ANNOTATION_NAME)); + assertNull(typeResource.getAnnotation(MappedSuperclassAnnotation.ANNOTATION_NAME)); + assertNotNull(typeResource.getAnnotation(IdClassAnnotation.ANNOTATION_NAME)); } public void testMorphToEmbeddable() throws Exception { @@ -70,8 +70,8 @@ public class JavaMappedSuperclassTests extends ContextModelTestCase assertTrue(getJavaPersistentType().getMapping() instanceof Embeddable); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - assertNull(typeResource.getMappingAnnotation(MappedSuperclassAnnotation.ANNOTATION_NAME)); - assertNull(typeResource.getSupportingAnnotation(IdClassAnnotation.ANNOTATION_NAME)); + assertNull(typeResource.getAnnotation(MappedSuperclassAnnotation.ANNOTATION_NAME)); + assertNull(typeResource.getAnnotation(IdClassAnnotation.ANNOTATION_NAME)); } public void testMorphToNull() throws Exception { @@ -85,8 +85,8 @@ public class JavaMappedSuperclassTests extends ContextModelTestCase assertTrue(getJavaPersistentType().getMapping() instanceof JavaNullTypeMapping); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - assertNull(typeResource.getMappingAnnotation(MappedSuperclassAnnotation.ANNOTATION_NAME)); - assertNull(typeResource.getSupportingAnnotation(IdClassAnnotation.ANNOTATION_NAME)); + assertNull(typeResource.getAnnotation(MappedSuperclassAnnotation.ANNOTATION_NAME)); + assertNull(typeResource.getAnnotation(IdClassAnnotation.ANNOTATION_NAME)); } @@ -199,28 +199,28 @@ public class JavaMappedSuperclassTests extends ContextModelTestCase MappedSuperclass mappedSuperclass = (MappedSuperclass) getJavaPersistentType().getMapping(); assertNull(mappedSuperclass.getIdClass()); - assertNull(typeResource.getSupportingAnnotation(IdClassAnnotation.ANNOTATION_NAME)); + assertNull(typeResource.getAnnotation(IdClassAnnotation.ANNOTATION_NAME)); - IdClassAnnotation idClass = (IdClassAnnotation) typeResource.addSupportingAnnotation(IdClassAnnotation.ANNOTATION_NAME); + IdClassAnnotation idClass = (IdClassAnnotation) typeResource.addAnnotation(IdClassAnnotation.ANNOTATION_NAME); assertNull(mappedSuperclass.getIdClass()); - assertNotNull(typeResource.getSupportingAnnotation(IdClassAnnotation.ANNOTATION_NAME)); + assertNotNull(typeResource.getAnnotation(IdClassAnnotation.ANNOTATION_NAME)); idClass.setValue("model.Foo"); assertEquals("model.Foo", mappedSuperclass.getIdClass()); - assertEquals("model.Foo", ((IdClassAnnotation) typeResource.getSupportingAnnotation(IdClassAnnotation.ANNOTATION_NAME)).getValue()); + assertEquals("model.Foo", ((IdClassAnnotation) typeResource.getAnnotation(IdClassAnnotation.ANNOTATION_NAME)).getValue()); //test setting @IdClass value to null, IdClass annotation is removed idClass.setValue(null); assertNull(mappedSuperclass.getIdClass()); - assertNull(typeResource.getSupportingAnnotation(IdClassAnnotation.ANNOTATION_NAME)); + assertNull(typeResource.getAnnotation(IdClassAnnotation.ANNOTATION_NAME)); //reset @IdClass value and then remove @IdClass - idClass = (IdClassAnnotation) typeResource.addSupportingAnnotation(IdClassAnnotation.ANNOTATION_NAME); + idClass = (IdClassAnnotation) typeResource.addAnnotation(IdClassAnnotation.ANNOTATION_NAME); idClass.setValue("model.Foo"); - typeResource.removeSupportingAnnotation(IdClassAnnotation.ANNOTATION_NAME); + typeResource.removeAnnotation(IdClassAnnotation.ANNOTATION_NAME); assertNull(mappedSuperclass.getIdClass()); - assertNull(typeResource.getSupportingAnnotation(IdClassAnnotation.ANNOTATION_NAME)); + assertNull(typeResource.getAnnotation(IdClassAnnotation.ANNOTATION_NAME)); } public void testModifyIdClass() throws Exception { @@ -231,15 +231,15 @@ public class JavaMappedSuperclassTests extends ContextModelTestCase MappedSuperclass mappedSuperclass = (MappedSuperclass) getJavaPersistentType().getMapping(); assertNull(mappedSuperclass.getIdClass()); - assertNull(typeResource.getSupportingAnnotation(IdClassAnnotation.ANNOTATION_NAME)); + assertNull(typeResource.getAnnotation(IdClassAnnotation.ANNOTATION_NAME)); mappedSuperclass.setIdClass("model.Foo"); - assertEquals("model.Foo", ((IdClassAnnotation) typeResource.getSupportingAnnotation(IdClassAnnotation.ANNOTATION_NAME)).getValue()); + assertEquals("model.Foo", ((IdClassAnnotation) typeResource.getAnnotation(IdClassAnnotation.ANNOTATION_NAME)).getValue()); assertEquals("model.Foo", mappedSuperclass.getIdClass()); mappedSuperclass.setIdClass(null); assertNull(mappedSuperclass.getIdClass()); - assertNull(typeResource.getSupportingAnnotation(IdClassAnnotation.ANNOTATION_NAME)); + assertNull(typeResource.getAnnotation(IdClassAnnotation.ANNOTATION_NAME)); } } diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/JavaNamedNativeQueryTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/JavaNamedNativeQueryTests.java index 66139509fa..0460ea83c2 100644 --- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/JavaNamedNativeQueryTests.java +++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/JavaNamedNativeQueryTests.java @@ -55,7 +55,7 @@ public class JavaNamedNativeQueryTests extends ContextModelTestCase NamedNativeQuery namedNativeQuery = entity.getQueryContainer().namedNativeQueries().next(); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - NamedNativeQueryAnnotation javaNamedNativeQuery = (NamedNativeQueryAnnotation) typeResource.getSupportingAnnotation(NamedNativeQueryAnnotation.ANNOTATION_NAME); + NamedNativeQueryAnnotation javaNamedNativeQuery = (NamedNativeQueryAnnotation) typeResource.getAnnotation(NamedNativeQueryAnnotation.ANNOTATION_NAME); assertEquals(QUERY_NAME, javaNamedNativeQuery.getName()); assertEquals(QUERY_NAME, namedNativeQuery.getName()); @@ -78,7 +78,7 @@ public class JavaNamedNativeQueryTests extends ContextModelTestCase NamedNativeQuery namedNativeQuery = entity.getQueryContainer().namedNativeQueries().next(); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - NamedNativeQueryAnnotation javaNamedNativeQuery = (NamedNativeQueryAnnotation) typeResource.getSupportingAnnotation(NamedNativeQueryAnnotation.ANNOTATION_NAME); + NamedNativeQueryAnnotation javaNamedNativeQuery = (NamedNativeQueryAnnotation) typeResource.getAnnotation(NamedNativeQueryAnnotation.ANNOTATION_NAME); assertEquals(QUERY_NAME, javaNamedNativeQuery.getName()); assertEquals(QUERY_NAME, namedNativeQuery.getName()); @@ -102,7 +102,7 @@ public class JavaNamedNativeQueryTests extends ContextModelTestCase NamedNativeQuery namedNativeQuery = entity.getQueryContainer().namedNativeQueries().next(); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - NamedNativeQueryAnnotation javaNamedNativeQuery = (NamedNativeQueryAnnotation) typeResource.getSupportingAnnotation(NamedNativeQueryAnnotation.ANNOTATION_NAME); + NamedNativeQueryAnnotation javaNamedNativeQuery = (NamedNativeQueryAnnotation) typeResource.getAnnotation(NamedNativeQueryAnnotation.ANNOTATION_NAME); assertEquals(QUERY_QUERY, javaNamedNativeQuery.getQuery()); assertEquals(QUERY_QUERY, namedNativeQuery.getQuery()); @@ -125,7 +125,7 @@ public class JavaNamedNativeQueryTests extends ContextModelTestCase NamedNativeQuery namedNativeQuery = entity.getQueryContainer().namedNativeQueries().next(); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - NamedNativeQueryAnnotation javaNamedNativeQuery = (NamedNativeQueryAnnotation) typeResource.getSupportingAnnotation(NamedNativeQueryAnnotation.ANNOTATION_NAME); + NamedNativeQueryAnnotation javaNamedNativeQuery = (NamedNativeQueryAnnotation) typeResource.getAnnotation(NamedNativeQueryAnnotation.ANNOTATION_NAME); assertEquals(QUERY_QUERY, javaNamedNativeQuery.getQuery()); assertEquals(QUERY_QUERY, namedNativeQuery.getQuery()); @@ -149,7 +149,7 @@ public class JavaNamedNativeQueryTests extends ContextModelTestCase NamedNativeQuery namedNativeQuery = entity.getQueryContainer().namedNativeQueries().next(); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - NamedNativeQueryAnnotation javaNamedNativeQuery = (NamedNativeQueryAnnotation) typeResource.getSupportingAnnotation(NamedNativeQueryAnnotation.ANNOTATION_NAME); + NamedNativeQueryAnnotation javaNamedNativeQuery = (NamedNativeQueryAnnotation) typeResource.getAnnotation(NamedNativeQueryAnnotation.ANNOTATION_NAME); QueryHint queryHint = namedNativeQuery.addHint(0); @@ -194,7 +194,7 @@ public class JavaNamedNativeQueryTests extends ContextModelTestCase NamedNativeQuery namedNativeQuery = entity.getQueryContainer().namedNativeQueries().next(); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - NamedNativeQueryAnnotation javaNamedNativeQuery = (NamedNativeQueryAnnotation) typeResource.getSupportingAnnotation(NamedNativeQueryAnnotation.ANNOTATION_NAME); + NamedNativeQueryAnnotation javaNamedNativeQuery = (NamedNativeQueryAnnotation) typeResource.getAnnotation(NamedNativeQueryAnnotation.ANNOTATION_NAME); namedNativeQuery.addHint(0).setName("FOO"); namedNativeQuery.addHint(1).setName("BAR"); @@ -222,7 +222,7 @@ public class JavaNamedNativeQueryTests extends ContextModelTestCase NamedNativeQuery namedNativeQuery = entity.getQueryContainer().namedNativeQueries().next(); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - NamedNativeQueryAnnotation javaNamedNativeQuery = (NamedNativeQueryAnnotation) typeResource.getSupportingAnnotation(NamedNativeQueryAnnotation.ANNOTATION_NAME); + NamedNativeQueryAnnotation javaNamedNativeQuery = (NamedNativeQueryAnnotation) typeResource.getAnnotation(NamedNativeQueryAnnotation.ANNOTATION_NAME); namedNativeQuery.addHint(0).setName("FOO"); namedNativeQuery.addHint(1).setName("BAR"); @@ -260,7 +260,7 @@ public class JavaNamedNativeQueryTests extends ContextModelTestCase NamedNativeQuery namedNativeQuery = entity.getQueryContainer().namedNativeQueries().next(); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - NamedNativeQueryAnnotation javaNamedNativeQuery = (NamedNativeQueryAnnotation) typeResource.getSupportingAnnotation(NamedNativeQueryAnnotation.ANNOTATION_NAME); + NamedNativeQueryAnnotation javaNamedNativeQuery = (NamedNativeQueryAnnotation) typeResource.getAnnotation(NamedNativeQueryAnnotation.ANNOTATION_NAME); javaNamedNativeQuery.addHint(0); javaNamedNativeQuery.addHint(1); @@ -314,7 +314,7 @@ public class JavaNamedNativeQueryTests extends ContextModelTestCase assertEquals(0, namedNativeQuery.hintsSize()); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - NamedNativeQueryAnnotation javaNamedNativeQuery = (NamedNativeQueryAnnotation) typeResource.getSupportingAnnotation(NamedNativeQueryAnnotation.ANNOTATION_NAME); + NamedNativeQueryAnnotation javaNamedNativeQuery = (NamedNativeQueryAnnotation) typeResource.getAnnotation(NamedNativeQueryAnnotation.ANNOTATION_NAME); javaNamedNativeQuery.addHint(0); @@ -336,7 +336,7 @@ public class JavaNamedNativeQueryTests extends ContextModelTestCase NamedNativeQuery namedNativeQuery = entity.getQueryContainer().namedNativeQueries().next(); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - NamedNativeQueryAnnotation javaNamedNativeQuery = (NamedNativeQueryAnnotation) typeResource.getSupportingAnnotation(NamedNativeQueryAnnotation.ANNOTATION_NAME); + NamedNativeQueryAnnotation javaNamedNativeQuery = (NamedNativeQueryAnnotation) typeResource.getAnnotation(NamedNativeQueryAnnotation.ANNOTATION_NAME); assertEquals(null, javaNamedNativeQuery.getResultClass()); assertEquals(null, namedNativeQuery.getResultClass()); @@ -359,7 +359,7 @@ public class JavaNamedNativeQueryTests extends ContextModelTestCase NamedNativeQuery namedNativeQuery = entity.getQueryContainer().namedNativeQueries().next(); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - NamedNativeQueryAnnotation javaNamedNativeQuery = (NamedNativeQueryAnnotation) typeResource.getSupportingAnnotation(NamedNativeQueryAnnotation.ANNOTATION_NAME); + NamedNativeQueryAnnotation javaNamedNativeQuery = (NamedNativeQueryAnnotation) typeResource.getAnnotation(NamedNativeQueryAnnotation.ANNOTATION_NAME); assertEquals(null, javaNamedNativeQuery.getResultClass()); assertEquals(null, namedNativeQuery.getResultClass()); @@ -383,7 +383,7 @@ public class JavaNamedNativeQueryTests extends ContextModelTestCase NamedNativeQuery namedNativeQuery = entity.getQueryContainer().namedNativeQueries().next(); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - NamedNativeQueryAnnotation javaNamedNativeQuery = (NamedNativeQueryAnnotation) typeResource.getSupportingAnnotation(NamedNativeQueryAnnotation.ANNOTATION_NAME); + NamedNativeQueryAnnotation javaNamedNativeQuery = (NamedNativeQueryAnnotation) typeResource.getAnnotation(NamedNativeQueryAnnotation.ANNOTATION_NAME); assertEquals(null, javaNamedNativeQuery.getResultSetMapping()); assertEquals(null, namedNativeQuery.getResultSetMapping()); @@ -406,7 +406,7 @@ public class JavaNamedNativeQueryTests extends ContextModelTestCase NamedNativeQuery namedNativeQuery = entity.getQueryContainer().namedNativeQueries().next(); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - NamedNativeQueryAnnotation javaNamedNativeQuery = (NamedNativeQueryAnnotation) typeResource.getSupportingAnnotation(NamedNativeQueryAnnotation.ANNOTATION_NAME); + NamedNativeQueryAnnotation javaNamedNativeQuery = (NamedNativeQueryAnnotation) typeResource.getAnnotation(NamedNativeQueryAnnotation.ANNOTATION_NAME); assertEquals(null, javaNamedNativeQuery.getResultSetMapping()); assertEquals(null, namedNativeQuery.getResultSetMapping()); diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/JavaNamedQueryTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/JavaNamedQueryTests.java index ace94bee93..84bdee49d6 100644 --- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/JavaNamedQueryTests.java +++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/JavaNamedQueryTests.java @@ -55,7 +55,7 @@ public class JavaNamedQueryTests extends ContextModelTestCase NamedQuery namedQuery = entity.getQueryContainer().namedQueries().next(); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - NamedQueryAnnotation javaNamedQuery = (NamedQueryAnnotation) typeResource.getSupportingAnnotation(NamedQueryAnnotation.ANNOTATION_NAME); + NamedQueryAnnotation javaNamedQuery = (NamedQueryAnnotation) typeResource.getAnnotation(NamedQueryAnnotation.ANNOTATION_NAME); assertEquals(QUERY_NAME, javaNamedQuery.getName()); assertEquals(QUERY_NAME, namedQuery.getName()); @@ -78,7 +78,7 @@ public class JavaNamedQueryTests extends ContextModelTestCase NamedQuery namedQuery = entity.getQueryContainer().namedQueries().next(); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - NamedQueryAnnotation javaNamedQuery = (NamedQueryAnnotation) typeResource.getSupportingAnnotation(NamedQueryAnnotation.ANNOTATION_NAME); + NamedQueryAnnotation javaNamedQuery = (NamedQueryAnnotation) typeResource.getAnnotation(NamedQueryAnnotation.ANNOTATION_NAME); assertEquals(QUERY_NAME, javaNamedQuery.getName()); assertEquals(QUERY_NAME, namedQuery.getName()); @@ -102,7 +102,7 @@ public class JavaNamedQueryTests extends ContextModelTestCase NamedQuery namedQuery = entity.getQueryContainer().namedQueries().next(); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - NamedQueryAnnotation javaNamedQuery = (NamedQueryAnnotation) typeResource.getSupportingAnnotation(NamedQueryAnnotation.ANNOTATION_NAME); + NamedQueryAnnotation javaNamedQuery = (NamedQueryAnnotation) typeResource.getAnnotation(NamedQueryAnnotation.ANNOTATION_NAME); assertEquals(QUERY_QUERY, javaNamedQuery.getQuery()); assertEquals(QUERY_QUERY, namedQuery.getQuery()); @@ -125,7 +125,7 @@ public class JavaNamedQueryTests extends ContextModelTestCase NamedQuery namedQuery = entity.getQueryContainer().namedQueries().next(); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - NamedQueryAnnotation javaNamedQuery = (NamedQueryAnnotation) typeResource.getSupportingAnnotation(NamedQueryAnnotation.ANNOTATION_NAME); + NamedQueryAnnotation javaNamedQuery = (NamedQueryAnnotation) typeResource.getAnnotation(NamedQueryAnnotation.ANNOTATION_NAME); assertEquals(QUERY_QUERY, javaNamedQuery.getQuery()); assertEquals(QUERY_QUERY, namedQuery.getQuery()); @@ -149,7 +149,7 @@ public class JavaNamedQueryTests extends ContextModelTestCase NamedQuery namedQuery = entity.getQueryContainer().namedQueries().next(); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - NamedQueryAnnotation javaNamedQuery = (NamedQueryAnnotation) typeResource.getSupportingAnnotation(NamedQueryAnnotation.ANNOTATION_NAME); + NamedQueryAnnotation javaNamedQuery = (NamedQueryAnnotation) typeResource.getAnnotation(NamedQueryAnnotation.ANNOTATION_NAME); QueryHint queryHint = namedQuery.addHint(0); @@ -188,7 +188,7 @@ public class JavaNamedQueryTests extends ContextModelTestCase NamedQuery namedQuery = entity.getQueryContainer().namedQueries().next(); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - NamedQueryAnnotation javaNamedQuery = (NamedQueryAnnotation) typeResource.getSupportingAnnotation(NamedQueryAnnotation.ANNOTATION_NAME); + NamedQueryAnnotation javaNamedQuery = (NamedQueryAnnotation) typeResource.getAnnotation(NamedQueryAnnotation.ANNOTATION_NAME); namedQuery.addHint(0).setName("FOO"); namedQuery.addHint(1).setName("BAR"); @@ -216,7 +216,7 @@ public class JavaNamedQueryTests extends ContextModelTestCase NamedQuery namedQuery = entity.getQueryContainer().namedQueries().next(); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - NamedQueryAnnotation javaNamedQuery = (NamedQueryAnnotation) typeResource.getSupportingAnnotation(NamedQueryAnnotation.ANNOTATION_NAME); + NamedQueryAnnotation javaNamedQuery = (NamedQueryAnnotation) typeResource.getAnnotation(NamedQueryAnnotation.ANNOTATION_NAME); namedQuery.addHint(0).setName("FOO"); namedQuery.addHint(1).setName("BAR"); @@ -254,7 +254,7 @@ public class JavaNamedQueryTests extends ContextModelTestCase NamedQuery namedQuery = entity.getQueryContainer().namedQueries().next(); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - NamedQueryAnnotation javaNamedQuery = (NamedQueryAnnotation) typeResource.getSupportingAnnotation(NamedQueryAnnotation.ANNOTATION_NAME); + NamedQueryAnnotation javaNamedQuery = (NamedQueryAnnotation) typeResource.getAnnotation(NamedQueryAnnotation.ANNOTATION_NAME); javaNamedQuery.addHint(0); javaNamedQuery.addHint(1); @@ -308,7 +308,7 @@ public class JavaNamedQueryTests extends ContextModelTestCase assertEquals(0, namedQuery.hintsSize()); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - NamedQueryAnnotation javaNamedQuery = (NamedQueryAnnotation) typeResource.getSupportingAnnotation(NamedQueryAnnotation.ANNOTATION_NAME); + NamedQueryAnnotation javaNamedQuery = (NamedQueryAnnotation) typeResource.getAnnotation(NamedQueryAnnotation.ANNOTATION_NAME); javaNamedQuery.addHint(0); diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/JavaOneToManyMappingTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/JavaOneToManyMappingTests.java index 29cbf0d5e0..ac0a0ccfc5 100644 --- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/JavaOneToManyMappingTests.java +++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/JavaOneToManyMappingTests.java @@ -237,10 +237,10 @@ public class JavaOneToManyMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - assertNull(attributeResource.getMappingAnnotation(OneToManyAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getMappingAnnotation(BasicAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getSupportingAnnotation(JoinTableAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getSupportingAnnotation(OrderByAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(OneToManyAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getAnnotation(BasicAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(JoinTableAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(OrderByAnnotation.ANNOTATION_NAME)); } public void testMorphToDefault() throws Exception { @@ -259,9 +259,9 @@ public class JavaOneToManyMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - assertNull(attributeResource.getMappingAnnotation(OneToManyAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getSupportingAnnotation(JoinTableAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getSupportingAnnotation(OrderByAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(OneToManyAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(JoinTableAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(OrderByAnnotation.ANNOTATION_NAME)); } public void testMorphToVersionMapping() throws Exception { @@ -280,10 +280,10 @@ public class JavaOneToManyMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - assertNull(attributeResource.getMappingAnnotation(OneToManyAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getMappingAnnotation(VersionAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getSupportingAnnotation(JoinTableAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getSupportingAnnotation(OrderByAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(OneToManyAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getAnnotation(VersionAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(JoinTableAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(OrderByAnnotation.ANNOTATION_NAME)); } public void testMorphToIdMapping() throws Exception { @@ -302,10 +302,10 @@ public class JavaOneToManyMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - assertNull(attributeResource.getMappingAnnotation(OneToManyAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getMappingAnnotation(IdAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getSupportingAnnotation(JoinTableAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getSupportingAnnotation(OrderByAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(OneToManyAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getAnnotation(IdAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(JoinTableAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(OrderByAnnotation.ANNOTATION_NAME)); } public void testMorphToEmbeddedMapping() throws Exception { @@ -324,10 +324,10 @@ public class JavaOneToManyMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - assertNull(attributeResource.getMappingAnnotation(OneToManyAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getMappingAnnotation(EmbeddedAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getSupportingAnnotation(JoinTableAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getSupportingAnnotation(OrderByAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(OneToManyAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getAnnotation(EmbeddedAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(JoinTableAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(OrderByAnnotation.ANNOTATION_NAME)); } public void testMorphToEmbeddedIdMapping() throws Exception { @@ -346,10 +346,10 @@ public class JavaOneToManyMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - assertNull(attributeResource.getMappingAnnotation(OneToManyAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getMappingAnnotation(EmbeddedIdAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getSupportingAnnotation(JoinTableAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getSupportingAnnotation(OrderByAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(OneToManyAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getAnnotation(EmbeddedIdAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(JoinTableAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(OrderByAnnotation.ANNOTATION_NAME)); } public void testMorphToTransientMapping() throws Exception { @@ -368,10 +368,10 @@ public class JavaOneToManyMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - assertNull(attributeResource.getMappingAnnotation(OneToManyAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getMappingAnnotation(TransientAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getSupportingAnnotation(JoinTableAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getSupportingAnnotation(OrderByAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(OneToManyAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getAnnotation(TransientAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(JoinTableAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(OrderByAnnotation.ANNOTATION_NAME)); } public void testMorphToOneToOneMapping() throws Exception { @@ -390,10 +390,10 @@ public class JavaOneToManyMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - assertNull(attributeResource.getMappingAnnotation(OneToManyAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getMappingAnnotation(OneToOneAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getSupportingAnnotation(JoinTableAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getSupportingAnnotation(OrderByAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(OneToManyAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getAnnotation(OneToOneAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getAnnotation(JoinTableAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(OrderByAnnotation.ANNOTATION_NAME)); } public void testMorphToManyToManyMapping() throws Exception { @@ -412,10 +412,10 @@ public class JavaOneToManyMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - assertNull(attributeResource.getMappingAnnotation(OneToManyAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getMappingAnnotation(ManyToManyAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getSupportingAnnotation(JoinTableAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getSupportingAnnotation(OrderByAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(OneToManyAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getAnnotation(ManyToManyAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getAnnotation(JoinTableAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getAnnotation(OrderByAnnotation.ANNOTATION_NAME)); } public void testMorphToManyToOneMapping() throws Exception { @@ -434,10 +434,10 @@ public class JavaOneToManyMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - assertNull(attributeResource.getMappingAnnotation(OneToManyAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getMappingAnnotation(ManyToOneAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getSupportingAnnotation(JoinTableAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getSupportingAnnotation(OrderByAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(OneToManyAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getAnnotation(ManyToOneAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getAnnotation(JoinTableAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(OrderByAnnotation.ANNOTATION_NAME)); } @@ -450,7 +450,7 @@ public class JavaOneToManyMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - OneToManyAnnotation oneToMany = (OneToManyAnnotation) attributeResource.getMappingAnnotation(); + OneToManyAnnotation oneToMany = (OneToManyAnnotation) attributeResource.getAnnotation(OneToManyAnnotation.ANNOTATION_NAME); assertNull(oneToManyMapping.getSpecifiedTargetEntity()); assertNull(oneToMany.getTargetEntity()); @@ -475,7 +475,7 @@ public class JavaOneToManyMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - OneToManyAnnotation oneToMany = (OneToManyAnnotation) attributeResource.getMappingAnnotation(); + OneToManyAnnotation oneToMany = (OneToManyAnnotation) attributeResource.getAnnotation(OneToManyAnnotation.ANNOTATION_NAME); assertNull(oneToManyMapping.getSpecifiedTargetEntity()); assertNull(oneToMany.getTargetEntity()); @@ -500,7 +500,7 @@ public class JavaOneToManyMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - OneToManyAnnotation oneToMany = (OneToManyAnnotation) attributeResource.getMappingAnnotation(); + OneToManyAnnotation oneToMany = (OneToManyAnnotation) attributeResource.getAnnotation(OneToManyAnnotation.ANNOTATION_NAME); assertNull(oneToManyMapping.getSpecifiedFetch()); assertNull(oneToMany.getFetch()); @@ -530,7 +530,7 @@ public class JavaOneToManyMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - OneToManyAnnotation oneToMany = (OneToManyAnnotation) attributeResource.getMappingAnnotation(); + OneToManyAnnotation oneToMany = (OneToManyAnnotation) attributeResource.getAnnotation(OneToManyAnnotation.ANNOTATION_NAME); assertNull(oneToManyMapping.getSpecifiedFetch()); assertNull(oneToMany.getFetch()); @@ -543,7 +543,6 @@ public class JavaOneToManyMappingTests extends ContextModelTestCase oneToManyMapping.setSpecifiedFetch(FetchType.LAZY); assertEquals(FetchType.LAZY, oneToManyMapping.getSpecifiedFetch()); assertEquals(org.eclipse.jpt.core.resource.java.FetchType.LAZY, oneToMany.getFetch()); - //set fetch to null in the context model oneToManyMapping.setSpecifiedFetch(null); @@ -560,7 +559,7 @@ public class JavaOneToManyMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - OneToManyAnnotation oneToMany = (OneToManyAnnotation) attributeResource.getMappingAnnotation(); + OneToManyAnnotation oneToMany = (OneToManyAnnotation) attributeResource.getAnnotation(OneToManyAnnotation.ANNOTATION_NAME); assertNull(oneToManyMapping.getRelationshipReference().getMappedByJoiningStrategy().getMappedByAttribute()); assertNull(oneToMany.getMappedBy()); @@ -585,7 +584,7 @@ public class JavaOneToManyMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - OneToManyAnnotation oneToMany = (OneToManyAnnotation) attributeResource.getMappingAnnotation(); + OneToManyAnnotation oneToMany = (OneToManyAnnotation) attributeResource.getAnnotation(OneToManyAnnotation.ANNOTATION_NAME); assertNull(oneToManyMapping.getRelationshipReference().getMappedByJoiningStrategy().getMappedByAttribute()); assertNull(oneToMany.getMappedBy()); @@ -748,12 +747,12 @@ public class JavaOneToManyMappingTests extends ContextModelTestCase JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); assertNull(oneToManyMapping.getMapKey()); - assertNull(attributeResource.getSupportingAnnotation(MapKeyAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(MapKeyAnnotation.ANNOTATION_NAME)); //set mapKey in the resource model, verify context model does not change - attributeResource.addSupportingAnnotation(MapKeyAnnotation.ANNOTATION_NAME); + attributeResource.addAnnotation(MapKeyAnnotation.ANNOTATION_NAME); assertNull(oneToManyMapping.getMapKey()); - MapKeyAnnotation mapKey = (MapKeyAnnotation) attributeResource.getSupportingAnnotation(MapKeyAnnotation.ANNOTATION_NAME); + MapKeyAnnotation mapKey = (MapKeyAnnotation) attributeResource.getAnnotation(MapKeyAnnotation.ANNOTATION_NAME); assertNotNull(mapKey); //set mapKey name in the resource model, verify context model updated @@ -767,9 +766,9 @@ public class JavaOneToManyMappingTests extends ContextModelTestCase assertNull(mapKey.getName()); mapKey.setName("myMapKey"); - attributeResource.removeSupportingAnnotation(MapKeyAnnotation.ANNOTATION_NAME); + attributeResource.removeAnnotation(MapKeyAnnotation.ANNOTATION_NAME); assertNull(oneToManyMapping.getMapKey()); - assertNull(attributeResource.getSupportingAnnotation(MapKeyAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(MapKeyAnnotation.ANNOTATION_NAME)); } public void testModifyMapKey() throws Exception { @@ -783,18 +782,18 @@ public class JavaOneToManyMappingTests extends ContextModelTestCase JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); assertNull(oneToManyMapping.getMapKey()); - assertNull(attributeResource.getSupportingAnnotation(MapKeyAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(MapKeyAnnotation.ANNOTATION_NAME)); //set mapKey in the context model, verify resource model updated oneToManyMapping.setMapKey("myMapKey"); - MapKeyAnnotation mapKey = (MapKeyAnnotation) attributeResource.getSupportingAnnotation(MapKeyAnnotation.ANNOTATION_NAME); + MapKeyAnnotation mapKey = (MapKeyAnnotation) attributeResource.getAnnotation(MapKeyAnnotation.ANNOTATION_NAME); assertEquals("myMapKey", oneToManyMapping.getMapKey()); assertEquals("myMapKey", mapKey.getName()); //set mapKey to null in the context model oneToManyMapping.setMapKey(null); assertNull(oneToManyMapping.getMapKey()); - assertNull(attributeResource.getSupportingAnnotation(MapKeyAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(MapKeyAnnotation.ANNOTATION_NAME)); } public void testUpdateOrderBy() throws Exception { @@ -808,19 +807,19 @@ public class JavaOneToManyMappingTests extends ContextModelTestCase JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); assertNull(oneToManyMapping.getOrderBy()); - assertNull(attributeResource.getSupportingAnnotation(OrderByAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(OrderByAnnotation.ANNOTATION_NAME)); //set orderBy in the resource model, verify context model updated - attributeResource.addSupportingAnnotation(OrderByAnnotation.ANNOTATION_NAME); - OrderByAnnotation orderBy = (OrderByAnnotation) attributeResource.getSupportingAnnotation(OrderByAnnotation.ANNOTATION_NAME); + attributeResource.addAnnotation(OrderByAnnotation.ANNOTATION_NAME); + OrderByAnnotation orderBy = (OrderByAnnotation) attributeResource.getAnnotation(OrderByAnnotation.ANNOTATION_NAME); orderBy.setValue("newOrderBy"); assertEquals("newOrderBy", oneToManyMapping.getOrderBy()); assertEquals("newOrderBy", orderBy.getValue()); //set orderBy to null in the resource model - attributeResource.removeSupportingAnnotation(OrderByAnnotation.ANNOTATION_NAME); + attributeResource.removeAnnotation(OrderByAnnotation.ANNOTATION_NAME); assertNull(oneToManyMapping.getOrderBy()); - assertNull(attributeResource.getSupportingAnnotation(OrderByAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(OrderByAnnotation.ANNOTATION_NAME)); } public void testModifyOrderBy() throws Exception { @@ -834,18 +833,18 @@ public class JavaOneToManyMappingTests extends ContextModelTestCase JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); assertNull(oneToManyMapping.getOrderBy()); - assertNull(attributeResource.getSupportingAnnotation(OrderByAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(OrderByAnnotation.ANNOTATION_NAME)); //set mappedBy in the context model, verify resource model updated oneToManyMapping.setOrderBy("newOrderBy"); assertEquals("newOrderBy", oneToManyMapping.getOrderBy()); - OrderByAnnotation orderBy = (OrderByAnnotation) attributeResource.getSupportingAnnotation(OrderByAnnotation.ANNOTATION_NAME); + OrderByAnnotation orderBy = (OrderByAnnotation) attributeResource.getAnnotation(OrderByAnnotation.ANNOTATION_NAME); assertEquals("newOrderBy", orderBy.getValue()); //set mappedBy to null in the context model oneToManyMapping.setOrderBy(null); assertNull(oneToManyMapping.getOrderBy()); - assertNull(attributeResource.getSupportingAnnotation(OrderByAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(OrderByAnnotation.ANNOTATION_NAME)); } public void testUpdateNoOrdering() throws Exception { @@ -859,20 +858,20 @@ public class JavaOneToManyMappingTests extends ContextModelTestCase JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); assertTrue(oneToManyMapping.isNoOrdering()); - assertNull(attributeResource.getSupportingAnnotation(OrderByAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(OrderByAnnotation.ANNOTATION_NAME)); //set orderBy in the resource model, verify context model updated - attributeResource.addSupportingAnnotation(OrderByAnnotation.ANNOTATION_NAME); + attributeResource.addAnnotation(OrderByAnnotation.ANNOTATION_NAME); assertFalse(oneToManyMapping.isNoOrdering()); - OrderByAnnotation orderBy = (OrderByAnnotation) attributeResource.getSupportingAnnotation(OrderByAnnotation.ANNOTATION_NAME); + OrderByAnnotation orderBy = (OrderByAnnotation) attributeResource.getAnnotation(OrderByAnnotation.ANNOTATION_NAME); orderBy.setValue("newOrderBy"); assertFalse(oneToManyMapping.isNoOrdering()); //set orderBy to null in the resource model - attributeResource.removeSupportingAnnotation(OrderByAnnotation.ANNOTATION_NAME); + attributeResource.removeAnnotation(OrderByAnnotation.ANNOTATION_NAME); assertTrue(oneToManyMapping.isNoOrdering()); - assertNull(attributeResource.getSupportingAnnotation(OrderByAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(OrderByAnnotation.ANNOTATION_NAME)); } public void testUpdatePkOrdering() throws Exception { @@ -886,20 +885,20 @@ public class JavaOneToManyMappingTests extends ContextModelTestCase JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); assertFalse(oneToManyMapping.isPkOrdering()); - assertNull(attributeResource.getSupportingAnnotation(OrderByAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(OrderByAnnotation.ANNOTATION_NAME)); //set orderBy in the resource model, verify context model updated - attributeResource.addSupportingAnnotation(OrderByAnnotation.ANNOTATION_NAME); + attributeResource.addAnnotation(OrderByAnnotation.ANNOTATION_NAME); assertTrue(oneToManyMapping.isPkOrdering()); - OrderByAnnotation orderBy = (OrderByAnnotation) attributeResource.getSupportingAnnotation(OrderByAnnotation.ANNOTATION_NAME); + OrderByAnnotation orderBy = (OrderByAnnotation) attributeResource.getAnnotation(OrderByAnnotation.ANNOTATION_NAME); orderBy.setValue("newOrderBy"); assertFalse(oneToManyMapping.isPkOrdering()); //set orderBy to null in the resource model - attributeResource.removeSupportingAnnotation(OrderByAnnotation.ANNOTATION_NAME); + attributeResource.removeAnnotation(OrderByAnnotation.ANNOTATION_NAME); assertFalse(oneToManyMapping.isPkOrdering()); - assertNull(attributeResource.getSupportingAnnotation(OrderByAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(OrderByAnnotation.ANNOTATION_NAME)); } public void testUpdateCustomOrdering() throws Exception { @@ -913,20 +912,20 @@ public class JavaOneToManyMappingTests extends ContextModelTestCase JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); assertFalse(oneToManyMapping.isCustomOrdering()); - assertNull(attributeResource.getSupportingAnnotation(OrderByAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(OrderByAnnotation.ANNOTATION_NAME)); //set orderBy in the resource model, verify context model updated - attributeResource.addSupportingAnnotation(OrderByAnnotation.ANNOTATION_NAME); + attributeResource.addAnnotation(OrderByAnnotation.ANNOTATION_NAME); assertFalse(oneToManyMapping.isCustomOrdering()); - OrderByAnnotation orderBy = (OrderByAnnotation) attributeResource.getSupportingAnnotation(OrderByAnnotation.ANNOTATION_NAME); + OrderByAnnotation orderBy = (OrderByAnnotation) attributeResource.getAnnotation(OrderByAnnotation.ANNOTATION_NAME); orderBy.setValue("newOrderBy"); assertTrue(oneToManyMapping.isCustomOrdering()); //set orderBy to null in the resource model - attributeResource.removeSupportingAnnotation(OrderByAnnotation.ANNOTATION_NAME); + attributeResource.removeAnnotation(OrderByAnnotation.ANNOTATION_NAME); assertFalse(oneToManyMapping.isCustomOrdering()); - assertNull(attributeResource.getSupportingAnnotation(OrderByAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(OrderByAnnotation.ANNOTATION_NAME)); } public void testDefaultTargetEntityForMap() throws Exception { diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/JavaOneToOneMappingTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/JavaOneToOneMappingTests.java index 6c10347445..aed0ec2a37 100644 --- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/JavaOneToOneMappingTests.java +++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/JavaOneToOneMappingTests.java @@ -198,9 +198,9 @@ public class JavaOneToOneMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - assertNull(attributeResource.getMappingAnnotation(OneToOneAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getMappingAnnotation(BasicAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getSupportingAnnotation(JoinColumnAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(OneToOneAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getAnnotation(BasicAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(JoinColumnAnnotation.ANNOTATION_NAME)); } public void testMorphToDefault() throws Exception { @@ -219,8 +219,8 @@ public class JavaOneToOneMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - assertNull(attributeResource.getMappingAnnotation(OneToOneAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getSupportingAnnotation(JoinColumnAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(OneToOneAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(JoinColumnAnnotation.ANNOTATION_NAME)); } public void testMorphToVersionMapping() throws Exception { @@ -239,9 +239,9 @@ public class JavaOneToOneMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - assertNull(attributeResource.getMappingAnnotation(OneToOneAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getMappingAnnotation(VersionAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getSupportingAnnotation(JoinColumnAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(OneToOneAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getAnnotation(VersionAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(JoinColumnAnnotation.ANNOTATION_NAME)); } public void testMorphToIdMapping() throws Exception { @@ -260,9 +260,9 @@ public class JavaOneToOneMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - assertNull(attributeResource.getMappingAnnotation(OneToOneAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getMappingAnnotation(IdAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getSupportingAnnotation(JoinColumnAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(OneToOneAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getAnnotation(IdAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(JoinColumnAnnotation.ANNOTATION_NAME)); } public void testMorphToEmbeddedMapping() throws Exception { @@ -281,9 +281,9 @@ public class JavaOneToOneMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - assertNull(attributeResource.getMappingAnnotation(OneToOneAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getMappingAnnotation(EmbeddedAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getSupportingAnnotation(JoinColumnAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(OneToOneAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getAnnotation(EmbeddedAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(JoinColumnAnnotation.ANNOTATION_NAME)); } public void testMorphToEmbeddedIdMapping() throws Exception { @@ -302,9 +302,9 @@ public class JavaOneToOneMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - assertNull(attributeResource.getMappingAnnotation(OneToOneAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getMappingAnnotation(EmbeddedIdAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getSupportingAnnotation(JoinColumnAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(OneToOneAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getAnnotation(EmbeddedIdAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(JoinColumnAnnotation.ANNOTATION_NAME)); } public void testMorphToTransientMapping() throws Exception { @@ -323,9 +323,9 @@ public class JavaOneToOneMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - assertNull(attributeResource.getMappingAnnotation(OneToOneAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getMappingAnnotation(TransientAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getSupportingAnnotation(JoinColumnAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(OneToOneAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getAnnotation(TransientAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(JoinColumnAnnotation.ANNOTATION_NAME)); } public void testMorphToManyToOneMapping() throws Exception { @@ -344,9 +344,9 @@ public class JavaOneToOneMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - assertNull(attributeResource.getMappingAnnotation(OneToOneAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getMappingAnnotation(ManyToOneAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getSupportingAnnotation(JoinColumnAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(OneToOneAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getAnnotation(ManyToOneAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getAnnotation(JoinColumnAnnotation.ANNOTATION_NAME)); } public void testMorphToOneToManyMapping() throws Exception { @@ -365,9 +365,9 @@ public class JavaOneToOneMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - assertNull(attributeResource.getMappingAnnotation(OneToOneAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getMappingAnnotation(OneToManyAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getSupportingAnnotation(JoinColumnAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(OneToOneAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getAnnotation(OneToManyAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getAnnotation(JoinColumnAnnotation.ANNOTATION_NAME)); } public void testMorphToManyToManyMapping() throws Exception { @@ -386,9 +386,9 @@ public class JavaOneToOneMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - assertNull(attributeResource.getMappingAnnotation(OneToOneAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getMappingAnnotation(ManyToManyAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getSupportingAnnotation(JoinColumnAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(OneToOneAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getAnnotation(ManyToManyAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(JoinColumnAnnotation.ANNOTATION_NAME)); } @@ -401,7 +401,7 @@ public class JavaOneToOneMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - OneToOneAnnotation oneToOne = (OneToOneAnnotation) attributeResource.getMappingAnnotation(); + OneToOneAnnotation oneToOne = (OneToOneAnnotation) attributeResource.getAnnotation(OneToOneAnnotation.ANNOTATION_NAME); assertNull(oneToOneMapping.getSpecifiedTargetEntity()); assertNull(oneToOne.getTargetEntity()); @@ -426,7 +426,7 @@ public class JavaOneToOneMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - OneToOneAnnotation oneToOne = (OneToOneAnnotation) attributeResource.getMappingAnnotation(); + OneToOneAnnotation oneToOne = (OneToOneAnnotation) attributeResource.getAnnotation(OneToOneAnnotation.ANNOTATION_NAME); assertNull(oneToOneMapping.getSpecifiedTargetEntity()); assertNull(oneToOne.getTargetEntity()); @@ -452,7 +452,7 @@ public class JavaOneToOneMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - OneToOneAnnotation oneToOne = (OneToOneAnnotation) attributeResource.getMappingAnnotation(); + OneToOneAnnotation oneToOne = (OneToOneAnnotation) attributeResource.getAnnotation(OneToOneAnnotation.ANNOTATION_NAME); assertNull(mappedBy.getMappedByAttribute()); assertNull(oneToOne.getMappedBy()); @@ -478,7 +478,7 @@ public class JavaOneToOneMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - OneToOneAnnotation oneToOne = (OneToOneAnnotation) attributeResource.getMappingAnnotation(); + OneToOneAnnotation oneToOne = (OneToOneAnnotation) attributeResource.getAnnotation(OneToOneAnnotation.ANNOTATION_NAME); assertNull(mappedBy.getMappedByAttribute()); assertNull(oneToOne.getMappedBy()); @@ -503,7 +503,7 @@ public class JavaOneToOneMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - OneToOneAnnotation oneToOne = (OneToOneAnnotation) attributeResource.getMappingAnnotation(); + OneToOneAnnotation oneToOne = (OneToOneAnnotation) attributeResource.getAnnotation(OneToOneAnnotation.ANNOTATION_NAME); assertNull(oneToOneMapping.getSpecifiedOptional()); assertNull(oneToOne.getOptional()); @@ -533,7 +533,7 @@ public class JavaOneToOneMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - OneToOneAnnotation oneToOne = (OneToOneAnnotation) attributeResource.getMappingAnnotation(); + OneToOneAnnotation oneToOne = (OneToOneAnnotation) attributeResource.getAnnotation(OneToOneAnnotation.ANNOTATION_NAME); assertNull(oneToOneMapping.getSpecifiedOptional()); assertNull(oneToOne.getOptional()); @@ -542,7 +542,7 @@ public class JavaOneToOneMappingTests extends ContextModelTestCase oneToOneMapping.setSpecifiedOptional(Boolean.TRUE); assertEquals(Boolean.TRUE, oneToOneMapping.getSpecifiedOptional()); assertEquals(Boolean.TRUE, oneToOne.getOptional()); - + oneToOneMapping.setSpecifiedOptional(Boolean.FALSE); assertEquals(Boolean.FALSE, oneToOneMapping.getSpecifiedOptional()); assertEquals(Boolean.FALSE, oneToOne.getOptional()); @@ -563,7 +563,7 @@ public class JavaOneToOneMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - OneToOneAnnotation oneToOne = (OneToOneAnnotation) attributeResource.getMappingAnnotation(); + OneToOneAnnotation oneToOne = (OneToOneAnnotation) attributeResource.getAnnotation(OneToOneAnnotation.ANNOTATION_NAME); assertNull(oneToOneMapping.getSpecifiedFetch()); assertNull(oneToOne.getFetch()); @@ -572,11 +572,10 @@ public class JavaOneToOneMappingTests extends ContextModelTestCase oneToOne.setFetch(org.eclipse.jpt.core.resource.java.FetchType.EAGER); assertEquals(FetchType.EAGER, oneToOneMapping.getSpecifiedFetch()); assertEquals(org.eclipse.jpt.core.resource.java.FetchType.EAGER, oneToOne.getFetch()); - + oneToOne.setFetch(org.eclipse.jpt.core.resource.java.FetchType.LAZY); assertEquals(FetchType.LAZY, oneToOneMapping.getSpecifiedFetch()); assertEquals(org.eclipse.jpt.core.resource.java.FetchType.LAZY, oneToOne.getFetch()); - //set fetch to null in the resource model oneToOne.setFetch(null); @@ -593,7 +592,7 @@ public class JavaOneToOneMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - OneToOneAnnotation oneToOne = (OneToOneAnnotation) attributeResource.getMappingAnnotation(); + OneToOneAnnotation oneToOne = (OneToOneAnnotation) attributeResource.getAnnotation(OneToOneAnnotation.ANNOTATION_NAME); assertNull(oneToOneMapping.getSpecifiedFetch()); assertNull(oneToOne.getFetch()); @@ -606,7 +605,6 @@ public class JavaOneToOneMappingTests extends ContextModelTestCase oneToOneMapping.setSpecifiedFetch(FetchType.LAZY); assertEquals(FetchType.LAZY, oneToOneMapping.getSpecifiedFetch()); assertEquals(org.eclipse.jpt.core.resource.java.FetchType.LAZY, oneToOne.getFetch()); - //set fetch to null in the context model oneToOneMapping.setSpecifiedFetch(null); @@ -630,13 +628,13 @@ public class JavaOneToOneMappingTests extends ContextModelTestCase JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); //add an annotation to the resource model and verify the context model is updated - JoinColumnAnnotation joinColumn = (JoinColumnAnnotation) attributeResource.addSupportingAnnotation(0, JPA.JOIN_COLUMN, JPA.JOIN_COLUMNS); + JoinColumnAnnotation joinColumn = (JoinColumnAnnotation) attributeResource.addAnnotation(0, JPA.JOIN_COLUMN, JPA.JOIN_COLUMNS); joinColumn.setName("FOO"); specifiedJoinColumns = joinColumns.specifiedJoinColumns(); assertEquals("FOO", specifiedJoinColumns.next().getName()); assertFalse(specifiedJoinColumns.hasNext()); - joinColumn = (JoinColumnAnnotation) attributeResource.addSupportingAnnotation(0, JPA.JOIN_COLUMN, JPA.JOIN_COLUMNS); + joinColumn = (JoinColumnAnnotation) attributeResource.addAnnotation(0, JPA.JOIN_COLUMN, JPA.JOIN_COLUMNS); joinColumn.setName("BAR"); specifiedJoinColumns = joinColumns.specifiedJoinColumns(); assertEquals("BAR", specifiedJoinColumns.next().getName()); @@ -644,7 +642,7 @@ public class JavaOneToOneMappingTests extends ContextModelTestCase assertFalse(specifiedJoinColumns.hasNext()); - joinColumn = (JoinColumnAnnotation) attributeResource.addSupportingAnnotation(0, JPA.JOIN_COLUMN, JPA.JOIN_COLUMNS); + joinColumn = (JoinColumnAnnotation) attributeResource.addAnnotation(0, JPA.JOIN_COLUMN, JPA.JOIN_COLUMNS); joinColumn.setName("BAZ"); specifiedJoinColumns = joinColumns.specifiedJoinColumns(); assertEquals("BAZ", specifiedJoinColumns.next().getName()); @@ -653,26 +651,26 @@ public class JavaOneToOneMappingTests extends ContextModelTestCase assertFalse(specifiedJoinColumns.hasNext()); //move an annotation to the resource model and verify the context model is updated - attributeResource.moveSupportingAnnotation(1, 0, JPA.JOIN_COLUMNS); + attributeResource.moveAnnotation(1, 0, JPA.JOIN_COLUMNS); specifiedJoinColumns = joinColumns.specifiedJoinColumns(); assertEquals("BAR", specifiedJoinColumns.next().getName()); assertEquals("BAZ", specifiedJoinColumns.next().getName()); assertEquals("FOO", specifiedJoinColumns.next().getName()); assertFalse(specifiedJoinColumns.hasNext()); - attributeResource.removeSupportingAnnotation(0, JPA.JOIN_COLUMN, JPA.JOIN_COLUMNS); + attributeResource.removeAnnotation(0, JPA.JOIN_COLUMN, JPA.JOIN_COLUMNS); specifiedJoinColumns = joinColumns.specifiedJoinColumns(); assertEquals("BAZ", specifiedJoinColumns.next().getName()); assertEquals("FOO", specifiedJoinColumns.next().getName()); assertFalse(specifiedJoinColumns.hasNext()); - attributeResource.removeSupportingAnnotation(0, JPA.JOIN_COLUMN, JPA.JOIN_COLUMNS); + attributeResource.removeAnnotation(0, JPA.JOIN_COLUMN, JPA.JOIN_COLUMNS); specifiedJoinColumns = joinColumns.specifiedJoinColumns(); assertEquals("FOO", specifiedJoinColumns.next().getName()); assertFalse(specifiedJoinColumns.hasNext()); - attributeResource.removeSupportingAnnotation(0, JPA.JOIN_COLUMN, JPA.JOIN_COLUMNS); + attributeResource.removeAnnotation(0, JPA.JOIN_COLUMN, JPA.JOIN_COLUMNS); specifiedJoinColumns = joinColumns.specifiedJoinColumns(); assertFalse(specifiedJoinColumns.hasNext()); } @@ -738,7 +736,7 @@ public class JavaOneToOneMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); Iterator<NestableAnnotation> joinColumnsIterator = - attributeResource.supportingAnnotations(JoinColumnAnnotation.ANNOTATION_NAME, JoinColumnsAnnotation.ANNOTATION_NAME); + attributeResource.annotations(JoinColumnAnnotation.ANNOTATION_NAME, JoinColumnsAnnotation.ANNOTATION_NAME); assertEquals("BAZ", ((JoinColumnAnnotation) joinColumnsIterator.next()).getName()); assertEquals("BAR", ((JoinColumnAnnotation) joinColumnsIterator.next()).getName()); @@ -761,7 +759,7 @@ public class JavaOneToOneMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); Iterator<NestableAnnotation> joinColumnsIterator = - attributeResource.supportingAnnotations(JoinColumnAnnotation.ANNOTATION_NAME, JoinColumnsAnnotation.ANNOTATION_NAME); + attributeResource.annotations(JoinColumnAnnotation.ANNOTATION_NAME, JoinColumnsAnnotation.ANNOTATION_NAME); assertEquals("FOO", ((JoinColumnAnnotation) joinColumnsIterator.next()).getName()); assertEquals("BAR", ((JoinColumnAnnotation) joinColumnsIterator.next()).getName()); @@ -783,11 +781,11 @@ public class JavaOneToOneMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - assertEquals(3, CollectionTools.size(attributeResource.supportingAnnotations(JoinColumnAnnotation.ANNOTATION_NAME, JoinColumnsAnnotation.ANNOTATION_NAME))); + assertEquals(3, CollectionTools.size(attributeResource.annotations(JoinColumnAnnotation.ANNOTATION_NAME, JoinColumnsAnnotation.ANNOTATION_NAME))); joinColumns.removeSpecifiedJoinColumn(1); - Iterator<NestableAnnotation> joinColumnResources = attributeResource.supportingAnnotations(JoinColumnAnnotation.ANNOTATION_NAME, JoinColumnsAnnotation.ANNOTATION_NAME); + Iterator<NestableAnnotation> joinColumnResources = attributeResource.annotations(JoinColumnAnnotation.ANNOTATION_NAME, JoinColumnsAnnotation.ANNOTATION_NAME); assertEquals("FOO", ((JoinColumnAnnotation) joinColumnResources.next()).getName()); assertEquals("BAZ", ((JoinColumnAnnotation) joinColumnResources.next()).getName()); assertFalse(joinColumnResources.hasNext()); @@ -799,7 +797,7 @@ public class JavaOneToOneMappingTests extends ContextModelTestCase joinColumns.removeSpecifiedJoinColumn(1); - joinColumnResources = attributeResource.supportingAnnotations(JoinColumnAnnotation.ANNOTATION_NAME, JoinColumnsAnnotation.ANNOTATION_NAME); + joinColumnResources = attributeResource.annotations(JoinColumnAnnotation.ANNOTATION_NAME, JoinColumnsAnnotation.ANNOTATION_NAME); assertEquals("FOO", ((JoinColumnAnnotation) joinColumnResources.next()).getName()); assertFalse(joinColumnResources.hasNext()); @@ -809,12 +807,12 @@ public class JavaOneToOneMappingTests extends ContextModelTestCase joinColumns.removeSpecifiedJoinColumn(0); - joinColumnResources = attributeResource.supportingAnnotations(JoinColumnAnnotation.ANNOTATION_NAME, JoinColumnsAnnotation.ANNOTATION_NAME); + joinColumnResources = attributeResource.annotations(JoinColumnAnnotation.ANNOTATION_NAME, JoinColumnsAnnotation.ANNOTATION_NAME); assertFalse(joinColumnResources.hasNext()); joinColumnsIterator = joinColumns.specifiedJoinColumns(); assertFalse(joinColumnsIterator.hasNext()); - assertNull(attributeResource.getSupportingAnnotation(JoinColumnsAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(JoinColumnsAnnotation.ANNOTATION_NAME)); } public void testMoveSpecifiedJoinColumn() throws Exception { @@ -831,7 +829,7 @@ public class JavaOneToOneMappingTests extends ContextModelTestCase JavaResourcePersistentAttribute attributeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME).persistableAttributes().next(); - ListIterator<NestableAnnotation> javaJoinColumns = attributeResource.supportingAnnotations(JoinColumnAnnotation.ANNOTATION_NAME, JoinColumnsAnnotation.ANNOTATION_NAME); + Iterator<NestableAnnotation> javaJoinColumns = attributeResource.annotations(JoinColumnAnnotation.ANNOTATION_NAME, JoinColumnsAnnotation.ANNOTATION_NAME); assertEquals(3, CollectionTools.size(javaJoinColumns)); @@ -841,7 +839,7 @@ public class JavaOneToOneMappingTests extends ContextModelTestCase assertEquals("BAZ", primaryKeyJoinColumns.next().getSpecifiedName()); assertEquals("FOO", primaryKeyJoinColumns.next().getSpecifiedName()); - javaJoinColumns = attributeResource.supportingAnnotations(JoinColumnAnnotation.ANNOTATION_NAME, JoinColumnsAnnotation.ANNOTATION_NAME); + javaJoinColumns = attributeResource.annotations(JoinColumnAnnotation.ANNOTATION_NAME, JoinColumnsAnnotation.ANNOTATION_NAME); assertEquals("BAR", ((JoinColumnAnnotation) javaJoinColumns.next()).getName()); assertEquals("BAZ", ((JoinColumnAnnotation) javaJoinColumns.next()).getName()); assertEquals("FOO", ((JoinColumnAnnotation) javaJoinColumns.next()).getName()); @@ -853,7 +851,7 @@ public class JavaOneToOneMappingTests extends ContextModelTestCase assertEquals("BAR", primaryKeyJoinColumns.next().getSpecifiedName()); assertEquals("FOO", primaryKeyJoinColumns.next().getSpecifiedName()); - javaJoinColumns = attributeResource.supportingAnnotations(JoinColumnAnnotation.ANNOTATION_NAME, JoinColumnsAnnotation.ANNOTATION_NAME); + javaJoinColumns = attributeResource.annotations(JoinColumnAnnotation.ANNOTATION_NAME, JoinColumnsAnnotation.ANNOTATION_NAME); assertEquals("BAZ", ((JoinColumnAnnotation) javaJoinColumns.next()).getName()); assertEquals("BAR", ((JoinColumnAnnotation) javaJoinColumns.next()).getName()); assertEquals("FOO", ((JoinColumnAnnotation) javaJoinColumns.next()).getName()); @@ -868,9 +866,9 @@ public class JavaOneToOneMappingTests extends ContextModelTestCase JoinColumnJoiningStrategy joinColumns = oneToOneMapping.getRelationshipReference().getJoinColumnJoiningStrategy(); JavaResourcePersistentAttribute attributeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME).persistableAttributes().next(); - ((JoinColumnAnnotation) attributeResource.addSupportingAnnotation(0, JoinColumnAnnotation.ANNOTATION_NAME, JoinColumnsAnnotation.ANNOTATION_NAME)).setName("FOO"); - ((JoinColumnAnnotation) attributeResource.addSupportingAnnotation(1, JoinColumnAnnotation.ANNOTATION_NAME, JoinColumnsAnnotation.ANNOTATION_NAME)).setName("BAR"); - ((JoinColumnAnnotation) attributeResource.addSupportingAnnotation(2, JoinColumnAnnotation.ANNOTATION_NAME, JoinColumnsAnnotation.ANNOTATION_NAME)).setName("BAZ"); + ((JoinColumnAnnotation) attributeResource.addAnnotation(0, JoinColumnAnnotation.ANNOTATION_NAME, JoinColumnsAnnotation.ANNOTATION_NAME)).setName("FOO"); + ((JoinColumnAnnotation) attributeResource.addAnnotation(1, JoinColumnAnnotation.ANNOTATION_NAME, JoinColumnsAnnotation.ANNOTATION_NAME)).setName("BAR"); + ((JoinColumnAnnotation) attributeResource.addAnnotation(2, JoinColumnAnnotation.ANNOTATION_NAME, JoinColumnsAnnotation.ANNOTATION_NAME)).setName("BAZ"); ListIterator<? extends JoinColumn> joinColumnsIterator = joinColumns.specifiedJoinColumns(); assertEquals("FOO", joinColumnsIterator.next().getName()); @@ -878,32 +876,32 @@ public class JavaOneToOneMappingTests extends ContextModelTestCase assertEquals("BAZ", joinColumnsIterator.next().getName()); assertFalse(joinColumnsIterator.hasNext()); - attributeResource.moveSupportingAnnotation(2, 0, JoinColumnsAnnotation.ANNOTATION_NAME); + attributeResource.moveAnnotation(2, 0, JoinColumnsAnnotation.ANNOTATION_NAME); joinColumnsIterator = joinColumns.specifiedJoinColumns(); assertEquals("BAR", joinColumnsIterator.next().getName()); assertEquals("BAZ", joinColumnsIterator.next().getName()); assertEquals("FOO", joinColumnsIterator.next().getName()); assertFalse(joinColumnsIterator.hasNext()); - attributeResource.moveSupportingAnnotation(0, 1, JoinColumnsAnnotation.ANNOTATION_NAME); + attributeResource.moveAnnotation(0, 1, JoinColumnsAnnotation.ANNOTATION_NAME); joinColumnsIterator = joinColumns.specifiedJoinColumns(); assertEquals("BAZ", joinColumnsIterator.next().getName()); assertEquals("BAR", joinColumnsIterator.next().getName()); assertEquals("FOO", joinColumnsIterator.next().getName()); assertFalse(joinColumnsIterator.hasNext()); - attributeResource.removeSupportingAnnotation(1, JoinColumnAnnotation.ANNOTATION_NAME, JoinColumnsAnnotation.ANNOTATION_NAME); + attributeResource.removeAnnotation(1, JoinColumnAnnotation.ANNOTATION_NAME, JoinColumnsAnnotation.ANNOTATION_NAME); joinColumnsIterator = joinColumns.specifiedJoinColumns(); assertEquals("BAZ", joinColumnsIterator.next().getName()); assertEquals("FOO", joinColumnsIterator.next().getName()); assertFalse(joinColumnsIterator.hasNext()); - attributeResource.removeSupportingAnnotation(1, JoinColumnAnnotation.ANNOTATION_NAME, JoinColumnsAnnotation.ANNOTATION_NAME); + attributeResource.removeAnnotation(1, JoinColumnAnnotation.ANNOTATION_NAME, JoinColumnsAnnotation.ANNOTATION_NAME); joinColumnsIterator = joinColumns.specifiedJoinColumns(); assertEquals("BAZ", joinColumnsIterator.next().getName()); assertFalse(joinColumnsIterator.hasNext()); - attributeResource.removeSupportingAnnotation(0, JoinColumnAnnotation.ANNOTATION_NAME, JoinColumnsAnnotation.ANNOTATION_NAME); + attributeResource.removeAnnotation(0, JoinColumnAnnotation.ANNOTATION_NAME, JoinColumnsAnnotation.ANNOTATION_NAME); joinColumnsIterator = joinColumns.specifiedJoinColumns(); assertFalse(joinColumnsIterator.hasNext()); } @@ -1076,13 +1074,13 @@ public class JavaOneToOneMappingTests extends ContextModelTestCase JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); //add an annotation to the resource model and verify the context model is updated - PrimaryKeyJoinColumnAnnotation joinColumn = (PrimaryKeyJoinColumnAnnotation) attributeResource.addSupportingAnnotation(0, JPA.PRIMARY_KEY_JOIN_COLUMN, JPA.PRIMARY_KEY_JOIN_COLUMNS); + PrimaryKeyJoinColumnAnnotation joinColumn = (PrimaryKeyJoinColumnAnnotation) attributeResource.addAnnotation(0, JPA.PRIMARY_KEY_JOIN_COLUMN, JPA.PRIMARY_KEY_JOIN_COLUMNS); joinColumn.setName("FOO"); primaryKeyJoinColumns = strategy.primaryKeyJoinColumns(); assertEquals("FOO", primaryKeyJoinColumns.next().getName()); assertFalse(primaryKeyJoinColumns.hasNext()); - joinColumn = (PrimaryKeyJoinColumnAnnotation) attributeResource.addSupportingAnnotation(0, JPA.PRIMARY_KEY_JOIN_COLUMN, JPA.PRIMARY_KEY_JOIN_COLUMNS); + joinColumn = (PrimaryKeyJoinColumnAnnotation) attributeResource.addAnnotation(0, JPA.PRIMARY_KEY_JOIN_COLUMN, JPA.PRIMARY_KEY_JOIN_COLUMNS); joinColumn.setName("BAR"); primaryKeyJoinColumns = strategy.primaryKeyJoinColumns(); assertEquals("BAR", primaryKeyJoinColumns.next().getName()); @@ -1090,7 +1088,7 @@ public class JavaOneToOneMappingTests extends ContextModelTestCase assertFalse(primaryKeyJoinColumns.hasNext()); - joinColumn = (PrimaryKeyJoinColumnAnnotation) attributeResource.addSupportingAnnotation(0, JPA.PRIMARY_KEY_JOIN_COLUMN, JPA.PRIMARY_KEY_JOIN_COLUMNS); + joinColumn = (PrimaryKeyJoinColumnAnnotation) attributeResource.addAnnotation(0, JPA.PRIMARY_KEY_JOIN_COLUMN, JPA.PRIMARY_KEY_JOIN_COLUMNS); joinColumn.setName("BAZ"); primaryKeyJoinColumns = strategy.primaryKeyJoinColumns(); assertEquals("BAZ", primaryKeyJoinColumns.next().getName()); @@ -1099,26 +1097,26 @@ public class JavaOneToOneMappingTests extends ContextModelTestCase assertFalse(primaryKeyJoinColumns.hasNext()); //move an annotation to the resource model and verify the context model is updated - attributeResource.moveSupportingAnnotation(1, 0, JPA.PRIMARY_KEY_JOIN_COLUMNS); + attributeResource.moveAnnotation(1, 0, JPA.PRIMARY_KEY_JOIN_COLUMNS); primaryKeyJoinColumns = strategy.primaryKeyJoinColumns(); assertEquals("BAR", primaryKeyJoinColumns.next().getName()); assertEquals("BAZ", primaryKeyJoinColumns.next().getName()); assertEquals("FOO", primaryKeyJoinColumns.next().getName()); assertFalse(primaryKeyJoinColumns.hasNext()); - attributeResource.removeSupportingAnnotation(0, JPA.PRIMARY_KEY_JOIN_COLUMN, JPA.PRIMARY_KEY_JOIN_COLUMNS); + attributeResource.removeAnnotation(0, JPA.PRIMARY_KEY_JOIN_COLUMN, JPA.PRIMARY_KEY_JOIN_COLUMNS); primaryKeyJoinColumns = strategy.primaryKeyJoinColumns(); assertEquals("BAZ", primaryKeyJoinColumns.next().getName()); assertEquals("FOO", primaryKeyJoinColumns.next().getName()); assertFalse(primaryKeyJoinColumns.hasNext()); - attributeResource.removeSupportingAnnotation(0, JPA.PRIMARY_KEY_JOIN_COLUMN, JPA.PRIMARY_KEY_JOIN_COLUMNS); + attributeResource.removeAnnotation(0, JPA.PRIMARY_KEY_JOIN_COLUMN, JPA.PRIMARY_KEY_JOIN_COLUMNS); primaryKeyJoinColumns = strategy.primaryKeyJoinColumns(); assertEquals("FOO", primaryKeyJoinColumns.next().getName()); assertFalse(primaryKeyJoinColumns.hasNext()); - attributeResource.removeSupportingAnnotation(0, JPA.PRIMARY_KEY_JOIN_COLUMN, JPA.PRIMARY_KEY_JOIN_COLUMNS); + attributeResource.removeAnnotation(0, JPA.PRIMARY_KEY_JOIN_COLUMN, JPA.PRIMARY_KEY_JOIN_COLUMNS); primaryKeyJoinColumns = strategy.primaryKeyJoinColumns(); assertFalse(primaryKeyJoinColumns.hasNext()); } @@ -1156,7 +1154,7 @@ public class JavaOneToOneMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - Iterator<NestableAnnotation> joinColumns = attributeResource.supportingAnnotations(PrimaryKeyJoinColumnAnnotation.ANNOTATION_NAME, PrimaryKeyJoinColumnsAnnotation.ANNOTATION_NAME); + Iterator<NestableAnnotation> joinColumns = attributeResource.annotations(PrimaryKeyJoinColumnAnnotation.ANNOTATION_NAME, PrimaryKeyJoinColumnsAnnotation.ANNOTATION_NAME); assertEquals("BAZ", ((PrimaryKeyJoinColumnAnnotation) joinColumns.next()).getName()); assertEquals("BAR", ((PrimaryKeyJoinColumnAnnotation) joinColumns.next()).getName()); @@ -1179,7 +1177,7 @@ public class JavaOneToOneMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - Iterator<NestableAnnotation> joinColumns = attributeResource.supportingAnnotations(PrimaryKeyJoinColumnAnnotation.ANNOTATION_NAME, PrimaryKeyJoinColumnsAnnotation.ANNOTATION_NAME); + Iterator<NestableAnnotation> joinColumns = attributeResource.annotations(PrimaryKeyJoinColumnAnnotation.ANNOTATION_NAME, PrimaryKeyJoinColumnsAnnotation.ANNOTATION_NAME); assertEquals("FOO", ((PrimaryKeyJoinColumnAnnotation) joinColumns.next()).getName()); assertEquals("BAR", ((PrimaryKeyJoinColumnAnnotation) joinColumns.next()).getName()); @@ -1203,11 +1201,11 @@ public class JavaOneToOneMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - assertEquals(3, CollectionTools.size(attributeResource.supportingAnnotations(PrimaryKeyJoinColumnAnnotation.ANNOTATION_NAME, PrimaryKeyJoinColumnsAnnotation.ANNOTATION_NAME))); + assertEquals(3, CollectionTools.size(attributeResource.annotations(PrimaryKeyJoinColumnAnnotation.ANNOTATION_NAME, PrimaryKeyJoinColumnsAnnotation.ANNOTATION_NAME))); strategy.removePrimaryKeyJoinColumn(1); - Iterator<NestableAnnotation> joinColumnResources = attributeResource.supportingAnnotations(PrimaryKeyJoinColumnAnnotation.ANNOTATION_NAME, PrimaryKeyJoinColumnsAnnotation.ANNOTATION_NAME); + Iterator<NestableAnnotation> joinColumnResources = attributeResource.annotations(PrimaryKeyJoinColumnAnnotation.ANNOTATION_NAME, PrimaryKeyJoinColumnsAnnotation.ANNOTATION_NAME); assertEquals("FOO", ((PrimaryKeyJoinColumnAnnotation) joinColumnResources.next()).getName()); assertEquals("BAZ", ((PrimaryKeyJoinColumnAnnotation) joinColumnResources.next()).getName()); assertFalse(joinColumnResources.hasNext()); @@ -1219,7 +1217,7 @@ public class JavaOneToOneMappingTests extends ContextModelTestCase strategy.removePrimaryKeyJoinColumn(1); - joinColumnResources = attributeResource.supportingAnnotations(PrimaryKeyJoinColumnAnnotation.ANNOTATION_NAME, PrimaryKeyJoinColumnsAnnotation.ANNOTATION_NAME); + joinColumnResources = attributeResource.annotations(PrimaryKeyJoinColumnAnnotation.ANNOTATION_NAME, PrimaryKeyJoinColumnsAnnotation.ANNOTATION_NAME); assertEquals("FOO", ((PrimaryKeyJoinColumnAnnotation) joinColumnResources.next()).getName()); assertFalse(joinColumnResources.hasNext()); @@ -1229,12 +1227,12 @@ public class JavaOneToOneMappingTests extends ContextModelTestCase strategy.removePrimaryKeyJoinColumn(0); - joinColumnResources = attributeResource.supportingAnnotations(PrimaryKeyJoinColumnAnnotation.ANNOTATION_NAME, PrimaryKeyJoinColumnsAnnotation.ANNOTATION_NAME); + joinColumnResources = attributeResource.annotations(PrimaryKeyJoinColumnAnnotation.ANNOTATION_NAME, PrimaryKeyJoinColumnsAnnotation.ANNOTATION_NAME); assertFalse(joinColumnResources.hasNext()); joinColumns = strategy.primaryKeyJoinColumns(); assertFalse(joinColumns.hasNext()); - assertNull(attributeResource.getSupportingAnnotation(PrimaryKeyJoinColumnsAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(PrimaryKeyJoinColumnsAnnotation.ANNOTATION_NAME)); } public void testMovePrimaryKeyJoinColumn() throws Exception { @@ -1252,7 +1250,7 @@ public class JavaOneToOneMappingTests extends ContextModelTestCase JavaResourcePersistentAttribute attributeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME).persistableAttributes().next(); - ListIterator<NestableAnnotation> javaJoinColumns = attributeResource.supportingAnnotations(PrimaryKeyJoinColumnAnnotation.ANNOTATION_NAME, PrimaryKeyJoinColumnsAnnotation.ANNOTATION_NAME); + Iterator<NestableAnnotation> javaJoinColumns = attributeResource.annotations(PrimaryKeyJoinColumnAnnotation.ANNOTATION_NAME, PrimaryKeyJoinColumnsAnnotation.ANNOTATION_NAME); assertEquals(3, CollectionTools.size(javaJoinColumns)); @@ -1262,7 +1260,7 @@ public class JavaOneToOneMappingTests extends ContextModelTestCase assertEquals("BAZ", primaryKeyJoinColumns.next().getSpecifiedName()); assertEquals("FOO", primaryKeyJoinColumns.next().getSpecifiedName()); - javaJoinColumns = attributeResource.supportingAnnotations(PrimaryKeyJoinColumnAnnotation.ANNOTATION_NAME, PrimaryKeyJoinColumnsAnnotation.ANNOTATION_NAME); + javaJoinColumns = attributeResource.annotations(PrimaryKeyJoinColumnAnnotation.ANNOTATION_NAME, PrimaryKeyJoinColumnsAnnotation.ANNOTATION_NAME); assertEquals("BAR", ((PrimaryKeyJoinColumnAnnotation) javaJoinColumns.next()).getName()); assertEquals("BAZ", ((PrimaryKeyJoinColumnAnnotation) javaJoinColumns.next()).getName()); assertEquals("FOO", ((PrimaryKeyJoinColumnAnnotation) javaJoinColumns.next()).getName()); @@ -1274,7 +1272,7 @@ public class JavaOneToOneMappingTests extends ContextModelTestCase assertEquals("BAR", primaryKeyJoinColumns.next().getSpecifiedName()); assertEquals("FOO", primaryKeyJoinColumns.next().getSpecifiedName()); - javaJoinColumns = attributeResource.supportingAnnotations(PrimaryKeyJoinColumnAnnotation.ANNOTATION_NAME, PrimaryKeyJoinColumnsAnnotation.ANNOTATION_NAME); + javaJoinColumns = attributeResource.annotations(PrimaryKeyJoinColumnAnnotation.ANNOTATION_NAME, PrimaryKeyJoinColumnsAnnotation.ANNOTATION_NAME); assertEquals("BAZ", ((PrimaryKeyJoinColumnAnnotation) javaJoinColumns.next()).getName()); assertEquals("BAR", ((PrimaryKeyJoinColumnAnnotation) javaJoinColumns.next()).getName()); assertEquals("FOO", ((PrimaryKeyJoinColumnAnnotation) javaJoinColumns.next()).getName()); @@ -1290,9 +1288,9 @@ public class JavaOneToOneMappingTests extends ContextModelTestCase PrimaryKeyJoinColumnJoiningStrategy strategy = oneToOneMapping.getRelationshipReference().getPrimaryKeyJoinColumnJoiningStrategy(); - ((PrimaryKeyJoinColumnAnnotation) attributeResource.addSupportingAnnotation(0, PrimaryKeyJoinColumnAnnotation.ANNOTATION_NAME, PrimaryKeyJoinColumnsAnnotation.ANNOTATION_NAME)).setName("FOO"); - ((PrimaryKeyJoinColumnAnnotation) attributeResource.addSupportingAnnotation(1, PrimaryKeyJoinColumnAnnotation.ANNOTATION_NAME, PrimaryKeyJoinColumnsAnnotation.ANNOTATION_NAME)).setName("BAR"); - ((PrimaryKeyJoinColumnAnnotation) attributeResource.addSupportingAnnotation(2, PrimaryKeyJoinColumnAnnotation.ANNOTATION_NAME, PrimaryKeyJoinColumnsAnnotation.ANNOTATION_NAME)).setName("BAZ"); + ((PrimaryKeyJoinColumnAnnotation) attributeResource.addAnnotation(0, PrimaryKeyJoinColumnAnnotation.ANNOTATION_NAME, PrimaryKeyJoinColumnsAnnotation.ANNOTATION_NAME)).setName("FOO"); + ((PrimaryKeyJoinColumnAnnotation) attributeResource.addAnnotation(1, PrimaryKeyJoinColumnAnnotation.ANNOTATION_NAME, PrimaryKeyJoinColumnsAnnotation.ANNOTATION_NAME)).setName("BAR"); + ((PrimaryKeyJoinColumnAnnotation) attributeResource.addAnnotation(2, PrimaryKeyJoinColumnAnnotation.ANNOTATION_NAME, PrimaryKeyJoinColumnsAnnotation.ANNOTATION_NAME)).setName("BAZ"); ListIterator<PrimaryKeyJoinColumn> joinColumns = strategy.primaryKeyJoinColumns(); assertEquals("FOO", joinColumns.next().getName()); @@ -1300,32 +1298,32 @@ public class JavaOneToOneMappingTests extends ContextModelTestCase assertEquals("BAZ", joinColumns.next().getName()); assertFalse(joinColumns.hasNext()); - attributeResource.moveSupportingAnnotation(2, 0, PrimaryKeyJoinColumnsAnnotation.ANNOTATION_NAME); + attributeResource.moveAnnotation(2, 0, PrimaryKeyJoinColumnsAnnotation.ANNOTATION_NAME); joinColumns = strategy.primaryKeyJoinColumns(); assertEquals("BAR", joinColumns.next().getName()); assertEquals("BAZ", joinColumns.next().getName()); assertEquals("FOO", joinColumns.next().getName()); assertFalse(joinColumns.hasNext()); - attributeResource.moveSupportingAnnotation(0, 1, PrimaryKeyJoinColumnsAnnotation.ANNOTATION_NAME); + attributeResource.moveAnnotation(0, 1, PrimaryKeyJoinColumnsAnnotation.ANNOTATION_NAME); joinColumns = strategy.primaryKeyJoinColumns(); assertEquals("BAZ", joinColumns.next().getName()); assertEquals("BAR", joinColumns.next().getName()); assertEquals("FOO", joinColumns.next().getName()); assertFalse(joinColumns.hasNext()); - attributeResource.removeSupportingAnnotation(1, PrimaryKeyJoinColumnAnnotation.ANNOTATION_NAME, PrimaryKeyJoinColumnsAnnotation.ANNOTATION_NAME); + attributeResource.removeAnnotation(1, PrimaryKeyJoinColumnAnnotation.ANNOTATION_NAME, PrimaryKeyJoinColumnsAnnotation.ANNOTATION_NAME); joinColumns = strategy.primaryKeyJoinColumns(); assertEquals("BAZ", joinColumns.next().getName()); assertEquals("FOO", joinColumns.next().getName()); assertFalse(joinColumns.hasNext()); - attributeResource.removeSupportingAnnotation(1, PrimaryKeyJoinColumnAnnotation.ANNOTATION_NAME, PrimaryKeyJoinColumnsAnnotation.ANNOTATION_NAME); + attributeResource.removeAnnotation(1, PrimaryKeyJoinColumnAnnotation.ANNOTATION_NAME, PrimaryKeyJoinColumnsAnnotation.ANNOTATION_NAME); joinColumns = strategy.primaryKeyJoinColumns(); assertEquals("BAZ", joinColumns.next().getName()); assertFalse(joinColumns.hasNext()); - attributeResource.removeSupportingAnnotation(0, PrimaryKeyJoinColumnAnnotation.ANNOTATION_NAME, PrimaryKeyJoinColumnsAnnotation.ANNOTATION_NAME); + attributeResource.removeAnnotation(0, PrimaryKeyJoinColumnAnnotation.ANNOTATION_NAME, PrimaryKeyJoinColumnsAnnotation.ANNOTATION_NAME); joinColumns = strategy.primaryKeyJoinColumns(); assertFalse(joinColumns.hasNext()); } diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/JavaPrimaryKeyJoinColumnTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/JavaPrimaryKeyJoinColumnTests.java index 51d129c09d..c80c08a7e8 100644 --- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/JavaPrimaryKeyJoinColumnTests.java +++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/JavaPrimaryKeyJoinColumnTests.java @@ -76,7 +76,7 @@ public class JavaPrimaryKeyJoinColumnTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - PrimaryKeyJoinColumnAnnotation pkJoinColumnResource = (PrimaryKeyJoinColumnAnnotation) typeResource.getSupportingAnnotation(JPA.PRIMARY_KEY_JOIN_COLUMN); + PrimaryKeyJoinColumnAnnotation pkJoinColumnResource = (PrimaryKeyJoinColumnAnnotation) typeResource.getAnnotation(JPA.PRIMARY_KEY_JOIN_COLUMN); pkJoinColumnResource.setName("FOO"); specifiedPkJoinColumn = getJavaEntity().specifiedPrimaryKeyJoinColumns().next(); @@ -125,13 +125,13 @@ public class JavaPrimaryKeyJoinColumnTests extends ContextModelTestCase assertEquals("foo", specifiedPkJoinColumn.getSpecifiedName()); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - PrimaryKeyJoinColumnAnnotation pkJoinColumn = (PrimaryKeyJoinColumnAnnotation) typeResource.getSupportingAnnotation(JPA.PRIMARY_KEY_JOIN_COLUMN); + PrimaryKeyJoinColumnAnnotation pkJoinColumn = (PrimaryKeyJoinColumnAnnotation) typeResource.getAnnotation(JPA.PRIMARY_KEY_JOIN_COLUMN); assertEquals("foo", pkJoinColumn.getName()); specifiedPkJoinColumn.setSpecifiedName(null); assertNull(specifiedPkJoinColumn.getSpecifiedName()); - pkJoinColumn = (PrimaryKeyJoinColumnAnnotation) typeResource.getSupportingAnnotation(JPA.PRIMARY_KEY_JOIN_COLUMN); + pkJoinColumn = (PrimaryKeyJoinColumnAnnotation) typeResource.getAnnotation(JPA.PRIMARY_KEY_JOIN_COLUMN); assertNull(pkJoinColumn); } @@ -143,7 +143,7 @@ public class JavaPrimaryKeyJoinColumnTests extends ContextModelTestCase assertNull(specifiedPkJoinColumn.getColumnDefinition()); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - PrimaryKeyJoinColumnAnnotation column = (PrimaryKeyJoinColumnAnnotation) typeResource.getSupportingAnnotation(JPA.PRIMARY_KEY_JOIN_COLUMN); + PrimaryKeyJoinColumnAnnotation column = (PrimaryKeyJoinColumnAnnotation) typeResource.getAnnotation(JPA.PRIMARY_KEY_JOIN_COLUMN); column.setColumnDefinition(COLUMN_DEFINITION); assertEquals(COLUMN_DEFINITION, specifiedPkJoinColumn.getColumnDefinition()); @@ -152,7 +152,7 @@ public class JavaPrimaryKeyJoinColumnTests extends ContextModelTestCase assertNull(specifiedPkJoinColumn.getColumnDefinition()); - typeResource.removeSupportingAnnotation(JPA.PRIMARY_KEY_JOIN_COLUMN); + typeResource.removeAnnotation(JPA.PRIMARY_KEY_JOIN_COLUMN); assertEquals(0, getJavaEntity().specifiedPrimaryKeyJoinColumnsSize()); } @@ -165,12 +165,12 @@ public class JavaPrimaryKeyJoinColumnTests extends ContextModelTestCase specifiedPkJoinColumn.setColumnDefinition("foo"); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - PrimaryKeyJoinColumnAnnotation column = (PrimaryKeyJoinColumnAnnotation) typeResource.getSupportingAnnotation(JPA.PRIMARY_KEY_JOIN_COLUMN); + PrimaryKeyJoinColumnAnnotation column = (PrimaryKeyJoinColumnAnnotation) typeResource.getAnnotation(JPA.PRIMARY_KEY_JOIN_COLUMN); assertEquals("foo", column.getColumnDefinition()); specifiedPkJoinColumn.setColumnDefinition(null); - column = (PrimaryKeyJoinColumnAnnotation) typeResource.getSupportingAnnotation(JPA.PRIMARY_KEY_JOIN_COLUMN); + column = (PrimaryKeyJoinColumnAnnotation) typeResource.getAnnotation(JPA.PRIMARY_KEY_JOIN_COLUMN); assertNull(column.getColumnDefinition()); } @@ -182,7 +182,7 @@ public class JavaPrimaryKeyJoinColumnTests extends ContextModelTestCase assertNull(specifiedPkJoinColumn.getSpecifiedReferencedColumnName()); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - PrimaryKeyJoinColumnAnnotation pkJoinColumnResource = (PrimaryKeyJoinColumnAnnotation) typeResource.getSupportingAnnotation(JPA.PRIMARY_KEY_JOIN_COLUMN); + PrimaryKeyJoinColumnAnnotation pkJoinColumnResource = (PrimaryKeyJoinColumnAnnotation) typeResource.getAnnotation(JPA.PRIMARY_KEY_JOIN_COLUMN); pkJoinColumnResource.setReferencedColumnName("FOO"); specifiedPkJoinColumn = getJavaEntity().specifiedPrimaryKeyJoinColumns().next(); @@ -219,7 +219,7 @@ public class JavaPrimaryKeyJoinColumnTests extends ContextModelTestCase addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - PrimaryKeyJoinColumnAnnotation pkJoinColumnResource = (PrimaryKeyJoinColumnAnnotation) typeResource.getSupportingAnnotation(JPA.PRIMARY_KEY_JOIN_COLUMN); + PrimaryKeyJoinColumnAnnotation pkJoinColumnResource = (PrimaryKeyJoinColumnAnnotation) typeResource.getAnnotation(JPA.PRIMARY_KEY_JOIN_COLUMN); pkJoinColumnResource.setReferencedColumnName("FOO"); @@ -237,14 +237,14 @@ public class JavaPrimaryKeyJoinColumnTests extends ContextModelTestCase assertEquals("foo", specifiedPkJoinColumn.getSpecifiedReferencedColumnName()); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - PrimaryKeyJoinColumnAnnotation pkJoinColumn = (PrimaryKeyJoinColumnAnnotation) typeResource.getSupportingAnnotation(JPA.PRIMARY_KEY_JOIN_COLUMN); + PrimaryKeyJoinColumnAnnotation pkJoinColumn = (PrimaryKeyJoinColumnAnnotation) typeResource.getAnnotation(JPA.PRIMARY_KEY_JOIN_COLUMN); assertEquals("foo", pkJoinColumn.getReferencedColumnName()); specifiedPkJoinColumn.setSpecifiedName(null); specifiedPkJoinColumn.setSpecifiedReferencedColumnName(null); assertNull(specifiedPkJoinColumn.getSpecifiedReferencedColumnName()); - pkJoinColumn = (PrimaryKeyJoinColumnAnnotation) typeResource.getSupportingAnnotation(JPA.PRIMARY_KEY_JOIN_COLUMN); + pkJoinColumn = (PrimaryKeyJoinColumnAnnotation) typeResource.getAnnotation(JPA.PRIMARY_KEY_JOIN_COLUMN); assertNull(pkJoinColumn); } diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/JavaQueryHintTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/JavaQueryHintTests.java index 9fad86298f..ce4e4d1c25 100644 --- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/JavaQueryHintTests.java +++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/JavaQueryHintTests.java @@ -53,7 +53,7 @@ public class JavaQueryHintTests extends ContextModelTestCase QueryHint queryHint = entity.getQueryContainer().namedQueries().next().hints().next(); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - QueryHintAnnotation javaQueryHint = ((NamedQueryAnnotation) typeResource.getSupportingAnnotation(NamedQueryAnnotation.ANNOTATION_NAME)).hints().next(); + QueryHintAnnotation javaQueryHint = ((NamedQueryAnnotation) typeResource.getAnnotation(NamedQueryAnnotation.ANNOTATION_NAME)).hints().next(); assertNull(javaQueryHint.getName()); assertNull(queryHint.getName()); @@ -77,7 +77,7 @@ public class JavaQueryHintTests extends ContextModelTestCase QueryHint queryHint = entity.getQueryContainer().namedQueries().next().hints().next(); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - QueryHintAnnotation javaQueryhint = ((NamedQueryAnnotation) typeResource.getSupportingAnnotation(NamedQueryAnnotation.ANNOTATION_NAME)).hints().next(); + QueryHintAnnotation javaQueryhint = ((NamedQueryAnnotation) typeResource.getAnnotation(NamedQueryAnnotation.ANNOTATION_NAME)).hints().next(); assertNull(javaQueryhint.getName()); assertNull(queryHint.getName()); @@ -101,7 +101,7 @@ public class JavaQueryHintTests extends ContextModelTestCase QueryHint queryHint = entity.getQueryContainer().namedQueries().next().hints().next(); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - QueryHintAnnotation javaQueryhint = ((NamedQueryAnnotation) typeResource.getSupportingAnnotation(NamedQueryAnnotation.ANNOTATION_NAME)).hints().next(); + QueryHintAnnotation javaQueryhint = ((NamedQueryAnnotation) typeResource.getAnnotation(NamedQueryAnnotation.ANNOTATION_NAME)).hints().next(); assertNull(javaQueryhint.getValue()); assertNull(queryHint.getValue()); @@ -125,7 +125,7 @@ public class JavaQueryHintTests extends ContextModelTestCase QueryHint queryHint = entity.getQueryContainer().namedQueries().next().hints().next(); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - QueryHintAnnotation javaQueryhint = ((NamedQueryAnnotation) typeResource.getSupportingAnnotation(NamedQueryAnnotation.ANNOTATION_NAME)).hints().next(); + QueryHintAnnotation javaQueryhint = ((NamedQueryAnnotation) typeResource.getAnnotation(NamedQueryAnnotation.ANNOTATION_NAME)).hints().next(); assertNull(javaQueryhint.getValue()); assertNull(queryHint.getValue()); diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/JavaSecondaryTableTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/JavaSecondaryTableTests.java index 6df0ff16fa..34e6f7cea7 100644 --- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/JavaSecondaryTableTests.java +++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/JavaSecondaryTableTests.java @@ -108,7 +108,7 @@ public class JavaSecondaryTableTests extends ContextModelTestCase assertEquals("foo", getJavaEntity().secondaryTables().next().getSpecifiedName()); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - SecondaryTableAnnotation table = (SecondaryTableAnnotation) typeResource.getSupportingAnnotation(JPA.SECONDARY_TABLE); + SecondaryTableAnnotation table = (SecondaryTableAnnotation) typeResource.getAnnotation(JPA.SECONDARY_TABLE); assertEquals("foo", table.getName()); } @@ -123,7 +123,7 @@ public class JavaSecondaryTableTests extends ContextModelTestCase assertEquals(0, getJavaEntity().secondaryTablesSize()); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - assertNull(typeResource.getSupportingAnnotation(JPA.SECONDARY_TABLE)); + assertNull(typeResource.getAnnotation(JPA.SECONDARY_TABLE)); } public void testUpdateFromSpecifiedNameChangeInResourceModel() throws Exception { @@ -131,7 +131,7 @@ public class JavaSecondaryTableTests extends ContextModelTestCase addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - SecondaryTableAnnotation table = (SecondaryTableAnnotation) typeResource.getSupportingAnnotation(JPA.SECONDARY_TABLE); + SecondaryTableAnnotation table = (SecondaryTableAnnotation) typeResource.getAnnotation(JPA.SECONDARY_TABLE); table.setName("foo"); assertEquals("foo", getJavaEntity().secondaryTables().next().getSpecifiedName()); @@ -142,7 +142,7 @@ public class JavaSecondaryTableTests extends ContextModelTestCase addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - ListIterator<NestableAnnotation> secondaryTableResources = typeResource.supportingAnnotations(JPA.SECONDARY_TABLE, JPA.SECONDARY_TABLES); + Iterator<NestableAnnotation> secondaryTableResources = typeResource.annotations(JPA.SECONDARY_TABLE, JPA.SECONDARY_TABLES); ((SecondaryTableAnnotation) secondaryTableResources.next()).setCatalog("foo"); ((SecondaryTableAnnotation) secondaryTableResources.next()).setCatalog("bar"); @@ -156,7 +156,7 @@ public class JavaSecondaryTableTests extends ContextModelTestCase addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - ListIterator<NestableAnnotation> secondaryTableResources = typeResource.supportingAnnotations(JPA.SECONDARY_TABLE, JPA.SECONDARY_TABLES); + Iterator<NestableAnnotation> secondaryTableResources = typeResource.annotations(JPA.SECONDARY_TABLE, JPA.SECONDARY_TABLES); ((SecondaryTableAnnotation) secondaryTableResources.next()).setSchema("foo"); ((SecondaryTableAnnotation) secondaryTableResources.next()).setSchema("bar"); @@ -170,7 +170,7 @@ public class JavaSecondaryTableTests extends ContextModelTestCase addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - SecondaryTableAnnotation table = (SecondaryTableAnnotation) typeResource.getSupportingAnnotation(JPA.SECONDARY_TABLE); + SecondaryTableAnnotation table = (SecondaryTableAnnotation) typeResource.getAnnotation(JPA.SECONDARY_TABLE); table.setCatalog("myCatalog"); @@ -197,12 +197,12 @@ public class JavaSecondaryTableTests extends ContextModelTestCase table.setSpecifiedName(null); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - SecondaryTableAnnotation tableResource = (SecondaryTableAnnotation) typeResource.getSupportingAnnotation(JPA.SECONDARY_TABLE); + SecondaryTableAnnotation tableResource = (SecondaryTableAnnotation) typeResource.getAnnotation(JPA.SECONDARY_TABLE); assertEquals("myCatalog", tableResource.getCatalog()); table.setSpecifiedCatalog(null); - assertNull(typeResource.getSupportingAnnotation(JPA.SECONDARY_TABLE)); + assertNull(typeResource.getAnnotation(JPA.SECONDARY_TABLE)); } public void testGetSchema() throws Exception { @@ -210,7 +210,7 @@ public class JavaSecondaryTableTests extends ContextModelTestCase addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - SecondaryTableAnnotation tableResource = (SecondaryTableAnnotation) typeResource.getSupportingAnnotation(JPA.SECONDARY_TABLE); + SecondaryTableAnnotation tableResource = (SecondaryTableAnnotation) typeResource.getAnnotation(JPA.SECONDARY_TABLE); tableResource.setSchema("mySchema"); @@ -237,12 +237,12 @@ public class JavaSecondaryTableTests extends ContextModelTestCase table.setSpecifiedName(null); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - SecondaryTableAnnotation tableResource = (SecondaryTableAnnotation) typeResource.getSupportingAnnotation(JPA.SECONDARY_TABLE); + SecondaryTableAnnotation tableResource = (SecondaryTableAnnotation) typeResource.getAnnotation(JPA.SECONDARY_TABLE); assertEquals("mySchema", tableResource.getSchema()); table.setSpecifiedSchema(null); - assertNull(typeResource.getSupportingAnnotation(JPA.SECONDARY_TABLE)); + assertNull(typeResource.getAnnotation(JPA.SECONDARY_TABLE)); } public void testSpecifiedPrimaryKeyJoinColumns() throws Exception { @@ -255,7 +255,7 @@ public class JavaSecondaryTableTests extends ContextModelTestCase assertFalse(specifiedPkJoinColumns.hasNext()); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - SecondaryTableAnnotation tableResource = (SecondaryTableAnnotation) typeResource.getSupportingAnnotation(JPA.SECONDARY_TABLE); + SecondaryTableAnnotation tableResource = (SecondaryTableAnnotation) typeResource.getAnnotation(JPA.SECONDARY_TABLE); //add an annotation to the resource model and verify the context model is updated PrimaryKeyJoinColumnAnnotation pkJoinColumn = tableResource.addPkJoinColumn(0); @@ -369,7 +369,7 @@ public class JavaSecondaryTableTests extends ContextModelTestCase assertEquals("FOO", specifiedPkJoinColumns.next().getName()); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - SecondaryTableAnnotation tableResource = (SecondaryTableAnnotation) typeResource.getSupportingAnnotation(JPA.SECONDARY_TABLE); + SecondaryTableAnnotation tableResource = (SecondaryTableAnnotation) typeResource.getAnnotation(JPA.SECONDARY_TABLE); Iterator<PrimaryKeyJoinColumnAnnotation> pkJoinColumns = tableResource.pkJoinColumns(); assertEquals("BAZ", pkJoinColumns.next().getName()); @@ -394,7 +394,7 @@ public class JavaSecondaryTableTests extends ContextModelTestCase assertEquals("BAZ", specifiedPkJoinColumns.next().getName()); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - SecondaryTableAnnotation tableResource = (SecondaryTableAnnotation) typeResource.getSupportingAnnotation(JPA.SECONDARY_TABLE); + SecondaryTableAnnotation tableResource = (SecondaryTableAnnotation) typeResource.getAnnotation(JPA.SECONDARY_TABLE); Iterator<PrimaryKeyJoinColumnAnnotation> pkJoinColumns = tableResource.pkJoinColumns(); assertEquals("FOO", pkJoinColumns.next().getName()); @@ -413,7 +413,7 @@ public class JavaSecondaryTableTests extends ContextModelTestCase secondaryTable.addSpecifiedPrimaryKeyJoinColumn(2).setSpecifiedName("BAZ"); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - SecondaryTableAnnotation tableResource = (SecondaryTableAnnotation) typeResource.getSupportingAnnotation(JPA.SECONDARY_TABLE); + SecondaryTableAnnotation tableResource = (SecondaryTableAnnotation) typeResource.getAnnotation(JPA.SECONDARY_TABLE); assertEquals(3, tableResource.pkJoinColumnsSize()); @@ -464,7 +464,7 @@ public class JavaSecondaryTableTests extends ContextModelTestCase assertEquals("BAZ", specifiedPkJoinColumns.next().getName()); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - SecondaryTableAnnotation tableResource = (SecondaryTableAnnotation) typeResource.getSupportingAnnotation(JPA.SECONDARY_TABLE); + SecondaryTableAnnotation tableResource = (SecondaryTableAnnotation) typeResource.getAnnotation(JPA.SECONDARY_TABLE); Iterator<PrimaryKeyJoinColumnAnnotation> pkJoinColumns = tableResource.pkJoinColumns(); assertEquals("FOO", pkJoinColumns.next().getName()); @@ -535,7 +535,7 @@ public class JavaSecondaryTableTests extends ContextModelTestCase assertFalse(uniqueConstraints.hasNext()); JavaResourcePersistentType resourcePersistentType = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - SecondaryTableAnnotation secondaryTableAnnotation = (SecondaryTableAnnotation) resourcePersistentType.getSupportingAnnotation(JPA.SECONDARY_TABLE); + SecondaryTableAnnotation secondaryTableAnnotation = (SecondaryTableAnnotation) resourcePersistentType.getAnnotation(JPA.SECONDARY_TABLE); secondaryTableAnnotation.addUniqueConstraint(0).addColumnName(0, "foo"); secondaryTableAnnotation.addUniqueConstraint(0).addColumnName(0, "bar"); @@ -555,7 +555,7 @@ public class JavaSecondaryTableTests extends ContextModelTestCase assertEquals(0, secondaryTable.uniqueConstraintsSize()); JavaResourcePersistentType resourcePersistentType = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - SecondaryTableAnnotation secondaryTableAnnotation = (SecondaryTableAnnotation) resourcePersistentType.getSupportingAnnotation(JPA.SECONDARY_TABLE); + SecondaryTableAnnotation secondaryTableAnnotation = (SecondaryTableAnnotation) resourcePersistentType.getAnnotation(JPA.SECONDARY_TABLE); secondaryTableAnnotation.addUniqueConstraint(0).addColumnName(0, "foo"); secondaryTableAnnotation.addUniqueConstraint(1).addColumnName(0, "bar"); @@ -572,7 +572,7 @@ public class JavaSecondaryTableTests extends ContextModelTestCase secondaryTable.addUniqueConstraint(0).addColumnName(0, "BAZ"); JavaResourcePersistentType resourcePersistentType = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - SecondaryTableAnnotation secondaryTableAnnotation = (SecondaryTableAnnotation) resourcePersistentType.getSupportingAnnotation(JPA.SECONDARY_TABLE); + SecondaryTableAnnotation secondaryTableAnnotation = (SecondaryTableAnnotation) resourcePersistentType.getAnnotation(JPA.SECONDARY_TABLE); ListIterator<UniqueConstraintAnnotation> uniqueConstraints = secondaryTableAnnotation.uniqueConstraints(); assertEquals("BAZ", uniqueConstraints.next().columnNames().next()); @@ -591,7 +591,7 @@ public class JavaSecondaryTableTests extends ContextModelTestCase secondaryTable.addUniqueConstraint(0).addColumnName(0, "BAZ"); JavaResourcePersistentType resourcePersistentType = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - SecondaryTableAnnotation secondaryTableAnnotation = (SecondaryTableAnnotation) resourcePersistentType.getSupportingAnnotation(JPA.SECONDARY_TABLE); + SecondaryTableAnnotation secondaryTableAnnotation = (SecondaryTableAnnotation) resourcePersistentType.getAnnotation(JPA.SECONDARY_TABLE); ListIterator<UniqueConstraintAnnotation> uniqueConstraints = secondaryTableAnnotation.uniqueConstraints(); assertEquals("BAZ", uniqueConstraints.next().columnNames().next()); @@ -610,7 +610,7 @@ public class JavaSecondaryTableTests extends ContextModelTestCase secondaryTable.addUniqueConstraint(2).addColumnName(0, "BAZ"); JavaResourcePersistentType resourcePersistentType = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - SecondaryTableAnnotation secondaryTableAnnotation = (SecondaryTableAnnotation) resourcePersistentType.getSupportingAnnotation(JPA.SECONDARY_TABLE); + SecondaryTableAnnotation secondaryTableAnnotation = (SecondaryTableAnnotation) resourcePersistentType.getAnnotation(JPA.SECONDARY_TABLE); assertEquals(3, secondaryTableAnnotation.uniqueConstraintsSize()); @@ -654,7 +654,7 @@ public class JavaSecondaryTableTests extends ContextModelTestCase secondaryTable.addUniqueConstraint(2).addColumnName(0, "BAZ"); JavaResourcePersistentType resourcePersistentType = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - SecondaryTableAnnotation secondaryTableAnnotation = (SecondaryTableAnnotation) resourcePersistentType.getSupportingAnnotation(JPA.SECONDARY_TABLE); + SecondaryTableAnnotation secondaryTableAnnotation = (SecondaryTableAnnotation) resourcePersistentType.getAnnotation(JPA.SECONDARY_TABLE); assertEquals(3, secondaryTableAnnotation.uniqueConstraintsSize()); @@ -689,7 +689,7 @@ public class JavaSecondaryTableTests extends ContextModelTestCase SecondaryTable secondaryTable = getJavaEntity().specifiedSecondaryTables().next(); JavaResourcePersistentType resourcePersistentType = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - SecondaryTableAnnotation secondaryTableAnnotation = (SecondaryTableAnnotation) resourcePersistentType.getSupportingAnnotation(JPA.SECONDARY_TABLE); + SecondaryTableAnnotation secondaryTableAnnotation = (SecondaryTableAnnotation) resourcePersistentType.getAnnotation(JPA.SECONDARY_TABLE); secondaryTableAnnotation.addUniqueConstraint(0).addColumnName("FOO"); secondaryTableAnnotation.addUniqueConstraint(1).addColumnName("BAR"); diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/JavaSequenceGeneratorTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/JavaSequenceGeneratorTests.java index 5b4f09dab3..f758971830 100644 --- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/JavaSequenceGeneratorTests.java +++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/JavaSequenceGeneratorTests.java @@ -60,7 +60,7 @@ public class JavaSequenceGeneratorTests extends ContextModelTestCase //change resource model sequenceGenerator name, verify the context model is updated JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - SequenceGeneratorAnnotation sequenceGenerator = (SequenceGeneratorAnnotation) attributeResource.getSupportingAnnotation(JPA.SEQUENCE_GENERATOR); + SequenceGeneratorAnnotation sequenceGenerator = (SequenceGeneratorAnnotation) attributeResource.getAnnotation(JPA.SEQUENCE_GENERATOR); sequenceGenerator.setName("foo"); @@ -80,7 +80,7 @@ public class JavaSequenceGeneratorTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - SequenceGeneratorAnnotation sequenceGenerator = (SequenceGeneratorAnnotation) attributeResource.getSupportingAnnotation(JPA.SEQUENCE_GENERATOR); + SequenceGeneratorAnnotation sequenceGenerator = (SequenceGeneratorAnnotation) attributeResource.getAnnotation(JPA.SEQUENCE_GENERATOR); assertEquals("foo", sequenceGenerator.getName()); } @@ -98,7 +98,7 @@ public class JavaSequenceGeneratorTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - SequenceGeneratorAnnotation sequenceGenerator = (SequenceGeneratorAnnotation) attributeResource.getSupportingAnnotation(JPA.SEQUENCE_GENERATOR); + SequenceGeneratorAnnotation sequenceGenerator = (SequenceGeneratorAnnotation) attributeResource.getAnnotation(JPA.SEQUENCE_GENERATOR); assertNull(sequenceGenerator); } @@ -112,7 +112,7 @@ public class JavaSequenceGeneratorTests extends ContextModelTestCase assertEquals(SequenceGenerator.DEFAULT_INITIAL_VALUE, idMapping.getGeneratorContainer().getSequenceGenerator().getInitialValue()); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - SequenceGeneratorAnnotation sequenceGenerator = (SequenceGeneratorAnnotation) attributeResource.getSupportingAnnotation(JPA.SEQUENCE_GENERATOR); + SequenceGeneratorAnnotation sequenceGenerator = (SequenceGeneratorAnnotation) attributeResource.getAnnotation(JPA.SEQUENCE_GENERATOR); sequenceGenerator.setInitialValue(Integer.valueOf(82)); @@ -143,13 +143,13 @@ public class JavaSequenceGeneratorTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - SequenceGeneratorAnnotation sequenceGenerator = (SequenceGeneratorAnnotation) attributeResource.getSupportingAnnotation(JPA.SEQUENCE_GENERATOR); + SequenceGeneratorAnnotation sequenceGenerator = (SequenceGeneratorAnnotation) attributeResource.getAnnotation(JPA.SEQUENCE_GENERATOR); assertEquals(Integer.valueOf(20), sequenceGenerator.getInitialValue()); idMapping.getGeneratorContainer().getSequenceGenerator().setName(null); idMapping.getGeneratorContainer().getSequenceGenerator().setSpecifiedInitialValue(null); - assertNull(attributeResource.getSupportingAnnotation(JPA.SEQUENCE_GENERATOR)); + assertNull(attributeResource.getAnnotation(JPA.SEQUENCE_GENERATOR)); } public void testGetAllocationSize() throws Exception { @@ -162,7 +162,7 @@ public class JavaSequenceGeneratorTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - SequenceGeneratorAnnotation sequenceGenerator = (SequenceGeneratorAnnotation) attributeResource.getSupportingAnnotation(JPA.SEQUENCE_GENERATOR); + SequenceGeneratorAnnotation sequenceGenerator = (SequenceGeneratorAnnotation) attributeResource.getAnnotation(JPA.SEQUENCE_GENERATOR); sequenceGenerator.setAllocationSize(Integer.valueOf(20)); @@ -193,13 +193,13 @@ public class JavaSequenceGeneratorTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - SequenceGeneratorAnnotation sequenceGenerator = (SequenceGeneratorAnnotation) attributeResource.getSupportingAnnotation(JPA.SEQUENCE_GENERATOR); + SequenceGeneratorAnnotation sequenceGenerator = (SequenceGeneratorAnnotation) attributeResource.getAnnotation(JPA.SEQUENCE_GENERATOR); assertEquals(Integer.valueOf(25), sequenceGenerator.getAllocationSize()); idMapping.getGeneratorContainer().getSequenceGenerator().setName(null); idMapping.getGeneratorContainer().getSequenceGenerator().setSpecifiedAllocationSize(null); - assertNull(attributeResource.getSupportingAnnotation(JPA.SEQUENCE_GENERATOR)); + assertNull(attributeResource.getAnnotation(JPA.SEQUENCE_GENERATOR)); } @@ -213,7 +213,7 @@ public class JavaSequenceGeneratorTests extends ContextModelTestCase assertNull(idMapping.getGeneratorContainer().getSequenceGenerator().getSequenceName()); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - SequenceGeneratorAnnotation sequenceGenerator = (SequenceGeneratorAnnotation) attributeResource.getSupportingAnnotation(JPA.SEQUENCE_GENERATOR); + SequenceGeneratorAnnotation sequenceGenerator = (SequenceGeneratorAnnotation) attributeResource.getAnnotation(JPA.SEQUENCE_GENERATOR); sequenceGenerator.setSequenceName("mySequenceName"); @@ -244,13 +244,13 @@ public class JavaSequenceGeneratorTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - SequenceGeneratorAnnotation sequenceGenerator = (SequenceGeneratorAnnotation) attributeResource.getSupportingAnnotation(JPA.SEQUENCE_GENERATOR); + SequenceGeneratorAnnotation sequenceGenerator = (SequenceGeneratorAnnotation) attributeResource.getAnnotation(JPA.SEQUENCE_GENERATOR); assertEquals("mySequenceName", sequenceGenerator.getSequenceName()); idMapping.getGeneratorContainer().getSequenceGenerator().setName(null); idMapping.getGeneratorContainer().getSequenceGenerator().setSpecifiedSequenceName(null); - assertNull(attributeResource.getSupportingAnnotation(JPA.SEQUENCE_GENERATOR)); + assertNull(attributeResource.getAnnotation(JPA.SEQUENCE_GENERATOR)); } } diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/JavaTableGeneratorTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/JavaTableGeneratorTests.java index 7231ee7c23..1a1e8e1d8e 100644 --- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/JavaTableGeneratorTests.java +++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/JavaTableGeneratorTests.java @@ -69,7 +69,7 @@ public class JavaTableGeneratorTests extends ContextModelTestCase //change resource model tableGenerator name, verify the context model is updated JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - TableGeneratorAnnotation tableGenerator = (TableGeneratorAnnotation) attributeResource.getSupportingAnnotation(JPA.TABLE_GENERATOR); + TableGeneratorAnnotation tableGenerator = (TableGeneratorAnnotation) attributeResource.getAnnotation(JPA.TABLE_GENERATOR); tableGenerator.setName("foo"); @@ -89,7 +89,7 @@ public class JavaTableGeneratorTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - TableGeneratorAnnotation tableGenerator = (TableGeneratorAnnotation) attributeResource.getSupportingAnnotation(JPA.TABLE_GENERATOR); + TableGeneratorAnnotation tableGenerator = (TableGeneratorAnnotation) attributeResource.getAnnotation(JPA.TABLE_GENERATOR); assertEquals("foo", tableGenerator.getName()); } @@ -107,7 +107,7 @@ public class JavaTableGeneratorTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - TableGeneratorAnnotation tableGenerator = (TableGeneratorAnnotation) attributeResource.getSupportingAnnotation(JPA.TABLE_GENERATOR); + TableGeneratorAnnotation tableGenerator = (TableGeneratorAnnotation) attributeResource.getAnnotation(JPA.TABLE_GENERATOR); assertNull(tableGenerator); } @@ -121,7 +121,7 @@ public class JavaTableGeneratorTests extends ContextModelTestCase assertNull(idMapping.getGeneratorContainer().getTableGenerator().getCatalog()); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - TableGeneratorAnnotation tableGenerator = (TableGeneratorAnnotation) attributeResource.getSupportingAnnotation(JPA.TABLE_GENERATOR); + TableGeneratorAnnotation tableGenerator = (TableGeneratorAnnotation) attributeResource.getAnnotation(JPA.TABLE_GENERATOR); tableGenerator.setCatalog("myCatalog"); @@ -152,13 +152,13 @@ public class JavaTableGeneratorTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - TableGeneratorAnnotation tableGenerator = (TableGeneratorAnnotation) attributeResource.getSupportingAnnotation(JPA.TABLE_GENERATOR); + TableGeneratorAnnotation tableGenerator = (TableGeneratorAnnotation) attributeResource.getAnnotation(JPA.TABLE_GENERATOR); assertEquals("myCatalog", tableGenerator.getCatalog()); idMapping.getGeneratorContainer().getTableGenerator().setName(null); idMapping.getGeneratorContainer().getTableGenerator().setSpecifiedCatalog(null); - assertNull(attributeResource.getSupportingAnnotation(JPA.TABLE_GENERATOR)); + assertNull(attributeResource.getAnnotation(JPA.TABLE_GENERATOR)); } public void testGetSchema() throws Exception { @@ -170,7 +170,7 @@ public class JavaTableGeneratorTests extends ContextModelTestCase assertNull(idMapping.getGeneratorContainer().getTableGenerator().getSchema()); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - TableGeneratorAnnotation tableGenerator = (TableGeneratorAnnotation) attributeResource.getSupportingAnnotation(JPA.TABLE_GENERATOR); + TableGeneratorAnnotation tableGenerator = (TableGeneratorAnnotation) attributeResource.getAnnotation(JPA.TABLE_GENERATOR); tableGenerator.setSchema("mySchema"); @@ -229,13 +229,13 @@ public class JavaTableGeneratorTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - TableGeneratorAnnotation tableGenerator = (TableGeneratorAnnotation) attributeResource.getSupportingAnnotation(JPA.TABLE_GENERATOR); + TableGeneratorAnnotation tableGenerator = (TableGeneratorAnnotation) attributeResource.getAnnotation(JPA.TABLE_GENERATOR); assertEquals("mySchema", tableGenerator.getSchema()); idMapping.getGeneratorContainer().getTableGenerator().setName(null); idMapping.getGeneratorContainer().getTableGenerator().setSpecifiedSchema(null); - assertNull(attributeResource.getSupportingAnnotation(JPA.TABLE_GENERATOR)); + assertNull(attributeResource.getAnnotation(JPA.TABLE_GENERATOR)); } public void testGetPkColumnName() throws Exception { @@ -247,7 +247,7 @@ public class JavaTableGeneratorTests extends ContextModelTestCase assertNull(idMapping.getGeneratorContainer().getTableGenerator().getPkColumnName()); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - TableGeneratorAnnotation tableGenerator = (TableGeneratorAnnotation) attributeResource.getSupportingAnnotation(JPA.TABLE_GENERATOR); + TableGeneratorAnnotation tableGenerator = (TableGeneratorAnnotation) attributeResource.getAnnotation(JPA.TABLE_GENERATOR); tableGenerator.setPkColumnName("myPkColumnName"); @@ -278,13 +278,13 @@ public class JavaTableGeneratorTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - TableGeneratorAnnotation tableGenerator = (TableGeneratorAnnotation) attributeResource.getSupportingAnnotation(JPA.TABLE_GENERATOR); + TableGeneratorAnnotation tableGenerator = (TableGeneratorAnnotation) attributeResource.getAnnotation(JPA.TABLE_GENERATOR); assertEquals("myPkColumnName", tableGenerator.getPkColumnName()); idMapping.getGeneratorContainer().getTableGenerator().setName(null); idMapping.getGeneratorContainer().getTableGenerator().setSpecifiedPkColumnName(null); - assertNull(attributeResource.getSupportingAnnotation(JPA.TABLE_GENERATOR)); + assertNull(attributeResource.getAnnotation(JPA.TABLE_GENERATOR)); } public void testGetValueColumnName() throws Exception { @@ -296,7 +296,7 @@ public class JavaTableGeneratorTests extends ContextModelTestCase assertNull(idMapping.getGeneratorContainer().getTableGenerator().getValueColumnName()); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - TableGeneratorAnnotation tableGenerator = (TableGeneratorAnnotation) attributeResource.getSupportingAnnotation(JPA.TABLE_GENERATOR); + TableGeneratorAnnotation tableGenerator = (TableGeneratorAnnotation) attributeResource.getAnnotation(JPA.TABLE_GENERATOR); tableGenerator.setValueColumnName("myValueColumnName"); @@ -327,13 +327,13 @@ public class JavaTableGeneratorTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - TableGeneratorAnnotation tableGenerator = (TableGeneratorAnnotation) attributeResource.getSupportingAnnotation(JPA.TABLE_GENERATOR); + TableGeneratorAnnotation tableGenerator = (TableGeneratorAnnotation) attributeResource.getAnnotation(JPA.TABLE_GENERATOR); assertEquals("myValueColumnName", tableGenerator.getValueColumnName()); idMapping.getGeneratorContainer().getTableGenerator().setName(null); idMapping.getGeneratorContainer().getTableGenerator().setSpecifiedValueColumnName(null); - assertNull(attributeResource.getSupportingAnnotation(JPA.TABLE_GENERATOR)); + assertNull(attributeResource.getAnnotation(JPA.TABLE_GENERATOR)); } public void testGetPkColumnValue() throws Exception { @@ -345,7 +345,7 @@ public class JavaTableGeneratorTests extends ContextModelTestCase assertNull(idMapping.getGeneratorContainer().getTableGenerator().getPkColumnValue()); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - TableGeneratorAnnotation tableGenerator = (TableGeneratorAnnotation) attributeResource.getSupportingAnnotation(JPA.TABLE_GENERATOR); + TableGeneratorAnnotation tableGenerator = (TableGeneratorAnnotation) attributeResource.getAnnotation(JPA.TABLE_GENERATOR); tableGenerator.setPkColumnValue("myPkColumnValue"); @@ -376,13 +376,13 @@ public class JavaTableGeneratorTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - TableGeneratorAnnotation tableGenerator = (TableGeneratorAnnotation) attributeResource.getSupportingAnnotation(JPA.TABLE_GENERATOR); + TableGeneratorAnnotation tableGenerator = (TableGeneratorAnnotation) attributeResource.getAnnotation(JPA.TABLE_GENERATOR); assertEquals("myPkColumnValue", tableGenerator.getPkColumnValue()); idMapping.getGeneratorContainer().getTableGenerator().setName(null); idMapping.getGeneratorContainer().getTableGenerator().setSpecifiedPkColumnValue(null); - assertNull(attributeResource.getSupportingAnnotation(JPA.TABLE_GENERATOR)); + assertNull(attributeResource.getAnnotation(JPA.TABLE_GENERATOR)); } public void testGetInitialValue() throws Exception { @@ -394,7 +394,7 @@ public class JavaTableGeneratorTests extends ContextModelTestCase assertEquals(TableGenerator.DEFAULT_INITIAL_VALUE, idMapping.getGeneratorContainer().getTableGenerator().getInitialValue()); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - TableGeneratorAnnotation tableGenerator = (TableGeneratorAnnotation) attributeResource.getSupportingAnnotation(JPA.TABLE_GENERATOR); + TableGeneratorAnnotation tableGenerator = (TableGeneratorAnnotation) attributeResource.getAnnotation(JPA.TABLE_GENERATOR); tableGenerator.setInitialValue(Integer.valueOf(82)); @@ -425,13 +425,13 @@ public class JavaTableGeneratorTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - TableGeneratorAnnotation tableGenerator = (TableGeneratorAnnotation) attributeResource.getSupportingAnnotation(JPA.TABLE_GENERATOR); + TableGeneratorAnnotation tableGenerator = (TableGeneratorAnnotation) attributeResource.getAnnotation(JPA.TABLE_GENERATOR); assertEquals(Integer.valueOf(20), tableGenerator.getInitialValue()); idMapping.getGeneratorContainer().getTableGenerator().setName(null); idMapping.getGeneratorContainer().getTableGenerator().setSpecifiedInitialValue(null); - assertNull(attributeResource.getSupportingAnnotation(JPA.TABLE_GENERATOR)); + assertNull(attributeResource.getAnnotation(JPA.TABLE_GENERATOR)); } public void testGetAllocationSize() throws Exception { @@ -444,7 +444,7 @@ public class JavaTableGeneratorTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - TableGeneratorAnnotation tableGenerator = (TableGeneratorAnnotation) attributeResource.getSupportingAnnotation(JPA.TABLE_GENERATOR); + TableGeneratorAnnotation tableGenerator = (TableGeneratorAnnotation) attributeResource.getAnnotation(JPA.TABLE_GENERATOR); tableGenerator.setAllocationSize(Integer.valueOf(20)); @@ -475,13 +475,13 @@ public class JavaTableGeneratorTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - TableGeneratorAnnotation tableGenerator = (TableGeneratorAnnotation) attributeResource.getSupportingAnnotation(JPA.TABLE_GENERATOR); + TableGeneratorAnnotation tableGenerator = (TableGeneratorAnnotation) attributeResource.getAnnotation(JPA.TABLE_GENERATOR); assertEquals(Integer.valueOf(25), tableGenerator.getAllocationSize()); idMapping.getGeneratorContainer().getTableGenerator().setName(null); idMapping.getGeneratorContainer().getTableGenerator().setSpecifiedAllocationSize(null); - assertNull(attributeResource.getSupportingAnnotation(JPA.TABLE_GENERATOR)); + assertNull(attributeResource.getAnnotation(JPA.TABLE_GENERATOR)); } @@ -496,7 +496,7 @@ public class JavaTableGeneratorTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - TableGeneratorAnnotation tableGeneratorAnnotation = (TableGeneratorAnnotation) attributeResource.getSupportingAnnotation(JPA.TABLE_GENERATOR); + TableGeneratorAnnotation tableGeneratorAnnotation = (TableGeneratorAnnotation) attributeResource.getAnnotation(JPA.TABLE_GENERATOR); tableGeneratorAnnotation.addUniqueConstraint(0).addColumnName(0, "foo"); tableGeneratorAnnotation.addUniqueConstraint(0).addColumnName(0, "bar"); @@ -517,7 +517,7 @@ public class JavaTableGeneratorTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - TableGeneratorAnnotation tableGeneratorAnnotation = (TableGeneratorAnnotation) attributeResource.getSupportingAnnotation(JPA.TABLE_GENERATOR); + TableGeneratorAnnotation tableGeneratorAnnotation = (TableGeneratorAnnotation) attributeResource.getAnnotation(JPA.TABLE_GENERATOR); tableGeneratorAnnotation.addUniqueConstraint(0).addColumnName(0, "foo"); tableGeneratorAnnotation.addUniqueConstraint(1).addColumnName(0, "bar"); @@ -535,7 +535,7 @@ public class JavaTableGeneratorTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - TableGeneratorAnnotation tableGeneratorAnnotation = (TableGeneratorAnnotation) attributeResource.getSupportingAnnotation(JPA.TABLE_GENERATOR); + TableGeneratorAnnotation tableGeneratorAnnotation = (TableGeneratorAnnotation) attributeResource.getAnnotation(JPA.TABLE_GENERATOR); ListIterator<UniqueConstraintAnnotation> uniqueConstraints = tableGeneratorAnnotation.uniqueConstraints(); assertEquals("BAZ", uniqueConstraints.next().columnNames().next()); @@ -555,7 +555,7 @@ public class JavaTableGeneratorTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - TableGeneratorAnnotation tableGeneratorAnnotation = (TableGeneratorAnnotation) attributeResource.getSupportingAnnotation(JPA.TABLE_GENERATOR); + TableGeneratorAnnotation tableGeneratorAnnotation = (TableGeneratorAnnotation) attributeResource.getAnnotation(JPA.TABLE_GENERATOR); ListIterator<UniqueConstraintAnnotation> uniqueConstraints = tableGeneratorAnnotation.uniqueConstraints(); assertEquals("BAZ", uniqueConstraints.next().columnNames().next()); @@ -575,7 +575,7 @@ public class JavaTableGeneratorTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - TableGeneratorAnnotation tableGeneratorAnnotation = (TableGeneratorAnnotation) attributeResource.getSupportingAnnotation(JPA.TABLE_GENERATOR); + TableGeneratorAnnotation tableGeneratorAnnotation = (TableGeneratorAnnotation) attributeResource.getAnnotation(JPA.TABLE_GENERATOR); assertEquals(3, tableGeneratorAnnotation.uniqueConstraintsSize()); @@ -620,7 +620,7 @@ public class JavaTableGeneratorTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - TableGeneratorAnnotation tableGeneratorAnnotation = (TableGeneratorAnnotation) attributeResource.getSupportingAnnotation(JPA.TABLE_GENERATOR); + TableGeneratorAnnotation tableGeneratorAnnotation = (TableGeneratorAnnotation) attributeResource.getAnnotation(JPA.TABLE_GENERATOR); assertEquals(3, tableGeneratorAnnotation.uniqueConstraintsSize()); @@ -656,7 +656,7 @@ public class JavaTableGeneratorTests extends ContextModelTestCase TableGenerator tableGenerator = ((IdMapping) getJavaPersistentType().getAttributeNamed("id").getMapping()).getGeneratorContainer().getTableGenerator(); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - TableGeneratorAnnotation tableGeneratorAnnotation = (TableGeneratorAnnotation) attributeResource.getSupportingAnnotation(JPA.TABLE_GENERATOR); + TableGeneratorAnnotation tableGeneratorAnnotation = (TableGeneratorAnnotation) attributeResource.getAnnotation(JPA.TABLE_GENERATOR); tableGeneratorAnnotation.addUniqueConstraint(0).addColumnName("FOO"); tableGeneratorAnnotation.addUniqueConstraint(1).addColumnName("BAR"); diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/JavaTableTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/JavaTableTests.java index f972a4f2be..262e40d131 100644 --- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/JavaTableTests.java +++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/JavaTableTests.java @@ -215,7 +215,7 @@ public class JavaTableTests extends ContextModelTestCase assertEquals("foo", getJavaEntity().getTable().getSpecifiedName()); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - TableAnnotation table = (TableAnnotation) typeResource.getSupportingAnnotation(JPA.TABLE); + TableAnnotation table = (TableAnnotation) typeResource.getAnnotation(JPA.TABLE); assertEquals("foo", table.getName()); } @@ -229,7 +229,7 @@ public class JavaTableTests extends ContextModelTestCase assertNull(getJavaEntity().getTable().getSpecifiedName()); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - TableAnnotation table = (TableAnnotation) typeResource.getSupportingAnnotation(JPA.TABLE); + TableAnnotation table = (TableAnnotation) typeResource.getAnnotation(JPA.TABLE); assertNull(table); } @@ -239,12 +239,12 @@ public class JavaTableTests extends ContextModelTestCase addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - TableAnnotation table = (TableAnnotation) typeResource.getSupportingAnnotation(JPA.TABLE); + TableAnnotation table = (TableAnnotation) typeResource.getAnnotation(JPA.TABLE); table.setName("foo"); assertEquals("foo", getJavaEntity().getTable().getSpecifiedName()); - typeResource.removeSupportingAnnotation(JPA.TABLE); + typeResource.removeAnnotation(JPA.TABLE); assertNull(getJavaEntity().getTable().getSpecifiedName()); } @@ -253,7 +253,7 @@ public class JavaTableTests extends ContextModelTestCase addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - TableAnnotation table = (TableAnnotation) typeResource.getSupportingAnnotation(JPA.TABLE); + TableAnnotation table = (TableAnnotation) typeResource.getAnnotation(JPA.TABLE); table.setCatalog("myCatalog"); @@ -316,12 +316,12 @@ public class JavaTableTests extends ContextModelTestCase table.setSpecifiedCatalog("myCatalog"); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - TableAnnotation tableResource = (TableAnnotation) typeResource.getSupportingAnnotation(JPA.TABLE); + TableAnnotation tableResource = (TableAnnotation) typeResource.getAnnotation(JPA.TABLE); assertEquals("myCatalog", tableResource.getCatalog()); table.setSpecifiedCatalog(null); - assertNull(typeResource.getSupportingAnnotation(JPA.TABLE)); + assertNull(typeResource.getAnnotation(JPA.TABLE)); } public void testGetSchema() throws Exception { @@ -329,7 +329,7 @@ public class JavaTableTests extends ContextModelTestCase addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - TableAnnotation table = (TableAnnotation) typeResource.getSupportingAnnotation(JPA.TABLE); + TableAnnotation table = (TableAnnotation) typeResource.getAnnotation(JPA.TABLE); table.setSchema("mySchema"); @@ -355,12 +355,12 @@ public class JavaTableTests extends ContextModelTestCase table.setSpecifiedSchema("mySchema"); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - TableAnnotation tableResource = (TableAnnotation) typeResource.getSupportingAnnotation(JPA.TABLE); + TableAnnotation tableResource = (TableAnnotation) typeResource.getAnnotation(JPA.TABLE); assertEquals("mySchema", tableResource.getSchema()); table.setSpecifiedSchema(null); - assertNull(typeResource.getSupportingAnnotation(JPA.TABLE)); + assertNull(typeResource.getAnnotation(JPA.TABLE)); } public void testUniqueConstraints() throws Exception { @@ -371,7 +371,7 @@ public class JavaTableTests extends ContextModelTestCase assertFalse(uniqueConstraints.hasNext()); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - TableAnnotation tableAnnotation = (TableAnnotation) typeResource.getSupportingAnnotation(JPA.TABLE); + TableAnnotation tableAnnotation = (TableAnnotation) typeResource.getAnnotation(JPA.TABLE); tableAnnotation.addUniqueConstraint(0).addColumnName(0, "foo"); tableAnnotation.addUniqueConstraint(0).addColumnName(0, "bar"); @@ -389,7 +389,7 @@ public class JavaTableTests extends ContextModelTestCase assertEquals(0, getJavaEntity().getTable().uniqueConstraintsSize()); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - TableAnnotation tableAnnotation = (TableAnnotation) typeResource.getSupportingAnnotation(JPA.TABLE); + TableAnnotation tableAnnotation = (TableAnnotation) typeResource.getAnnotation(JPA.TABLE); tableAnnotation.addUniqueConstraint(0).addColumnName(0, "foo"); tableAnnotation.addUniqueConstraint(1).addColumnName(0, "bar"); @@ -406,7 +406,7 @@ public class JavaTableTests extends ContextModelTestCase table.addUniqueConstraint(0).addColumnName(0, "BAZ"); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - TableAnnotation tableAnnotation = (TableAnnotation) typeResource.getSupportingAnnotation(JPA.TABLE); + TableAnnotation tableAnnotation = (TableAnnotation) typeResource.getAnnotation(JPA.TABLE); ListIterator<UniqueConstraintAnnotation> uniqueConstraints = tableAnnotation.uniqueConstraints(); assertEquals("BAZ", uniqueConstraints.next().columnNames().next()); @@ -425,7 +425,7 @@ public class JavaTableTests extends ContextModelTestCase table.addUniqueConstraint(0).addColumnName(0, "BAZ"); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - TableAnnotation tableAnnotation = (TableAnnotation) typeResource.getSupportingAnnotation(JPA.TABLE); + TableAnnotation tableAnnotation = (TableAnnotation) typeResource.getAnnotation(JPA.TABLE); ListIterator<UniqueConstraintAnnotation> uniqueConstraints = tableAnnotation.uniqueConstraints(); assertEquals("BAZ", uniqueConstraints.next().columnNames().next()); @@ -444,7 +444,7 @@ public class JavaTableTests extends ContextModelTestCase table.addUniqueConstraint(2).addColumnName(0, "BAZ"); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - TableAnnotation tableAnnotation = (TableAnnotation) typeResource.getSupportingAnnotation(JPA.TABLE); + TableAnnotation tableAnnotation = (TableAnnotation) typeResource.getAnnotation(JPA.TABLE); assertEquals(3, tableAnnotation.uniqueConstraintsSize()); @@ -488,7 +488,7 @@ public class JavaTableTests extends ContextModelTestCase table.addUniqueConstraint(2).addColumnName(0, "BAZ"); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - TableAnnotation tableAnnotation = (TableAnnotation) typeResource.getSupportingAnnotation(JPA.TABLE); + TableAnnotation tableAnnotation = (TableAnnotation) typeResource.getAnnotation(JPA.TABLE); assertEquals(3, tableAnnotation.uniqueConstraintsSize()); @@ -523,7 +523,7 @@ public class JavaTableTests extends ContextModelTestCase Table table = getJavaEntity().getTable(); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - TableAnnotation tableAnnotation = (TableAnnotation) typeResource.getSupportingAnnotation(JPA.TABLE); + TableAnnotation tableAnnotation = (TableAnnotation) typeResource.getAnnotation(JPA.TABLE); tableAnnotation.addUniqueConstraint(0).addColumnName("FOO"); tableAnnotation.addUniqueConstraint(1).addColumnName("BAR"); diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/JavaTransientMappingTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/JavaTransientMappingTests.java index 6f2ca904a6..94e013b467 100644 --- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/JavaTransientMappingTests.java +++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/JavaTransientMappingTests.java @@ -78,8 +78,8 @@ public class JavaTransientMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - assertNull(attributeResource.getMappingAnnotation(TransientAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getMappingAnnotation(BasicAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(TransientAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getAnnotation(BasicAnnotation.ANNOTATION_NAME)); } public void testMorphToDefault() throws Exception { @@ -96,7 +96,7 @@ public class JavaTransientMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - assertNull(attributeResource.getMappingAnnotation(TransientAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(TransientAnnotation.ANNOTATION_NAME)); } public void testMorphToVersionMapping() throws Exception { @@ -112,8 +112,8 @@ public class JavaTransientMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - assertNull(attributeResource.getMappingAnnotation(TransientAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getMappingAnnotation(VersionAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(TransientAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getAnnotation(VersionAnnotation.ANNOTATION_NAME)); } public void testMorphToEmbeddedMapping() throws Exception { @@ -129,8 +129,8 @@ public class JavaTransientMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - assertNull(attributeResource.getMappingAnnotation(TransientAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getMappingAnnotation(EmbeddedAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(TransientAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getAnnotation(EmbeddedAnnotation.ANNOTATION_NAME)); } public void testMorphToIdMapping() throws Exception { @@ -146,8 +146,8 @@ public class JavaTransientMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - assertNull(attributeResource.getMappingAnnotation(TransientAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getMappingAnnotation(IdAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(TransientAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getAnnotation(IdAnnotation.ANNOTATION_NAME)); } public void testMorphToEmbeddedIdMapping() throws Exception { @@ -163,8 +163,8 @@ public class JavaTransientMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - assertNull(attributeResource.getMappingAnnotation(TransientAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getMappingAnnotation(EmbeddedIdAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(TransientAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getAnnotation(EmbeddedIdAnnotation.ANNOTATION_NAME)); } public void testMorphToOneToOneMapping() throws Exception { @@ -180,8 +180,8 @@ public class JavaTransientMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - assertNull(attributeResource.getMappingAnnotation(TransientAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getMappingAnnotation(OneToOneAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(TransientAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getAnnotation(OneToOneAnnotation.ANNOTATION_NAME)); } public void testMorphToOneToManyMapping() throws Exception { @@ -197,8 +197,8 @@ public class JavaTransientMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - assertNull(attributeResource.getMappingAnnotation(TransientAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getMappingAnnotation(OneToManyAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(TransientAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getAnnotation(OneToManyAnnotation.ANNOTATION_NAME)); } public void testMorphToManyToOneMapping() throws Exception { @@ -214,8 +214,8 @@ public class JavaTransientMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - assertNull(attributeResource.getMappingAnnotation(TransientAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getMappingAnnotation(ManyToOneAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(TransientAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getAnnotation(ManyToOneAnnotation.ANNOTATION_NAME)); } public void testMorphToManyToManyMapping() throws Exception { @@ -231,8 +231,8 @@ public class JavaTransientMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - assertNull(attributeResource.getMappingAnnotation(TransientAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getMappingAnnotation(ManyToManyAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(TransientAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getAnnotation(ManyToManyAnnotation.ANNOTATION_NAME)); } public void testTransientMapping() throws Exception { diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/JavaVersionMappingTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/JavaVersionMappingTests.java index a8b6f2cce9..edbb6cb7ee 100644 --- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/JavaVersionMappingTests.java +++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/JavaVersionMappingTests.java @@ -105,10 +105,10 @@ public class JavaVersionMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - assertNull(attributeResource.getMappingAnnotation(VersionAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getMappingAnnotation(BasicAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getSupportingAnnotation(ColumnAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getSupportingAnnotation(TemporalAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(VersionAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getAnnotation(BasicAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getAnnotation(ColumnAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getAnnotation(TemporalAnnotation.ANNOTATION_NAME)); } public void testMorphToDefault() throws Exception { @@ -129,9 +129,9 @@ public class JavaVersionMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - assertNull(attributeResource.getMappingAnnotation(VersionAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getSupportingAnnotation(ColumnAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getSupportingAnnotation(TemporalAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(VersionAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getAnnotation(ColumnAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getAnnotation(TemporalAnnotation.ANNOTATION_NAME)); } public void testMorphToIdMapping() throws Exception { @@ -152,10 +152,10 @@ public class JavaVersionMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - assertNull(attributeResource.getMappingAnnotation(VersionAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getMappingAnnotation(IdAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getSupportingAnnotation(ColumnAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getSupportingAnnotation(TemporalAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(VersionAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getAnnotation(IdAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getAnnotation(ColumnAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getAnnotation(TemporalAnnotation.ANNOTATION_NAME)); } public void testMorphToEmbeddedMapping() throws Exception { @@ -175,10 +175,10 @@ public class JavaVersionMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - assertNull(attributeResource.getMappingAnnotation(VersionAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getMappingAnnotation(EmbeddedAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getSupportingAnnotation(ColumnAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getSupportingAnnotation(TemporalAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(VersionAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getAnnotation(EmbeddedAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(ColumnAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(TemporalAnnotation.ANNOTATION_NAME)); } public void testMorphToTransientMapping() throws Exception { @@ -198,10 +198,10 @@ public class JavaVersionMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - assertNull(attributeResource.getMappingAnnotation(VersionAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getMappingAnnotation(TransientAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getSupportingAnnotation(ColumnAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getSupportingAnnotation(TemporalAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(VersionAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getAnnotation(TransientAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(ColumnAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(TemporalAnnotation.ANNOTATION_NAME)); } public void testMorphToEmbeddedIdMapping() throws Exception { @@ -221,10 +221,10 @@ public class JavaVersionMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - assertNull(attributeResource.getMappingAnnotation(VersionAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getMappingAnnotation(EmbeddedIdAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getSupportingAnnotation(ColumnAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getSupportingAnnotation(TemporalAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(VersionAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getAnnotation(EmbeddedIdAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(ColumnAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(TemporalAnnotation.ANNOTATION_NAME)); } public void testMorphToOneToOneMapping() throws Exception { @@ -244,10 +244,10 @@ public class JavaVersionMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - assertNull(attributeResource.getMappingAnnotation(VersionAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getMappingAnnotation(OneToOneAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getSupportingAnnotation(ColumnAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getSupportingAnnotation(TemporalAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(VersionAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getAnnotation(OneToOneAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(ColumnAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(TemporalAnnotation.ANNOTATION_NAME)); } public void testMorphToOneToManyMapping() throws Exception { @@ -267,10 +267,10 @@ public class JavaVersionMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - assertNull(attributeResource.getMappingAnnotation(VersionAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getMappingAnnotation(OneToManyAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getSupportingAnnotation(ColumnAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getSupportingAnnotation(TemporalAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(VersionAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getAnnotation(OneToManyAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(ColumnAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(TemporalAnnotation.ANNOTATION_NAME)); } public void testMorphToManyToOneMapping() throws Exception { @@ -290,10 +290,10 @@ public class JavaVersionMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - assertNull(attributeResource.getMappingAnnotation(VersionAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getMappingAnnotation(ManyToOneAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getSupportingAnnotation(ColumnAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getSupportingAnnotation(TemporalAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(VersionAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getAnnotation(ManyToOneAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(ColumnAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(TemporalAnnotation.ANNOTATION_NAME)); } public void testMorphToManyToManyMapping() throws Exception { @@ -313,10 +313,10 @@ public class JavaVersionMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - assertNull(attributeResource.getMappingAnnotation(VersionAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getMappingAnnotation(ManyToManyAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getSupportingAnnotation(ColumnAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getSupportingAnnotation(TemporalAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(VersionAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getAnnotation(ManyToManyAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(ColumnAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(TemporalAnnotation.ANNOTATION_NAME)); } @@ -343,12 +343,12 @@ public class JavaVersionMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - TemporalAnnotation temporal = (TemporalAnnotation) attributeResource.getSupportingAnnotation(TemporalAnnotation.ANNOTATION_NAME); + TemporalAnnotation temporal = (TemporalAnnotation) attributeResource.getAnnotation(TemporalAnnotation.ANNOTATION_NAME); assertEquals(org.eclipse.jpt.core.resource.java.TemporalType.TIME, temporal.getValue()); versionMapping.setSpecifiedConverter(null); - assertNull(attributeResource.getSupportingAnnotation(TemporalAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(TemporalAnnotation.ANNOTATION_NAME)); } public void testGetTemporalUpdatesFromResourceModelChange() throws Exception { @@ -363,12 +363,12 @@ public class JavaVersionMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - TemporalAnnotation temporal = (TemporalAnnotation) attributeResource.addSupportingAnnotation(TemporalAnnotation.ANNOTATION_NAME); + TemporalAnnotation temporal = (TemporalAnnotation) attributeResource.addAnnotation(TemporalAnnotation.ANNOTATION_NAME); temporal.setValue(org.eclipse.jpt.core.resource.java.TemporalType.DATE); assertEquals(TemporalType.DATE, ((TemporalConverter) versionMapping.getConverter()).getTemporalType()); - attributeResource.removeSupportingAnnotation(TemporalAnnotation.ANNOTATION_NAME); + attributeResource.removeAnnotation(TemporalAnnotation.ANNOTATION_NAME); assertEquals(Converter.NO_CONVERTER, versionMapping.getConverter().getType()); assertFalse(versionMapping.isDefault()); @@ -387,12 +387,11 @@ public class JavaVersionMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - ColumnAnnotation column = (ColumnAnnotation) attributeResource.addSupportingAnnotation(JPA.COLUMN); + ColumnAnnotation column = (ColumnAnnotation) attributeResource.addAnnotation(JPA.COLUMN); column.setName("foo"); assertEquals("foo", versionMapping.getColumn().getSpecifiedName()); assertEquals("foo", versionMapping.getColumn().getName()); assertEquals("id", versionMapping.getColumn().getDefaultName()); } - } diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/jpa2/context/java/Generic2_0JavaAssociationOverrideTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/jpa2/context/java/Generic2_0JavaAssociationOverrideTests.java index 520f087f04..4c355cdc4c 100644 --- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/jpa2/context/java/Generic2_0JavaAssociationOverrideTests.java +++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/jpa2/context/java/Generic2_0JavaAssociationOverrideTests.java @@ -131,7 +131,7 @@ public class Generic2_0JavaAssociationOverrideTests extends Generic2_0ContextMod javaAssociationOverride = javaAssociationOverride.setVirtual(false); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(PACKAGE_NAME + ".AnnotationTestTypeChild"); - AssociationOverrideAnnotation associationOverrideResource = (AssociationOverrideAnnotation) typeResource.getSupportingAnnotation(JPA.ASSOCIATION_OVERRIDE); + AssociationOverrideAnnotation associationOverrideResource = (AssociationOverrideAnnotation) typeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDE); assertEquals("address", javaAssociationOverride.getName()); assertEquals("address", associationOverrideResource.getName()); @@ -151,9 +151,9 @@ public class Generic2_0JavaAssociationOverrideTests extends Generic2_0ContextMod assertEquals("FOO", javaAssociationOverride.getName()); assertEquals("FOO", associationOverrideResource.getName()); - typeResource.removeSupportingAnnotation(0, JPA.ASSOCIATION_OVERRIDE, JPA.ASSOCIATION_OVERRIDES); + typeResource.removeAnnotation(0, JPA.ASSOCIATION_OVERRIDE, JPA.ASSOCIATION_OVERRIDES); assertFalse(getJavaEntity().specifiedAssociationOverrides().hasNext()); - assertFalse(typeResource.supportingAnnotations(JPA.ASSOCIATION_OVERRIDE, JPA.ASSOCIATION_OVERRIDES).hasNext()); + assertFalse(typeResource.annotations(JPA.ASSOCIATION_OVERRIDE, JPA.ASSOCIATION_OVERRIDES).hasNext()); } public void testModifyName() throws Exception { @@ -167,7 +167,7 @@ public class Generic2_0JavaAssociationOverrideTests extends Generic2_0ContextMod javaAssociationOverride = javaAssociationOverride.setVirtual(false); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(PACKAGE_NAME + ".AnnotationTestTypeChild"); - AssociationOverrideAnnotation associationOverrideResource = (AssociationOverrideAnnotation) typeResource.getSupportingAnnotation(JPA.ASSOCIATION_OVERRIDE); + AssociationOverrideAnnotation associationOverrideResource = (AssociationOverrideAnnotation) typeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDE); assertEquals("address", javaAssociationOverride.getName()); assertEquals("address", associationOverrideResource.getName()); @@ -181,7 +181,7 @@ public class Generic2_0JavaAssociationOverrideTests extends Generic2_0ContextMod //set name to null in the context model javaAssociationOverride.setName(null); assertNull(javaAssociationOverride.getName()); - associationOverrideResource = (AssociationOverrideAnnotation) typeResource.getSupportingAnnotation(JPA.ASSOCIATION_OVERRIDE); + associationOverrideResource = (AssociationOverrideAnnotation) typeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDE); assertNull(associationOverrideResource.getName()); } @@ -198,7 +198,7 @@ public class Generic2_0JavaAssociationOverrideTests extends Generic2_0ContextMod JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(PACKAGE_NAME + ".AnnotationTestTypeChild"); - AssociationOverrideAnnotation associationOverrideResource = (AssociationOverrideAnnotation) typeResource.getSupportingAnnotation(JPA.ASSOCIATION_OVERRIDE); + AssociationOverrideAnnotation associationOverrideResource = (AssociationOverrideAnnotation) typeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDE); JoinColumn joinColumn = joiningStrategy.addSpecifiedJoinColumn(0); @@ -242,7 +242,7 @@ public class Generic2_0JavaAssociationOverrideTests extends Generic2_0ContextMod JoinColumnJoiningStrategy joiningStrategy = javaAssociationOverride.getRelationshipReference().getJoinColumnJoiningStrategy(); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(PACKAGE_NAME + ".AnnotationTestTypeChild"); - AssociationOverrideAnnotation associationOverrideResource = (AssociationOverrideAnnotation) typeResource.getSupportingAnnotation(JPA.ASSOCIATION_OVERRIDE); + AssociationOverrideAnnotation associationOverrideResource = (AssociationOverrideAnnotation) typeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDE); assertEquals(1, associationOverrideResource.joinColumnsSize()); @@ -280,7 +280,7 @@ public class Generic2_0JavaAssociationOverrideTests extends Generic2_0ContextMod JoinColumnJoiningStrategy joiningStrategy = javaAssociationOverride.getRelationshipReference().getJoinColumnJoiningStrategy(); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(PACKAGE_NAME + ".AnnotationTestTypeChild"); - AssociationOverrideAnnotation associationOverrideResource = (AssociationOverrideAnnotation) typeResource.getSupportingAnnotation(JPA.ASSOCIATION_OVERRIDE); + AssociationOverrideAnnotation associationOverrideResource = (AssociationOverrideAnnotation) typeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDE); joiningStrategy.addSpecifiedJoinColumn(0).setSpecifiedName("FOO"); joiningStrategy.addSpecifiedJoinColumn(1).setSpecifiedName("BAR"); @@ -323,7 +323,7 @@ public class Generic2_0JavaAssociationOverrideTests extends Generic2_0ContextMod JavaJoinColumnJoiningStrategy joiningStrategy = javaAssociationOverride.getRelationshipReference().getJoinColumnJoiningStrategy(); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(PACKAGE_NAME + ".AnnotationTestTypeChild"); - AssociationOverrideAnnotation associationOverrideResource = (AssociationOverrideAnnotation) typeResource.getSupportingAnnotation(JPA.ASSOCIATION_OVERRIDE); + AssociationOverrideAnnotation associationOverrideResource = (AssociationOverrideAnnotation) typeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDE); ListIterator<JavaJoinColumn> joinColumns = joiningStrategy.specifiedJoinColumns(); JoinColumn joinColumn = joinColumns.next(); @@ -391,7 +391,7 @@ public class Generic2_0JavaAssociationOverrideTests extends Generic2_0ContextMod JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - AssociationOverrideAnnotation associationOverrideResource = (AssociationOverrideAnnotation) typeResource.getSupportingAnnotation(JPA.ASSOCIATION_OVERRIDE); + AssociationOverrideAnnotation associationOverrideResource = (AssociationOverrideAnnotation) typeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDE); associationOverrideResource.setName("FOO"); specifiedAssociationOverride = getJavaEntity().specifiedAssociationOverrides().next(); @@ -408,7 +408,7 @@ public class Generic2_0JavaAssociationOverrideTests extends Generic2_0ContextMod specifiedAssociationOverride.setName("FOO"); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - AssociationOverrideAnnotation associationOverrideResource = (AssociationOverrideAnnotation) typeResource.getSupportingAnnotation(JPA.ASSOCIATION_OVERRIDE); + AssociationOverrideAnnotation associationOverrideResource = (AssociationOverrideAnnotation) typeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDE); assertEquals("FOO", associationOverrideResource.getName()); } @@ -455,7 +455,7 @@ public class Generic2_0JavaAssociationOverrideTests extends Generic2_0ContextMod JoinTableJoiningStrategy joiningStrategy = ((AssociationOverrideRelationshipReference2_0) javaAssociationOverride.getRelationshipReference()).getJoinTableJoiningStrategy(); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(PACKAGE_NAME + ".AnnotationTestTypeChild"); - AssociationOverride2_0Annotation associationOverrideResource = (AssociationOverride2_0Annotation) typeResource.getSupportingAnnotation(JPA.ASSOCIATION_OVERRIDE); + AssociationOverride2_0Annotation associationOverrideResource = (AssociationOverride2_0Annotation) typeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDE); JoinTable joinTable = joiningStrategy.getJoinTable(); @@ -477,7 +477,7 @@ public class Generic2_0JavaAssociationOverrideTests extends Generic2_0ContextMod JoinTableJoiningStrategy joiningStrategy = ((AssociationOverrideRelationshipReference2_0) javaAssociationOverride.getRelationshipReference()).getJoinTableJoiningStrategy(); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(PACKAGE_NAME + ".AnnotationTestTypeChild"); - AssociationOverride2_0Annotation associationOverrideResource = (AssociationOverride2_0Annotation) typeResource.getSupportingAnnotation(JPA.ASSOCIATION_OVERRIDE); + AssociationOverride2_0Annotation associationOverrideResource = (AssociationOverride2_0Annotation) typeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDE); associationOverrideResource.getJoinTable().setName("MY_JOIN_TABLE"); assertEquals("MY_JOIN_TABLE", joiningStrategy.getJoinTable().getSpecifiedName()); diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/jpa2/context/java/Generic2_0JavaEntityTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/jpa2/context/java/Generic2_0JavaEntityTests.java index 7c14c617bd..0f7de785e2 100644 --- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/jpa2/context/java/Generic2_0JavaEntityTests.java +++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/jpa2/context/java/Generic2_0JavaEntityTests.java @@ -429,13 +429,13 @@ public class Generic2_0JavaEntityTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); //add an annotation to the resource model and verify the context model is updated - AttributeOverrideAnnotation attributeOverride = (AttributeOverrideAnnotation) typeResource.addSupportingAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + AttributeOverrideAnnotation attributeOverride = (AttributeOverrideAnnotation) typeResource.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); attributeOverride.setName("FOO"); specifiedAttributeOverrides = getJavaEntity().specifiedAttributeOverrides(); assertEquals("FOO", specifiedAttributeOverrides.next().getName()); assertFalse(specifiedAttributeOverrides.hasNext()); - attributeOverride = (AttributeOverrideAnnotation) typeResource.addSupportingAnnotation(1, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + attributeOverride = (AttributeOverrideAnnotation) typeResource.addAnnotation(1, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); attributeOverride.setName("BAR"); specifiedAttributeOverrides = getJavaEntity().specifiedAttributeOverrides(); assertEquals("FOO", specifiedAttributeOverrides.next().getName()); @@ -443,7 +443,7 @@ public class Generic2_0JavaEntityTests extends ContextModelTestCase assertFalse(specifiedAttributeOverrides.hasNext()); - attributeOverride = (AttributeOverrideAnnotation) typeResource.addSupportingAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + attributeOverride = (AttributeOverrideAnnotation) typeResource.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); attributeOverride.setName("BAZ"); specifiedAttributeOverrides = getJavaEntity().specifiedAttributeOverrides(); assertEquals("BAZ", specifiedAttributeOverrides.next().getName()); @@ -452,26 +452,26 @@ public class Generic2_0JavaEntityTests extends ContextModelTestCase assertFalse(specifiedAttributeOverrides.hasNext()); //move an annotation to the resource model and verify the context model is updated - typeResource.moveSupportingAnnotation(1, 0, JPA.ATTRIBUTE_OVERRIDES); + typeResource.moveAnnotation(1, 0, JPA.ATTRIBUTE_OVERRIDES); specifiedAttributeOverrides = getJavaEntity().specifiedAttributeOverrides(); assertEquals("FOO", specifiedAttributeOverrides.next().getName()); assertEquals("BAZ", specifiedAttributeOverrides.next().getName()); assertEquals("BAR", specifiedAttributeOverrides.next().getName()); assertFalse(specifiedAttributeOverrides.hasNext()); - typeResource.removeSupportingAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + typeResource.removeAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); specifiedAttributeOverrides = getJavaEntity().specifiedAttributeOverrides(); assertEquals("BAZ", specifiedAttributeOverrides.next().getName()); assertEquals("BAR", specifiedAttributeOverrides.next().getName()); assertFalse(specifiedAttributeOverrides.hasNext()); - typeResource.removeSupportingAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + typeResource.removeAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); specifiedAttributeOverrides = getJavaEntity().specifiedAttributeOverrides(); assertEquals("BAR", specifiedAttributeOverrides.next().getName()); assertFalse(specifiedAttributeOverrides.hasNext()); - typeResource.removeSupportingAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + typeResource.removeAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); specifiedAttributeOverrides = getJavaEntity().specifiedAttributeOverrides(); assertFalse(specifiedAttributeOverrides.hasNext()); } @@ -489,8 +489,8 @@ public class Generic2_0JavaEntityTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_SUB_TYPE_NAME); assertEquals(SUB_TYPE_NAME, typeResource.getName()); - assertNull(typeResource.getSupportingAnnotation(AttributeOverrideAnnotation.ANNOTATION_NAME)); - assertNull(typeResource.getSupportingAnnotation(AttributeOverridesAnnotation.ANNOTATION_NAME)); + assertNull(typeResource.getAnnotation(AttributeOverrideAnnotation.ANNOTATION_NAME)); + assertNull(typeResource.getAnnotation(AttributeOverridesAnnotation.ANNOTATION_NAME)); assertEquals(3, javaEntity.virtualAttributeOverridesSize()); AttributeOverride virtualAttributeOverride = javaEntity.virtualAttributeOverrides().next(); @@ -506,8 +506,8 @@ public class Generic2_0JavaEntityTests extends ContextModelTestCase idMapping.getColumn().setSpecifiedTable("BAR"); assertEquals(SUB_TYPE_NAME, typeResource.getName()); - assertNull(typeResource.getSupportingAnnotation(AttributeOverrideAnnotation.ANNOTATION_NAME)); - assertNull(typeResource.getSupportingAnnotation(AttributeOverridesAnnotation.ANNOTATION_NAME)); + assertNull(typeResource.getAnnotation(AttributeOverrideAnnotation.ANNOTATION_NAME)); + assertNull(typeResource.getAnnotation(AttributeOverridesAnnotation.ANNOTATION_NAME)); assertEquals(3, javaEntity.virtualAttributeOverridesSize()); virtualAttributeOverride = javaEntity.virtualAttributeOverrides().next(); @@ -518,8 +518,8 @@ public class Generic2_0JavaEntityTests extends ContextModelTestCase idMapping.getColumn().setSpecifiedName(null); idMapping.getColumn().setSpecifiedTable(null); assertEquals(SUB_TYPE_NAME, typeResource.getName()); - assertNull(typeResource.getSupportingAnnotation(AttributeOverrideAnnotation.ANNOTATION_NAME)); - assertNull(typeResource.getSupportingAnnotation(AttributeOverridesAnnotation.ANNOTATION_NAME)); + assertNull(typeResource.getAnnotation(AttributeOverrideAnnotation.ANNOTATION_NAME)); + assertNull(typeResource.getAnnotation(AttributeOverridesAnnotation.ANNOTATION_NAME)); virtualAttributeOverride = javaEntity.virtualAttributeOverrides().next(); assertEquals("id", virtualAttributeOverride.getName()); @@ -543,8 +543,8 @@ public class Generic2_0JavaEntityTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_SUB_TYPE_NAME); assertEquals(SUB_TYPE_NAME, typeResource.getName()); - assertNull(typeResource.getSupportingAnnotation(AttributeOverrideAnnotation.ANNOTATION_NAME)); - assertNull(typeResource.getSupportingAnnotation(AttributeOverridesAnnotation.ANNOTATION_NAME)); + assertNull(typeResource.getAnnotation(AttributeOverrideAnnotation.ANNOTATION_NAME)); + assertNull(typeResource.getAnnotation(AttributeOverridesAnnotation.ANNOTATION_NAME)); assertEquals(3, javaEntity.virtualAttributeOverridesSize()); AttributeOverride virtualAttributeOverride = javaEntity.virtualAttributeOverrides().next(); @@ -560,8 +560,8 @@ public class Generic2_0JavaEntityTests extends ContextModelTestCase idMapping.getColumn().setSpecifiedTable("BAR"); assertEquals(SUB_TYPE_NAME, typeResource.getName()); - assertNull(typeResource.getSupportingAnnotation(AttributeOverrideAnnotation.ANNOTATION_NAME)); - assertNull(typeResource.getSupportingAnnotation(AttributeOverridesAnnotation.ANNOTATION_NAME)); + assertNull(typeResource.getAnnotation(AttributeOverrideAnnotation.ANNOTATION_NAME)); + assertNull(typeResource.getAnnotation(AttributeOverridesAnnotation.ANNOTATION_NAME)); assertEquals(3, javaEntity.virtualAttributeOverridesSize()); virtualAttributeOverride = javaEntity.virtualAttributeOverrides().next(); @@ -572,8 +572,8 @@ public class Generic2_0JavaEntityTests extends ContextModelTestCase idMapping.getColumn().setSpecifiedName(null); idMapping.getColumn().setSpecifiedTable(null); assertEquals(SUB_TYPE_NAME, typeResource.getName()); - assertNull(typeResource.getSupportingAnnotation(AttributeOverrideAnnotation.ANNOTATION_NAME)); - assertNull(typeResource.getSupportingAnnotation(AttributeOverridesAnnotation.ANNOTATION_NAME)); + assertNull(typeResource.getAnnotation(AttributeOverrideAnnotation.ANNOTATION_NAME)); + assertNull(typeResource.getAnnotation(AttributeOverridesAnnotation.ANNOTATION_NAME)); virtualAttributeOverride = javaEntity.virtualAttributeOverrides().next(); assertEquals("id", virtualAttributeOverride.getName()); @@ -593,9 +593,9 @@ public class Generic2_0JavaEntityTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); //add an annotation to the resource model and verify the context model is updated - AttributeOverrideAnnotation attributeOverride = (AttributeOverrideAnnotation) typeResource.addSupportingAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + AttributeOverrideAnnotation attributeOverride = (AttributeOverrideAnnotation) typeResource.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); attributeOverride.setName("FOO"); - attributeOverride = (AttributeOverrideAnnotation) typeResource.addSupportingAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + attributeOverride = (AttributeOverrideAnnotation) typeResource.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); attributeOverride.setName("BAR"); assertEquals(2, getJavaEntity().specifiedAttributeOverridesSize()); @@ -639,7 +639,7 @@ public class Generic2_0JavaEntityTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_SUB_TYPE_NAME); - AttributeOverrideAnnotation annotation = (AttributeOverrideAnnotation) typeResource.addSupportingAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + AttributeOverrideAnnotation annotation = (AttributeOverrideAnnotation) typeResource.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); annotation.setName("bar"); assertEquals(4, javaEntity.attributeOverridesSize()); } @@ -655,7 +655,7 @@ public class Generic2_0JavaEntityTests extends ContextModelTestCase getJavaEntity().virtualAttributeOverrides().next().setVirtual(false); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_SUB_TYPE_NAME); - Iterator<NestableAnnotation> attributeOverrides = typeResource.supportingAnnotations(AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverridesAnnotation.ANNOTATION_NAME); + Iterator<NestableAnnotation> attributeOverrides = typeResource.annotations(AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverridesAnnotation.ANNOTATION_NAME); assertEquals("id", ((AttributeOverrideAnnotation) attributeOverrides.next()).getName()); assertEquals("name", ((AttributeOverrideAnnotation) attributeOverrides.next()).getName()); @@ -675,7 +675,7 @@ public class Generic2_0JavaEntityTests extends ContextModelTestCase getJavaEntity().virtualAttributeOverrides().next().setVirtual(false); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_SUB_TYPE_NAME); - Iterator<NestableAnnotation> attributeOverrides = typeResource.supportingAnnotations(AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverridesAnnotation.ANNOTATION_NAME); + Iterator<NestableAnnotation> attributeOverrides = typeResource.annotations(AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverridesAnnotation.ANNOTATION_NAME); assertEquals("name", ((AttributeOverrideAnnotation) attributeOverrides.next()).getName()); assertEquals("id", ((AttributeOverrideAnnotation) attributeOverrides.next()).getName()); @@ -694,11 +694,11 @@ public class Generic2_0JavaEntityTests extends ContextModelTestCase getJavaEntity().virtualAttributeOverrides().next().setVirtual(false); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_SUB_TYPE_NAME); - assertEquals(3, CollectionTools.size(typeResource.supportingAnnotations(AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverridesAnnotation.ANNOTATION_NAME))); + assertEquals(3, CollectionTools.size(typeResource.annotations(AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverridesAnnotation.ANNOTATION_NAME))); getJavaEntity().specifiedAttributeOverrides().next().setVirtual(true); - Iterator<NestableAnnotation> attributeOverrideResources = typeResource.supportingAnnotations(AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverridesAnnotation.ANNOTATION_NAME); + Iterator<NestableAnnotation> attributeOverrideResources = typeResource.annotations(AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverridesAnnotation.ANNOTATION_NAME); assertEquals("name", ((AttributeOverrideAnnotation) attributeOverrideResources.next()).getName()); assertEquals("foo", ((AttributeOverrideAnnotation) attributeOverrideResources.next()).getName()); assertFalse(attributeOverrideResources.hasNext()); @@ -710,7 +710,7 @@ public class Generic2_0JavaEntityTests extends ContextModelTestCase getJavaEntity().specifiedAttributeOverrides().next().setVirtual(true); - attributeOverrideResources = typeResource.supportingAnnotations(AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverridesAnnotation.ANNOTATION_NAME); + attributeOverrideResources = typeResource.annotations(AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverridesAnnotation.ANNOTATION_NAME); assertEquals("foo", ((AttributeOverrideAnnotation) attributeOverrideResources.next()).getName()); assertFalse(attributeOverrideResources.hasNext()); @@ -720,12 +720,12 @@ public class Generic2_0JavaEntityTests extends ContextModelTestCase getJavaEntity().specifiedAttributeOverrides().next().setVirtual(true); - attributeOverrideResources = typeResource.supportingAnnotations(AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverridesAnnotation.ANNOTATION_NAME); + attributeOverrideResources = typeResource.annotations(AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverridesAnnotation.ANNOTATION_NAME); assertFalse(attributeOverrideResources.hasNext()); attributeOverrides = getJavaEntity().specifiedAttributeOverrides(); assertFalse(attributeOverrides.hasNext()); - assertNull(typeResource.getSupportingAnnotation(AttributeOverridesAnnotation.ANNOTATION_NAME)); + assertNull(typeResource.getAnnotation(AttributeOverridesAnnotation.ANNOTATION_NAME)); } public void testMoveSpecifiedAttributeOverride() throws Exception { @@ -743,7 +743,7 @@ public class Generic2_0JavaEntityTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_SUB_TYPE_NAME); - ListIterator<NestableAnnotation> javaAttributeOverrides = typeResource.supportingAnnotations(AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverridesAnnotation.ANNOTATION_NAME); + Iterator<NestableAnnotation> javaAttributeOverrides = typeResource.annotations(AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverridesAnnotation.ANNOTATION_NAME); assertEquals(3, CollectionTools.size(javaAttributeOverrides)); @@ -753,7 +753,7 @@ public class Generic2_0JavaEntityTests extends ContextModelTestCase assertEquals("foo", attributeOverrides.next().getName()); assertEquals("id", attributeOverrides.next().getName()); - javaAttributeOverrides = typeResource.supportingAnnotations(AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverridesAnnotation.ANNOTATION_NAME); + javaAttributeOverrides = typeResource.annotations(AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverridesAnnotation.ANNOTATION_NAME); assertEquals("name", ((AttributeOverrideAnnotation) javaAttributeOverrides.next()).getName()); assertEquals("foo", ((AttributeOverrideAnnotation) javaAttributeOverrides.next()).getName()); assertEquals("id", ((AttributeOverrideAnnotation) javaAttributeOverrides.next()).getName()); @@ -765,7 +765,7 @@ public class Generic2_0JavaEntityTests extends ContextModelTestCase assertEquals("name", attributeOverrides.next().getName()); assertEquals("id", attributeOverrides.next().getName()); - javaAttributeOverrides = typeResource.supportingAnnotations(AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverridesAnnotation.ANNOTATION_NAME); + javaAttributeOverrides = typeResource.annotations(AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverridesAnnotation.ANNOTATION_NAME); assertEquals("foo", ((AttributeOverrideAnnotation) javaAttributeOverrides.next()).getName()); assertEquals("name", ((AttributeOverrideAnnotation) javaAttributeOverrides.next()).getName()); assertEquals("id", ((AttributeOverrideAnnotation) javaAttributeOverrides.next()).getName()); @@ -778,9 +778,9 @@ public class Generic2_0JavaEntityTests extends ContextModelTestCase Entity entity = getJavaEntity(); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - ((AttributeOverrideAnnotation) typeResource.addSupportingAnnotation(0, AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverridesAnnotation.ANNOTATION_NAME)).setName("FOO"); - ((AttributeOverrideAnnotation) typeResource.addSupportingAnnotation(1, AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverridesAnnotation.ANNOTATION_NAME)).setName("BAR"); - ((AttributeOverrideAnnotation) typeResource.addSupportingAnnotation(2, AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverridesAnnotation.ANNOTATION_NAME)).setName("BAZ"); + ((AttributeOverrideAnnotation) typeResource.addAnnotation(0, AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverridesAnnotation.ANNOTATION_NAME)).setName("FOO"); + ((AttributeOverrideAnnotation) typeResource.addAnnotation(1, AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverridesAnnotation.ANNOTATION_NAME)).setName("BAR"); + ((AttributeOverrideAnnotation) typeResource.addAnnotation(2, AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverridesAnnotation.ANNOTATION_NAME)).setName("BAZ"); ListIterator<AttributeOverride> attributeOverrides = entity.specifiedAttributeOverrides(); assertEquals("FOO", attributeOverrides.next().getName()); @@ -788,32 +788,32 @@ public class Generic2_0JavaEntityTests extends ContextModelTestCase assertEquals("BAZ", attributeOverrides.next().getName()); assertFalse(attributeOverrides.hasNext()); - typeResource.moveSupportingAnnotation(2, 0, AttributeOverridesAnnotation.ANNOTATION_NAME); + typeResource.moveAnnotation(2, 0, AttributeOverridesAnnotation.ANNOTATION_NAME); attributeOverrides = entity.specifiedAttributeOverrides(); assertEquals("BAR", attributeOverrides.next().getName()); assertEquals("BAZ", attributeOverrides.next().getName()); assertEquals("FOO", attributeOverrides.next().getName()); assertFalse(attributeOverrides.hasNext()); - typeResource.moveSupportingAnnotation(0, 1, AttributeOverridesAnnotation.ANNOTATION_NAME); + typeResource.moveAnnotation(0, 1, AttributeOverridesAnnotation.ANNOTATION_NAME); attributeOverrides = entity.specifiedAttributeOverrides(); assertEquals("BAZ", attributeOverrides.next().getName()); assertEquals("BAR", attributeOverrides.next().getName()); assertEquals("FOO", attributeOverrides.next().getName()); assertFalse(attributeOverrides.hasNext()); - typeResource.removeSupportingAnnotation(1, AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverridesAnnotation.ANNOTATION_NAME); + typeResource.removeAnnotation(1, AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverridesAnnotation.ANNOTATION_NAME); attributeOverrides = entity.specifiedAttributeOverrides(); assertEquals("BAZ", attributeOverrides.next().getName()); assertEquals("FOO", attributeOverrides.next().getName()); assertFalse(attributeOverrides.hasNext()); - typeResource.removeSupportingAnnotation(1, AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverridesAnnotation.ANNOTATION_NAME); + typeResource.removeAnnotation(1, AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverridesAnnotation.ANNOTATION_NAME); attributeOverrides = entity.specifiedAttributeOverrides(); assertEquals("BAZ", attributeOverrides.next().getName()); assertFalse(attributeOverrides.hasNext()); - typeResource.removeSupportingAnnotation(0, AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverridesAnnotation.ANNOTATION_NAME); + typeResource.removeAnnotation(0, AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverridesAnnotation.ANNOTATION_NAME); attributeOverrides = entity.specifiedAttributeOverrides(); assertFalse(attributeOverrides.hasNext()); } @@ -925,13 +925,13 @@ public class Generic2_0JavaEntityTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); //add an annotation to the resource model and verify the context model is updated - AssociationOverrideAnnotation associationOverride = (AssociationOverrideAnnotation) typeResource.addSupportingAnnotation(0, JPA.ASSOCIATION_OVERRIDE, JPA.ASSOCIATION_OVERRIDES); + AssociationOverrideAnnotation associationOverride = (AssociationOverrideAnnotation) typeResource.addAnnotation(0, JPA.ASSOCIATION_OVERRIDE, JPA.ASSOCIATION_OVERRIDES); associationOverride.setName("FOO"); specifiedAssociationOverrides = getJavaEntity().specifiedAssociationOverrides(); assertEquals("FOO", specifiedAssociationOverrides.next().getName()); assertFalse(specifiedAssociationOverrides.hasNext()); - associationOverride = (AssociationOverrideAnnotation) typeResource.addSupportingAnnotation(1, JPA.ASSOCIATION_OVERRIDE, JPA.ASSOCIATION_OVERRIDES); + associationOverride = (AssociationOverrideAnnotation) typeResource.addAnnotation(1, JPA.ASSOCIATION_OVERRIDE, JPA.ASSOCIATION_OVERRIDES); associationOverride.setName("BAR"); specifiedAssociationOverrides = getJavaEntity().specifiedAssociationOverrides(); assertEquals("FOO", specifiedAssociationOverrides.next().getName()); @@ -939,7 +939,7 @@ public class Generic2_0JavaEntityTests extends ContextModelTestCase assertFalse(specifiedAssociationOverrides.hasNext()); - associationOverride = (AssociationOverrideAnnotation) typeResource.addSupportingAnnotation(0, JPA.ASSOCIATION_OVERRIDE, JPA.ASSOCIATION_OVERRIDES); + associationOverride = (AssociationOverrideAnnotation) typeResource.addAnnotation(0, JPA.ASSOCIATION_OVERRIDE, JPA.ASSOCIATION_OVERRIDES); associationOverride.setName("BAZ"); specifiedAssociationOverrides = getJavaEntity().specifiedAssociationOverrides(); assertEquals("BAZ", specifiedAssociationOverrides.next().getName()); @@ -948,26 +948,26 @@ public class Generic2_0JavaEntityTests extends ContextModelTestCase assertFalse(specifiedAssociationOverrides.hasNext()); //move an annotation to the resource model and verify the context model is updated - typeResource.moveSupportingAnnotation(1, 0, JPA.ASSOCIATION_OVERRIDES); + typeResource.moveAnnotation(1, 0, JPA.ASSOCIATION_OVERRIDES); specifiedAssociationOverrides = getJavaEntity().specifiedAssociationOverrides(); assertEquals("FOO", specifiedAssociationOverrides.next().getName()); assertEquals("BAZ", specifiedAssociationOverrides.next().getName()); assertEquals("BAR", specifiedAssociationOverrides.next().getName()); assertFalse(specifiedAssociationOverrides.hasNext()); - typeResource.removeSupportingAnnotation(0, JPA.ASSOCIATION_OVERRIDE, JPA.ASSOCIATION_OVERRIDES); + typeResource.removeAnnotation(0, JPA.ASSOCIATION_OVERRIDE, JPA.ASSOCIATION_OVERRIDES); specifiedAssociationOverrides = getJavaEntity().specifiedAssociationOverrides(); assertEquals("BAZ", specifiedAssociationOverrides.next().getName()); assertEquals("BAR", specifiedAssociationOverrides.next().getName()); assertFalse(specifiedAssociationOverrides.hasNext()); - typeResource.removeSupportingAnnotation(0, JPA.ASSOCIATION_OVERRIDE, JPA.ASSOCIATION_OVERRIDES); + typeResource.removeAnnotation(0, JPA.ASSOCIATION_OVERRIDE, JPA.ASSOCIATION_OVERRIDES); specifiedAssociationOverrides = getJavaEntity().specifiedAssociationOverrides(); assertEquals("BAR", specifiedAssociationOverrides.next().getName()); assertFalse(specifiedAssociationOverrides.hasNext()); - typeResource.removeSupportingAnnotation(0, JPA.ASSOCIATION_OVERRIDE, JPA.ASSOCIATION_OVERRIDES); + typeResource.removeAnnotation(0, JPA.ASSOCIATION_OVERRIDE, JPA.ASSOCIATION_OVERRIDES); specifiedAssociationOverrides = getJavaEntity().specifiedAssociationOverrides(); assertFalse(specifiedAssociationOverrides.hasNext()); } @@ -985,8 +985,8 @@ public class Generic2_0JavaEntityTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_SUB_TYPE_NAME); assertEquals(SUB_TYPE_NAME, typeResource.getName()); - assertNull(typeResource.getSupportingAnnotation(AssociationOverrideAnnotation.ANNOTATION_NAME)); - assertNull(typeResource.getSupportingAnnotation(AssociationOverridesAnnotation.ANNOTATION_NAME)); + assertNull(typeResource.getAnnotation(AssociationOverrideAnnotation.ANNOTATION_NAME)); + assertNull(typeResource.getAnnotation(AssociationOverridesAnnotation.ANNOTATION_NAME)); assertEquals(4, javaEntity.virtualAssociationOverridesSize()); AssociationOverride virtualAssociationOverride = javaEntity.virtualAssociationOverrides().next(); @@ -999,8 +999,8 @@ public class Generic2_0JavaEntityTests extends ContextModelTestCase //idMapping.getColumn().setSpecifiedTable("BAR"); assertEquals(SUB_TYPE_NAME, typeResource.getName()); - assertNull(typeResource.getSupportingAnnotation(AssociationOverrideAnnotation.ANNOTATION_NAME)); - assertNull(typeResource.getSupportingAnnotation(AssociationOverridesAnnotation.ANNOTATION_NAME)); + assertNull(typeResource.getAnnotation(AssociationOverrideAnnotation.ANNOTATION_NAME)); + assertNull(typeResource.getAnnotation(AssociationOverridesAnnotation.ANNOTATION_NAME)); assertEquals(4, javaEntity.virtualAssociationOverridesSize()); virtualAssociationOverride = javaEntity.virtualAssociationOverrides().next(); @@ -1009,8 +1009,8 @@ public class Generic2_0JavaEntityTests extends ContextModelTestCase //idMapping.getColumn().setSpecifiedName(null); //idMapping.getColumn().setSpecifiedTable(null); assertEquals(SUB_TYPE_NAME, typeResource.getName()); - assertNull(typeResource.getSupportingAnnotation(AssociationOverrideAnnotation.ANNOTATION_NAME)); - assertNull(typeResource.getSupportingAnnotation(AssociationOverridesAnnotation.ANNOTATION_NAME)); + assertNull(typeResource.getAnnotation(AssociationOverrideAnnotation.ANNOTATION_NAME)); + assertNull(typeResource.getAnnotation(AssociationOverridesAnnotation.ANNOTATION_NAME)); virtualAssociationOverride = javaEntity.virtualAssociationOverrides().next(); assertEquals("address", virtualAssociationOverride.getName()); @@ -1072,9 +1072,9 @@ public class Generic2_0JavaEntityTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); //add an annotation to the resource model and verify the context model is updated - AssociationOverrideAnnotation associationOverride = (AssociationOverrideAnnotation) typeResource.addSupportingAnnotation(0, JPA.ASSOCIATION_OVERRIDE, JPA.ASSOCIATION_OVERRIDES); + AssociationOverrideAnnotation associationOverride = (AssociationOverrideAnnotation) typeResource.addAnnotation(0, JPA.ASSOCIATION_OVERRIDE, JPA.ASSOCIATION_OVERRIDES); associationOverride.setName("FOO"); - associationOverride = (AssociationOverrideAnnotation) typeResource.addSupportingAnnotation(0, JPA.ASSOCIATION_OVERRIDE, JPA.ASSOCIATION_OVERRIDES); + associationOverride = (AssociationOverrideAnnotation) typeResource.addAnnotation(0, JPA.ASSOCIATION_OVERRIDE, JPA.ASSOCIATION_OVERRIDES); associationOverride.setName("BAR"); assertEquals(2, getJavaEntity().specifiedAssociationOverridesSize()); @@ -1121,7 +1121,7 @@ public class Generic2_0JavaEntityTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_SUB_TYPE_NAME); - AssociationOverrideAnnotation annotation = (AssociationOverrideAnnotation) typeResource.addSupportingAnnotation(0, JPA.ASSOCIATION_OVERRIDE, JPA.ASSOCIATION_OVERRIDES); + AssociationOverrideAnnotation annotation = (AssociationOverrideAnnotation) typeResource.addAnnotation(0, JPA.ASSOCIATION_OVERRIDE, JPA.ASSOCIATION_OVERRIDES); annotation.setName("bar"); assertEquals(5, javaEntity.associationOverridesSize()); } @@ -1137,7 +1137,7 @@ public class Generic2_0JavaEntityTests extends ContextModelTestCase getJavaEntity().virtualAssociationOverrides().next().setVirtual(false); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_SUB_TYPE_NAME); - Iterator<NestableAnnotation> associationOverrides = typeResource.supportingAnnotations(AssociationOverrideAnnotation.ANNOTATION_NAME, AssociationOverridesAnnotation.ANNOTATION_NAME); + Iterator<NestableAnnotation> associationOverrides = typeResource.annotations(AssociationOverrideAnnotation.ANNOTATION_NAME, AssociationOverridesAnnotation.ANNOTATION_NAME); assertEquals("address", ((AssociationOverrideAnnotation) associationOverrides.next()).getName()); assertEquals("address2", ((AssociationOverrideAnnotation) associationOverrides.next()).getName()); @@ -1157,7 +1157,7 @@ public class Generic2_0JavaEntityTests extends ContextModelTestCase getJavaEntity().virtualAssociationOverrides().next().setVirtual(false); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_SUB_TYPE_NAME); - Iterator<NestableAnnotation> associationOverrides = typeResource.supportingAnnotations(AssociationOverrideAnnotation.ANNOTATION_NAME, AssociationOverridesAnnotation.ANNOTATION_NAME); + Iterator<NestableAnnotation> associationOverrides = typeResource.annotations(AssociationOverrideAnnotation.ANNOTATION_NAME, AssociationOverridesAnnotation.ANNOTATION_NAME); assertEquals("address2", ((AssociationOverrideAnnotation) associationOverrides.next()).getName()); assertEquals("address", ((AssociationOverrideAnnotation) associationOverrides.next()).getName()); @@ -1175,11 +1175,11 @@ public class Generic2_0JavaEntityTests extends ContextModelTestCase getJavaEntity().virtualAssociationOverrides().next().setVirtual(false); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_SUB_TYPE_NAME); - assertEquals(2, CollectionTools.size(typeResource.supportingAnnotations(AssociationOverrideAnnotation.ANNOTATION_NAME, AssociationOverridesAnnotation.ANNOTATION_NAME))); + assertEquals(2, CollectionTools.size(typeResource.annotations(AssociationOverrideAnnotation.ANNOTATION_NAME, AssociationOverridesAnnotation.ANNOTATION_NAME))); getJavaEntity().specifiedAssociationOverrides().next().setVirtual(true); - Iterator<NestableAnnotation> associationOverrideResources = typeResource.supportingAnnotations(AssociationOverrideAnnotation.ANNOTATION_NAME, AssociationOverridesAnnotation.ANNOTATION_NAME); + Iterator<NestableAnnotation> associationOverrideResources = typeResource.annotations(AssociationOverrideAnnotation.ANNOTATION_NAME, AssociationOverridesAnnotation.ANNOTATION_NAME); assertEquals("address2", ((AssociationOverrideAnnotation) associationOverrideResources.next()).getName()); assertFalse(associationOverrideResources.hasNext()); @@ -1189,12 +1189,12 @@ public class Generic2_0JavaEntityTests extends ContextModelTestCase getJavaEntity().specifiedAssociationOverrides().next().setVirtual(true); - associationOverrideResources = typeResource.supportingAnnotations(AssociationOverrideAnnotation.ANNOTATION_NAME, AssociationOverridesAnnotation.ANNOTATION_NAME); + associationOverrideResources = typeResource.annotations(AssociationOverrideAnnotation.ANNOTATION_NAME, AssociationOverridesAnnotation.ANNOTATION_NAME); assertFalse(associationOverrideResources.hasNext()); associationOverrides = getJavaEntity().specifiedAssociationOverrides(); assertFalse(associationOverrides.hasNext()); - assertNull(typeResource.getSupportingAnnotation(AssociationOverridesAnnotation.ANNOTATION_NAME)); + assertNull(typeResource.getAnnotation(AssociationOverridesAnnotation.ANNOTATION_NAME)); } public void testMoveSpecifiedAssociationOverride() throws Exception { @@ -1211,7 +1211,7 @@ public class Generic2_0JavaEntityTests extends ContextModelTestCase JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_SUB_TYPE_NAME); - ListIterator<NestableAnnotation> javaAssociationOverrides = typeResource.supportingAnnotations(AssociationOverrideAnnotation.ANNOTATION_NAME, AssociationOverridesAnnotation.ANNOTATION_NAME); + Iterator<NestableAnnotation> javaAssociationOverrides = typeResource.annotations(AssociationOverrideAnnotation.ANNOTATION_NAME, AssociationOverridesAnnotation.ANNOTATION_NAME); assertEquals(2, CollectionTools.size(javaAssociationOverrides)); @@ -1220,7 +1220,7 @@ public class Generic2_0JavaEntityTests extends ContextModelTestCase assertEquals("address2", associationOverrides.next().getName()); assertEquals("address", associationOverrides.next().getName()); - javaAssociationOverrides = typeResource.supportingAnnotations(AssociationOverrideAnnotation.ANNOTATION_NAME, AssociationOverridesAnnotation.ANNOTATION_NAME); + javaAssociationOverrides = typeResource.annotations(AssociationOverrideAnnotation.ANNOTATION_NAME, AssociationOverridesAnnotation.ANNOTATION_NAME); assertEquals("address2", ((AssociationOverrideAnnotation) javaAssociationOverrides.next()).getName()); assertEquals("address", ((AssociationOverrideAnnotation) javaAssociationOverrides.next()).getName()); @@ -1230,7 +1230,7 @@ public class Generic2_0JavaEntityTests extends ContextModelTestCase assertEquals("address", associationOverrides.next().getName()); assertEquals("address2", associationOverrides.next().getName()); - javaAssociationOverrides = typeResource.supportingAnnotations(AssociationOverrideAnnotation.ANNOTATION_NAME, AssociationOverridesAnnotation.ANNOTATION_NAME); + javaAssociationOverrides = typeResource.annotations(AssociationOverrideAnnotation.ANNOTATION_NAME, AssociationOverridesAnnotation.ANNOTATION_NAME); assertEquals("address", ((AssociationOverrideAnnotation) javaAssociationOverrides.next()).getName()); assertEquals("address2", ((AssociationOverrideAnnotation) javaAssociationOverrides.next()).getName()); } @@ -1242,9 +1242,9 @@ public class Generic2_0JavaEntityTests extends ContextModelTestCase Entity entity = getJavaEntity(); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - ((AssociationOverrideAnnotation) typeResource.addSupportingAnnotation(0, AssociationOverrideAnnotation.ANNOTATION_NAME, AssociationOverridesAnnotation.ANNOTATION_NAME)).setName("FOO"); - ((AssociationOverrideAnnotation) typeResource.addSupportingAnnotation(1, AssociationOverrideAnnotation.ANNOTATION_NAME, AssociationOverridesAnnotation.ANNOTATION_NAME)).setName("BAR"); - ((AssociationOverrideAnnotation) typeResource.addSupportingAnnotation(2, AssociationOverrideAnnotation.ANNOTATION_NAME, AssociationOverridesAnnotation.ANNOTATION_NAME)).setName("BAZ"); + ((AssociationOverrideAnnotation) typeResource.addAnnotation(0, AssociationOverrideAnnotation.ANNOTATION_NAME, AssociationOverridesAnnotation.ANNOTATION_NAME)).setName("FOO"); + ((AssociationOverrideAnnotation) typeResource.addAnnotation(1, AssociationOverrideAnnotation.ANNOTATION_NAME, AssociationOverridesAnnotation.ANNOTATION_NAME)).setName("BAR"); + ((AssociationOverrideAnnotation) typeResource.addAnnotation(2, AssociationOverrideAnnotation.ANNOTATION_NAME, AssociationOverridesAnnotation.ANNOTATION_NAME)).setName("BAZ"); ListIterator<AssociationOverride> associationOverrides = entity.specifiedAssociationOverrides(); assertEquals("FOO", associationOverrides.next().getName()); @@ -1252,32 +1252,32 @@ public class Generic2_0JavaEntityTests extends ContextModelTestCase assertEquals("BAZ", associationOverrides.next().getName()); assertFalse(associationOverrides.hasNext()); - typeResource.moveSupportingAnnotation(2, 0, AssociationOverridesAnnotation.ANNOTATION_NAME); + typeResource.moveAnnotation(2, 0, AssociationOverridesAnnotation.ANNOTATION_NAME); associationOverrides = entity.specifiedAssociationOverrides(); assertEquals("BAR", associationOverrides.next().getName()); assertEquals("BAZ", associationOverrides.next().getName()); assertEquals("FOO", associationOverrides.next().getName()); assertFalse(associationOverrides.hasNext()); - typeResource.moveSupportingAnnotation(0, 1, AssociationOverridesAnnotation.ANNOTATION_NAME); + typeResource.moveAnnotation(0, 1, AssociationOverridesAnnotation.ANNOTATION_NAME); associationOverrides = entity.specifiedAssociationOverrides(); assertEquals("BAZ", associationOverrides.next().getName()); assertEquals("BAR", associationOverrides.next().getName()); assertEquals("FOO", associationOverrides.next().getName()); assertFalse(associationOverrides.hasNext()); - typeResource.removeSupportingAnnotation(1, AssociationOverrideAnnotation.ANNOTATION_NAME, AssociationOverridesAnnotation.ANNOTATION_NAME); + typeResource.removeAnnotation(1, AssociationOverrideAnnotation.ANNOTATION_NAME, AssociationOverridesAnnotation.ANNOTATION_NAME); associationOverrides = entity.specifiedAssociationOverrides(); assertEquals("BAZ", associationOverrides.next().getName()); assertEquals("FOO", associationOverrides.next().getName()); assertFalse(associationOverrides.hasNext()); - typeResource.removeSupportingAnnotation(1, AssociationOverrideAnnotation.ANNOTATION_NAME, AssociationOverridesAnnotation.ANNOTATION_NAME); + typeResource.removeAnnotation(1, AssociationOverrideAnnotation.ANNOTATION_NAME, AssociationOverridesAnnotation.ANNOTATION_NAME); associationOverrides = entity.specifiedAssociationOverrides(); assertEquals("BAZ", associationOverrides.next().getName()); assertFalse(associationOverrides.hasNext()); - typeResource.removeSupportingAnnotation(0, AssociationOverrideAnnotation.ANNOTATION_NAME, AssociationOverridesAnnotation.ANNOTATION_NAME); + typeResource.removeAnnotation(0, AssociationOverrideAnnotation.ANNOTATION_NAME, AssociationOverridesAnnotation.ANNOTATION_NAME); associationOverrides = entity.specifiedAssociationOverrides(); assertFalse(associationOverrides.hasNext()); } diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/jpa2/context/java/Generic2_0JavaPersistentAttributeTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/jpa2/context/java/Generic2_0JavaPersistentAttributeTests.java index 36e299e3c5..f54483c387 100644 --- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/jpa2/context/java/Generic2_0JavaPersistentAttributeTests.java +++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/jpa2/context/java/Generic2_0JavaPersistentAttributeTests.java @@ -14,13 +14,27 @@ import org.eclipse.jdt.core.ICompilationUnit; import org.eclipse.jpt.core.MappingKeys; import org.eclipse.jpt.core.context.AccessType; import org.eclipse.jpt.core.context.PersistentAttribute; +import org.eclipse.jpt.core.context.java.JavaPersistentAttribute; import org.eclipse.jpt.core.resource.java.JPA; import org.eclipse.jpt.utility.internal.iterators.ArrayIterator; @SuppressWarnings("nls") public class Generic2_0JavaPersistentAttributeTests extends Generic2_0ContextModelTestCase { - + private ICompilationUnit createTestEntityForDerivedId() throws Exception { + return createTestType(new DefaultAnnotationWriter() { + @Override + public Iterator<String> imports() { + return new ArrayIterator<String>(JPA.ENTITY, JPA.ID, JPA.ONE_TO_ONE, JPA.MANY_TO_ONE); + } + + @Override + public void appendTypeAnnotationTo(StringBuilder sb) { + sb.append("@Entity"); + } + }); + } + private ICompilationUnit createTestEntitySpecifiedAccessField() throws Exception { return this.createTestType(new DefaultAnnotationWriter() { @Override @@ -107,4 +121,32 @@ public class Generic2_0JavaPersistentAttributeTests extends Generic2_0ContextMod assertEquals(AccessType.PROPERTY, idPersistentAttribute.getDefaultAccess()); assertEquals(null, idPersistentAttribute.getSpecifiedAccess()); } + + public void testDerivedIdMappingInitialization() throws Exception { + createTestEntityForDerivedId(); + addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); + + JavaPersistentAttribute id = getJavaPersistentType().getAttributeNamed("id"); + assertEquals(id.getMappingKey(), MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY); + + id.getResourcePersistentAttribute().addAnnotation(JPA.ID); + assertEquals(id.getMappingKey(), MappingKeys.ID_ATTRIBUTE_MAPPING_KEY); + + id.getResourcePersistentAttribute().addAnnotation(JPA.ONE_TO_ONE); + assertEquals(id.getMappingKey(), MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY); + assertNotNull(id.getResourcePersistentAttribute().getAnnotation(JPA.ID)); + + id.getResourcePersistentAttribute().removeAnnotation(JPA.ONE_TO_ONE); + assertEquals(id.getMappingKey(), MappingKeys.ID_ATTRIBUTE_MAPPING_KEY); + + id.getResourcePersistentAttribute().addAnnotation(JPA.MANY_TO_ONE); + assertEquals(id.getMappingKey(), MappingKeys.MANY_TO_ONE_ATTRIBUTE_MAPPING_KEY); + assertNotNull(id.getResourcePersistentAttribute().getAnnotation(JPA.ID)); + + id.getResourcePersistentAttribute().removeAnnotation(JPA.MANY_TO_ONE); + assertEquals(id.getMappingKey(), MappingKeys.ID_ATTRIBUTE_MAPPING_KEY); + + id.getResourcePersistentAttribute().setPrimaryAnnotation(null, new String[0]); + assertEquals(id.getMappingKey(), MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY); + } } diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/jpa2/context/java/Generic2_0JavaPersistentTypeTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/jpa2/context/java/Generic2_0JavaPersistentTypeTests.java index 86d0dfcade..192ba84ca5 100644 --- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/jpa2/context/java/Generic2_0JavaPersistentTypeTests.java +++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/jpa2/context/java/Generic2_0JavaPersistentTypeTests.java @@ -327,7 +327,7 @@ public class Generic2_0JavaPersistentTypeTests extends Generic2_0ContextModelTes assertFalse(attributes.hasNext()); - getJavaPersistentType().attributes().next().getResourcePersistentAttribute().setMappingAnnotation(TransientAnnotation.ANNOTATION_NAME); + getJavaPersistentType().attributes().next().getResourcePersistentAttribute().setPrimaryAnnotation(TransientAnnotation.ANNOTATION_NAME, new String[0]); attributes = getJavaPersistentType().attributes(); javaPersistentAttribute = attributes.next(); @@ -652,8 +652,7 @@ public class Generic2_0JavaPersistentTypeTests extends Generic2_0ContextModelTes getJavaPersistentType().setMappingKey(MappingKeys.ENTITY_TYPE_MAPPING_KEY); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - assertNotNull(typeResource.getMappingAnnotation()); - assertTrue(typeResource.getMappingAnnotation() instanceof EntityAnnotation); + assertNotNull(typeResource.getAnnotation(EntityAnnotation.ANNOTATION_NAME)); assertEquals(MappingKeys.ENTITY_TYPE_MAPPING_KEY, getJavaPersistentType().getMappingKey()); } @@ -667,8 +666,7 @@ public class Generic2_0JavaPersistentTypeTests extends Generic2_0ContextModelTes getJavaPersistentType().setMappingKey(MappingKeys.EMBEDDABLE_TYPE_MAPPING_KEY); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - assertNotNull(typeResource.getMappingAnnotation()); - assertTrue(typeResource.getMappingAnnotation() instanceof EmbeddableAnnotation); + assertNotNull(typeResource.getAnnotation(EmbeddableAnnotation.ANNOTATION_NAME)); assertEquals(MappingKeys.EMBEDDABLE_TYPE_MAPPING_KEY, getJavaPersistentType().getMappingKey()); } @@ -682,8 +680,7 @@ public class Generic2_0JavaPersistentTypeTests extends Generic2_0ContextModelTes getJavaPersistentType().setMappingKey(MappingKeys.NULL_TYPE_MAPPING_KEY); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - assertNull(typeResource.getMappingAnnotation()); - assertNull(typeResource.getMappingAnnotation(EntityAnnotation.ANNOTATION_NAME)); + assertNull(typeResource.getAnnotation(EntityAnnotation.ANNOTATION_NAME)); assertEquals(MappingKeys.NULL_TYPE_MAPPING_KEY, getJavaPersistentType().getMappingKey()); } @@ -695,7 +692,7 @@ public class Generic2_0JavaPersistentTypeTests extends Generic2_0ContextModelTes assertEquals(MappingKeys.ENTITY_TYPE_MAPPING_KEY, getJavaPersistentType().getMappingKey()); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - typeResource.setMappingAnnotation(EmbeddableAnnotation.ANNOTATION_NAME); + typeResource.setPrimaryAnnotation(EmbeddableAnnotation.ANNOTATION_NAME, new String[0]); assertEquals(MappingKeys.EMBEDDABLE_TYPE_MAPPING_KEY, getJavaPersistentType().getMappingKey()); } @@ -707,7 +704,7 @@ public class Generic2_0JavaPersistentTypeTests extends Generic2_0ContextModelTes assertEquals(MappingKeys.NULL_TYPE_MAPPING_KEY, getJavaPersistentType().getMappingKey()); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - typeResource.setMappingAnnotation(EntityAnnotation.ANNOTATION_NAME); + typeResource.setPrimaryAnnotation(EntityAnnotation.ANNOTATION_NAME, new String[0]); assertEquals(MappingKeys.ENTITY_TYPE_MAPPING_KEY, getJavaPersistentType().getMappingKey()); } diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/jpa2/context/java/Generic2_0JavaSequenceGeneratorTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/jpa2/context/java/Generic2_0JavaSequenceGeneratorTests.java index ecdbfdd846..6db6580521 100644 --- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/jpa2/context/java/Generic2_0JavaSequenceGeneratorTests.java +++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/jpa2/context/java/Generic2_0JavaSequenceGeneratorTests.java @@ -56,7 +56,7 @@ public class Generic2_0JavaSequenceGeneratorTests extends Generic2_0ContextModel assertNull(sequenceGenerator.getCatalog()); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - SequenceGenerator2_0Annotation annotation = (SequenceGenerator2_0Annotation) attributeResource.getSupportingAnnotation(JPA.SEQUENCE_GENERATOR); + SequenceGenerator2_0Annotation annotation = (SequenceGenerator2_0Annotation) attributeResource.getAnnotation(JPA.SEQUENCE_GENERATOR); annotation.setCatalog("testCatalog"); @@ -90,13 +90,13 @@ public class Generic2_0JavaSequenceGeneratorTests extends Generic2_0ContextModel JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - SequenceGenerator2_0Annotation annotation = (SequenceGenerator2_0Annotation) attributeResource.getSupportingAnnotation(JPA.SEQUENCE_GENERATOR); + SequenceGenerator2_0Annotation annotation = (SequenceGenerator2_0Annotation) attributeResource.getAnnotation(JPA.SEQUENCE_GENERATOR); assertEquals("testCatalog", annotation.getCatalog()); sequenceGenerator.setName(null); sequenceGenerator.setSpecifiedCatalog(null); - assertNull(attributeResource.getSupportingAnnotation(JPA.SEQUENCE_GENERATOR)); + assertNull(attributeResource.getAnnotation(JPA.SEQUENCE_GENERATOR)); } // ********** schema ********** @@ -111,7 +111,7 @@ public class Generic2_0JavaSequenceGeneratorTests extends Generic2_0ContextModel assertNull(sequenceGenerator.getSchema()); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - SequenceGenerator2_0Annotation annotation = (SequenceGenerator2_0Annotation) attributeResource.getSupportingAnnotation(JPA.SEQUENCE_GENERATOR); + SequenceGenerator2_0Annotation annotation = (SequenceGenerator2_0Annotation) attributeResource.getAnnotation(JPA.SEQUENCE_GENERATOR); annotation.setSchema("testSchema"); @@ -176,13 +176,13 @@ public class Generic2_0JavaSequenceGeneratorTests extends Generic2_0ContextModel JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); - SequenceGenerator2_0Annotation annotation = (SequenceGenerator2_0Annotation) attributeResource.getSupportingAnnotation(JPA.SEQUENCE_GENERATOR); + SequenceGenerator2_0Annotation annotation = (SequenceGenerator2_0Annotation) attributeResource.getAnnotation(JPA.SEQUENCE_GENERATOR); assertEquals("testSchema", annotation.getSchema()); sequenceGenerator.setName(null); sequenceGenerator.setSpecifiedSchema(null); - assertNull(attributeResource.getSupportingAnnotation(JPA.SEQUENCE_GENERATOR)); + assertNull(attributeResource.getAnnotation(JPA.SEQUENCE_GENERATOR)); } // ********** utility ********** diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/jpa2/context/orm/Generic2_0OrmPersistentAttributeTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/jpa2/context/orm/Generic2_0OrmPersistentAttributeTests.java index c875b6ee40..9356db88d0 100644 --- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/jpa2/context/orm/Generic2_0OrmPersistentAttributeTests.java +++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/jpa2/context/orm/Generic2_0OrmPersistentAttributeTests.java @@ -28,7 +28,8 @@ import org.eclipse.jpt.core.resource.java.JavaResourcePersistentAttribute; import org.eclipse.jpt.utility.internal.iterators.ArrayIterator; @SuppressWarnings("nls") -public class Generic2_0OrmPersistentAttributeTests extends Generic2_0OrmContextModelTestCase +public class Generic2_0OrmPersistentAttributeTests + extends Generic2_0OrmContextModelTestCase { public Generic2_0OrmPersistentAttributeTests(String name) { diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/jpa2/context/orm/Generic2_0OrmPersistentTypeTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/jpa2/context/orm/Generic2_0OrmPersistentTypeTests.java index e1f0b9d18a..5e28d3b1e5 100644 --- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/jpa2/context/orm/Generic2_0OrmPersistentTypeTests.java +++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/jpa2/context/orm/Generic2_0OrmPersistentTypeTests.java @@ -21,7 +21,8 @@ import org.eclipse.jpt.core.resource.java.JPA; import org.eclipse.jpt.utility.internal.iterators.ArrayIterator; @SuppressWarnings("nls") -public class Generic2_0OrmPersistentTypeTests extends Generic2_0OrmContextModelTestCase +public class Generic2_0OrmPersistentTypeTests + extends Generic2_0OrmContextModelTestCase { public Generic2_0OrmPersistentTypeTests(String name) { diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/jpa2/context/orm/Generic2_0OrmSequenceGeneratorTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/jpa2/context/orm/Generic2_0OrmSequenceGeneratorTests.java index c79ad4b2e1..eaf345e3e1 100644 --- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/jpa2/context/orm/Generic2_0OrmSequenceGeneratorTests.java +++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/jpa2/context/orm/Generic2_0OrmSequenceGeneratorTests.java @@ -15,7 +15,8 @@ import org.eclipse.jpt.core.jpa2.resource.orm.XmlSequenceGenerator; /** * Generic2_0OrmSequenceGenerator2_0Tests */ -public class Generic2_0OrmSequenceGeneratorTests extends Generic2_0OrmContextModelTestCase +public class Generic2_0OrmSequenceGeneratorTests + extends Generic2_0OrmContextModelTestCase { public Generic2_0OrmSequenceGeneratorTests(String name) { diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/jpa2/resource/java/Access2_0AnnotationTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/jpa2/resource/java/Access2_0AnnotationTests.java index e60429a760..42b14d51c7 100644 --- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/jpa2/resource/java/Access2_0AnnotationTests.java +++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/jpa2/resource/java/Access2_0AnnotationTests.java @@ -71,7 +71,7 @@ public class Access2_0AnnotationTests extends JavaResourceModel2_0TestCase { ICompilationUnit cu = this.createTestAccessOnType(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - Access2_0Annotation access = (Access2_0Annotation) typeResource.getSupportingAnnotation(JPA.ACCESS); + Access2_0Annotation access = (Access2_0Annotation) typeResource.getAnnotation(JPA.ACCESS); assertNotNull(access); assertEquals(AccessType.PROPERTY, access.getValue()); } @@ -80,13 +80,13 @@ public class Access2_0AnnotationTests extends JavaResourceModel2_0TestCase { ICompilationUnit cu = this.createTestType(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - Access2_0Annotation access = (Access2_0Annotation) typeResource.getSupportingAnnotation(JPA.ACCESS); + Access2_0Annotation access = (Access2_0Annotation) typeResource.getAnnotation(JPA.ACCESS); assertNull(access); - typeResource.addSupportingAnnotation(JPA.ACCESS); + typeResource.addAnnotation(JPA.ACCESS); assertSourceContains("@Access", cu); - access = (Access2_0Annotation) typeResource.getSupportingAnnotation(JPA.ACCESS); + access = (Access2_0Annotation) typeResource.getAnnotation(JPA.ACCESS); assertNotNull(access); access.setValue(AccessType.FIELD); @@ -98,7 +98,7 @@ public class Access2_0AnnotationTests extends JavaResourceModel2_0TestCase { assertSourceContains("@Access(PROPERTY)", cu); access.setValue(null); - assertNull(typeResource.getSupportingAnnotation(JPA.ACCESS)); + assertNull(typeResource.getAnnotation(JPA.ACCESS)); assertSourceDoesNotContain("@Access", cu); } @@ -107,7 +107,7 @@ public class Access2_0AnnotationTests extends JavaResourceModel2_0TestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.persistableFields().next(); - Access2_0Annotation access = (Access2_0Annotation) attributeResource.getSupportingAnnotation(JPA.ACCESS); + Access2_0Annotation access = (Access2_0Annotation) attributeResource.getAnnotation(JPA.ACCESS); assertNotNull(access); assertEquals(AccessType.FIELD, access.getValue()); } @@ -117,13 +117,13 @@ public class Access2_0AnnotationTests extends JavaResourceModel2_0TestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.persistableFields().next(); - Access2_0Annotation access = (Access2_0Annotation) attributeResource.getSupportingAnnotation(JPA.ACCESS); + Access2_0Annotation access = (Access2_0Annotation) attributeResource.getAnnotation(JPA.ACCESS); assertNull(access); - attributeResource.addSupportingAnnotation(JPA.ACCESS); + attributeResource.addAnnotation(JPA.ACCESS); assertSourceContains("@Access", cu); - access = (Access2_0Annotation) attributeResource.getSupportingAnnotation(JPA.ACCESS); + access = (Access2_0Annotation) attributeResource.getAnnotation(JPA.ACCESS); assertNotNull(access); access.setValue(AccessType.FIELD); @@ -135,7 +135,7 @@ public class Access2_0AnnotationTests extends JavaResourceModel2_0TestCase { assertSourceContains("@Access(PROPERTY)", cu); access.setValue(null); - assertNull(attributeResource.getSupportingAnnotation(JPA.ACCESS)); + assertNull(attributeResource.getAnnotation(JPA.ACCESS)); assertSourceDoesNotContain("@Access", cu); } @@ -144,7 +144,7 @@ public class Access2_0AnnotationTests extends JavaResourceModel2_0TestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.persistableProperties().next(); - Access2_0Annotation access = (Access2_0Annotation) attributeResource.getSupportingAnnotation(JPA.ACCESS); + Access2_0Annotation access = (Access2_0Annotation) attributeResource.getAnnotation(JPA.ACCESS); assertNotNull(access); assertEquals(AccessType.PROPERTY, access.getValue()); } @@ -154,13 +154,13 @@ public class Access2_0AnnotationTests extends JavaResourceModel2_0TestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.persistableProperties().next(); - Access2_0Annotation access = (Access2_0Annotation) attributeResource.getSupportingAnnotation(JPA.ACCESS); + Access2_0Annotation access = (Access2_0Annotation) attributeResource.getAnnotation(JPA.ACCESS); assertNull(access); - attributeResource.addSupportingAnnotation(JPA.ACCESS); + attributeResource.addAnnotation(JPA.ACCESS); assertSourceContains("@Access", cu); - access = (Access2_0Annotation) attributeResource.getSupportingAnnotation(JPA.ACCESS); + access = (Access2_0Annotation) attributeResource.getAnnotation(JPA.ACCESS); assertNotNull(access); access.setValue(AccessType.FIELD); @@ -172,7 +172,7 @@ public class Access2_0AnnotationTests extends JavaResourceModel2_0TestCase { assertSourceContains("@Access(PROPERTY)", cu); access.setValue(null); - assertNull(attributeResource.getSupportingAnnotation(JPA.ACCESS)); + assertNull(attributeResource.getAnnotation(JPA.ACCESS)); assertSourceDoesNotContain("@Access", cu); } } diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/jpa2/resource/java/AssociationOverride2_0Tests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/jpa2/resource/java/AssociationOverride2_0Tests.java index 0eb554f273..91efc8051e 100644 --- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/jpa2/resource/java/AssociationOverride2_0Tests.java +++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/jpa2/resource/java/AssociationOverride2_0Tests.java @@ -153,7 +153,7 @@ public class AssociationOverride2_0Tests extends JavaResourceModel2_0TestCase { ICompilationUnit cu = this.createTestAssociationOverrideOnField(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - AssociationOverrideAnnotation associationOverride = (AssociationOverrideAnnotation) attributeResource.getSupportingAnnotation(JPA.ASSOCIATION_OVERRIDE); + AssociationOverrideAnnotation associationOverride = (AssociationOverrideAnnotation) attributeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDE); assertNotNull(associationOverride); assertEquals(ASSOCIATION_OVERRIDE_NAME, associationOverride.getName()); @@ -163,7 +163,7 @@ public class AssociationOverride2_0Tests extends JavaResourceModel2_0TestCase { ICompilationUnit cu = this.createTestAssociationOverrideOnField(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - AssociationOverrideAnnotation associationOverride = (AssociationOverrideAnnotation) attributeResource.getSupportingAnnotation(JPA.ASSOCIATION_OVERRIDE); + AssociationOverrideAnnotation associationOverride = (AssociationOverrideAnnotation) attributeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDE); assertNotNull(associationOverride); assertEquals(ASSOCIATION_OVERRIDE_NAME, associationOverride.getName()); @@ -177,7 +177,7 @@ public class AssociationOverride2_0Tests extends JavaResourceModel2_0TestCase { ICompilationUnit cu = this.createTestAssociationOverrideOnField(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - AssociationOverrideAnnotation associationOverride = (AssociationOverrideAnnotation) attributeResource.getSupportingAnnotation(JPA.ASSOCIATION_OVERRIDE); + AssociationOverrideAnnotation associationOverride = (AssociationOverrideAnnotation) attributeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDE); assertEquals(ASSOCIATION_OVERRIDE_NAME, associationOverride.getName()); @@ -194,7 +194,7 @@ public class AssociationOverride2_0Tests extends JavaResourceModel2_0TestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - AssociationOverrideAnnotation associationOverride = (AssociationOverrideAnnotation) attributeResource.getSupportingAnnotation(JPA.ASSOCIATION_OVERRIDE); + AssociationOverrideAnnotation associationOverride = (AssociationOverrideAnnotation) attributeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDE); assertEquals(0, associationOverride.joinColumnsSize()); } @@ -204,7 +204,7 @@ public class AssociationOverride2_0Tests extends JavaResourceModel2_0TestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - AssociationOverrideAnnotation associationOverride = (AssociationOverrideAnnotation) attributeResource.getSupportingAnnotation(JPA.ASSOCIATION_OVERRIDE); + AssociationOverrideAnnotation associationOverride = (AssociationOverrideAnnotation) attributeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDE); associationOverride.addJoinColumn(0); @@ -218,7 +218,7 @@ public class AssociationOverride2_0Tests extends JavaResourceModel2_0TestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - AssociationOverrideAnnotation associationOverride = (AssociationOverrideAnnotation) attributeResource.getSupportingAnnotation(JPA.ASSOCIATION_OVERRIDE); + AssociationOverrideAnnotation associationOverride = (AssociationOverrideAnnotation) attributeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDE); assertEquals(2, associationOverride.joinColumnsSize()); } @@ -228,7 +228,7 @@ public class AssociationOverride2_0Tests extends JavaResourceModel2_0TestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - AssociationOverrideAnnotation associationOverride = (AssociationOverrideAnnotation) attributeResource.getSupportingAnnotation(JPA.ASSOCIATION_OVERRIDE); + AssociationOverrideAnnotation associationOverride = (AssociationOverrideAnnotation) attributeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDE); associationOverride.addJoinColumn(0).setName("FOO"); associationOverride.addJoinColumn(1); @@ -246,7 +246,7 @@ public class AssociationOverride2_0Tests extends JavaResourceModel2_0TestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - AssociationOverrideAnnotation associationOverride = (AssociationOverrideAnnotation) attributeResource.getSupportingAnnotation(JPA.ASSOCIATION_OVERRIDE); + AssociationOverrideAnnotation associationOverride = (AssociationOverrideAnnotation) attributeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDE); associationOverride.addJoinColumn(0).setName("FOO"); Iterator<JoinColumnAnnotation> joinColumns = associationOverride.joinColumns(); @@ -280,7 +280,7 @@ public class AssociationOverride2_0Tests extends JavaResourceModel2_0TestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - AssociationOverrideAnnotation associationOverride = (AssociationOverrideAnnotation) attributeResource.getSupportingAnnotation(JPA.ASSOCIATION_OVERRIDE); + AssociationOverrideAnnotation associationOverride = (AssociationOverrideAnnotation) attributeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDE); JoinColumnAnnotation joinColumn = associationOverride.joinColumnAt(0); joinColumn.setReferencedColumnName("REF_NAME"); joinColumn.setUnique(Boolean.FALSE); @@ -306,7 +306,7 @@ public class AssociationOverride2_0Tests extends JavaResourceModel2_0TestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - AssociationOverrideAnnotation associationOverride = (AssociationOverrideAnnotation) attributeResource.getSupportingAnnotation(JPA.ASSOCIATION_OVERRIDE); + AssociationOverrideAnnotation associationOverride = (AssociationOverrideAnnotation) attributeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDE); JoinColumnAnnotation joinColumn = associationOverride.joinColumnAt(0); joinColumn.setReferencedColumnName("REF_NAME"); @@ -333,7 +333,7 @@ public class AssociationOverride2_0Tests extends JavaResourceModel2_0TestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - AssociationOverrideAnnotation associationOverride = (AssociationOverrideAnnotation) attributeResource.getSupportingAnnotation(JPA.ASSOCIATION_OVERRIDE); + AssociationOverrideAnnotation associationOverride = (AssociationOverrideAnnotation) attributeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDE); assertEquals(2, associationOverride.joinColumnsSize()); @@ -350,7 +350,7 @@ public class AssociationOverride2_0Tests extends JavaResourceModel2_0TestCase { public void testGetNullJoinTable() throws Exception { ICompilationUnit cu = this.createTestAssociationOverrideOnType(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - AssociationOverride2_0Annotation associationOverride = (AssociationOverride2_0Annotation) typeResource.getSupportingAnnotation(JPA.ASSOCIATION_OVERRIDE); + AssociationOverride2_0Annotation associationOverride = (AssociationOverride2_0Annotation) typeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDE); JoinTableAnnotation joinTable = associationOverride.getJoinTable(); assertNotNull(associationOverride); assertNull(joinTable); @@ -359,7 +359,7 @@ public class AssociationOverride2_0Tests extends JavaResourceModel2_0TestCase { public void testJoinTableGetName() throws Exception { ICompilationUnit cu = this.createTestAssociationOverrideWithJoinTable(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - AssociationOverride2_0Annotation associationOverride = (AssociationOverride2_0Annotation) typeResource.getSupportingAnnotation(JPA.ASSOCIATION_OVERRIDE); + AssociationOverride2_0Annotation associationOverride = (AssociationOverride2_0Annotation) typeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDE); JoinTableAnnotation joinTable = associationOverride.getJoinTable(); assertEquals(JOIN_TABLE_NAME, joinTable.getName()); } @@ -367,7 +367,7 @@ public class AssociationOverride2_0Tests extends JavaResourceModel2_0TestCase { public void testJoinTableSetName() throws Exception { ICompilationUnit cu = this.createTestAssociationOverrideWithJoinTable(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - AssociationOverride2_0Annotation associationOverride = (AssociationOverride2_0Annotation) typeResource.getSupportingAnnotation(JPA.ASSOCIATION_OVERRIDE); + AssociationOverride2_0Annotation associationOverride = (AssociationOverride2_0Annotation) typeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDE); JoinTableAnnotation joinTable = associationOverride.getJoinTable(); assertEquals(JOIN_TABLE_NAME, joinTable.getName()); @@ -383,7 +383,7 @@ public class AssociationOverride2_0Tests extends JavaResourceModel2_0TestCase { public void testAddJoinTable() throws Exception { ICompilationUnit cu = this.createTestAssociationOverrideOnType(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - AssociationOverride2_0Annotation associationOverride = (AssociationOverride2_0Annotation) typeResource.getSupportingAnnotation(JPA.ASSOCIATION_OVERRIDE); + AssociationOverride2_0Annotation associationOverride = (AssociationOverride2_0Annotation) typeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDE); JoinTableAnnotation joinTable = associationOverride.getJoinTable(); assertNull(joinTable); @@ -396,7 +396,7 @@ public class AssociationOverride2_0Tests extends JavaResourceModel2_0TestCase { public void testRemoveJoinTable() throws Exception { ICompilationUnit cu = this.createTestAssociationOverrideOnType(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - AssociationOverride2_0Annotation associationOverride = (AssociationOverride2_0Annotation) typeResource.getSupportingAnnotation(JPA.ASSOCIATION_OVERRIDE); + AssociationOverride2_0Annotation associationOverride = (AssociationOverride2_0Annotation) typeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDE); JoinTableAnnotation joinTable = associationOverride.getJoinTable(); assertNull(joinTable); } @@ -405,7 +405,7 @@ public class AssociationOverride2_0Tests extends JavaResourceModel2_0TestCase { ICompilationUnit cu = this.createTestAssociationOverrideJoinTableWithCatalog(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - AssociationOverride2_0Annotation associationOverride = (AssociationOverride2_0Annotation) typeResource.getSupportingAnnotation(JPA.ASSOCIATION_OVERRIDE); + AssociationOverride2_0Annotation associationOverride = (AssociationOverride2_0Annotation) typeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDE); JoinTableAnnotation table = associationOverride.getJoinTable(); assertNotNull(table); assertEquals(CATALOG_NAME, table.getCatalog()); @@ -415,7 +415,7 @@ public class AssociationOverride2_0Tests extends JavaResourceModel2_0TestCase { ICompilationUnit cu = this.createTestAssociationOverrideWithJoinTable(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - AssociationOverride2_0Annotation associationOverride = (AssociationOverride2_0Annotation) typeResource.getSupportingAnnotation(JPA.ASSOCIATION_OVERRIDE); + AssociationOverride2_0Annotation associationOverride = (AssociationOverride2_0Annotation) typeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDE); JoinTableAnnotation table = associationOverride.getJoinTable(); assertNotNull(table); assertNull(table.getCatalog()); @@ -430,7 +430,7 @@ public class AssociationOverride2_0Tests extends JavaResourceModel2_0TestCase { ICompilationUnit cu = this.createTestAssociationOverrideJoinTableWithCatalog(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - AssociationOverride2_0Annotation associationOverride = (AssociationOverride2_0Annotation) typeResource.getSupportingAnnotation(JPA.ASSOCIATION_OVERRIDE); + AssociationOverride2_0Annotation associationOverride = (AssociationOverride2_0Annotation) typeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDE); JoinTableAnnotation table = associationOverride.getJoinTable(); assertEquals(CATALOG_NAME, table.getCatalog()); @@ -444,7 +444,7 @@ public class AssociationOverride2_0Tests extends JavaResourceModel2_0TestCase { ICompilationUnit cu = this.createTestAssociationOverrideJoinTableWithSchema(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - AssociationOverride2_0Annotation associationOverride = (AssociationOverride2_0Annotation) typeResource.getSupportingAnnotation(JPA.ASSOCIATION_OVERRIDE); + AssociationOverride2_0Annotation associationOverride = (AssociationOverride2_0Annotation) typeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDE); JoinTableAnnotation table = associationOverride.getJoinTable(); assertNotNull(table); assertEquals(SCHEMA_NAME, table.getSchema()); @@ -454,7 +454,7 @@ public class AssociationOverride2_0Tests extends JavaResourceModel2_0TestCase { ICompilationUnit cu = this.createTestAssociationOverrideWithJoinTable(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - AssociationOverride2_0Annotation associationOverride = (AssociationOverride2_0Annotation) typeResource.getSupportingAnnotation(JPA.ASSOCIATION_OVERRIDE); + AssociationOverride2_0Annotation associationOverride = (AssociationOverride2_0Annotation) typeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDE); JoinTableAnnotation table = associationOverride.getJoinTable(); assertNotNull(table); assertNull(table.getSchema()); @@ -469,7 +469,7 @@ public class AssociationOverride2_0Tests extends JavaResourceModel2_0TestCase { ICompilationUnit cu = this.createTestAssociationOverrideJoinTableWithSchema(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - AssociationOverride2_0Annotation associationOverride = (AssociationOverride2_0Annotation) typeResource.getSupportingAnnotation(JPA.ASSOCIATION_OVERRIDE); + AssociationOverride2_0Annotation associationOverride = (AssociationOverride2_0Annotation) typeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDE); JoinTableAnnotation table = associationOverride.getJoinTable(); assertEquals(SCHEMA_NAME, table.getSchema()); @@ -483,7 +483,7 @@ public class AssociationOverride2_0Tests extends JavaResourceModel2_0TestCase { ICompilationUnit cu = this.createTestAssociationOverrideWithJoinTable(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - AssociationOverride2_0Annotation associationOverride = (AssociationOverride2_0Annotation) typeResource.getSupportingAnnotation(JPA.ASSOCIATION_OVERRIDE); + AssociationOverride2_0Annotation associationOverride = (AssociationOverride2_0Annotation) typeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDE); JoinTableAnnotation table = associationOverride.getJoinTable(); assertEquals(0, table.uniqueConstraintsSize()); @@ -493,7 +493,7 @@ public class AssociationOverride2_0Tests extends JavaResourceModel2_0TestCase { ICompilationUnit cu = this.createTestAssociationOverrideWithJoinTable(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - AssociationOverride2_0Annotation associationOverride = (AssociationOverride2_0Annotation) typeResource.getSupportingAnnotation(JPA.ASSOCIATION_OVERRIDE); + AssociationOverride2_0Annotation associationOverride = (AssociationOverride2_0Annotation) typeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDE); JoinTableAnnotation table = associationOverride.getJoinTable(); @@ -507,7 +507,7 @@ public class AssociationOverride2_0Tests extends JavaResourceModel2_0TestCase { ICompilationUnit cu = this.createTestAssociationOverrideJoinTableWithUniqueConstraints(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - AssociationOverride2_0Annotation associationOverride = (AssociationOverride2_0Annotation) typeResource.getSupportingAnnotation(JPA.ASSOCIATION_OVERRIDE); + AssociationOverride2_0Annotation associationOverride = (AssociationOverride2_0Annotation) typeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDE); JoinTableAnnotation table = associationOverride.getJoinTable(); assertEquals(3, table.uniqueConstraintsSize()); @@ -517,7 +517,7 @@ public class AssociationOverride2_0Tests extends JavaResourceModel2_0TestCase { ICompilationUnit cu = this.createTestAssociationOverrideWithJoinTable(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - AssociationOverride2_0Annotation associationOverride = (AssociationOverride2_0Annotation) typeResource.getSupportingAnnotation(JPA.ASSOCIATION_OVERRIDE); + AssociationOverride2_0Annotation associationOverride = (AssociationOverride2_0Annotation) typeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDE); JoinTableAnnotation table = associationOverride.getJoinTable(); table.addUniqueConstraint(0).addColumnName("FOO"); @@ -535,7 +535,7 @@ public class AssociationOverride2_0Tests extends JavaResourceModel2_0TestCase { ICompilationUnit cu = this.createTestAssociationOverrideJoinTableWithUniqueConstraints(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - AssociationOverride2_0Annotation associationOverride = (AssociationOverride2_0Annotation) typeResource.getSupportingAnnotation(JPA.ASSOCIATION_OVERRIDE); + AssociationOverride2_0Annotation associationOverride = (AssociationOverride2_0Annotation) typeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDE); JoinTableAnnotation table = associationOverride.getJoinTable(); assertEquals("BAR", table.uniqueConstraintAt(0).columnNames().next()); assertEquals("FOO", table.uniqueConstraintAt(1).columnNames().next()); @@ -562,7 +562,7 @@ public class AssociationOverride2_0Tests extends JavaResourceModel2_0TestCase { ICompilationUnit cu = this.createTestAssociationOverrideJoinTableWithUniqueConstraints(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - AssociationOverride2_0Annotation associationOverride = (AssociationOverride2_0Annotation) typeResource.getSupportingAnnotation(JPA.ASSOCIATION_OVERRIDE); + AssociationOverride2_0Annotation associationOverride = (AssociationOverride2_0Annotation) typeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDE); JoinTableAnnotation table = associationOverride.getJoinTable(); assertSourceContains("@AssociationOverride(name = \"" + ASSOCIATION_OVERRIDE_NAME + "\", joinTable = @JoinTable(uniqueConstraints = {@UniqueConstraint(columnNames = {\"BAR\"}), @UniqueConstraint(columnNames = {\"FOO\"}), @UniqueConstraint(columnNames = {\"BAZ\"})}))", cu); @@ -574,7 +574,7 @@ public class AssociationOverride2_0Tests extends JavaResourceModel2_0TestCase { ICompilationUnit cu = this.createTestAssociationOverrideJoinTableWithUniqueConstraints(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - AssociationOverride2_0Annotation associationOverride = (AssociationOverride2_0Annotation) typeResource.getSupportingAnnotation(JPA.ASSOCIATION_OVERRIDE); + AssociationOverride2_0Annotation associationOverride = (AssociationOverride2_0Annotation) typeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDE); JoinTableAnnotation table = associationOverride.getJoinTable(); assertSourceContains("@AssociationOverride(name = \"" + ASSOCIATION_OVERRIDE_NAME + "\", joinTable = @JoinTable(uniqueConstraints = {@UniqueConstraint(columnNames = {\"BAR\"}), @UniqueConstraint(columnNames = {\"FOO\"}), @UniqueConstraint(columnNames = {\"BAZ\"})}))", cu); @@ -586,7 +586,7 @@ public class AssociationOverride2_0Tests extends JavaResourceModel2_0TestCase { ICompilationUnit cu = this.createTestAssociationOverrideWithJoinTable(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - AssociationOverride2_0Annotation associationOverride = (AssociationOverride2_0Annotation) typeResource.getSupportingAnnotation(JPA.ASSOCIATION_OVERRIDE); + AssociationOverride2_0Annotation associationOverride = (AssociationOverride2_0Annotation) typeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDE); JoinTableAnnotation table = associationOverride.getJoinTable(); assertEquals(0, table.joinColumnsSize()); @@ -596,7 +596,7 @@ public class AssociationOverride2_0Tests extends JavaResourceModel2_0TestCase { ICompilationUnit cu = this.createTestAssociationOverrideWithJoinTable(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - AssociationOverride2_0Annotation associationOverride = (AssociationOverride2_0Annotation) typeResource.getSupportingAnnotation(JPA.ASSOCIATION_OVERRIDE); + AssociationOverride2_0Annotation associationOverride = (AssociationOverride2_0Annotation) typeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDE); JoinTableAnnotation table = associationOverride.getJoinTable(); @@ -610,7 +610,7 @@ public class AssociationOverride2_0Tests extends JavaResourceModel2_0TestCase { ICompilationUnit cu = this.createTestAssociationOverrideJoinTableWithJoinColumns(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - AssociationOverride2_0Annotation associationOverride = (AssociationOverride2_0Annotation) typeResource.getSupportingAnnotation(JPA.ASSOCIATION_OVERRIDE); + AssociationOverride2_0Annotation associationOverride = (AssociationOverride2_0Annotation) typeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDE); JoinTableAnnotation table = associationOverride.getJoinTable(); assertEquals(2, table.joinColumnsSize()); @@ -620,7 +620,7 @@ public class AssociationOverride2_0Tests extends JavaResourceModel2_0TestCase { ICompilationUnit cu = this.createTestAssociationOverrideWithJoinTable(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - AssociationOverride2_0Annotation associationOverride = (AssociationOverride2_0Annotation) typeResource.getSupportingAnnotation(JPA.ASSOCIATION_OVERRIDE); + AssociationOverride2_0Annotation associationOverride = (AssociationOverride2_0Annotation) typeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDE); JoinTableAnnotation table = associationOverride.getJoinTable(); table.addJoinColumn(0).setName("FOO"); @@ -637,7 +637,7 @@ public class AssociationOverride2_0Tests extends JavaResourceModel2_0TestCase { ICompilationUnit cu = this.createTestAssociationOverrideJoinTableWithJoinColumns(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - AssociationOverride2_0Annotation associationOverride = (AssociationOverride2_0Annotation) typeResource.getSupportingAnnotation(JPA.ASSOCIATION_OVERRIDE); + AssociationOverride2_0Annotation associationOverride = (AssociationOverride2_0Annotation) typeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDE); JoinTableAnnotation table = associationOverride.getJoinTable(); table.addJoinColumn(0).setName("FOO"); @@ -667,7 +667,7 @@ public class AssociationOverride2_0Tests extends JavaResourceModel2_0TestCase { ICompilationUnit cu = this.createTestAssociationOverrideJoinTableWithJoinColumns(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - AssociationOverride2_0Annotation associationOverride = (AssociationOverride2_0Annotation) typeResource.getSupportingAnnotation(JPA.ASSOCIATION_OVERRIDE); + AssociationOverride2_0Annotation associationOverride = (AssociationOverride2_0Annotation) typeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDE); JoinTableAnnotation table = associationOverride.getJoinTable(); JoinColumnAnnotation joinColumn = table.joinColumnAt(0); joinColumn.setReferencedColumnName("REF_NAME"); @@ -693,7 +693,7 @@ public class AssociationOverride2_0Tests extends JavaResourceModel2_0TestCase { ICompilationUnit cu = this.createTestAssociationOverrideJoinTableWithJoinColumns(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - AssociationOverride2_0Annotation associationOverride = (AssociationOverride2_0Annotation) typeResource.getSupportingAnnotation(JPA.ASSOCIATION_OVERRIDE); + AssociationOverride2_0Annotation associationOverride = (AssociationOverride2_0Annotation) typeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDE); JoinTableAnnotation table = associationOverride.getJoinTable(); JoinColumnAnnotation joinColumn = table.joinColumnAt(0); @@ -722,7 +722,7 @@ public class AssociationOverride2_0Tests extends JavaResourceModel2_0TestCase { ICompilationUnit cu = this.createTestAssociationOverrideJoinTableWithJoinColumns(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - AssociationOverride2_0Annotation associationOverride = (AssociationOverride2_0Annotation) typeResource.getSupportingAnnotation(JPA.ASSOCIATION_OVERRIDE); + AssociationOverride2_0Annotation associationOverride = (AssociationOverride2_0Annotation) typeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDE); JoinTableAnnotation table = associationOverride.getJoinTable(); assertEquals(2, table.joinColumnsSize()); @@ -741,7 +741,7 @@ public class AssociationOverride2_0Tests extends JavaResourceModel2_0TestCase { ICompilationUnit cu = this.createTestAssociationOverrideWithJoinTable(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - AssociationOverride2_0Annotation associationOverride = (AssociationOverride2_0Annotation) typeResource.getSupportingAnnotation(JPA.ASSOCIATION_OVERRIDE); + AssociationOverride2_0Annotation associationOverride = (AssociationOverride2_0Annotation) typeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDE); JoinTableAnnotation table = associationOverride.getJoinTable(); assertEquals(0, table.inverseJoinColumnsSize()); @@ -751,7 +751,7 @@ public class AssociationOverride2_0Tests extends JavaResourceModel2_0TestCase { ICompilationUnit cu = this.createTestAssociationOverrideWithJoinTable(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - AssociationOverride2_0Annotation associationOverride = (AssociationOverride2_0Annotation) typeResource.getSupportingAnnotation(JPA.ASSOCIATION_OVERRIDE); + AssociationOverride2_0Annotation associationOverride = (AssociationOverride2_0Annotation) typeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDE); JoinTableAnnotation table = associationOverride.getJoinTable(); @@ -765,7 +765,7 @@ public class AssociationOverride2_0Tests extends JavaResourceModel2_0TestCase { ICompilationUnit cu = this.createTestAssociationOverrideJoinTableWithInverseJoinColumns(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - AssociationOverride2_0Annotation associationOverride = (AssociationOverride2_0Annotation) typeResource.getSupportingAnnotation(JPA.ASSOCIATION_OVERRIDE); + AssociationOverride2_0Annotation associationOverride = (AssociationOverride2_0Annotation) typeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDE); JoinTableAnnotation table = associationOverride.getJoinTable(); assertEquals(2, table.inverseJoinColumnsSize()); @@ -775,7 +775,7 @@ public class AssociationOverride2_0Tests extends JavaResourceModel2_0TestCase { ICompilationUnit cu = this.createTestAssociationOverrideWithJoinTable(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - AssociationOverride2_0Annotation associationOverride = (AssociationOverride2_0Annotation) typeResource.getSupportingAnnotation(JPA.ASSOCIATION_OVERRIDE); + AssociationOverride2_0Annotation associationOverride = (AssociationOverride2_0Annotation) typeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDE); JoinTableAnnotation table = associationOverride.getJoinTable(); table.addInverseJoinColumn(0).setName("FOO"); @@ -792,7 +792,7 @@ public class AssociationOverride2_0Tests extends JavaResourceModel2_0TestCase { ICompilationUnit cu = this.createTestAssociationOverrideJoinTableWithInverseJoinColumns(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - AssociationOverride2_0Annotation associationOverride = (AssociationOverride2_0Annotation) typeResource.getSupportingAnnotation(JPA.ASSOCIATION_OVERRIDE); + AssociationOverride2_0Annotation associationOverride = (AssociationOverride2_0Annotation) typeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDE); JoinTableAnnotation table = associationOverride.getJoinTable(); table.addInverseJoinColumn(2).setName("FOO"); @@ -823,7 +823,7 @@ public class AssociationOverride2_0Tests extends JavaResourceModel2_0TestCase { ICompilationUnit cu = this.createTestAssociationOverrideJoinTableWithInverseJoinColumns(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - AssociationOverride2_0Annotation associationOverride = (AssociationOverride2_0Annotation) typeResource.getSupportingAnnotation(JPA.ASSOCIATION_OVERRIDE); + AssociationOverride2_0Annotation associationOverride = (AssociationOverride2_0Annotation) typeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDE); JoinTableAnnotation table = associationOverride.getJoinTable(); table.addInverseJoinColumn(0).setName("FOO"); @@ -845,7 +845,7 @@ public class AssociationOverride2_0Tests extends JavaResourceModel2_0TestCase { ICompilationUnit cu = this.createTestAssociationOverrideJoinTableWithInverseJoinColumns(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - AssociationOverride2_0Annotation associationOverride = (AssociationOverride2_0Annotation) typeResource.getSupportingAnnotation(JPA.ASSOCIATION_OVERRIDE); + AssociationOverride2_0Annotation associationOverride = (AssociationOverride2_0Annotation) typeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDE); JoinTableAnnotation table = associationOverride.getJoinTable(); table.addInverseJoinColumn(1).setName("FOO"); @@ -867,7 +867,7 @@ public class AssociationOverride2_0Tests extends JavaResourceModel2_0TestCase { ICompilationUnit cu = this.createTestAssociationOverrideJoinTableWithInverseJoinColumns(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - AssociationOverride2_0Annotation associationOverride = (AssociationOverride2_0Annotation) typeResource.getSupportingAnnotation(JPA.ASSOCIATION_OVERRIDE); + AssociationOverride2_0Annotation associationOverride = (AssociationOverride2_0Annotation) typeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDE); JoinTableAnnotation table = associationOverride.getJoinTable(); assertEquals(2, table.inverseJoinColumnsSize()); diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/jpa2/resource/java/AssociationOverrides2_0Tests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/jpa2/resource/java/AssociationOverrides2_0Tests.java index 6a1eef964b..f1d5b7acd9 100644 --- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/jpa2/resource/java/AssociationOverrides2_0Tests.java +++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/jpa2/resource/java/AssociationOverrides2_0Tests.java @@ -173,7 +173,7 @@ public class AssociationOverrides2_0Tests extends JavaResourceModel2_0TestCase { ICompilationUnit cu = this.createTestAssociationOverrideOnField(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - AssociationOverridesAnnotation associationOverrides = (AssociationOverridesAnnotation) attributeResource.getSupportingAnnotation(JPA.ASSOCIATION_OVERRIDES); + AssociationOverridesAnnotation associationOverrides = (AssociationOverridesAnnotation) attributeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDES); AssociationOverrideAnnotation associationOverride = associationOverrides.nestedAnnotations().next(); assertNotNull(associationOverride); @@ -184,7 +184,7 @@ public class AssociationOverrides2_0Tests extends JavaResourceModel2_0TestCase { ICompilationUnit cu = this.createTestAssociationOverrideOnField(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - AssociationOverridesAnnotation associationOverrides = (AssociationOverridesAnnotation) attributeResource.getSupportingAnnotation(JPA.ASSOCIATION_OVERRIDES); + AssociationOverridesAnnotation associationOverrides = (AssociationOverridesAnnotation) attributeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDES); AssociationOverrideAnnotation associationOverride = associationOverrides.nestedAnnotations().next(); assertNotNull(associationOverride); @@ -199,7 +199,7 @@ public class AssociationOverrides2_0Tests extends JavaResourceModel2_0TestCase { ICompilationUnit cu = this.createTestAssociationOverrideOnField(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - AssociationOverridesAnnotation associationOverrides = (AssociationOverridesAnnotation) attributeResource.getSupportingAnnotation(JPA.ASSOCIATION_OVERRIDES); + AssociationOverridesAnnotation associationOverrides = (AssociationOverridesAnnotation) attributeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDES); AssociationOverrideAnnotation associationOverride = associationOverrides.nestedAnnotations().next(); assertEquals(ASSOCIATION_OVERRIDE_NAME, associationOverride.getName()); @@ -215,46 +215,46 @@ public class AssociationOverrides2_0Tests extends JavaResourceModel2_0TestCase { ICompilationUnit cu = createTestAssociationOverride(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - AssociationOverrideAnnotation associationOverride = (AssociationOverrideAnnotation) typeResource.addSupportingAnnotation(1, JPA.ASSOCIATION_OVERRIDE, JPA.ASSOCIATION_OVERRIDES); + AssociationOverrideAnnotation associationOverride = (AssociationOverrideAnnotation) typeResource.addAnnotation(1, JPA.ASSOCIATION_OVERRIDE, JPA.ASSOCIATION_OVERRIDES); associationOverride.setName("BAR"); assertSourceContains("@AssociationOverrides({@AssociationOverride(name = \"FOO\", joinColumns = @JoinColumn(name = \"FOO\", columnDefinition = \"BAR\", referencedColumnName = \"BAZ\")),@AssociationOverride(name = \"BAR\")})", cu); - assertNull(typeResource.getSupportingAnnotation(JPA.ASSOCIATION_OVERRIDE)); - assertNotNull(typeResource.getSupportingAnnotation(JPA.ASSOCIATION_OVERRIDES)); - assertEquals(2, CollectionTools.size(typeResource.supportingAnnotations(JPA.ASSOCIATION_OVERRIDE, JPA.ASSOCIATION_OVERRIDES))); + assertNull(typeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDE)); + assertNotNull(typeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDES)); + assertEquals(2, CollectionTools.size(typeResource.annotations(JPA.ASSOCIATION_OVERRIDE, JPA.ASSOCIATION_OVERRIDES))); } public void testAddAssociationOverrideToBeginningOfList() throws Exception { ICompilationUnit cu = createTestAssociationOverride(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - AssociationOverrideAnnotation associationOverride = (AssociationOverrideAnnotation) typeResource.addSupportingAnnotation(1, JPA.ASSOCIATION_OVERRIDE, JPA.ASSOCIATION_OVERRIDES); + AssociationOverrideAnnotation associationOverride = (AssociationOverrideAnnotation) typeResource.addAnnotation(1, JPA.ASSOCIATION_OVERRIDE, JPA.ASSOCIATION_OVERRIDES); associationOverride.setName("BAR"); assertSourceContains("@AssociationOverrides({@AssociationOverride(name = \"FOO\", joinColumns = @JoinColumn(name = \"FOO\", columnDefinition = \"BAR\", referencedColumnName = \"BAZ\")),@AssociationOverride(name = \"BAR\")})", cu); - associationOverride = (AssociationOverrideAnnotation) typeResource.addSupportingAnnotation(0, JPA.ASSOCIATION_OVERRIDE, JPA.ASSOCIATION_OVERRIDES); + associationOverride = (AssociationOverrideAnnotation) typeResource.addAnnotation(0, JPA.ASSOCIATION_OVERRIDE, JPA.ASSOCIATION_OVERRIDES); associationOverride.setName("BAZ"); assertSourceContains("@AssociationOverrides({@AssociationOverride(name = \"BAZ\"),@AssociationOverride(name = \"FOO\", joinColumns = @JoinColumn(name = \"FOO\", columnDefinition = \"BAR\", referencedColumnName = \"BAZ\")), @AssociationOverride(name = \"BAR\")})", cu); - Iterator<NestableAnnotation> associationOverrides = typeResource.supportingAnnotations(JPA.ASSOCIATION_OVERRIDE, JPA.ASSOCIATION_OVERRIDES); + Iterator<NestableAnnotation> associationOverrides = typeResource.annotations(JPA.ASSOCIATION_OVERRIDE, JPA.ASSOCIATION_OVERRIDES); assertEquals("BAZ", ((AssociationOverrideAnnotation) associationOverrides.next()).getName()); assertEquals("FOO", ((AssociationOverrideAnnotation) associationOverrides.next()).getName()); assertEquals("BAR", ((AssociationOverrideAnnotation) associationOverrides.next()).getName()); - assertNull(typeResource.getSupportingAnnotation(JPA.ASSOCIATION_OVERRIDE)); - assertNotNull(typeResource.getSupportingAnnotation(JPA.ASSOCIATION_OVERRIDES)); - assertEquals(3, CollectionTools.size(typeResource.supportingAnnotations(JPA.ASSOCIATION_OVERRIDE, JPA.ASSOCIATION_OVERRIDES))); + assertNull(typeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDE)); + assertNotNull(typeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDES)); + assertEquals(3, CollectionTools.size(typeResource.annotations(JPA.ASSOCIATION_OVERRIDE, JPA.ASSOCIATION_OVERRIDES))); } public void testRemoveAssociationOverrideCopyExisting() throws Exception { ICompilationUnit cu = createTestAssociationOverride(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - AssociationOverrideAnnotation associationOverride = (AssociationOverrideAnnotation) typeResource.addSupportingAnnotation(1, JPA.ASSOCIATION_OVERRIDE, JPA.ASSOCIATION_OVERRIDES); + AssociationOverrideAnnotation associationOverride = (AssociationOverrideAnnotation) typeResource.addAnnotation(1, JPA.ASSOCIATION_OVERRIDE, JPA.ASSOCIATION_OVERRIDES); associationOverride.setName("BAR"); assertSourceContains("@AssociationOverrides({@AssociationOverride(name = \"FOO\", joinColumns = @JoinColumn(name = \"FOO\", columnDefinition = \"BAR\", referencedColumnName = \"BAZ\")),@AssociationOverride(name = \"BAR\")})", cu); - typeResource.removeSupportingAnnotation(1, JPA.ASSOCIATION_OVERRIDE, JPA.ASSOCIATION_OVERRIDES); + typeResource.removeAnnotation(1, JPA.ASSOCIATION_OVERRIDE, JPA.ASSOCIATION_OVERRIDES); assertSourceContains("@AssociationOverride(name = \"FOO\", joinColumns = @JoinColumn(name = \"FOO\", columnDefinition = \"BAR\", referencedColumnName = \"BAZ\"))", cu); } @@ -263,7 +263,7 @@ public class AssociationOverrides2_0Tests extends JavaResourceModel2_0TestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - AssociationOverrideAnnotation associationOverride = (AssociationOverrideAnnotation) attributeResource.supportingAnnotations(JPA.ASSOCIATION_OVERRIDE, JPA.ASSOCIATION_OVERRIDES).next(); + AssociationOverrideAnnotation associationOverride = (AssociationOverrideAnnotation) attributeResource.annotations(JPA.ASSOCIATION_OVERRIDE, JPA.ASSOCIATION_OVERRIDES).next(); assertEquals(0, associationOverride.joinColumnsSize()); } @@ -273,7 +273,7 @@ public class AssociationOverrides2_0Tests extends JavaResourceModel2_0TestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - AssociationOverrideAnnotation associationOverride = (AssociationOverrideAnnotation) attributeResource.supportingAnnotations(JPA.ASSOCIATION_OVERRIDE, JPA.ASSOCIATION_OVERRIDES).next(); + AssociationOverrideAnnotation associationOverride = (AssociationOverrideAnnotation) attributeResource.annotations(JPA.ASSOCIATION_OVERRIDE, JPA.ASSOCIATION_OVERRIDES).next(); associationOverride.addJoinColumn(0); associationOverride.addJoinColumn(1); @@ -286,7 +286,7 @@ public class AssociationOverrides2_0Tests extends JavaResourceModel2_0TestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - AssociationOverrideAnnotation associationOverride = (AssociationOverrideAnnotation) attributeResource.supportingAnnotations(JPA.ASSOCIATION_OVERRIDE, JPA.ASSOCIATION_OVERRIDES).next(); + AssociationOverrideAnnotation associationOverride = (AssociationOverrideAnnotation) attributeResource.annotations(JPA.ASSOCIATION_OVERRIDE, JPA.ASSOCIATION_OVERRIDES).next(); assertEquals(2, associationOverride.joinColumnsSize()); } @@ -296,7 +296,7 @@ public class AssociationOverrides2_0Tests extends JavaResourceModel2_0TestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - AssociationOverrideAnnotation associationOverride = (AssociationOverrideAnnotation) attributeResource.supportingAnnotations(JPA.ASSOCIATION_OVERRIDE, JPA.ASSOCIATION_OVERRIDES).next(); + AssociationOverrideAnnotation associationOverride = (AssociationOverrideAnnotation) attributeResource.annotations(JPA.ASSOCIATION_OVERRIDE, JPA.ASSOCIATION_OVERRIDES).next(); associationOverride.addJoinColumn(0).setName("FOO"); associationOverride.addJoinColumn(1); @@ -316,7 +316,7 @@ public class AssociationOverrides2_0Tests extends JavaResourceModel2_0TestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - AssociationOverrideAnnotation associationOverride = (AssociationOverrideAnnotation) attributeResource.supportingAnnotations(JPA.ASSOCIATION_OVERRIDE, JPA.ASSOCIATION_OVERRIDES).next(); + AssociationOverrideAnnotation associationOverride = (AssociationOverrideAnnotation) attributeResource.annotations(JPA.ASSOCIATION_OVERRIDE, JPA.ASSOCIATION_OVERRIDES).next(); associationOverride.addJoinColumn(0).setName("FOO"); Iterator<JoinColumnAnnotation> joinColumns = associationOverride.joinColumns(); @@ -350,7 +350,7 @@ public class AssociationOverrides2_0Tests extends JavaResourceModel2_0TestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - AssociationOverrideAnnotation associationOverride = (AssociationOverrideAnnotation) attributeResource.supportingAnnotations(JPA.ASSOCIATION_OVERRIDE, JPA.ASSOCIATION_OVERRIDES).next(); + AssociationOverrideAnnotation associationOverride = (AssociationOverrideAnnotation) attributeResource.annotations(JPA.ASSOCIATION_OVERRIDE, JPA.ASSOCIATION_OVERRIDES).next(); JoinColumnAnnotation joinColumn = associationOverride.joinColumnAt(0); joinColumn.setReferencedColumnName("REF_NAME"); joinColumn.setUnique(Boolean.FALSE); @@ -375,7 +375,7 @@ public class AssociationOverrides2_0Tests extends JavaResourceModel2_0TestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - AssociationOverrideAnnotation associationOverride = (AssociationOverrideAnnotation) attributeResource.supportingAnnotations(JPA.ASSOCIATION_OVERRIDE, JPA.ASSOCIATION_OVERRIDES).next(); + AssociationOverrideAnnotation associationOverride = (AssociationOverrideAnnotation) attributeResource.annotations(JPA.ASSOCIATION_OVERRIDE, JPA.ASSOCIATION_OVERRIDES).next(); JoinColumnAnnotation joinColumn = associationOverride.joinColumnAt(0); joinColumn.setReferencedColumnName("REF_NAME"); @@ -401,7 +401,7 @@ public class AssociationOverrides2_0Tests extends JavaResourceModel2_0TestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - AssociationOverrideAnnotation associationOverride = (AssociationOverrideAnnotation) attributeResource.supportingAnnotations(JPA.ASSOCIATION_OVERRIDE, JPA.ASSOCIATION_OVERRIDES).next(); + AssociationOverrideAnnotation associationOverride = (AssociationOverrideAnnotation) attributeResource.annotations(JPA.ASSOCIATION_OVERRIDE, JPA.ASSOCIATION_OVERRIDES).next(); assertEquals(2, associationOverride.joinColumnsSize()); @@ -418,7 +418,7 @@ public class AssociationOverrides2_0Tests extends JavaResourceModel2_0TestCase { public void testGetNullJoinTable() throws Exception { ICompilationUnit cu = this.createTestAssociationOverrideOnType(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - AssociationOverridesAnnotation associationOverrides = (AssociationOverridesAnnotation) typeResource.getSupportingAnnotation(JPA.ASSOCIATION_OVERRIDES); + AssociationOverridesAnnotation associationOverrides = (AssociationOverridesAnnotation) typeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDES); AssociationOverride2_0Annotation associationOverride = (AssociationOverride2_0Annotation) associationOverrides.nestedAnnotations().next(); JoinTableAnnotation joinTable = associationOverride.getJoinTable(); assertNotNull(associationOverride); @@ -428,7 +428,7 @@ public class AssociationOverrides2_0Tests extends JavaResourceModel2_0TestCase { public void testJoinTableGetName() throws Exception { ICompilationUnit cu = this.createTestAssociationOverrideWithJoinTable(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - AssociationOverridesAnnotation associationOverrides = (AssociationOverridesAnnotation) typeResource.getSupportingAnnotation(JPA.ASSOCIATION_OVERRIDES); + AssociationOverridesAnnotation associationOverrides = (AssociationOverridesAnnotation) typeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDES); AssociationOverride2_0Annotation associationOverride = (AssociationOverride2_0Annotation) associationOverrides.nestedAnnotations().next(); JoinTableAnnotation joinTable = associationOverride.getJoinTable(); assertEquals(JOIN_TABLE_NAME, joinTable.getName()); @@ -437,7 +437,7 @@ public class AssociationOverrides2_0Tests extends JavaResourceModel2_0TestCase { public void testJoinTableSetName() throws Exception { ICompilationUnit cu = this.createTestAssociationOverrideWithJoinTable(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - AssociationOverridesAnnotation associationOverrides = (AssociationOverridesAnnotation) typeResource.getSupportingAnnotation(JPA.ASSOCIATION_OVERRIDES); + AssociationOverridesAnnotation associationOverrides = (AssociationOverridesAnnotation) typeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDES); AssociationOverride2_0Annotation associationOverride = (AssociationOverride2_0Annotation) associationOverrides.nestedAnnotations().next(); JoinTableAnnotation joinTable = associationOverride.getJoinTable(); assertEquals(JOIN_TABLE_NAME, joinTable.getName()); @@ -454,7 +454,7 @@ public class AssociationOverrides2_0Tests extends JavaResourceModel2_0TestCase { public void testAddJoinTable() throws Exception { ICompilationUnit cu = this.createTestAssociationOverrideOnType(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - AssociationOverridesAnnotation associationOverrides = (AssociationOverridesAnnotation) typeResource.getSupportingAnnotation(JPA.ASSOCIATION_OVERRIDES); + AssociationOverridesAnnotation associationOverrides = (AssociationOverridesAnnotation) typeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDES); AssociationOverride2_0Annotation associationOverride = (AssociationOverride2_0Annotation) associationOverrides.nestedAnnotations().next(); JoinTableAnnotation joinTable = associationOverride.getJoinTable(); assertNull(joinTable); @@ -468,7 +468,7 @@ public class AssociationOverrides2_0Tests extends JavaResourceModel2_0TestCase { public void testRemoveJoinTable() throws Exception { ICompilationUnit cu = this.createTestAssociationOverrideOnType(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - AssociationOverridesAnnotation associationOverrides = (AssociationOverridesAnnotation) typeResource.getSupportingAnnotation(JPA.ASSOCIATION_OVERRIDES); + AssociationOverridesAnnotation associationOverrides = (AssociationOverridesAnnotation) typeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDES); AssociationOverride2_0Annotation associationOverride = (AssociationOverride2_0Annotation) associationOverrides.nestedAnnotations().next(); JoinTableAnnotation joinTable = associationOverride.getJoinTable(); assertNull(joinTable); @@ -478,7 +478,7 @@ public class AssociationOverrides2_0Tests extends JavaResourceModel2_0TestCase { ICompilationUnit cu = this.createTestAssociationOverrideJoinTableWithCatalog(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - AssociationOverridesAnnotation associationOverrides = (AssociationOverridesAnnotation) typeResource.getSupportingAnnotation(JPA.ASSOCIATION_OVERRIDES); + AssociationOverridesAnnotation associationOverrides = (AssociationOverridesAnnotation) typeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDES); AssociationOverride2_0Annotation associationOverride = (AssociationOverride2_0Annotation) associationOverrides.nestedAnnotations().next(); JoinTableAnnotation table = associationOverride.getJoinTable(); assertNotNull(table); @@ -489,7 +489,7 @@ public class AssociationOverrides2_0Tests extends JavaResourceModel2_0TestCase { ICompilationUnit cu = this.createTestAssociationOverrideWithJoinTable(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - AssociationOverridesAnnotation associationOverrides = (AssociationOverridesAnnotation) typeResource.getSupportingAnnotation(JPA.ASSOCIATION_OVERRIDES); + AssociationOverridesAnnotation associationOverrides = (AssociationOverridesAnnotation) typeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDES); AssociationOverride2_0Annotation associationOverride = (AssociationOverride2_0Annotation) associationOverrides.nestedAnnotations().next(); JoinTableAnnotation table = associationOverride.getJoinTable(); assertNotNull(table); @@ -505,7 +505,7 @@ public class AssociationOverrides2_0Tests extends JavaResourceModel2_0TestCase { ICompilationUnit cu = this.createTestAssociationOverrideJoinTableWithCatalog(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - AssociationOverridesAnnotation associationOverrides = (AssociationOverridesAnnotation) typeResource.getSupportingAnnotation(JPA.ASSOCIATION_OVERRIDES); + AssociationOverridesAnnotation associationOverrides = (AssociationOverridesAnnotation) typeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDES); AssociationOverride2_0Annotation associationOverride = (AssociationOverride2_0Annotation) associationOverrides.nestedAnnotations().next(); JoinTableAnnotation table = associationOverride.getJoinTable(); assertEquals(CATALOG_NAME, table.getCatalog()); @@ -520,7 +520,7 @@ public class AssociationOverrides2_0Tests extends JavaResourceModel2_0TestCase { ICompilationUnit cu = this.createTestAssociationOverrideJoinTableWithSchema(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - AssociationOverridesAnnotation associationOverrides = (AssociationOverridesAnnotation) typeResource.getSupportingAnnotation(JPA.ASSOCIATION_OVERRIDES); + AssociationOverridesAnnotation associationOverrides = (AssociationOverridesAnnotation) typeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDES); AssociationOverride2_0Annotation associationOverride = (AssociationOverride2_0Annotation) associationOverrides.nestedAnnotations().next(); JoinTableAnnotation table = associationOverride.getJoinTable(); assertNotNull(table); @@ -531,7 +531,7 @@ public class AssociationOverrides2_0Tests extends JavaResourceModel2_0TestCase { ICompilationUnit cu = this.createTestAssociationOverrideWithJoinTable(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - AssociationOverridesAnnotation associationOverrides = (AssociationOverridesAnnotation) typeResource.getSupportingAnnotation(JPA.ASSOCIATION_OVERRIDES); + AssociationOverridesAnnotation associationOverrides = (AssociationOverridesAnnotation) typeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDES); AssociationOverride2_0Annotation associationOverride = (AssociationOverride2_0Annotation) associationOverrides.nestedAnnotations().next(); JoinTableAnnotation table = associationOverride.getJoinTable(); assertNotNull(table); @@ -547,7 +547,7 @@ public class AssociationOverrides2_0Tests extends JavaResourceModel2_0TestCase { ICompilationUnit cu = this.createTestAssociationOverrideJoinTableWithSchema(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - AssociationOverridesAnnotation associationOverrides = (AssociationOverridesAnnotation) typeResource.getSupportingAnnotation(JPA.ASSOCIATION_OVERRIDES); + AssociationOverridesAnnotation associationOverrides = (AssociationOverridesAnnotation) typeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDES); AssociationOverride2_0Annotation associationOverride = (AssociationOverride2_0Annotation) associationOverrides.nestedAnnotations().next(); JoinTableAnnotation table = associationOverride.getJoinTable(); assertEquals(SCHEMA_NAME, table.getSchema()); @@ -562,7 +562,7 @@ public class AssociationOverrides2_0Tests extends JavaResourceModel2_0TestCase { ICompilationUnit cu = this.createTestAssociationOverrideWithJoinTable(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - AssociationOverridesAnnotation associationOverrides = (AssociationOverridesAnnotation) typeResource.getSupportingAnnotation(JPA.ASSOCIATION_OVERRIDES); + AssociationOverridesAnnotation associationOverrides = (AssociationOverridesAnnotation) typeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDES); AssociationOverride2_0Annotation associationOverride = (AssociationOverride2_0Annotation) associationOverrides.nestedAnnotations().next(); JoinTableAnnotation table = associationOverride.getJoinTable(); @@ -573,7 +573,7 @@ public class AssociationOverrides2_0Tests extends JavaResourceModel2_0TestCase { ICompilationUnit cu = this.createTestAssociationOverrideWithJoinTable(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - AssociationOverridesAnnotation associationOverrides = (AssociationOverridesAnnotation) typeResource.getSupportingAnnotation(JPA.ASSOCIATION_OVERRIDES); + AssociationOverridesAnnotation associationOverrides = (AssociationOverridesAnnotation) typeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDES); AssociationOverride2_0Annotation associationOverride = (AssociationOverride2_0Annotation) associationOverrides.nestedAnnotations().next(); JoinTableAnnotation table = associationOverride.getJoinTable(); @@ -588,7 +588,7 @@ public class AssociationOverrides2_0Tests extends JavaResourceModel2_0TestCase { ICompilationUnit cu = this.createTestAssociationOverrideJoinTableWithUniqueConstraints(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - AssociationOverridesAnnotation associationOverrides = (AssociationOverridesAnnotation) typeResource.getSupportingAnnotation(JPA.ASSOCIATION_OVERRIDES); + AssociationOverridesAnnotation associationOverrides = (AssociationOverridesAnnotation) typeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDES); AssociationOverride2_0Annotation associationOverride = (AssociationOverride2_0Annotation) associationOverrides.nestedAnnotations().next(); JoinTableAnnotation table = associationOverride.getJoinTable(); @@ -599,7 +599,7 @@ public class AssociationOverrides2_0Tests extends JavaResourceModel2_0TestCase { ICompilationUnit cu = this.createTestAssociationOverrideWithJoinTable(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - AssociationOverridesAnnotation associationOverrides = (AssociationOverridesAnnotation) typeResource.getSupportingAnnotation(JPA.ASSOCIATION_OVERRIDES); + AssociationOverridesAnnotation associationOverrides = (AssociationOverridesAnnotation) typeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDES); AssociationOverride2_0Annotation associationOverride = (AssociationOverride2_0Annotation) associationOverrides.nestedAnnotations().next(); JoinTableAnnotation table = associationOverride.getJoinTable(); @@ -618,7 +618,7 @@ public class AssociationOverrides2_0Tests extends JavaResourceModel2_0TestCase { ICompilationUnit cu = this.createTestAssociationOverrideJoinTableWithUniqueConstraints(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - AssociationOverridesAnnotation associationOverrides = (AssociationOverridesAnnotation) typeResource.getSupportingAnnotation(JPA.ASSOCIATION_OVERRIDES); + AssociationOverridesAnnotation associationOverrides = (AssociationOverridesAnnotation) typeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDES); AssociationOverride2_0Annotation associationOverride = (AssociationOverride2_0Annotation) associationOverrides.nestedAnnotations().next(); JoinTableAnnotation table = associationOverride.getJoinTable(); assertEquals("BAR", table.uniqueConstraintAt(0).columnNames().next()); @@ -646,7 +646,7 @@ public class AssociationOverrides2_0Tests extends JavaResourceModel2_0TestCase { ICompilationUnit cu = this.createTestAssociationOverrideJoinTableWithUniqueConstraints(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - AssociationOverridesAnnotation associationOverrides = (AssociationOverridesAnnotation) typeResource.getSupportingAnnotation(JPA.ASSOCIATION_OVERRIDES); + AssociationOverridesAnnotation associationOverrides = (AssociationOverridesAnnotation) typeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDES); AssociationOverride2_0Annotation associationOverride = (AssociationOverride2_0Annotation) associationOverrides.nestedAnnotations().next(); JoinTableAnnotation table = associationOverride.getJoinTable(); assertSourceContains("@AssociationOverride(name = \"" + ASSOCIATION_OVERRIDE_NAME + "\", joinTable = @JoinTable(uniqueConstraints = {@UniqueConstraint(columnNames = {\"BAR\"}), @UniqueConstraint(columnNames = {\"FOO\"}), @UniqueConstraint(columnNames = {\"BAZ\"})}))", cu); @@ -659,7 +659,7 @@ public class AssociationOverrides2_0Tests extends JavaResourceModel2_0TestCase { ICompilationUnit cu = this.createTestAssociationOverrideJoinTableWithUniqueConstraints(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - AssociationOverridesAnnotation associationOverrides = (AssociationOverridesAnnotation) typeResource.getSupportingAnnotation(JPA.ASSOCIATION_OVERRIDES); + AssociationOverridesAnnotation associationOverrides = (AssociationOverridesAnnotation) typeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDES); AssociationOverride2_0Annotation associationOverride = (AssociationOverride2_0Annotation) associationOverrides.nestedAnnotations().next(); JoinTableAnnotation table = associationOverride.getJoinTable(); assertSourceContains("@AssociationOverride(name = \"" + ASSOCIATION_OVERRIDE_NAME + "\", joinTable = @JoinTable(uniqueConstraints = {@UniqueConstraint(columnNames = {\"BAR\"}), @UniqueConstraint(columnNames = {\"FOO\"}), @UniqueConstraint(columnNames = {\"BAZ\"})}))", cu); @@ -672,7 +672,7 @@ public class AssociationOverrides2_0Tests extends JavaResourceModel2_0TestCase { ICompilationUnit cu = this.createTestAssociationOverrideWithJoinTable(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - AssociationOverridesAnnotation associationOverrides = (AssociationOverridesAnnotation) typeResource.getSupportingAnnotation(JPA.ASSOCIATION_OVERRIDES); + AssociationOverridesAnnotation associationOverrides = (AssociationOverridesAnnotation) typeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDES); AssociationOverride2_0Annotation associationOverride = (AssociationOverride2_0Annotation) associationOverrides.nestedAnnotations().next(); JoinTableAnnotation table = associationOverride.getJoinTable(); @@ -683,7 +683,7 @@ public class AssociationOverrides2_0Tests extends JavaResourceModel2_0TestCase { ICompilationUnit cu = this.createTestAssociationOverrideWithJoinTable(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - AssociationOverridesAnnotation associationOverrides = (AssociationOverridesAnnotation) typeResource.getSupportingAnnotation(JPA.ASSOCIATION_OVERRIDES); + AssociationOverridesAnnotation associationOverrides = (AssociationOverridesAnnotation) typeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDES); AssociationOverride2_0Annotation associationOverride = (AssociationOverride2_0Annotation) associationOverrides.nestedAnnotations().next(); JoinTableAnnotation table = associationOverride.getJoinTable(); @@ -698,7 +698,7 @@ public class AssociationOverrides2_0Tests extends JavaResourceModel2_0TestCase { ICompilationUnit cu = this.createTestAssociationOverrideJoinTableWithJoinColumns(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - AssociationOverridesAnnotation associationOverrides = (AssociationOverridesAnnotation) typeResource.getSupportingAnnotation(JPA.ASSOCIATION_OVERRIDES); + AssociationOverridesAnnotation associationOverrides = (AssociationOverridesAnnotation) typeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDES); AssociationOverride2_0Annotation associationOverride = (AssociationOverride2_0Annotation) associationOverrides.nestedAnnotations().next(); JoinTableAnnotation table = associationOverride.getJoinTable(); @@ -709,7 +709,7 @@ public class AssociationOverrides2_0Tests extends JavaResourceModel2_0TestCase { ICompilationUnit cu = this.createTestAssociationOverrideWithJoinTable(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - AssociationOverridesAnnotation associationOverrides = (AssociationOverridesAnnotation) typeResource.getSupportingAnnotation(JPA.ASSOCIATION_OVERRIDES); + AssociationOverridesAnnotation associationOverrides = (AssociationOverridesAnnotation) typeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDES); AssociationOverride2_0Annotation associationOverride = (AssociationOverride2_0Annotation) associationOverrides.nestedAnnotations().next(); JoinTableAnnotation table = associationOverride.getJoinTable(); @@ -727,7 +727,7 @@ public class AssociationOverrides2_0Tests extends JavaResourceModel2_0TestCase { ICompilationUnit cu = this.createTestAssociationOverrideJoinTableWithJoinColumns(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - AssociationOverridesAnnotation associationOverrides = (AssociationOverridesAnnotation) typeResource.getSupportingAnnotation(JPA.ASSOCIATION_OVERRIDES); + AssociationOverridesAnnotation associationOverrides = (AssociationOverridesAnnotation) typeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDES); AssociationOverride2_0Annotation associationOverride = (AssociationOverride2_0Annotation) associationOverrides.nestedAnnotations().next(); JoinTableAnnotation table = associationOverride.getJoinTable(); table.addJoinColumn(0).setName("FOO"); @@ -758,7 +758,7 @@ public class AssociationOverrides2_0Tests extends JavaResourceModel2_0TestCase { ICompilationUnit cu = this.createTestAssociationOverrideJoinTableWithJoinColumns(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - AssociationOverridesAnnotation associationOverrides = (AssociationOverridesAnnotation) typeResource.getSupportingAnnotation(JPA.ASSOCIATION_OVERRIDES); + AssociationOverridesAnnotation associationOverrides = (AssociationOverridesAnnotation) typeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDES); AssociationOverride2_0Annotation associationOverride = (AssociationOverride2_0Annotation) associationOverrides.nestedAnnotations().next(); JoinTableAnnotation table = associationOverride.getJoinTable(); JoinColumnAnnotation joinColumn = table.joinColumnAt(0); @@ -785,7 +785,7 @@ public class AssociationOverrides2_0Tests extends JavaResourceModel2_0TestCase { ICompilationUnit cu = this.createTestAssociationOverrideJoinTableWithJoinColumns(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - AssociationOverridesAnnotation associationOverrides = (AssociationOverridesAnnotation) typeResource.getSupportingAnnotation(JPA.ASSOCIATION_OVERRIDES); + AssociationOverridesAnnotation associationOverrides = (AssociationOverridesAnnotation) typeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDES); AssociationOverride2_0Annotation associationOverride = (AssociationOverride2_0Annotation) associationOverrides.nestedAnnotations().next(); JoinTableAnnotation table = associationOverride.getJoinTable(); @@ -815,7 +815,7 @@ public class AssociationOverrides2_0Tests extends JavaResourceModel2_0TestCase { ICompilationUnit cu = this.createTestAssociationOverrideJoinTableWithJoinColumns(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - AssociationOverridesAnnotation associationOverrides = (AssociationOverridesAnnotation) typeResource.getSupportingAnnotation(JPA.ASSOCIATION_OVERRIDES); + AssociationOverridesAnnotation associationOverrides = (AssociationOverridesAnnotation) typeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDES); AssociationOverride2_0Annotation associationOverride = (AssociationOverride2_0Annotation) associationOverrides.nestedAnnotations().next(); JoinTableAnnotation table = associationOverride.getJoinTable(); @@ -835,7 +835,7 @@ public class AssociationOverrides2_0Tests extends JavaResourceModel2_0TestCase { ICompilationUnit cu = this.createTestAssociationOverrideWithJoinTable(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - AssociationOverridesAnnotation associationOverrides = (AssociationOverridesAnnotation) typeResource.getSupportingAnnotation(JPA.ASSOCIATION_OVERRIDES); + AssociationOverridesAnnotation associationOverrides = (AssociationOverridesAnnotation) typeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDES); AssociationOverride2_0Annotation associationOverride = (AssociationOverride2_0Annotation) associationOverrides.nestedAnnotations().next(); JoinTableAnnotation table = associationOverride.getJoinTable(); @@ -846,7 +846,7 @@ public class AssociationOverrides2_0Tests extends JavaResourceModel2_0TestCase { ICompilationUnit cu = this.createTestAssociationOverrideWithJoinTable(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - AssociationOverridesAnnotation associationOverrides = (AssociationOverridesAnnotation) typeResource.getSupportingAnnotation(JPA.ASSOCIATION_OVERRIDES); + AssociationOverridesAnnotation associationOverrides = (AssociationOverridesAnnotation) typeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDES); AssociationOverride2_0Annotation associationOverride = (AssociationOverride2_0Annotation) associationOverrides.nestedAnnotations().next(); JoinTableAnnotation table = associationOverride.getJoinTable(); @@ -861,7 +861,7 @@ public class AssociationOverrides2_0Tests extends JavaResourceModel2_0TestCase { ICompilationUnit cu = this.createTestAssociationOverrideJoinTableWithInverseJoinColumns(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - AssociationOverridesAnnotation associationOverrides = (AssociationOverridesAnnotation) typeResource.getSupportingAnnotation(JPA.ASSOCIATION_OVERRIDES); + AssociationOverridesAnnotation associationOverrides = (AssociationOverridesAnnotation) typeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDES); AssociationOverride2_0Annotation associationOverride = (AssociationOverride2_0Annotation) associationOverrides.nestedAnnotations().next(); JoinTableAnnotation table = associationOverride.getJoinTable(); @@ -872,7 +872,7 @@ public class AssociationOverrides2_0Tests extends JavaResourceModel2_0TestCase { ICompilationUnit cu = this.createTestAssociationOverrideWithJoinTable(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - AssociationOverridesAnnotation associationOverrides = (AssociationOverridesAnnotation) typeResource.getSupportingAnnotation(JPA.ASSOCIATION_OVERRIDES); + AssociationOverridesAnnotation associationOverrides = (AssociationOverridesAnnotation) typeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDES); AssociationOverride2_0Annotation associationOverride = (AssociationOverride2_0Annotation) associationOverrides.nestedAnnotations().next(); JoinTableAnnotation table = associationOverride.getJoinTable(); @@ -890,7 +890,7 @@ public class AssociationOverrides2_0Tests extends JavaResourceModel2_0TestCase { ICompilationUnit cu = this.createTestAssociationOverrideJoinTableWithInverseJoinColumns(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - AssociationOverridesAnnotation associationOverrides = (AssociationOverridesAnnotation) typeResource.getSupportingAnnotation(JPA.ASSOCIATION_OVERRIDES); + AssociationOverridesAnnotation associationOverrides = (AssociationOverridesAnnotation) typeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDES); AssociationOverride2_0Annotation associationOverride = (AssociationOverride2_0Annotation) associationOverrides.nestedAnnotations().next(); JoinTableAnnotation table = associationOverride.getJoinTable(); table.addInverseJoinColumn(2).setName("FOO"); @@ -922,7 +922,7 @@ public class AssociationOverrides2_0Tests extends JavaResourceModel2_0TestCase { ICompilationUnit cu = this.createTestAssociationOverrideJoinTableWithInverseJoinColumns(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - AssociationOverridesAnnotation associationOverrides = (AssociationOverridesAnnotation) typeResource.getSupportingAnnotation(JPA.ASSOCIATION_OVERRIDES); + AssociationOverridesAnnotation associationOverrides = (AssociationOverridesAnnotation) typeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDES); AssociationOverride2_0Annotation associationOverride = (AssociationOverride2_0Annotation) associationOverrides.nestedAnnotations().next(); JoinTableAnnotation table = associationOverride.getJoinTable(); table.addInverseJoinColumn(0).setName("FOO"); @@ -945,7 +945,7 @@ public class AssociationOverrides2_0Tests extends JavaResourceModel2_0TestCase { ICompilationUnit cu = this.createTestAssociationOverrideJoinTableWithInverseJoinColumns(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - AssociationOverridesAnnotation associationOverrides = (AssociationOverridesAnnotation) typeResource.getSupportingAnnotation(JPA.ASSOCIATION_OVERRIDES); + AssociationOverridesAnnotation associationOverrides = (AssociationOverridesAnnotation) typeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDES); AssociationOverride2_0Annotation associationOverride = (AssociationOverride2_0Annotation) associationOverrides.nestedAnnotations().next(); JoinTableAnnotation table = associationOverride.getJoinTable(); table.addInverseJoinColumn(1).setName("FOO"); @@ -968,7 +968,7 @@ public class AssociationOverrides2_0Tests extends JavaResourceModel2_0TestCase { ICompilationUnit cu = this.createTestAssociationOverrideJoinTableWithInverseJoinColumns(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - AssociationOverridesAnnotation associationOverrides = (AssociationOverridesAnnotation) typeResource.getSupportingAnnotation(JPA.ASSOCIATION_OVERRIDES); + AssociationOverridesAnnotation associationOverrides = (AssociationOverridesAnnotation) typeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDES); AssociationOverride2_0Annotation associationOverride = (AssociationOverride2_0Annotation) associationOverrides.nestedAnnotations().next(); JoinTableAnnotation table = associationOverride.getJoinTable(); diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/jpa2/resource/java/SequenceGenerator2_0Tests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/jpa2/resource/java/SequenceGenerator2_0Tests.java index 1886e0266b..b241d8de96 100644 --- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/jpa2/resource/java/SequenceGenerator2_0Tests.java +++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/jpa2/resource/java/SequenceGenerator2_0Tests.java @@ -45,7 +45,7 @@ public class SequenceGenerator2_0Tests extends JavaResourceModel2_0TestCase { JavaResourcePersistentType typeResource = this.buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - SequenceGenerator2_0Annotation sequenceGenerator = (SequenceGenerator2_0Annotation) attributeResource.getSupportingAnnotation(JPA.SEQUENCE_GENERATOR); + SequenceGenerator2_0Annotation sequenceGenerator = (SequenceGenerator2_0Annotation) attributeResource.getAnnotation(JPA.SEQUENCE_GENERATOR); assertEquals(GENERATOR_CATALOG, sequenceGenerator.getCatalog()); } @@ -54,7 +54,7 @@ public class SequenceGenerator2_0Tests extends JavaResourceModel2_0TestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - SequenceGenerator2_0Annotation sequenceGenerator = (SequenceGenerator2_0Annotation) attributeResource.getSupportingAnnotation(JPA.SEQUENCE_GENERATOR); + SequenceGenerator2_0Annotation sequenceGenerator = (SequenceGenerator2_0Annotation) attributeResource.getAnnotation(JPA.SEQUENCE_GENERATOR); assertEquals(GENERATOR_CATALOG, sequenceGenerator.getCatalog()); sequenceGenerator.setCatalog("foo"); @@ -75,7 +75,7 @@ public class SequenceGenerator2_0Tests extends JavaResourceModel2_0TestCase { JavaResourcePersistentType typeResource = this.buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - SequenceGenerator2_0Annotation sequenceGenerator = (SequenceGenerator2_0Annotation) attributeResource.getSupportingAnnotation(JPA.SEQUENCE_GENERATOR); + SequenceGenerator2_0Annotation sequenceGenerator = (SequenceGenerator2_0Annotation) attributeResource.getAnnotation(JPA.SEQUENCE_GENERATOR); assertEquals(GENERATOR_SCHEMA, sequenceGenerator.getSchema()); } @@ -84,7 +84,7 @@ public class SequenceGenerator2_0Tests extends JavaResourceModel2_0TestCase { JavaResourcePersistentType typeResource = this.buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - SequenceGenerator2_0Annotation sequenceGenerator = (SequenceGenerator2_0Annotation) attributeResource.getSupportingAnnotation(JPA.SEQUENCE_GENERATOR); + SequenceGenerator2_0Annotation sequenceGenerator = (SequenceGenerator2_0Annotation) attributeResource.getAnnotation(JPA.SEQUENCE_GENERATOR); assertEquals(GENERATOR_SCHEMA, sequenceGenerator.getSchema()); sequenceGenerator.setSchema("foo"); diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/platform/JpaPlatformTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/platform/JpaPlatformTests.java index bc8f4efb69..c9162b778d 100644 --- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/platform/JpaPlatformTests.java +++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/platform/JpaPlatformTests.java @@ -17,6 +17,7 @@ import org.eclipse.jpt.core.MappingKeys; import org.eclipse.jpt.core.context.java.JavaAttributeMapping; import org.eclipse.jpt.core.context.java.JavaAttributeMappingProvider; import org.eclipse.jpt.core.context.java.JavaTypeMapping; +import org.eclipse.jpt.core.context.java.JavaTypeMappingProvider; import org.eclipse.jpt.core.internal.facet.JpaFacetDataModelProperties; import org.eclipse.jpt.core.internal.facet.JpaFacetDataModelProvider; import org.eclipse.jpt.core.resource.java.JPA; @@ -99,12 +100,17 @@ public class JpaPlatformTests extends ContextModelTestCase public void testBuildJavaTypeMappingFromMappingKey() throws Exception { createTestEntity(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - - JavaTypeMapping javaTypeMapping = getJpaProject().getJpaPlatform().buildJavaTypeMappingFromMappingKey(JavaTestTypeMapping.TEST_TYPE_MAPPING_KEY, getJavaPersistentType()); - assertTrue(javaTypeMapping instanceof JavaTestTypeMapping); - javaTypeMapping = jpaPlatform().buildJavaTypeMappingFromMappingKey(MappingKeys.ENTITY_TYPE_MAPPING_KEY, getJavaPersistentType()); - assertTrue(javaTypeMapping instanceof TestJavaEntity); + JavaTypeMappingProvider mappingProvider = + jpaPlatform().getJavaTypeMappingProvider(JavaTestTypeMapping.TEST_TYPE_MAPPING_KEY); + JavaTypeMapping mapping = + mappingProvider.buildMapping(getJavaPersistentType(), jpaPlatform().getJpaFactory()); + assertTrue(mapping instanceof JavaTestTypeMapping); + + mappingProvider = + jpaPlatform().getJavaTypeMappingProvider(MappingKeys.ENTITY_TYPE_MAPPING_KEY); + mapping = mappingProvider.buildMapping(getJavaPersistentType(), jpaPlatform().getJpaFactory()); + assertTrue(mapping instanceof TestJavaEntity); } public void testBuildJavaAttributeMappingFromMappingKey() throws Exception { @@ -123,5 +129,4 @@ public class JpaPlatformTests extends ContextModelTestCase getJavaPersistentType().getAttributeNamed("name"), jpaPlatform().getJpaFactory()); assertTrue(mapping instanceof TestJavaBasicMapping); } - } diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/AssociationOverrideTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/AssociationOverrideTests.java index d86c38e831..f3463c3301 100644 --- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/AssociationOverrideTests.java +++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/AssociationOverrideTests.java @@ -57,7 +57,7 @@ public class AssociationOverrideTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestAssociationOverrideOnField(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - AssociationOverrideAnnotation associationOverride = (AssociationOverrideAnnotation) attributeResource.getSupportingAnnotation(JPA.ASSOCIATION_OVERRIDE); + AssociationOverrideAnnotation associationOverride = (AssociationOverrideAnnotation) attributeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDE); assertNotNull(associationOverride); assertEquals(ASSOCIATION_OVERRIDE_NAME, associationOverride.getName()); @@ -67,7 +67,7 @@ public class AssociationOverrideTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestAssociationOverrideOnField(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - AssociationOverrideAnnotation associationOverride = (AssociationOverrideAnnotation) attributeResource.getSupportingAnnotation(JPA.ASSOCIATION_OVERRIDE); + AssociationOverrideAnnotation associationOverride = (AssociationOverrideAnnotation) attributeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDE); assertNotNull(associationOverride); assertEquals(ASSOCIATION_OVERRIDE_NAME, associationOverride.getName()); @@ -81,7 +81,7 @@ public class AssociationOverrideTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestAssociationOverrideOnField(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - AssociationOverrideAnnotation associationOverride = (AssociationOverrideAnnotation) attributeResource.getSupportingAnnotation(JPA.ASSOCIATION_OVERRIDE); + AssociationOverrideAnnotation associationOverride = (AssociationOverrideAnnotation) attributeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDE); assertEquals(ASSOCIATION_OVERRIDE_NAME, associationOverride.getName()); @@ -98,7 +98,7 @@ public class AssociationOverrideTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - AssociationOverrideAnnotation associationOverride = (AssociationOverrideAnnotation) attributeResource.getSupportingAnnotation(JPA.ASSOCIATION_OVERRIDE); + AssociationOverrideAnnotation associationOverride = (AssociationOverrideAnnotation) attributeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDE); assertEquals(0, associationOverride.joinColumnsSize()); } @@ -108,7 +108,7 @@ public class AssociationOverrideTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - AssociationOverrideAnnotation associationOverride = (AssociationOverrideAnnotation) attributeResource.getSupportingAnnotation(JPA.ASSOCIATION_OVERRIDE); + AssociationOverrideAnnotation associationOverride = (AssociationOverrideAnnotation) attributeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDE); associationOverride.addJoinColumn(0); @@ -122,7 +122,7 @@ public class AssociationOverrideTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - AssociationOverrideAnnotation associationOverride = (AssociationOverrideAnnotation) attributeResource.getSupportingAnnotation(JPA.ASSOCIATION_OVERRIDE); + AssociationOverrideAnnotation associationOverride = (AssociationOverrideAnnotation) attributeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDE); assertEquals(2, associationOverride.joinColumnsSize()); } @@ -132,7 +132,7 @@ public class AssociationOverrideTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - AssociationOverrideAnnotation associationOverride = (AssociationOverrideAnnotation) attributeResource.getSupportingAnnotation(JPA.ASSOCIATION_OVERRIDE); + AssociationOverrideAnnotation associationOverride = (AssociationOverrideAnnotation) attributeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDE); associationOverride.addJoinColumn(0).setName("FOO"); associationOverride.addJoinColumn(1); @@ -150,7 +150,7 @@ public class AssociationOverrideTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - AssociationOverrideAnnotation associationOverride = (AssociationOverrideAnnotation) attributeResource.getSupportingAnnotation(JPA.ASSOCIATION_OVERRIDE); + AssociationOverrideAnnotation associationOverride = (AssociationOverrideAnnotation) attributeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDE); associationOverride.addJoinColumn(0).setName("FOO"); Iterator<JoinColumnAnnotation> joinColumns = associationOverride.joinColumns(); @@ -184,7 +184,7 @@ public class AssociationOverrideTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - AssociationOverrideAnnotation associationOverride = (AssociationOverrideAnnotation) attributeResource.getSupportingAnnotation(JPA.ASSOCIATION_OVERRIDE); + AssociationOverrideAnnotation associationOverride = (AssociationOverrideAnnotation) attributeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDE); JoinColumnAnnotation joinColumn = associationOverride.joinColumnAt(0); joinColumn.setReferencedColumnName("REF_NAME"); joinColumn.setUnique(Boolean.FALSE); @@ -210,7 +210,7 @@ public class AssociationOverrideTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - AssociationOverrideAnnotation associationOverride = (AssociationOverrideAnnotation) attributeResource.getSupportingAnnotation(JPA.ASSOCIATION_OVERRIDE); + AssociationOverrideAnnotation associationOverride = (AssociationOverrideAnnotation) attributeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDE); JoinColumnAnnotation joinColumn = associationOverride.joinColumnAt(0); joinColumn.setReferencedColumnName("REF_NAME"); @@ -237,7 +237,7 @@ public class AssociationOverrideTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - AssociationOverrideAnnotation associationOverride = (AssociationOverrideAnnotation) attributeResource.getSupportingAnnotation(JPA.ASSOCIATION_OVERRIDE); + AssociationOverrideAnnotation associationOverride = (AssociationOverrideAnnotation) attributeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDE); assertEquals(2, associationOverride.joinColumnsSize()); diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/AssociationOverridesTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/AssociationOverridesTests.java index c7a207c3c5..9f1385dc63 100644 --- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/AssociationOverridesTests.java +++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/AssociationOverridesTests.java @@ -76,7 +76,7 @@ public class AssociationOverridesTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestAssociationOverrideOnField(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - AssociationOverridesAnnotation associationOverrides = (AssociationOverridesAnnotation) attributeResource.getSupportingAnnotation(JPA.ASSOCIATION_OVERRIDES); + AssociationOverridesAnnotation associationOverrides = (AssociationOverridesAnnotation) attributeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDES); AssociationOverrideAnnotation associationOverride = associationOverrides.nestedAnnotations().next(); assertNotNull(associationOverride); @@ -87,7 +87,7 @@ public class AssociationOverridesTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestAssociationOverrideOnField(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - AssociationOverridesAnnotation associationOverrides = (AssociationOverridesAnnotation) attributeResource.getSupportingAnnotation(JPA.ASSOCIATION_OVERRIDES); + AssociationOverridesAnnotation associationOverrides = (AssociationOverridesAnnotation) attributeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDES); AssociationOverrideAnnotation associationOverride = associationOverrides.nestedAnnotations().next(); assertNotNull(associationOverride); @@ -102,7 +102,7 @@ public class AssociationOverridesTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestAssociationOverrideOnField(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - AssociationOverridesAnnotation associationOverrides = (AssociationOverridesAnnotation) attributeResource.getSupportingAnnotation(JPA.ASSOCIATION_OVERRIDES); + AssociationOverridesAnnotation associationOverrides = (AssociationOverridesAnnotation) attributeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDES); AssociationOverrideAnnotation associationOverride = associationOverrides.nestedAnnotations().next(); assertEquals(ASSOCIATION_OVERRIDE_NAME, associationOverride.getName()); @@ -118,46 +118,46 @@ public class AssociationOverridesTests extends JavaResourceModelTestCase { ICompilationUnit cu = createTestAssociationOverride(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - AssociationOverrideAnnotation associationOverride = (AssociationOverrideAnnotation) typeResource.addSupportingAnnotation(1, JPA.ASSOCIATION_OVERRIDE, JPA.ASSOCIATION_OVERRIDES); + AssociationOverrideAnnotation associationOverride = (AssociationOverrideAnnotation) typeResource.addAnnotation(1, JPA.ASSOCIATION_OVERRIDE, JPA.ASSOCIATION_OVERRIDES); associationOverride.setName("BAR"); assertSourceContains("@AssociationOverrides({@AssociationOverride(name = \"FOO\", joinColumns = @JoinColumn(name = \"FOO\", columnDefinition = \"BAR\", referencedColumnName = \"BAZ\")),@AssociationOverride(name = \"BAR\")})", cu); - assertNull(typeResource.getSupportingAnnotation(JPA.ASSOCIATION_OVERRIDE)); - assertNotNull(typeResource.getSupportingAnnotation(JPA.ASSOCIATION_OVERRIDES)); - assertEquals(2, CollectionTools.size(typeResource.supportingAnnotations(JPA.ASSOCIATION_OVERRIDE, JPA.ASSOCIATION_OVERRIDES))); + assertNull(typeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDE)); + assertNotNull(typeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDES)); + assertEquals(2, CollectionTools.size(typeResource.annotations(JPA.ASSOCIATION_OVERRIDE, JPA.ASSOCIATION_OVERRIDES))); } public void testAddAssociationOverrideToBeginningOfList() throws Exception { ICompilationUnit cu = createTestAssociationOverride(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - AssociationOverrideAnnotation associationOverride = (AssociationOverrideAnnotation) typeResource.addSupportingAnnotation(1, JPA.ASSOCIATION_OVERRIDE, JPA.ASSOCIATION_OVERRIDES); + AssociationOverrideAnnotation associationOverride = (AssociationOverrideAnnotation) typeResource.addAnnotation(1, JPA.ASSOCIATION_OVERRIDE, JPA.ASSOCIATION_OVERRIDES); associationOverride.setName("BAR"); assertSourceContains("@AssociationOverrides({@AssociationOverride(name = \"FOO\", joinColumns = @JoinColumn(name = \"FOO\", columnDefinition = \"BAR\", referencedColumnName = \"BAZ\")),@AssociationOverride(name = \"BAR\")})", cu); - associationOverride = (AssociationOverrideAnnotation) typeResource.addSupportingAnnotation(0, JPA.ASSOCIATION_OVERRIDE, JPA.ASSOCIATION_OVERRIDES); + associationOverride = (AssociationOverrideAnnotation) typeResource.addAnnotation(0, JPA.ASSOCIATION_OVERRIDE, JPA.ASSOCIATION_OVERRIDES); associationOverride.setName("BAZ"); assertSourceContains("@AssociationOverrides({@AssociationOverride(name = \"BAZ\"),@AssociationOverride(name = \"FOO\", joinColumns = @JoinColumn(name = \"FOO\", columnDefinition = \"BAR\", referencedColumnName = \"BAZ\")), @AssociationOverride(name = \"BAR\")})", cu); - Iterator<NestableAnnotation> associationOverrides = typeResource.supportingAnnotations(JPA.ASSOCIATION_OVERRIDE, JPA.ASSOCIATION_OVERRIDES); + Iterator<NestableAnnotation> associationOverrides = typeResource.annotations(JPA.ASSOCIATION_OVERRIDE, JPA.ASSOCIATION_OVERRIDES); assertEquals("BAZ", ((AssociationOverrideAnnotation) associationOverrides.next()).getName()); assertEquals("FOO", ((AssociationOverrideAnnotation) associationOverrides.next()).getName()); assertEquals("BAR", ((AssociationOverrideAnnotation) associationOverrides.next()).getName()); - assertNull(typeResource.getSupportingAnnotation(JPA.ASSOCIATION_OVERRIDE)); - assertNotNull(typeResource.getSupportingAnnotation(JPA.ASSOCIATION_OVERRIDES)); - assertEquals(3, CollectionTools.size(typeResource.supportingAnnotations(JPA.ASSOCIATION_OVERRIDE, JPA.ASSOCIATION_OVERRIDES))); + assertNull(typeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDE)); + assertNotNull(typeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDES)); + assertEquals(3, CollectionTools.size(typeResource.annotations(JPA.ASSOCIATION_OVERRIDE, JPA.ASSOCIATION_OVERRIDES))); } public void testRemoveAssociationOverrideCopyExisting() throws Exception { ICompilationUnit cu = createTestAssociationOverride(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - AssociationOverrideAnnotation associationOverride = (AssociationOverrideAnnotation) typeResource.addSupportingAnnotation(1, JPA.ASSOCIATION_OVERRIDE, JPA.ASSOCIATION_OVERRIDES); + AssociationOverrideAnnotation associationOverride = (AssociationOverrideAnnotation) typeResource.addAnnotation(1, JPA.ASSOCIATION_OVERRIDE, JPA.ASSOCIATION_OVERRIDES); associationOverride.setName("BAR"); assertSourceContains("@AssociationOverrides({@AssociationOverride(name = \"FOO\", joinColumns = @JoinColumn(name = \"FOO\", columnDefinition = \"BAR\", referencedColumnName = \"BAZ\")),@AssociationOverride(name = \"BAR\")})", cu); - typeResource.removeSupportingAnnotation(1, JPA.ASSOCIATION_OVERRIDE, JPA.ASSOCIATION_OVERRIDES); + typeResource.removeAnnotation(1, JPA.ASSOCIATION_OVERRIDE, JPA.ASSOCIATION_OVERRIDES); assertSourceContains("@AssociationOverride(name = \"FOO\", joinColumns = @JoinColumn(name = \"FOO\", columnDefinition = \"BAR\", referencedColumnName = \"BAZ\"))", cu); } @@ -166,7 +166,7 @@ public class AssociationOverridesTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - AssociationOverrideAnnotation associationOverride = (AssociationOverrideAnnotation) attributeResource.supportingAnnotations(JPA.ASSOCIATION_OVERRIDE, JPA.ASSOCIATION_OVERRIDES).next(); + AssociationOverrideAnnotation associationOverride = (AssociationOverrideAnnotation) attributeResource.annotations(JPA.ASSOCIATION_OVERRIDE, JPA.ASSOCIATION_OVERRIDES).next(); assertEquals(0, associationOverride.joinColumnsSize()); } @@ -176,7 +176,7 @@ public class AssociationOverridesTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - AssociationOverrideAnnotation associationOverride = (AssociationOverrideAnnotation) attributeResource.supportingAnnotations(JPA.ASSOCIATION_OVERRIDE, JPA.ASSOCIATION_OVERRIDES).next(); + AssociationOverrideAnnotation associationOverride = (AssociationOverrideAnnotation) attributeResource.annotations(JPA.ASSOCIATION_OVERRIDE, JPA.ASSOCIATION_OVERRIDES).next(); associationOverride.addJoinColumn(0); associationOverride.addJoinColumn(1); @@ -189,7 +189,7 @@ public class AssociationOverridesTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - AssociationOverrideAnnotation associationOverride = (AssociationOverrideAnnotation) attributeResource.supportingAnnotations(JPA.ASSOCIATION_OVERRIDE, JPA.ASSOCIATION_OVERRIDES).next(); + AssociationOverrideAnnotation associationOverride = (AssociationOverrideAnnotation) attributeResource.annotations(JPA.ASSOCIATION_OVERRIDE, JPA.ASSOCIATION_OVERRIDES).next(); assertEquals(2, associationOverride.joinColumnsSize()); } @@ -199,7 +199,7 @@ public class AssociationOverridesTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - AssociationOverrideAnnotation associationOverride = (AssociationOverrideAnnotation) attributeResource.supportingAnnotations(JPA.ASSOCIATION_OVERRIDE, JPA.ASSOCIATION_OVERRIDES).next(); + AssociationOverrideAnnotation associationOverride = (AssociationOverrideAnnotation) attributeResource.annotations(JPA.ASSOCIATION_OVERRIDE, JPA.ASSOCIATION_OVERRIDES).next(); associationOverride.addJoinColumn(0).setName("FOO"); associationOverride.addJoinColumn(1); @@ -219,7 +219,7 @@ public class AssociationOverridesTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - AssociationOverrideAnnotation associationOverride = (AssociationOverrideAnnotation) attributeResource.supportingAnnotations(JPA.ASSOCIATION_OVERRIDE, JPA.ASSOCIATION_OVERRIDES).next(); + AssociationOverrideAnnotation associationOverride = (AssociationOverrideAnnotation) attributeResource.annotations(JPA.ASSOCIATION_OVERRIDE, JPA.ASSOCIATION_OVERRIDES).next(); associationOverride.addJoinColumn(0).setName("FOO"); Iterator<JoinColumnAnnotation> joinColumns = associationOverride.joinColumns(); @@ -253,7 +253,7 @@ public class AssociationOverridesTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - AssociationOverrideAnnotation associationOverride = (AssociationOverrideAnnotation) attributeResource.supportingAnnotations(JPA.ASSOCIATION_OVERRIDE, JPA.ASSOCIATION_OVERRIDES).next(); + AssociationOverrideAnnotation associationOverride = (AssociationOverrideAnnotation) attributeResource.annotations(JPA.ASSOCIATION_OVERRIDE, JPA.ASSOCIATION_OVERRIDES).next(); JoinColumnAnnotation joinColumn = associationOverride.joinColumnAt(0); joinColumn.setReferencedColumnName("REF_NAME"); joinColumn.setUnique(Boolean.FALSE); @@ -278,7 +278,7 @@ public class AssociationOverridesTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - AssociationOverrideAnnotation associationOverride = (AssociationOverrideAnnotation) attributeResource.supportingAnnotations(JPA.ASSOCIATION_OVERRIDE, JPA.ASSOCIATION_OVERRIDES).next(); + AssociationOverrideAnnotation associationOverride = (AssociationOverrideAnnotation) attributeResource.annotations(JPA.ASSOCIATION_OVERRIDE, JPA.ASSOCIATION_OVERRIDES).next(); JoinColumnAnnotation joinColumn = associationOverride.joinColumnAt(0); joinColumn.setReferencedColumnName("REF_NAME"); @@ -304,7 +304,7 @@ public class AssociationOverridesTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - AssociationOverrideAnnotation associationOverride = (AssociationOverrideAnnotation) attributeResource.supportingAnnotations(JPA.ASSOCIATION_OVERRIDE, JPA.ASSOCIATION_OVERRIDES).next(); + AssociationOverrideAnnotation associationOverride = (AssociationOverrideAnnotation) attributeResource.annotations(JPA.ASSOCIATION_OVERRIDE, JPA.ASSOCIATION_OVERRIDES).next(); assertEquals(2, associationOverride.joinColumnsSize()); diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/AttributeOverrideTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/AttributeOverrideTests.java index 2b62b55107..a3a8c701c3 100644 --- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/AttributeOverrideTests.java +++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/AttributeOverrideTests.java @@ -58,7 +58,7 @@ public class AttributeOverrideTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestAttributeOverrideOnField(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - AttributeOverrideAnnotation attributeOverride = (AttributeOverrideAnnotation) attributeResource.getSupportingAnnotation(JPA.ATTRIBUTE_OVERRIDE); + AttributeOverrideAnnotation attributeOverride = (AttributeOverrideAnnotation) attributeResource.getAnnotation(JPA.ATTRIBUTE_OVERRIDE); assertNotNull(attributeOverride); assertEquals(ATTRIBUTE_OVERRIDE_NAME, attributeOverride.getName()); @@ -68,7 +68,7 @@ public class AttributeOverrideTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestAttributeOverrideOnField(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - AttributeOverrideAnnotation attributeOverride = (AttributeOverrideAnnotation) attributeResource.getSupportingAnnotation(JPA.ATTRIBUTE_OVERRIDE); + AttributeOverrideAnnotation attributeOverride = (AttributeOverrideAnnotation) attributeResource.getAnnotation(JPA.ATTRIBUTE_OVERRIDE); ColumnAnnotation column = attributeOverride.getColumn(); assertNotNull(attributeOverride); assertNull(column); @@ -78,7 +78,7 @@ public class AttributeOverrideTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestAttributeOverrideOnField(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - AttributeOverrideAnnotation attributeOverride = (AttributeOverrideAnnotation) attributeResource.getSupportingAnnotation(JPA.ATTRIBUTE_OVERRIDE); + AttributeOverrideAnnotation attributeOverride = (AttributeOverrideAnnotation) attributeResource.getAnnotation(JPA.ATTRIBUTE_OVERRIDE); assertNotNull(attributeOverride); assertEquals(ATTRIBUTE_OVERRIDE_NAME, attributeOverride.getName()); @@ -92,7 +92,7 @@ public class AttributeOverrideTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestAttributeOverrideOnField(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - AttributeOverrideAnnotation attributeOverride = (AttributeOverrideAnnotation) attributeResource.getSupportingAnnotation(JPA.ATTRIBUTE_OVERRIDE); + AttributeOverrideAnnotation attributeOverride = (AttributeOverrideAnnotation) attributeResource.getAnnotation(JPA.ATTRIBUTE_OVERRIDE); assertEquals(ATTRIBUTE_OVERRIDE_NAME, attributeOverride.getName()); @@ -107,7 +107,7 @@ public class AttributeOverrideTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestAttributeOverrideWithColumnOnField(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - AttributeOverrideAnnotation attributeOverride = (AttributeOverrideAnnotation) attributeResource.getSupportingAnnotation(JPA.ATTRIBUTE_OVERRIDE); + AttributeOverrideAnnotation attributeOverride = (AttributeOverrideAnnotation) attributeResource.getAnnotation(JPA.ATTRIBUTE_OVERRIDE); ColumnAnnotation column = attributeOverride.getColumn(); assertEquals(COLUMN_NAME, column.getName()); } @@ -116,7 +116,7 @@ public class AttributeOverrideTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestAttributeOverrideWithColumnOnField(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - AttributeOverrideAnnotation attributeOverride = (AttributeOverrideAnnotation) attributeResource.getSupportingAnnotation(JPA.ATTRIBUTE_OVERRIDE); + AttributeOverrideAnnotation attributeOverride = (AttributeOverrideAnnotation) attributeResource.getAnnotation(JPA.ATTRIBUTE_OVERRIDE); ColumnAnnotation column = attributeOverride.getColumn(); assertEquals(COLUMN_NAME, column.getName()); @@ -133,7 +133,7 @@ public class AttributeOverrideTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestAttributeOverrideOnField(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - AttributeOverrideAnnotation attributeOverride = (AttributeOverrideAnnotation) attributeResource.getSupportingAnnotation(JPA.ATTRIBUTE_OVERRIDE); + AttributeOverrideAnnotation attributeOverride = (AttributeOverrideAnnotation) attributeResource.getAnnotation(JPA.ATTRIBUTE_OVERRIDE); ColumnAnnotation column = attributeOverride.getColumn(); assertNull(column); @@ -147,7 +147,7 @@ public class AttributeOverrideTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestAttributeOverrideOnField(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - AttributeOverrideAnnotation attributeOverride = (AttributeOverrideAnnotation) attributeResource.getSupportingAnnotation(JPA.ATTRIBUTE_OVERRIDE); + AttributeOverrideAnnotation attributeOverride = (AttributeOverrideAnnotation) attributeResource.getAnnotation(JPA.ATTRIBUTE_OVERRIDE); ColumnAnnotation column = attributeOverride.getColumn(); assertNull(column); } diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/AttributeOverridesTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/AttributeOverridesTests.java index 51b5418cc6..6ff234c926 100644 --- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/AttributeOverridesTests.java +++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/AttributeOverridesTests.java @@ -77,7 +77,7 @@ public class AttributeOverridesTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestAttributeOverrideOnField(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - AttributeOverridesAnnotation attributeOverrides = (AttributeOverridesAnnotation) attributeResource.getSupportingAnnotation(JPA.ATTRIBUTE_OVERRIDES); + AttributeOverridesAnnotation attributeOverrides = (AttributeOverridesAnnotation) attributeResource.getAnnotation(JPA.ATTRIBUTE_OVERRIDES); AttributeOverrideAnnotation attributeOverride = attributeOverrides.nestedAnnotations().next(); assertNotNull(attributeOverride); @@ -88,7 +88,7 @@ public class AttributeOverridesTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestAttributeOverrideOnField(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - AttributeOverridesAnnotation attributeOverrides = (AttributeOverridesAnnotation) attributeResource.getSupportingAnnotation(JPA.ATTRIBUTE_OVERRIDES); + AttributeOverridesAnnotation attributeOverrides = (AttributeOverridesAnnotation) attributeResource.getAnnotation(JPA.ATTRIBUTE_OVERRIDES); AttributeOverrideAnnotation attributeOverride = attributeOverrides.nestedAnnotations().next(); ColumnAnnotation column = attributeOverride.getColumn(); assertNotNull(attributeOverride); @@ -99,7 +99,7 @@ public class AttributeOverridesTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestAttributeOverrideOnField(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - AttributeOverridesAnnotation attributeOverrides = (AttributeOverridesAnnotation) attributeResource.getSupportingAnnotation(JPA.ATTRIBUTE_OVERRIDES); + AttributeOverridesAnnotation attributeOverrides = (AttributeOverridesAnnotation) attributeResource.getAnnotation(JPA.ATTRIBUTE_OVERRIDES); AttributeOverrideAnnotation attributeOverride = attributeOverrides.nestedAnnotations().next(); assertNotNull(attributeOverride); @@ -114,7 +114,7 @@ public class AttributeOverridesTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestAttributeOverrideOnField(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - AttributeOverridesAnnotation attributeOverrides = (AttributeOverridesAnnotation) attributeResource.getSupportingAnnotation(JPA.ATTRIBUTE_OVERRIDES); + AttributeOverridesAnnotation attributeOverrides = (AttributeOverridesAnnotation) attributeResource.getAnnotation(JPA.ATTRIBUTE_OVERRIDES); AttributeOverrideAnnotation attributeOverride = attributeOverrides.nestedAnnotations().next(); assertEquals(ATTRIBUTE_OVERRIDE_NAME, attributeOverride.getName()); @@ -130,7 +130,7 @@ public class AttributeOverridesTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestAttributeOverrideWithColumnOnField(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - AttributeOverridesAnnotation attributeOverrides = (AttributeOverridesAnnotation) attributeResource.getSupportingAnnotation(JPA.ATTRIBUTE_OVERRIDES); + AttributeOverridesAnnotation attributeOverrides = (AttributeOverridesAnnotation) attributeResource.getAnnotation(JPA.ATTRIBUTE_OVERRIDES); AttributeOverrideAnnotation attributeOverride = attributeOverrides.nestedAnnotations().next(); ColumnAnnotation column = attributeOverride.getColumn(); @@ -141,7 +141,7 @@ public class AttributeOverridesTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestAttributeOverrideWithColumnOnField(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - AttributeOverrideAnnotation attributeOverride = (AttributeOverrideAnnotation) attributeResource.supportingAnnotations(JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES).next(); + AttributeOverrideAnnotation attributeOverride = (AttributeOverrideAnnotation) attributeResource.annotations(JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES).next(); ColumnAnnotation column = attributeOverride.getColumn(); @@ -160,46 +160,46 @@ public class AttributeOverridesTests extends JavaResourceModelTestCase { ICompilationUnit cu = createTestAttributeOverride(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - AttributeOverrideAnnotation attributeOverride = (AttributeOverrideAnnotation) typeResource.addSupportingAnnotation(1, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + AttributeOverrideAnnotation attributeOverride = (AttributeOverrideAnnotation) typeResource.addAnnotation(1, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); attributeOverride.setName("BAR"); assertSourceContains("@AttributeOverrides({@AttributeOverride(name = \"FOO\", column = @Column(name = \"FOO\", columnDefinition = \"BAR\", table = \"BAZ\", unique = false, nullable = false, insertable = false, updatable = false, length = 1, precision = 1, scale = 1)),@AttributeOverride(name = \"BAR\")})", cu); - assertNull(typeResource.getSupportingAnnotation(JPA.ATTRIBUTE_OVERRIDE)); - assertNotNull(typeResource.getSupportingAnnotation(JPA.ATTRIBUTE_OVERRIDES)); - assertEquals(2, CollectionTools.size(typeResource.supportingAnnotations(JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES))); + assertNull(typeResource.getAnnotation(JPA.ATTRIBUTE_OVERRIDE)); + assertNotNull(typeResource.getAnnotation(JPA.ATTRIBUTE_OVERRIDES)); + assertEquals(2, CollectionTools.size(typeResource.annotations(JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES))); } public void testAddAttributeOverrideToBeginningOfList() throws Exception { ICompilationUnit cu = createTestAttributeOverride(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - AttributeOverrideAnnotation attributeOverride = (AttributeOverrideAnnotation) typeResource.addSupportingAnnotation(1, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + AttributeOverrideAnnotation attributeOverride = (AttributeOverrideAnnotation) typeResource.addAnnotation(1, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); attributeOverride.setName("BAR"); assertSourceContains("@AttributeOverrides({@AttributeOverride(name = \"FOO\", column = @Column(name = \"FOO\", columnDefinition = \"BAR\", table = \"BAZ\", unique = false, nullable = false, insertable = false, updatable = false, length = 1, precision = 1, scale = 1)),@AttributeOverride(name = \"BAR\")})", cu); - attributeOverride = (AttributeOverrideAnnotation) typeResource.addSupportingAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + attributeOverride = (AttributeOverrideAnnotation) typeResource.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); attributeOverride.setName("BAZ"); assertSourceContains("@AttributeOverrides({@AttributeOverride(name = \"BAZ\"),@AttributeOverride(name = \"FOO\", column = @Column(name = \"FOO\", columnDefinition = \"BAR\", table = \"BAZ\", unique = false, nullable = false, insertable = false, updatable = false, length = 1, precision = 1, scale = 1)), @AttributeOverride(name = \"BAR\")})", cu); - Iterator<NestableAnnotation> attributeOverrides = typeResource.supportingAnnotations(JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + Iterator<NestableAnnotation> attributeOverrides = typeResource.annotations(JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); assertEquals("BAZ", ((AttributeOverrideAnnotation) attributeOverrides.next()).getName()); assertEquals("FOO", ((AttributeOverrideAnnotation) attributeOverrides.next()).getName()); assertEquals("BAR", ((AttributeOverrideAnnotation) attributeOverrides.next()).getName()); - assertNull(typeResource.getSupportingAnnotation(JPA.ATTRIBUTE_OVERRIDE)); - assertNotNull(typeResource.getSupportingAnnotation(JPA.ATTRIBUTE_OVERRIDES)); - assertEquals(3, CollectionTools.size(typeResource.supportingAnnotations(JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES))); + assertNull(typeResource.getAnnotation(JPA.ATTRIBUTE_OVERRIDE)); + assertNotNull(typeResource.getAnnotation(JPA.ATTRIBUTE_OVERRIDES)); + assertEquals(3, CollectionTools.size(typeResource.annotations(JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES))); } public void testRemoveAttributeOverrideCopyExisting() throws Exception { ICompilationUnit cu = createTestAttributeOverride(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - AttributeOverrideAnnotation attributeOverride = (AttributeOverrideAnnotation) typeResource.addSupportingAnnotation(1, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + AttributeOverrideAnnotation attributeOverride = (AttributeOverrideAnnotation) typeResource.addAnnotation(1, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); attributeOverride.setName("BAR"); assertSourceContains("@AttributeOverrides({@AttributeOverride(name = \"FOO\", column = @Column(name = \"FOO\", columnDefinition = \"BAR\", table = \"BAZ\", unique = false, nullable = false, insertable = false, updatable = false, length = 1, precision = 1, scale = 1)),@AttributeOverride(name = \"BAR\")})", cu); - typeResource.removeSupportingAnnotation(1, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + typeResource.removeAnnotation(1, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); assertSourceContains("@AttributeOverride(name = \"FOO\", column = @Column(name = \"FOO\", columnDefinition = \"BAR\", table = \"BAZ\", unique = false, nullable = false, insertable = false, updatable = false, length = 1, precision = 1, scale = 1))", cu); } //not sure i want to test this api, how can we keep ContainerAnnotation.add, move, remove from being public? diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/BasicTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/BasicTests.java index f2077b9595..84e8fa4fd5 100644 --- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/BasicTests.java +++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/BasicTests.java @@ -69,7 +69,7 @@ public class BasicTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - BasicAnnotation basic = (BasicAnnotation) attributeResource.getMappingAnnotation(JPA.BASIC); + BasicAnnotation basic = (BasicAnnotation) attributeResource.getAnnotation(JPA.BASIC); assertNotNull(basic); } @@ -78,7 +78,7 @@ public class BasicTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - BasicAnnotation basic = (BasicAnnotation) attributeResource.getMappingAnnotation(JPA.BASIC); + BasicAnnotation basic = (BasicAnnotation) attributeResource.getAnnotation(JPA.BASIC); assertEquals(Boolean.TRUE, basic.getOptional()); } @@ -87,7 +87,7 @@ public class BasicTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - BasicAnnotation basic = (BasicAnnotation) attributeResource.getMappingAnnotation(JPA.BASIC); + BasicAnnotation basic = (BasicAnnotation) attributeResource.getAnnotation(JPA.BASIC); assertEquals(Boolean.TRUE, basic.getOptional()); basic.setOptional(Boolean.FALSE); @@ -101,7 +101,7 @@ public class BasicTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - BasicAnnotation basic = (BasicAnnotation) attributeResource.getMappingAnnotation(JPA.BASIC); + BasicAnnotation basic = (BasicAnnotation) attributeResource.getAnnotation(JPA.BASIC); assertEquals(Boolean.TRUE, basic.getOptional()); basic.setOptional(null); @@ -116,7 +116,7 @@ public class BasicTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - BasicAnnotation basic = (BasicAnnotation) attributeResource.getMappingAnnotation(JPA.BASIC); + BasicAnnotation basic = (BasicAnnotation) attributeResource.getAnnotation(JPA.BASIC); assertEquals(FetchType.EAGER, basic.getFetch()); } @@ -125,7 +125,7 @@ public class BasicTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - BasicAnnotation basic = (BasicAnnotation) attributeResource.getMappingAnnotation(JPA.BASIC); + BasicAnnotation basic = (BasicAnnotation) attributeResource.getAnnotation(JPA.BASIC); assertEquals(FetchType.EAGER, basic.getFetch()); basic.setFetch(FetchType.LAZY); @@ -139,7 +139,7 @@ public class BasicTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - BasicAnnotation basic = (BasicAnnotation) attributeResource.getMappingAnnotation(JPA.BASIC); + BasicAnnotation basic = (BasicAnnotation) attributeResource.getAnnotation(JPA.BASIC); assertEquals(FetchType.EAGER, basic.getFetch()); basic.setFetch(null); diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/ColumnTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/ColumnTests.java index f82a4966ea..5052b0ef37 100644 --- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/ColumnTests.java +++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/ColumnTests.java @@ -110,7 +110,7 @@ public class ColumnTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestColumnWithName(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - ColumnAnnotation column = (ColumnAnnotation) attributeResource.getSupportingAnnotation(JPA.COLUMN); + ColumnAnnotation column = (ColumnAnnotation) attributeResource.getAnnotation(JPA.COLUMN); assertNotNull(column); assertEquals(COLUMN_NAME, column.getName()); } @@ -119,7 +119,7 @@ public class ColumnTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestColumn(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - ColumnAnnotation column = (ColumnAnnotation) attributeResource.getSupportingAnnotation(JPA.COLUMN); + ColumnAnnotation column = (ColumnAnnotation) attributeResource.getAnnotation(JPA.COLUMN); assertNotNull(column); assertNull(column.getName()); assertNull(column.getNullable()); @@ -134,7 +134,7 @@ public class ColumnTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestColumn(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - ColumnAnnotation column = (ColumnAnnotation) attributeResource.getSupportingAnnotation(JPA.COLUMN); + ColumnAnnotation column = (ColumnAnnotation) attributeResource.getAnnotation(JPA.COLUMN); assertNotNull(column); assertNull(column.getName()); @@ -149,7 +149,7 @@ public class ColumnTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestColumnWithName(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - ColumnAnnotation column = (ColumnAnnotation) attributeResource.getSupportingAnnotation(JPA.COLUMN); + ColumnAnnotation column = (ColumnAnnotation) attributeResource.getAnnotation(JPA.COLUMN); assertEquals(COLUMN_NAME, column.getName()); @@ -163,7 +163,7 @@ public class ColumnTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestColumnWithTable(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - ColumnAnnotation column = (ColumnAnnotation) attributeResource.getSupportingAnnotation(JPA.COLUMN); + ColumnAnnotation column = (ColumnAnnotation) attributeResource.getAnnotation(JPA.COLUMN); assertEquals(COLUMN_TABLE, column.getTable()); } @@ -171,7 +171,7 @@ public class ColumnTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestColumn(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - ColumnAnnotation column = (ColumnAnnotation) attributeResource.getSupportingAnnotation(JPA.COLUMN); + ColumnAnnotation column = (ColumnAnnotation) attributeResource.getAnnotation(JPA.COLUMN); assertNotNull(column); assertNull(column.getTable()); @@ -190,7 +190,7 @@ public class ColumnTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestColumnWithColumnDefinition(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - ColumnAnnotation column = (ColumnAnnotation) attributeResource.getSupportingAnnotation(JPA.COLUMN); + ColumnAnnotation column = (ColumnAnnotation) attributeResource.getAnnotation(JPA.COLUMN); assertEquals(COLUMN_COLUMN_DEFINITION, column.getColumnDefinition()); } @@ -198,7 +198,7 @@ public class ColumnTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestColumn(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - ColumnAnnotation column = (ColumnAnnotation) attributeResource.getSupportingAnnotation(JPA.COLUMN); + ColumnAnnotation column = (ColumnAnnotation) attributeResource.getAnnotation(JPA.COLUMN); assertNotNull(column); assertNull(column.getColumnDefinition()); @@ -217,7 +217,7 @@ public class ColumnTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestColumnWithBooleanElement("unique"); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - ColumnAnnotation column = (ColumnAnnotation) attributeResource.getSupportingAnnotation(JPA.COLUMN); + ColumnAnnotation column = (ColumnAnnotation) attributeResource.getAnnotation(JPA.COLUMN); assertEquals(Boolean.TRUE, column.getUnique()); } @@ -226,7 +226,7 @@ public class ColumnTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestColumn(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - ColumnAnnotation column = (ColumnAnnotation) attributeResource.getSupportingAnnotation(JPA.COLUMN); + ColumnAnnotation column = (ColumnAnnotation) attributeResource.getAnnotation(JPA.COLUMN); assertNotNull(column); assertNull(column.getUnique()); @@ -244,7 +244,7 @@ public class ColumnTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestColumnWithBooleanElement("nullable"); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - ColumnAnnotation column = (ColumnAnnotation) attributeResource.getSupportingAnnotation(JPA.COLUMN); + ColumnAnnotation column = (ColumnAnnotation) attributeResource.getAnnotation(JPA.COLUMN); assertEquals(Boolean.TRUE, column.getNullable()); } @@ -253,7 +253,7 @@ public class ColumnTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestColumn(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - ColumnAnnotation column = (ColumnAnnotation) attributeResource.getSupportingAnnotation(JPA.COLUMN); + ColumnAnnotation column = (ColumnAnnotation) attributeResource.getAnnotation(JPA.COLUMN); assertNotNull(column); assertNull(column.getNullable()); @@ -271,7 +271,7 @@ public class ColumnTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestColumnWithBooleanElement("insertable"); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - ColumnAnnotation column = (ColumnAnnotation) attributeResource.getSupportingAnnotation(JPA.COLUMN); + ColumnAnnotation column = (ColumnAnnotation) attributeResource.getAnnotation(JPA.COLUMN); assertEquals(Boolean.TRUE, column.getInsertable()); } @@ -280,7 +280,7 @@ public class ColumnTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestColumn(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - ColumnAnnotation column = (ColumnAnnotation) attributeResource.getSupportingAnnotation(JPA.COLUMN); + ColumnAnnotation column = (ColumnAnnotation) attributeResource.getAnnotation(JPA.COLUMN); assertNotNull(column); assertNull(column.getInsertable()); @@ -298,7 +298,7 @@ public class ColumnTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestColumnWithBooleanElement("updatable"); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - ColumnAnnotation column = (ColumnAnnotation) attributeResource.getSupportingAnnotation(JPA.COLUMN); + ColumnAnnotation column = (ColumnAnnotation) attributeResource.getAnnotation(JPA.COLUMN); assertEquals(Boolean.TRUE, column.getUpdatable()); } @@ -307,7 +307,7 @@ public class ColumnTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestColumn(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - ColumnAnnotation column = (ColumnAnnotation) attributeResource.getSupportingAnnotation(JPA.COLUMN); + ColumnAnnotation column = (ColumnAnnotation) attributeResource.getAnnotation(JPA.COLUMN); assertNotNull(column); assertNull(column.getUpdatable()); @@ -325,7 +325,7 @@ public class ColumnTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestColumnWithIntElement("length"); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - ColumnAnnotation column = (ColumnAnnotation) attributeResource.getSupportingAnnotation(JPA.COLUMN); + ColumnAnnotation column = (ColumnAnnotation) attributeResource.getAnnotation(JPA.COLUMN); assertEquals(Integer.valueOf(5), column.getLength()); } @@ -334,7 +334,7 @@ public class ColumnTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestColumn(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - ColumnAnnotation column = (ColumnAnnotation) attributeResource.getSupportingAnnotation(JPA.COLUMN); + ColumnAnnotation column = (ColumnAnnotation) attributeResource.getAnnotation(JPA.COLUMN); assertNotNull(column); assertNull(column.getLength()); @@ -352,7 +352,7 @@ public class ColumnTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestColumnWithIntElement("precision"); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - ColumnAnnotation column = (ColumnAnnotation) attributeResource.getSupportingAnnotation(JPA.COLUMN); + ColumnAnnotation column = (ColumnAnnotation) attributeResource.getAnnotation(JPA.COLUMN); assertEquals(Integer.valueOf(5), column.getPrecision()); } @@ -361,7 +361,7 @@ public class ColumnTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestColumn(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - ColumnAnnotation column = (ColumnAnnotation) attributeResource.getSupportingAnnotation(JPA.COLUMN); + ColumnAnnotation column = (ColumnAnnotation) attributeResource.getAnnotation(JPA.COLUMN); assertNotNull(column); assertEquals(null, column.getPrecision()); @@ -379,7 +379,7 @@ public class ColumnTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestColumnWithIntElement("scale"); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - ColumnAnnotation column = (ColumnAnnotation) attributeResource.getSupportingAnnotation(JPA.COLUMN); + ColumnAnnotation column = (ColumnAnnotation) attributeResource.getAnnotation(JPA.COLUMN); assertEquals(Integer.valueOf(5), column.getScale()); } @@ -388,7 +388,7 @@ public class ColumnTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestColumn(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - ColumnAnnotation column = (ColumnAnnotation) attributeResource.getSupportingAnnotation(JPA.COLUMN); + ColumnAnnotation column = (ColumnAnnotation) attributeResource.getAnnotation(JPA.COLUMN); assertNotNull(column); assertNull(column.getScale()); diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/DiscriminatorColumnTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/DiscriminatorColumnTests.java index 3ca4deeb88..38e47e8372 100644 --- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/DiscriminatorColumnTests.java +++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/DiscriminatorColumnTests.java @@ -95,7 +95,7 @@ public class DiscriminatorColumnTests extends JavaResourceModelTestCase { public void testGetName() throws Exception { ICompilationUnit cu = this.createTestDiscriminatorColumnWithName(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - DiscriminatorColumnAnnotation column = (DiscriminatorColumnAnnotation) typeResource.getSupportingAnnotation(JPA.DISCRIMINATOR_COLUMN); + DiscriminatorColumnAnnotation column = (DiscriminatorColumnAnnotation) typeResource.getAnnotation(JPA.DISCRIMINATOR_COLUMN); assertNotNull(column); assertEquals(COLUMN_NAME, column.getName()); } @@ -103,7 +103,7 @@ public class DiscriminatorColumnTests extends JavaResourceModelTestCase { public void testGetNull() throws Exception { ICompilationUnit cu = this.createTestDiscriminatorColumn(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - DiscriminatorColumnAnnotation column = (DiscriminatorColumnAnnotation) typeResource.getSupportingAnnotation(JPA.DISCRIMINATOR_COLUMN); + DiscriminatorColumnAnnotation column = (DiscriminatorColumnAnnotation) typeResource.getAnnotation(JPA.DISCRIMINATOR_COLUMN); assertNotNull(column); assertNull(column.getName()); assertNull(column.getDiscriminatorType()); @@ -113,7 +113,7 @@ public class DiscriminatorColumnTests extends JavaResourceModelTestCase { public void testSetName() throws Exception { ICompilationUnit cu = this.createTestDiscriminatorColumn(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - DiscriminatorColumnAnnotation column = (DiscriminatorColumnAnnotation) typeResource.getSupportingAnnotation(JPA.DISCRIMINATOR_COLUMN); + DiscriminatorColumnAnnotation column = (DiscriminatorColumnAnnotation) typeResource.getAnnotation(JPA.DISCRIMINATOR_COLUMN); assertNotNull(column); assertNull(column.getName()); @@ -127,7 +127,7 @@ public class DiscriminatorColumnTests extends JavaResourceModelTestCase { public void testSetNameNull() throws Exception { ICompilationUnit cu = this.createTestDiscriminatorColumnWithName(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - DiscriminatorColumnAnnotation column = (DiscriminatorColumnAnnotation) typeResource.getSupportingAnnotation(JPA.DISCRIMINATOR_COLUMN); + DiscriminatorColumnAnnotation column = (DiscriminatorColumnAnnotation) typeResource.getAnnotation(JPA.DISCRIMINATOR_COLUMN); assertEquals(COLUMN_NAME, column.getName()); @@ -140,14 +140,14 @@ public class DiscriminatorColumnTests extends JavaResourceModelTestCase { public void testGetColumnDefinition() throws Exception { ICompilationUnit cu = this.createTestDiscriminatorColumnWithColumnDefinition(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - DiscriminatorColumnAnnotation column = (DiscriminatorColumnAnnotation) typeResource.getSupportingAnnotation(JPA.DISCRIMINATOR_COLUMN); + DiscriminatorColumnAnnotation column = (DiscriminatorColumnAnnotation) typeResource.getAnnotation(JPA.DISCRIMINATOR_COLUMN); assertEquals(COLUMN_COLUMN_DEFINITION, column.getColumnDefinition()); } public void testSetColumnDefinition() throws Exception { ICompilationUnit cu = this.createTestDiscriminatorColumn(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - DiscriminatorColumnAnnotation column = (DiscriminatorColumnAnnotation) typeResource.getSupportingAnnotation(JPA.DISCRIMINATOR_COLUMN); + DiscriminatorColumnAnnotation column = (DiscriminatorColumnAnnotation) typeResource.getAnnotation(JPA.DISCRIMINATOR_COLUMN); assertNotNull(column); assertNull(column.getColumnDefinition()); @@ -165,7 +165,7 @@ public class DiscriminatorColumnTests extends JavaResourceModelTestCase { public void testGetLength() throws Exception { ICompilationUnit cu = this.createTestColumnWithIntElement("length"); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - DiscriminatorColumnAnnotation column = (DiscriminatorColumnAnnotation) typeResource.getSupportingAnnotation(JPA.DISCRIMINATOR_COLUMN); + DiscriminatorColumnAnnotation column = (DiscriminatorColumnAnnotation) typeResource.getAnnotation(JPA.DISCRIMINATOR_COLUMN); assertEquals(Integer.valueOf(5), column.getLength()); } @@ -173,7 +173,7 @@ public class DiscriminatorColumnTests extends JavaResourceModelTestCase { public void testSetLength() throws Exception { ICompilationUnit cu = this.createTestDiscriminatorColumn(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - DiscriminatorColumnAnnotation column = (DiscriminatorColumnAnnotation) typeResource.getSupportingAnnotation(JPA.DISCRIMINATOR_COLUMN); + DiscriminatorColumnAnnotation column = (DiscriminatorColumnAnnotation) typeResource.getAnnotation(JPA.DISCRIMINATOR_COLUMN); assertNotNull(column); assertNull(column.getLength()); @@ -190,14 +190,14 @@ public class DiscriminatorColumnTests extends JavaResourceModelTestCase { public void testGetDiscriminatorType() throws Exception { ICompilationUnit cu = this.createTestDiscriminatorColumnWithDiscriminatorType(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - DiscriminatorColumnAnnotation column = (DiscriminatorColumnAnnotation) typeResource.getSupportingAnnotation(JPA.DISCRIMINATOR_COLUMN); + DiscriminatorColumnAnnotation column = (DiscriminatorColumnAnnotation) typeResource.getAnnotation(JPA.DISCRIMINATOR_COLUMN); assertEquals(DiscriminatorType.CHAR, column.getDiscriminatorType()); } public void testSetDiscriminatorType() throws Exception { ICompilationUnit cu = this.createTestDiscriminatorColumn(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - DiscriminatorColumnAnnotation column = (DiscriminatorColumnAnnotation) typeResource.getSupportingAnnotation(JPA.DISCRIMINATOR_COLUMN); + DiscriminatorColumnAnnotation column = (DiscriminatorColumnAnnotation) typeResource.getAnnotation(JPA.DISCRIMINATOR_COLUMN); assertNull(column.getDiscriminatorType()); diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/DiscriminatorValueTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/DiscriminatorValueTests.java index c5beed484f..542961c712 100644 --- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/DiscriminatorValueTests.java +++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/DiscriminatorValueTests.java @@ -53,7 +53,7 @@ public class DiscriminatorValueTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestDiscriminatorValue(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - DiscriminatorValueAnnotation discriminatorValue = (DiscriminatorValueAnnotation) typeResource.getSupportingAnnotation(JPA.DISCRIMINATOR_VALUE); + DiscriminatorValueAnnotation discriminatorValue = (DiscriminatorValueAnnotation) typeResource.getAnnotation(JPA.DISCRIMINATOR_VALUE); assertNotNull(discriminatorValue); } @@ -61,7 +61,7 @@ public class DiscriminatorValueTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestDiscriminatorValueWithValue(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - DiscriminatorValueAnnotation discriminatorValue = (DiscriminatorValueAnnotation) typeResource.getSupportingAnnotation(JPA.DISCRIMINATOR_VALUE); + DiscriminatorValueAnnotation discriminatorValue = (DiscriminatorValueAnnotation) typeResource.getAnnotation(JPA.DISCRIMINATOR_VALUE); assertEquals("discriminator", discriminatorValue.getValue()); } @@ -69,7 +69,7 @@ public class DiscriminatorValueTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestDiscriminatorValue(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - DiscriminatorValueAnnotation discriminatorValue = (DiscriminatorValueAnnotation) typeResource.getSupportingAnnotation(JPA.DISCRIMINATOR_VALUE); + DiscriminatorValueAnnotation discriminatorValue = (DiscriminatorValueAnnotation) typeResource.getAnnotation(JPA.DISCRIMINATOR_VALUE); discriminatorValue.setValue("foo"); diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/EmbeddableTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/EmbeddableTests.java index 6ad9f3b0c8..e1b69a0feb 100644 --- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/EmbeddableTests.java +++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/EmbeddableTests.java @@ -56,7 +56,7 @@ public class EmbeddableTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestEmbeddable(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourceNode mappingAnnotation = typeResource.getMappingAnnotation(); + JavaResourceNode mappingAnnotation = typeResource.getAnnotation(EmbeddableAnnotation.ANNOTATION_NAME); assertTrue(mappingAnnotation instanceof EmbeddableAnnotation); } @@ -64,10 +64,10 @@ public class EmbeddableTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestEmbeddableAndEntity(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourceNode mappingAnnotation = typeResource.getMappingAnnotation(); + JavaResourceNode mappingAnnotation = typeResource.getAnnotation(EmbeddableAnnotation.ANNOTATION_NAME); assertTrue(mappingAnnotation instanceof EmbeddableAnnotation); - EntityAnnotation entity = (EntityAnnotation) typeResource.getMappingAnnotation(JPA.ENTITY); + EntityAnnotation entity = (EntityAnnotation) typeResource.getAnnotation(JPA.ENTITY); assertNotNull(entity); } diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/EmbeddedIdTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/EmbeddedIdTests.java index 42acc30c0c..bcd884dc17 100644 --- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/EmbeddedIdTests.java +++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/EmbeddedIdTests.java @@ -43,7 +43,7 @@ public class EmbeddedIdTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - JavaResourceNode mappingAnnotation = attributeResource.getMappingAnnotation(); + JavaResourceNode mappingAnnotation = attributeResource.getAnnotation(EmbeddedIdAnnotation.ANNOTATION_NAME); assertTrue(mappingAnnotation instanceof EmbeddedIdAnnotation); } diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/EmbeddedTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/EmbeddedTests.java index f34354a840..98117ca0a7 100644 --- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/EmbeddedTests.java +++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/EmbeddedTests.java @@ -43,7 +43,7 @@ public class EmbeddedTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - JavaResourceNode mappingAnnotation = attributeResource.getMappingAnnotation(); + JavaResourceNode mappingAnnotation = attributeResource.getAnnotation(EmbeddedAnnotation.ANNOTATION_NAME); assertTrue(mappingAnnotation instanceof EmbeddedAnnotation); } diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/EntityTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/EntityTests.java index 6297416b63..a958cbe45d 100644 --- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/EntityTests.java +++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/EntityTests.java @@ -71,7 +71,7 @@ public class EntityTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestEntityWithName(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - EntityAnnotation entity = (EntityAnnotation) typeResource.getMappingAnnotation(JPA.ENTITY); + EntityAnnotation entity = (EntityAnnotation) typeResource.getAnnotation(JPA.ENTITY); assertTrue(entity != null); assertEquals(ENTITY_NAME, entity.getName()); } @@ -80,7 +80,7 @@ public class EntityTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestEntity(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - EntityAnnotation entity = (EntityAnnotation) typeResource.getMappingAnnotation(JPA.ENTITY); + EntityAnnotation entity = (EntityAnnotation) typeResource.getAnnotation(JPA.ENTITY); assertTrue(entity != null); assertNull(entity.getName()); } @@ -89,7 +89,7 @@ public class EntityTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestEntity(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - EntityAnnotation entity = (EntityAnnotation) typeResource.getMappingAnnotation(JPA.ENTITY); + EntityAnnotation entity = (EntityAnnotation) typeResource.getAnnotation(JPA.ENTITY); assertNull(entity.getName()); entity.setName("Foo"); assertEquals("Foo", entity.getName()); @@ -101,7 +101,7 @@ public class EntityTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestEntityWithName(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - EntityAnnotation entity = (EntityAnnotation) typeResource.getMappingAnnotation(JPA.ENTITY); + EntityAnnotation entity = (EntityAnnotation) typeResource.getAnnotation(JPA.ENTITY); assertEquals(ENTITY_NAME, entity.getName()); entity.setName(null); @@ -115,10 +115,10 @@ public class EntityTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestMappedSuperclassAndEntity(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourceNode mappingAnnotation = typeResource.getMappingAnnotation(); + JavaResourceNode mappingAnnotation = typeResource.getAnnotation(EntityAnnotation.ANNOTATION_NAME); assertTrue(mappingAnnotation instanceof EntityAnnotation); - MappedSuperclassAnnotation mappedSuperclass = (MappedSuperclassAnnotation) typeResource.getMappingAnnotation(JPA.MAPPED_SUPERCLASS); + MappedSuperclassAnnotation mappedSuperclass = (MappedSuperclassAnnotation) typeResource.getAnnotation(JPA.MAPPED_SUPERCLASS); assertNotNull(mappedSuperclass); } diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/EnumeratedTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/EnumeratedTests.java index 919676c0f0..a17bf64a52 100644 --- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/EnumeratedTests.java +++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/EnumeratedTests.java @@ -56,7 +56,7 @@ public class EnumeratedTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - EnumeratedAnnotation enumerated = (EnumeratedAnnotation) attributeResource.getSupportingAnnotation(JPA.ENUMERATED); + EnumeratedAnnotation enumerated = (EnumeratedAnnotation) attributeResource.getAnnotation(JPA.ENUMERATED); assertNotNull(enumerated); } @@ -65,7 +65,7 @@ public class EnumeratedTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - EnumeratedAnnotation enumerated = (EnumeratedAnnotation) attributeResource.getSupportingAnnotation(JPA.ENUMERATED); + EnumeratedAnnotation enumerated = (EnumeratedAnnotation) attributeResource.getAnnotation(JPA.ENUMERATED); assertEquals(EnumType.ORDINAL, enumerated.getValue()); } @@ -74,7 +74,7 @@ public class EnumeratedTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - EnumeratedAnnotation enumerated = (EnumeratedAnnotation) attributeResource.getSupportingAnnotation(JPA.ENUMERATED); + EnumeratedAnnotation enumerated = (EnumeratedAnnotation) attributeResource.getAnnotation(JPA.ENUMERATED); enumerated.setValue(EnumType.STRING); diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/GeneratedValueTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/GeneratedValueTests.java index e65a912113..e32c0d03d7 100644 --- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/GeneratedValueTests.java +++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/GeneratedValueTests.java @@ -70,7 +70,7 @@ public class GeneratedValueTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - GeneratedValueAnnotation generatedValue = (GeneratedValueAnnotation) attributeResource.getSupportingAnnotation(JPA.GENERATED_VALUE); + GeneratedValueAnnotation generatedValue = (GeneratedValueAnnotation) attributeResource.getAnnotation(JPA.GENERATED_VALUE); assertNotNull(generatedValue); } @@ -79,7 +79,7 @@ public class GeneratedValueTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - GeneratedValueAnnotation generatedValue = (GeneratedValueAnnotation) attributeResource.getSupportingAnnotation(JPA.GENERATED_VALUE); + GeneratedValueAnnotation generatedValue = (GeneratedValueAnnotation) attributeResource.getAnnotation(JPA.GENERATED_VALUE); assertEquals(GENERATOR, generatedValue.getGenerator()); } @@ -88,7 +88,7 @@ public class GeneratedValueTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - GeneratedValueAnnotation generatedValue = (GeneratedValueAnnotation) attributeResource.getSupportingAnnotation(JPA.GENERATED_VALUE); + GeneratedValueAnnotation generatedValue = (GeneratedValueAnnotation) attributeResource.getAnnotation(JPA.GENERATED_VALUE); assertEquals(GENERATOR, generatedValue.getGenerator()); generatedValue.setGenerator("foo"); @@ -108,7 +108,7 @@ public class GeneratedValueTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - GeneratedValueAnnotation generatedValue = (GeneratedValueAnnotation) attributeResource.getSupportingAnnotation(JPA.GENERATED_VALUE); + GeneratedValueAnnotation generatedValue = (GeneratedValueAnnotation) attributeResource.getAnnotation(JPA.GENERATED_VALUE); assertEquals(GenerationType.SEQUENCE, generatedValue.getStrategy()); } @@ -117,7 +117,7 @@ public class GeneratedValueTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - GeneratedValueAnnotation generatedValue = (GeneratedValueAnnotation) attributeResource.getSupportingAnnotation(JPA.GENERATED_VALUE); + GeneratedValueAnnotation generatedValue = (GeneratedValueAnnotation) attributeResource.getAnnotation(JPA.GENERATED_VALUE); assertEquals(GenerationType.SEQUENCE, generatedValue.getStrategy()); generatedValue.setStrategy(GenerationType.TABLE); diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/IdClassTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/IdClassTests.java index c6ce1260ff..af0079717e 100644 --- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/IdClassTests.java +++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/IdClassTests.java @@ -55,7 +55,7 @@ public class IdClassTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestIdClass(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - IdClassAnnotation idClass = (IdClassAnnotation) typeResource.getSupportingAnnotation(JPA.ID_CLASS); + IdClassAnnotation idClass = (IdClassAnnotation) typeResource.getAnnotation(JPA.ID_CLASS); assertNotNull(idClass); assertNull(idClass.getValue()); } @@ -64,7 +64,7 @@ public class IdClassTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestIdClassWithValue(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - IdClassAnnotation idClass = (IdClassAnnotation) typeResource.getSupportingAnnotation(JPA.ID_CLASS); + IdClassAnnotation idClass = (IdClassAnnotation) typeResource.getAnnotation(JPA.ID_CLASS); assertEquals(ID_CLASS_VALUE, idClass.getValue()); } @@ -72,7 +72,7 @@ public class IdClassTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestIdClassWithValue(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - IdClassAnnotation idClass = (IdClassAnnotation) typeResource.getSupportingAnnotation(JPA.ID_CLASS); + IdClassAnnotation idClass = (IdClassAnnotation) typeResource.getAnnotation(JPA.ID_CLASS); assertEquals(ID_CLASS_VALUE, idClass.getValue()); idClass.setValue("foo"); @@ -84,7 +84,7 @@ public class IdClassTests extends JavaResourceModelTestCase { assertSourceDoesNotContain("@IdClass", cu); - idClass = (IdClassAnnotation) typeResource.getSupportingAnnotation(JPA.ID_CLASS); + idClass = (IdClassAnnotation) typeResource.getAnnotation(JPA.ID_CLASS); assertNull(idClass); } @@ -92,7 +92,7 @@ public class IdClassTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestIdClassWithValue(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - IdClassAnnotation idClass = (IdClassAnnotation) typeResource.getSupportingAnnotation(JPA.ID_CLASS); + IdClassAnnotation idClass = (IdClassAnnotation) typeResource.getAnnotation(JPA.ID_CLASS); assertNotNull(idClass.getValue()); assertEquals("MyClass", idClass.getFullyQualifiedClassName()); //bug 196200 changed this diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/IdTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/IdTests.java index 3574e4d649..9dd3c413e9 100644 --- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/IdTests.java +++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/IdTests.java @@ -43,7 +43,7 @@ public class IdTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - JavaResourceNode mappingAnnotation = attributeResource.getMappingAnnotation(); + JavaResourceNode mappingAnnotation = attributeResource.getAnnotation(IdAnnotation.ANNOTATION_NAME); assertTrue(mappingAnnotation instanceof IdAnnotation); } diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/InheritanceTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/InheritanceTests.java index d3901a3956..a40770ca29 100644 --- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/InheritanceTests.java +++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/InheritanceTests.java @@ -54,7 +54,7 @@ public class InheritanceTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestInheritance(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - InheritanceAnnotation inheritance = (InheritanceAnnotation) typeResource.getSupportingAnnotation(JPA.INHERITANCE); + InheritanceAnnotation inheritance = (InheritanceAnnotation) typeResource.getAnnotation(JPA.INHERITANCE); assertNotNull(inheritance); } @@ -62,7 +62,7 @@ public class InheritanceTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestInheritanceWithStrategy(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - InheritanceAnnotation inheritance = (InheritanceAnnotation) typeResource.getSupportingAnnotation(JPA.INHERITANCE); + InheritanceAnnotation inheritance = (InheritanceAnnotation) typeResource.getAnnotation(JPA.INHERITANCE); assertEquals(InheritanceType.JOINED, inheritance.getStrategy()); } @@ -70,7 +70,7 @@ public class InheritanceTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestInheritance(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - InheritanceAnnotation inheritance = (InheritanceAnnotation) typeResource.getSupportingAnnotation(JPA.INHERITANCE); + InheritanceAnnotation inheritance = (InheritanceAnnotation) typeResource.getAnnotation(JPA.INHERITANCE); inheritance.setStrategy(InheritanceType.TABLE_PER_CLASS); assertSourceContains("@Inheritance(strategy = TABLE_PER_CLASS)", cu); diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/JavaResourcePersistentAttributeTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/JavaResourcePersistentAttributeTests.java index 1a8cb78a59..99e2328de6 100644 --- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/JavaResourcePersistentAttributeTests.java +++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/JavaResourcePersistentAttributeTests.java @@ -19,6 +19,7 @@ import org.eclipse.jpt.core.internal.resource.java.source.SourceOneToOneAnnotati import org.eclipse.jpt.core.resource.java.AttributeOverrideAnnotation; import org.eclipse.jpt.core.resource.java.BasicAnnotation; import org.eclipse.jpt.core.resource.java.ColumnAnnotation; +import org.eclipse.jpt.core.resource.java.GeneratedValueAnnotation; import org.eclipse.jpt.core.resource.java.IdAnnotation; import org.eclipse.jpt.core.resource.java.JPA; import org.eclipse.jpt.core.resource.java.JavaResourceNode; @@ -346,21 +347,21 @@ public class JavaResourcePersistentAttributeTests extends JavaResourceModelTestC ICompilationUnit cu = this.createTestEntityWithColumn(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - assertEquals(1, attributeResource.supportingAnnotationsSize()); + assertEquals(1, attributeResource.annotationsSize()); } public void testJavaAttributeAnnotation() throws Exception { ICompilationUnit cu = this.createTestEntityWithColumn(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - assertNotNull(attributeResource.getSupportingAnnotation(JPA.COLUMN)); + assertNotNull(attributeResource.getAnnotation(JPA.COLUMN)); } public void testJavaAttributeAnnotationNull() throws Exception { ICompilationUnit cu = this.createTestEntity(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - assertNull(attributeResource.getSupportingAnnotation(JPA.TABLE)); + assertNull(attributeResource.getAnnotation(JPA.TABLE)); } //This will result in a compilation error, but we assume the first column found @@ -368,7 +369,7 @@ public class JavaResourcePersistentAttributeTests extends JavaResourceModelTestC ICompilationUnit cu = this.createTestEntityMultipleColumns(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - ColumnAnnotation columnResource = (ColumnAnnotation) attributeResource.getSupportingAnnotation(JPA.COLUMN); + ColumnAnnotation columnResource = (ColumnAnnotation) attributeResource.getAnnotation(JPA.COLUMN); assertEquals("FOO", columnResource.getName()); } @@ -376,7 +377,7 @@ public class JavaResourcePersistentAttributeTests extends JavaResourceModelTestC ICompilationUnit cu = this.createTestEntityWithColumn(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - attributeResource.removeSupportingAnnotation(JPA.COLUMN); + attributeResource.removeAnnotation(JPA.COLUMN); assertSourceDoesNotContain("@Column", cu); } @@ -386,14 +387,14 @@ public class JavaResourcePersistentAttributeTests extends JavaResourceModelTestC JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - ColumnAnnotation columnResource = (ColumnAnnotation) attributeResource.getSupportingAnnotation(JPA.COLUMN); + ColumnAnnotation columnResource = (ColumnAnnotation) attributeResource.getAnnotation(JPA.COLUMN); columnResource.setTable(null); assertSourceContains("@Column(name = \"FOO\")", cu); columnResource.setName(null); assertSourceDoesNotContain("@Column", cu); - assertNull(typeResource.getSupportingAnnotation(JPA.TABLE)); + assertNull(typeResource.getAnnotation(JPA.TABLE)); } public void testMultipleAttributeMappings() throws Exception { @@ -401,19 +402,18 @@ public class JavaResourcePersistentAttributeTests extends JavaResourceModelTestC JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - assertEquals(2, attributeResource.mappingAnnotationsSize()); - assertEquals(0, attributeResource.supportingAnnotationsSize()); - assertNotNull(attributeResource.getMappingAnnotation(JPA.BASIC)); - assertNotNull(attributeResource.getMappingAnnotation(JPA.ID)); + assertEquals(2, attributeResource.annotationsSize()); + assertNotNull(attributeResource.getAnnotation(JPA.BASIC)); + assertNotNull(attributeResource.getAnnotation(JPA.ID)); - JavaResourceNode javaAttributeMappingAnnotation = attributeResource.getMappingAnnotation(); + JavaResourceNode javaAttributeMappingAnnotation = attributeResource.getAnnotation(BasicAnnotation.ANNOTATION_NAME); assertTrue(javaAttributeMappingAnnotation instanceof BasicAnnotation); assertSourceContains("@Basic", cu); assertSourceContains("@Id", cu); - attributeResource.setMappingAnnotation(JPA.ONE_TO_MANY); - assertEquals(1, attributeResource.mappingAnnotationsSize()); - javaAttributeMappingAnnotation = attributeResource.getMappingAnnotation(); + attributeResource.setPrimaryAnnotation(JPA.ONE_TO_MANY, new String[0]); + assertEquals(1, attributeResource.annotationsSize()); + javaAttributeMappingAnnotation = attributeResource.getAnnotation(OneToManyAnnotation.ANNOTATION_NAME); assertTrue(javaAttributeMappingAnnotation instanceof OneToManyAnnotation); assertSourceDoesNotContain("@Id", cu); assertSourceContains("@OneToMany", cu); @@ -424,10 +424,10 @@ public class JavaResourcePersistentAttributeTests extends JavaResourceModelTestC ICompilationUnit cu = createTestType(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - assertEquals(0, attributeResource.mappingAnnotationsSize()); + assertEquals(0, attributeResource.annotationsSize()); - attributeResource.setMappingAnnotation(JPA.ID); - assertTrue(attributeResource.getMappingAnnotation() instanceof IdAnnotation); + attributeResource.setPrimaryAnnotation(JPA.ID, new String[0]); + assertTrue(attributeResource.getAnnotation(IdAnnotation.ANNOTATION_NAME) instanceof IdAnnotation); assertSourceContains("@Id", cu); } @@ -435,10 +435,10 @@ public class JavaResourcePersistentAttributeTests extends JavaResourceModelTestC ICompilationUnit cu = createTestEntityWithColumn(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - assertNull(attributeResource.getMappingAnnotation()); + assertEquals(1, attributeResource.annotationsSize()); - attributeResource.setMappingAnnotation(JPA.ID); - assertTrue(attributeResource.getMappingAnnotation() instanceof IdAnnotation); + attributeResource.setPrimaryAnnotation(JPA.ID, new String[] {ColumnAnnotation.ANNOTATION_NAME}); + assertTrue(attributeResource.getAnnotation(IdAnnotation.ANNOTATION_NAME) instanceof IdAnnotation); assertSourceContains("@Id", cu); assertSourceContains("@Column", cu); @@ -448,10 +448,14 @@ public class JavaResourcePersistentAttributeTests extends JavaResourceModelTestC ICompilationUnit cu = createTestEntityWithIdColumnGeneratedValue(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - assertTrue(attributeResource.getMappingAnnotation() instanceof IdAnnotation); + assertTrue(attributeResource.getAnnotation(IdAnnotation.ANNOTATION_NAME) instanceof IdAnnotation); - attributeResource.setMappingAnnotation(JPA.BASIC); - assertTrue(attributeResource.getMappingAnnotation() instanceof BasicAnnotation); + attributeResource.setPrimaryAnnotation( + JPA.BASIC, + new String[] { + ColumnAnnotation.ANNOTATION_NAME, + GeneratedValueAnnotation.ANNOTATION_NAME}); + assertTrue(attributeResource.getAnnotation(BasicAnnotation.ANNOTATION_NAME) instanceof BasicAnnotation); assertSourceDoesNotContain("@Id", cu); assertSourceContains("@GeneratedValue", cu); //not supported by Basic @@ -462,11 +466,15 @@ public class JavaResourcePersistentAttributeTests extends JavaResourceModelTestC ICompilationUnit cu = createTestEntityWithIdColumnGeneratedValue(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - assertTrue(attributeResource.getMappingAnnotation() instanceof IdAnnotation); + assertTrue(attributeResource.getAnnotation(IdAnnotation.ANNOTATION_NAME) instanceof IdAnnotation); - attributeResource.setMappingAnnotation(null); - assertNull(attributeResource.getMappingAnnotation()); + attributeResource.setPrimaryAnnotation( + null, + new String[] { + ColumnAnnotation.ANNOTATION_NAME, + GeneratedValueAnnotation.ANNOTATION_NAME}); + assertEquals(2, attributeResource.annotationsSize()); assertSourceDoesNotContain("@Id", cu); assertSourceContains("@GeneratedValue", cu); //not supported by Basic assertSourceContains("@Column", cu); //common between Id and Basic @@ -479,7 +487,7 @@ public class JavaResourcePersistentAttributeTests extends JavaResourceModelTestC JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); assertSourceDoesNotContain("@Column", cu); - attributeResource.addSupportingAnnotation(JPA.COLUMN); + attributeResource.addAnnotation(JPA.COLUMN); assertSourceContains("@Column", cu); } @@ -488,7 +496,7 @@ public class JavaResourcePersistentAttributeTests extends JavaResourceModelTestC JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); assertSourceContains("@Column", cu); - attributeResource.removeSupportingAnnotation(JPA.COLUMN); + attributeResource.removeAnnotation(JPA.COLUMN); assertSourceDoesNotContain("@Column", cu); } @@ -512,9 +520,9 @@ public class JavaResourcePersistentAttributeTests extends JavaResourceModelTestC } }); - assertNotNull(attributeResource.getSupportingAnnotation(JPA.COLUMN)); - assertNull(attributeResource.getMappingAnnotation(JPA.ID)); - assertNotNull(attributeResource.getMappingAnnotation(JPA.ONE_TO_ONE)); + assertNotNull(attributeResource.getAnnotation(JPA.COLUMN)); + assertNull(attributeResource.getAnnotation(JPA.ID)); + assertNotNull(attributeResource.getAnnotation(JPA.ONE_TO_ONE)); assertSourceContains("@Column", cu); } @@ -523,9 +531,9 @@ public class JavaResourcePersistentAttributeTests extends JavaResourceModelTestC JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - assertEquals(1, CollectionTools.size(attributeResource.supportingAnnotations(JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES))); + assertEquals(1, CollectionTools.size(attributeResource.annotations(JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES))); - AttributeOverrideAnnotation attributeOverride = (AttributeOverrideAnnotation) attributeResource.supportingAnnotations(JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES).next(); + AttributeOverrideAnnotation attributeOverride = (AttributeOverrideAnnotation) attributeResource.annotations(JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES).next(); assertEquals("FOO", attributeOverride.getName()); } @@ -535,7 +543,7 @@ public class JavaResourcePersistentAttributeTests extends JavaResourceModelTestC JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - assertEquals(0, CollectionTools.size(attributeResource.supportingAnnotations(JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES))); + assertEquals(0, CollectionTools.size(attributeResource.annotations(JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES))); } public void testJavaAttributeAnnotationsContainerNoNestable() throws Exception { @@ -543,18 +551,18 @@ public class JavaResourcePersistentAttributeTests extends JavaResourceModelTestC JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - assertEquals(0, CollectionTools.size(attributeResource.supportingAnnotations(JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES))); + assertEquals(0, CollectionTools.size(attributeResource.annotations(JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES))); } public void testJavaAttributeAnnotationsNestableAndContainer() throws Exception { ICompilationUnit cu = createTestEmbeddedWithAttributeOverrideAndAttributeOverrides(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - assertNotNull(attributeResource.getSupportingAnnotation(JPA.ATTRIBUTE_OVERRIDE)); - assertNotNull(attributeResource.getSupportingAnnotation(JPA.ATTRIBUTE_OVERRIDES)); - assertEquals(2, CollectionTools.size(attributeResource.supportingAnnotations(JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES))); + assertNotNull(attributeResource.getAnnotation(JPA.ATTRIBUTE_OVERRIDE)); + assertNotNull(attributeResource.getAnnotation(JPA.ATTRIBUTE_OVERRIDES)); + assertEquals(2, CollectionTools.size(attributeResource.annotations(JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES))); - AttributeOverrideAnnotation attributeOverrideResource = (AttributeOverrideAnnotation) attributeResource.supportingAnnotations(JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES).next(); + AttributeOverrideAnnotation attributeOverrideResource = (AttributeOverrideAnnotation) attributeResource.annotations(JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES).next(); assertEquals("BAR", attributeOverrideResource.getName()); } @@ -563,7 +571,7 @@ public class JavaResourcePersistentAttributeTests extends JavaResourceModelTestC ICompilationUnit cu = createTestEntity(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - AttributeOverrideAnnotation attributeOverride = (AttributeOverrideAnnotation) attributeResource.addSupportingAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + AttributeOverrideAnnotation attributeOverride = (AttributeOverrideAnnotation) attributeResource.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); attributeOverride.setName("FOO"); assertSourceContains("@AttributeOverride(name = \"FOO\")", cu); } @@ -575,13 +583,13 @@ public class JavaResourcePersistentAttributeTests extends JavaResourceModelTestC JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - AttributeOverrideAnnotation attributeOverride = (AttributeOverrideAnnotation) attributeResource.addSupportingAnnotation(1, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + AttributeOverrideAnnotation attributeOverride = (AttributeOverrideAnnotation) attributeResource.addAnnotation(1, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); attributeOverride.setName("BAR"); assertSourceContains("@AttributeOverrides({@AttributeOverride(name = \"FOO\"),@AttributeOverride(name = \"BAR\")})", cu); - assertNull(attributeResource.getSupportingAnnotation(JPA.ATTRIBUTE_OVERRIDE)); - assertNotNull(attributeResource.getSupportingAnnotation(JPA.ATTRIBUTE_OVERRIDES)); - assertEquals(2, CollectionTools.size(attributeResource.supportingAnnotations(JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES))); + assertNull(attributeResource.getAnnotation(JPA.ATTRIBUTE_OVERRIDE)); + assertNotNull(attributeResource.getAnnotation(JPA.ATTRIBUTE_OVERRIDES)); + assertEquals(2, CollectionTools.size(attributeResource.annotations(JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES))); } // @Embedded @@ -595,13 +603,13 @@ public class JavaResourcePersistentAttributeTests extends JavaResourceModelTestC JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - AttributeOverrideAnnotation attributeOverride = (AttributeOverrideAnnotation) attributeResource.addSupportingAnnotation(1, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + AttributeOverrideAnnotation attributeOverride = (AttributeOverrideAnnotation) attributeResource.addAnnotation(1, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); attributeOverride.setName("BAR"); assertSourceContains("@AttributeOverrides({@AttributeOverride(name = \"FOO\"),@AttributeOverride(name = \"BAR\")})", cu); - assertNull(attributeResource.getSupportingAnnotation(JPA.ATTRIBUTE_OVERRIDE)); - assertNotNull(attributeResource.getSupportingAnnotation(JPA.ATTRIBUTE_OVERRIDES)); - assertEquals(2, CollectionTools.size(attributeResource.supportingAnnotations(JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES))); + assertNull(attributeResource.getAnnotation(JPA.ATTRIBUTE_OVERRIDE)); + assertNotNull(attributeResource.getAnnotation(JPA.ATTRIBUTE_OVERRIDES)); + assertEquals(2, CollectionTools.size(attributeResource.annotations(JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES))); } public void testAddJavaAttributeAnnotationNestableContainer5() throws Exception { @@ -609,13 +617,13 @@ public class JavaResourcePersistentAttributeTests extends JavaResourceModelTestC JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - AttributeOverrideAnnotation attributeOverride = (AttributeOverrideAnnotation) attributeResource.addSupportingAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + AttributeOverrideAnnotation attributeOverride = (AttributeOverrideAnnotation) attributeResource.addAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); attributeOverride.setName("BAR"); assertSourceContains("@AttributeOverrides({@AttributeOverride(name = \"BAR\"),@AttributeOverride(name = \"FOO\")})", cu); - assertNull(attributeResource.getSupportingAnnotation(JPA.ATTRIBUTE_OVERRIDE)); - assertNotNull(attributeResource.getSupportingAnnotation(JPA.ATTRIBUTE_OVERRIDES)); - assertEquals(2, CollectionTools.size(attributeResource.supportingAnnotations(JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES))); + assertNull(attributeResource.getAnnotation(JPA.ATTRIBUTE_OVERRIDE)); + assertNotNull(attributeResource.getAnnotation(JPA.ATTRIBUTE_OVERRIDES)); + assertEquals(2, CollectionTools.size(attributeResource.annotations(JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES))); } // @Embedded @@ -631,20 +639,20 @@ public class JavaResourcePersistentAttributeTests extends JavaResourceModelTestC JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - assertNotNull(attributeResource.getSupportingAnnotation(JPA.ATTRIBUTE_OVERRIDE)); - assertNotNull(attributeResource.getSupportingAnnotation(JPA.ATTRIBUTE_OVERRIDES)); - assertEquals(2, CollectionTools.size(attributeResource.supportingAnnotations(JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES))); + assertNotNull(attributeResource.getAnnotation(JPA.ATTRIBUTE_OVERRIDE)); + assertNotNull(attributeResource.getAnnotation(JPA.ATTRIBUTE_OVERRIDES)); + assertEquals(2, CollectionTools.size(attributeResource.annotations(JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES))); - AttributeOverrideAnnotation attributeOverride = (AttributeOverrideAnnotation) attributeResource.addSupportingAnnotation(2, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + AttributeOverrideAnnotation attributeOverride = (AttributeOverrideAnnotation) attributeResource.addAnnotation(2, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); assertSourceContains("@AttributeOverrides({@AttributeOverride(name = \"BAR\"), @AttributeOverride(name = \"BAZ\"),", cu); assertSourceContains("@AttributeOverride})", cu); attributeOverride.setName("BOO"); - assertNotNull(attributeResource.getSupportingAnnotation(JPA.ATTRIBUTE_OVERRIDE)); - assertNotNull(attributeResource.getSupportingAnnotation(JPA.ATTRIBUTE_OVERRIDES)); - assertEquals(3, CollectionTools.size(attributeResource.supportingAnnotations(JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES))); + assertNotNull(attributeResource.getAnnotation(JPA.ATTRIBUTE_OVERRIDE)); + assertNotNull(attributeResource.getAnnotation(JPA.ATTRIBUTE_OVERRIDES)); + assertEquals(3, CollectionTools.size(attributeResource.annotations(JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES))); - Iterator<NestableAnnotation> attributeOverrideAnnotations = attributeResource.supportingAnnotations(JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + Iterator<NestableAnnotation> attributeOverrideAnnotations = attributeResource.annotations(JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); attributeOverride = (AttributeOverrideAnnotation) attributeOverrideAnnotations.next(); assertEquals("BAR", attributeOverride.getName()); attributeOverride = (AttributeOverrideAnnotation) attributeOverrideAnnotations.next(); @@ -663,7 +671,7 @@ public class JavaResourcePersistentAttributeTests extends JavaResourceModelTestC JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - attributeResource.removeSupportingAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + attributeResource.removeAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); assertSourceDoesNotContain("@AttributeOverride", cu); } @@ -676,7 +684,7 @@ public class JavaResourcePersistentAttributeTests extends JavaResourceModelTestC JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - attributeResource.removeSupportingAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + attributeResource.removeAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); assertSourceDoesNotContain("@AttributeOverride", cu); assertSourceDoesNotContain("@AttributeOverrides", cu); @@ -687,7 +695,7 @@ public class JavaResourcePersistentAttributeTests extends JavaResourceModelTestC JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - attributeResource.removeSupportingAnnotation(0, JPA.ATTRIBUTE_OVERRIDE , JPA.ATTRIBUTE_OVERRIDES); + attributeResource.removeAnnotation(0, JPA.ATTRIBUTE_OVERRIDE , JPA.ATTRIBUTE_OVERRIDES); assertSourceDoesNotContain("@AttributeOverride(name = \"FOO\"", cu); assertSourceContains("@AttributeOverride(name = \"BAR\"", cu); @@ -699,12 +707,12 @@ public class JavaResourcePersistentAttributeTests extends JavaResourceModelTestC JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - AttributeOverrideAnnotation newAnnotation = (AttributeOverrideAnnotation)attributeResource.addSupportingAnnotation(2, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + AttributeOverrideAnnotation newAnnotation = (AttributeOverrideAnnotation)attributeResource.addAnnotation(2, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); newAnnotation.setName("BAZ"); assertSourceContains("@AttributeOverrides({@AttributeOverride(name = \"FOO\"), @AttributeOverride(name = \"BAR\"),", cu); assertSourceContains("@AttributeOverride(name = \"BAZ\")})", cu); - attributeResource.removeSupportingAnnotation(1, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + attributeResource.removeAnnotation(1, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); assertSourceContains("@AttributeOverrides({@AttributeOverride(name = \"FOO\"), @AttributeOverride(name = \"BAZ\")})", cu); } @@ -713,13 +721,13 @@ public class JavaResourcePersistentAttributeTests extends JavaResourceModelTestC JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - AttributeOverrideAnnotation newAnnotation = (AttributeOverrideAnnotation)attributeResource.addSupportingAnnotation(2, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + AttributeOverrideAnnotation newAnnotation = (AttributeOverrideAnnotation)attributeResource.addAnnotation(2, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); newAnnotation.setName("BAZ"); assertSourceContains("@AttributeOverrides({@AttributeOverride(name = \"FOO\"), @AttributeOverride(name = \"BAR\"),", cu); assertSourceContains("@AttributeOverride(name = \"BAZ\")})", cu); - attributeResource.moveSupportingAnnotation(0, 2, JPA.ATTRIBUTE_OVERRIDES); + attributeResource.moveAnnotation(0, 2, JPA.ATTRIBUTE_OVERRIDES); assertSourceContains("@AttributeOverrides({@AttributeOverride(name = \"BAZ\"), @AttributeOverride(name = \"FOO\"),", cu); assertSourceContains("@AttributeOverride(name = \"BAR\")})", cu); } @@ -729,12 +737,12 @@ public class JavaResourcePersistentAttributeTests extends JavaResourceModelTestC JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - AttributeOverrideAnnotation newAnnotation = (AttributeOverrideAnnotation) attributeResource.addSupportingAnnotation(2, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); + AttributeOverrideAnnotation newAnnotation = (AttributeOverrideAnnotation) attributeResource.addAnnotation(2, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES); newAnnotation.setName("BAZ"); assertSourceContains("@AttributeOverrides({@AttributeOverride(name = \"FOO\"), @AttributeOverride(name = \"BAR\"),", cu); assertSourceContains("@AttributeOverride(name = \"BAZ\")})", cu); - attributeResource.moveSupportingAnnotation(1, 0, JPA.ATTRIBUTE_OVERRIDES); + attributeResource.moveAnnotation(1, 0, JPA.ATTRIBUTE_OVERRIDES); assertSourceContains("@AttributeOverrides({@AttributeOverride(name = \"BAR\"), @AttributeOverride(name = \"FOO\"),", cu); assertSourceContains("@AttributeOverride(name = \"BAZ\")})", cu); } @@ -815,11 +823,11 @@ public class JavaResourcePersistentAttributeTests extends JavaResourceModelTestC assertEquals(4, CollectionTools.size(typeResource.fields())); Iterator<JavaResourcePersistentAttribute> fields = typeResource.fields(); JavaResourcePersistentAttribute attributeResource = fields.next(); - ColumnAnnotation column = (ColumnAnnotation) attributeResource.getSupportingAnnotation(JPA.COLUMN); + ColumnAnnotation column = (ColumnAnnotation) attributeResource.getAnnotation(JPA.COLUMN); assertEquals("baz", column.getName()); attributeResource = fields.next(); - column = (ColumnAnnotation) attributeResource.getSupportingAnnotation(JPA.COLUMN); + column = (ColumnAnnotation) attributeResource.getAnnotation(JPA.COLUMN); assertEquals("baz", column.getName()); } diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/JavaResourcePersistentTypeTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/JavaResourcePersistentTypeTests.java index 1ff5585102..c9954be080 100644 --- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/JavaResourcePersistentTypeTests.java +++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/JavaResourcePersistentTypeTests.java @@ -10,7 +10,6 @@ package org.eclipse.jpt.core.tests.internal.resource.java; import java.util.Iterator; - import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.jdt.core.ICompilationUnit; import org.eclipse.jpt.core.internal.resource.java.source.SourceEmbeddableAnnotation; @@ -438,33 +437,33 @@ public class JavaResourcePersistentTypeTests extends JavaResourceModelTestCase { public void testJavaTypeAnnotations() throws Exception { ICompilationUnit cu = this.createTestEntityWithTable(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - assertEquals(1, typeResource.supportingAnnotationsSize()); + assertEquals(2, typeResource.annotationsSize()); } public void testJavaTypeAnnotation() throws Exception { ICompilationUnit cu = this.createTestEntityWithTable(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - assertNotNull(typeResource.getSupportingAnnotation(JPA.TABLE)); + assertNotNull(typeResource.getAnnotation(JPA.TABLE)); } public void testJavaTypeAnnotationNull() throws Exception { ICompilationUnit cu = this.createTestEntity(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - assertNull(typeResource.getSupportingAnnotation(JPA.TABLE)); + assertNull(typeResource.getAnnotation(JPA.TABLE)); } //This will result in a compilation error, but we assume the first table found public void testDuplicateAnnotations() throws Exception { ICompilationUnit cu = this.createTestEntityMultipleTables(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - TableAnnotation tableResource = (TableAnnotation) typeResource.getSupportingAnnotation(JPA.TABLE); + TableAnnotation tableResource = (TableAnnotation) typeResource.getAnnotation(JPA.TABLE); assertEquals("FOO", tableResource.getName()); } public void testRemoveTable() throws Exception { ICompilationUnit cu = this.createTestEntityWithTable(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - typeResource.removeSupportingAnnotation(JPA.TABLE); + typeResource.removeAnnotation(JPA.TABLE); assertSourceDoesNotContain("@Table", cu); } @@ -473,14 +472,14 @@ public class JavaResourcePersistentTypeTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestEntityWithTable(); JavaResourcePersistentType jrpt = buildJavaTypeResource(cu); - TableAnnotation tableAnnotation = (TableAnnotation) jrpt.getSupportingAnnotation(JPA.TABLE); + TableAnnotation tableAnnotation = (TableAnnotation) jrpt.getAnnotation(JPA.TABLE); tableAnnotation.setSchema(null); assertSourceContains("@Table(name = \"FOO\")", cu); tableAnnotation.setName(null); assertSourceDoesNotContain("@Table", cu); - assertNull(jrpt.getSupportingAnnotation(JPA.TABLE)); + assertNull(jrpt.getAnnotation(JPA.TABLE)); } public void testMultipleTypeMappings() throws Exception { @@ -488,19 +487,18 @@ public class JavaResourcePersistentTypeTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - assertEquals(2, typeResource.mappingAnnotationsSize()); - assertEquals(0, typeResource.supportingAnnotationsSize()); - assertNotNull(typeResource.getMappingAnnotation(JPA.EMBEDDABLE)); - assertNotNull(typeResource.getMappingAnnotation(JPA.ENTITY)); + assertEquals(2, typeResource.annotationsSize()); + assertNotNull(typeResource.getAnnotation(JPA.EMBEDDABLE)); + assertNotNull(typeResource.getAnnotation(JPA.ENTITY)); - JavaResourceNode javaTypeMappingAnnotation = typeResource.getMappingAnnotation(); + JavaResourceNode javaTypeMappingAnnotation = typeResource.getAnnotation(EmbeddableAnnotation.ANNOTATION_NAME); assertTrue(javaTypeMappingAnnotation instanceof EmbeddableAnnotation); assertSourceContains("@Entity", cu); assertSourceContains("@Embeddable", cu); - typeResource.setMappingAnnotation(JPA.MAPPED_SUPERCLASS); - assertEquals(1, typeResource.mappingAnnotationsSize()); - javaTypeMappingAnnotation = typeResource.getMappingAnnotation(); + typeResource.setPrimaryAnnotation(JPA.MAPPED_SUPERCLASS, new String[0]); + assertEquals(1, typeResource.annotationsSize()); + javaTypeMappingAnnotation = typeResource.getAnnotation(MappedSuperclassAnnotation.ANNOTATION_NAME); assertTrue(javaTypeMappingAnnotation instanceof MappedSuperclassAnnotation); assertSourceDoesNotContain("@Entity", cu); assertSourceContains("@MappedSuperclass", cu); @@ -510,31 +508,19 @@ public class JavaResourcePersistentTypeTests extends JavaResourceModelTestCase { public void testSetJavaTypeMappingAnnotation() throws Exception { ICompilationUnit cu = createTestType(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - assertEquals(0, typeResource.mappingAnnotationsSize()); + assertEquals(0, typeResource.annotationsSize()); - typeResource.setMappingAnnotation(JPA.ENTITY); - assertTrue(typeResource.getMappingAnnotation() instanceof EntityAnnotation); + typeResource.setPrimaryAnnotation(JPA.ENTITY, new String[0]); + assertTrue(typeResource.getAnnotation(EntityAnnotation.ANNOTATION_NAME) instanceof EntityAnnotation); assertSourceContains("@Entity", cu); } - public void testSetJavaTypeMappingAnnotation2() throws Exception { - ICompilationUnit cu = createTestEntityWithTable(); - JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - assertTrue(typeResource.getMappingAnnotation() instanceof EntityAnnotation); - - typeResource.setMappingAnnotation(JPA.EMBEDDABLE); - assertTrue(typeResource.getMappingAnnotation() instanceof EmbeddableAnnotation); - - assertSourceDoesNotContain("@Entity", cu); - assertSourceContains("@Table", cu); - } - public void testAddJavaTypeAnnotation() throws Exception { ICompilationUnit cu = createTestEntity(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); assertSourceDoesNotContain("@Table", cu); - typeResource.addSupportingAnnotation(JPA.TABLE); + typeResource.addAnnotation(JPA.TABLE); assertSourceContains("@Table", cu); } @@ -543,7 +529,7 @@ public class JavaResourcePersistentTypeTests extends JavaResourceModelTestCase { ICompilationUnit cu = createTestEntityWithTable(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); assertSourceContains("@Table", cu); - typeResource.removeSupportingAnnotation(JPA.TABLE); + typeResource.removeAnnotation(JPA.TABLE); assertSourceDoesNotContain("@Table", cu); } @@ -566,9 +552,9 @@ public class JavaResourcePersistentTypeTests extends JavaResourceModelTestCase { } }); - assertNotNull(typeResource.getSupportingAnnotation(JPA.TABLE)); - assertNull(typeResource.getMappingAnnotation(JPA.ENTITY)); - assertNotNull(typeResource.getMappingAnnotation(JPA.EMBEDDABLE)); + assertNotNull(typeResource.getAnnotation(JPA.TABLE)); + assertNull(typeResource.getAnnotation(JPA.ENTITY)); + assertNotNull(typeResource.getAnnotation(JPA.EMBEDDABLE)); assertSourceContains("@Table", cu); } @@ -576,9 +562,9 @@ public class JavaResourcePersistentTypeTests extends JavaResourceModelTestCase { ICompilationUnit cu = createTestEntityWithSecondaryTable(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - assertEquals(1, CollectionTools.size(typeResource.supportingAnnotations(JPA.SECONDARY_TABLE, JPA.SECONDARY_TABLES))); + assertEquals(1, CollectionTools.size(typeResource.annotations(JPA.SECONDARY_TABLE, JPA.SECONDARY_TABLES))); - SecondaryTableAnnotation secondaryTableResource = (SecondaryTableAnnotation) typeResource.supportingAnnotations(JPA.SECONDARY_TABLE, JPA.SECONDARY_TABLES).next(); + SecondaryTableAnnotation secondaryTableResource = (SecondaryTableAnnotation) typeResource.annotations(JPA.SECONDARY_TABLE, JPA.SECONDARY_TABLES).next(); assertEquals("FOO", secondaryTableResource.getName()); } @@ -587,25 +573,25 @@ public class JavaResourcePersistentTypeTests extends JavaResourceModelTestCase { ICompilationUnit cu = createTestEntity(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - assertEquals(0, CollectionTools.size(typeResource.supportingAnnotations(JPA.SECONDARY_TABLE, JPA.SECONDARY_TABLES))); + assertEquals(0, CollectionTools.size(typeResource.annotations(JPA.SECONDARY_TABLE, JPA.SECONDARY_TABLES))); } public void testJavaTypeAnnotationsContainerNoNestable() throws Exception { ICompilationUnit cu = createTestEntityWithEmptySecondaryTables(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - assertEquals(0, CollectionTools.size(typeResource.supportingAnnotations(JPA.SECONDARY_TABLE, JPA.SECONDARY_TABLES))); + assertEquals(0, CollectionTools.size(typeResource.annotations(JPA.SECONDARY_TABLE, JPA.SECONDARY_TABLES))); } public void testJavaTypeAnnotationsNestableAndContainer() throws Exception { ICompilationUnit cu = createTestEntityWithSecondaryTableAndSecondaryTables(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - assertNotNull(typeResource.getSupportingAnnotation(JPA.SECONDARY_TABLE)); - assertNotNull(typeResource.getSupportingAnnotation(JPA.SECONDARY_TABLES)); - assertEquals(2, CollectionTools.size(typeResource.supportingAnnotations(JPA.SECONDARY_TABLE, JPA.SECONDARY_TABLES))); + assertNotNull(typeResource.getAnnotation(JPA.SECONDARY_TABLE)); + assertNotNull(typeResource.getAnnotation(JPA.SECONDARY_TABLES)); + assertEquals(2, CollectionTools.size(typeResource.annotations(JPA.SECONDARY_TABLE, JPA.SECONDARY_TABLES))); - SecondaryTableAnnotation secondaryTableResource = (SecondaryTableAnnotation) typeResource.supportingAnnotations(JPA.SECONDARY_TABLE, JPA.SECONDARY_TABLES).next(); + SecondaryTableAnnotation secondaryTableResource = (SecondaryTableAnnotation) typeResource.annotations(JPA.SECONDARY_TABLE, JPA.SECONDARY_TABLES).next(); assertEquals("BAR", secondaryTableResource.getName()); } @@ -614,7 +600,7 @@ public class JavaResourcePersistentTypeTests extends JavaResourceModelTestCase { public void testAddJavaTypeAnnotationNestableContainer() throws Exception { ICompilationUnit cu = createTestEntity(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - SecondaryTableAnnotation secondaryTableResource = (SecondaryTableAnnotation) typeResource.addSupportingAnnotation(0, JPA.SECONDARY_TABLE, JPA.SECONDARY_TABLES); + SecondaryTableAnnotation secondaryTableResource = (SecondaryTableAnnotation) typeResource.addAnnotation(0, JPA.SECONDARY_TABLE, JPA.SECONDARY_TABLES); secondaryTableResource.setName("FOO"); assertSourceContains("@SecondaryTable(name = \"FOO\")", cu); } @@ -625,13 +611,13 @@ public class JavaResourcePersistentTypeTests extends JavaResourceModelTestCase { ICompilationUnit cu = createTestEntityWithSecondaryTable(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - SecondaryTableAnnotation secondaryTableResource = (SecondaryTableAnnotation) typeResource.addSupportingAnnotation(1, JPA.SECONDARY_TABLE, JPA.SECONDARY_TABLES); + SecondaryTableAnnotation secondaryTableResource = (SecondaryTableAnnotation) typeResource.addAnnotation(1, JPA.SECONDARY_TABLE, JPA.SECONDARY_TABLES); secondaryTableResource.setName("BAR"); assertSourceContains("@SecondaryTables({@SecondaryTable(name = \"FOO\"),@SecondaryTable(name = \"BAR\")})", cu); - assertNull(typeResource.getSupportingAnnotation(JPA.SECONDARY_TABLE)); - assertNotNull(typeResource.getSupportingAnnotation(JPA.SECONDARY_TABLES)); - assertEquals(2, CollectionTools.size(typeResource.supportingAnnotations(JPA.SECONDARY_TABLE, JPA.SECONDARY_TABLES))); + assertNull(typeResource.getAnnotation(JPA.SECONDARY_TABLE)); + assertNotNull(typeResource.getAnnotation(JPA.SECONDARY_TABLES)); + assertEquals(2, CollectionTools.size(typeResource.annotations(JPA.SECONDARY_TABLE, JPA.SECONDARY_TABLES))); } // @Entity @@ -644,45 +630,45 @@ public class JavaResourcePersistentTypeTests extends JavaResourceModelTestCase { ICompilationUnit cu = createTestEntityWithSecondaryTables(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - SecondaryTableAnnotation secondaryTableResource = (SecondaryTableAnnotation) typeResource.addSupportingAnnotation(1, JPA.SECONDARY_TABLE, JPA.SECONDARY_TABLES); + SecondaryTableAnnotation secondaryTableResource = (SecondaryTableAnnotation) typeResource.addAnnotation(1, JPA.SECONDARY_TABLE, JPA.SECONDARY_TABLES); secondaryTableResource.setName("BAR"); assertSourceContains("@SecondaryTables({@SecondaryTable(name = \"FOO\"),@SecondaryTable(name = \"BAR\")})", cu); - assertNull(typeResource.getSupportingAnnotation(JPA.SECONDARY_TABLE)); - assertNotNull(typeResource.getSupportingAnnotation(JPA.SECONDARY_TABLES)); - assertEquals(2, CollectionTools.size(typeResource.supportingAnnotations(JPA.SECONDARY_TABLE, JPA.SECONDARY_TABLES))); + assertNull(typeResource.getAnnotation(JPA.SECONDARY_TABLE)); + assertNotNull(typeResource.getAnnotation(JPA.SECONDARY_TABLES)); + assertEquals(2, CollectionTools.size(typeResource.annotations(JPA.SECONDARY_TABLE, JPA.SECONDARY_TABLES))); } public void testAddJavaTypeAnnotationNestableContainer5() throws Exception { ICompilationUnit cu = createTestEntityWithSecondaryTables(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - SecondaryTableAnnotation secondaryTableResource = (SecondaryTableAnnotation) typeResource.addSupportingAnnotation(0, JPA.SECONDARY_TABLE, JPA.SECONDARY_TABLES); + SecondaryTableAnnotation secondaryTableResource = (SecondaryTableAnnotation) typeResource.addAnnotation(0, JPA.SECONDARY_TABLE, JPA.SECONDARY_TABLES); secondaryTableResource.setName("BAR"); assertSourceContains("@SecondaryTables({@SecondaryTable(name = \"BAR\"),@SecondaryTable(name = \"FOO\")})", cu); - assertNull(typeResource.getSupportingAnnotation(JPA.SECONDARY_TABLE)); - assertNotNull(typeResource.getSupportingAnnotation(JPA.SECONDARY_TABLES)); - assertEquals(2, CollectionTools.size(typeResource.supportingAnnotations(JPA.SECONDARY_TABLE, JPA.SECONDARY_TABLES))); + assertNull(typeResource.getAnnotation(JPA.SECONDARY_TABLE)); + assertNotNull(typeResource.getAnnotation(JPA.SECONDARY_TABLES)); + assertEquals(2, CollectionTools.size(typeResource.annotations(JPA.SECONDARY_TABLE, JPA.SECONDARY_TABLES))); } public void testAddJavaTypeAnnotationNestableContainer6() throws Exception { ICompilationUnit cu = createTestEntityWithSecondaryTables(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - SecondaryTableAnnotation secondaryTableResource = (SecondaryTableAnnotation) typeResource.addSupportingAnnotation(0, JPA.SECONDARY_TABLE, JPA.SECONDARY_TABLES); + SecondaryTableAnnotation secondaryTableResource = (SecondaryTableAnnotation) typeResource.addAnnotation(0, JPA.SECONDARY_TABLE, JPA.SECONDARY_TABLES); secondaryTableResource.setName("BAR"); assertSourceContains("@SecondaryTables({@SecondaryTable(name = \"BAR\"),@SecondaryTable(name = \"FOO\")})", cu); - assertNull(typeResource.getSupportingAnnotation(JPA.SECONDARY_TABLE)); - assertNotNull(typeResource.getSupportingAnnotation(JPA.SECONDARY_TABLES)); - assertEquals(2, CollectionTools.size(typeResource.supportingAnnotations(JPA.SECONDARY_TABLE, JPA.SECONDARY_TABLES))); + assertNull(typeResource.getAnnotation(JPA.SECONDARY_TABLE)); + assertNotNull(typeResource.getAnnotation(JPA.SECONDARY_TABLES)); + assertEquals(2, CollectionTools.size(typeResource.annotations(JPA.SECONDARY_TABLE, JPA.SECONDARY_TABLES))); - secondaryTableResource = (SecondaryTableAnnotation) typeResource.addSupportingAnnotation(0, JPA.SECONDARY_TABLE, JPA.SECONDARY_TABLES); + secondaryTableResource = (SecondaryTableAnnotation) typeResource.addAnnotation(0, JPA.SECONDARY_TABLE, JPA.SECONDARY_TABLES); secondaryTableResource.setName("BAZ"); assertSourceContains("@SecondaryTables({@SecondaryTable(name = \"BAZ\"),@SecondaryTable(name = \"BAR\"), @SecondaryTable(name = \"FOO\")})", cu); - assertEquals(3, CollectionTools.size(typeResource.supportingAnnotations(JPA.SECONDARY_TABLE, JPA.SECONDARY_TABLES))); + assertEquals(3, CollectionTools.size(typeResource.annotations(JPA.SECONDARY_TABLE, JPA.SECONDARY_TABLES))); } // @Entity @@ -697,19 +683,19 @@ public class JavaResourcePersistentTypeTests extends JavaResourceModelTestCase { ICompilationUnit cu = createTestEntityWithSecondaryTableAndSecondaryTables(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - assertNotNull(typeResource.getSupportingAnnotation(JPA.SECONDARY_TABLE)); - assertNotNull(typeResource.getSupportingAnnotation(JPA.SECONDARY_TABLES)); - assertEquals(2, CollectionTools.size(typeResource.supportingAnnotations(JPA.SECONDARY_TABLE, JPA.SECONDARY_TABLES))); + assertNotNull(typeResource.getAnnotation(JPA.SECONDARY_TABLE)); + assertNotNull(typeResource.getAnnotation(JPA.SECONDARY_TABLES)); + assertEquals(2, CollectionTools.size(typeResource.annotations(JPA.SECONDARY_TABLE, JPA.SECONDARY_TABLES))); - SecondaryTableAnnotation secondaryTableResource = (SecondaryTableAnnotation) typeResource.addSupportingAnnotation(2, JPA.SECONDARY_TABLE, JPA.SECONDARY_TABLES); + SecondaryTableAnnotation secondaryTableResource = (SecondaryTableAnnotation) typeResource.addAnnotation(2, JPA.SECONDARY_TABLE, JPA.SECONDARY_TABLES); assertSourceContains("@SecondaryTables({@SecondaryTable(name = \"BAR\"), @SecondaryTable(name = \"BAZ\"), @SecondaryTable})", cu); secondaryTableResource.setName("BOO"); - assertNotNull(typeResource.getSupportingAnnotation(JPA.SECONDARY_TABLE)); - assertNotNull(typeResource.getSupportingAnnotation(JPA.SECONDARY_TABLES)); - assertEquals(3, CollectionTools.size(typeResource.supportingAnnotations(JPA.SECONDARY_TABLE, JPA.SECONDARY_TABLES))); + assertNotNull(typeResource.getAnnotation(JPA.SECONDARY_TABLE)); + assertNotNull(typeResource.getAnnotation(JPA.SECONDARY_TABLES)); + assertEquals(3, CollectionTools.size(typeResource.annotations(JPA.SECONDARY_TABLE, JPA.SECONDARY_TABLES))); - Iterator<NestableAnnotation> secondaryTableAnnotations = typeResource.supportingAnnotations(JPA.SECONDARY_TABLE, JPA.SECONDARY_TABLES); + Iterator<NestableAnnotation> secondaryTableAnnotations = typeResource.annotations(JPA.SECONDARY_TABLE, JPA.SECONDARY_TABLES); secondaryTableResource = (SecondaryTableAnnotation) secondaryTableAnnotations.next(); assertEquals("BAR", secondaryTableResource.getName()); secondaryTableResource = (SecondaryTableAnnotation) secondaryTableAnnotations.next(); @@ -726,7 +712,7 @@ public class JavaResourcePersistentTypeTests extends JavaResourceModelTestCase { ICompilationUnit cu = createTestEntityWithSecondaryTable(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - typeResource.removeSupportingAnnotation(0, JPA.SECONDARY_TABLE, JPA.SECONDARY_TABLES); + typeResource.removeAnnotation(0, JPA.SECONDARY_TABLE, JPA.SECONDARY_TABLES); assertSourceDoesNotContain("@SecondaryTable", cu); } @@ -738,7 +724,7 @@ public class JavaResourcePersistentTypeTests extends JavaResourceModelTestCase { ICompilationUnit cu = createTestEntityWithSecondaryTables(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - typeResource.removeSupportingAnnotation(0, JPA.SECONDARY_TABLE, JPA.SECONDARY_TABLES); + typeResource.removeAnnotation(0, JPA.SECONDARY_TABLE, JPA.SECONDARY_TABLES); assertSourceDoesNotContain("@SecondaryTable", cu); assertSourceDoesNotContain("@SecondaryTables", cu); @@ -748,7 +734,7 @@ public class JavaResourcePersistentTypeTests extends JavaResourceModelTestCase { ICompilationUnit cu = createTestEntityWith2SecondaryTables(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - typeResource.removeSupportingAnnotation(0, JPA.SECONDARY_TABLE, JPA.SECONDARY_TABLES); + typeResource.removeAnnotation(0, JPA.SECONDARY_TABLE, JPA.SECONDARY_TABLES); assertSourceDoesNotContain("@SecondaryTable(name = \"FOO\"", cu); assertSourceContains("@SecondaryTable(name = \"BAR\"", cu); @@ -759,11 +745,11 @@ public class JavaResourcePersistentTypeTests extends JavaResourceModelTestCase { ICompilationUnit cu = createTestEntityWith2SecondaryTables(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - SecondaryTableAnnotation newAnnotation = (SecondaryTableAnnotation)typeResource.addSupportingAnnotation(2, JPA.SECONDARY_TABLE, JPA.SECONDARY_TABLES); + SecondaryTableAnnotation newAnnotation = (SecondaryTableAnnotation)typeResource.addAnnotation(2, JPA.SECONDARY_TABLE, JPA.SECONDARY_TABLES); newAnnotation.setName("BAZ"); assertSourceContains("@SecondaryTables({@SecondaryTable(name = \"FOO\"), @SecondaryTable(name = \"BAR\"), @SecondaryTable(name = \"BAZ", cu); - typeResource.removeSupportingAnnotation(1, JPA.SECONDARY_TABLE, JPA.SECONDARY_TABLES); + typeResource.removeAnnotation(1, JPA.SECONDARY_TABLE, JPA.SECONDARY_TABLES); assertSourceContains("@SecondaryTables({@SecondaryTable(name = \"FOO\"), @SecondaryTable(name = \"BAZ\")})", cu); } @@ -771,11 +757,11 @@ public class JavaResourcePersistentTypeTests extends JavaResourceModelTestCase { ICompilationUnit cu = createTestEntityWith2SecondaryTables(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - SecondaryTableAnnotation newAnnotation = (SecondaryTableAnnotation)typeResource.addSupportingAnnotation(2, JPA.SECONDARY_TABLE, JPA.SECONDARY_TABLES); + SecondaryTableAnnotation newAnnotation = (SecondaryTableAnnotation)typeResource.addAnnotation(2, JPA.SECONDARY_TABLE, JPA.SECONDARY_TABLES); newAnnotation.setName("BAZ"); assertSourceContains("@SecondaryTables({@SecondaryTable(name = \"FOO\"), @SecondaryTable(name = \"BAR\"), @SecondaryTable(name = \"BAZ\")})", cu); - typeResource.moveSupportingAnnotation(0, 2, JPA.SECONDARY_TABLES); + typeResource.moveAnnotation(0, 2, JPA.SECONDARY_TABLES); assertSourceContains("@SecondaryTables({@SecondaryTable(name = \"BAZ\"), @SecondaryTable(name = \"FOO\"), @SecondaryTable(name = \"BAR\")})", cu); } @@ -783,11 +769,11 @@ public class JavaResourcePersistentTypeTests extends JavaResourceModelTestCase { ICompilationUnit cu = createTestEntityWith2SecondaryTables(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - SecondaryTableAnnotation newAnnotation = (SecondaryTableAnnotation)typeResource.addSupportingAnnotation(2, JPA.SECONDARY_TABLE, JPA.SECONDARY_TABLES); + SecondaryTableAnnotation newAnnotation = (SecondaryTableAnnotation)typeResource.addAnnotation(2, JPA.SECONDARY_TABLE, JPA.SECONDARY_TABLES); newAnnotation.setName("BAZ"); assertSourceContains("@SecondaryTables({@SecondaryTable(name = \"FOO\"), @SecondaryTable(name = \"BAR\"), @SecondaryTable(name = \"BAZ\")})", cu); - typeResource.moveSupportingAnnotation(2, 0, JPA.SECONDARY_TABLES); + typeResource.moveAnnotation(2, 0, JPA.SECONDARY_TABLES); assertSourceContains("@SecondaryTables({@SecondaryTable(name = \"BAR\"), @SecondaryTable(name = \"BAZ\"), @SecondaryTable(name = \"FOO\")})", cu); } @@ -803,12 +789,12 @@ public class JavaResourcePersistentTypeTests extends JavaResourceModelTestCase { ICompilationUnit cu = createTestEntityDuplicates(); JavaResourcePersistentType persistentType = buildJavaTypeResource(cu); - EntityAnnotation javaTypeMappingAnnotation = (EntityAnnotation) persistentType.getMappingAnnotation(JPA.ENTITY); + EntityAnnotation javaTypeMappingAnnotation = (EntityAnnotation) persistentType.getAnnotation(JPA.ENTITY); assertEquals("FirstEntity", javaTypeMappingAnnotation.getName()); - assertEquals(1, persistentType.mappingAnnotationsSize()); + assertEquals(1, persistentType.annotationsSize()); - javaTypeMappingAnnotation = (EntityAnnotation) persistentType.getMappingAnnotation(); + javaTypeMappingAnnotation = (EntityAnnotation) persistentType.getAnnotation(EntityAnnotation.ANNOTATION_NAME); assertEquals("FirstEntity", javaTypeMappingAnnotation.getName()); } @@ -899,23 +885,23 @@ public class JavaResourcePersistentTypeTests extends JavaResourceModelTestCase { public void testAnnotatedMemberType() throws Exception { ICompilationUnit cu = this.createTestEntityWithMemberEmbeddable(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - assertNotNull(typeResource.getMappingAnnotation(JPA.ENTITY)); - assertNull(typeResource.getMappingAnnotation(JPA.EMBEDDABLE)); + assertNotNull(typeResource.getAnnotation(JPA.ENTITY)); + assertNull(typeResource.getAnnotation(JPA.EMBEDDABLE)); JavaResourcePersistentType nestedType = typeResource.persistableTypes().next(); - assertNull(nestedType.getMappingAnnotation(JPA.ENTITY)); - assertNotNull(nestedType.getMappingAnnotation(JPA.EMBEDDABLE)); + assertNull(nestedType.getAnnotation(JPA.ENTITY)); + assertNotNull(nestedType.getAnnotation(JPA.EMBEDDABLE)); } public void testInvalidAnnotations() throws Exception { ICompilationUnit cu = this.createTestInvalidAnnotations(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - assertEquals(0, typeResource.mappingAnnotationsSize()); - assertEquals(0, typeResource.supportingAnnotationsSize()); + assertEquals(0, typeResource.annotationsSize()); + assertEquals(0, typeResource.annotationsSize()); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - assertEquals(0, attributeResource.mappingAnnotationsSize()); - assertEquals(0, attributeResource.supportingAnnotationsSize()); + assertEquals(0, attributeResource.annotationsSize()); + assertEquals(0, attributeResource.annotationsSize()); } } diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/JoinColumnTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/JoinColumnTests.java index 7b5953c283..c17aff5f2d 100644 --- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/JoinColumnTests.java +++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/JoinColumnTests.java @@ -111,7 +111,7 @@ public class JoinColumnTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestJoinColumnWithName(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - JoinColumnAnnotation column = (JoinColumnAnnotation) attributeResource.getSupportingAnnotation(JPA.JOIN_COLUMN); + JoinColumnAnnotation column = (JoinColumnAnnotation) attributeResource.getAnnotation(JPA.JOIN_COLUMN); assertNotNull(column); assertEquals(COLUMN_NAME, column.getName()); } @@ -120,7 +120,7 @@ public class JoinColumnTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestJoinColumn(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - JoinColumnAnnotation column = (JoinColumnAnnotation) attributeResource.getSupportingAnnotation(JPA.JOIN_COLUMN); + JoinColumnAnnotation column = (JoinColumnAnnotation) attributeResource.getAnnotation(JPA.JOIN_COLUMN); assertNotNull(column); assertNull(column.getName()); assertNull(column.getNullable()); @@ -136,7 +136,7 @@ public class JoinColumnTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestJoinColumn(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - JoinColumnAnnotation column = (JoinColumnAnnotation) attributeResource.getSupportingAnnotation(JPA.JOIN_COLUMN); + JoinColumnAnnotation column = (JoinColumnAnnotation) attributeResource.getAnnotation(JPA.JOIN_COLUMN); assertNotNull(column); assertNull(column.getName()); @@ -151,7 +151,7 @@ public class JoinColumnTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestJoinColumnWithName(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - JoinColumnAnnotation column = (JoinColumnAnnotation) attributeResource.getSupportingAnnotation(JPA.JOIN_COLUMN); + JoinColumnAnnotation column = (JoinColumnAnnotation) attributeResource.getAnnotation(JPA.JOIN_COLUMN); assertEquals(COLUMN_NAME, column.getName()); @@ -165,7 +165,7 @@ public class JoinColumnTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestJoinColumnWithTable(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - JoinColumnAnnotation column = (JoinColumnAnnotation) attributeResource.getSupportingAnnotation(JPA.JOIN_COLUMN); + JoinColumnAnnotation column = (JoinColumnAnnotation) attributeResource.getAnnotation(JPA.JOIN_COLUMN); assertEquals(COLUMN_TABLE, column.getTable()); } @@ -173,7 +173,7 @@ public class JoinColumnTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestJoinColumn(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - JoinColumnAnnotation column = (JoinColumnAnnotation) attributeResource.getSupportingAnnotation(JPA.JOIN_COLUMN); + JoinColumnAnnotation column = (JoinColumnAnnotation) attributeResource.getAnnotation(JPA.JOIN_COLUMN); assertNotNull(column); assertNull(column.getTable()); @@ -192,7 +192,7 @@ public class JoinColumnTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestJoinColumnWithReferencedColumnName(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - JoinColumnAnnotation column = (JoinColumnAnnotation) attributeResource.getSupportingAnnotation(JPA.JOIN_COLUMN); + JoinColumnAnnotation column = (JoinColumnAnnotation) attributeResource.getAnnotation(JPA.JOIN_COLUMN); assertEquals(COLUMN_REFERENCED_COLUMN_NAME, column.getReferencedColumnName()); } @@ -200,7 +200,7 @@ public class JoinColumnTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestJoinColumn(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - JoinColumnAnnotation column = (JoinColumnAnnotation) attributeResource.getSupportingAnnotation(JPA.JOIN_COLUMN); + JoinColumnAnnotation column = (JoinColumnAnnotation) attributeResource.getAnnotation(JPA.JOIN_COLUMN); assertNotNull(column); assertNull(column.getReferencedColumnName()); @@ -219,7 +219,7 @@ public class JoinColumnTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestJoinColumnWithColumnDefinition(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - JoinColumnAnnotation column = (JoinColumnAnnotation) attributeResource.getSupportingAnnotation(JPA.JOIN_COLUMN); + JoinColumnAnnotation column = (JoinColumnAnnotation) attributeResource.getAnnotation(JPA.JOIN_COLUMN); assertEquals(COLUMN_COLUMN_DEFINITION, column.getColumnDefinition()); } @@ -227,7 +227,7 @@ public class JoinColumnTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestJoinColumn(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - JoinColumnAnnotation column = (JoinColumnAnnotation) attributeResource.getSupportingAnnotation(JPA.JOIN_COLUMN); + JoinColumnAnnotation column = (JoinColumnAnnotation) attributeResource.getAnnotation(JPA.JOIN_COLUMN); assertNotNull(column); assertNull(column.getColumnDefinition()); @@ -246,7 +246,7 @@ public class JoinColumnTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestJoinColumnWithBooleanElement("unique"); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - JoinColumnAnnotation column = (JoinColumnAnnotation) attributeResource.getSupportingAnnotation(JPA.JOIN_COLUMN); + JoinColumnAnnotation column = (JoinColumnAnnotation) attributeResource.getAnnotation(JPA.JOIN_COLUMN); assertEquals(Boolean.TRUE, column.getUnique()); } @@ -255,7 +255,7 @@ public class JoinColumnTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestJoinColumn(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - JoinColumnAnnotation column = (JoinColumnAnnotation) attributeResource.getSupportingAnnotation(JPA.JOIN_COLUMN); + JoinColumnAnnotation column = (JoinColumnAnnotation) attributeResource.getAnnotation(JPA.JOIN_COLUMN); assertNotNull(column); assertNull(column.getUnique()); @@ -273,7 +273,7 @@ public class JoinColumnTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestJoinColumnWithBooleanElement("nullable"); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - JoinColumnAnnotation column = (JoinColumnAnnotation) attributeResource.getSupportingAnnotation(JPA.JOIN_COLUMN); + JoinColumnAnnotation column = (JoinColumnAnnotation) attributeResource.getAnnotation(JPA.JOIN_COLUMN); assertEquals(Boolean.TRUE, column.getNullable()); } @@ -282,7 +282,7 @@ public class JoinColumnTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestJoinColumn(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - JoinColumnAnnotation column = (JoinColumnAnnotation) attributeResource.getSupportingAnnotation(JPA.JOIN_COLUMN); + JoinColumnAnnotation column = (JoinColumnAnnotation) attributeResource.getAnnotation(JPA.JOIN_COLUMN); assertNotNull(column); assertNull(column.getNullable()); @@ -300,7 +300,7 @@ public class JoinColumnTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestJoinColumnWithBooleanElement("insertable"); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - JoinColumnAnnotation column = (JoinColumnAnnotation) attributeResource.getSupportingAnnotation(JPA.JOIN_COLUMN); + JoinColumnAnnotation column = (JoinColumnAnnotation) attributeResource.getAnnotation(JPA.JOIN_COLUMN); assertEquals(Boolean.TRUE, column.getInsertable()); } @@ -309,7 +309,7 @@ public class JoinColumnTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestJoinColumn(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - JoinColumnAnnotation column = (JoinColumnAnnotation) attributeResource.getSupportingAnnotation(JPA.JOIN_COLUMN); + JoinColumnAnnotation column = (JoinColumnAnnotation) attributeResource.getAnnotation(JPA.JOIN_COLUMN); assertNotNull(column); assertNull(column.getInsertable()); @@ -327,7 +327,7 @@ public class JoinColumnTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestJoinColumnWithBooleanElement("updatable"); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - JoinColumnAnnotation column = (JoinColumnAnnotation) attributeResource.getSupportingAnnotation(JPA.JOIN_COLUMN); + JoinColumnAnnotation column = (JoinColumnAnnotation) attributeResource.getAnnotation(JPA.JOIN_COLUMN); assertEquals(Boolean.TRUE, column.getUpdatable()); } @@ -336,7 +336,7 @@ public class JoinColumnTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestJoinColumn(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - JoinColumnAnnotation column = (JoinColumnAnnotation) attributeResource.getSupportingAnnotation(JPA.JOIN_COLUMN); + JoinColumnAnnotation column = (JoinColumnAnnotation) attributeResource.getAnnotation(JPA.JOIN_COLUMN); assertNotNull(column); assertNull(column.getUpdatable()); diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/JoinColumnsTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/JoinColumnsTests.java index 8be5c3e571..6a489025f3 100644 --- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/JoinColumnsTests.java +++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/JoinColumnsTests.java @@ -127,7 +127,7 @@ public class JoinColumnsTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestJoinColumnWithName(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - JoinColumnAnnotation column = (JoinColumnAnnotation) attributeResource.supportingAnnotations(JPA.JOIN_COLUMN, JPA.JOIN_COLUMNS).next(); + JoinColumnAnnotation column = (JoinColumnAnnotation) attributeResource.annotations(JPA.JOIN_COLUMN, JPA.JOIN_COLUMNS).next(); assertNotNull(column); assertEquals(COLUMN_NAME, column.getName()); } @@ -136,7 +136,7 @@ public class JoinColumnsTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestJoinColumns(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - JoinColumnAnnotation column = (JoinColumnAnnotation) attributeResource.supportingAnnotations(JPA.JOIN_COLUMN, JPA.JOIN_COLUMNS).next(); + JoinColumnAnnotation column = (JoinColumnAnnotation) attributeResource.annotations(JPA.JOIN_COLUMN, JPA.JOIN_COLUMNS).next(); assertNotNull(column); assertNull(column.getName()); assertNull(column.getNullable()); @@ -151,7 +151,7 @@ public class JoinColumnsTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestJoinColumns(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - JoinColumnAnnotation column = (JoinColumnAnnotation) attributeResource.supportingAnnotations(JPA.JOIN_COLUMN, JPA.JOIN_COLUMNS).next(); + JoinColumnAnnotation column = (JoinColumnAnnotation) attributeResource.annotations(JPA.JOIN_COLUMN, JPA.JOIN_COLUMNS).next(); assertNotNull(column); assertNull(column.getName()); @@ -166,7 +166,7 @@ public class JoinColumnsTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestJoinColumnWithName(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - JoinColumnAnnotation column = (JoinColumnAnnotation) attributeResource.supportingAnnotations(JPA.JOIN_COLUMN, JPA.JOIN_COLUMNS).next(); + JoinColumnAnnotation column = (JoinColumnAnnotation) attributeResource.annotations(JPA.JOIN_COLUMN, JPA.JOIN_COLUMNS).next(); assertEquals(COLUMN_NAME, column.getName()); @@ -180,7 +180,7 @@ public class JoinColumnsTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestJoinColumnWithTable(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - JoinColumnAnnotation column = (JoinColumnAnnotation) attributeResource.supportingAnnotations(JPA.JOIN_COLUMN, JPA.JOIN_COLUMNS).next(); + JoinColumnAnnotation column = (JoinColumnAnnotation) attributeResource.annotations(JPA.JOIN_COLUMN, JPA.JOIN_COLUMNS).next(); assertEquals(COLUMN_TABLE, column.getTable()); } @@ -188,7 +188,7 @@ public class JoinColumnsTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestJoinColumns(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - JoinColumnAnnotation column = (JoinColumnAnnotation) attributeResource.supportingAnnotations(JPA.JOIN_COLUMN, JPA.JOIN_COLUMNS).next(); + JoinColumnAnnotation column = (JoinColumnAnnotation) attributeResource.annotations(JPA.JOIN_COLUMN, JPA.JOIN_COLUMNS).next(); assertNotNull(column); assertNull(column.getTable()); @@ -207,7 +207,7 @@ public class JoinColumnsTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestJoinColumnWithReferencedColumnName(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - JoinColumnAnnotation column = (JoinColumnAnnotation) attributeResource.supportingAnnotations(JPA.JOIN_COLUMN, JPA.JOIN_COLUMNS).next(); + JoinColumnAnnotation column = (JoinColumnAnnotation) attributeResource.annotations(JPA.JOIN_COLUMN, JPA.JOIN_COLUMNS).next(); assertEquals(COLUMN_REFERENCED_COLUMN_NAME, column.getReferencedColumnName()); } @@ -215,7 +215,7 @@ public class JoinColumnsTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestJoinColumns(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - JoinColumnAnnotation column = (JoinColumnAnnotation) attributeResource.supportingAnnotations(JPA.JOIN_COLUMN, JPA.JOIN_COLUMNS).next(); + JoinColumnAnnotation column = (JoinColumnAnnotation) attributeResource.annotations(JPA.JOIN_COLUMN, JPA.JOIN_COLUMNS).next(); assertNotNull(column); assertNull(column.getReferencedColumnName()); @@ -234,7 +234,7 @@ public class JoinColumnsTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestJoinColumnWithColumnDefinition(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - JoinColumnAnnotation column = (JoinColumnAnnotation) attributeResource.supportingAnnotations(JPA.JOIN_COLUMN, JPA.JOIN_COLUMNS).next(); + JoinColumnAnnotation column = (JoinColumnAnnotation) attributeResource.annotations(JPA.JOIN_COLUMN, JPA.JOIN_COLUMNS).next(); assertEquals(COLUMN_COLUMN_DEFINITION, column.getColumnDefinition()); } @@ -242,7 +242,7 @@ public class JoinColumnsTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestJoinColumns(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - JoinColumnAnnotation column = (JoinColumnAnnotation) attributeResource.supportingAnnotations(JPA.JOIN_COLUMN, JPA.JOIN_COLUMNS).next(); + JoinColumnAnnotation column = (JoinColumnAnnotation) attributeResource.annotations(JPA.JOIN_COLUMN, JPA.JOIN_COLUMNS).next(); assertNotNull(column); assertNull(column.getColumnDefinition()); @@ -261,7 +261,7 @@ public class JoinColumnsTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestJoinColumnWithBooleanElement("unique"); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - JoinColumnAnnotation column = (JoinColumnAnnotation) attributeResource.supportingAnnotations(JPA.JOIN_COLUMN, JPA.JOIN_COLUMNS).next(); + JoinColumnAnnotation column = (JoinColumnAnnotation) attributeResource.annotations(JPA.JOIN_COLUMN, JPA.JOIN_COLUMNS).next(); assertTrue(column.getUnique().booleanValue()); } @@ -270,7 +270,7 @@ public class JoinColumnsTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestJoinColumns(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - JoinColumnAnnotation column = (JoinColumnAnnotation) attributeResource.supportingAnnotations(JPA.JOIN_COLUMN, JPA.JOIN_COLUMNS).next(); + JoinColumnAnnotation column = (JoinColumnAnnotation) attributeResource.annotations(JPA.JOIN_COLUMN, JPA.JOIN_COLUMNS).next(); assertNotNull(column); assertNull(column.getUnique()); @@ -288,7 +288,7 @@ public class JoinColumnsTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestJoinColumnWithBooleanElement("nullable"); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - JoinColumnAnnotation column = (JoinColumnAnnotation) attributeResource.supportingAnnotations(JPA.JOIN_COLUMN, JPA.JOIN_COLUMNS).next(); + JoinColumnAnnotation column = (JoinColumnAnnotation) attributeResource.annotations(JPA.JOIN_COLUMN, JPA.JOIN_COLUMNS).next(); assertTrue(column.getNullable().booleanValue()); } @@ -297,7 +297,7 @@ public class JoinColumnsTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestJoinColumns(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - JoinColumnAnnotation column = (JoinColumnAnnotation) attributeResource.supportingAnnotations(JPA.JOIN_COLUMN, JPA.JOIN_COLUMNS).next(); + JoinColumnAnnotation column = (JoinColumnAnnotation) attributeResource.annotations(JPA.JOIN_COLUMN, JPA.JOIN_COLUMNS).next(); assertNotNull(column); assertNull(column.getNullable()); @@ -315,7 +315,7 @@ public class JoinColumnsTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestJoinColumnWithBooleanElement("insertable"); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - JoinColumnAnnotation column = (JoinColumnAnnotation) attributeResource.supportingAnnotations(JPA.JOIN_COLUMN, JPA.JOIN_COLUMNS).next(); + JoinColumnAnnotation column = (JoinColumnAnnotation) attributeResource.annotations(JPA.JOIN_COLUMN, JPA.JOIN_COLUMNS).next(); assertTrue(column.getInsertable().booleanValue()); } @@ -324,7 +324,7 @@ public class JoinColumnsTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestJoinColumns(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - JoinColumnAnnotation column = (JoinColumnAnnotation) attributeResource.supportingAnnotations(JPA.JOIN_COLUMN, JPA.JOIN_COLUMNS).next(); + JoinColumnAnnotation column = (JoinColumnAnnotation) attributeResource.annotations(JPA.JOIN_COLUMN, JPA.JOIN_COLUMNS).next(); assertNotNull(column); assertNull(column.getInsertable()); @@ -342,7 +342,7 @@ public class JoinColumnsTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestJoinColumnWithBooleanElement("updatable"); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - JoinColumnAnnotation column = (JoinColumnAnnotation) attributeResource.supportingAnnotations(JPA.JOIN_COLUMN, JPA.JOIN_COLUMNS).next(); + JoinColumnAnnotation column = (JoinColumnAnnotation) attributeResource.annotations(JPA.JOIN_COLUMN, JPA.JOIN_COLUMNS).next(); assertTrue(column.getUpdatable().booleanValue()); } @@ -351,7 +351,7 @@ public class JoinColumnsTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestJoinColumns(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - JoinColumnAnnotation column = (JoinColumnAnnotation) attributeResource.supportingAnnotations(JPA.JOIN_COLUMN, JPA.JOIN_COLUMNS).next(); + JoinColumnAnnotation column = (JoinColumnAnnotation) attributeResource.annotations(JPA.JOIN_COLUMN, JPA.JOIN_COLUMNS).next(); assertNotNull(column); assertNull(column.getUpdatable()); @@ -372,13 +372,13 @@ public class JoinColumnsTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - JoinColumnAnnotation joinColumn = (JoinColumnAnnotation) attributeResource.addSupportingAnnotation(1, JPA.JOIN_COLUMN, JPA.JOIN_COLUMNS); + JoinColumnAnnotation joinColumn = (JoinColumnAnnotation) attributeResource.addAnnotation(1, JPA.JOIN_COLUMN, JPA.JOIN_COLUMNS); joinColumn.setName("FOO"); assertSourceContains("@JoinColumns({@JoinColumn(name = \"BAR\", columnDefinition = \"COLUMN_DEF\", table = \"TABLE\", unique = false, nullable = false, insertable = false, updatable = false, referencedColumnName = \"REF_NAME\"),@JoinColumn(name = \"FOO\")})", cu); - assertNull(attributeResource.getSupportingAnnotation(JPA.JOIN_COLUMN)); - assertNotNull(attributeResource.getSupportingAnnotation(JPA.JOIN_COLUMNS)); - assertEquals(2, CollectionTools.size(attributeResource.supportingAnnotations(JPA.JOIN_COLUMN, JPA.JOIN_COLUMNS))); + assertNull(attributeResource.getAnnotation(JPA.JOIN_COLUMN)); + assertNotNull(attributeResource.getAnnotation(JPA.JOIN_COLUMNS)); + assertEquals(2, CollectionTools.size(attributeResource.annotations(JPA.JOIN_COLUMN, JPA.JOIN_COLUMNS))); } public void testAddJoinColumnToBeginningOfList() throws Exception { @@ -386,22 +386,22 @@ public class JoinColumnsTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - JoinColumnAnnotation joinColumn = (JoinColumnAnnotation) attributeResource.addSupportingAnnotation(1, JPA.JOIN_COLUMN, JPA.JOIN_COLUMNS); + JoinColumnAnnotation joinColumn = (JoinColumnAnnotation) attributeResource.addAnnotation(1, JPA.JOIN_COLUMN, JPA.JOIN_COLUMNS); joinColumn.setName("FOO"); assertSourceContains("@JoinColumns({@JoinColumn(name = \"BAR\", columnDefinition = \"COLUMN_DEF\", table = \"TABLE\", unique = false, nullable = false, insertable = false, updatable = false, referencedColumnName = \"REF_NAME\"),@JoinColumn(name = \"FOO\")})", cu); - joinColumn = (JoinColumnAnnotation) attributeResource.addSupportingAnnotation(0, JPA.JOIN_COLUMN, JPA.JOIN_COLUMNS); + joinColumn = (JoinColumnAnnotation) attributeResource.addAnnotation(0, JPA.JOIN_COLUMN, JPA.JOIN_COLUMNS); joinColumn.setName("BAZ"); assertSourceContains("@JoinColumns({@JoinColumn(name = \"BAZ\"),@JoinColumn(name = \"BAR\", columnDefinition = \"COLUMN_DEF\", table = \"TABLE\", unique = false, nullable = false, insertable = false, updatable = false, referencedColumnName = \"REF_NAME\"), @JoinColumn(name = \"FOO\")})", cu); - Iterator<NestableAnnotation> joinColumns = attributeResource.supportingAnnotations(JPA.JOIN_COLUMN, JPA.JOIN_COLUMNS); + Iterator<NestableAnnotation> joinColumns = attributeResource.annotations(JPA.JOIN_COLUMN, JPA.JOIN_COLUMNS); assertEquals("BAZ", ((JoinColumnAnnotation) joinColumns.next()).getName()); assertEquals("BAR", ((JoinColumnAnnotation) joinColumns.next()).getName()); assertEquals("FOO", ((JoinColumnAnnotation) joinColumns.next()).getName()); - assertNull(attributeResource.getSupportingAnnotation(JPA.JOIN_COLUMN)); - assertNotNull(attributeResource.getSupportingAnnotation(JPA.JOIN_COLUMNS)); - assertEquals(3, CollectionTools.size(attributeResource.supportingAnnotations(JPA.JOIN_COLUMN, JPA.JOIN_COLUMNS))); + assertNull(attributeResource.getAnnotation(JPA.JOIN_COLUMN)); + assertNotNull(attributeResource.getAnnotation(JPA.JOIN_COLUMNS)); + assertEquals(3, CollectionTools.size(attributeResource.annotations(JPA.JOIN_COLUMN, JPA.JOIN_COLUMNS))); } @@ -410,11 +410,11 @@ public class JoinColumnsTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - JoinColumnAnnotation joinColumn = (JoinColumnAnnotation) attributeResource.addSupportingAnnotation(1, JPA.JOIN_COLUMN, JPA.JOIN_COLUMNS); + JoinColumnAnnotation joinColumn = (JoinColumnAnnotation) attributeResource.addAnnotation(1, JPA.JOIN_COLUMN, JPA.JOIN_COLUMNS); joinColumn.setName("FOO"); assertSourceContains("@JoinColumns({@JoinColumn(name = \"BAR\", columnDefinition = \"COLUMN_DEF\", table = \"TABLE\", unique = false, nullable = false, insertable = false, updatable = false, referencedColumnName = \"REF_NAME\"),@JoinColumn(name = \"FOO\")})", cu); - attributeResource.removeSupportingAnnotation(1, JPA.JOIN_COLUMN, JPA.JOIN_COLUMNS); + attributeResource.removeAnnotation(1, JPA.JOIN_COLUMN, JPA.JOIN_COLUMNS); assertSourceContains("@JoinColumn(name = \"BAR\", columnDefinition = \"COLUMN_DEF\", table = \"TABLE\", unique = false, nullable = false, insertable = false, updatable = false, referencedColumnName = \"REF_NAME\")", cu); } diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/JoinTableTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/JoinTableTests.java index ef488c5f90..45acbd521e 100644 --- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/JoinTableTests.java +++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/JoinTableTests.java @@ -126,7 +126,7 @@ public class JoinTableTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - JoinTableAnnotation table = (JoinTableAnnotation) attributeResource.getSupportingAnnotation(JPA.JOIN_TABLE); + JoinTableAnnotation table = (JoinTableAnnotation) attributeResource.getAnnotation(JPA.JOIN_TABLE); assertNotNull(table); assertEquals(TABLE_NAME, table.getName()); } @@ -136,7 +136,7 @@ public class JoinTableTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - JoinTableAnnotation table = (JoinTableAnnotation) attributeResource.getSupportingAnnotation(JPA.JOIN_TABLE); + JoinTableAnnotation table = (JoinTableAnnotation) attributeResource.getAnnotation(JPA.JOIN_TABLE); assertNotNull(table); assertNull(table.getName()); assertNull(table.getCatalog()); @@ -148,7 +148,7 @@ public class JoinTableTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - JoinTableAnnotation table = (JoinTableAnnotation) attributeResource.getSupportingAnnotation(JPA.JOIN_TABLE); + JoinTableAnnotation table = (JoinTableAnnotation) attributeResource.getAnnotation(JPA.JOIN_TABLE); assertNotNull(table); assertNull(table.getName()); @@ -163,7 +163,7 @@ public class JoinTableTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - JoinTableAnnotation table = (JoinTableAnnotation) attributeResource.getSupportingAnnotation(JPA.JOIN_TABLE); + JoinTableAnnotation table = (JoinTableAnnotation) attributeResource.getAnnotation(JPA.JOIN_TABLE); assertEquals(TABLE_NAME, table.getName()); table.setName(null); @@ -177,7 +177,7 @@ public class JoinTableTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - JoinTableAnnotation table = (JoinTableAnnotation) attributeResource.getSupportingAnnotation(JPA.JOIN_TABLE); + JoinTableAnnotation table = (JoinTableAnnotation) attributeResource.getAnnotation(JPA.JOIN_TABLE); assertNotNull(table); assertEquals(CATALOG_NAME, table.getCatalog()); } @@ -187,7 +187,7 @@ public class JoinTableTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - JoinTableAnnotation table = (JoinTableAnnotation) attributeResource.getSupportingAnnotation(JPA.JOIN_TABLE); + JoinTableAnnotation table = (JoinTableAnnotation) attributeResource.getAnnotation(JPA.JOIN_TABLE); assertNotNull(table); assertNull(table.getCatalog()); @@ -202,7 +202,7 @@ public class JoinTableTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - JoinTableAnnotation table = (JoinTableAnnotation) attributeResource.getSupportingAnnotation(JPA.JOIN_TABLE); + JoinTableAnnotation table = (JoinTableAnnotation) attributeResource.getAnnotation(JPA.JOIN_TABLE); assertEquals(CATALOG_NAME, table.getCatalog()); table.setCatalog(null); @@ -216,7 +216,7 @@ public class JoinTableTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - JoinTableAnnotation table = (JoinTableAnnotation) attributeResource.getSupportingAnnotation(JPA.JOIN_TABLE); + JoinTableAnnotation table = (JoinTableAnnotation) attributeResource.getAnnotation(JPA.JOIN_TABLE); assertNotNull(table); assertEquals(SCHEMA_NAME, table.getSchema()); } @@ -226,7 +226,7 @@ public class JoinTableTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - JoinTableAnnotation table = (JoinTableAnnotation) attributeResource.getSupportingAnnotation(JPA.JOIN_TABLE); + JoinTableAnnotation table = (JoinTableAnnotation) attributeResource.getAnnotation(JPA.JOIN_TABLE); assertNotNull(table); assertNull(table.getSchema()); @@ -241,7 +241,7 @@ public class JoinTableTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - JoinTableAnnotation table = (JoinTableAnnotation) attributeResource.getSupportingAnnotation(JPA.JOIN_TABLE); + JoinTableAnnotation table = (JoinTableAnnotation) attributeResource.getAnnotation(JPA.JOIN_TABLE); assertEquals(SCHEMA_NAME, table.getSchema()); table.setSchema(null); @@ -255,7 +255,7 @@ public class JoinTableTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - JoinTableAnnotation table = (JoinTableAnnotation) attributeResource.getSupportingAnnotation(JPA.JOIN_TABLE); + JoinTableAnnotation table = (JoinTableAnnotation) attributeResource.getAnnotation(JPA.JOIN_TABLE); assertEquals(0, table.uniqueConstraintsSize()); } @@ -265,7 +265,7 @@ public class JoinTableTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - JoinTableAnnotation table = (JoinTableAnnotation) attributeResource.getSupportingAnnotation(JPA.JOIN_TABLE); + JoinTableAnnotation table = (JoinTableAnnotation) attributeResource.getAnnotation(JPA.JOIN_TABLE); table.addUniqueConstraint(0); @@ -279,7 +279,7 @@ public class JoinTableTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - JoinTableAnnotation table = (JoinTableAnnotation) attributeResource.getSupportingAnnotation(JPA.JOIN_TABLE); + JoinTableAnnotation table = (JoinTableAnnotation) attributeResource.getAnnotation(JPA.JOIN_TABLE); assertEquals(3, table.uniqueConstraintsSize()); } @@ -289,7 +289,7 @@ public class JoinTableTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - JoinTableAnnotation table = (JoinTableAnnotation) attributeResource.getSupportingAnnotation(JPA.JOIN_TABLE); + JoinTableAnnotation table = (JoinTableAnnotation) attributeResource.getAnnotation(JPA.JOIN_TABLE); table.addUniqueConstraint(0).addColumnName("FOO"); table.addUniqueConstraint(1); @@ -307,7 +307,7 @@ public class JoinTableTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - JoinTableAnnotation table = (JoinTableAnnotation) attributeResource.getSupportingAnnotation(JPA.JOIN_TABLE); + JoinTableAnnotation table = (JoinTableAnnotation) attributeResource.getAnnotation(JPA.JOIN_TABLE); assertEquals("BAR", table.uniqueConstraintAt(0).columnNames().next()); assertEquals("FOO", table.uniqueConstraintAt(1).columnNames().next()); assertEquals("BAZ", table.uniqueConstraintAt(2).columnNames().next()); @@ -334,7 +334,7 @@ public class JoinTableTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - JoinTableAnnotation table = (JoinTableAnnotation) attributeResource.getSupportingAnnotation(JPA.JOIN_TABLE); + JoinTableAnnotation table = (JoinTableAnnotation) attributeResource.getAnnotation(JPA.JOIN_TABLE); assertSourceContains("@JoinTable(uniqueConstraints = {@UniqueConstraint(columnNames = {\"BAR\"}), @UniqueConstraint(columnNames = {\"FOO\"}), @UniqueConstraint(columnNames = {\"BAZ\"})})", cu); table.moveUniqueConstraint(2, 0); @@ -346,7 +346,7 @@ public class JoinTableTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - JoinTableAnnotation table = (JoinTableAnnotation) attributeResource.getSupportingAnnotation(JPA.JOIN_TABLE); + JoinTableAnnotation table = (JoinTableAnnotation) attributeResource.getAnnotation(JPA.JOIN_TABLE); assertSourceContains("@JoinTable(uniqueConstraints = {@UniqueConstraint(columnNames = {\"BAR\"}), @UniqueConstraint(columnNames = {\"FOO\"}), @UniqueConstraint(columnNames = {\"BAZ\"})})", cu); table.moveUniqueConstraint(0, 2); @@ -358,7 +358,7 @@ public class JoinTableTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - JoinTableAnnotation table = (JoinTableAnnotation) attributeResource.getSupportingAnnotation(JPA.JOIN_TABLE); + JoinTableAnnotation table = (JoinTableAnnotation) attributeResource.getAnnotation(JPA.JOIN_TABLE); assertEquals(0, table.joinColumnsSize()); } @@ -368,7 +368,7 @@ public class JoinTableTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - JoinTableAnnotation table = (JoinTableAnnotation) attributeResource.getSupportingAnnotation(JPA.JOIN_TABLE); + JoinTableAnnotation table = (JoinTableAnnotation) attributeResource.getAnnotation(JPA.JOIN_TABLE); table.addJoinColumn(0); @@ -382,7 +382,7 @@ public class JoinTableTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - JoinTableAnnotation table = (JoinTableAnnotation) attributeResource.getSupportingAnnotation(JPA.JOIN_TABLE); + JoinTableAnnotation table = (JoinTableAnnotation) attributeResource.getAnnotation(JPA.JOIN_TABLE); assertEquals(2, table.joinColumnsSize()); } @@ -392,7 +392,7 @@ public class JoinTableTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - JoinTableAnnotation table = (JoinTableAnnotation) attributeResource.getSupportingAnnotation(JPA.JOIN_TABLE); + JoinTableAnnotation table = (JoinTableAnnotation) attributeResource.getAnnotation(JPA.JOIN_TABLE); table.addJoinColumn(0).setName("FOO"); table.addJoinColumn(1); @@ -409,7 +409,7 @@ public class JoinTableTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - JoinTableAnnotation table = (JoinTableAnnotation) attributeResource.getSupportingAnnotation(JPA.JOIN_TABLE); + JoinTableAnnotation table = (JoinTableAnnotation) attributeResource.getAnnotation(JPA.JOIN_TABLE); table.addJoinColumn(0).setName("FOO"); assertEquals("FOO", table.joinColumnAt(0).getName()); @@ -439,7 +439,7 @@ public class JoinTableTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - JoinTableAnnotation table = (JoinTableAnnotation) attributeResource.getSupportingAnnotation(JPA.JOIN_TABLE); + JoinTableAnnotation table = (JoinTableAnnotation) attributeResource.getAnnotation(JPA.JOIN_TABLE); JoinColumnAnnotation joinColumn = table.joinColumnAt(0); joinColumn.setReferencedColumnName("REF_NAME"); joinColumn.setUnique(Boolean.FALSE); @@ -465,7 +465,7 @@ public class JoinTableTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - JoinTableAnnotation table = (JoinTableAnnotation) attributeResource.getSupportingAnnotation(JPA.JOIN_TABLE); + JoinTableAnnotation table = (JoinTableAnnotation) attributeResource.getAnnotation(JPA.JOIN_TABLE); JoinColumnAnnotation joinColumn = table.joinColumnAt(0); joinColumn.setReferencedColumnName("REF_NAME"); @@ -494,7 +494,7 @@ public class JoinTableTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - JoinTableAnnotation table = (JoinTableAnnotation) attributeResource.getSupportingAnnotation(JPA.JOIN_TABLE); + JoinTableAnnotation table = (JoinTableAnnotation) attributeResource.getAnnotation(JPA.JOIN_TABLE); assertEquals(2, table.joinColumnsSize()); @@ -513,7 +513,7 @@ public class JoinTableTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - JoinTableAnnotation table = (JoinTableAnnotation) attributeResource.getSupportingAnnotation(JPA.JOIN_TABLE); + JoinTableAnnotation table = (JoinTableAnnotation) attributeResource.getAnnotation(JPA.JOIN_TABLE); assertEquals(0, table.inverseJoinColumnsSize()); } @@ -523,7 +523,7 @@ public class JoinTableTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - JoinTableAnnotation table = (JoinTableAnnotation) attributeResource.getSupportingAnnotation(JPA.JOIN_TABLE); + JoinTableAnnotation table = (JoinTableAnnotation) attributeResource.getAnnotation(JPA.JOIN_TABLE); table.addInverseJoinColumn(0); @@ -537,7 +537,7 @@ public class JoinTableTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - JoinTableAnnotation table = (JoinTableAnnotation) attributeResource.getSupportingAnnotation(JPA.JOIN_TABLE); + JoinTableAnnotation table = (JoinTableAnnotation) attributeResource.getAnnotation(JPA.JOIN_TABLE); assertEquals(2, table.inverseJoinColumnsSize()); } @@ -547,7 +547,7 @@ public class JoinTableTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - JoinTableAnnotation table = (JoinTableAnnotation) attributeResource.getSupportingAnnotation(JPA.JOIN_TABLE); + JoinTableAnnotation table = (JoinTableAnnotation) attributeResource.getAnnotation(JPA.JOIN_TABLE); table.addInverseJoinColumn(0).setName("FOO"); table.addInverseJoinColumn(1); @@ -564,7 +564,7 @@ public class JoinTableTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - JoinTableAnnotation table = (JoinTableAnnotation) attributeResource.getSupportingAnnotation(JPA.JOIN_TABLE); + JoinTableAnnotation table = (JoinTableAnnotation) attributeResource.getAnnotation(JPA.JOIN_TABLE); table.addInverseJoinColumn(2).setName("FOO"); Iterator<JoinColumnAnnotation> inverseJoinColumns = table.inverseJoinColumns(); @@ -595,7 +595,7 @@ public class JoinTableTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - JoinTableAnnotation table = (JoinTableAnnotation) attributeResource.getSupportingAnnotation(JPA.JOIN_TABLE); + JoinTableAnnotation table = (JoinTableAnnotation) attributeResource.getAnnotation(JPA.JOIN_TABLE); table.addInverseJoinColumn(0).setName("FOO"); Iterator<JoinColumnAnnotation> inverseJoinColumns = table.inverseJoinColumns(); @@ -617,7 +617,7 @@ public class JoinTableTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - JoinTableAnnotation table = (JoinTableAnnotation) attributeResource.getSupportingAnnotation(JPA.JOIN_TABLE); + JoinTableAnnotation table = (JoinTableAnnotation) attributeResource.getAnnotation(JPA.JOIN_TABLE); table.addInverseJoinColumn(1).setName("FOO"); Iterator<JoinColumnAnnotation> inverseJoinColumns = table.inverseJoinColumns(); @@ -639,7 +639,7 @@ public class JoinTableTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - JoinTableAnnotation table = (JoinTableAnnotation) attributeResource.getSupportingAnnotation(JPA.JOIN_TABLE); + JoinTableAnnotation table = (JoinTableAnnotation) attributeResource.getAnnotation(JPA.JOIN_TABLE); assertEquals(2, table.inverseJoinColumnsSize()); diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/LobTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/LobTests.java index 908fd5a763..7c003a3610 100644 --- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/LobTests.java +++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/LobTests.java @@ -42,7 +42,7 @@ public class LobTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - LobAnnotation lob = (LobAnnotation) attributeResource.getSupportingAnnotation(JPA.LOB); + LobAnnotation lob = (LobAnnotation) attributeResource.getAnnotation(JPA.LOB); assertNotNull(lob); } diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/ManyToManyTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/ManyToManyTests.java index 91e8b65994..5bbba87e4a 100644 --- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/ManyToManyTests.java +++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/ManyToManyTests.java @@ -121,7 +121,7 @@ public class ManyToManyTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - ManyToManyAnnotation manyToMany = (ManyToManyAnnotation) attributeResource.getMappingAnnotation(JPA.MANY_TO_MANY); + ManyToManyAnnotation manyToMany = (ManyToManyAnnotation) attributeResource.getAnnotation(JPA.MANY_TO_MANY); assertNotNull(manyToMany); } @@ -130,7 +130,7 @@ public class ManyToManyTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - ManyToManyAnnotation manyToMany = (ManyToManyAnnotation) attributeResource.getMappingAnnotation(JPA.MANY_TO_MANY); + ManyToManyAnnotation manyToMany = (ManyToManyAnnotation) attributeResource.getAnnotation(JPA.MANY_TO_MANY); assertEquals(FetchType.EAGER, manyToMany.getFetch()); } @@ -139,7 +139,7 @@ public class ManyToManyTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - ManyToManyAnnotation manyToMany = (ManyToManyAnnotation) attributeResource.getMappingAnnotation(JPA.MANY_TO_MANY); + ManyToManyAnnotation manyToMany = (ManyToManyAnnotation) attributeResource.getAnnotation(JPA.MANY_TO_MANY); assertEquals(FetchType.EAGER, manyToMany.getFetch()); manyToMany.setFetch(FetchType.LAZY); @@ -153,7 +153,7 @@ public class ManyToManyTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - ManyToManyAnnotation manyToMany = (ManyToManyAnnotation) attributeResource.getMappingAnnotation(JPA.MANY_TO_MANY); + ManyToManyAnnotation manyToMany = (ManyToManyAnnotation) attributeResource.getAnnotation(JPA.MANY_TO_MANY); assertEquals(FetchType.EAGER, manyToMany.getFetch()); manyToMany.setFetch(null); @@ -168,7 +168,7 @@ public class ManyToManyTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - ManyToManyAnnotation manyToMany = (ManyToManyAnnotation) attributeResource.getMappingAnnotation(JPA.MANY_TO_MANY); + ManyToManyAnnotation manyToMany = (ManyToManyAnnotation) attributeResource.getAnnotation(JPA.MANY_TO_MANY); assertEquals(TYPE_NAME, manyToMany.getTargetEntity()); } @@ -177,7 +177,7 @@ public class ManyToManyTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - ManyToManyAnnotation manyToMany = (ManyToManyAnnotation) attributeResource.getMappingAnnotation(JPA.MANY_TO_MANY); + ManyToManyAnnotation manyToMany = (ManyToManyAnnotation) attributeResource.getAnnotation(JPA.MANY_TO_MANY); assertEquals(TYPE_NAME, manyToMany.getTargetEntity()); manyToMany.setTargetEntity("Foo"); @@ -190,7 +190,7 @@ public class ManyToManyTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - ManyToManyAnnotation manyToMany = (ManyToManyAnnotation) attributeResource.getMappingAnnotation(JPA.MANY_TO_MANY); + ManyToManyAnnotation manyToMany = (ManyToManyAnnotation) attributeResource.getAnnotation(JPA.MANY_TO_MANY); assertEquals(TYPE_NAME, manyToMany.getTargetEntity()); manyToMany.setTargetEntity(null); @@ -205,7 +205,7 @@ public class ManyToManyTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - ManyToManyAnnotation manyToMany = (ManyToManyAnnotation) attributeResource.getMappingAnnotation(JPA.MANY_TO_MANY); + ManyToManyAnnotation manyToMany = (ManyToManyAnnotation) attributeResource.getAnnotation(JPA.MANY_TO_MANY); assertEquals(FULLY_QUALIFIED_TYPE_NAME, manyToMany.getFullyQualifiedTargetEntityClassName()); manyToMany.setTargetEntity("Foo"); @@ -222,7 +222,7 @@ public class ManyToManyTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - ManyToManyAnnotation manyToMany = (ManyToManyAnnotation) attributeResource.getMappingAnnotation(JPA.MANY_TO_MANY); + ManyToManyAnnotation manyToMany = (ManyToManyAnnotation) attributeResource.getAnnotation(JPA.MANY_TO_MANY); assertEquals("foo", manyToMany.getMappedBy()); } @@ -231,7 +231,7 @@ public class ManyToManyTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - ManyToManyAnnotation manyToMany = (ManyToManyAnnotation) attributeResource.getMappingAnnotation(JPA.MANY_TO_MANY); + ManyToManyAnnotation manyToMany = (ManyToManyAnnotation) attributeResource.getAnnotation(JPA.MANY_TO_MANY); assertEquals(null, manyToMany.getMappedBy()); } @@ -240,7 +240,7 @@ public class ManyToManyTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - ManyToManyAnnotation manyToMany = (ManyToManyAnnotation) attributeResource.getMappingAnnotation(JPA.MANY_TO_MANY); + ManyToManyAnnotation manyToMany = (ManyToManyAnnotation) attributeResource.getAnnotation(JPA.MANY_TO_MANY); assertNull(manyToMany.getMappedBy()); manyToMany.setMappedBy("bar"); assertEquals("bar", manyToMany.getMappedBy()); @@ -253,7 +253,7 @@ public class ManyToManyTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - ManyToManyAnnotation manyToMany = (ManyToManyAnnotation) attributeResource.getMappingAnnotation(JPA.MANY_TO_MANY); + ManyToManyAnnotation manyToMany = (ManyToManyAnnotation) attributeResource.getAnnotation(JPA.MANY_TO_MANY); assertEquals("foo", manyToMany.getMappedBy()); manyToMany.setMappedBy(null); @@ -268,7 +268,7 @@ public class ManyToManyTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - ManyToManyAnnotation manyToMany = (ManyToManyAnnotation) attributeResource.getMappingAnnotation(JPA.MANY_TO_MANY); + ManyToManyAnnotation manyToMany = (ManyToManyAnnotation) attributeResource.getAnnotation(JPA.MANY_TO_MANY); assertFalse(manyToMany.isCascadeAll()); manyToMany.setCascadeAll(true); @@ -282,7 +282,7 @@ public class ManyToManyTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - ManyToManyAnnotation manyToMany = (ManyToManyAnnotation) attributeResource.getMappingAnnotation(JPA.MANY_TO_MANY); + ManyToManyAnnotation manyToMany = (ManyToManyAnnotation) attributeResource.getAnnotation(JPA.MANY_TO_MANY); assertFalse(manyToMany.isCascadeMerge()); manyToMany.setCascadeMerge(true); @@ -296,7 +296,7 @@ public class ManyToManyTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - ManyToManyAnnotation manyToMany = (ManyToManyAnnotation) attributeResource.getMappingAnnotation(JPA.MANY_TO_MANY); + ManyToManyAnnotation manyToMany = (ManyToManyAnnotation) attributeResource.getAnnotation(JPA.MANY_TO_MANY); assertFalse(manyToMany.isCascadePersist()); manyToMany.setCascadePersist(true); @@ -310,7 +310,7 @@ public class ManyToManyTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - ManyToManyAnnotation manyToMany = (ManyToManyAnnotation) attributeResource.getMappingAnnotation(JPA.MANY_TO_MANY); + ManyToManyAnnotation manyToMany = (ManyToManyAnnotation) attributeResource.getAnnotation(JPA.MANY_TO_MANY); assertFalse(manyToMany.isCascadeRemove()); manyToMany.setCascadeRemove(true); @@ -324,7 +324,7 @@ public class ManyToManyTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - ManyToManyAnnotation manyToMany = (ManyToManyAnnotation) attributeResource.getMappingAnnotation(JPA.MANY_TO_MANY); + ManyToManyAnnotation manyToMany = (ManyToManyAnnotation) attributeResource.getAnnotation(JPA.MANY_TO_MANY); assertFalse(manyToMany.isCascadeRefresh()); manyToMany.setCascadeRefresh(true); @@ -338,7 +338,7 @@ public class ManyToManyTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - ManyToManyAnnotation manyToMany = (ManyToManyAnnotation) attributeResource.getMappingAnnotation(JPA.MANY_TO_MANY); + ManyToManyAnnotation manyToMany = (ManyToManyAnnotation) attributeResource.getAnnotation(JPA.MANY_TO_MANY); assertTrue(manyToMany.isCascadeAll()); manyToMany.setCascadeAll(true); @@ -363,7 +363,7 @@ public class ManyToManyTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - ManyToManyAnnotation manyToMany = (ManyToManyAnnotation) attributeResource.getMappingAnnotation(JPA.MANY_TO_MANY); + ManyToManyAnnotation manyToMany = (ManyToManyAnnotation) attributeResource.getAnnotation(JPA.MANY_TO_MANY); assertTrue(manyToMany.isCascadeMerge()); manyToMany.setCascadeMerge(false); //TODO should the resource model handle this and remove both MERGE @@ -381,7 +381,7 @@ public class ManyToManyTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - ManyToManyAnnotation manyToMany = (ManyToManyAnnotation) attributeResource.getMappingAnnotation(JPA.MANY_TO_MANY); + ManyToManyAnnotation manyToMany = (ManyToManyAnnotation) attributeResource.getAnnotation(JPA.MANY_TO_MANY); assertTrue(manyToMany.isCascadeMerge()); assertTrue(manyToMany.isCascadeRemove()); diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/ManyToOneTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/ManyToOneTests.java index d11ab1494c..e76703b1bb 100644 --- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/ManyToOneTests.java +++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/ManyToOneTests.java @@ -121,7 +121,7 @@ public class ManyToOneTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - ManyToOneAnnotation manyToOne = (ManyToOneAnnotation) attributeResource.getMappingAnnotation(JPA.MANY_TO_ONE); + ManyToOneAnnotation manyToOne = (ManyToOneAnnotation) attributeResource.getAnnotation(JPA.MANY_TO_ONE); assertNotNull(manyToOne); } @@ -130,7 +130,7 @@ public class ManyToOneTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - ManyToOneAnnotation manyToOne = (ManyToOneAnnotation) attributeResource.getMappingAnnotation(JPA.MANY_TO_ONE); + ManyToOneAnnotation manyToOne = (ManyToOneAnnotation) attributeResource.getAnnotation(JPA.MANY_TO_ONE); assertEquals(FetchType.EAGER, manyToOne.getFetch()); } @@ -139,7 +139,7 @@ public class ManyToOneTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - ManyToOneAnnotation manyToOne = (ManyToOneAnnotation) attributeResource.getMappingAnnotation(JPA.MANY_TO_ONE); + ManyToOneAnnotation manyToOne = (ManyToOneAnnotation) attributeResource.getAnnotation(JPA.MANY_TO_ONE); assertEquals(FetchType.EAGER, manyToOne.getFetch()); manyToOne.setFetch(FetchType.LAZY); @@ -153,7 +153,7 @@ public class ManyToOneTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - ManyToOneAnnotation manyToOne = (ManyToOneAnnotation) attributeResource.getMappingAnnotation(JPA.MANY_TO_ONE); + ManyToOneAnnotation manyToOne = (ManyToOneAnnotation) attributeResource.getAnnotation(JPA.MANY_TO_ONE); assertEquals(FetchType.EAGER, manyToOne.getFetch()); manyToOne.setFetch(null); @@ -169,7 +169,7 @@ public class ManyToOneTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - ManyToOneAnnotation manyToOne = (ManyToOneAnnotation) attributeResource.getMappingAnnotation(JPA.MANY_TO_ONE); + ManyToOneAnnotation manyToOne = (ManyToOneAnnotation) attributeResource.getAnnotation(JPA.MANY_TO_ONE); assertEquals(TYPE_NAME, manyToOne.getTargetEntity()); } @@ -178,7 +178,7 @@ public class ManyToOneTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - ManyToOneAnnotation manyToOne = (ManyToOneAnnotation) attributeResource.getMappingAnnotation(JPA.MANY_TO_ONE); + ManyToOneAnnotation manyToOne = (ManyToOneAnnotation) attributeResource.getAnnotation(JPA.MANY_TO_ONE); assertEquals(TYPE_NAME, manyToOne.getTargetEntity()); manyToOne.setTargetEntity("Foo"); @@ -191,7 +191,7 @@ public class ManyToOneTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - ManyToOneAnnotation manyToOne = (ManyToOneAnnotation) attributeResource.getMappingAnnotation(JPA.MANY_TO_ONE); + ManyToOneAnnotation manyToOne = (ManyToOneAnnotation) attributeResource.getAnnotation(JPA.MANY_TO_ONE); assertEquals(TYPE_NAME, manyToOne.getTargetEntity()); manyToOne.setTargetEntity(null); @@ -206,7 +206,7 @@ public class ManyToOneTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - ManyToOneAnnotation manyToOne = (ManyToOneAnnotation) attributeResource.getMappingAnnotation(JPA.MANY_TO_ONE); + ManyToOneAnnotation manyToOne = (ManyToOneAnnotation) attributeResource.getAnnotation(JPA.MANY_TO_ONE); assertEquals(FULLY_QUALIFIED_TYPE_NAME, manyToOne.getFullyQualifiedTargetEntityClassName()); manyToOne.setTargetEntity("Foo"); @@ -223,7 +223,7 @@ public class ManyToOneTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - ManyToOneAnnotation manyToOne = (ManyToOneAnnotation) attributeResource.getMappingAnnotation(JPA.MANY_TO_ONE); + ManyToOneAnnotation manyToOne = (ManyToOneAnnotation) attributeResource.getAnnotation(JPA.MANY_TO_ONE); assertEquals(Boolean.TRUE, manyToOne.getOptional()); } @@ -232,7 +232,7 @@ public class ManyToOneTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - ManyToOneAnnotation manyToOne = (ManyToOneAnnotation) attributeResource.getMappingAnnotation(JPA.MANY_TO_ONE); + ManyToOneAnnotation manyToOne = (ManyToOneAnnotation) attributeResource.getAnnotation(JPA.MANY_TO_ONE); assertEquals(Boolean.TRUE, manyToOne.getOptional()); manyToOne.setOptional(Boolean.FALSE); @@ -246,7 +246,7 @@ public class ManyToOneTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - ManyToOneAnnotation manyToOne = (ManyToOneAnnotation) attributeResource.getMappingAnnotation(JPA.MANY_TO_ONE); + ManyToOneAnnotation manyToOne = (ManyToOneAnnotation) attributeResource.getAnnotation(JPA.MANY_TO_ONE); assertEquals(Boolean.TRUE, manyToOne.getOptional()); manyToOne.setOptional(null); @@ -261,7 +261,7 @@ public class ManyToOneTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - ManyToOneAnnotation manyToOne = (ManyToOneAnnotation) attributeResource.getMappingAnnotation(JPA.MANY_TO_ONE); + ManyToOneAnnotation manyToOne = (ManyToOneAnnotation) attributeResource.getAnnotation(JPA.MANY_TO_ONE); assertFalse(manyToOne.isCascadeAll()); manyToOne.setCascadeAll(true); @@ -275,7 +275,7 @@ public class ManyToOneTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - ManyToOneAnnotation manyToOne = (ManyToOneAnnotation) attributeResource.getMappingAnnotation(JPA.MANY_TO_ONE); + ManyToOneAnnotation manyToOne = (ManyToOneAnnotation) attributeResource.getAnnotation(JPA.MANY_TO_ONE); assertFalse(manyToOne.isCascadeMerge()); manyToOne.setCascadeMerge(true); @@ -289,7 +289,7 @@ public class ManyToOneTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - ManyToOneAnnotation manyToOne = (ManyToOneAnnotation) attributeResource.getMappingAnnotation(JPA.MANY_TO_ONE); + ManyToOneAnnotation manyToOne = (ManyToOneAnnotation) attributeResource.getAnnotation(JPA.MANY_TO_ONE); assertFalse(manyToOne.isCascadePersist()); manyToOne.setCascadePersist(true); @@ -303,7 +303,7 @@ public class ManyToOneTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - ManyToOneAnnotation manyToOne = (ManyToOneAnnotation) attributeResource.getMappingAnnotation(JPA.MANY_TO_ONE); + ManyToOneAnnotation manyToOne = (ManyToOneAnnotation) attributeResource.getAnnotation(JPA.MANY_TO_ONE); assertFalse(manyToOne.isCascadeRemove()); manyToOne.setCascadeRemove(true); @@ -317,7 +317,7 @@ public class ManyToOneTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - ManyToOneAnnotation manyToOne = (ManyToOneAnnotation) attributeResource.getMappingAnnotation(JPA.MANY_TO_ONE); + ManyToOneAnnotation manyToOne = (ManyToOneAnnotation) attributeResource.getAnnotation(JPA.MANY_TO_ONE); assertFalse(manyToOne.isCascadeRefresh()); manyToOne.setCascadeRefresh(true); @@ -331,7 +331,7 @@ public class ManyToOneTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - ManyToOneAnnotation manyToOne = (ManyToOneAnnotation) attributeResource.getMappingAnnotation(JPA.MANY_TO_ONE); + ManyToOneAnnotation manyToOne = (ManyToOneAnnotation) attributeResource.getAnnotation(JPA.MANY_TO_ONE); assertTrue(manyToOne.isCascadeAll()); manyToOne.setCascadeAll(true); @@ -356,7 +356,7 @@ public class ManyToOneTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - ManyToOneAnnotation manyToOne = (ManyToOneAnnotation) attributeResource.getMappingAnnotation(JPA.MANY_TO_ONE); + ManyToOneAnnotation manyToOne = (ManyToOneAnnotation) attributeResource.getAnnotation(JPA.MANY_TO_ONE); assertTrue(manyToOne.isCascadeMerge()); manyToOne.setCascadeMerge(false);//TODO should the resource model handle this and remove both MERGE @@ -374,7 +374,7 @@ public class ManyToOneTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - ManyToOneAnnotation manyToOne = (ManyToOneAnnotation) attributeResource.getMappingAnnotation(JPA.MANY_TO_ONE); + ManyToOneAnnotation manyToOne = (ManyToOneAnnotation) attributeResource.getAnnotation(JPA.MANY_TO_ONE); assertTrue(manyToOne.isCascadeMerge()); assertTrue(manyToOne.isCascadeRemove()); diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/MapKeyTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/MapKeyTests.java index 409de12160..0f3db8e7c4 100644 --- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/MapKeyTests.java +++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/MapKeyTests.java @@ -55,7 +55,7 @@ public class MapKeyTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - MapKeyAnnotation mapKey = (MapKeyAnnotation) attributeResource.getSupportingAnnotation(JPA.MAP_KEY); + MapKeyAnnotation mapKey = (MapKeyAnnotation) attributeResource.getAnnotation(JPA.MAP_KEY); assertNotNull(mapKey); } @@ -64,7 +64,7 @@ public class MapKeyTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - MapKeyAnnotation mapKey = (MapKeyAnnotation) attributeResource.getSupportingAnnotation(JPA.MAP_KEY); + MapKeyAnnotation mapKey = (MapKeyAnnotation) attributeResource.getAnnotation(JPA.MAP_KEY); assertEquals("key", mapKey.getName()); } @@ -73,7 +73,7 @@ public class MapKeyTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - MapKeyAnnotation mapKey = (MapKeyAnnotation) attributeResource.getSupportingAnnotation(JPA.MAP_KEY); + MapKeyAnnotation mapKey = (MapKeyAnnotation) attributeResource.getAnnotation(JPA.MAP_KEY); mapKey.setName("foo"); diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/MappedSuperclassTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/MappedSuperclassTests.java index 5f20d3d322..726906a3f6 100644 --- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/MappedSuperclassTests.java +++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/MappedSuperclassTests.java @@ -56,7 +56,7 @@ public class MappedSuperclassTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestMappedSuperclass(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourceNode mappingAnnotation = typeResource.getMappingAnnotation(); + JavaResourceNode mappingAnnotation = typeResource.getAnnotation(MappedSuperclassAnnotation.ANNOTATION_NAME); assertTrue(mappingAnnotation instanceof MappedSuperclassAnnotation); } @@ -64,10 +64,10 @@ public class MappedSuperclassTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestMappedSuperclassAndEntity(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - JavaResourceNode mappingAnnotation = typeResource.getMappingAnnotation(); + JavaResourceNode mappingAnnotation = typeResource.getAnnotation(EntityAnnotation.ANNOTATION_NAME); assertTrue(mappingAnnotation instanceof EntityAnnotation); - MappedSuperclassAnnotation mappedSuperclass = (MappedSuperclassAnnotation) typeResource.getMappingAnnotation(JPA.MAPPED_SUPERCLASS); + MappedSuperclassAnnotation mappedSuperclass = (MappedSuperclassAnnotation) typeResource.getAnnotation(JPA.MAPPED_SUPERCLASS); assertNotNull(mappedSuperclass); } diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/NamedNativeQueriesTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/NamedNativeQueriesTests.java index 274a1b6a25..b18a3bed9e 100644 --- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/NamedNativeQueriesTests.java +++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/NamedNativeQueriesTests.java @@ -114,7 +114,7 @@ public class NamedNativeQueriesTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestNamedNativeQueries(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - NamedNativeQueriesAnnotation namedQueries = (NamedNativeQueriesAnnotation) typeResource.getSupportingAnnotation(JPA.NAMED_NATIVE_QUERIES); + NamedNativeQueriesAnnotation namedQueries = (NamedNativeQueriesAnnotation) typeResource.getAnnotation(JPA.NAMED_NATIVE_QUERIES); NamedNativeQueryAnnotation namedQuery = namedQueries.nestedAnnotations().next(); assertNotNull(namedQuery); } @@ -123,7 +123,7 @@ public class NamedNativeQueriesTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestNamedNativeQueryWithName(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - NamedNativeQueriesAnnotation namedQueries = (NamedNativeQueriesAnnotation) typeResource.getSupportingAnnotation(JPA.NAMED_NATIVE_QUERIES); + NamedNativeQueriesAnnotation namedQueries = (NamedNativeQueriesAnnotation) typeResource.getAnnotation(JPA.NAMED_NATIVE_QUERIES); NamedNativeQueryAnnotation namedQuery = namedQueries.nestedAnnotations().next(); assertEquals(QUERY_NAME, namedQuery.getName()); } @@ -132,7 +132,7 @@ public class NamedNativeQueriesTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestNamedNativeQueryWithName(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - NamedNativeQueriesAnnotation namedQueries = (NamedNativeQueriesAnnotation) typeResource.getSupportingAnnotation(JPA.NAMED_NATIVE_QUERIES); + NamedNativeQueriesAnnotation namedQueries = (NamedNativeQueriesAnnotation) typeResource.getAnnotation(JPA.NAMED_NATIVE_QUERIES); NamedNativeQueryAnnotation namedQuery = namedQueries.nestedAnnotations().next(); assertEquals(QUERY_NAME, namedQuery.getName()); @@ -151,7 +151,7 @@ public class NamedNativeQueriesTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestNamedNativeQueryWithQuery(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - NamedNativeQueriesAnnotation namedQueries = (NamedNativeQueriesAnnotation) typeResource.getSupportingAnnotation(JPA.NAMED_NATIVE_QUERIES); + NamedNativeQueriesAnnotation namedQueries = (NamedNativeQueriesAnnotation) typeResource.getAnnotation(JPA.NAMED_NATIVE_QUERIES); NamedNativeQueryAnnotation namedQuery = namedQueries.nestedAnnotations().next(); assertEquals(QUERY_QUERY, namedQuery.getQuery()); } @@ -160,7 +160,7 @@ public class NamedNativeQueriesTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestNamedNativeQueryWithQuery(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - NamedNativeQueriesAnnotation namedQueries = (NamedNativeQueriesAnnotation) typeResource.getSupportingAnnotation(JPA.NAMED_NATIVE_QUERIES); + NamedNativeQueriesAnnotation namedQueries = (NamedNativeQueriesAnnotation) typeResource.getAnnotation(JPA.NAMED_NATIVE_QUERIES); NamedNativeQueryAnnotation namedQuery = namedQueries.nestedAnnotations().next(); assertEquals(QUERY_QUERY, namedQuery.getQuery()); @@ -179,7 +179,7 @@ public class NamedNativeQueriesTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestNamedNativeQueryWithResultClass(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - NamedNativeQueriesAnnotation namedQueries = (NamedNativeQueriesAnnotation) typeResource.getSupportingAnnotation(JPA.NAMED_NATIVE_QUERIES); + NamedNativeQueriesAnnotation namedQueries = (NamedNativeQueriesAnnotation) typeResource.getAnnotation(JPA.NAMED_NATIVE_QUERIES); NamedNativeQueryAnnotation namedQuery = namedQueries.nestedAnnotations().next(); assertEquals(QUERY_RESULT_CLASS, namedQuery.getResultClass()); } @@ -188,7 +188,7 @@ public class NamedNativeQueriesTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestNamedNativeQueryWithResultClass(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - NamedNativeQueriesAnnotation namedQueries = (NamedNativeQueriesAnnotation) typeResource.getSupportingAnnotation(JPA.NAMED_NATIVE_QUERIES); + NamedNativeQueriesAnnotation namedQueries = (NamedNativeQueriesAnnotation) typeResource.getAnnotation(JPA.NAMED_NATIVE_QUERIES); NamedNativeQueryAnnotation namedQuery = namedQueries.nestedAnnotations().next(); assertEquals(QUERY_RESULT_CLASS, namedQuery.getResultClass()); @@ -207,7 +207,7 @@ public class NamedNativeQueriesTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestNamedNativeQueryWithResultClass(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - NamedNativeQueriesAnnotation namedQueries = (NamedNativeQueriesAnnotation) typeResource.getSupportingAnnotation(JPA.NAMED_NATIVE_QUERIES); + NamedNativeQueriesAnnotation namedQueries = (NamedNativeQueriesAnnotation) typeResource.getAnnotation(JPA.NAMED_NATIVE_QUERIES); NamedNativeQueryAnnotation namedQuery = namedQueries.nestedAnnotations().next(); assertNotNull(namedQuery.getResultClass()); assertEquals("Result", namedQuery.getFullyQualifiedResultClassName());//bug 196200 changed this @@ -222,7 +222,7 @@ public class NamedNativeQueriesTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestNamedNativeQueryWithResultSetMapping(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - NamedNativeQueriesAnnotation namedQueries = (NamedNativeQueriesAnnotation) typeResource.getSupportingAnnotation(JPA.NAMED_NATIVE_QUERIES); + NamedNativeQueriesAnnotation namedQueries = (NamedNativeQueriesAnnotation) typeResource.getAnnotation(JPA.NAMED_NATIVE_QUERIES); NamedNativeQueryAnnotation namedQuery = namedQueries.nestedAnnotations().next(); assertEquals(QUERY_RESULT_SET_MAPPING, namedQuery.getResultSetMapping()); } @@ -231,7 +231,7 @@ public class NamedNativeQueriesTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestNamedNativeQueryWithResultSetMapping(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - NamedNativeQueriesAnnotation namedQueries = (NamedNativeQueriesAnnotation) typeResource.getSupportingAnnotation(JPA.NAMED_NATIVE_QUERIES); + NamedNativeQueriesAnnotation namedQueries = (NamedNativeQueriesAnnotation) typeResource.getAnnotation(JPA.NAMED_NATIVE_QUERIES); NamedNativeQueryAnnotation namedQuery = namedQueries.nestedAnnotations().next(); assertEquals(QUERY_RESULT_SET_MAPPING, namedQuery.getResultSetMapping()); @@ -250,7 +250,7 @@ public class NamedNativeQueriesTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestNamedNativeQueries(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - NamedNativeQueriesAnnotation namedQueries = (NamedNativeQueriesAnnotation) typeResource.getSupportingAnnotation(JPA.NAMED_NATIVE_QUERIES); + NamedNativeQueriesAnnotation namedQueries = (NamedNativeQueriesAnnotation) typeResource.getAnnotation(JPA.NAMED_NATIVE_QUERIES); NamedNativeQueryAnnotation namedQuery = namedQueries.nestedAnnotations().next(); assertEquals(0, namedQuery.hintsSize()); @@ -260,7 +260,7 @@ public class NamedNativeQueriesTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestNamedNativeQueries(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - NamedNativeQueriesAnnotation namedQueries = (NamedNativeQueriesAnnotation) typeResource.getSupportingAnnotation(JPA.NAMED_NATIVE_QUERIES); + NamedNativeQueriesAnnotation namedQueries = (NamedNativeQueriesAnnotation) typeResource.getAnnotation(JPA.NAMED_NATIVE_QUERIES); NamedNativeQueryAnnotation namedQuery = namedQueries.nestedAnnotations().next(); namedQuery.addHint(0); @@ -273,7 +273,7 @@ public class NamedNativeQueriesTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestNamedNativeQueryWithQueryHints(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - NamedNativeQueriesAnnotation namedQueries = (NamedNativeQueriesAnnotation) typeResource.getSupportingAnnotation(JPA.NAMED_NATIVE_QUERIES); + NamedNativeQueriesAnnotation namedQueries = (NamedNativeQueriesAnnotation) typeResource.getAnnotation(JPA.NAMED_NATIVE_QUERIES); NamedNativeQueryAnnotation namedQuery = namedQueries.nestedAnnotations().next(); assertEquals(2, namedQuery.hintsSize()); @@ -283,7 +283,7 @@ public class NamedNativeQueriesTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestNamedNativeQueries(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - NamedNativeQueriesAnnotation namedQueries = (NamedNativeQueriesAnnotation) typeResource.getSupportingAnnotation(JPA.NAMED_NATIVE_QUERIES); + NamedNativeQueriesAnnotation namedQueries = (NamedNativeQueriesAnnotation) typeResource.getAnnotation(JPA.NAMED_NATIVE_QUERIES); NamedNativeQueryAnnotation namedQuery = namedQueries.nestedAnnotations().next(); namedQuery.addHint(0).setName("FOO"); @@ -300,7 +300,7 @@ public class NamedNativeQueriesTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestNamedNativeQueryWithQueryHints(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - NamedNativeQueriesAnnotation namedQueries = (NamedNativeQueriesAnnotation) typeResource.getSupportingAnnotation(JPA.NAMED_NATIVE_QUERIES); + NamedNativeQueriesAnnotation namedQueries = (NamedNativeQueriesAnnotation) typeResource.getAnnotation(JPA.NAMED_NATIVE_QUERIES); NamedNativeQueryAnnotation namedQuery = namedQueries.nestedAnnotations().next(); namedQuery.addHint(0).setName("BAZ"); @@ -330,7 +330,7 @@ public class NamedNativeQueriesTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestNamedNativeQueryWithQueryHints(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - NamedNativeQueriesAnnotation namedQueries = (NamedNativeQueriesAnnotation) typeResource.getSupportingAnnotation(JPA.NAMED_NATIVE_QUERIES); + NamedNativeQueriesAnnotation namedQueries = (NamedNativeQueriesAnnotation) typeResource.getAnnotation(JPA.NAMED_NATIVE_QUERIES); NamedNativeQueryAnnotation namedQuery = namedQueries.nestedAnnotations().next(); namedQuery.addHint(0).setName("BAZ"); @@ -353,7 +353,7 @@ public class NamedNativeQueriesTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestNamedNativeQueryWithQueryHints(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - NamedNativeQueriesAnnotation namedQueries = (NamedNativeQueriesAnnotation) typeResource.getSupportingAnnotation(JPA.NAMED_NATIVE_QUERIES); + NamedNativeQueriesAnnotation namedQueries = (NamedNativeQueriesAnnotation) typeResource.getAnnotation(JPA.NAMED_NATIVE_QUERIES); NamedNativeQueryAnnotation namedQuery = namedQueries.nestedAnnotations().next(); namedQuery.addHint(0).setName("BAZ"); @@ -376,46 +376,46 @@ public class NamedNativeQueriesTests extends JavaResourceModelTestCase { ICompilationUnit cu = createTestNamedNativeQuery(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - NamedNativeQueryAnnotation namedQuery = (NamedNativeQueryAnnotation) typeResource.addSupportingAnnotation(1, JPA.NAMED_NATIVE_QUERY, JPA.NAMED_NATIVE_QUERIES); + NamedNativeQueryAnnotation namedQuery = (NamedNativeQueryAnnotation) typeResource.addAnnotation(1, JPA.NAMED_NATIVE_QUERY, JPA.NAMED_NATIVE_QUERIES); namedQuery.setName("BAR"); assertSourceContains("@NamedNativeQueries({@NamedNativeQuery(name = \"foo\", query = \"bar\", hints = @QueryHint(name = \"BAR\", value = \"FOO\"), resultClass = Foo.class, resultSetMapping = \"mapping\"),@NamedNativeQuery(name = \"BAR\")})", cu); - assertNull(typeResource.getSupportingAnnotation(JPA.NAMED_NATIVE_QUERY)); - assertNotNull(typeResource.getSupportingAnnotation(JPA.NAMED_NATIVE_QUERIES)); - assertEquals(2, CollectionTools.size(typeResource.supportingAnnotations(JPA.NAMED_NATIVE_QUERY, JPA.NAMED_NATIVE_QUERIES))); + assertNull(typeResource.getAnnotation(JPA.NAMED_NATIVE_QUERY)); + assertNotNull(typeResource.getAnnotation(JPA.NAMED_NATIVE_QUERIES)); + assertEquals(2, CollectionTools.size(typeResource.annotations(JPA.NAMED_NATIVE_QUERY, JPA.NAMED_NATIVE_QUERIES))); } public void testAddNamedNativeQueryToBeginningOfList() throws Exception { ICompilationUnit cu = createTestNamedNativeQuery(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - NamedNativeQueryAnnotation namedQuery = (NamedNativeQueryAnnotation) typeResource.addSupportingAnnotation(1, JPA.NAMED_NATIVE_QUERY, JPA.NAMED_NATIVE_QUERIES); + NamedNativeQueryAnnotation namedQuery = (NamedNativeQueryAnnotation) typeResource.addAnnotation(1, JPA.NAMED_NATIVE_QUERY, JPA.NAMED_NATIVE_QUERIES); namedQuery.setName("BAR"); assertSourceContains("@NamedNativeQueries({@NamedNativeQuery(name = \"foo\", query = \"bar\", hints = @QueryHint(name = \"BAR\", value = \"FOO\"), resultClass = Foo.class, resultSetMapping = \"mapping\"),@NamedNativeQuery(name = \"BAR\")})", cu); - namedQuery = (NamedNativeQueryAnnotation) typeResource.addSupportingAnnotation(0, JPA.NAMED_NATIVE_QUERY, JPA.NAMED_NATIVE_QUERIES); + namedQuery = (NamedNativeQueryAnnotation) typeResource.addAnnotation(0, JPA.NAMED_NATIVE_QUERY, JPA.NAMED_NATIVE_QUERIES); namedQuery.setName("BAZ"); assertSourceContains("@NamedNativeQueries({@NamedNativeQuery(name = \"BAZ\"),@NamedNativeQuery(name = \"foo\", query = \"bar\", hints = @QueryHint(name = \"BAR\", value = \"FOO\"), resultClass = Foo.class, resultSetMapping = \"mapping\"), @NamedNativeQuery(name = \"BAR\")})", cu); - Iterator<NestableAnnotation> namedQueries = typeResource.supportingAnnotations(JPA.NAMED_NATIVE_QUERY, JPA.NAMED_NATIVE_QUERIES); + Iterator<NestableAnnotation> namedQueries = typeResource.annotations(JPA.NAMED_NATIVE_QUERY, JPA.NAMED_NATIVE_QUERIES); assertEquals("BAZ", ((NamedNativeQueryAnnotation) namedQueries.next()).getName()); assertEquals("foo", ((NamedNativeQueryAnnotation) namedQueries.next()).getName()); assertEquals("BAR", ((NamedNativeQueryAnnotation) namedQueries.next()).getName()); - assertNull(typeResource.getSupportingAnnotation(JPA.NAMED_NATIVE_QUERY)); - assertNotNull(typeResource.getSupportingAnnotation(JPA.NAMED_NATIVE_QUERIES)); - assertEquals(3, CollectionTools.size(typeResource.supportingAnnotations(JPA.NAMED_NATIVE_QUERY, JPA.NAMED_NATIVE_QUERIES))); + assertNull(typeResource.getAnnotation(JPA.NAMED_NATIVE_QUERY)); + assertNotNull(typeResource.getAnnotation(JPA.NAMED_NATIVE_QUERIES)); + assertEquals(3, CollectionTools.size(typeResource.annotations(JPA.NAMED_NATIVE_QUERY, JPA.NAMED_NATIVE_QUERIES))); } public void testRemoveNamedNativeQueryCopyExisting() throws Exception { ICompilationUnit cu = createTestNamedNativeQuery(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - NamedNativeQueryAnnotation namedQuery = (NamedNativeQueryAnnotation) typeResource.addSupportingAnnotation(1, JPA.NAMED_NATIVE_QUERY, JPA.NAMED_NATIVE_QUERIES); + NamedNativeQueryAnnotation namedQuery = (NamedNativeQueryAnnotation) typeResource.addAnnotation(1, JPA.NAMED_NATIVE_QUERY, JPA.NAMED_NATIVE_QUERIES); namedQuery.setName("BAR"); assertSourceContains("@NamedNativeQueries({@NamedNativeQuery(name = \"foo\", query = \"bar\", hints = @QueryHint(name = \"BAR\", value = \"FOO\"), resultClass = Foo.class, resultSetMapping = \"mapping\"),@NamedNativeQuery(name = \"BAR\")})", cu); - typeResource.removeSupportingAnnotation(1, JPA.NAMED_NATIVE_QUERY, JPA.NAMED_NATIVE_QUERIES); + typeResource.removeAnnotation(1, JPA.NAMED_NATIVE_QUERY, JPA.NAMED_NATIVE_QUERIES); assertSourceContains("@NamedNativeQuery(name = \"foo\", query = \"bar\", hints = @QueryHint(name = \"BAR\", value = \"FOO\"), resultClass = Foo.class, resultSetMapping = \"mapping\")", cu); } } diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/NamedNativeQueryTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/NamedNativeQueryTests.java index 79b0fe3d3b..d417de0445 100644 --- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/NamedNativeQueryTests.java +++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/NamedNativeQueryTests.java @@ -97,7 +97,7 @@ public class NamedNativeQueryTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestNamedNativeQuery(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - NamedNativeQueryAnnotation namedQuery = (NamedNativeQueryAnnotation) typeResource.getSupportingAnnotation(JPA.NAMED_NATIVE_QUERY); + NamedNativeQueryAnnotation namedQuery = (NamedNativeQueryAnnotation) typeResource.getAnnotation(JPA.NAMED_NATIVE_QUERY); assertNotNull(namedQuery); } @@ -105,7 +105,7 @@ public class NamedNativeQueryTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestNamedNativeQueryWithName(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - NamedNativeQueryAnnotation namedQuery = (NamedNativeQueryAnnotation) typeResource.getSupportingAnnotation(JPA.NAMED_NATIVE_QUERY); + NamedNativeQueryAnnotation namedQuery = (NamedNativeQueryAnnotation) typeResource.getAnnotation(JPA.NAMED_NATIVE_QUERY); assertEquals(QUERY_NAME, namedQuery.getName()); } @@ -113,7 +113,7 @@ public class NamedNativeQueryTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestNamedNativeQueryWithName(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - NamedNativeQueryAnnotation namedQuery = (NamedNativeQueryAnnotation) typeResource.getSupportingAnnotation(JPA.NAMED_NATIVE_QUERY); + NamedNativeQueryAnnotation namedQuery = (NamedNativeQueryAnnotation) typeResource.getAnnotation(JPA.NAMED_NATIVE_QUERY); assertEquals(QUERY_NAME, namedQuery.getName()); namedQuery.setName("foo"); @@ -131,7 +131,7 @@ public class NamedNativeQueryTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestNamedNativeQueryWithQuery(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - NamedNativeQueryAnnotation namedQuery = (NamedNativeQueryAnnotation) typeResource.getSupportingAnnotation(JPA.NAMED_NATIVE_QUERY); + NamedNativeQueryAnnotation namedQuery = (NamedNativeQueryAnnotation) typeResource.getAnnotation(JPA.NAMED_NATIVE_QUERY); assertEquals(QUERY_QUERY, namedQuery.getQuery()); } @@ -139,7 +139,7 @@ public class NamedNativeQueryTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestNamedNativeQueryWithQuery(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - NamedNativeQueryAnnotation namedQuery = (NamedNativeQueryAnnotation) typeResource.getSupportingAnnotation(JPA.NAMED_NATIVE_QUERY); + NamedNativeQueryAnnotation namedQuery = (NamedNativeQueryAnnotation) typeResource.getAnnotation(JPA.NAMED_NATIVE_QUERY); assertEquals(QUERY_QUERY, namedQuery.getQuery()); namedQuery.setQuery("foo"); @@ -157,7 +157,7 @@ public class NamedNativeQueryTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestNamedNativeQueryWithResultClass(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - NamedNativeQueryAnnotation namedQuery = (NamedNativeQueryAnnotation) typeResource.getSupportingAnnotation(JPA.NAMED_NATIVE_QUERY); + NamedNativeQueryAnnotation namedQuery = (NamedNativeQueryAnnotation) typeResource.getAnnotation(JPA.NAMED_NATIVE_QUERY); assertEquals(QUERY_RESULT_CLASS, namedQuery.getResultClass()); } @@ -165,7 +165,7 @@ public class NamedNativeQueryTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestNamedNativeQueryWithResultClass(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - NamedNativeQueryAnnotation namedQuery = (NamedNativeQueryAnnotation) typeResource.getSupportingAnnotation(JPA.NAMED_NATIVE_QUERY); + NamedNativeQueryAnnotation namedQuery = (NamedNativeQueryAnnotation) typeResource.getAnnotation(JPA.NAMED_NATIVE_QUERY); assertEquals(QUERY_RESULT_CLASS, namedQuery.getResultClass()); namedQuery.setResultClass("foo"); @@ -183,7 +183,7 @@ public class NamedNativeQueryTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestNamedNativeQueryWithResultClass(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - NamedNativeQueryAnnotation namedQuery = (NamedNativeQueryAnnotation) typeResource.getSupportingAnnotation(JPA.NAMED_NATIVE_QUERY); + NamedNativeQueryAnnotation namedQuery = (NamedNativeQueryAnnotation) typeResource.getAnnotation(JPA.NAMED_NATIVE_QUERY); assertNotNull(namedQuery.getResultClass()); assertEquals("Result", namedQuery.getFullyQualifiedResultClassName());//bug 196200 changed this @@ -197,7 +197,7 @@ public class NamedNativeQueryTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestNamedNativeQueryWithResultSetMapping(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - NamedNativeQueryAnnotation namedQuery = (NamedNativeQueryAnnotation) typeResource.getSupportingAnnotation(JPA.NAMED_NATIVE_QUERY); + NamedNativeQueryAnnotation namedQuery = (NamedNativeQueryAnnotation) typeResource.getAnnotation(JPA.NAMED_NATIVE_QUERY); assertEquals(QUERY_RESULT_SET_MAPPING, namedQuery.getResultSetMapping()); } @@ -205,7 +205,7 @@ public class NamedNativeQueryTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestNamedNativeQueryWithResultSetMapping(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - NamedNativeQueryAnnotation namedQuery = (NamedNativeQueryAnnotation) typeResource.getSupportingAnnotation(JPA.NAMED_NATIVE_QUERY); + NamedNativeQueryAnnotation namedQuery = (NamedNativeQueryAnnotation) typeResource.getAnnotation(JPA.NAMED_NATIVE_QUERY); assertEquals(QUERY_RESULT_SET_MAPPING, namedQuery.getResultSetMapping()); namedQuery.setResultSetMapping("foo"); @@ -223,7 +223,7 @@ public class NamedNativeQueryTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestNamedNativeQuery(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - NamedNativeQueryAnnotation namedQuery = (NamedNativeQueryAnnotation) typeResource.getSupportingAnnotation(JPA.NAMED_NATIVE_QUERY); + NamedNativeQueryAnnotation namedQuery = (NamedNativeQueryAnnotation) typeResource.getAnnotation(JPA.NAMED_NATIVE_QUERY); assertEquals(0, namedQuery.hintsSize()); } @@ -232,7 +232,7 @@ public class NamedNativeQueryTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestNamedNativeQuery(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - NamedNativeQueryAnnotation namedQuery = (NamedNativeQueryAnnotation) typeResource.getSupportingAnnotation(JPA.NAMED_NATIVE_QUERY); + NamedNativeQueryAnnotation namedQuery = (NamedNativeQueryAnnotation) typeResource.getAnnotation(JPA.NAMED_NATIVE_QUERY); namedQuery.addHint(0); namedQuery.addHint(1); @@ -244,7 +244,7 @@ public class NamedNativeQueryTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestNamedNativeQueryWithQueryHints(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - NamedNativeQueryAnnotation namedQuery = (NamedNativeQueryAnnotation) typeResource.getSupportingAnnotation(JPA.NAMED_NATIVE_QUERY); + NamedNativeQueryAnnotation namedQuery = (NamedNativeQueryAnnotation) typeResource.getAnnotation(JPA.NAMED_NATIVE_QUERY); assertEquals(2, namedQuery.hintsSize()); } @@ -254,7 +254,7 @@ public class NamedNativeQueryTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestNamedNativeQuery(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - NamedNativeQueryAnnotation namedQuery = (NamedNativeQueryAnnotation) typeResource.getSupportingAnnotation(JPA.NAMED_NATIVE_QUERY); + NamedNativeQueryAnnotation namedQuery = (NamedNativeQueryAnnotation) typeResource.getAnnotation(JPA.NAMED_NATIVE_QUERY); namedQuery.addHint(0).setName("FOO"); namedQuery.addHint(1); @@ -270,7 +270,7 @@ public class NamedNativeQueryTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestNamedNativeQueryWithQueryHints(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - NamedNativeQueryAnnotation namedQuery = (NamedNativeQueryAnnotation) typeResource.getSupportingAnnotation(JPA.NAMED_NATIVE_QUERY); + NamedNativeQueryAnnotation namedQuery = (NamedNativeQueryAnnotation) typeResource.getAnnotation(JPA.NAMED_NATIVE_QUERY); namedQuery.addHint(0).setName("BAZ"); assertEquals("BAZ", namedQuery.hintAt(0).getName()); @@ -299,7 +299,7 @@ public class NamedNativeQueryTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestNamedNativeQueryWithQueryHints(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - NamedNativeQueryAnnotation namedQuery = (NamedNativeQueryAnnotation) typeResource.getSupportingAnnotation(JPA.NAMED_NATIVE_QUERY); + NamedNativeQueryAnnotation namedQuery = (NamedNativeQueryAnnotation) typeResource.getAnnotation(JPA.NAMED_NATIVE_QUERY); namedQuery.addHint(0).setName("BAZ"); @@ -321,7 +321,7 @@ public class NamedNativeQueryTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestNamedNativeQueryWithQueryHints(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - NamedNativeQueryAnnotation namedQuery = (NamedNativeQueryAnnotation) typeResource.getSupportingAnnotation(JPA.NAMED_NATIVE_QUERY); + NamedNativeQueryAnnotation namedQuery = (NamedNativeQueryAnnotation) typeResource.getAnnotation(JPA.NAMED_NATIVE_QUERY); namedQuery.addHint(0).setName("BAZ"); assertEquals("BAZ", namedQuery.hintAt(0).getName()); diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/NamedQueriesTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/NamedQueriesTests.java index 20796246b3..103cbe30d4 100644 --- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/NamedQueriesTests.java +++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/NamedQueriesTests.java @@ -95,7 +95,7 @@ public class NamedQueriesTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestNamedQueries(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - NamedQueriesAnnotation namedQueries = (NamedQueriesAnnotation) typeResource.getSupportingAnnotation(JPA.NAMED_QUERIES); + NamedQueriesAnnotation namedQueries = (NamedQueriesAnnotation) typeResource.getAnnotation(JPA.NAMED_QUERIES); NamedQueryAnnotation namedQuery = namedQueries.nestedAnnotations().next(); assertNotNull(namedQuery); } @@ -104,7 +104,7 @@ public class NamedQueriesTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestNamedQueryWithName(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - NamedQueriesAnnotation namedQueries = (NamedQueriesAnnotation) typeResource.getSupportingAnnotation(JPA.NAMED_QUERIES); + NamedQueriesAnnotation namedQueries = (NamedQueriesAnnotation) typeResource.getAnnotation(JPA.NAMED_QUERIES); NamedQueryAnnotation namedQuery = namedQueries.nestedAnnotations().next(); assertEquals(QUERY_NAME, namedQuery.getName()); } @@ -113,7 +113,7 @@ public class NamedQueriesTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestNamedQueryWithName(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - NamedQueriesAnnotation namedQueries = (NamedQueriesAnnotation) typeResource.getSupportingAnnotation(JPA.NAMED_QUERIES); + NamedQueriesAnnotation namedQueries = (NamedQueriesAnnotation) typeResource.getAnnotation(JPA.NAMED_QUERIES); NamedQueryAnnotation namedQuery = namedQueries.nestedAnnotations().next(); assertEquals(QUERY_NAME, namedQuery.getName()); @@ -132,7 +132,7 @@ public class NamedQueriesTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestNamedQueryWithQuery(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - NamedQueriesAnnotation namedQueries = (NamedQueriesAnnotation) typeResource.getSupportingAnnotation(JPA.NAMED_QUERIES); + NamedQueriesAnnotation namedQueries = (NamedQueriesAnnotation) typeResource.getAnnotation(JPA.NAMED_QUERIES); NamedQueryAnnotation namedQuery = namedQueries.nestedAnnotations().next(); assertEquals(QUERY_QUERY, namedQuery.getQuery()); } @@ -141,7 +141,7 @@ public class NamedQueriesTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestNamedQueryWithQuery(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - NamedQueriesAnnotation namedQueries = (NamedQueriesAnnotation) typeResource.getSupportingAnnotation(JPA.NAMED_QUERIES); + NamedQueriesAnnotation namedQueries = (NamedQueriesAnnotation) typeResource.getAnnotation(JPA.NAMED_QUERIES); NamedQueryAnnotation namedQuery = namedQueries.nestedAnnotations().next(); assertEquals(QUERY_QUERY, namedQuery.getQuery()); @@ -160,7 +160,7 @@ public class NamedQueriesTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestNamedQueries(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - NamedQueriesAnnotation namedQueries = (NamedQueriesAnnotation) typeResource.getSupportingAnnotation(JPA.NAMED_QUERIES); + NamedQueriesAnnotation namedQueries = (NamedQueriesAnnotation) typeResource.getAnnotation(JPA.NAMED_QUERIES); NamedQueryAnnotation namedQuery = namedQueries.nestedAnnotations().next(); assertEquals(0, namedQuery.hintsSize()); @@ -170,7 +170,7 @@ public class NamedQueriesTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestNamedQueries(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - NamedQueriesAnnotation namedQueries = (NamedQueriesAnnotation) typeResource.getSupportingAnnotation(JPA.NAMED_QUERIES); + NamedQueriesAnnotation namedQueries = (NamedQueriesAnnotation) typeResource.getAnnotation(JPA.NAMED_QUERIES); NamedQueryAnnotation namedQuery = namedQueries.nestedAnnotations().next(); namedQuery.addHint(0); @@ -183,7 +183,7 @@ public class NamedQueriesTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestNamedQueryWithQueryHints(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - NamedQueriesAnnotation namedQueries = (NamedQueriesAnnotation) typeResource.getSupportingAnnotation(JPA.NAMED_QUERIES); + NamedQueriesAnnotation namedQueries = (NamedQueriesAnnotation) typeResource.getAnnotation(JPA.NAMED_QUERIES); NamedQueryAnnotation namedQuery = namedQueries.nestedAnnotations().next(); assertEquals(2, namedQuery.hintsSize()); @@ -193,7 +193,7 @@ public class NamedQueriesTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestNamedQueries(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - NamedQueriesAnnotation namedQueries = (NamedQueriesAnnotation) typeResource.getSupportingAnnotation(JPA.NAMED_QUERIES); + NamedQueriesAnnotation namedQueries = (NamedQueriesAnnotation) typeResource.getAnnotation(JPA.NAMED_QUERIES); NamedQueryAnnotation namedQuery = namedQueries.nestedAnnotations().next(); namedQuery.addHint(0).setName("FOO"); @@ -211,7 +211,7 @@ public class NamedQueriesTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestNamedQueryWithQueryHints(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - NamedQueriesAnnotation namedQueries = (NamedQueriesAnnotation) typeResource.getSupportingAnnotation(JPA.NAMED_QUERIES); + NamedQueriesAnnotation namedQueries = (NamedQueriesAnnotation) typeResource.getAnnotation(JPA.NAMED_QUERIES); NamedQueryAnnotation namedQuery = namedQueries.nestedAnnotations().next(); namedQuery.addHint(0).setName("BAZ"); @@ -240,7 +240,7 @@ public class NamedQueriesTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestNamedQueryWithQueryHints(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - NamedQueriesAnnotation namedQueries = (NamedQueriesAnnotation) typeResource.getSupportingAnnotation(JPA.NAMED_QUERIES); + NamedQueriesAnnotation namedQueries = (NamedQueriesAnnotation) typeResource.getAnnotation(JPA.NAMED_QUERIES); NamedQueryAnnotation namedQuery = namedQueries.nestedAnnotations().next(); namedQuery.addHint(0).setName("BAZ"); @@ -262,7 +262,7 @@ public class NamedQueriesTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestNamedQueryWithQueryHints(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - NamedQueriesAnnotation namedQueries = (NamedQueriesAnnotation) typeResource.getSupportingAnnotation(JPA.NAMED_QUERIES); + NamedQueriesAnnotation namedQueries = (NamedQueriesAnnotation) typeResource.getAnnotation(JPA.NAMED_QUERIES); NamedQueryAnnotation namedQuery = namedQueries.nestedAnnotations().next(); namedQuery.addHint(0).setName("BAZ"); @@ -284,47 +284,47 @@ public class NamedQueriesTests extends JavaResourceModelTestCase { ICompilationUnit cu = createTestNamedQuery(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - NamedQueryAnnotation namedQuery = (NamedQueryAnnotation) typeResource.addSupportingAnnotation(1, JPA.NAMED_QUERY, JPA.NAMED_QUERIES); + NamedQueryAnnotation namedQuery = (NamedQueryAnnotation) typeResource.addAnnotation(1, JPA.NAMED_QUERY, JPA.NAMED_QUERIES); namedQuery.setName("BAR"); assertSourceContains("@NamedQueries({@NamedQuery(name = \"foo\", query = \"bar\", hints = @QueryHint(name = \"BAR\", value = \"FOO\")),@NamedQuery(name = \"BAR\")})", cu); - assertNull(typeResource.getSupportingAnnotation(JPA.NAMED_QUERY)); - assertNotNull(typeResource.getSupportingAnnotation(JPA.NAMED_QUERIES)); - assertEquals(2, CollectionTools.size(typeResource.supportingAnnotations(JPA.NAMED_QUERY, JPA.NAMED_QUERIES))); + assertNull(typeResource.getAnnotation(JPA.NAMED_QUERY)); + assertNotNull(typeResource.getAnnotation(JPA.NAMED_QUERIES)); + assertEquals(2, CollectionTools.size(typeResource.annotations(JPA.NAMED_QUERY, JPA.NAMED_QUERIES))); } public void testAddNamedQueryToBeginningOfList() throws Exception { ICompilationUnit cu = createTestNamedQuery(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - NamedQueryAnnotation namedQuery = (NamedQueryAnnotation) typeResource.addSupportingAnnotation(1, JPA.NAMED_QUERY, JPA.NAMED_QUERIES); + NamedQueryAnnotation namedQuery = (NamedQueryAnnotation) typeResource.addAnnotation(1, JPA.NAMED_QUERY, JPA.NAMED_QUERIES); namedQuery.setName("BAR"); assertSourceContains("@NamedQueries({@NamedQuery(name = \"foo\", query = \"bar\", hints = @QueryHint(name = \"BAR\", value = \"FOO\")),@NamedQuery(name = \"BAR\")})", cu); - namedQuery = (NamedQueryAnnotation) typeResource.addSupportingAnnotation(0, JPA.NAMED_QUERY, JPA.NAMED_QUERIES); + namedQuery = (NamedQueryAnnotation) typeResource.addAnnotation(0, JPA.NAMED_QUERY, JPA.NAMED_QUERIES); namedQuery.setName("BAZ"); assertSourceContains("@NamedQueries({@NamedQuery(name = \"BAZ\"),@NamedQuery(name = \"foo\", query = \"bar\", hints = @QueryHint(name = \"BAR\", value = \"FOO\")), @NamedQuery(name = \"BAR\")})", cu); - Iterator<NestableAnnotation> namedQueries = typeResource.supportingAnnotations(JPA.NAMED_QUERY, JPA.NAMED_QUERIES); + Iterator<NestableAnnotation> namedQueries = typeResource.annotations(JPA.NAMED_QUERY, JPA.NAMED_QUERIES); assertEquals("BAZ", ((NamedQueryAnnotation) namedQueries.next()).getName()); assertEquals("foo", ((NamedQueryAnnotation) namedQueries.next()).getName()); assertEquals("BAR", ((NamedQueryAnnotation) namedQueries.next()).getName()); - assertNull(typeResource.getSupportingAnnotation(JPA.NAMED_QUERY)); - assertNotNull(typeResource.getSupportingAnnotation(JPA.NAMED_QUERIES)); - assertEquals(3, CollectionTools.size(typeResource.supportingAnnotations(JPA.NAMED_QUERY, JPA.NAMED_QUERIES))); + assertNull(typeResource.getAnnotation(JPA.NAMED_QUERY)); + assertNotNull(typeResource.getAnnotation(JPA.NAMED_QUERIES)); + assertEquals(3, CollectionTools.size(typeResource.annotations(JPA.NAMED_QUERY, JPA.NAMED_QUERIES))); } public void testRemoveNamedQueryCopyExisting() throws Exception { ICompilationUnit cu = createTestNamedQuery(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - NamedQueryAnnotation namedQuery = (NamedQueryAnnotation) typeResource.addSupportingAnnotation(1, JPA.NAMED_QUERY, JPA.NAMED_QUERIES); + NamedQueryAnnotation namedQuery = (NamedQueryAnnotation) typeResource.addAnnotation(1, JPA.NAMED_QUERY, JPA.NAMED_QUERIES); namedQuery.setName("BAR"); assertSourceContains("@NamedQueries({@NamedQuery(name = \"foo\", query = \"bar\", hints = @QueryHint(name = \"BAR\", value = \"FOO\")),@NamedQuery(name = \"BAR\")})", cu); - typeResource.removeSupportingAnnotation(1, JPA.NAMED_QUERY, JPA.NAMED_QUERIES); + typeResource.removeAnnotation(1, JPA.NAMED_QUERY, JPA.NAMED_QUERIES); assertSourceContains("@NamedQuery(name = \"foo\", query = \"bar\", hints = @QueryHint(name = \"BAR\", value = \"FOO\"))", cu); } diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/NamedQueryTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/NamedQueryTests.java index 520c3c6425..254a62d4f1 100644 --- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/NamedQueryTests.java +++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/NamedQueryTests.java @@ -79,7 +79,7 @@ public class NamedQueryTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestNamedQuery(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - NamedQueryAnnotation namedQuery = (NamedQueryAnnotation) typeResource.getSupportingAnnotation(JPA.NAMED_QUERY); + NamedQueryAnnotation namedQuery = (NamedQueryAnnotation) typeResource.getAnnotation(JPA.NAMED_QUERY); assertNotNull(namedQuery); } @@ -87,7 +87,7 @@ public class NamedQueryTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestNamedQueryWithName(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - NamedQueryAnnotation namedQuery = (NamedQueryAnnotation) typeResource.getSupportingAnnotation(JPA.NAMED_QUERY); + NamedQueryAnnotation namedQuery = (NamedQueryAnnotation) typeResource.getAnnotation(JPA.NAMED_QUERY); assertEquals(QUERY_NAME, namedQuery.getName()); } @@ -95,7 +95,7 @@ public class NamedQueryTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestNamedQueryWithName(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - NamedQueryAnnotation namedQuery = (NamedQueryAnnotation) typeResource.getSupportingAnnotation(JPA.NAMED_QUERY); + NamedQueryAnnotation namedQuery = (NamedQueryAnnotation) typeResource.getAnnotation(JPA.NAMED_QUERY); assertEquals(QUERY_NAME, namedQuery.getName()); namedQuery.setName("foo"); @@ -113,7 +113,7 @@ public class NamedQueryTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestNamedQueryWithQuery(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - NamedQueryAnnotation namedQuery = (NamedQueryAnnotation) typeResource.getSupportingAnnotation(JPA.NAMED_QUERY); + NamedQueryAnnotation namedQuery = (NamedQueryAnnotation) typeResource.getAnnotation(JPA.NAMED_QUERY); assertEquals(QUERY_QUERY, namedQuery.getQuery()); } @@ -121,7 +121,7 @@ public class NamedQueryTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestNamedQueryWithQuery(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - NamedQueryAnnotation namedQuery = (NamedQueryAnnotation) typeResource.getSupportingAnnotation(JPA.NAMED_QUERY); + NamedQueryAnnotation namedQuery = (NamedQueryAnnotation) typeResource.getAnnotation(JPA.NAMED_QUERY); assertEquals(QUERY_QUERY, namedQuery.getQuery()); namedQuery.setQuery("foo"); @@ -139,7 +139,7 @@ public class NamedQueryTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestNamedQuery(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - NamedQueryAnnotation namedQuery = (NamedQueryAnnotation) typeResource.getSupportingAnnotation(JPA.NAMED_QUERY); + NamedQueryAnnotation namedQuery = (NamedQueryAnnotation) typeResource.getAnnotation(JPA.NAMED_QUERY); assertEquals(0, namedQuery.hintsSize()); } @@ -148,7 +148,7 @@ public class NamedQueryTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestNamedQuery(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - NamedQueryAnnotation namedQuery = (NamedQueryAnnotation) typeResource.getSupportingAnnotation(JPA.NAMED_QUERY); + NamedQueryAnnotation namedQuery = (NamedQueryAnnotation) typeResource.getAnnotation(JPA.NAMED_QUERY); namedQuery.addHint(0); namedQuery.addHint(1); @@ -160,7 +160,7 @@ public class NamedQueryTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestNamedQueryWithQueryHints(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - NamedQueryAnnotation namedQuery = (NamedQueryAnnotation) typeResource.getSupportingAnnotation(JPA.NAMED_QUERY); + NamedQueryAnnotation namedQuery = (NamedQueryAnnotation) typeResource.getAnnotation(JPA.NAMED_QUERY); assertEquals(2, namedQuery.hintsSize()); @@ -173,7 +173,7 @@ public class NamedQueryTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestNamedQuery(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - NamedQueryAnnotation namedQuery = (NamedQueryAnnotation) typeResource.getSupportingAnnotation(JPA.NAMED_QUERY); + NamedQueryAnnotation namedQuery = (NamedQueryAnnotation) typeResource.getAnnotation(JPA.NAMED_QUERY); namedQuery.addHint(0).setName("FOO"); namedQuery.addHint(1); @@ -190,7 +190,7 @@ public class NamedQueryTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestNamedQueryWithQueryHints(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - NamedQueryAnnotation namedQuery = (NamedQueryAnnotation) typeResource.getSupportingAnnotation(JPA.NAMED_QUERY); + NamedQueryAnnotation namedQuery = (NamedQueryAnnotation) typeResource.getAnnotation(JPA.NAMED_QUERY); namedQuery.addHint(0).setName("BAZ"); assertEquals("BAZ", namedQuery.hintAt(0).getName()); @@ -218,7 +218,7 @@ public class NamedQueryTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestNamedQueryWithQueryHints(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - NamedQueryAnnotation namedQuery = (NamedQueryAnnotation) typeResource.getSupportingAnnotation(JPA.NAMED_QUERY); + NamedQueryAnnotation namedQuery = (NamedQueryAnnotation) typeResource.getAnnotation(JPA.NAMED_QUERY); namedQuery.addHint(0).setName("BAZ"); assertEquals("BAZ", namedQuery.hintAt(0).getName()); @@ -239,7 +239,7 @@ public class NamedQueryTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestNamedQueryWithQueryHints(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - NamedQueryAnnotation namedQuery = (NamedQueryAnnotation) typeResource.getSupportingAnnotation(JPA.NAMED_QUERY); + NamedQueryAnnotation namedQuery = (NamedQueryAnnotation) typeResource.getAnnotation(JPA.NAMED_QUERY); namedQuery.addHint(0).setName("BAZ"); assertEquals("BAZ", namedQuery.hintAt(0).getName()); diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/OneToManyTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/OneToManyTests.java index 3040f80089..3b529fee48 100644 --- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/OneToManyTests.java +++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/OneToManyTests.java @@ -121,7 +121,7 @@ public class OneToManyTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - OneToManyAnnotation oneToMany = (OneToManyAnnotation) attributeResource.getMappingAnnotation(JPA.ONE_TO_MANY); + OneToManyAnnotation oneToMany = (OneToManyAnnotation) attributeResource.getAnnotation(JPA.ONE_TO_MANY); assertNotNull(oneToMany); } @@ -130,7 +130,7 @@ public class OneToManyTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - OneToManyAnnotation oneToMany = (OneToManyAnnotation) attributeResource.getMappingAnnotation(JPA.ONE_TO_MANY); + OneToManyAnnotation oneToMany = (OneToManyAnnotation) attributeResource.getAnnotation(JPA.ONE_TO_MANY); assertEquals(FetchType.EAGER, oneToMany.getFetch()); } @@ -139,7 +139,7 @@ public class OneToManyTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - OneToManyAnnotation oneToMany = (OneToManyAnnotation) attributeResource.getMappingAnnotation(JPA.ONE_TO_MANY); + OneToManyAnnotation oneToMany = (OneToManyAnnotation) attributeResource.getAnnotation(JPA.ONE_TO_MANY); assertEquals(FetchType.EAGER, oneToMany.getFetch()); oneToMany.setFetch(FetchType.LAZY); @@ -153,7 +153,7 @@ public class OneToManyTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - OneToManyAnnotation oneToMany = (OneToManyAnnotation) attributeResource.getMappingAnnotation(JPA.ONE_TO_MANY); + OneToManyAnnotation oneToMany = (OneToManyAnnotation) attributeResource.getAnnotation(JPA.ONE_TO_MANY); assertEquals(FetchType.EAGER, oneToMany.getFetch()); oneToMany.setFetch(null); @@ -169,7 +169,7 @@ public class OneToManyTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - OneToManyAnnotation oneToMany = (OneToManyAnnotation) attributeResource.getMappingAnnotation(JPA.ONE_TO_MANY); + OneToManyAnnotation oneToMany = (OneToManyAnnotation) attributeResource.getAnnotation(JPA.ONE_TO_MANY); assertEquals(TYPE_NAME, oneToMany.getTargetEntity()); } @@ -178,7 +178,7 @@ public class OneToManyTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - OneToManyAnnotation oneToMany = (OneToManyAnnotation) attributeResource.getMappingAnnotation(JPA.ONE_TO_MANY); + OneToManyAnnotation oneToMany = (OneToManyAnnotation) attributeResource.getAnnotation(JPA.ONE_TO_MANY); assertEquals(TYPE_NAME, oneToMany.getTargetEntity()); oneToMany.setTargetEntity("Foo"); @@ -191,7 +191,7 @@ public class OneToManyTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - OneToManyAnnotation oneToMany = (OneToManyAnnotation) attributeResource.getMappingAnnotation(JPA.ONE_TO_MANY); + OneToManyAnnotation oneToMany = (OneToManyAnnotation) attributeResource.getAnnotation(JPA.ONE_TO_MANY); assertEquals(TYPE_NAME, oneToMany.getTargetEntity()); oneToMany.setTargetEntity(null); @@ -206,7 +206,7 @@ public class OneToManyTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - OneToManyAnnotation oneToMany = (OneToManyAnnotation) attributeResource.getMappingAnnotation(JPA.ONE_TO_MANY); + OneToManyAnnotation oneToMany = (OneToManyAnnotation) attributeResource.getAnnotation(JPA.ONE_TO_MANY); assertEquals(FULLY_QUALIFIED_TYPE_NAME, oneToMany.getFullyQualifiedTargetEntityClassName()); oneToMany.setTargetEntity("Foo"); @@ -223,7 +223,7 @@ public class OneToManyTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - OneToManyAnnotation oneToMany = (OneToManyAnnotation) attributeResource.getMappingAnnotation(JPA.ONE_TO_MANY); + OneToManyAnnotation oneToMany = (OneToManyAnnotation) attributeResource.getAnnotation(JPA.ONE_TO_MANY); assertEquals("foo", oneToMany.getMappedBy()); } @@ -233,7 +233,7 @@ public class OneToManyTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - OneToManyAnnotation oneToMany = (OneToManyAnnotation) attributeResource.getMappingAnnotation(JPA.ONE_TO_MANY); + OneToManyAnnotation oneToMany = (OneToManyAnnotation) attributeResource.getAnnotation(JPA.ONE_TO_MANY); assertEquals(null, oneToMany.getMappedBy()); } @@ -242,7 +242,7 @@ public class OneToManyTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - OneToManyAnnotation oneToMany = (OneToManyAnnotation) attributeResource.getMappingAnnotation(JPA.ONE_TO_MANY); + OneToManyAnnotation oneToMany = (OneToManyAnnotation) attributeResource.getAnnotation(JPA.ONE_TO_MANY); assertNull(oneToMany.getMappedBy()); oneToMany.setMappedBy("bar"); assertEquals("bar", oneToMany.getMappedBy()); @@ -255,7 +255,7 @@ public class OneToManyTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - OneToManyAnnotation oneToMany = (OneToManyAnnotation) attributeResource.getMappingAnnotation(JPA.ONE_TO_MANY); + OneToManyAnnotation oneToMany = (OneToManyAnnotation) attributeResource.getAnnotation(JPA.ONE_TO_MANY); assertEquals("foo", oneToMany.getMappedBy()); oneToMany.setMappedBy(null); @@ -270,7 +270,7 @@ public class OneToManyTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - OneToManyAnnotation oneToMany = (OneToManyAnnotation) attributeResource.getMappingAnnotation(JPA.ONE_TO_MANY); + OneToManyAnnotation oneToMany = (OneToManyAnnotation) attributeResource.getAnnotation(JPA.ONE_TO_MANY); assertFalse(oneToMany.isCascadeAll()); oneToMany.setCascadeAll(true); @@ -284,7 +284,7 @@ public class OneToManyTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - OneToManyAnnotation oneToMany = (OneToManyAnnotation) attributeResource.getMappingAnnotation(JPA.ONE_TO_MANY); + OneToManyAnnotation oneToMany = (OneToManyAnnotation) attributeResource.getAnnotation(JPA.ONE_TO_MANY); assertFalse(oneToMany.isCascadeMerge()); oneToMany.setCascadeMerge(true); @@ -298,7 +298,7 @@ public class OneToManyTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - OneToManyAnnotation oneToMany = (OneToManyAnnotation) attributeResource.getMappingAnnotation(JPA.ONE_TO_MANY); + OneToManyAnnotation oneToMany = (OneToManyAnnotation) attributeResource.getAnnotation(JPA.ONE_TO_MANY); assertFalse(oneToMany.isCascadePersist()); oneToMany.setCascadePersist(true); @@ -312,7 +312,7 @@ public class OneToManyTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - OneToManyAnnotation oneToMany = (OneToManyAnnotation) attributeResource.getMappingAnnotation(JPA.ONE_TO_MANY); + OneToManyAnnotation oneToMany = (OneToManyAnnotation) attributeResource.getAnnotation(JPA.ONE_TO_MANY); assertFalse(oneToMany.isCascadeRemove()); oneToMany.setCascadeRemove(true); @@ -326,7 +326,7 @@ public class OneToManyTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - OneToManyAnnotation oneToMany = (OneToManyAnnotation) attributeResource.getMappingAnnotation(JPA.ONE_TO_MANY); + OneToManyAnnotation oneToMany = (OneToManyAnnotation) attributeResource.getAnnotation(JPA.ONE_TO_MANY); assertFalse(oneToMany.isCascadeRefresh()); oneToMany.setCascadeRefresh(true); @@ -340,7 +340,7 @@ public class OneToManyTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - OneToManyAnnotation oneToMany = (OneToManyAnnotation) attributeResource.getMappingAnnotation(JPA.ONE_TO_MANY); + OneToManyAnnotation oneToMany = (OneToManyAnnotation) attributeResource.getAnnotation(JPA.ONE_TO_MANY); assertTrue(oneToMany.isCascadeAll()); oneToMany.setCascadeAll(true); @@ -365,7 +365,7 @@ public class OneToManyTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - OneToManyAnnotation oneToMany = (OneToManyAnnotation) attributeResource.getMappingAnnotation(JPA.ONE_TO_MANY); + OneToManyAnnotation oneToMany = (OneToManyAnnotation) attributeResource.getAnnotation(JPA.ONE_TO_MANY); assertTrue(oneToMany.isCascadeMerge()); oneToMany.setCascadeMerge(false);//TODO should the resource model handle this and remove both MERGE @@ -383,7 +383,7 @@ public class OneToManyTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - OneToManyAnnotation oneToMany = (OneToManyAnnotation) attributeResource.getMappingAnnotation(JPA.ONE_TO_MANY); + OneToManyAnnotation oneToMany = (OneToManyAnnotation) attributeResource.getAnnotation(JPA.ONE_TO_MANY); assertTrue(oneToMany.isCascadeMerge()); assertTrue(oneToMany.isCascadeRemove()); diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/OneToOneTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/OneToOneTests.java index 681f49478e..0997797956 100644 --- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/OneToOneTests.java +++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/OneToOneTests.java @@ -134,7 +134,7 @@ public class OneToOneTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - OneToOneAnnotation oneToOne = (OneToOneAnnotation) attributeResource.getMappingAnnotation(JPA.ONE_TO_ONE); + OneToOneAnnotation oneToOne = (OneToOneAnnotation) attributeResource.getAnnotation(JPA.ONE_TO_ONE); assertNotNull(oneToOne); } @@ -143,7 +143,7 @@ public class OneToOneTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - OneToOneAnnotation oneToOne = (OneToOneAnnotation) attributeResource.getMappingAnnotation(JPA.ONE_TO_ONE); + OneToOneAnnotation oneToOne = (OneToOneAnnotation) attributeResource.getAnnotation(JPA.ONE_TO_ONE); assertEquals(FetchType.EAGER, oneToOne.getFetch()); } @@ -152,7 +152,7 @@ public class OneToOneTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - OneToOneAnnotation oneToOne = (OneToOneAnnotation) attributeResource.getMappingAnnotation(JPA.ONE_TO_ONE); + OneToOneAnnotation oneToOne = (OneToOneAnnotation) attributeResource.getAnnotation(JPA.ONE_TO_ONE); assertEquals(FetchType.EAGER, oneToOne.getFetch()); oneToOne.setFetch(FetchType.LAZY); @@ -166,7 +166,7 @@ public class OneToOneTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - OneToOneAnnotation oneToOne = (OneToOneAnnotation) attributeResource.getMappingAnnotation(JPA.ONE_TO_ONE); + OneToOneAnnotation oneToOne = (OneToOneAnnotation) attributeResource.getAnnotation(JPA.ONE_TO_ONE); assertEquals(FetchType.EAGER, oneToOne.getFetch()); oneToOne.setFetch(null); @@ -182,7 +182,7 @@ public class OneToOneTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - OneToOneAnnotation oneToOne = (OneToOneAnnotation) attributeResource.getMappingAnnotation(JPA.ONE_TO_ONE); + OneToOneAnnotation oneToOne = (OneToOneAnnotation) attributeResource.getAnnotation(JPA.ONE_TO_ONE); assertEquals(TYPE_NAME, oneToOne.getTargetEntity()); } @@ -191,7 +191,7 @@ public class OneToOneTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - OneToOneAnnotation oneToOne = (OneToOneAnnotation) attributeResource.getMappingAnnotation(JPA.ONE_TO_ONE); + OneToOneAnnotation oneToOne = (OneToOneAnnotation) attributeResource.getAnnotation(JPA.ONE_TO_ONE); assertEquals(TYPE_NAME, oneToOne.getTargetEntity()); oneToOne.setTargetEntity("Foo"); @@ -204,7 +204,7 @@ public class OneToOneTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - OneToOneAnnotation oneToOne = (OneToOneAnnotation) attributeResource.getMappingAnnotation(JPA.ONE_TO_ONE); + OneToOneAnnotation oneToOne = (OneToOneAnnotation) attributeResource.getAnnotation(JPA.ONE_TO_ONE); assertEquals(TYPE_NAME, oneToOne.getTargetEntity()); oneToOne.setTargetEntity(null); @@ -219,7 +219,7 @@ public class OneToOneTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - OneToOneAnnotation oneToOne = (OneToOneAnnotation) attributeResource.getMappingAnnotation(JPA.ONE_TO_ONE); + OneToOneAnnotation oneToOne = (OneToOneAnnotation) attributeResource.getAnnotation(JPA.ONE_TO_ONE); assertEquals(FULLY_QUALIFIED_TYPE_NAME, oneToOne.getFullyQualifiedTargetEntityClassName()); oneToOne.setTargetEntity("Foo"); @@ -236,7 +236,7 @@ public class OneToOneTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - OneToOneAnnotation oneToOne = (OneToOneAnnotation) attributeResource.getMappingAnnotation(JPA.ONE_TO_ONE); + OneToOneAnnotation oneToOne = (OneToOneAnnotation) attributeResource.getAnnotation(JPA.ONE_TO_ONE); assertEquals(Boolean.TRUE, oneToOne.getOptional()); } @@ -245,7 +245,7 @@ public class OneToOneTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - OneToOneAnnotation oneToOne = (OneToOneAnnotation) attributeResource.getMappingAnnotation(JPA.ONE_TO_ONE); + OneToOneAnnotation oneToOne = (OneToOneAnnotation) attributeResource.getAnnotation(JPA.ONE_TO_ONE); assertEquals(Boolean.TRUE, oneToOne.getOptional()); oneToOne.setOptional(Boolean.FALSE); @@ -259,7 +259,7 @@ public class OneToOneTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - OneToOneAnnotation oneToOne = (OneToOneAnnotation) attributeResource.getMappingAnnotation(JPA.ONE_TO_ONE); + OneToOneAnnotation oneToOne = (OneToOneAnnotation) attributeResource.getAnnotation(JPA.ONE_TO_ONE); assertEquals(Boolean.TRUE, oneToOne.getOptional()); oneToOne.setOptional(null); @@ -274,7 +274,7 @@ public class OneToOneTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - OneToOneAnnotation oneToOne = (OneToOneAnnotation) attributeResource.getMappingAnnotation(JPA.ONE_TO_ONE); + OneToOneAnnotation oneToOne = (OneToOneAnnotation) attributeResource.getAnnotation(JPA.ONE_TO_ONE); assertEquals("foo", oneToOne.getMappedBy()); } @@ -283,7 +283,7 @@ public class OneToOneTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - OneToOneAnnotation oneToOne = (OneToOneAnnotation) attributeResource.getMappingAnnotation(JPA.ONE_TO_ONE); + OneToOneAnnotation oneToOne = (OneToOneAnnotation) attributeResource.getAnnotation(JPA.ONE_TO_ONE); assertEquals(null, oneToOne.getMappedBy()); } @@ -292,7 +292,7 @@ public class OneToOneTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - OneToOneAnnotation oneToOne = (OneToOneAnnotation) attributeResource.getMappingAnnotation(JPA.ONE_TO_ONE); + OneToOneAnnotation oneToOne = (OneToOneAnnotation) attributeResource.getAnnotation(JPA.ONE_TO_ONE); assertNull(oneToOne.getMappedBy()); oneToOne.setMappedBy("bar"); assertEquals("bar", oneToOne.getMappedBy()); @@ -305,7 +305,7 @@ public class OneToOneTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - OneToOneAnnotation oneToOne = (OneToOneAnnotation) attributeResource.getMappingAnnotation(JPA.ONE_TO_ONE); + OneToOneAnnotation oneToOne = (OneToOneAnnotation) attributeResource.getAnnotation(JPA.ONE_TO_ONE); assertEquals("foo", oneToOne.getMappedBy()); oneToOne.setMappedBy(null); @@ -320,7 +320,7 @@ public class OneToOneTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - OneToOneAnnotation oneToOne = (OneToOneAnnotation) attributeResource.getMappingAnnotation(JPA.ONE_TO_ONE); + OneToOneAnnotation oneToOne = (OneToOneAnnotation) attributeResource.getAnnotation(JPA.ONE_TO_ONE); assertFalse(oneToOne.isCascadeAll()); oneToOne.setCascadeAll(true); @@ -334,7 +334,7 @@ public class OneToOneTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - OneToOneAnnotation oneToOne = (OneToOneAnnotation) attributeResource.getMappingAnnotation(JPA.ONE_TO_ONE); + OneToOneAnnotation oneToOne = (OneToOneAnnotation) attributeResource.getAnnotation(JPA.ONE_TO_ONE); assertFalse(oneToOne.isCascadeMerge()); oneToOne.setCascadeMerge(true); @@ -348,7 +348,7 @@ public class OneToOneTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - OneToOneAnnotation oneToOne = (OneToOneAnnotation) attributeResource.getMappingAnnotation(JPA.ONE_TO_ONE); + OneToOneAnnotation oneToOne = (OneToOneAnnotation) attributeResource.getAnnotation(JPA.ONE_TO_ONE); assertFalse(oneToOne.isCascadePersist()); oneToOne.setCascadePersist(true); @@ -362,7 +362,7 @@ public class OneToOneTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - OneToOneAnnotation oneToOne = (OneToOneAnnotation) attributeResource.getMappingAnnotation(JPA.ONE_TO_ONE); + OneToOneAnnotation oneToOne = (OneToOneAnnotation) attributeResource.getAnnotation(JPA.ONE_TO_ONE); assertFalse(oneToOne.isCascadeRemove()); oneToOne.setCascadeRemove(true); @@ -376,7 +376,7 @@ public class OneToOneTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - OneToOneAnnotation oneToOne = (OneToOneAnnotation) attributeResource.getMappingAnnotation(JPA.ONE_TO_ONE); + OneToOneAnnotation oneToOne = (OneToOneAnnotation) attributeResource.getAnnotation(JPA.ONE_TO_ONE); assertFalse(oneToOne.isCascadeRefresh()); oneToOne.setCascadeRefresh(true); @@ -390,7 +390,7 @@ public class OneToOneTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - OneToOneAnnotation oneToOne = (OneToOneAnnotation) attributeResource.getMappingAnnotation(JPA.ONE_TO_ONE); + OneToOneAnnotation oneToOne = (OneToOneAnnotation) attributeResource.getAnnotation(JPA.ONE_TO_ONE); assertTrue(oneToOne.isCascadeAll()); oneToOne.setCascadeAll(true); @@ -415,7 +415,7 @@ public class OneToOneTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - OneToOneAnnotation oneToOne = (OneToOneAnnotation) attributeResource.getMappingAnnotation(JPA.ONE_TO_ONE); + OneToOneAnnotation oneToOne = (OneToOneAnnotation) attributeResource.getAnnotation(JPA.ONE_TO_ONE); assertTrue(oneToOne.isCascadeMerge()); oneToOne.setCascadeMerge(false);//TODO should the resource model handle this and remove both MERGE @@ -433,7 +433,7 @@ public class OneToOneTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - OneToOneAnnotation oneToOne = (OneToOneAnnotation) attributeResource.getMappingAnnotation(JPA.ONE_TO_ONE); + OneToOneAnnotation oneToOne = (OneToOneAnnotation) attributeResource.getAnnotation(JPA.ONE_TO_ONE); assertTrue(oneToOne.isCascadeMerge()); assertTrue(oneToOne.isCascadeRemove()); diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/OrderByTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/OrderByTests.java index 55120e4a94..d403160318 100644 --- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/OrderByTests.java +++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/OrderByTests.java @@ -55,7 +55,7 @@ public class OrderByTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - OrderByAnnotation orderBy = (OrderByAnnotation) attributeResource.getSupportingAnnotation(JPA.ORDER_BY); + OrderByAnnotation orderBy = (OrderByAnnotation) attributeResource.getAnnotation(JPA.ORDER_BY); assertNotNull(orderBy); } @@ -64,7 +64,7 @@ public class OrderByTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - OrderByAnnotation orderBy = (OrderByAnnotation) attributeResource.getSupportingAnnotation(JPA.ORDER_BY); + OrderByAnnotation orderBy = (OrderByAnnotation) attributeResource.getAnnotation(JPA.ORDER_BY); assertEquals("key", orderBy.getValue()); } @@ -73,7 +73,7 @@ public class OrderByTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - OrderByAnnotation orderBy = (OrderByAnnotation) attributeResource.getSupportingAnnotation(JPA.ORDER_BY); + OrderByAnnotation orderBy = (OrderByAnnotation) attributeResource.getAnnotation(JPA.ORDER_BY); orderBy.setValue("foo"); diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/PrimaryKeyJoinColumnTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/PrimaryKeyJoinColumnTests.java index 025e347a3f..42177540e2 100644 --- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/PrimaryKeyJoinColumnTests.java +++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/PrimaryKeyJoinColumnTests.java @@ -84,7 +84,7 @@ public class PrimaryKeyJoinColumnTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestPrimaryKeyJoinColumnWithName(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - PrimaryKeyJoinColumnAnnotation column = (PrimaryKeyJoinColumnAnnotation) attributeResource.getSupportingAnnotation(JPA.PRIMARY_KEY_JOIN_COLUMN); + PrimaryKeyJoinColumnAnnotation column = (PrimaryKeyJoinColumnAnnotation) attributeResource.getAnnotation(JPA.PRIMARY_KEY_JOIN_COLUMN); assertNotNull(column); assertEquals(COLUMN_NAME, column.getName()); } @@ -93,7 +93,7 @@ public class PrimaryKeyJoinColumnTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestPrimaryKeyJoinColumn(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - PrimaryKeyJoinColumnAnnotation column = (PrimaryKeyJoinColumnAnnotation) attributeResource.getSupportingAnnotation(JPA.PRIMARY_KEY_JOIN_COLUMN); + PrimaryKeyJoinColumnAnnotation column = (PrimaryKeyJoinColumnAnnotation) attributeResource.getAnnotation(JPA.PRIMARY_KEY_JOIN_COLUMN); assertNotNull(column); assertNull(column.getReferencedColumnName()); assertNull(column.getColumnDefinition()); @@ -103,7 +103,7 @@ public class PrimaryKeyJoinColumnTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestPrimaryKeyJoinColumn(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - PrimaryKeyJoinColumnAnnotation column = (PrimaryKeyJoinColumnAnnotation) attributeResource.getSupportingAnnotation(JPA.PRIMARY_KEY_JOIN_COLUMN); + PrimaryKeyJoinColumnAnnotation column = (PrimaryKeyJoinColumnAnnotation) attributeResource.getAnnotation(JPA.PRIMARY_KEY_JOIN_COLUMN); assertNotNull(column); assertNull(column.getName()); @@ -118,7 +118,7 @@ public class PrimaryKeyJoinColumnTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestPrimaryKeyJoinColumnWithName(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - PrimaryKeyJoinColumnAnnotation column = (PrimaryKeyJoinColumnAnnotation) attributeResource.getSupportingAnnotation(JPA.PRIMARY_KEY_JOIN_COLUMN); + PrimaryKeyJoinColumnAnnotation column = (PrimaryKeyJoinColumnAnnotation) attributeResource.getAnnotation(JPA.PRIMARY_KEY_JOIN_COLUMN); assertEquals(COLUMN_NAME, column.getName()); @@ -134,7 +134,7 @@ public class PrimaryKeyJoinColumnTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestPrimaryKeyJoinColumnWithReferencedColumnName(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - PrimaryKeyJoinColumnAnnotation column = (PrimaryKeyJoinColumnAnnotation) attributeResource.getSupportingAnnotation(JPA.PRIMARY_KEY_JOIN_COLUMN); + PrimaryKeyJoinColumnAnnotation column = (PrimaryKeyJoinColumnAnnotation) attributeResource.getAnnotation(JPA.PRIMARY_KEY_JOIN_COLUMN); assertEquals(COLUMN_REFERENCED_COLUMN_NAME, column.getReferencedColumnName()); } @@ -142,7 +142,7 @@ public class PrimaryKeyJoinColumnTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestPrimaryKeyJoinColumn(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - PrimaryKeyJoinColumnAnnotation column = (PrimaryKeyJoinColumnAnnotation) attributeResource.getSupportingAnnotation(JPA.PRIMARY_KEY_JOIN_COLUMN); + PrimaryKeyJoinColumnAnnotation column = (PrimaryKeyJoinColumnAnnotation) attributeResource.getAnnotation(JPA.PRIMARY_KEY_JOIN_COLUMN); assertNotNull(column); assertNull(column.getReferencedColumnName()); @@ -161,7 +161,7 @@ public class PrimaryKeyJoinColumnTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestPrimaryKeyJoinColumnWithColumnDefinition(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - PrimaryKeyJoinColumnAnnotation column = (PrimaryKeyJoinColumnAnnotation) attributeResource.getSupportingAnnotation(JPA.PRIMARY_KEY_JOIN_COLUMN); + PrimaryKeyJoinColumnAnnotation column = (PrimaryKeyJoinColumnAnnotation) attributeResource.getAnnotation(JPA.PRIMARY_KEY_JOIN_COLUMN); assertEquals(COLUMN_COLUMN_DEFINITION, column.getColumnDefinition()); } @@ -169,7 +169,7 @@ public class PrimaryKeyJoinColumnTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestPrimaryKeyJoinColumn(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - PrimaryKeyJoinColumnAnnotation column = (PrimaryKeyJoinColumnAnnotation) attributeResource.getSupportingAnnotation(JPA.PRIMARY_KEY_JOIN_COLUMN); + PrimaryKeyJoinColumnAnnotation column = (PrimaryKeyJoinColumnAnnotation) attributeResource.getAnnotation(JPA.PRIMARY_KEY_JOIN_COLUMN); assertNotNull(column); assertNull(column.getColumnDefinition()); diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/PrimaryKeyJoinColumnsTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/PrimaryKeyJoinColumnsTests.java index 1e01f24d38..74f08302f7 100644 --- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/PrimaryKeyJoinColumnsTests.java +++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/PrimaryKeyJoinColumnsTests.java @@ -100,7 +100,7 @@ public class PrimaryKeyJoinColumnsTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestPrimaryKeyJoinColumnWithName(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - PrimaryKeyJoinColumnAnnotation column = (PrimaryKeyJoinColumnAnnotation) attributeResource.supportingAnnotations(JPA.PRIMARY_KEY_JOIN_COLUMN, JPA.PRIMARY_KEY_JOIN_COLUMNS).next(); + PrimaryKeyJoinColumnAnnotation column = (PrimaryKeyJoinColumnAnnotation) attributeResource.annotations(JPA.PRIMARY_KEY_JOIN_COLUMN, JPA.PRIMARY_KEY_JOIN_COLUMNS).next(); assertNotNull(column); assertEquals(COLUMN_NAME, column.getName()); } @@ -109,7 +109,7 @@ public class PrimaryKeyJoinColumnsTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestPrimaryKeyJoinColumns(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - PrimaryKeyJoinColumnAnnotation column = (PrimaryKeyJoinColumnAnnotation) attributeResource.supportingAnnotations(JPA.PRIMARY_KEY_JOIN_COLUMN, JPA.PRIMARY_KEY_JOIN_COLUMNS).next(); + PrimaryKeyJoinColumnAnnotation column = (PrimaryKeyJoinColumnAnnotation) attributeResource.annotations(JPA.PRIMARY_KEY_JOIN_COLUMN, JPA.PRIMARY_KEY_JOIN_COLUMNS).next(); assertNotNull(column); assertNull(column.getName()); assertNull(column.getReferencedColumnName()); @@ -120,7 +120,7 @@ public class PrimaryKeyJoinColumnsTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestPrimaryKeyJoinColumns(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - PrimaryKeyJoinColumnAnnotation column = (PrimaryKeyJoinColumnAnnotation) attributeResource.supportingAnnotations(JPA.PRIMARY_KEY_JOIN_COLUMN, JPA.PRIMARY_KEY_JOIN_COLUMNS).next(); + PrimaryKeyJoinColumnAnnotation column = (PrimaryKeyJoinColumnAnnotation) attributeResource.annotations(JPA.PRIMARY_KEY_JOIN_COLUMN, JPA.PRIMARY_KEY_JOIN_COLUMNS).next(); assertNotNull(column); assertNull(column.getName()); @@ -135,7 +135,7 @@ public class PrimaryKeyJoinColumnsTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestPrimaryKeyJoinColumnWithName(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - PrimaryKeyJoinColumnAnnotation column = (PrimaryKeyJoinColumnAnnotation) attributeResource.supportingAnnotations(JPA.PRIMARY_KEY_JOIN_COLUMN, JPA.PRIMARY_KEY_JOIN_COLUMNS).next(); + PrimaryKeyJoinColumnAnnotation column = (PrimaryKeyJoinColumnAnnotation) attributeResource.annotations(JPA.PRIMARY_KEY_JOIN_COLUMN, JPA.PRIMARY_KEY_JOIN_COLUMNS).next(); assertEquals(COLUMN_NAME, column.getName()); @@ -149,7 +149,7 @@ public class PrimaryKeyJoinColumnsTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestPrimaryKeyJoinColumnWithReferencedColumnName(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - PrimaryKeyJoinColumnAnnotation column = (PrimaryKeyJoinColumnAnnotation) attributeResource.supportingAnnotations(JPA.PRIMARY_KEY_JOIN_COLUMN, JPA.PRIMARY_KEY_JOIN_COLUMNS).next(); + PrimaryKeyJoinColumnAnnotation column = (PrimaryKeyJoinColumnAnnotation) attributeResource.annotations(JPA.PRIMARY_KEY_JOIN_COLUMN, JPA.PRIMARY_KEY_JOIN_COLUMNS).next(); assertEquals(COLUMN_REFERENCED_COLUMN_NAME, column.getReferencedColumnName()); } @@ -157,7 +157,7 @@ public class PrimaryKeyJoinColumnsTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestPrimaryKeyJoinColumns(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - PrimaryKeyJoinColumnAnnotation column = (PrimaryKeyJoinColumnAnnotation) attributeResource.supportingAnnotations(JPA.PRIMARY_KEY_JOIN_COLUMN, JPA.PRIMARY_KEY_JOIN_COLUMNS).next(); + PrimaryKeyJoinColumnAnnotation column = (PrimaryKeyJoinColumnAnnotation) attributeResource.annotations(JPA.PRIMARY_KEY_JOIN_COLUMN, JPA.PRIMARY_KEY_JOIN_COLUMNS).next(); assertNotNull(column); assertNull(column.getReferencedColumnName()); @@ -176,7 +176,7 @@ public class PrimaryKeyJoinColumnsTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestPrimaryKeyJoinColumnWithColumnDefinition(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - PrimaryKeyJoinColumnAnnotation column = (PrimaryKeyJoinColumnAnnotation) attributeResource.supportingAnnotations(JPA.PRIMARY_KEY_JOIN_COLUMN, JPA.PRIMARY_KEY_JOIN_COLUMNS).next(); + PrimaryKeyJoinColumnAnnotation column = (PrimaryKeyJoinColumnAnnotation) attributeResource.annotations(JPA.PRIMARY_KEY_JOIN_COLUMN, JPA.PRIMARY_KEY_JOIN_COLUMNS).next(); assertEquals(COLUMN_COLUMN_DEFINITION, column.getColumnDefinition()); } @@ -184,7 +184,7 @@ public class PrimaryKeyJoinColumnsTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestPrimaryKeyJoinColumns(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - PrimaryKeyJoinColumnAnnotation column = (PrimaryKeyJoinColumnAnnotation) attributeResource.supportingAnnotations(JPA.PRIMARY_KEY_JOIN_COLUMN, JPA.PRIMARY_KEY_JOIN_COLUMNS).next(); + PrimaryKeyJoinColumnAnnotation column = (PrimaryKeyJoinColumnAnnotation) attributeResource.annotations(JPA.PRIMARY_KEY_JOIN_COLUMN, JPA.PRIMARY_KEY_JOIN_COLUMNS).next(); assertNotNull(column); assertNull(column.getColumnDefinition()); @@ -205,35 +205,35 @@ public class PrimaryKeyJoinColumnsTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - PrimaryKeyJoinColumnAnnotation joinColumn = (PrimaryKeyJoinColumnAnnotation) attributeResource.addSupportingAnnotation(1, JPA.PRIMARY_KEY_JOIN_COLUMN, JPA.PRIMARY_KEY_JOIN_COLUMNS); + PrimaryKeyJoinColumnAnnotation joinColumn = (PrimaryKeyJoinColumnAnnotation) attributeResource.addAnnotation(1, JPA.PRIMARY_KEY_JOIN_COLUMN, JPA.PRIMARY_KEY_JOIN_COLUMNS); joinColumn.setName("FOO"); assertSourceContains("@PrimaryKeyJoinColumns({@PrimaryKeyJoinColumn(name = \"BAR\", columnDefinition = \"COLUMN_DEF\", referencedColumnName = \"REF_NAME\"),@PrimaryKeyJoinColumn(name = \"FOO\")})", cu); - assertNull(attributeResource.getSupportingAnnotation(JPA.PRIMARY_KEY_JOIN_COLUMN)); - assertNotNull(attributeResource.getSupportingAnnotation(JPA.PRIMARY_KEY_JOIN_COLUMNS)); - assertEquals(2, CollectionTools.size(attributeResource.supportingAnnotations(JPA.PRIMARY_KEY_JOIN_COLUMN, JPA.PRIMARY_KEY_JOIN_COLUMNS))); + assertNull(attributeResource.getAnnotation(JPA.PRIMARY_KEY_JOIN_COLUMN)); + assertNotNull(attributeResource.getAnnotation(JPA.PRIMARY_KEY_JOIN_COLUMNS)); + assertEquals(2, CollectionTools.size(attributeResource.annotations(JPA.PRIMARY_KEY_JOIN_COLUMN, JPA.PRIMARY_KEY_JOIN_COLUMNS))); } public void testAddPrimaryKeyJoinColumnToBeginningOfList() throws Exception { ICompilationUnit cu = createTestPrimaryKeyJoinColumn(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - PrimaryKeyJoinColumnAnnotation joinColumn = (PrimaryKeyJoinColumnAnnotation) attributeResource.addSupportingAnnotation(1, JPA.PRIMARY_KEY_JOIN_COLUMN, JPA.PRIMARY_KEY_JOIN_COLUMNS); + PrimaryKeyJoinColumnAnnotation joinColumn = (PrimaryKeyJoinColumnAnnotation) attributeResource.addAnnotation(1, JPA.PRIMARY_KEY_JOIN_COLUMN, JPA.PRIMARY_KEY_JOIN_COLUMNS); joinColumn.setName("FOO"); assertSourceContains("@PrimaryKeyJoinColumns({@PrimaryKeyJoinColumn(name = \"BAR\", columnDefinition = \"COLUMN_DEF\", referencedColumnName = \"REF_NAME\"),@PrimaryKeyJoinColumn(name = \"FOO\")})", cu); - joinColumn = (PrimaryKeyJoinColumnAnnotation) attributeResource.addSupportingAnnotation(0, JPA.PRIMARY_KEY_JOIN_COLUMN, JPA.PRIMARY_KEY_JOIN_COLUMNS); + joinColumn = (PrimaryKeyJoinColumnAnnotation) attributeResource.addAnnotation(0, JPA.PRIMARY_KEY_JOIN_COLUMN, JPA.PRIMARY_KEY_JOIN_COLUMNS); joinColumn.setName("BAZ"); assertSourceContains("@PrimaryKeyJoinColumns({@PrimaryKeyJoinColumn(name = \"BAZ\"),@PrimaryKeyJoinColumn(name = \"BAR\", columnDefinition = \"COLUMN_DEF\", referencedColumnName = \"REF_NAME\"), @PrimaryKeyJoinColumn(name = \"FOO\")})", cu); - Iterator<NestableAnnotation> pkJoinColumns = attributeResource.supportingAnnotations(JPA.PRIMARY_KEY_JOIN_COLUMN, JPA.PRIMARY_KEY_JOIN_COLUMNS); + Iterator<NestableAnnotation> pkJoinColumns = attributeResource.annotations(JPA.PRIMARY_KEY_JOIN_COLUMN, JPA.PRIMARY_KEY_JOIN_COLUMNS); assertEquals("BAZ", ((PrimaryKeyJoinColumnAnnotation) pkJoinColumns.next()).getName()); assertEquals("BAR", ((PrimaryKeyJoinColumnAnnotation) pkJoinColumns.next()).getName()); assertEquals("FOO", ((PrimaryKeyJoinColumnAnnotation) pkJoinColumns.next()).getName()); - assertNull(attributeResource.getSupportingAnnotation(JPA.PRIMARY_KEY_JOIN_COLUMN)); - assertNotNull(attributeResource.getSupportingAnnotation(JPA.PRIMARY_KEY_JOIN_COLUMNS)); - assertEquals(3, CollectionTools.size(attributeResource.supportingAnnotations(JPA.PRIMARY_KEY_JOIN_COLUMN, JPA.PRIMARY_KEY_JOIN_COLUMNS))); + assertNull(attributeResource.getAnnotation(JPA.PRIMARY_KEY_JOIN_COLUMN)); + assertNotNull(attributeResource.getAnnotation(JPA.PRIMARY_KEY_JOIN_COLUMNS)); + assertEquals(3, CollectionTools.size(attributeResource.annotations(JPA.PRIMARY_KEY_JOIN_COLUMN, JPA.PRIMARY_KEY_JOIN_COLUMNS))); } public void testRemovePrimaryKeyJoinColumnCopyExisting() throws Exception { @@ -241,11 +241,11 @@ public class PrimaryKeyJoinColumnsTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - PrimaryKeyJoinColumnAnnotation joinColumn = (PrimaryKeyJoinColumnAnnotation) attributeResource.addSupportingAnnotation(1, JPA.PRIMARY_KEY_JOIN_COLUMN, JPA.PRIMARY_KEY_JOIN_COLUMNS); + PrimaryKeyJoinColumnAnnotation joinColumn = (PrimaryKeyJoinColumnAnnotation) attributeResource.addAnnotation(1, JPA.PRIMARY_KEY_JOIN_COLUMN, JPA.PRIMARY_KEY_JOIN_COLUMNS); joinColumn.setName("FOO"); assertSourceContains("@PrimaryKeyJoinColumns({@PrimaryKeyJoinColumn(name = \"BAR\", columnDefinition = \"COLUMN_DEF\", referencedColumnName = \"REF_NAME\"),@PrimaryKeyJoinColumn(name = \"FOO\")})", cu); - attributeResource.removeSupportingAnnotation(1, JPA.PRIMARY_KEY_JOIN_COLUMN, JPA.PRIMARY_KEY_JOIN_COLUMNS); + attributeResource.removeAnnotation(1, JPA.PRIMARY_KEY_JOIN_COLUMN, JPA.PRIMARY_KEY_JOIN_COLUMNS); assertSourceContains("@PrimaryKeyJoinColumn(name = \"BAR\", columnDefinition = \"COLUMN_DEF\", referencedColumnName = \"REF_NAME\")", cu); } diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/QueryHintTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/QueryHintTests.java index b522972feb..1a61a2a98b 100644 --- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/QueryHintTests.java +++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/QueryHintTests.java @@ -44,7 +44,7 @@ public class QueryHintTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestNamedQueryWithQueryHints(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - NamedQueryAnnotation namedQuery = (NamedQueryAnnotation) typeResource.getSupportingAnnotation(JPA.NAMED_QUERY); + NamedQueryAnnotation namedQuery = (NamedQueryAnnotation) typeResource.getAnnotation(JPA.NAMED_QUERY); QueryHintAnnotation queryHint = namedQuery.hints().next(); assertEquals(QUERY_HINT_NAME, queryHint.getName()); } @@ -53,7 +53,7 @@ public class QueryHintTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestNamedQueryWithQueryHints(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - NamedQueryAnnotation namedQuery = (NamedQueryAnnotation) typeResource.getSupportingAnnotation(JPA.NAMED_QUERY); + NamedQueryAnnotation namedQuery = (NamedQueryAnnotation) typeResource.getAnnotation(JPA.NAMED_QUERY); QueryHintAnnotation queryHint = namedQuery.hints().next(); assertEquals(QUERY_HINT_NAME, queryHint.getName()); diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/SecondaryTableTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/SecondaryTableTests.java index 357596a1f6..3ed657cfde 100644 --- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/SecondaryTableTests.java +++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/SecondaryTableTests.java @@ -111,7 +111,7 @@ public class SecondaryTableTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestSecondaryTableWithName(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - SecondaryTableAnnotation table = (SecondaryTableAnnotation) typeResource.getSupportingAnnotation(JPA.SECONDARY_TABLE); + SecondaryTableAnnotation table = (SecondaryTableAnnotation) typeResource.getAnnotation(JPA.SECONDARY_TABLE); assertNotNull(table); assertEquals(TABLE_NAME, table.getName()); } @@ -120,7 +120,7 @@ public class SecondaryTableTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestSecondaryTable(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - SecondaryTableAnnotation table = (SecondaryTableAnnotation) typeResource.getSupportingAnnotation(JPA.SECONDARY_TABLE); + SecondaryTableAnnotation table = (SecondaryTableAnnotation) typeResource.getAnnotation(JPA.SECONDARY_TABLE); assertNotNull(table); assertNull(table.getName()); assertNull(table.getCatalog()); @@ -131,7 +131,7 @@ public class SecondaryTableTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestSecondaryTable(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - SecondaryTableAnnotation table = (SecondaryTableAnnotation) typeResource.getSupportingAnnotation(JPA.SECONDARY_TABLE); + SecondaryTableAnnotation table = (SecondaryTableAnnotation) typeResource.getAnnotation(JPA.SECONDARY_TABLE); assertNotNull(table); assertNull(table.getName()); @@ -145,7 +145,7 @@ public class SecondaryTableTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestSecondaryTableWithName(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - SecondaryTableAnnotation table = (SecondaryTableAnnotation) typeResource.getSupportingAnnotation(JPA.SECONDARY_TABLE); + SecondaryTableAnnotation table = (SecondaryTableAnnotation) typeResource.getAnnotation(JPA.SECONDARY_TABLE); assertEquals(TABLE_NAME, table.getName()); table.setName(null); @@ -158,7 +158,7 @@ public class SecondaryTableTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestSecondaryTableWithCatalog(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - SecondaryTableAnnotation table = (SecondaryTableAnnotation) typeResource.getSupportingAnnotation(JPA.SECONDARY_TABLE); + SecondaryTableAnnotation table = (SecondaryTableAnnotation) typeResource.getAnnotation(JPA.SECONDARY_TABLE); assertNotNull(table); assertEquals(CATALOG_NAME, table.getCatalog()); } @@ -167,7 +167,7 @@ public class SecondaryTableTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestSecondaryTable(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - SecondaryTableAnnotation table = (SecondaryTableAnnotation) typeResource.getSupportingAnnotation(JPA.SECONDARY_TABLE); + SecondaryTableAnnotation table = (SecondaryTableAnnotation) typeResource.getAnnotation(JPA.SECONDARY_TABLE); assertNotNull(table); assertNull(table.getCatalog()); @@ -181,7 +181,7 @@ public class SecondaryTableTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestSecondaryTableWithCatalog(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - SecondaryTableAnnotation table = (SecondaryTableAnnotation) typeResource.getSupportingAnnotation(JPA.SECONDARY_TABLE); + SecondaryTableAnnotation table = (SecondaryTableAnnotation) typeResource.getAnnotation(JPA.SECONDARY_TABLE); assertEquals(CATALOG_NAME, table.getCatalog()); table.setCatalog(null); @@ -194,7 +194,7 @@ public class SecondaryTableTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestSecondaryTableWithSchema(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - SecondaryTableAnnotation table = (SecondaryTableAnnotation) typeResource.getSupportingAnnotation(JPA.SECONDARY_TABLE); + SecondaryTableAnnotation table = (SecondaryTableAnnotation) typeResource.getAnnotation(JPA.SECONDARY_TABLE); assertNotNull(table); assertEquals(SCHEMA_NAME, table.getSchema()); } @@ -203,7 +203,7 @@ public class SecondaryTableTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestSecondaryTable(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - SecondaryTableAnnotation table = (SecondaryTableAnnotation) typeResource.getSupportingAnnotation(JPA.SECONDARY_TABLE); + SecondaryTableAnnotation table = (SecondaryTableAnnotation) typeResource.getAnnotation(JPA.SECONDARY_TABLE); assertNotNull(table); assertNull(table.getSchema()); @@ -217,7 +217,7 @@ public class SecondaryTableTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestSecondaryTableWithSchema(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - SecondaryTableAnnotation table = (SecondaryTableAnnotation) typeResource.getSupportingAnnotation(JPA.SECONDARY_TABLE); + SecondaryTableAnnotation table = (SecondaryTableAnnotation) typeResource.getAnnotation(JPA.SECONDARY_TABLE); assertEquals(SCHEMA_NAME, table.getSchema()); table.setSchema(null); @@ -230,7 +230,7 @@ public class SecondaryTableTests extends JavaResourceModelTestCase { public void testUniqueConstraints() throws Exception { ICompilationUnit cu = this.createTestSecondaryTable(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - SecondaryTableAnnotation table = (SecondaryTableAnnotation) typeResource.getSupportingAnnotation(JPA.SECONDARY_TABLE); + SecondaryTableAnnotation table = (SecondaryTableAnnotation) typeResource.getAnnotation(JPA.SECONDARY_TABLE); assertEquals(0, table.uniqueConstraintsSize()); } @@ -238,7 +238,7 @@ public class SecondaryTableTests extends JavaResourceModelTestCase { public void testUniqueConstraints2() throws Exception { ICompilationUnit cu = this.createTestSecondaryTable(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - SecondaryTableAnnotation table = (SecondaryTableAnnotation) typeResource.getSupportingAnnotation(JPA.SECONDARY_TABLE); + SecondaryTableAnnotation table = (SecondaryTableAnnotation) typeResource.getAnnotation(JPA.SECONDARY_TABLE); table.addUniqueConstraint(0); table.addUniqueConstraint(1); @@ -249,7 +249,7 @@ public class SecondaryTableTests extends JavaResourceModelTestCase { public void testUniqueConstraints3() throws Exception { ICompilationUnit cu = this.createTestSecondaryTableWithUniqueConstraints(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - SecondaryTableAnnotation table = (SecondaryTableAnnotation) typeResource.getSupportingAnnotation(JPA.SECONDARY_TABLE); + SecondaryTableAnnotation table = (SecondaryTableAnnotation) typeResource.getAnnotation(JPA.SECONDARY_TABLE); assertEquals(3, table.uniqueConstraintsSize()); } @@ -257,7 +257,7 @@ public class SecondaryTableTests extends JavaResourceModelTestCase { public void testAddUniqueConstraint() throws Exception { ICompilationUnit cu = this.createTestSecondaryTable(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - SecondaryTableAnnotation table = (SecondaryTableAnnotation) typeResource.getSupportingAnnotation(JPA.SECONDARY_TABLE); + SecondaryTableAnnotation table = (SecondaryTableAnnotation) typeResource.getAnnotation(JPA.SECONDARY_TABLE); table.addUniqueConstraint(0).addColumnName("FOO"); table.addUniqueConstraint(1); @@ -273,7 +273,7 @@ public class SecondaryTableTests extends JavaResourceModelTestCase { public void testRemoveUniqueConstraint() throws Exception { ICompilationUnit cu = this.createTestSecondaryTableWithUniqueConstraints(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - SecondaryTableAnnotation table = (SecondaryTableAnnotation) typeResource.getSupportingAnnotation(JPA.SECONDARY_TABLE); + SecondaryTableAnnotation table = (SecondaryTableAnnotation) typeResource.getAnnotation(JPA.SECONDARY_TABLE); table.removeUniqueConstraint(1); Iterator<UniqueConstraintAnnotation> uniqueConstraints = table.uniqueConstraints(); @@ -297,7 +297,7 @@ public class SecondaryTableTests extends JavaResourceModelTestCase { public void testMoveUniqueConstraint() throws Exception { ICompilationUnit cu = this.createTestSecondaryTableWithUniqueConstraints(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - SecondaryTableAnnotation secondaryTable = (SecondaryTableAnnotation) typeResource.getSupportingAnnotation(JPA.SECONDARY_TABLE); + SecondaryTableAnnotation secondaryTable = (SecondaryTableAnnotation) typeResource.getAnnotation(JPA.SECONDARY_TABLE); assertEquals("BAR", secondaryTable.uniqueConstraintAt(0).columnNames().next()); assertEquals("FOO", secondaryTable.uniqueConstraintAt(1).columnNames().next()); @@ -315,7 +315,7 @@ public class SecondaryTableTests extends JavaResourceModelTestCase { public void testMoveUniqueConstraint2() throws Exception { ICompilationUnit cu = this.createTestSecondaryTableWithUniqueConstraints(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - SecondaryTableAnnotation secondaryTable = (SecondaryTableAnnotation) typeResource.getSupportingAnnotation(JPA.SECONDARY_TABLE); + SecondaryTableAnnotation secondaryTable = (SecondaryTableAnnotation) typeResource.getAnnotation(JPA.SECONDARY_TABLE); assertEquals("BAR", secondaryTable.uniqueConstraintAt(0).columnNames().next()); assertEquals("FOO", secondaryTable.uniqueConstraintAt(1).columnNames().next()); @@ -334,7 +334,7 @@ public class SecondaryTableTests extends JavaResourceModelTestCase { public void testPkJoinColumns() throws Exception { ICompilationUnit cu = this.createTestSecondaryTable(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - SecondaryTableAnnotation table = (SecondaryTableAnnotation) typeResource.getSupportingAnnotation(JPA.SECONDARY_TABLE); + SecondaryTableAnnotation table = (SecondaryTableAnnotation) typeResource.getAnnotation(JPA.SECONDARY_TABLE); assertEquals(0, table.pkJoinColumnsSize()); } @@ -342,7 +342,7 @@ public class SecondaryTableTests extends JavaResourceModelTestCase { public void testPkJoinColumns2() throws Exception { ICompilationUnit cu = this.createTestSecondaryTable(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - SecondaryTableAnnotation table = (SecondaryTableAnnotation) typeResource.getSupportingAnnotation(JPA.SECONDARY_TABLE); + SecondaryTableAnnotation table = (SecondaryTableAnnotation) typeResource.getAnnotation(JPA.SECONDARY_TABLE); table.addPkJoinColumn(0); table.addPkJoinColumn(1); @@ -353,7 +353,7 @@ public class SecondaryTableTests extends JavaResourceModelTestCase { public void testPkJoinColumns3() throws Exception { ICompilationUnit cu = this.createTestSecondaryTableWithPkJoinColumns(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - SecondaryTableAnnotation table = (SecondaryTableAnnotation) typeResource.getSupportingAnnotation(JPA.SECONDARY_TABLE); + SecondaryTableAnnotation table = (SecondaryTableAnnotation) typeResource.getAnnotation(JPA.SECONDARY_TABLE); assertEquals(3, table.pkJoinColumnsSize()); } @@ -361,7 +361,7 @@ public class SecondaryTableTests extends JavaResourceModelTestCase { public void testAddPkJoinColumn() throws Exception { ICompilationUnit cu = this.createTestSecondaryTable(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - SecondaryTableAnnotation table = (SecondaryTableAnnotation) typeResource.getSupportingAnnotation(JPA.SECONDARY_TABLE); + SecondaryTableAnnotation table = (SecondaryTableAnnotation) typeResource.getAnnotation(JPA.SECONDARY_TABLE); table.addPkJoinColumn(0).setName("FOO"); @@ -379,7 +379,7 @@ public class SecondaryTableTests extends JavaResourceModelTestCase { public void testRemovePkJoinColumn() throws Exception { ICompilationUnit cu = this.createTestSecondaryTableWithPkJoinColumns(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - SecondaryTableAnnotation table = (SecondaryTableAnnotation) typeResource.getSupportingAnnotation(JPA.SECONDARY_TABLE); + SecondaryTableAnnotation table = (SecondaryTableAnnotation) typeResource.getAnnotation(JPA.SECONDARY_TABLE); table.removePkJoinColumn(1); assertSourceContains("@SecondaryTable(pkJoinColumns = {@PrimaryKeyJoinColumn(name = \"BAR\"), @PrimaryKeyJoinColumn(name = \"BAZ\")})", cu); @@ -395,7 +395,7 @@ public class SecondaryTableTests extends JavaResourceModelTestCase { public void testMovePkJoinColumn() throws Exception { ICompilationUnit cu = this.createTestSecondaryTableWithPkJoinColumns(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - SecondaryTableAnnotation table = (SecondaryTableAnnotation) typeResource.getSupportingAnnotation(JPA.SECONDARY_TABLE); + SecondaryTableAnnotation table = (SecondaryTableAnnotation) typeResource.getAnnotation(JPA.SECONDARY_TABLE); PrimaryKeyJoinColumnAnnotation joinColumn = table.pkJoinColumnAt(0); joinColumn.setReferencedColumnName("REF_NAME"); joinColumn.setColumnDefinition("COLUMN_DEF"); @@ -406,7 +406,7 @@ public class SecondaryTableTests extends JavaResourceModelTestCase { public void testMovePkJoinColumn2() throws Exception { ICompilationUnit cu = this.createTestSecondaryTableWithPkJoinColumns(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - SecondaryTableAnnotation table = (SecondaryTableAnnotation) typeResource.getSupportingAnnotation(JPA.SECONDARY_TABLE); + SecondaryTableAnnotation table = (SecondaryTableAnnotation) typeResource.getAnnotation(JPA.SECONDARY_TABLE); PrimaryKeyJoinColumnAnnotation joinColumn = table.pkJoinColumnAt(0); @@ -419,7 +419,7 @@ public class SecondaryTableTests extends JavaResourceModelTestCase { public void testSetPkJoinColumnName() throws Exception { ICompilationUnit cu = this.createTestSecondaryTableWithPkJoinColumns(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - SecondaryTableAnnotation table = (SecondaryTableAnnotation) typeResource.getSupportingAnnotation(JPA.SECONDARY_TABLE); + SecondaryTableAnnotation table = (SecondaryTableAnnotation) typeResource.getAnnotation(JPA.SECONDARY_TABLE); assertEquals(3, table.pkJoinColumnsSize()); diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/SecondaryTablesTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/SecondaryTablesTests.java index 278f0f0f75..1cc9a47435 100644 --- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/SecondaryTablesTests.java +++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/SecondaryTablesTests.java @@ -129,9 +129,9 @@ public class SecondaryTablesTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestSecondaryTableWithName(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - SecondaryTableAnnotation table = (SecondaryTableAnnotation) typeResource.getSupportingAnnotation(JPA.SECONDARY_TABLE); + SecondaryTableAnnotation table = (SecondaryTableAnnotation) typeResource.getAnnotation(JPA.SECONDARY_TABLE); assertNull(table); - SecondaryTablesAnnotation secondaryTables = (SecondaryTablesAnnotation) typeResource.getSupportingAnnotation(JPA.SECONDARY_TABLES); + SecondaryTablesAnnotation secondaryTables = (SecondaryTablesAnnotation) typeResource.getAnnotation(JPA.SECONDARY_TABLES); assertNotNull(secondaryTables); SecondaryTableAnnotation secondaryTable = secondaryTables.nestedAnnotations().next(); @@ -142,7 +142,7 @@ public class SecondaryTablesTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestSecondaryTables(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - SecondaryTablesAnnotation secondaryTables = (SecondaryTablesAnnotation) typeResource.getSupportingAnnotation(JPA.SECONDARY_TABLES); + SecondaryTablesAnnotation secondaryTables = (SecondaryTablesAnnotation) typeResource.getAnnotation(JPA.SECONDARY_TABLES); SecondaryTableAnnotation secondaryTable = secondaryTables.nestedAnnotations().next(); assertNull(secondaryTable.getName()); assertNull(secondaryTable.getCatalog()); @@ -153,7 +153,7 @@ public class SecondaryTablesTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestSecondaryTables(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - SecondaryTablesAnnotation secondaryTables = (SecondaryTablesAnnotation) typeResource.getSupportingAnnotation(JPA.SECONDARY_TABLES); + SecondaryTablesAnnotation secondaryTables = (SecondaryTablesAnnotation) typeResource.getAnnotation(JPA.SECONDARY_TABLES); SecondaryTableAnnotation secondaryTable = secondaryTables.nestedAnnotations().next(); assertNull(secondaryTable.getName()); @@ -168,7 +168,7 @@ public class SecondaryTablesTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestSecondaryTableWithName(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - SecondaryTablesAnnotation secondaryTables = (SecondaryTablesAnnotation) typeResource.getSupportingAnnotation(JPA.SECONDARY_TABLES); + SecondaryTablesAnnotation secondaryTables = (SecondaryTablesAnnotation) typeResource.getAnnotation(JPA.SECONDARY_TABLES); SecondaryTableAnnotation secondaryTable = secondaryTables.nestedAnnotations().next(); assertEquals(TABLE_NAME, secondaryTable.getName()); @@ -182,7 +182,7 @@ public class SecondaryTablesTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestSecondaryTableWithCatalog(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - SecondaryTablesAnnotation secondaryTables = (SecondaryTablesAnnotation) typeResource.getSupportingAnnotation(JPA.SECONDARY_TABLES); + SecondaryTablesAnnotation secondaryTables = (SecondaryTablesAnnotation) typeResource.getAnnotation(JPA.SECONDARY_TABLES); SecondaryTableAnnotation secondaryTable = secondaryTables.nestedAnnotations().next(); assertEquals(CATALOG_NAME, secondaryTable.getCatalog()); } @@ -191,7 +191,7 @@ public class SecondaryTablesTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestSecondaryTables(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - SecondaryTablesAnnotation secondaryTables = (SecondaryTablesAnnotation) typeResource.getSupportingAnnotation(JPA.SECONDARY_TABLES); + SecondaryTablesAnnotation secondaryTables = (SecondaryTablesAnnotation) typeResource.getAnnotation(JPA.SECONDARY_TABLES); SecondaryTableAnnotation secondaryTable = secondaryTables.nestedAnnotations().next(); assertNull(secondaryTable.getCatalog()); @@ -205,7 +205,7 @@ public class SecondaryTablesTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestSecondaryTableWithCatalog(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - SecondaryTablesAnnotation secondaryTables = (SecondaryTablesAnnotation) typeResource.getSupportingAnnotation(JPA.SECONDARY_TABLES); + SecondaryTablesAnnotation secondaryTables = (SecondaryTablesAnnotation) typeResource.getAnnotation(JPA.SECONDARY_TABLES); SecondaryTableAnnotation secondaryTable = secondaryTables.nestedAnnotations().next(); assertEquals(CATALOG_NAME, secondaryTable.getCatalog()); @@ -219,7 +219,7 @@ public class SecondaryTablesTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestSecondaryTableWithSchema(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - SecondaryTablesAnnotation secondaryTables = (SecondaryTablesAnnotation) typeResource.getSupportingAnnotation(JPA.SECONDARY_TABLES); + SecondaryTablesAnnotation secondaryTables = (SecondaryTablesAnnotation) typeResource.getAnnotation(JPA.SECONDARY_TABLES); SecondaryTableAnnotation secondaryTable = secondaryTables.nestedAnnotations().next(); assertNotNull(secondaryTable); assertEquals(SCHEMA_NAME, secondaryTable.getSchema()); @@ -229,7 +229,7 @@ public class SecondaryTablesTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestSecondaryTables(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - SecondaryTablesAnnotation secondaryTables = (SecondaryTablesAnnotation) typeResource.getSupportingAnnotation(JPA.SECONDARY_TABLES); + SecondaryTablesAnnotation secondaryTables = (SecondaryTablesAnnotation) typeResource.getAnnotation(JPA.SECONDARY_TABLES); SecondaryTableAnnotation secondaryTable = secondaryTables.nestedAnnotations().next(); assertNull(secondaryTable.getSchema()); @@ -243,7 +243,7 @@ public class SecondaryTablesTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestSecondaryTableWithSchema(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - SecondaryTablesAnnotation secondaryTables = (SecondaryTablesAnnotation) typeResource.getSupportingAnnotation(JPA.SECONDARY_TABLES); + SecondaryTablesAnnotation secondaryTables = (SecondaryTablesAnnotation) typeResource.getAnnotation(JPA.SECONDARY_TABLES); SecondaryTableAnnotation secondaryTable = secondaryTables.nestedAnnotations().next(); assertEquals(SCHEMA_NAME, secondaryTable.getSchema()); @@ -257,7 +257,7 @@ public class SecondaryTablesTests extends JavaResourceModelTestCase { public void testUniqueConstraints() throws Exception { ICompilationUnit cu = this.createTestSecondaryTables(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - SecondaryTablesAnnotation secondaryTables = (SecondaryTablesAnnotation) typeResource.getSupportingAnnotation(JPA.SECONDARY_TABLES); + SecondaryTablesAnnotation secondaryTables = (SecondaryTablesAnnotation) typeResource.getAnnotation(JPA.SECONDARY_TABLES); SecondaryTableAnnotation secondaryTable = secondaryTables.nestedAnnotations().next(); assertEquals(0, secondaryTable.uniqueConstraintsSize()); @@ -266,7 +266,7 @@ public class SecondaryTablesTests extends JavaResourceModelTestCase { public void testUniqueConstraints2() throws Exception { ICompilationUnit cu = this.createTestSecondaryTables(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - SecondaryTablesAnnotation secondaryTables = (SecondaryTablesAnnotation) typeResource.getSupportingAnnotation(JPA.SECONDARY_TABLES); + SecondaryTablesAnnotation secondaryTables = (SecondaryTablesAnnotation) typeResource.getAnnotation(JPA.SECONDARY_TABLES); SecondaryTableAnnotation secondaryTable = secondaryTables.nestedAnnotations().next(); secondaryTable.addUniqueConstraint(0); @@ -278,7 +278,7 @@ public class SecondaryTablesTests extends JavaResourceModelTestCase { public void testUniqueConstraints3() throws Exception { ICompilationUnit cu = this.createTestSecondaryTableWithUniqueConstraints(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - SecondaryTablesAnnotation secondaryTables = (SecondaryTablesAnnotation) typeResource.getSupportingAnnotation(JPA.SECONDARY_TABLES); + SecondaryTablesAnnotation secondaryTables = (SecondaryTablesAnnotation) typeResource.getAnnotation(JPA.SECONDARY_TABLES); SecondaryTableAnnotation secondaryTable = secondaryTables.nestedAnnotations().next(); assertEquals(2, secondaryTable.uniqueConstraintsSize()); @@ -287,7 +287,7 @@ public class SecondaryTablesTests extends JavaResourceModelTestCase { public void testAddUniqueConstraint() throws Exception { ICompilationUnit cu = this.createTestSecondaryTables(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - SecondaryTablesAnnotation secondaryTables = (SecondaryTablesAnnotation) typeResource.getSupportingAnnotation(JPA.SECONDARY_TABLES); + SecondaryTablesAnnotation secondaryTables = (SecondaryTablesAnnotation) typeResource.getAnnotation(JPA.SECONDARY_TABLES); SecondaryTableAnnotation secondaryTable = secondaryTables.nestedAnnotations().next(); secondaryTable.addUniqueConstraint(0).addColumnName("FOO"); @@ -304,7 +304,7 @@ public class SecondaryTablesTests extends JavaResourceModelTestCase { public void testRemoveUniqueConstraint() throws Exception { ICompilationUnit cu = this.createTestSecondaryTableWithUniqueConstraints(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - SecondaryTablesAnnotation secondaryTables = (SecondaryTablesAnnotation) typeResource.getSupportingAnnotation(JPA.SECONDARY_TABLES); + SecondaryTablesAnnotation secondaryTables = (SecondaryTablesAnnotation) typeResource.getAnnotation(JPA.SECONDARY_TABLES); SecondaryTableAnnotation secondaryTable = secondaryTables.nestedAnnotations().next(); secondaryTable.addUniqueConstraint(0).addColumnName("FOO"); @@ -321,7 +321,7 @@ public class SecondaryTablesTests extends JavaResourceModelTestCase { public void testMoveUniqueConstraint() throws Exception { ICompilationUnit cu = this.createTestSecondaryTableWithUniqueConstraints(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - SecondaryTablesAnnotation secondaryTables = (SecondaryTablesAnnotation) typeResource.getSupportingAnnotation(JPA.SECONDARY_TABLES); + SecondaryTablesAnnotation secondaryTables = (SecondaryTablesAnnotation) typeResource.getAnnotation(JPA.SECONDARY_TABLES); SecondaryTableAnnotation secondaryTable = secondaryTables.nestedAnnotations().next(); secondaryTable.addUniqueConstraint(0).addColumnName("FOO"); @@ -339,7 +339,7 @@ public class SecondaryTablesTests extends JavaResourceModelTestCase { public void testMoveUniqueConstraint2() throws Exception { ICompilationUnit cu = this.createTestSecondaryTableWithUniqueConstraints(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - SecondaryTablesAnnotation secondaryTables = (SecondaryTablesAnnotation) typeResource.getSupportingAnnotation(JPA.SECONDARY_TABLES); + SecondaryTablesAnnotation secondaryTables = (SecondaryTablesAnnotation) typeResource.getAnnotation(JPA.SECONDARY_TABLES); SecondaryTableAnnotation secondaryTable = secondaryTables.nestedAnnotations().next(); secondaryTable.addUniqueConstraint(0).addColumnName("FOO"); @@ -361,46 +361,46 @@ public class SecondaryTablesTests extends JavaResourceModelTestCase { ICompilationUnit cu = createTestSecondaryTable(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - SecondaryTableAnnotation secondaryTable = (SecondaryTableAnnotation) typeResource.addSupportingAnnotation(1, JPA.SECONDARY_TABLE, JPA.SECONDARY_TABLES); + SecondaryTableAnnotation secondaryTable = (SecondaryTableAnnotation) typeResource.addAnnotation(1, JPA.SECONDARY_TABLE, JPA.SECONDARY_TABLES); secondaryTable.setName("BAR"); assertSourceContains("@SecondaryTables({@SecondaryTable(name = \"FOO\", schema = \"BAZ\", catalog = \"BAR\", uniqueConstraints = @UniqueConstraint(columnNames = \"BAR\")),@SecondaryTable(name = \"BAR\")})", cu); - assertNull(typeResource.getSupportingAnnotation(JPA.SECONDARY_TABLE)); - assertNotNull(typeResource.getSupportingAnnotation(JPA.SECONDARY_TABLES)); - assertEquals(2, CollectionTools.size(typeResource.supportingAnnotations(JPA.SECONDARY_TABLE, JPA.SECONDARY_TABLES))); + assertNull(typeResource.getAnnotation(JPA.SECONDARY_TABLE)); + assertNotNull(typeResource.getAnnotation(JPA.SECONDARY_TABLES)); + assertEquals(2, CollectionTools.size(typeResource.annotations(JPA.SECONDARY_TABLE, JPA.SECONDARY_TABLES))); } public void testAddSecondaryTable() throws Exception { ICompilationUnit cu = createTestSecondaryTable(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - SecondaryTableAnnotation secondaryTable = (SecondaryTableAnnotation) typeResource.addSupportingAnnotation(1, JPA.SECONDARY_TABLE, JPA.SECONDARY_TABLES); + SecondaryTableAnnotation secondaryTable = (SecondaryTableAnnotation) typeResource.addAnnotation(1, JPA.SECONDARY_TABLE, JPA.SECONDARY_TABLES); secondaryTable.setName("BAR"); assertSourceContains("@SecondaryTables({@SecondaryTable(name = \"FOO\", schema = \"BAZ\", catalog = \"BAR\", uniqueConstraints = @UniqueConstraint(columnNames = \"BAR\")),@SecondaryTable(name = \"BAR\")})", cu); - secondaryTable = (SecondaryTableAnnotation) typeResource.addSupportingAnnotation(0, JPA.SECONDARY_TABLE, JPA.SECONDARY_TABLES); + secondaryTable = (SecondaryTableAnnotation) typeResource.addAnnotation(0, JPA.SECONDARY_TABLE, JPA.SECONDARY_TABLES); secondaryTable.setName("BAZ"); assertSourceContains("@SecondaryTables({@SecondaryTable(name = \"BAZ\"),@SecondaryTable(name = \"FOO\", schema = \"BAZ\", catalog = \"BAR\", uniqueConstraints = @UniqueConstraint(columnNames = \"BAR\")), @SecondaryTable(name = \"BAR\")})", cu); - Iterator<NestableAnnotation> secondaryTables = typeResource.supportingAnnotations(JPA.SECONDARY_TABLE, JPA.SECONDARY_TABLES); + Iterator<NestableAnnotation> secondaryTables = typeResource.annotations(JPA.SECONDARY_TABLE, JPA.SECONDARY_TABLES); assertEquals("BAZ", ((SecondaryTableAnnotation) secondaryTables.next()).getName()); assertEquals("FOO", ((SecondaryTableAnnotation) secondaryTables.next()).getName()); assertEquals("BAR", ((SecondaryTableAnnotation) secondaryTables.next()).getName()); - assertNull(typeResource.getSupportingAnnotation(JPA.SECONDARY_TABLE)); - assertNotNull(typeResource.getSupportingAnnotation(JPA.SECONDARY_TABLES)); - assertEquals(3, CollectionTools.size(typeResource.supportingAnnotations(JPA.SECONDARY_TABLE, JPA.SECONDARY_TABLES))); + assertNull(typeResource.getAnnotation(JPA.SECONDARY_TABLE)); + assertNotNull(typeResource.getAnnotation(JPA.SECONDARY_TABLES)); + assertEquals(3, CollectionTools.size(typeResource.annotations(JPA.SECONDARY_TABLE, JPA.SECONDARY_TABLES))); } public void testRemoveSecondaryTableCopyExisting() throws Exception { ICompilationUnit cu = createTestSecondaryTable(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - SecondaryTableAnnotation secondaryTable = (SecondaryTableAnnotation) typeResource.addSupportingAnnotation(1, JPA.SECONDARY_TABLE, JPA.SECONDARY_TABLES); + SecondaryTableAnnotation secondaryTable = (SecondaryTableAnnotation) typeResource.addAnnotation(1, JPA.SECONDARY_TABLE, JPA.SECONDARY_TABLES); secondaryTable.setName("BAR"); assertSourceContains("@SecondaryTables({@SecondaryTable(name = \"FOO\", schema = \"BAZ\", catalog = \"BAR\", uniqueConstraints = @UniqueConstraint(columnNames = \"BAR\")),@SecondaryTable(name = \"BAR\")})", cu); - typeResource.removeSupportingAnnotation(1, JPA.SECONDARY_TABLE, JPA.SECONDARY_TABLES); + typeResource.removeAnnotation(1, JPA.SECONDARY_TABLE, JPA.SECONDARY_TABLES); assertSourceContains("@SecondaryTable(name = \"FOO\", schema = \"BAZ\", catalog = \"BAR\", uniqueConstraints = @UniqueConstraint(columnNames = \"BAR\"))", cu); } @@ -408,7 +408,7 @@ public class SecondaryTablesTests extends JavaResourceModelTestCase { public void testPkJoinColumns() throws Exception { ICompilationUnit cu = this.createTestSecondaryTables(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - SecondaryTableAnnotation table = (SecondaryTableAnnotation) typeResource.supportingAnnotations(JPA.SECONDARY_TABLE, JPA.SECONDARY_TABLES).next(); + SecondaryTableAnnotation table = (SecondaryTableAnnotation) typeResource.annotations(JPA.SECONDARY_TABLE, JPA.SECONDARY_TABLES).next(); assertEquals(0, table.pkJoinColumnsSize()); } @@ -416,7 +416,7 @@ public class SecondaryTablesTests extends JavaResourceModelTestCase { public void testPkJoinColumns2() throws Exception { ICompilationUnit cu = this.createTestSecondaryTables(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - SecondaryTableAnnotation table = (SecondaryTableAnnotation) typeResource.supportingAnnotations(JPA.SECONDARY_TABLE, JPA.SECONDARY_TABLES).next(); + SecondaryTableAnnotation table = (SecondaryTableAnnotation) typeResource.annotations(JPA.SECONDARY_TABLE, JPA.SECONDARY_TABLES).next(); table.addPkJoinColumn(0); table.addPkJoinColumn(1); @@ -427,7 +427,7 @@ public class SecondaryTablesTests extends JavaResourceModelTestCase { public void testPkJoinColumns3() throws Exception { ICompilationUnit cu = this.createTestSecondaryTablesWithPkJoinColumns(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - SecondaryTableAnnotation table = (SecondaryTableAnnotation) typeResource.supportingAnnotations(JPA.SECONDARY_TABLE, JPA.SECONDARY_TABLES).next(); + SecondaryTableAnnotation table = (SecondaryTableAnnotation) typeResource.annotations(JPA.SECONDARY_TABLE, JPA.SECONDARY_TABLES).next(); assertEquals(3, table.pkJoinColumnsSize()); } @@ -435,7 +435,7 @@ public class SecondaryTablesTests extends JavaResourceModelTestCase { public void testAddPkJoinColumn() throws Exception { ICompilationUnit cu = this.createTestSecondaryTables(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - SecondaryTableAnnotation table = (SecondaryTableAnnotation) typeResource.supportingAnnotations(JPA.SECONDARY_TABLE, JPA.SECONDARY_TABLES).next(); + SecondaryTableAnnotation table = (SecondaryTableAnnotation) typeResource.annotations(JPA.SECONDARY_TABLE, JPA.SECONDARY_TABLES).next(); table.addPkJoinColumn(0).setName("FOO"); table.addPkJoinColumn(1); @@ -447,7 +447,7 @@ public class SecondaryTablesTests extends JavaResourceModelTestCase { public void testRemovePkJoinColumn() throws Exception { ICompilationUnit cu = this.createTestSecondaryTablesWithPkJoinColumns(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - SecondaryTableAnnotation table = (SecondaryTableAnnotation) typeResource.supportingAnnotations(JPA.SECONDARY_TABLE, JPA.SECONDARY_TABLES).next(); + SecondaryTableAnnotation table = (SecondaryTableAnnotation) typeResource.annotations(JPA.SECONDARY_TABLE, JPA.SECONDARY_TABLES).next(); table.removePkJoinColumn(1); assertSourceContains("@SecondaryTables(@SecondaryTable(pkJoinColumns = {@PrimaryKeyJoinColumn(name = \"BAR\"), @PrimaryKeyJoinColumn(name = \"BAZ\")}))", cu); @@ -462,7 +462,7 @@ public class SecondaryTablesTests extends JavaResourceModelTestCase { public void testMovePkJoinColumn() throws Exception { ICompilationUnit cu = this.createTestSecondaryTablesWithPkJoinColumns(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - SecondaryTableAnnotation table = (SecondaryTableAnnotation) typeResource.supportingAnnotations(JPA.SECONDARY_TABLE, JPA.SECONDARY_TABLES).next(); + SecondaryTableAnnotation table = (SecondaryTableAnnotation) typeResource.annotations(JPA.SECONDARY_TABLE, JPA.SECONDARY_TABLES).next(); PrimaryKeyJoinColumnAnnotation joinColumn = table.pkJoinColumnAt(0); joinColumn.setReferencedColumnName("REF_NAME"); joinColumn.setColumnDefinition("COLUMN_DEF"); @@ -473,7 +473,7 @@ public class SecondaryTablesTests extends JavaResourceModelTestCase { public void testMovePkJoinColumn2() throws Exception { ICompilationUnit cu = this.createTestSecondaryTablesWithPkJoinColumns(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - SecondaryTableAnnotation table = (SecondaryTableAnnotation) typeResource.supportingAnnotations(JPA.SECONDARY_TABLE, JPA.SECONDARY_TABLES).next(); + SecondaryTableAnnotation table = (SecondaryTableAnnotation) typeResource.annotations(JPA.SECONDARY_TABLE, JPA.SECONDARY_TABLES).next(); PrimaryKeyJoinColumnAnnotation joinColumn = table.pkJoinColumnAt(0); @@ -486,7 +486,7 @@ public class SecondaryTablesTests extends JavaResourceModelTestCase { public void testSetPkJoinColumnName() throws Exception { ICompilationUnit cu = this.createTestSecondaryTablesWithPkJoinColumns(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - SecondaryTableAnnotation table = (SecondaryTableAnnotation) typeResource.supportingAnnotations(JPA.SECONDARY_TABLE, JPA.SECONDARY_TABLES).next(); + SecondaryTableAnnotation table = (SecondaryTableAnnotation) typeResource.annotations(JPA.SECONDARY_TABLE, JPA.SECONDARY_TABLES).next(); assertEquals(3, table.pkJoinColumnsSize()); diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/SequenceGeneratorTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/SequenceGeneratorTests.java index bf2c26bbb0..d660df6c06 100644 --- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/SequenceGeneratorTests.java +++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/SequenceGeneratorTests.java @@ -103,7 +103,7 @@ public class SequenceGeneratorTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - SequenceGeneratorAnnotation sequenceGenerator = (SequenceGeneratorAnnotation) attributeResource.getSupportingAnnotation(JPA.SEQUENCE_GENERATOR); + SequenceGeneratorAnnotation sequenceGenerator = (SequenceGeneratorAnnotation) attributeResource.getAnnotation(JPA.SEQUENCE_GENERATOR); assertNotNull(sequenceGenerator); } @@ -111,7 +111,7 @@ public class SequenceGeneratorTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestSequenceGeneratorOnType(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - SequenceGeneratorAnnotation sequenceGenerator = (SequenceGeneratorAnnotation) typeResource.getSupportingAnnotation(JPA.SEQUENCE_GENERATOR); + SequenceGeneratorAnnotation sequenceGenerator = (SequenceGeneratorAnnotation) typeResource.getAnnotation(JPA.SEQUENCE_GENERATOR); assertNotNull(sequenceGenerator); } @@ -120,7 +120,7 @@ public class SequenceGeneratorTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - SequenceGeneratorAnnotation sequenceGenerator = (SequenceGeneratorAnnotation) attributeResource.getSupportingAnnotation(JPA.SEQUENCE_GENERATOR); + SequenceGeneratorAnnotation sequenceGenerator = (SequenceGeneratorAnnotation) attributeResource.getAnnotation(JPA.SEQUENCE_GENERATOR); assertEquals(GENERATOR_NAME, sequenceGenerator.getName()); } @@ -129,7 +129,7 @@ public class SequenceGeneratorTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - SequenceGeneratorAnnotation sequenceGenerator = (SequenceGeneratorAnnotation) attributeResource.getSupportingAnnotation(JPA.SEQUENCE_GENERATOR); + SequenceGeneratorAnnotation sequenceGenerator = (SequenceGeneratorAnnotation) attributeResource.getAnnotation(JPA.SEQUENCE_GENERATOR); assertEquals(GENERATOR_NAME, sequenceGenerator.getName()); sequenceGenerator.setName("foo"); @@ -148,7 +148,7 @@ public class SequenceGeneratorTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - SequenceGeneratorAnnotation sequenceGenerator = (SequenceGeneratorAnnotation) attributeResource.getSupportingAnnotation(JPA.SEQUENCE_GENERATOR); + SequenceGeneratorAnnotation sequenceGenerator = (SequenceGeneratorAnnotation) attributeResource.getAnnotation(JPA.SEQUENCE_GENERATOR); assertEquals(GENERATOR_SEQUENCE_NAME, sequenceGenerator.getSequenceName()); } @@ -157,7 +157,7 @@ public class SequenceGeneratorTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - SequenceGeneratorAnnotation sequenceGenerator = (SequenceGeneratorAnnotation) attributeResource.getSupportingAnnotation(JPA.SEQUENCE_GENERATOR); + SequenceGeneratorAnnotation sequenceGenerator = (SequenceGeneratorAnnotation) attributeResource.getAnnotation(JPA.SEQUENCE_GENERATOR); assertEquals(GENERATOR_SEQUENCE_NAME, sequenceGenerator.getSequenceName()); sequenceGenerator.setSequenceName("foo"); @@ -176,7 +176,7 @@ public class SequenceGeneratorTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - SequenceGeneratorAnnotation sequenceGenerator = (SequenceGeneratorAnnotation) attributeResource.getSupportingAnnotation(JPA.SEQUENCE_GENERATOR); + SequenceGeneratorAnnotation sequenceGenerator = (SequenceGeneratorAnnotation) attributeResource.getAnnotation(JPA.SEQUENCE_GENERATOR); assertEquals(GENERATOR_ALLOCATION_SIZE, sequenceGenerator.getAllocationSize()); } @@ -185,7 +185,7 @@ public class SequenceGeneratorTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - SequenceGeneratorAnnotation sequenceGenerator = (SequenceGeneratorAnnotation) attributeResource.getSupportingAnnotation(JPA.SEQUENCE_GENERATOR); + SequenceGeneratorAnnotation sequenceGenerator = (SequenceGeneratorAnnotation) attributeResource.getAnnotation(JPA.SEQUENCE_GENERATOR); assertEquals(GENERATOR_ALLOCATION_SIZE, sequenceGenerator.getAllocationSize()); sequenceGenerator.setAllocationSize(Integer.valueOf(500)); @@ -206,7 +206,7 @@ public class SequenceGeneratorTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - SequenceGeneratorAnnotation sequenceGenerator = (SequenceGeneratorAnnotation) attributeResource.getSupportingAnnotation(JPA.SEQUENCE_GENERATOR); + SequenceGeneratorAnnotation sequenceGenerator = (SequenceGeneratorAnnotation) attributeResource.getAnnotation(JPA.SEQUENCE_GENERATOR); assertEquals(GENERATOR_INITIAL_VALUE, sequenceGenerator.getInitialValue()); } @@ -215,7 +215,7 @@ public class SequenceGeneratorTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - SequenceGeneratorAnnotation sequenceGenerator = (SequenceGeneratorAnnotation) attributeResource.getSupportingAnnotation(JPA.SEQUENCE_GENERATOR); + SequenceGeneratorAnnotation sequenceGenerator = (SequenceGeneratorAnnotation) attributeResource.getAnnotation(JPA.SEQUENCE_GENERATOR); assertEquals(GENERATOR_INITIAL_VALUE, sequenceGenerator.getInitialValue()); sequenceGenerator.setInitialValue(Integer.valueOf(500)); diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/TableGeneratorTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/TableGeneratorTests.java index c4067dec1c..f5c5f04816 100644 --- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/TableGeneratorTests.java +++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/TableGeneratorTests.java @@ -139,7 +139,7 @@ public class TableGeneratorTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - TableGeneratorAnnotation tableGenerator = (TableGeneratorAnnotation) attributeResource.getSupportingAnnotation(JPA.TABLE_GENERATOR); + TableGeneratorAnnotation tableGenerator = (TableGeneratorAnnotation) attributeResource.getAnnotation(JPA.TABLE_GENERATOR); assertNotNull(tableGenerator); } @@ -147,7 +147,7 @@ public class TableGeneratorTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestTableGeneratorOnType(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - TableGeneratorAnnotation tableGenerator = (TableGeneratorAnnotation) typeResource.getSupportingAnnotation(JPA.TABLE_GENERATOR); + TableGeneratorAnnotation tableGenerator = (TableGeneratorAnnotation) typeResource.getAnnotation(JPA.TABLE_GENERATOR); assertNotNull(tableGenerator); } @@ -156,7 +156,7 @@ public class TableGeneratorTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - TableGeneratorAnnotation tableGenerator = (TableGeneratorAnnotation) attributeResource.getSupportingAnnotation(JPA.TABLE_GENERATOR); + TableGeneratorAnnotation tableGenerator = (TableGeneratorAnnotation) attributeResource.getAnnotation(JPA.TABLE_GENERATOR); assertEquals(GENERATOR_NAME, tableGenerator.getName()); } @@ -165,7 +165,7 @@ public class TableGeneratorTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - TableGeneratorAnnotation tableGenerator = (TableGeneratorAnnotation) attributeResource.getSupportingAnnotation(JPA.TABLE_GENERATOR); + TableGeneratorAnnotation tableGenerator = (TableGeneratorAnnotation) attributeResource.getAnnotation(JPA.TABLE_GENERATOR); assertEquals(GENERATOR_NAME, tableGenerator.getName()); tableGenerator.setName("foo"); @@ -184,7 +184,7 @@ public class TableGeneratorTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - TableGeneratorAnnotation tableGenerator = (TableGeneratorAnnotation) attributeResource.getSupportingAnnotation(JPA.TABLE_GENERATOR); + TableGeneratorAnnotation tableGenerator = (TableGeneratorAnnotation) attributeResource.getAnnotation(JPA.TABLE_GENERATOR); assertEquals(GENERATOR_TABLE, tableGenerator.getTable()); } @@ -193,7 +193,7 @@ public class TableGeneratorTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - TableGeneratorAnnotation tableGenerator = (TableGeneratorAnnotation) attributeResource.getSupportingAnnotation(JPA.TABLE_GENERATOR); + TableGeneratorAnnotation tableGenerator = (TableGeneratorAnnotation) attributeResource.getAnnotation(JPA.TABLE_GENERATOR); assertEquals(GENERATOR_TABLE, tableGenerator.getTable()); tableGenerator.setTable("foo"); @@ -212,7 +212,7 @@ public class TableGeneratorTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - TableGeneratorAnnotation tableGenerator = (TableGeneratorAnnotation) attributeResource.getSupportingAnnotation(JPA.TABLE_GENERATOR); + TableGeneratorAnnotation tableGenerator = (TableGeneratorAnnotation) attributeResource.getAnnotation(JPA.TABLE_GENERATOR); assertEquals(GENERATOR_CATALOG, tableGenerator.getCatalog()); } @@ -221,7 +221,7 @@ public class TableGeneratorTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - TableGeneratorAnnotation tableGenerator = (TableGeneratorAnnotation) attributeResource.getSupportingAnnotation(JPA.TABLE_GENERATOR); + TableGeneratorAnnotation tableGenerator = (TableGeneratorAnnotation) attributeResource.getAnnotation(JPA.TABLE_GENERATOR); assertEquals(GENERATOR_CATALOG, tableGenerator.getCatalog()); tableGenerator.setCatalog("foo"); @@ -240,7 +240,7 @@ public class TableGeneratorTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - TableGeneratorAnnotation tableGenerator = (TableGeneratorAnnotation) attributeResource.getSupportingAnnotation(JPA.TABLE_GENERATOR); + TableGeneratorAnnotation tableGenerator = (TableGeneratorAnnotation) attributeResource.getAnnotation(JPA.TABLE_GENERATOR); assertEquals(GENERATOR_SCHEMA, tableGenerator.getSchema()); } @@ -249,7 +249,7 @@ public class TableGeneratorTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - TableGeneratorAnnotation tableGenerator = (TableGeneratorAnnotation) attributeResource.getSupportingAnnotation(JPA.TABLE_GENERATOR); + TableGeneratorAnnotation tableGenerator = (TableGeneratorAnnotation) attributeResource.getAnnotation(JPA.TABLE_GENERATOR); assertEquals(GENERATOR_SCHEMA, tableGenerator.getSchema()); tableGenerator.setSchema("foo"); @@ -268,7 +268,7 @@ public class TableGeneratorTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - TableGeneratorAnnotation tableGenerator = (TableGeneratorAnnotation) attributeResource.getSupportingAnnotation(JPA.TABLE_GENERATOR); + TableGeneratorAnnotation tableGenerator = (TableGeneratorAnnotation) attributeResource.getAnnotation(JPA.TABLE_GENERATOR); assertEquals(GENERATOR_PK_COLUMN_NAME, tableGenerator.getPkColumnName()); } @@ -277,7 +277,7 @@ public class TableGeneratorTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - TableGeneratorAnnotation tableGenerator = (TableGeneratorAnnotation) attributeResource.getSupportingAnnotation(JPA.TABLE_GENERATOR); + TableGeneratorAnnotation tableGenerator = (TableGeneratorAnnotation) attributeResource.getAnnotation(JPA.TABLE_GENERATOR); assertEquals(GENERATOR_PK_COLUMN_NAME, tableGenerator.getPkColumnName()); tableGenerator.setPkColumnName("foo"); @@ -296,7 +296,7 @@ public class TableGeneratorTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - TableGeneratorAnnotation tableGenerator = (TableGeneratorAnnotation) attributeResource.getSupportingAnnotation(JPA.TABLE_GENERATOR); + TableGeneratorAnnotation tableGenerator = (TableGeneratorAnnotation) attributeResource.getAnnotation(JPA.TABLE_GENERATOR); assertEquals(GENERATOR_VALUE_COLUMN_NAME, tableGenerator.getValueColumnName()); } @@ -305,7 +305,7 @@ public class TableGeneratorTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - TableGeneratorAnnotation tableGenerator = (TableGeneratorAnnotation) attributeResource.getSupportingAnnotation(JPA.TABLE_GENERATOR); + TableGeneratorAnnotation tableGenerator = (TableGeneratorAnnotation) attributeResource.getAnnotation(JPA.TABLE_GENERATOR); assertEquals(GENERATOR_VALUE_COLUMN_NAME, tableGenerator.getValueColumnName()); tableGenerator.setValueColumnName("foo"); @@ -324,7 +324,7 @@ public class TableGeneratorTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - TableGeneratorAnnotation tableGenerator = (TableGeneratorAnnotation) attributeResource.getSupportingAnnotation(JPA.TABLE_GENERATOR); + TableGeneratorAnnotation tableGenerator = (TableGeneratorAnnotation) attributeResource.getAnnotation(JPA.TABLE_GENERATOR); assertEquals(GENERATOR_PK_COLUMN_VALUE, tableGenerator.getPkColumnValue()); } @@ -333,7 +333,7 @@ public class TableGeneratorTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - TableGeneratorAnnotation tableGenerator = (TableGeneratorAnnotation) attributeResource.getSupportingAnnotation(JPA.TABLE_GENERATOR); + TableGeneratorAnnotation tableGenerator = (TableGeneratorAnnotation) attributeResource.getAnnotation(JPA.TABLE_GENERATOR); assertEquals(GENERATOR_PK_COLUMN_VALUE, tableGenerator.getPkColumnValue()); tableGenerator.setPkColumnValue("foo"); @@ -352,7 +352,7 @@ public class TableGeneratorTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - TableGeneratorAnnotation tableGenerator = (TableGeneratorAnnotation) attributeResource.getSupportingAnnotation(JPA.TABLE_GENERATOR); + TableGeneratorAnnotation tableGenerator = (TableGeneratorAnnotation) attributeResource.getAnnotation(JPA.TABLE_GENERATOR); assertEquals(GENERATOR_ALLOCATION_SIZE, tableGenerator.getAllocationSize()); } @@ -361,7 +361,7 @@ public class TableGeneratorTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - TableGeneratorAnnotation tableGenerator = (TableGeneratorAnnotation) attributeResource.getSupportingAnnotation(JPA.TABLE_GENERATOR); + TableGeneratorAnnotation tableGenerator = (TableGeneratorAnnotation) attributeResource.getAnnotation(JPA.TABLE_GENERATOR); assertEquals(GENERATOR_ALLOCATION_SIZE, tableGenerator.getAllocationSize()); tableGenerator.setAllocationSize(Integer.valueOf(500)); @@ -382,7 +382,7 @@ public class TableGeneratorTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - TableGeneratorAnnotation tableGenerator = (TableGeneratorAnnotation) attributeResource.getSupportingAnnotation(JPA.TABLE_GENERATOR); + TableGeneratorAnnotation tableGenerator = (TableGeneratorAnnotation) attributeResource.getAnnotation(JPA.TABLE_GENERATOR); assertEquals(GENERATOR_INITIAL_VALUE, tableGenerator.getInitialValue()); } @@ -391,7 +391,7 @@ public class TableGeneratorTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - TableGeneratorAnnotation tableGenerator = (TableGeneratorAnnotation) attributeResource.getSupportingAnnotation(JPA.TABLE_GENERATOR); + TableGeneratorAnnotation tableGenerator = (TableGeneratorAnnotation) attributeResource.getAnnotation(JPA.TABLE_GENERATOR); assertEquals(GENERATOR_INITIAL_VALUE, tableGenerator.getInitialValue()); tableGenerator.setInitialValue(Integer.valueOf(500)); @@ -412,7 +412,7 @@ public class TableGeneratorTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - TableGeneratorAnnotation tableGenerator = (TableGeneratorAnnotation) attributeResource.getSupportingAnnotation(JPA.TABLE_GENERATOR); + TableGeneratorAnnotation tableGenerator = (TableGeneratorAnnotation) attributeResource.getAnnotation(JPA.TABLE_GENERATOR); assertEquals(0, tableGenerator.uniqueConstraintsSize()); } @@ -422,7 +422,7 @@ public class TableGeneratorTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - TableGeneratorAnnotation tableGenerator = (TableGeneratorAnnotation) attributeResource.getSupportingAnnotation(JPA.TABLE_GENERATOR); + TableGeneratorAnnotation tableGenerator = (TableGeneratorAnnotation) attributeResource.getAnnotation(JPA.TABLE_GENERATOR); tableGenerator.addUniqueConstraint(0); tableGenerator.addUniqueConstraint(1); @@ -435,7 +435,7 @@ public class TableGeneratorTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - TableGeneratorAnnotation tableGenerator = (TableGeneratorAnnotation) attributeResource.getSupportingAnnotation(JPA.TABLE_GENERATOR); + TableGeneratorAnnotation tableGenerator = (TableGeneratorAnnotation) attributeResource.getAnnotation(JPA.TABLE_GENERATOR); assertEquals(3, tableGenerator.uniqueConstraintsSize()); } @@ -445,7 +445,7 @@ public class TableGeneratorTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - TableGeneratorAnnotation tableGenerator = (TableGeneratorAnnotation) attributeResource.getSupportingAnnotation(JPA.TABLE_GENERATOR); + TableGeneratorAnnotation tableGenerator = (TableGeneratorAnnotation) attributeResource.getAnnotation(JPA.TABLE_GENERATOR); tableGenerator.addUniqueConstraint(0).addColumnName("FOO"); tableGenerator.addUniqueConstraint(1); @@ -464,7 +464,7 @@ public class TableGeneratorTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - TableGeneratorAnnotation tableGenerator = (TableGeneratorAnnotation) attributeResource.getSupportingAnnotation(JPA.TABLE_GENERATOR); + TableGeneratorAnnotation tableGenerator = (TableGeneratorAnnotation) attributeResource.getAnnotation(JPA.TABLE_GENERATOR); tableGenerator.removeUniqueConstraint(1); assertSourceContains("@TableGenerator(uniqueConstraints = {@UniqueConstraint(columnNames = {\"BAR\"}), @UniqueConstraint(columnNames = {\"BAZ\"})})", cu); @@ -481,7 +481,7 @@ public class TableGeneratorTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - TableGeneratorAnnotation tableGenerator = (TableGeneratorAnnotation) attributeResource.getSupportingAnnotation(JPA.TABLE_GENERATOR); + TableGeneratorAnnotation tableGenerator = (TableGeneratorAnnotation) attributeResource.getAnnotation(JPA.TABLE_GENERATOR); tableGenerator.moveUniqueConstraint(2, 0); assertSourceContains("@TableGenerator(uniqueConstraints = {@UniqueConstraint(columnNames = {\"FOO\"}), @UniqueConstraint(columnNames = {\"BAZ\"}), @UniqueConstraint(columnNames = {\"BAR\"})})", cu); @@ -492,7 +492,7 @@ public class TableGeneratorTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - TableGeneratorAnnotation tableGenerator = (TableGeneratorAnnotation) attributeResource.getSupportingAnnotation(JPA.TABLE_GENERATOR); + TableGeneratorAnnotation tableGenerator = (TableGeneratorAnnotation) attributeResource.getAnnotation(JPA.TABLE_GENERATOR); tableGenerator.moveUniqueConstraint(0, 2); assertSourceContains("@TableGenerator(uniqueConstraints = {@UniqueConstraint(columnNames = {\"BAZ\"}), @UniqueConstraint(columnNames = {\"BAR\"}), @UniqueConstraint(columnNames = {\"FOO\"})})", cu); diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/TableTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/TableTests.java index a2cf4d9c83..2fce6fb645 100644 --- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/TableTests.java +++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/TableTests.java @@ -97,7 +97,7 @@ public class TableTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestTableWithName(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - TableAnnotation table = (TableAnnotation) typeResource.getSupportingAnnotation(JPA.TABLE); + TableAnnotation table = (TableAnnotation) typeResource.getAnnotation(JPA.TABLE); assertNotNull(table); assertEquals(TABLE_NAME, table.getName()); } @@ -106,7 +106,7 @@ public class TableTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestTable(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - TableAnnotation table = (TableAnnotation) typeResource.getSupportingAnnotation(JPA.TABLE); + TableAnnotation table = (TableAnnotation) typeResource.getAnnotation(JPA.TABLE); assertNotNull(table); assertNull(table.getName()); assertNull(table.getCatalog()); @@ -117,7 +117,7 @@ public class TableTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestTable(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - TableAnnotation table = (TableAnnotation) typeResource.getSupportingAnnotation(JPA.TABLE); + TableAnnotation table = (TableAnnotation) typeResource.getAnnotation(JPA.TABLE); assertNotNull(table); assertNull(table.getName()); @@ -131,7 +131,7 @@ public class TableTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestTableWithName(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - TableAnnotation table = (TableAnnotation) typeResource.getSupportingAnnotation(JPA.TABLE); + TableAnnotation table = (TableAnnotation) typeResource.getAnnotation(JPA.TABLE); assertEquals(TABLE_NAME, table.getName()); table.setName(null); @@ -144,7 +144,7 @@ public class TableTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestTableWithCatalog(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - TableAnnotation table = (TableAnnotation) typeResource.getSupportingAnnotation(JPA.TABLE); + TableAnnotation table = (TableAnnotation) typeResource.getAnnotation(JPA.TABLE); assertNotNull(table); assertEquals(CATALOG_NAME, table.getCatalog()); } @@ -153,7 +153,7 @@ public class TableTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestTable(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - TableAnnotation table = (TableAnnotation) typeResource.getSupportingAnnotation(JPA.TABLE); + TableAnnotation table = (TableAnnotation) typeResource.getAnnotation(JPA.TABLE); assertNotNull(table); assertNull(table.getCatalog()); @@ -167,7 +167,7 @@ public class TableTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestTableWithCatalog(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - TableAnnotation table = (TableAnnotation) typeResource.getSupportingAnnotation(JPA.TABLE); + TableAnnotation table = (TableAnnotation) typeResource.getAnnotation(JPA.TABLE); assertEquals(CATALOG_NAME, table.getCatalog()); table.setCatalog(null); @@ -180,7 +180,7 @@ public class TableTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestTableWithSchema(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - TableAnnotation table = (TableAnnotation) typeResource.getSupportingAnnotation(JPA.TABLE); + TableAnnotation table = (TableAnnotation) typeResource.getAnnotation(JPA.TABLE); assertNotNull(table); assertEquals(SCHEMA_NAME, table.getSchema()); } @@ -189,7 +189,7 @@ public class TableTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestTable(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - TableAnnotation table = (TableAnnotation) typeResource.getSupportingAnnotation(JPA.TABLE); + TableAnnotation table = (TableAnnotation) typeResource.getAnnotation(JPA.TABLE); assertNotNull(table); assertNull(table.getSchema()); @@ -203,7 +203,7 @@ public class TableTests extends JavaResourceModelTestCase { ICompilationUnit cu = this.createTestTableWithSchema(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - TableAnnotation table = (TableAnnotation) typeResource.getSupportingAnnotation(JPA.TABLE); + TableAnnotation table = (TableAnnotation) typeResource.getAnnotation(JPA.TABLE); assertEquals(SCHEMA_NAME, table.getSchema()); table.setSchema(null); @@ -215,7 +215,7 @@ public class TableTests extends JavaResourceModelTestCase { public void testUniqueConstraints() throws Exception { ICompilationUnit cu = this.createTestTable(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - TableAnnotation table = (TableAnnotation) typeResource.getSupportingAnnotation(JPA.TABLE); + TableAnnotation table = (TableAnnotation) typeResource.getAnnotation(JPA.TABLE); assertEquals(0, table.uniqueConstraintsSize()); } @@ -223,7 +223,7 @@ public class TableTests extends JavaResourceModelTestCase { public void testUniqueConstraints2() throws Exception { ICompilationUnit cu = this.createTestTable(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - TableAnnotation table = (TableAnnotation) typeResource.getSupportingAnnotation(JPA.TABLE); + TableAnnotation table = (TableAnnotation) typeResource.getAnnotation(JPA.TABLE); table.addUniqueConstraint(0); table.addUniqueConstraint(1); @@ -234,7 +234,7 @@ public class TableTests extends JavaResourceModelTestCase { public void testUniqueConstraints3() throws Exception { ICompilationUnit cu = this.createTestTableWithUniqueConstraints(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - TableAnnotation table = (TableAnnotation) typeResource.getSupportingAnnotation(JPA.TABLE); + TableAnnotation table = (TableAnnotation) typeResource.getAnnotation(JPA.TABLE); assertEquals(3, table.uniqueConstraintsSize()); } @@ -242,7 +242,7 @@ public class TableTests extends JavaResourceModelTestCase { public void testAddUniqueConstraint() throws Exception { ICompilationUnit cu = this.createTestTable(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - TableAnnotation table = (TableAnnotation) typeResource.getSupportingAnnotation(JPA.TABLE); + TableAnnotation table = (TableAnnotation) typeResource.getAnnotation(JPA.TABLE); table.addUniqueConstraint(0).addColumnName("FOO"); table.addUniqueConstraint(1); @@ -258,7 +258,7 @@ public class TableTests extends JavaResourceModelTestCase { public void testAddUniqueConstraint2() throws Exception { ICompilationUnit cu = this.createTestTable(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - TableAnnotation table = (TableAnnotation) typeResource.getSupportingAnnotation(JPA.TABLE); + TableAnnotation table = (TableAnnotation) typeResource.getAnnotation(JPA.TABLE); table.addUniqueConstraint(0).addColumnName("FOO"); table.addUniqueConstraint(0); @@ -275,7 +275,7 @@ public class TableTests extends JavaResourceModelTestCase { public void testRemoveUniqueConstraint() throws Exception { ICompilationUnit cu = this.createTestTableWithUniqueConstraints(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - TableAnnotation table = (TableAnnotation) typeResource.getSupportingAnnotation(JPA.TABLE); + TableAnnotation table = (TableAnnotation) typeResource.getAnnotation(JPA.TABLE); table.removeUniqueConstraint(1); assertSourceContains("@Table(uniqueConstraints = {@UniqueConstraint(columnNames = {\"BAR\"}), @UniqueConstraint(columnNames = {\"BAZ\"})})", cu); @@ -290,7 +290,7 @@ public class TableTests extends JavaResourceModelTestCase { public void testRemoveUniqueConstraint2() throws Exception { ICompilationUnit cu = this.createTestTable(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - TableAnnotation table = (TableAnnotation) typeResource.getSupportingAnnotation(JPA.TABLE); + TableAnnotation table = (TableAnnotation) typeResource.getAnnotation(JPA.TABLE); table.addUniqueConstraint(0).addColumnName("FOO"); table.addUniqueConstraint(1).addColumnName("BAR"); table.addUniqueConstraint(2).addColumnName("BAZ"); @@ -309,7 +309,7 @@ public class TableTests extends JavaResourceModelTestCase { public void testRemoveUniqueConstraint3() throws Exception { ICompilationUnit cu = this.createTestTable(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - TableAnnotation table = (TableAnnotation) typeResource.getSupportingAnnotation(JPA.TABLE); + TableAnnotation table = (TableAnnotation) typeResource.getAnnotation(JPA.TABLE); table.addUniqueConstraint(0).addColumnName("FOO"); table.addUniqueConstraint(1).addColumnName("BAR"); table.addUniqueConstraint(2).addColumnName("BAZ"); @@ -328,7 +328,7 @@ public class TableTests extends JavaResourceModelTestCase { public void testMoveUniqueConstraint() throws Exception { ICompilationUnit cu = this.createTestTableWithUniqueConstraints(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - TableAnnotation table = (TableAnnotation) typeResource.getSupportingAnnotation(JPA.TABLE); + TableAnnotation table = (TableAnnotation) typeResource.getAnnotation(JPA.TABLE); table.moveUniqueConstraint(2, 0); assertSourceContains("@Table(uniqueConstraints = {@UniqueConstraint(columnNames = {\"FOO\"}), @UniqueConstraint(columnNames = {\"BAZ\"}), @UniqueConstraint(columnNames = {\"BAR\"})})", cu); @@ -337,7 +337,7 @@ public class TableTests extends JavaResourceModelTestCase { public void testMoveUniqueConstraint2() throws Exception { ICompilationUnit cu = this.createTestTableWithUniqueConstraints(); JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); - TableAnnotation table = (TableAnnotation) typeResource.getSupportingAnnotation(JPA.TABLE); + TableAnnotation table = (TableAnnotation) typeResource.getAnnotation(JPA.TABLE); table.moveUniqueConstraint(0, 2); assertSourceContains("@Table(uniqueConstraints = {@UniqueConstraint(columnNames = {\"BAZ\"}), @UniqueConstraint(columnNames = {\"BAR\"}), @UniqueConstraint(columnNames = {\"FOO\"})})", cu); diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/TemporalTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/TemporalTests.java index 0769884ced..a75771b225 100644 --- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/TemporalTests.java +++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/TemporalTests.java @@ -56,7 +56,7 @@ public class TemporalTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - TemporalAnnotation temporal = (TemporalAnnotation) attributeResource.getSupportingAnnotation(JPA.TEMPORAL); + TemporalAnnotation temporal = (TemporalAnnotation) attributeResource.getAnnotation(JPA.TEMPORAL); assertNotNull(temporal); } @@ -65,7 +65,7 @@ public class TemporalTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - TemporalAnnotation temporal = (TemporalAnnotation) attributeResource.getSupportingAnnotation(JPA.TEMPORAL); + TemporalAnnotation temporal = (TemporalAnnotation) attributeResource.getAnnotation(JPA.TEMPORAL); assertEquals(TemporalType.DATE, temporal.getValue()); } @@ -74,7 +74,7 @@ public class TemporalTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - TemporalAnnotation temporal = (TemporalAnnotation) attributeResource.getSupportingAnnotation(JPA.TEMPORAL); + TemporalAnnotation temporal = (TemporalAnnotation) attributeResource.getAnnotation(JPA.TEMPORAL); temporal.setValue(TemporalType.TIME); diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/TransientTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/TransientTests.java index e268318116..d12522fd48 100644 --- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/TransientTests.java +++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/TransientTests.java @@ -43,7 +43,7 @@ public class TransientTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - JavaResourceNode mappingAnnotation = attributeResource.getMappingAnnotation(); + JavaResourceNode mappingAnnotation = attributeResource.getAnnotation(TransientAnnotation.ANNOTATION_NAME); assertTrue(mappingAnnotation instanceof TransientAnnotation); } diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/VersionTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/VersionTests.java index 5abf709599..82e5288290 100644 --- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/VersionTests.java +++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/VersionTests.java @@ -43,7 +43,7 @@ public class VersionTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - JavaResourceNode mappingAnnotation = attributeResource.getMappingAnnotation(); + JavaResourceNode mappingAnnotation = attributeResource.getAnnotation(VersionAnnotation.ANNOTATION_NAME); assertTrue(mappingAnnotation instanceof VersionAnnotation); } } |