diff options
| author | kmoore | 2008-03-27 00:17:26 +0000 |
|---|---|---|
| committer | kmoore | 2008-03-27 00:17:26 +0000 |
| commit | c3c3d564da96dee28a24c0a62b400bfed6458d74 (patch) | |
| tree | bc129ece7fa93403bf6dcbc52ad429c45faa402c /jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core | |
| parent | 7baaacb258774c19ccee1eb3ba47cd49926903e5 (diff) | |
| download | webtools.dali-c3c3d564da96dee28a24c0a62b400bfed6458d74.tar.gz webtools.dali-c3c3d564da96dee28a24c0a62b400bfed6458d74.tar.xz webtools.dali-c3c3d564da96dee28a24c0a62b400bfed6458d74.zip | |
renamed java resource model interfaces to include Annotation for consistency
Diffstat (limited to 'jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core')
36 files changed, 875 insertions, 875 deletions
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 eb5bb4ec47..b0c5eb0ff5 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 @@ -29,21 +29,21 @@ import org.eclipse.jpt.core.context.PersistentAttribute; import org.eclipse.jpt.core.context.TemporalType; import org.eclipse.jpt.core.context.TransientMapping; import org.eclipse.jpt.core.context.VersionMapping; -import org.eclipse.jpt.core.resource.java.Basic; +import org.eclipse.jpt.core.resource.java.BasicAnnotation; import org.eclipse.jpt.core.resource.java.ColumnAnnotation; -import org.eclipse.jpt.core.resource.java.Embedded; -import org.eclipse.jpt.core.resource.java.EmbeddedId; -import org.eclipse.jpt.core.resource.java.Enumerated; -import org.eclipse.jpt.core.resource.java.Id; +import org.eclipse.jpt.core.resource.java.EmbeddedAnnotation; +import org.eclipse.jpt.core.resource.java.EmbeddedIdAnnotation; +import org.eclipse.jpt.core.resource.java.EnumeratedAnnotation; +import org.eclipse.jpt.core.resource.java.IdAnnotation; import org.eclipse.jpt.core.resource.java.JPA; import org.eclipse.jpt.core.resource.java.JavaResourcePersistentAttribute; import org.eclipse.jpt.core.resource.java.JavaResourcePersistentType; -import org.eclipse.jpt.core.resource.java.Lob; -import org.eclipse.jpt.core.resource.java.ManyToOne; -import org.eclipse.jpt.core.resource.java.OneToOne; -import org.eclipse.jpt.core.resource.java.Temporal; -import org.eclipse.jpt.core.resource.java.Transient; -import org.eclipse.jpt.core.resource.java.Version; +import org.eclipse.jpt.core.resource.java.LobAnnotation; +import org.eclipse.jpt.core.resource.java.ManyToOneAnnotation; +import org.eclipse.jpt.core.resource.java.OneToOneAnnotation; +import org.eclipse.jpt.core.resource.java.TemporalAnnotation; +import org.eclipse.jpt.core.resource.java.TransientAnnotation; +import org.eclipse.jpt.core.resource.java.VersionAnnotation; import org.eclipse.jpt.core.resource.persistence.PersistenceFactory; import org.eclipse.jpt.core.resource.persistence.XmlMappingFileRef; import org.eclipse.jpt.core.tests.internal.context.ContextModelTestCase; @@ -237,7 +237,7 @@ public class JavaBasicMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = jpaProject().getJavaPersistentTypeResource(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.attributes().next(); - Basic basic = (Basic) attributeResource.getMappingAnnotation(JPA.BASIC); + BasicAnnotation basic = (BasicAnnotation) attributeResource.getMappingAnnotation(JPA.BASIC); basic.setFetch(org.eclipse.jpt.core.resource.java.FetchType.LAZY); assertEquals(FetchType.LAZY, basicMapping.getSpecifiedFetch()); @@ -265,7 +265,7 @@ public class JavaBasicMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = jpaProject().getJavaPersistentTypeResource(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.attributes().next(); - Basic basic = (Basic) attributeResource.getMappingAnnotation(JPA.BASIC); + BasicAnnotation basic = (BasicAnnotation) attributeResource.getMappingAnnotation(JPA.BASIC); assertEquals(org.eclipse.jpt.core.resource.java.FetchType.LAZY, basic.getFetch()); @@ -288,7 +288,7 @@ public class JavaBasicMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = jpaProject().getJavaPersistentTypeResource(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.properties().next(); - Basic basic = (Basic) attributeResource.getMappingAnnotation(JPA.BASIC); + BasicAnnotation basic = (BasicAnnotation) attributeResource.getMappingAnnotation(JPA.BASIC); assertEquals(org.eclipse.jpt.core.resource.java.FetchType.LAZY, basic.getFetch()); @@ -335,9 +335,9 @@ public class JavaBasicMappingTests extends ContextModelTestCase assertNotNull(attributeResource.getAnnotation(ColumnAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getAnnotation(Temporal.ANNOTATION_NAME)); - assertNotNull(attributeResource.getAnnotation(Lob.ANNOTATION_NAME)); - assertNotNull(attributeResource.getAnnotation(Enumerated.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 { @@ -365,11 +365,11 @@ public class JavaBasicMappingTests extends ContextModelTestCase JavaResourcePersistentAttribute attributeResource = typeResource.attributes().next(); assertNull(((BasicMapping) persistentAttribute.getMapping()).getSpecifiedFetch()); assertNull(((BasicMapping) persistentAttribute.getMapping()).getSpecifiedOptional()); - assertNull(attributeResource.getMappingAnnotation(Basic.ANNOTATION_NAME)); + assertNull(attributeResource.getMappingAnnotation(BasicAnnotation.ANNOTATION_NAME)); assertNotNull(attributeResource.getAnnotation(ColumnAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getAnnotation(Temporal.ANNOTATION_NAME)); - assertNotNull(attributeResource.getAnnotation(Lob.ANNOTATION_NAME)); - assertNotNull(attributeResource.getAnnotation(Enumerated.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 { @@ -393,12 +393,12 @@ public class JavaBasicMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = jpaProject().getJavaPersistentTypeResource(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.attributes().next(); - assertNull(attributeResource.getMappingAnnotation(Basic.ANNOTATION_NAME)); - assertNotNull(attributeResource.getMappingAnnotation(Id.ANNOTATION_NAME)); + assertNull(attributeResource.getMappingAnnotation(BasicAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getMappingAnnotation(IdAnnotation.ANNOTATION_NAME)); assertNotNull(attributeResource.getAnnotation(ColumnAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getAnnotation(Temporal.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(Lob.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(Enumerated.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 { @@ -420,12 +420,12 @@ public class JavaBasicMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = jpaProject().getJavaPersistentTypeResource(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.attributes().next(); - assertNull(attributeResource.getMappingAnnotation(Basic.ANNOTATION_NAME)); - assertNotNull(attributeResource.getMappingAnnotation(Version.ANNOTATION_NAME)); + assertNull(attributeResource.getMappingAnnotation(BasicAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getMappingAnnotation(VersionAnnotation.ANNOTATION_NAME)); assertNotNull(attributeResource.getAnnotation(ColumnAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getAnnotation(Temporal.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(Lob.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(Enumerated.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 { @@ -446,12 +446,12 @@ public class JavaBasicMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = jpaProject().getJavaPersistentTypeResource(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.attributes().next(); - assertNull(attributeResource.getMappingAnnotation(Basic.ANNOTATION_NAME)); - assertNotNull(attributeResource.getMappingAnnotation(Embedded.ANNOTATION_NAME)); + assertNull(attributeResource.getMappingAnnotation(BasicAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getMappingAnnotation(EmbeddedAnnotation.ANNOTATION_NAME)); assertNull(attributeResource.getAnnotation(ColumnAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(Temporal.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(Lob.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(Enumerated.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 { @@ -472,12 +472,12 @@ public class JavaBasicMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = jpaProject().getJavaPersistentTypeResource(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.attributes().next(); - assertNull(attributeResource.getMappingAnnotation(Basic.ANNOTATION_NAME)); - assertNotNull(attributeResource.getMappingAnnotation(EmbeddedId.ANNOTATION_NAME)); + assertNull(attributeResource.getMappingAnnotation(BasicAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getMappingAnnotation(EmbeddedIdAnnotation.ANNOTATION_NAME)); assertNull(attributeResource.getAnnotation(ColumnAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(Temporal.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(Lob.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(Enumerated.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 { @@ -498,12 +498,12 @@ public class JavaBasicMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = jpaProject().getJavaPersistentTypeResource(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.attributes().next(); - assertNull(attributeResource.getMappingAnnotation(Basic.ANNOTATION_NAME)); - assertNotNull(attributeResource.getMappingAnnotation(Transient.ANNOTATION_NAME)); + assertNull(attributeResource.getMappingAnnotation(BasicAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getMappingAnnotation(TransientAnnotation.ANNOTATION_NAME)); assertNull(attributeResource.getAnnotation(ColumnAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(Temporal.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(Lob.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(Enumerated.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 { @@ -528,12 +528,12 @@ public class JavaBasicMappingTests extends ContextModelTestCase JavaResourcePersistentAttribute attributeResource = typeResource.attributes().next(); //TODO assertEquals(FetchType.EAGER, ((IOneToOneMapping) persistentAttribute.getMapping()).getSpecifiedFetch()); // assertEquals(Boolean.FALSE, ((IOneToOneMapping) persistentAttribute.getMapping()).getSpecifiedOptional()); - assertNotNull(attributeResource.getMappingAnnotation(OneToOne.ANNOTATION_NAME)); - assertNull(attributeResource.getMappingAnnotation(Basic.ANNOTATION_NAME)); + assertNotNull(attributeResource.getMappingAnnotation(OneToOneAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getMappingAnnotation(BasicAnnotation.ANNOTATION_NAME)); assertNull(attributeResource.getAnnotation(ColumnAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(Temporal.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(Lob.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(Enumerated.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 { @@ -558,11 +558,11 @@ public class JavaBasicMappingTests extends ContextModelTestCase JavaResourcePersistentAttribute attributeResource = typeResource.attributes().next(); //TODO assertEquals(FetchType.EAGER, ((IOneToManyMapping) persistentAttribute.getMapping()).getSpecifiedFetch()); // assertNotNull(attributeResource.mappingAnnotation(OneToMany.ANNOTATION_NAME)); - assertNull(attributeResource.getMappingAnnotation(Basic.ANNOTATION_NAME)); + assertNull(attributeResource.getMappingAnnotation(BasicAnnotation.ANNOTATION_NAME)); assertNull(attributeResource.getAnnotation(ColumnAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(Temporal.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(Lob.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(Enumerated.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(); @@ -586,12 +586,12 @@ public class JavaBasicMappingTests extends ContextModelTestCase JavaResourcePersistentAttribute attributeResource = typeResource.attributes().next(); //TODO assertEquals(FetchType.EAGER, ((IManyToOneMapping) persistentAttribute.getMapping()).getSpecifiedFetch()); // assertEquals(Boolean.FALSE, ((IManyToOneMapping) persistentAttribute.getMapping()).getSpecifiedOptional()); - assertNotNull(attributeResource.getMappingAnnotation(ManyToOne.ANNOTATION_NAME)); - assertNull(attributeResource.getMappingAnnotation(Basic.ANNOTATION_NAME)); + assertNotNull(attributeResource.getMappingAnnotation(ManyToOneAnnotation.ANNOTATION_NAME)); + assertNull(attributeResource.getMappingAnnotation(BasicAnnotation.ANNOTATION_NAME)); assertNull(attributeResource.getAnnotation(ColumnAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(Temporal.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(Lob.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(Enumerated.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 { @@ -616,11 +616,11 @@ public class JavaBasicMappingTests extends ContextModelTestCase JavaResourcePersistentAttribute attributeResource = typeResource.attributes().next(); //TODO assertEquals(FetchType.EAGER, ((IManyToManyMapping) persistentAttribute.getMapping()).getSpecifiedFetch()); // assertNotNull(attributeResource.mappingAnnotation(ManyToMany.ANNOTATION_NAME)); - assertNull(attributeResource.getMappingAnnotation(Basic.ANNOTATION_NAME)); + assertNull(attributeResource.getMappingAnnotation(BasicAnnotation.ANNOTATION_NAME)); assertNull(attributeResource.getAnnotation(ColumnAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(Temporal.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(Lob.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(Enumerated.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 { @@ -666,7 +666,7 @@ public class JavaBasicMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = jpaProject().getJavaPersistentTypeResource(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.attributes().next(); - Basic basic = (Basic) attributeResource.getMappingAnnotation(JPA.BASIC); + BasicAnnotation basic = (BasicAnnotation) attributeResource.getMappingAnnotation(JPA.BASIC); basic.setOptional(Boolean.FALSE); assertEquals(Boolean.FALSE, basicMapping.getSpecifiedOptional()); @@ -694,7 +694,7 @@ public class JavaBasicMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = jpaProject().getJavaPersistentTypeResource(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.attributes().next(); - Basic basic = (Basic) attributeResource.getMappingAnnotation(JPA.BASIC); + BasicAnnotation basic = (BasicAnnotation) attributeResource.getMappingAnnotation(JPA.BASIC); assertEquals(Boolean.FALSE, basic.getOptional()); @@ -715,7 +715,7 @@ public class JavaBasicMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = jpaProject().getJavaPersistentTypeResource(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.attributes().next(); - Basic basic = (Basic) attributeResource.getMappingAnnotation(JPA.BASIC); + BasicAnnotation basic = (BasicAnnotation) attributeResource.getMappingAnnotation(JPA.BASIC); assertEquals(Boolean.TRUE, basic.getOptional()); @@ -743,7 +743,7 @@ public class JavaBasicMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = jpaProject().getJavaPersistentTypeResource(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.attributes().next(); - Basic basic = (Basic) attributeResource.getMappingAnnotation(JPA.BASIC); + BasicAnnotation basic = (BasicAnnotation) attributeResource.getMappingAnnotation(JPA.BASIC); basic.setOptional(Boolean.FALSE); assertEquals(Boolean.FALSE, basicMapping.getSpecifiedOptional()); @@ -792,10 +792,10 @@ public class JavaBasicMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = jpaProject().getJavaPersistentTypeResource(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.attributes().next(); - assertNotNull(attributeResource.getAnnotation(Lob.ANNOTATION_NAME)); + assertNotNull(attributeResource.getAnnotation(LobAnnotation.ANNOTATION_NAME)); basicMapping.setLob(false); - assertNull(attributeResource.getAnnotation(Lob.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(LobAnnotation.ANNOTATION_NAME)); } public void testIsLobUpdatesFromResourceModelChange() throws Exception { @@ -809,11 +809,11 @@ public class JavaBasicMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = jpaProject().getJavaPersistentTypeResource(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.attributes().next(); - attributeResource.addAnnotation(Lob.ANNOTATION_NAME); + attributeResource.addAnnotation(LobAnnotation.ANNOTATION_NAME); assertTrue(basicMapping.isLob()); - attributeResource.removeAnnotation(Lob.ANNOTATION_NAME); + attributeResource.removeAnnotation(LobAnnotation.ANNOTATION_NAME); assertFalse(basicMapping.isLob()); } @@ -881,12 +881,12 @@ public class JavaBasicMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = jpaProject().getJavaPersistentTypeResource(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.attributes().next(); - Enumerated enumerated = (Enumerated) attributeResource.getAnnotation(Enumerated.ANNOTATION_NAME); + EnumeratedAnnotation enumerated = (EnumeratedAnnotation) attributeResource.getAnnotation(EnumeratedAnnotation.ANNOTATION_NAME); assertEquals(org.eclipse.jpt.core.resource.java.EnumType.STRING, enumerated.getValue()); basicMapping.setSpecifiedEnumerated(null); - assertNull(attributeResource.getAnnotation(Enumerated.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(EnumeratedAnnotation.ANNOTATION_NAME)); } public void testGetSpecifieEnumeratedUpdatesFromResourceModelChange() throws Exception { @@ -901,13 +901,13 @@ public class JavaBasicMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = jpaProject().getJavaPersistentTypeResource(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.attributes().next(); - Enumerated enumerated = (Enumerated) attributeResource.addAnnotation(Enumerated.ANNOTATION_NAME); + EnumeratedAnnotation enumerated = (EnumeratedAnnotation) attributeResource.addAnnotation(EnumeratedAnnotation.ANNOTATION_NAME); enumerated.setValue(org.eclipse.jpt.core.resource.java.EnumType.STRING); assertEquals(EnumType.STRING, basicMapping.getSpecifiedEnumerated()); enumerated.setValue(null); - assertNull(attributeResource.getAnnotation(Enumerated.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(EnumeratedAnnotation.ANNOTATION_NAME)); assertNull(basicMapping.getSpecifiedEnumerated()); assertFalse(basicMapping.isDefault()); assertSame(basicMapping, persistentAttribute.getSpecifiedMapping()); @@ -946,12 +946,12 @@ public class JavaBasicMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = jpaProject().getJavaPersistentTypeResource(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.attributes().next(); - Temporal temporal = (Temporal) attributeResource.getAnnotation(Temporal.ANNOTATION_NAME); + TemporalAnnotation temporal = (TemporalAnnotation) attributeResource.getAnnotation(TemporalAnnotation.ANNOTATION_NAME); assertEquals(org.eclipse.jpt.core.resource.java.TemporalType.TIME, temporal.getValue()); basicMapping.setTemporal(null); - assertNull(attributeResource.getAnnotation(Temporal.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(TemporalAnnotation.ANNOTATION_NAME)); } public void testGetTemporalUpdatesFromResourceModelChange() throws Exception { @@ -966,12 +966,12 @@ public class JavaBasicMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = jpaProject().getJavaPersistentTypeResource(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.attributes().next(); - Temporal temporal = (Temporal) attributeResource.addAnnotation(Temporal.ANNOTATION_NAME); + TemporalAnnotation temporal = (TemporalAnnotation) attributeResource.addAnnotation(TemporalAnnotation.ANNOTATION_NAME); temporal.setValue(org.eclipse.jpt.core.resource.java.TemporalType.DATE); assertEquals(TemporalType.DATE, basicMapping.getTemporal()); - attributeResource.removeAnnotation(Temporal.ANNOTATION_NAME); + attributeResource.removeAnnotation(TemporalAnnotation.ANNOTATION_NAME); assertNull(basicMapping.getTemporal()); assertFalse(basicMapping.isDefault()); 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 6c3ce34bcf..eb16d4896f 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 @@ -31,21 +31,21 @@ import org.eclipse.jpt.core.context.java.JavaAttributeOverride; import org.eclipse.jpt.core.context.persistence.ClassRef; import org.eclipse.jpt.core.internal.context.java.GenericJavaNullAttributeMapping; import org.eclipse.jpt.core.resource.java.AttributeOverrideAnnotation; -import org.eclipse.jpt.core.resource.java.AttributeOverrides; -import org.eclipse.jpt.core.resource.java.Basic; -import org.eclipse.jpt.core.resource.java.Embedded; -import org.eclipse.jpt.core.resource.java.EmbeddedId; -import org.eclipse.jpt.core.resource.java.Id; +import org.eclipse.jpt.core.resource.java.AttributeOverridesAnnotation; +import org.eclipse.jpt.core.resource.java.BasicAnnotation; +import org.eclipse.jpt.core.resource.java.EmbeddedAnnotation; +import org.eclipse.jpt.core.resource.java.EmbeddedIdAnnotation; +import org.eclipse.jpt.core.resource.java.IdAnnotation; import org.eclipse.jpt.core.resource.java.JPA; import org.eclipse.jpt.core.resource.java.JavaResourceNode; import org.eclipse.jpt.core.resource.java.JavaResourcePersistentAttribute; import org.eclipse.jpt.core.resource.java.JavaResourcePersistentType; -import org.eclipse.jpt.core.resource.java.ManyToMany; -import org.eclipse.jpt.core.resource.java.ManyToOne; -import org.eclipse.jpt.core.resource.java.OneToMany; -import org.eclipse.jpt.core.resource.java.OneToOne; -import org.eclipse.jpt.core.resource.java.Transient; -import org.eclipse.jpt.core.resource.java.Version; +import org.eclipse.jpt.core.resource.java.ManyToManyAnnotation; +import org.eclipse.jpt.core.resource.java.ManyToOneAnnotation; +import org.eclipse.jpt.core.resource.java.OneToManyAnnotation; +import org.eclipse.jpt.core.resource.java.OneToOneAnnotation; +import org.eclipse.jpt.core.resource.java.TransientAnnotation; +import org.eclipse.jpt.core.resource.java.VersionAnnotation; import org.eclipse.jpt.core.tests.internal.context.ContextModelTestCase; import org.eclipse.jpt.core.tests.internal.projects.TestJavaProject.SourceWriter; import org.eclipse.jpt.utility.internal.iterators.ArrayIterator; @@ -137,8 +137,8 @@ public class JavaEmbeddedIdMappingTests extends ContextModelTestCase assertTrue(persistentAttribute.getMapping() instanceof BasicMapping); assertFalse(persistentAttribute.getMapping().isDefault()); - assertNull(attributeResource.getMappingAnnotation(EmbeddedId.ANNOTATION_NAME)); - assertNotNull(attributeResource.getMappingAnnotation(Basic.ANNOTATION_NAME)); + assertNull(attributeResource.getMappingAnnotation(EmbeddedIdAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getMappingAnnotation(BasicAnnotation.ANNOTATION_NAME)); assertNull(attributeResource.getAnnotation(AttributeOverrideAnnotation.ANNOTATION_NAME)); } @@ -159,7 +159,7 @@ public class JavaEmbeddedIdMappingTests extends ContextModelTestCase assertTrue(((EmbeddedMapping) persistentAttribute.getMapping()).attributeOverrides().hasNext()); assertTrue(persistentAttribute.getMapping().isDefault()); - assertNull(attributeResource.getMappingAnnotation(EmbeddedId.ANNOTATION_NAME)); + assertNull(attributeResource.getMappingAnnotation(EmbeddedIdAnnotation.ANNOTATION_NAME)); assertNotNull(attributeResource.getAnnotation(AttributeOverrideAnnotation.ANNOTATION_NAME)); } @@ -196,8 +196,8 @@ public class JavaEmbeddedIdMappingTests extends ContextModelTestCase persistentAttribute.setSpecifiedMappingKey(MappingKeys.VERSION_ATTRIBUTE_MAPPING_KEY); assertTrue(persistentAttribute.getMapping() instanceof VersionMapping); - assertNull(attributeResource.getMappingAnnotation(EmbeddedId.ANNOTATION_NAME)); - assertNotNull(attributeResource.getMappingAnnotation(Version.ANNOTATION_NAME)); + assertNull(attributeResource.getMappingAnnotation(EmbeddedIdAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getMappingAnnotation(VersionAnnotation.ANNOTATION_NAME)); assertNull(attributeResource.getAnnotation(AttributeOverrideAnnotation.ANNOTATION_NAME)); } @@ -216,8 +216,8 @@ public class JavaEmbeddedIdMappingTests extends ContextModelTestCase persistentAttribute.setSpecifiedMappingKey(MappingKeys.TRANSIENT_ATTRIBUTE_MAPPING_KEY); assertTrue(persistentAttribute.getMapping() instanceof TransientMapping); - assertNull(attributeResource.getMappingAnnotation(EmbeddedId.ANNOTATION_NAME)); - assertNotNull(attributeResource.getMappingAnnotation(Transient.ANNOTATION_NAME)); + assertNull(attributeResource.getMappingAnnotation(EmbeddedIdAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getMappingAnnotation(TransientAnnotation.ANNOTATION_NAME)); assertNull(attributeResource.getAnnotation(AttributeOverrideAnnotation.ANNOTATION_NAME)); } @@ -236,8 +236,8 @@ public class JavaEmbeddedIdMappingTests extends ContextModelTestCase persistentAttribute.setSpecifiedMappingKey(MappingKeys.ID_ATTRIBUTE_MAPPING_KEY); assertTrue(persistentAttribute.getMapping() instanceof IdMapping); - assertNull(attributeResource.getMappingAnnotation(EmbeddedId.ANNOTATION_NAME)); - assertNotNull(attributeResource.getMappingAnnotation(Id.ANNOTATION_NAME)); + assertNull(attributeResource.getMappingAnnotation(EmbeddedIdAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getMappingAnnotation(IdAnnotation.ANNOTATION_NAME)); assertNull(attributeResource.getAnnotation(AttributeOverrideAnnotation.ANNOTATION_NAME)); } @@ -256,8 +256,8 @@ public class JavaEmbeddedIdMappingTests extends ContextModelTestCase persistentAttribute.setSpecifiedMappingKey(MappingKeys.EMBEDDED_ATTRIBUTE_MAPPING_KEY); assertTrue(persistentAttribute.getMapping() instanceof EmbeddedMapping); - assertNull(attributeResource.getMappingAnnotation(EmbeddedId.ANNOTATION_NAME)); - assertNotNull(attributeResource.getMappingAnnotation(Embedded.ANNOTATION_NAME)); + assertNull(attributeResource.getMappingAnnotation(EmbeddedIdAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getMappingAnnotation(EmbeddedAnnotation.ANNOTATION_NAME)); assertNotNull(attributeResource.getAnnotation(AttributeOverrideAnnotation.ANNOTATION_NAME)); } @@ -276,8 +276,8 @@ public class JavaEmbeddedIdMappingTests extends ContextModelTestCase persistentAttribute.setSpecifiedMappingKey(MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY); assertTrue(persistentAttribute.getMapping() instanceof OneToOneMapping); - assertNull(attributeResource.getMappingAnnotation(EmbeddedId.ANNOTATION_NAME)); - assertNotNull(attributeResource.getMappingAnnotation(OneToOne.ANNOTATION_NAME)); + assertNull(attributeResource.getMappingAnnotation(EmbeddedIdAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getMappingAnnotation(OneToOneAnnotation.ANNOTATION_NAME)); assertNull(attributeResource.getAnnotation(AttributeOverrideAnnotation.ANNOTATION_NAME)); } @@ -296,8 +296,8 @@ public class JavaEmbeddedIdMappingTests extends ContextModelTestCase persistentAttribute.setSpecifiedMappingKey(MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY); assertTrue(persistentAttribute.getMapping() instanceof OneToManyMapping); - assertNull(attributeResource.getMappingAnnotation(EmbeddedId.ANNOTATION_NAME)); - assertNotNull(attributeResource.getMappingAnnotation(OneToMany.ANNOTATION_NAME)); + assertNull(attributeResource.getMappingAnnotation(EmbeddedIdAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getMappingAnnotation(OneToManyAnnotation.ANNOTATION_NAME)); assertNull(attributeResource.getAnnotation(AttributeOverrideAnnotation.ANNOTATION_NAME)); } @@ -316,8 +316,8 @@ public class JavaEmbeddedIdMappingTests extends ContextModelTestCase persistentAttribute.setSpecifiedMappingKey(MappingKeys.MANY_TO_ONE_ATTRIBUTE_MAPPING_KEY); assertTrue(persistentAttribute.getMapping() instanceof ManyToOneMapping); - assertNull(attributeResource.getMappingAnnotation(EmbeddedId.ANNOTATION_NAME)); - assertNotNull(attributeResource.getMappingAnnotation(ManyToOne.ANNOTATION_NAME)); + assertNull(attributeResource.getMappingAnnotation(EmbeddedIdAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getMappingAnnotation(ManyToOneAnnotation.ANNOTATION_NAME)); assertNull(attributeResource.getAnnotation(AttributeOverrideAnnotation.ANNOTATION_NAME)); } @@ -336,8 +336,8 @@ public class JavaEmbeddedIdMappingTests extends ContextModelTestCase persistentAttribute.setSpecifiedMappingKey(MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); assertTrue(persistentAttribute.getMapping() instanceof ManyToManyMapping); - assertNull(attributeResource.getMappingAnnotation(EmbeddedId.ANNOTATION_NAME)); - assertNotNull(attributeResource.getMappingAnnotation(ManyToMany.ANNOTATION_NAME)); + assertNull(attributeResource.getMappingAnnotation(EmbeddedIdAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getMappingAnnotation(ManyToManyAnnotation.ANNOTATION_NAME)); assertNull(attributeResource.getAnnotation(AttributeOverrideAnnotation.ANNOTATION_NAME)); } @@ -415,7 +415,7 @@ public class JavaEmbeddedIdMappingTests extends ContextModelTestCase JavaResourcePersistentAttribute attributeResource = typeResource.attributes().next(); assertEquals("myEmbeddedId", attributeResource.getName()); assertNull(attributeResource.getAnnotation(AttributeOverrideAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(AttributeOverrides.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(AttributeOverridesAnnotation.ANNOTATION_NAME)); assertEquals(2, embeddedIdMapping.virtualAttributeOverridesSize()); AttributeOverride defaultAttributeOverride = embeddedIdMapping.virtualAttributeOverrides().next(); @@ -535,14 +535,14 @@ public class JavaEmbeddedIdMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = jpaProject().getJavaPersistentTypeResource(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.attributes().next(); - Iterator<JavaResourceNode> attributeOverrides = attributeResource.annotations(AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverrides.ANNOTATION_NAME); + Iterator<JavaResourceNode> 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.annotations(AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverrides.ANNOTATION_NAME); + attributeOverrides = attributeResource.annotations(AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverridesAnnotation.ANNOTATION_NAME); assertEquals("state", ((AttributeOverrideAnnotation) attributeOverrides.next()).getName()); assertFalse(attributeOverrides.hasNext()); @@ -550,7 +550,7 @@ public class JavaEmbeddedIdMappingTests extends ContextModelTestCase assertEquals(1, embeddedIdMapping.virtualAttributeOverridesSize()); embeddedIdMapping.specifiedAttributeOverrides().next().setVirtual(true); - attributeOverrides = attributeResource.annotations(AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverrides.ANNOTATION_NAME); + attributeOverrides = attributeResource.annotations(AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverridesAnnotation.ANNOTATION_NAME); assertFalse(attributeOverrides.hasNext()); Iterator<AttributeOverride> virtualAttributeOverrides = embeddedIdMapping.virtualAttributeOverrides(); @@ -573,7 +573,7 @@ public class JavaEmbeddedIdMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = jpaProject().getJavaPersistentTypeResource(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.attributes().next(); - Iterator<JavaResourceNode> attributeOverrides = attributeResource.annotations(AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverrides.ANNOTATION_NAME); + Iterator<JavaResourceNode> attributeOverrides = attributeResource.annotations(AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverridesAnnotation.ANNOTATION_NAME); assertEquals("state", ((AttributeOverrideAnnotation) attributeOverrides.next()).getName()); assertEquals("city", ((AttributeOverrideAnnotation) attributeOverrides.next()).getName()); @@ -594,9 +594,9 @@ public class JavaEmbeddedIdMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = jpaProject().getJavaPersistentTypeResource(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.attributes().next(); - attributeResource.move(1, 0, AttributeOverrides.ANNOTATION_NAME); + attributeResource.move(1, 0, AttributeOverridesAnnotation.ANNOTATION_NAME); - Iterator<JavaResourceNode> attributeOverrides = attributeResource.annotations(AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverrides.ANNOTATION_NAME); + Iterator<JavaResourceNode> 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 c1724d7c0d..b68b5623db 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 @@ -31,21 +31,21 @@ import org.eclipse.jpt.core.context.java.JavaAttributeOverride; import org.eclipse.jpt.core.context.persistence.ClassRef; import org.eclipse.jpt.core.internal.context.java.GenericJavaNullAttributeMapping; import org.eclipse.jpt.core.resource.java.AttributeOverrideAnnotation; -import org.eclipse.jpt.core.resource.java.AttributeOverrides; -import org.eclipse.jpt.core.resource.java.Basic; -import org.eclipse.jpt.core.resource.java.Embedded; -import org.eclipse.jpt.core.resource.java.EmbeddedId; -import org.eclipse.jpt.core.resource.java.Id; +import org.eclipse.jpt.core.resource.java.AttributeOverridesAnnotation; +import org.eclipse.jpt.core.resource.java.BasicAnnotation; +import org.eclipse.jpt.core.resource.java.EmbeddedAnnotation; +import org.eclipse.jpt.core.resource.java.EmbeddedIdAnnotation; +import org.eclipse.jpt.core.resource.java.IdAnnotation; import org.eclipse.jpt.core.resource.java.JPA; import org.eclipse.jpt.core.resource.java.JavaResourceNode; import org.eclipse.jpt.core.resource.java.JavaResourcePersistentAttribute; import org.eclipse.jpt.core.resource.java.JavaResourcePersistentType; -import org.eclipse.jpt.core.resource.java.ManyToMany; -import org.eclipse.jpt.core.resource.java.ManyToOne; -import org.eclipse.jpt.core.resource.java.OneToMany; -import org.eclipse.jpt.core.resource.java.OneToOne; -import org.eclipse.jpt.core.resource.java.Transient; -import org.eclipse.jpt.core.resource.java.Version; +import org.eclipse.jpt.core.resource.java.ManyToManyAnnotation; +import org.eclipse.jpt.core.resource.java.ManyToOneAnnotation; +import org.eclipse.jpt.core.resource.java.OneToManyAnnotation; +import org.eclipse.jpt.core.resource.java.OneToOneAnnotation; +import org.eclipse.jpt.core.resource.java.TransientAnnotation; +import org.eclipse.jpt.core.resource.java.VersionAnnotation; import org.eclipse.jpt.core.tests.internal.context.ContextModelTestCase; import org.eclipse.jpt.core.tests.internal.projects.TestJavaProject.SourceWriter; import org.eclipse.jpt.utility.internal.iterators.ArrayIterator; @@ -135,8 +135,8 @@ public class JavaEmbeddedMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = jpaProject().getJavaPersistentTypeResource(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.attributes().next(); - assertNull(attributeResource.getMappingAnnotation(Embedded.ANNOTATION_NAME)); - assertNotNull(attributeResource.getMappingAnnotation(Basic.ANNOTATION_NAME)); + assertNull(attributeResource.getMappingAnnotation(EmbeddedAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getMappingAnnotation(BasicAnnotation.ANNOTATION_NAME)); assertNull(attributeResource.getAnnotation(AttributeOverrideAnnotation.ANNOTATION_NAME)); } @@ -157,7 +157,7 @@ public class JavaEmbeddedMappingTests extends ContextModelTestCase assertTrue(((EmbeddedMapping) persistentAttribute.getMapping()).attributeOverrides().hasNext()); assertTrue(persistentAttribute.getMapping().isDefault()); - assertNull(attributeResource.getMappingAnnotation(Embedded.ANNOTATION_NAME)); + assertNull(attributeResource.getMappingAnnotation(EmbeddedAnnotation.ANNOTATION_NAME)); assertNotNull(attributeResource.getAnnotation(AttributeOverrideAnnotation.ANNOTATION_NAME)); } @@ -194,8 +194,8 @@ public class JavaEmbeddedMappingTests extends ContextModelTestCase persistentAttribute.setSpecifiedMappingKey(MappingKeys.VERSION_ATTRIBUTE_MAPPING_KEY); assertTrue(persistentAttribute.getMapping() instanceof VersionMapping); - assertNull(attributeResource.getMappingAnnotation(Embedded.ANNOTATION_NAME)); - assertNotNull(attributeResource.getMappingAnnotation(Version.ANNOTATION_NAME)); + assertNull(attributeResource.getMappingAnnotation(EmbeddedAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getMappingAnnotation(VersionAnnotation.ANNOTATION_NAME)); assertNull(attributeResource.getAnnotation(AttributeOverrideAnnotation.ANNOTATION_NAME)); } @@ -214,8 +214,8 @@ public class JavaEmbeddedMappingTests extends ContextModelTestCase persistentAttribute.setSpecifiedMappingKey(MappingKeys.TRANSIENT_ATTRIBUTE_MAPPING_KEY); assertTrue(persistentAttribute.getMapping() instanceof TransientMapping); - assertNull(attributeResource.getMappingAnnotation(Embedded.ANNOTATION_NAME)); - assertNotNull(attributeResource.getMappingAnnotation(Transient.ANNOTATION_NAME)); + assertNull(attributeResource.getMappingAnnotation(EmbeddedAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getMappingAnnotation(TransientAnnotation.ANNOTATION_NAME)); assertNull(attributeResource.getAnnotation(AttributeOverrideAnnotation.ANNOTATION_NAME)); } @@ -234,8 +234,8 @@ public class JavaEmbeddedMappingTests extends ContextModelTestCase persistentAttribute.setSpecifiedMappingKey(MappingKeys.ID_ATTRIBUTE_MAPPING_KEY); assertTrue(persistentAttribute.getMapping() instanceof IdMapping); - assertNull(attributeResource.getMappingAnnotation(Embedded.ANNOTATION_NAME)); - assertNotNull(attributeResource.getMappingAnnotation(Id.ANNOTATION_NAME)); + assertNull(attributeResource.getMappingAnnotation(EmbeddedAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getMappingAnnotation(IdAnnotation.ANNOTATION_NAME)); assertNull(attributeResource.getAnnotation(AttributeOverrideAnnotation.ANNOTATION_NAME)); } @@ -254,8 +254,8 @@ public class JavaEmbeddedMappingTests extends ContextModelTestCase persistentAttribute.setSpecifiedMappingKey(MappingKeys.EMBEDDED_ID_ATTRIBUTE_MAPPING_KEY); assertTrue(persistentAttribute.getMapping() instanceof EmbeddedIdMapping); - assertNull(attributeResource.getMappingAnnotation(Embedded.ANNOTATION_NAME)); - assertNotNull(attributeResource.getMappingAnnotation(EmbeddedId.ANNOTATION_NAME)); + assertNull(attributeResource.getMappingAnnotation(EmbeddedAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getMappingAnnotation(EmbeddedIdAnnotation.ANNOTATION_NAME)); assertNotNull(attributeResource.getAnnotation(AttributeOverrideAnnotation.ANNOTATION_NAME)); } @@ -274,8 +274,8 @@ public class JavaEmbeddedMappingTests extends ContextModelTestCase persistentAttribute.setSpecifiedMappingKey(MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY); assertTrue(persistentAttribute.getMapping() instanceof OneToOneMapping); - assertNull(attributeResource.getMappingAnnotation(Embedded.ANNOTATION_NAME)); - assertNotNull(attributeResource.getMappingAnnotation(OneToOne.ANNOTATION_NAME)); + assertNull(attributeResource.getMappingAnnotation(EmbeddedAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getMappingAnnotation(OneToOneAnnotation.ANNOTATION_NAME)); assertNull(attributeResource.getAnnotation(AttributeOverrideAnnotation.ANNOTATION_NAME)); } @@ -294,8 +294,8 @@ public class JavaEmbeddedMappingTests extends ContextModelTestCase persistentAttribute.setSpecifiedMappingKey(MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY); assertTrue(persistentAttribute.getMapping() instanceof OneToManyMapping); - assertNull(attributeResource.getMappingAnnotation(Embedded.ANNOTATION_NAME)); - assertNotNull(attributeResource.getMappingAnnotation(OneToMany.ANNOTATION_NAME)); + assertNull(attributeResource.getMappingAnnotation(EmbeddedAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getMappingAnnotation(OneToManyAnnotation.ANNOTATION_NAME)); assertNull(attributeResource.getAnnotation(AttributeOverrideAnnotation.ANNOTATION_NAME)); } @@ -314,8 +314,8 @@ public class JavaEmbeddedMappingTests extends ContextModelTestCase persistentAttribute.setSpecifiedMappingKey(MappingKeys.MANY_TO_ONE_ATTRIBUTE_MAPPING_KEY); assertTrue(persistentAttribute.getMapping() instanceof ManyToOneMapping); - assertNull(attributeResource.getMappingAnnotation(Embedded.ANNOTATION_NAME)); - assertNotNull(attributeResource.getMappingAnnotation(ManyToOne.ANNOTATION_NAME)); + assertNull(attributeResource.getMappingAnnotation(EmbeddedAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getMappingAnnotation(ManyToOneAnnotation.ANNOTATION_NAME)); assertNull(attributeResource.getAnnotation(AttributeOverrideAnnotation.ANNOTATION_NAME)); } @@ -334,8 +334,8 @@ public class JavaEmbeddedMappingTests extends ContextModelTestCase persistentAttribute.setSpecifiedMappingKey(MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); assertTrue(persistentAttribute.getMapping() instanceof ManyToManyMapping); - assertNull(attributeResource.getMappingAnnotation(Embedded.ANNOTATION_NAME)); - assertNotNull(attributeResource.getMappingAnnotation(ManyToMany.ANNOTATION_NAME)); + assertNull(attributeResource.getMappingAnnotation(EmbeddedAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getMappingAnnotation(ManyToManyAnnotation.ANNOTATION_NAME)); assertNull(attributeResource.getAnnotation(AttributeOverrideAnnotation.ANNOTATION_NAME)); } @@ -414,7 +414,7 @@ public class JavaEmbeddedMappingTests extends ContextModelTestCase JavaResourcePersistentAttribute attributeResource = typeResource.attributes().next(); assertEquals("myEmbedded", attributeResource.getName()); assertNull(attributeResource.getAnnotation(AttributeOverrideAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(AttributeOverrides.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(AttributeOverridesAnnotation.ANNOTATION_NAME)); assertEquals(2, embeddedMapping.virtualAttributeOverridesSize()); AttributeOverride defaultAttributeOverride = embeddedMapping.virtualAttributeOverrides().next(); @@ -433,7 +433,7 @@ public class JavaEmbeddedMappingTests extends ContextModelTestCase assertEquals("myEmbedded", attributeResource.getName()); assertNull(attributeResource.getAnnotation(AttributeOverrideAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(AttributeOverrides.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(AttributeOverridesAnnotation.ANNOTATION_NAME)); assertEquals(2, embeddedMapping.virtualAttributeOverridesSize()); defaultAttributeOverride = embeddedMapping.virtualAttributeOverrides().next(); @@ -538,14 +538,14 @@ public class JavaEmbeddedMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = jpaProject().getJavaPersistentTypeResource(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.attributes().next(); - Iterator<JavaResourceNode> attributeOverrides = attributeResource.annotations(AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverrides.ANNOTATION_NAME); + Iterator<JavaResourceNode> 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.annotations(AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverrides.ANNOTATION_NAME); + attributeOverrides = attributeResource.annotations(AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverridesAnnotation.ANNOTATION_NAME); assertEquals("state", ((AttributeOverrideAnnotation) attributeOverrides.next()).getName()); assertFalse(attributeOverrides.hasNext()); @@ -553,7 +553,7 @@ public class JavaEmbeddedMappingTests extends ContextModelTestCase assertEquals(1, embeddedMapping.virtualAttributeOverridesSize()); embeddedMapping.specifiedAttributeOverrides().next().setVirtual(true); - attributeOverrides = attributeResource.annotations(AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverrides.ANNOTATION_NAME); + attributeOverrides = attributeResource.annotations(AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverridesAnnotation.ANNOTATION_NAME); assertFalse(attributeOverrides.hasNext()); Iterator<AttributeOverride> virtualAttributeOverrides = embeddedMapping.virtualAttributeOverrides(); @@ -576,7 +576,7 @@ public class JavaEmbeddedMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = jpaProject().getJavaPersistentTypeResource(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.attributes().next(); - Iterator<JavaResourceNode> attributeOverrides = attributeResource.annotations(AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverrides.ANNOTATION_NAME); + Iterator<JavaResourceNode> attributeOverrides = attributeResource.annotations(AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverridesAnnotation.ANNOTATION_NAME); assertEquals("state", ((AttributeOverrideAnnotation) attributeOverrides.next()).getName()); assertEquals("city", ((AttributeOverrideAnnotation) attributeOverrides.next()).getName()); @@ -596,9 +596,9 @@ public class JavaEmbeddedMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = jpaProject().getJavaPersistentTypeResource(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.attributes().next(); - attributeResource.move(1, 0, AttributeOverrides.ANNOTATION_NAME); + attributeResource.move(1, 0, AttributeOverridesAnnotation.ANNOTATION_NAME); - Iterator<JavaResourceNode> attributeOverrides = attributeResource.annotations(AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverrides.ANNOTATION_NAME); + Iterator<JavaResourceNode> 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 c4086c2690..304ebc78e0 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 @@ -43,25 +43,25 @@ import org.eclipse.jpt.core.context.orm.OrmPersistentType; import org.eclipse.jpt.core.context.persistence.ClassRef; import org.eclipse.jpt.core.internal.context.java.JavaNullTypeMapping; import org.eclipse.jpt.core.resource.java.AssociationOverrideAnnotation; -import org.eclipse.jpt.core.resource.java.AssociationOverrides; +import org.eclipse.jpt.core.resource.java.AssociationOverridesAnnotation; import org.eclipse.jpt.core.resource.java.AttributeOverrideAnnotation; -import org.eclipse.jpt.core.resource.java.AttributeOverrides; +import org.eclipse.jpt.core.resource.java.AttributeOverridesAnnotation; import org.eclipse.jpt.core.resource.java.DiscriminatorColumnAnnotation; -import org.eclipse.jpt.core.resource.java.DiscriminatorValue; +import org.eclipse.jpt.core.resource.java.DiscriminatorValueAnnotation; import org.eclipse.jpt.core.resource.java.EntityAnnotation; import org.eclipse.jpt.core.resource.java.IdClassAnnotation; -import org.eclipse.jpt.core.resource.java.Inheritance; +import org.eclipse.jpt.core.resource.java.InheritanceAnnotation; import org.eclipse.jpt.core.resource.java.JPA; import org.eclipse.jpt.core.resource.java.JavaResourceNode; import org.eclipse.jpt.core.resource.java.JavaResourcePersistentType; -import org.eclipse.jpt.core.resource.java.NamedNativeQueries; +import org.eclipse.jpt.core.resource.java.NamedNativeQueriesAnnotation; import org.eclipse.jpt.core.resource.java.NamedNativeQueryAnnotation; -import org.eclipse.jpt.core.resource.java.NamedQueries; +import org.eclipse.jpt.core.resource.java.NamedQueriesAnnotation; import org.eclipse.jpt.core.resource.java.NamedQueryAnnotation; import org.eclipse.jpt.core.resource.java.PrimaryKeyJoinColumnAnnotation; import org.eclipse.jpt.core.resource.java.PrimaryKeyJoinColumns; import org.eclipse.jpt.core.resource.java.SecondaryTableAnnotation; -import org.eclipse.jpt.core.resource.java.SecondaryTables; +import org.eclipse.jpt.core.resource.java.SecondaryTablesAnnotation; import org.eclipse.jpt.core.resource.java.SequenceGeneratorAnnotation; import org.eclipse.jpt.core.resource.java.TableAnnotation; import org.eclipse.jpt.core.resource.java.TableGeneratorAnnotation; @@ -354,8 +354,8 @@ public class JavaEntityTests extends ContextModelTestCase assertNull(typeResource.getAnnotation(PrimaryKeyJoinColumnAnnotation.ANNOTATION_NAME)); assertNull(typeResource.getAnnotation(AttributeOverrideAnnotation.ANNOTATION_NAME)); assertNull(typeResource.getAnnotation(AssociationOverrideAnnotation.ANNOTATION_NAME)); - assertNull(typeResource.getAnnotation(Inheritance.ANNOTATION_NAME)); - assertNull(typeResource.getAnnotation(DiscriminatorValue.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)); @@ -393,8 +393,8 @@ public class JavaEntityTests extends ContextModelTestCase assertNull(typeResource.getAnnotation(PrimaryKeyJoinColumnAnnotation.ANNOTATION_NAME)); assertNull(typeResource.getAnnotation(AttributeOverrideAnnotation.ANNOTATION_NAME)); assertNull(typeResource.getAnnotation(AssociationOverrideAnnotation.ANNOTATION_NAME)); - assertNull(typeResource.getAnnotation(Inheritance.ANNOTATION_NAME)); - assertNull(typeResource.getAnnotation(DiscriminatorValue.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)); @@ -432,8 +432,8 @@ public class JavaEntityTests extends ContextModelTestCase assertNull(typeResource.getAnnotation(PrimaryKeyJoinColumnAnnotation.ANNOTATION_NAME)); assertNull(typeResource.getAnnotation(AttributeOverrideAnnotation.ANNOTATION_NAME)); assertNull(typeResource.getAnnotation(AssociationOverrideAnnotation.ANNOTATION_NAME)); - assertNull(typeResource.getAnnotation(Inheritance.ANNOTATION_NAME)); - assertNull(typeResource.getAnnotation(DiscriminatorValue.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)); @@ -682,7 +682,7 @@ public class JavaEntityTests extends ContextModelTestCase assertEquals(InheritanceType.TABLE_PER_CLASS, javaEntity().getSpecifiedInheritanceStrategy()); JavaResourcePersistentType typeResource = jpaProject().getJavaPersistentTypeResource(FULLY_QUALIFIED_TYPE_NAME); - Inheritance inheritance = (Inheritance) typeResource.getAnnotation(Inheritance.ANNOTATION_NAME); + InheritanceAnnotation inheritance = (InheritanceAnnotation) typeResource.getAnnotation(InheritanceAnnotation.ANNOTATION_NAME); inheritance.setStrategy(org.eclipse.jpt.core.resource.java.InheritanceType.JOINED); @@ -703,7 +703,7 @@ public class JavaEntityTests extends ContextModelTestCase assertEquals(InheritanceType.JOINED, javaEntity().getSpecifiedInheritanceStrategy()); JavaResourcePersistentType typeResource = jpaProject().getJavaPersistentTypeResource(FULLY_QUALIFIED_TYPE_NAME); - Inheritance inheritance = (Inheritance) typeResource.getAnnotation(Inheritance.ANNOTATION_NAME); + InheritanceAnnotation inheritance = (InheritanceAnnotation) typeResource.getAnnotation(InheritanceAnnotation.ANNOTATION_NAME); assertEquals(org.eclipse.jpt.core.resource.java.InheritanceType.JOINED, inheritance.getStrategy()); } @@ -732,7 +732,7 @@ public class JavaEntityTests extends ContextModelTestCase assertEquals(DISCRIMINATOR_VALUE, javaEntity().getSpecifiedDiscriminatorValue()); JavaResourcePersistentType typeResource = jpaProject().getJavaPersistentTypeResource(FULLY_QUALIFIED_TYPE_NAME); - DiscriminatorValue discriminatorValue = (DiscriminatorValue) typeResource.getAnnotation(DiscriminatorValue.ANNOTATION_NAME); + DiscriminatorValueAnnotation discriminatorValue = (DiscriminatorValueAnnotation) typeResource.getAnnotation(DiscriminatorValueAnnotation.ANNOTATION_NAME); discriminatorValue.setValue("foo"); @@ -741,7 +741,7 @@ public class JavaEntityTests extends ContextModelTestCase discriminatorValue.setValue(null); assertNull(javaEntity().getSpecifiedDiscriminatorValue()); - assertNull(typeResource.getAnnotation(DiscriminatorValue.ANNOTATION_NAME)); + assertNull(typeResource.getAnnotation(DiscriminatorValueAnnotation.ANNOTATION_NAME)); } public void testSetSpecifiedDiscriminatorValue() throws Exception { @@ -754,7 +754,7 @@ public class JavaEntityTests extends ContextModelTestCase assertEquals("foo", javaEntity().getSpecifiedDiscriminatorValue()); JavaResourcePersistentType typeResource = jpaProject().getJavaPersistentTypeResource(FULLY_QUALIFIED_TYPE_NAME); - DiscriminatorValue discriminatorValue = (DiscriminatorValue) typeResource.getAnnotation(DiscriminatorValue.ANNOTATION_NAME); + DiscriminatorValueAnnotation discriminatorValue = (DiscriminatorValueAnnotation) typeResource.getAnnotation(DiscriminatorValueAnnotation.ANNOTATION_NAME); assertEquals("foo", discriminatorValue.getValue()); } @@ -778,9 +778,9 @@ public class JavaEntityTests extends ContextModelTestCase assertEquals(0, entity.secondaryTablesSize()); - ((SecondaryTableAnnotation) typeResource.addAnnotation(0, SecondaryTableAnnotation.ANNOTATION_NAME, SecondaryTables.ANNOTATION_NAME)).setName("FOO"); - ((SecondaryTableAnnotation) typeResource.addAnnotation(1, SecondaryTableAnnotation.ANNOTATION_NAME, SecondaryTables.ANNOTATION_NAME)).setName("BAR"); - ((SecondaryTableAnnotation) typeResource.addAnnotation(2, SecondaryTableAnnotation.ANNOTATION_NAME, SecondaryTables.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()); } @@ -806,9 +806,9 @@ public class JavaEntityTests extends ContextModelTestCase assertEquals(0, entity.specifiedSecondaryTablesSize()); - ((SecondaryTableAnnotation) typeResource.addAnnotation(0, SecondaryTableAnnotation.ANNOTATION_NAME, SecondaryTables.ANNOTATION_NAME)).setName("FOO"); - ((SecondaryTableAnnotation) typeResource.addAnnotation(1, SecondaryTableAnnotation.ANNOTATION_NAME, SecondaryTables.ANNOTATION_NAME)).setName("BAR"); - ((SecondaryTableAnnotation) typeResource.addAnnotation(2, SecondaryTableAnnotation.ANNOTATION_NAME, SecondaryTables.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()); } @@ -822,7 +822,7 @@ public class JavaEntityTests extends ContextModelTestCase javaEntity().addSpecifiedSecondaryTable(0).setSpecifiedName("BAZ"); JavaResourcePersistentType typeResource = jpaProject().getJavaPersistentTypeResource(FULLY_QUALIFIED_TYPE_NAME); - Iterator<JavaResourceNode> secondaryTables = typeResource.annotations(SecondaryTableAnnotation.ANNOTATION_NAME, SecondaryTables.ANNOTATION_NAME); + Iterator<JavaResourceNode> secondaryTables = typeResource.annotations(SecondaryTableAnnotation.ANNOTATION_NAME, SecondaryTablesAnnotation.ANNOTATION_NAME); assertEquals("BAZ", ((SecondaryTableAnnotation) secondaryTables.next()).getName()); assertEquals("BAR", ((SecondaryTableAnnotation) secondaryTables.next()).getName()); @@ -839,7 +839,7 @@ public class JavaEntityTests extends ContextModelTestCase javaEntity().addSpecifiedSecondaryTable(0).setSpecifiedName("BAZ"); JavaResourcePersistentType typeResource = jpaProject().getJavaPersistentTypeResource(FULLY_QUALIFIED_TYPE_NAME); - Iterator<JavaResourceNode> secondaryTables = typeResource.annotations(SecondaryTableAnnotation.ANNOTATION_NAME, SecondaryTables.ANNOTATION_NAME); + Iterator<JavaResourceNode> secondaryTables = typeResource.annotations(SecondaryTableAnnotation.ANNOTATION_NAME, SecondaryTablesAnnotation.ANNOTATION_NAME); assertEquals("BAZ", ((SecondaryTableAnnotation) secondaryTables.next()).getName()); assertEquals("FOO", ((SecondaryTableAnnotation) secondaryTables.next()).getName()); @@ -889,11 +889,11 @@ public class JavaEntityTests extends ContextModelTestCase JavaResourcePersistentType typeResource = jpaProject().getJavaPersistentTypeResource(FULLY_QUALIFIED_TYPE_NAME); - assertEquals(3, CollectionTools.size(typeResource.annotations(SecondaryTableAnnotation.ANNOTATION_NAME, SecondaryTables.ANNOTATION_NAME))); + assertEquals(3, CollectionTools.size(typeResource.annotations(SecondaryTableAnnotation.ANNOTATION_NAME, SecondaryTablesAnnotation.ANNOTATION_NAME))); javaEntity().removeSpecifiedSecondaryTable(1); - Iterator<JavaResourceNode> secondaryTableResources = typeResource.annotations(SecondaryTableAnnotation.ANNOTATION_NAME, SecondaryTables.ANNOTATION_NAME); + Iterator<JavaResourceNode> secondaryTableResources = typeResource.annotations(SecondaryTableAnnotation.ANNOTATION_NAME, SecondaryTablesAnnotation.ANNOTATION_NAME); assertEquals("FOO", ((SecondaryTableAnnotation) secondaryTableResources.next()).getName()); assertEquals("BAZ", ((SecondaryTableAnnotation) secondaryTableResources.next()).getName()); assertFalse(secondaryTableResources.hasNext()); @@ -905,7 +905,7 @@ public class JavaEntityTests extends ContextModelTestCase javaEntity().removeSpecifiedSecondaryTable(1); - secondaryTableResources = typeResource.annotations(SecondaryTableAnnotation.ANNOTATION_NAME, SecondaryTables.ANNOTATION_NAME); + secondaryTableResources = typeResource.annotations(SecondaryTableAnnotation.ANNOTATION_NAME, SecondaryTablesAnnotation.ANNOTATION_NAME); assertEquals("FOO", ((SecondaryTableAnnotation) secondaryTableResources.next()).getName()); assertFalse(secondaryTableResources.hasNext()); @@ -915,12 +915,12 @@ public class JavaEntityTests extends ContextModelTestCase javaEntity().removeSpecifiedSecondaryTable(0); - secondaryTableResources = typeResource.annotations(SecondaryTableAnnotation.ANNOTATION_NAME, SecondaryTables.ANNOTATION_NAME); + secondaryTableResources = typeResource.annotations(SecondaryTableAnnotation.ANNOTATION_NAME, SecondaryTablesAnnotation.ANNOTATION_NAME); assertFalse(secondaryTableResources.hasNext()); secondaryTables = javaEntity().secondaryTables(); assertFalse(secondaryTables.hasNext()); - assertNull(typeResource.getAnnotation(SecondaryTables.ANNOTATION_NAME)); + assertNull(typeResource.getAnnotation(SecondaryTablesAnnotation.ANNOTATION_NAME)); } public void testMoveSpecifiedSecondaryTable() throws Exception { @@ -934,7 +934,7 @@ public class JavaEntityTests extends ContextModelTestCase entity.addSpecifiedSecondaryTable(1).setSpecifiedName("BAR"); entity.addSpecifiedSecondaryTable(2).setSpecifiedName("BAZ"); - ListIterator<SecondaryTableAnnotation> javaSecondaryTables = typeResource.annotations(SecondaryTableAnnotation.ANNOTATION_NAME, SecondaryTables.ANNOTATION_NAME); + ListIterator<SecondaryTableAnnotation> javaSecondaryTables = typeResource.annotations(SecondaryTableAnnotation.ANNOTATION_NAME, SecondaryTablesAnnotation.ANNOTATION_NAME); assertEquals(3, CollectionTools.size(javaSecondaryTables)); @@ -944,7 +944,7 @@ public class JavaEntityTests extends ContextModelTestCase assertEquals("BAZ", secondaryTables.next().getSpecifiedName()); assertEquals("FOO", secondaryTables.next().getSpecifiedName()); - javaSecondaryTables = typeResource.annotations(SecondaryTableAnnotation.ANNOTATION_NAME, SecondaryTables.ANNOTATION_NAME); + javaSecondaryTables = typeResource.annotations(SecondaryTableAnnotation.ANNOTATION_NAME, SecondaryTablesAnnotation.ANNOTATION_NAME); assertEquals("BAR", javaSecondaryTables.next().getName()); assertEquals("BAZ", javaSecondaryTables.next().getName()); assertEquals("FOO", javaSecondaryTables.next().getName()); @@ -956,7 +956,7 @@ public class JavaEntityTests extends ContextModelTestCase assertEquals("BAR", secondaryTables.next().getSpecifiedName()); assertEquals("FOO", secondaryTables.next().getSpecifiedName()); - javaSecondaryTables = typeResource.annotations(SecondaryTableAnnotation.ANNOTATION_NAME, SecondaryTables.ANNOTATION_NAME); + javaSecondaryTables = typeResource.annotations(SecondaryTableAnnotation.ANNOTATION_NAME, SecondaryTablesAnnotation.ANNOTATION_NAME); assertEquals("BAZ", javaSecondaryTables.next().getName()); assertEquals("BAR", javaSecondaryTables.next().getName()); assertEquals("FOO", javaSecondaryTables.next().getName()); @@ -969,9 +969,9 @@ public class JavaEntityTests extends ContextModelTestCase Entity entity = javaEntity(); JavaResourcePersistentType typeResource = jpaProject().getJavaPersistentTypeResource(FULLY_QUALIFIED_TYPE_NAME); - ((SecondaryTableAnnotation) typeResource.addAnnotation(0, SecondaryTableAnnotation.ANNOTATION_NAME, SecondaryTables.ANNOTATION_NAME)).setName("FOO"); - ((SecondaryTableAnnotation) typeResource.addAnnotation(1, SecondaryTableAnnotation.ANNOTATION_NAME, SecondaryTables.ANNOTATION_NAME)).setName("BAR"); - ((SecondaryTableAnnotation) typeResource.addAnnotation(2, SecondaryTableAnnotation.ANNOTATION_NAME, SecondaryTables.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()); @@ -979,32 +979,32 @@ public class JavaEntityTests extends ContextModelTestCase assertEquals("BAZ", secondaryTables.next().getName()); assertFalse(secondaryTables.hasNext()); - typeResource.move(2, 0, SecondaryTables.ANNOTATION_NAME); + typeResource.move(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.move(0, 1, SecondaryTables.ANNOTATION_NAME); + typeResource.move(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.removeAnnotation(1, SecondaryTableAnnotation.ANNOTATION_NAME, SecondaryTables.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.removeAnnotation(1, SecondaryTableAnnotation.ANNOTATION_NAME, SecondaryTables.ANNOTATION_NAME); + typeResource.removeAnnotation(1, SecondaryTableAnnotation.ANNOTATION_NAME, SecondaryTablesAnnotation.ANNOTATION_NAME); secondaryTables = entity.specifiedSecondaryTables(); assertEquals("BAZ", secondaryTables.next().getName()); assertFalse(secondaryTables.hasNext()); - typeResource.removeAnnotation(0, SecondaryTableAnnotation.ANNOTATION_NAME, SecondaryTables.ANNOTATION_NAME); + typeResource.removeAnnotation(0, SecondaryTableAnnotation.ANNOTATION_NAME, SecondaryTablesAnnotation.ANNOTATION_NAME); secondaryTables = entity.specifiedSecondaryTables(); assertFalse(secondaryTables.hasNext()); } @@ -1705,7 +1705,7 @@ public class JavaEntityTests extends ContextModelTestCase JavaResourcePersistentType typeResource = jpaProject().getJavaPersistentTypeResource(FULLY_QUALIFIED_SUB_TYPE_NAME); assertEquals(SUB_TYPE_NAME, typeResource.getName()); assertNull(typeResource.getAnnotation(AttributeOverrideAnnotation.ANNOTATION_NAME)); - assertNull(typeResource.getAnnotation(AttributeOverrides.ANNOTATION_NAME)); + assertNull(typeResource.getAnnotation(AttributeOverridesAnnotation.ANNOTATION_NAME)); assertEquals(3, javaEntity.virtualAttributeOverridesSize()); AttributeOverride virtualAttributeOverride = javaEntity.virtualAttributeOverrides().next(); @@ -1722,7 +1722,7 @@ public class JavaEntityTests extends ContextModelTestCase assertEquals(SUB_TYPE_NAME, typeResource.getName()); assertNull(typeResource.getAnnotation(AttributeOverrideAnnotation.ANNOTATION_NAME)); - assertNull(typeResource.getAnnotation(AttributeOverrides.ANNOTATION_NAME)); + assertNull(typeResource.getAnnotation(AttributeOverridesAnnotation.ANNOTATION_NAME)); assertEquals(3, javaEntity.virtualAttributeOverridesSize()); virtualAttributeOverride = javaEntity.virtualAttributeOverrides().next(); @@ -1734,7 +1734,7 @@ public class JavaEntityTests extends ContextModelTestCase idMapping.getColumn().setSpecifiedTable(null); assertEquals(SUB_TYPE_NAME, typeResource.getName()); assertNull(typeResource.getAnnotation(AttributeOverrideAnnotation.ANNOTATION_NAME)); - assertNull(typeResource.getAnnotation(AttributeOverrides.ANNOTATION_NAME)); + assertNull(typeResource.getAnnotation(AttributeOverridesAnnotation.ANNOTATION_NAME)); virtualAttributeOverride = javaEntity.virtualAttributeOverrides().next(); assertEquals("id", virtualAttributeOverride.getName()); @@ -1816,7 +1816,7 @@ public class JavaEntityTests extends ContextModelTestCase javaEntity().virtualAttributeOverrides().next().setVirtual(false); JavaResourcePersistentType typeResource = jpaProject().getJavaPersistentTypeResource(FULLY_QUALIFIED_SUB_TYPE_NAME); - Iterator<JavaResourceNode> attributeOverrides = typeResource.annotations(AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverrides.ANNOTATION_NAME); + Iterator<JavaResourceNode> attributeOverrides = typeResource.annotations(AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverridesAnnotation.ANNOTATION_NAME); assertEquals("id", ((AttributeOverrideAnnotation) attributeOverrides.next()).getName()); assertEquals("name", ((AttributeOverrideAnnotation) attributeOverrides.next()).getName()); @@ -1836,7 +1836,7 @@ public class JavaEntityTests extends ContextModelTestCase javaEntity().virtualAttributeOverrides().next().setVirtual(false); JavaResourcePersistentType typeResource = jpaProject().getJavaPersistentTypeResource(FULLY_QUALIFIED_SUB_TYPE_NAME); - Iterator<JavaResourceNode> attributeOverrides = typeResource.annotations(AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverrides.ANNOTATION_NAME); + Iterator<JavaResourceNode> attributeOverrides = typeResource.annotations(AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverridesAnnotation.ANNOTATION_NAME); assertEquals("name", ((AttributeOverrideAnnotation) attributeOverrides.next()).getName()); assertEquals("id", ((AttributeOverrideAnnotation) attributeOverrides.next()).getName()); @@ -1855,11 +1855,11 @@ public class JavaEntityTests extends ContextModelTestCase javaEntity().virtualAttributeOverrides().next().setVirtual(false); JavaResourcePersistentType typeResource = jpaProject().getJavaPersistentTypeResource(FULLY_QUALIFIED_SUB_TYPE_NAME); - assertEquals(3, CollectionTools.size(typeResource.annotations(AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverrides.ANNOTATION_NAME))); + assertEquals(3, CollectionTools.size(typeResource.annotations(AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverridesAnnotation.ANNOTATION_NAME))); javaEntity().specifiedAttributeOverrides().next().setVirtual(true); - Iterator<JavaResourceNode> attributeOverrideResources = typeResource.annotations(AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverrides.ANNOTATION_NAME); + Iterator<JavaResourceNode> attributeOverrideResources = typeResource.annotations(AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverridesAnnotation.ANNOTATION_NAME); assertEquals("name", ((AttributeOverrideAnnotation) attributeOverrideResources.next()).getName()); assertEquals("foo", ((AttributeOverrideAnnotation) attributeOverrideResources.next()).getName()); assertFalse(attributeOverrideResources.hasNext()); @@ -1871,7 +1871,7 @@ public class JavaEntityTests extends ContextModelTestCase javaEntity().specifiedAttributeOverrides().next().setVirtual(true); - attributeOverrideResources = typeResource.annotations(AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverrides.ANNOTATION_NAME); + attributeOverrideResources = typeResource.annotations(AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverridesAnnotation.ANNOTATION_NAME); assertEquals("foo", ((AttributeOverrideAnnotation) attributeOverrideResources.next()).getName()); assertFalse(attributeOverrideResources.hasNext()); @@ -1881,12 +1881,12 @@ public class JavaEntityTests extends ContextModelTestCase javaEntity().specifiedAttributeOverrides().next().setVirtual(true); - attributeOverrideResources = typeResource.annotations(AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverrides.ANNOTATION_NAME); + attributeOverrideResources = typeResource.annotations(AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverridesAnnotation.ANNOTATION_NAME); assertFalse(attributeOverrideResources.hasNext()); attributeOverrides = javaEntity().specifiedAttributeOverrides(); assertFalse(attributeOverrides.hasNext()); - assertNull(typeResource.getAnnotation(AttributeOverrides.ANNOTATION_NAME)); + assertNull(typeResource.getAnnotation(AttributeOverridesAnnotation.ANNOTATION_NAME)); } public void testMoveSpecifiedAttributeOverride() throws Exception { @@ -1904,7 +1904,7 @@ public class JavaEntityTests extends ContextModelTestCase JavaResourcePersistentType typeResource = jpaProject().getJavaPersistentTypeResource(FULLY_QUALIFIED_SUB_TYPE_NAME); - ListIterator<AttributeOverrideAnnotation> javaAttributeOverrides = typeResource.annotations(AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverrides.ANNOTATION_NAME); + ListIterator<AttributeOverrideAnnotation> javaAttributeOverrides = typeResource.annotations(AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverridesAnnotation.ANNOTATION_NAME); assertEquals(3, CollectionTools.size(javaAttributeOverrides)); @@ -1914,7 +1914,7 @@ public class JavaEntityTests extends ContextModelTestCase assertEquals("foo", attributeOverrides.next().getName()); assertEquals("id", attributeOverrides.next().getName()); - javaAttributeOverrides = typeResource.annotations(AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverrides.ANNOTATION_NAME); + javaAttributeOverrides = typeResource.annotations(AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverridesAnnotation.ANNOTATION_NAME); assertEquals("name", javaAttributeOverrides.next().getName()); assertEquals("foo", javaAttributeOverrides.next().getName()); assertEquals("id", javaAttributeOverrides.next().getName()); @@ -1926,7 +1926,7 @@ public class JavaEntityTests extends ContextModelTestCase assertEquals("name", attributeOverrides.next().getName()); assertEquals("id", attributeOverrides.next().getName()); - javaAttributeOverrides = typeResource.annotations(AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverrides.ANNOTATION_NAME); + javaAttributeOverrides = typeResource.annotations(AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverridesAnnotation.ANNOTATION_NAME); assertEquals("foo", javaAttributeOverrides.next().getName()); assertEquals("name", javaAttributeOverrides.next().getName()); assertEquals("id", javaAttributeOverrides.next().getName()); @@ -1939,9 +1939,9 @@ public class JavaEntityTests extends ContextModelTestCase Entity entity = javaEntity(); JavaResourcePersistentType typeResource = jpaProject().getJavaPersistentTypeResource(FULLY_QUALIFIED_TYPE_NAME); - ((AttributeOverrideAnnotation) typeResource.addAnnotation(0, AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverrides.ANNOTATION_NAME)).setName("FOO"); - ((AttributeOverrideAnnotation) typeResource.addAnnotation(1, AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverrides.ANNOTATION_NAME)).setName("BAR"); - ((AttributeOverrideAnnotation) typeResource.addAnnotation(2, AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverrides.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()); @@ -1949,32 +1949,32 @@ public class JavaEntityTests extends ContextModelTestCase assertEquals("BAZ", attributeOverrides.next().getName()); assertFalse(attributeOverrides.hasNext()); - typeResource.move(2, 0, AttributeOverrides.ANNOTATION_NAME); + typeResource.move(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.move(0, 1, AttributeOverrides.ANNOTATION_NAME); + typeResource.move(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.removeAnnotation(1, AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverrides.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.removeAnnotation(1, AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverrides.ANNOTATION_NAME); + typeResource.removeAnnotation(1, AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverridesAnnotation.ANNOTATION_NAME); attributeOverrides = entity.specifiedAttributeOverrides(); assertEquals("BAZ", attributeOverrides.next().getName()); assertFalse(attributeOverrides.hasNext()); - typeResource.removeAnnotation(0, AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverrides.ANNOTATION_NAME); + typeResource.removeAnnotation(0, AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverridesAnnotation.ANNOTATION_NAME); attributeOverrides = entity.specifiedAttributeOverrides(); assertFalse(attributeOverrides.hasNext()); } @@ -2141,7 +2141,7 @@ public class JavaEntityTests extends ContextModelTestCase JavaResourcePersistentType typeResource = jpaProject().getJavaPersistentTypeResource(FULLY_QUALIFIED_SUB_TYPE_NAME); assertEquals(SUB_TYPE_NAME, typeResource.getName()); assertNull(typeResource.getAnnotation(AssociationOverrideAnnotation.ANNOTATION_NAME)); - assertNull(typeResource.getAnnotation(AssociationOverrides.ANNOTATION_NAME)); + assertNull(typeResource.getAnnotation(AssociationOverridesAnnotation.ANNOTATION_NAME)); assertEquals(2, javaEntity.virtualAssociationOverridesSize()); AssociationOverride virtualAssociationOverride = javaEntity.virtualAssociationOverrides().next(); @@ -2155,7 +2155,7 @@ public class JavaEntityTests extends ContextModelTestCase assertEquals(SUB_TYPE_NAME, typeResource.getName()); assertNull(typeResource.getAnnotation(AssociationOverrideAnnotation.ANNOTATION_NAME)); - assertNull(typeResource.getAnnotation(AssociationOverrides.ANNOTATION_NAME)); + assertNull(typeResource.getAnnotation(AssociationOverridesAnnotation.ANNOTATION_NAME)); assertEquals(2, javaEntity.virtualAssociationOverridesSize()); virtualAssociationOverride = javaEntity.virtualAssociationOverrides().next(); @@ -2165,7 +2165,7 @@ public class JavaEntityTests extends ContextModelTestCase //idMapping.getColumn().setSpecifiedTable(null); assertEquals(SUB_TYPE_NAME, typeResource.getName()); assertNull(typeResource.getAnnotation(AssociationOverrideAnnotation.ANNOTATION_NAME)); - assertNull(typeResource.getAnnotation(AssociationOverrides.ANNOTATION_NAME)); + assertNull(typeResource.getAnnotation(AssociationOverridesAnnotation.ANNOTATION_NAME)); virtualAssociationOverride = javaEntity.virtualAssociationOverrides().next(); assertEquals("address", virtualAssociationOverride.getName()); @@ -2286,7 +2286,7 @@ public class JavaEntityTests extends ContextModelTestCase javaEntity().virtualAssociationOverrides().next().setVirtual(false); JavaResourcePersistentType typeResource = jpaProject().getJavaPersistentTypeResource(FULLY_QUALIFIED_SUB_TYPE_NAME); - Iterator<JavaResourceNode> associationOverrides = typeResource.annotations(AssociationOverrideAnnotation.ANNOTATION_NAME, AssociationOverrides.ANNOTATION_NAME); + Iterator<JavaResourceNode> associationOverrides = typeResource.annotations(AssociationOverrideAnnotation.ANNOTATION_NAME, AssociationOverridesAnnotation.ANNOTATION_NAME); assertEquals("address", ((AssociationOverrideAnnotation) associationOverrides.next()).getName()); assertEquals("address2", ((AssociationOverrideAnnotation) associationOverrides.next()).getName()); @@ -2306,7 +2306,7 @@ public class JavaEntityTests extends ContextModelTestCase javaEntity().virtualAssociationOverrides().next().setVirtual(false); JavaResourcePersistentType typeResource = jpaProject().getJavaPersistentTypeResource(FULLY_QUALIFIED_SUB_TYPE_NAME); - Iterator<JavaResourceNode> associationOverrides = typeResource.annotations(AssociationOverrideAnnotation.ANNOTATION_NAME, AssociationOverrides.ANNOTATION_NAME); + Iterator<JavaResourceNode> associationOverrides = typeResource.annotations(AssociationOverrideAnnotation.ANNOTATION_NAME, AssociationOverridesAnnotation.ANNOTATION_NAME); assertEquals("address2", ((AssociationOverrideAnnotation) associationOverrides.next()).getName()); assertEquals("address", ((AssociationOverrideAnnotation) associationOverrides.next()).getName()); @@ -2324,11 +2324,11 @@ public class JavaEntityTests extends ContextModelTestCase javaEntity().virtualAssociationOverrides().next().setVirtual(false); JavaResourcePersistentType typeResource = jpaProject().getJavaPersistentTypeResource(FULLY_QUALIFIED_SUB_TYPE_NAME); - assertEquals(2, CollectionTools.size(typeResource.annotations(AssociationOverrideAnnotation.ANNOTATION_NAME, AssociationOverrides.ANNOTATION_NAME))); + assertEquals(2, CollectionTools.size(typeResource.annotations(AssociationOverrideAnnotation.ANNOTATION_NAME, AssociationOverridesAnnotation.ANNOTATION_NAME))); javaEntity().specifiedAssociationOverrides().next().setVirtual(true); - Iterator<JavaResourceNode> associationOverrideResources = typeResource.annotations(AssociationOverrideAnnotation.ANNOTATION_NAME, AssociationOverrides.ANNOTATION_NAME); + Iterator<JavaResourceNode> associationOverrideResources = typeResource.annotations(AssociationOverrideAnnotation.ANNOTATION_NAME, AssociationOverridesAnnotation.ANNOTATION_NAME); assertEquals("address2", ((AssociationOverrideAnnotation) associationOverrideResources.next()).getName()); assertFalse(associationOverrideResources.hasNext()); @@ -2338,12 +2338,12 @@ public class JavaEntityTests extends ContextModelTestCase javaEntity().specifiedAssociationOverrides().next().setVirtual(true); - associationOverrideResources = typeResource.annotations(AssociationOverrideAnnotation.ANNOTATION_NAME, AssociationOverrides.ANNOTATION_NAME); + associationOverrideResources = typeResource.annotations(AssociationOverrideAnnotation.ANNOTATION_NAME, AssociationOverridesAnnotation.ANNOTATION_NAME); assertFalse(associationOverrideResources.hasNext()); associationOverrides = javaEntity().specifiedAssociationOverrides(); assertFalse(associationOverrides.hasNext()); - assertNull(typeResource.getAnnotation(AssociationOverrides.ANNOTATION_NAME)); + assertNull(typeResource.getAnnotation(AssociationOverridesAnnotation.ANNOTATION_NAME)); } public void testMoveSpecifiedAssociationOverride() throws Exception { @@ -2360,7 +2360,7 @@ public class JavaEntityTests extends ContextModelTestCase JavaResourcePersistentType typeResource = jpaProject().getJavaPersistentTypeResource(FULLY_QUALIFIED_SUB_TYPE_NAME); - ListIterator<AssociationOverrideAnnotation> javaAssociationOverrides = typeResource.annotations(AssociationOverrideAnnotation.ANNOTATION_NAME, AssociationOverrides.ANNOTATION_NAME); + ListIterator<AssociationOverrideAnnotation> javaAssociationOverrides = typeResource.annotations(AssociationOverrideAnnotation.ANNOTATION_NAME, AssociationOverridesAnnotation.ANNOTATION_NAME); assertEquals(2, CollectionTools.size(javaAssociationOverrides)); @@ -2369,7 +2369,7 @@ public class JavaEntityTests extends ContextModelTestCase assertEquals("address2", associationOverrides.next().getName()); assertEquals("address", associationOverrides.next().getName()); - javaAssociationOverrides = typeResource.annotations(AssociationOverrideAnnotation.ANNOTATION_NAME, AssociationOverrides.ANNOTATION_NAME); + javaAssociationOverrides = typeResource.annotations(AssociationOverrideAnnotation.ANNOTATION_NAME, AssociationOverridesAnnotation.ANNOTATION_NAME); assertEquals("address2", javaAssociationOverrides.next().getName()); assertEquals("address", javaAssociationOverrides.next().getName()); @@ -2379,7 +2379,7 @@ public class JavaEntityTests extends ContextModelTestCase assertEquals("address", associationOverrides.next().getName()); assertEquals("address2", associationOverrides.next().getName()); - javaAssociationOverrides = typeResource.annotations(AssociationOverrideAnnotation.ANNOTATION_NAME, AssociationOverrides.ANNOTATION_NAME); + javaAssociationOverrides = typeResource.annotations(AssociationOverrideAnnotation.ANNOTATION_NAME, AssociationOverridesAnnotation.ANNOTATION_NAME); assertEquals("address", javaAssociationOverrides.next().getName()); assertEquals("address2", javaAssociationOverrides.next().getName()); } @@ -2391,9 +2391,9 @@ public class JavaEntityTests extends ContextModelTestCase Entity entity = javaEntity(); JavaResourcePersistentType typeResource = jpaProject().getJavaPersistentTypeResource(FULLY_QUALIFIED_TYPE_NAME); - ((AssociationOverrideAnnotation) typeResource.addAnnotation(0, AssociationOverrideAnnotation.ANNOTATION_NAME, AssociationOverrides.ANNOTATION_NAME)).setName("FOO"); - ((AssociationOverrideAnnotation) typeResource.addAnnotation(1, AssociationOverrideAnnotation.ANNOTATION_NAME, AssociationOverrides.ANNOTATION_NAME)).setName("BAR"); - ((AssociationOverrideAnnotation) typeResource.addAnnotation(2, AssociationOverrideAnnotation.ANNOTATION_NAME, AssociationOverrides.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()); @@ -2401,32 +2401,32 @@ public class JavaEntityTests extends ContextModelTestCase assertEquals("BAZ", associationOverrides.next().getName()); assertFalse(associationOverrides.hasNext()); - typeResource.move(2, 0, AssociationOverrides.ANNOTATION_NAME); + typeResource.move(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.move(0, 1, AssociationOverrides.ANNOTATION_NAME); + typeResource.move(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.removeAnnotation(1, AssociationOverrideAnnotation.ANNOTATION_NAME, AssociationOverrides.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.removeAnnotation(1, AssociationOverrideAnnotation.ANNOTATION_NAME, AssociationOverrides.ANNOTATION_NAME); + typeResource.removeAnnotation(1, AssociationOverrideAnnotation.ANNOTATION_NAME, AssociationOverridesAnnotation.ANNOTATION_NAME); associationOverrides = entity.specifiedAssociationOverrides(); assertEquals("BAZ", associationOverrides.next().getName()); assertFalse(associationOverrides.hasNext()); - typeResource.removeAnnotation(0, AssociationOverrideAnnotation.ANNOTATION_NAME, AssociationOverrides.ANNOTATION_NAME); + typeResource.removeAnnotation(0, AssociationOverrideAnnotation.ANNOTATION_NAME, AssociationOverridesAnnotation.ANNOTATION_NAME); associationOverrides = entity.specifiedAssociationOverrides(); assertFalse(associationOverrides.hasNext()); } @@ -2469,20 +2469,20 @@ public class JavaEntityTests extends ContextModelTestCase NamedQuery namedQuery = entity.addNamedQuery(0); namedQuery.setName("FOO"); - ListIterator<NamedQueryAnnotation> javaNamedQueries = typeResource.annotations(NamedQueryAnnotation.ANNOTATION_NAME, NamedQueries.ANNOTATION_NAME); + ListIterator<NamedQueryAnnotation> javaNamedQueries = typeResource.annotations(NamedQueryAnnotation.ANNOTATION_NAME, NamedQueriesAnnotation.ANNOTATION_NAME); assertEquals("FOO", javaNamedQueries.next().getName()); NamedQuery namedQuery2 = entity.addNamedQuery(0); namedQuery2.setName("BAR"); - javaNamedQueries = typeResource.annotations(NamedQueryAnnotation.ANNOTATION_NAME, NamedQueries.ANNOTATION_NAME); + javaNamedQueries = typeResource.annotations(NamedQueryAnnotation.ANNOTATION_NAME, NamedQueriesAnnotation.ANNOTATION_NAME); assertEquals("BAR", javaNamedQueries.next().getName()); assertEquals("FOO", javaNamedQueries.next().getName()); NamedQuery namedQuery3 = entity.addNamedQuery(1); namedQuery3.setName("BAZ"); - javaNamedQueries = typeResource.annotations(NamedQueryAnnotation.ANNOTATION_NAME, NamedQueries.ANNOTATION_NAME); + javaNamedQueries = typeResource.annotations(NamedQueryAnnotation.ANNOTATION_NAME, NamedQueriesAnnotation.ANNOTATION_NAME); assertEquals("BAR", javaNamedQueries.next().getName()); assertEquals("BAZ", javaNamedQueries.next().getName()); assertEquals("FOO", javaNamedQueries.next().getName()); @@ -2511,24 +2511,24 @@ public class JavaEntityTests extends ContextModelTestCase entity.addNamedQuery(1).setName("BAR"); entity.addNamedQuery(2).setName("BAZ"); - ListIterator<NamedQueryAnnotation> javaNamedQueries = typeResource.annotations(NamedQueryAnnotation.ANNOTATION_NAME, NamedQueries.ANNOTATION_NAME); + ListIterator<NamedQueryAnnotation> javaNamedQueries = typeResource.annotations(NamedQueryAnnotation.ANNOTATION_NAME, NamedQueriesAnnotation.ANNOTATION_NAME); assertEquals(3, CollectionTools.size(javaNamedQueries)); entity.removeNamedQuery(0); - javaNamedQueries = typeResource.annotations(NamedQueryAnnotation.ANNOTATION_NAME, NamedQueries.ANNOTATION_NAME); + javaNamedQueries = typeResource.annotations(NamedQueryAnnotation.ANNOTATION_NAME, NamedQueriesAnnotation.ANNOTATION_NAME); assertEquals(2, CollectionTools.size(javaNamedQueries)); - javaNamedQueries = typeResource.annotations(NamedQueryAnnotation.ANNOTATION_NAME, NamedQueries.ANNOTATION_NAME); + javaNamedQueries = typeResource.annotations(NamedQueryAnnotation.ANNOTATION_NAME, NamedQueriesAnnotation.ANNOTATION_NAME); assertEquals("BAR", javaNamedQueries.next().getName()); assertEquals("BAZ", javaNamedQueries.next().getName()); entity.removeNamedQuery(0); - javaNamedQueries = typeResource.annotations(NamedQueryAnnotation.ANNOTATION_NAME, NamedQueries.ANNOTATION_NAME); + javaNamedQueries = typeResource.annotations(NamedQueryAnnotation.ANNOTATION_NAME, NamedQueriesAnnotation.ANNOTATION_NAME); assertEquals(1, CollectionTools.size(javaNamedQueries)); - javaNamedQueries = typeResource.annotations(NamedQueryAnnotation.ANNOTATION_NAME, NamedQueries.ANNOTATION_NAME); + javaNamedQueries = typeResource.annotations(NamedQueryAnnotation.ANNOTATION_NAME, NamedQueriesAnnotation.ANNOTATION_NAME); assertEquals("BAZ", javaNamedQueries.next().getName()); entity.removeNamedQuery(0); - javaNamedQueries = typeResource.annotations(NamedQueryAnnotation.ANNOTATION_NAME, NamedQueries.ANNOTATION_NAME); + javaNamedQueries = typeResource.annotations(NamedQueryAnnotation.ANNOTATION_NAME, NamedQueriesAnnotation.ANNOTATION_NAME); assertEquals(0, CollectionTools.size(javaNamedQueries)); } @@ -2577,7 +2577,7 @@ public class JavaEntityTests extends ContextModelTestCase entity.addNamedQuery(1).setName("BAR"); entity.addNamedQuery(2).setName("BAZ"); - ListIterator<NamedQueryAnnotation> javaNamedQueries = typeResource.annotations(NamedQueryAnnotation.ANNOTATION_NAME, NamedQueries.ANNOTATION_NAME); + ListIterator<NamedQueryAnnotation> javaNamedQueries = typeResource.annotations(NamedQueryAnnotation.ANNOTATION_NAME, NamedQueriesAnnotation.ANNOTATION_NAME); assertEquals(3, CollectionTools.size(javaNamedQueries)); @@ -2587,7 +2587,7 @@ public class JavaEntityTests extends ContextModelTestCase assertEquals("BAZ", namedQueries.next().getName()); assertEquals("FOO", namedQueries.next().getName()); - javaNamedQueries = typeResource.annotations(NamedQueryAnnotation.ANNOTATION_NAME, NamedQueries.ANNOTATION_NAME); + javaNamedQueries = typeResource.annotations(NamedQueryAnnotation.ANNOTATION_NAME, NamedQueriesAnnotation.ANNOTATION_NAME); assertEquals("BAR", javaNamedQueries.next().getName()); assertEquals("BAZ", javaNamedQueries.next().getName()); assertEquals("FOO", javaNamedQueries.next().getName()); @@ -2599,7 +2599,7 @@ public class JavaEntityTests extends ContextModelTestCase assertEquals("BAR", namedQueries.next().getName()); assertEquals("FOO", namedQueries.next().getName()); - javaNamedQueries = typeResource.annotations(NamedQueryAnnotation.ANNOTATION_NAME, NamedQueries.ANNOTATION_NAME); + javaNamedQueries = typeResource.annotations(NamedQueryAnnotation.ANNOTATION_NAME, NamedQueriesAnnotation.ANNOTATION_NAME); assertEquals("BAZ", javaNamedQueries.next().getName()); assertEquals("BAR", javaNamedQueries.next().getName()); assertEquals("FOO", javaNamedQueries.next().getName()); @@ -2614,9 +2614,9 @@ public class JavaEntityTests extends ContextModelTestCase assertEquals(0, CollectionTools.size(entity.getPersistenceUnit().allQueries())); - ((NamedQueryAnnotation) typeResource.addAnnotation(0, NamedQueryAnnotation.ANNOTATION_NAME, NamedQueries.ANNOTATION_NAME)).setName("FOO"); - ((NamedQueryAnnotation) typeResource.addAnnotation(1, NamedQueryAnnotation.ANNOTATION_NAME, NamedQueries.ANNOTATION_NAME)).setName("BAR"); - ((NamedQueryAnnotation) typeResource.addAnnotation(2, NamedQueryAnnotation.ANNOTATION_NAME, NamedQueries.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<NamedQuery> namedQueries = entity.namedQueries(); assertEquals("FOO", namedQueries.next().getName()); assertEquals("BAR", namedQueries.next().getName()); @@ -2624,34 +2624,34 @@ public class JavaEntityTests extends ContextModelTestCase assertFalse(namedQueries.hasNext()); assertEquals(3, CollectionTools.size(entity.getPersistenceUnit().allQueries())); - typeResource.move(2, 0, NamedQueries.ANNOTATION_NAME); + typeResource.move(2, 0, NamedQueriesAnnotation.ANNOTATION_NAME); namedQueries = entity.namedQueries(); assertEquals("BAR", namedQueries.next().getName()); assertEquals("BAZ", namedQueries.next().getName()); assertEquals("FOO", namedQueries.next().getName()); assertFalse(namedQueries.hasNext()); - typeResource.move(0, 1, NamedQueries.ANNOTATION_NAME); + typeResource.move(0, 1, NamedQueriesAnnotation.ANNOTATION_NAME); namedQueries = entity.namedQueries(); assertEquals("BAZ", namedQueries.next().getName()); assertEquals("BAR", namedQueries.next().getName()); assertEquals("FOO", namedQueries.next().getName()); assertFalse(namedQueries.hasNext()); - typeResource.removeAnnotation(1, NamedQueryAnnotation.ANNOTATION_NAME, NamedQueries.ANNOTATION_NAME); + typeResource.removeAnnotation(1, NamedQueryAnnotation.ANNOTATION_NAME, NamedQueriesAnnotation.ANNOTATION_NAME); namedQueries = entity.namedQueries(); assertEquals("BAZ", namedQueries.next().getName()); assertEquals("FOO", namedQueries.next().getName()); assertFalse(namedQueries.hasNext()); assertEquals(2, CollectionTools.size(entity.getPersistenceUnit().allQueries())); - typeResource.removeAnnotation(1, NamedQueryAnnotation.ANNOTATION_NAME, NamedQueries.ANNOTATION_NAME); + typeResource.removeAnnotation(1, NamedQueryAnnotation.ANNOTATION_NAME, NamedQueriesAnnotation.ANNOTATION_NAME); namedQueries = entity.namedQueries(); assertEquals("BAZ", namedQueries.next().getName()); assertFalse(namedQueries.hasNext()); assertEquals(1, CollectionTools.size(entity.getPersistenceUnit().allQueries())); - typeResource.removeAnnotation(0, NamedQueryAnnotation.ANNOTATION_NAME, NamedQueries.ANNOTATION_NAME); + typeResource.removeAnnotation(0, NamedQueryAnnotation.ANNOTATION_NAME, NamedQueriesAnnotation.ANNOTATION_NAME); namedQueries = entity.namedQueries(); assertFalse(namedQueries.hasNext()); assertEquals(0, CollectionTools.size(entity.getPersistenceUnit().allQueries())); @@ -2666,9 +2666,9 @@ public class JavaEntityTests extends ContextModelTestCase assertEquals(0, entity.namedQueriesSize()); - ((NamedQueryAnnotation) typeResource.addAnnotation(0, NamedQueryAnnotation.ANNOTATION_NAME, NamedQueries.ANNOTATION_NAME)).setName("FOO"); - ((NamedQueryAnnotation) typeResource.addAnnotation(1, NamedQueryAnnotation.ANNOTATION_NAME, NamedQueries.ANNOTATION_NAME)).setName("BAR"); - ((NamedQueryAnnotation) typeResource.addAnnotation(2, NamedQueryAnnotation.ANNOTATION_NAME, NamedQueries.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.namedQueriesSize()); } @@ -2683,20 +2683,20 @@ public class JavaEntityTests extends ContextModelTestCase NamedNativeQuery namedNativeQuery = entity.addNamedNativeQuery(0); namedNativeQuery.setName("FOO"); - ListIterator<NamedNativeQueryAnnotation> javaNamedQueries = typeResource.annotations(NamedNativeQueryAnnotation.ANNOTATION_NAME, NamedNativeQueries.ANNOTATION_NAME); + ListIterator<NamedNativeQueryAnnotation> javaNamedQueries = typeResource.annotations(NamedNativeQueryAnnotation.ANNOTATION_NAME, NamedNativeQueriesAnnotation.ANNOTATION_NAME); assertEquals("FOO", javaNamedQueries.next().getName()); NamedNativeQuery namedNativeQuery2 = entity.addNamedNativeQuery(0); namedNativeQuery2.setName("BAR"); - javaNamedQueries = typeResource.annotations(NamedNativeQueryAnnotation.ANNOTATION_NAME, NamedNativeQueries.ANNOTATION_NAME); + javaNamedQueries = typeResource.annotations(NamedNativeQueryAnnotation.ANNOTATION_NAME, NamedNativeQueriesAnnotation.ANNOTATION_NAME); assertEquals("BAR", javaNamedQueries.next().getName()); assertEquals("FOO", javaNamedQueries.next().getName()); NamedNativeQuery namedNativeQuery3 = entity.addNamedNativeQuery(1); namedNativeQuery3.setName("BAZ"); - javaNamedQueries = typeResource.annotations(NamedNativeQueryAnnotation.ANNOTATION_NAME, NamedNativeQueries.ANNOTATION_NAME); + javaNamedQueries = typeResource.annotations(NamedNativeQueryAnnotation.ANNOTATION_NAME, NamedNativeQueriesAnnotation.ANNOTATION_NAME); assertEquals("BAR", javaNamedQueries.next().getName()); assertEquals("BAZ", javaNamedQueries.next().getName()); assertEquals("FOO", javaNamedQueries.next().getName()); @@ -2723,24 +2723,24 @@ public class JavaEntityTests extends ContextModelTestCase entity.addNamedNativeQuery(1).setName("BAR"); entity.addNamedNativeQuery(2).setName("BAZ"); - ListIterator<NamedNativeQueryAnnotation> javaNamedQueries = typeResource.annotations(NamedNativeQueryAnnotation.ANNOTATION_NAME, NamedNativeQueries.ANNOTATION_NAME); + ListIterator<NamedNativeQueryAnnotation> javaNamedQueries = typeResource.annotations(NamedNativeQueryAnnotation.ANNOTATION_NAME, NamedNativeQueriesAnnotation.ANNOTATION_NAME); assertEquals(3, CollectionTools.size(javaNamedQueries)); entity.removeNamedNativeQuery(0); - javaNamedQueries = typeResource.annotations(NamedNativeQueryAnnotation.ANNOTATION_NAME, NamedNativeQueries.ANNOTATION_NAME); + javaNamedQueries = typeResource.annotations(NamedNativeQueryAnnotation.ANNOTATION_NAME, NamedNativeQueriesAnnotation.ANNOTATION_NAME); assertEquals(2, CollectionTools.size(javaNamedQueries)); - javaNamedQueries = typeResource.annotations(NamedNativeQueryAnnotation.ANNOTATION_NAME, NamedNativeQueries.ANNOTATION_NAME); + javaNamedQueries = typeResource.annotations(NamedNativeQueryAnnotation.ANNOTATION_NAME, NamedNativeQueriesAnnotation.ANNOTATION_NAME); assertEquals("BAR", javaNamedQueries.next().getName()); assertEquals("BAZ", javaNamedQueries.next().getName()); entity.removeNamedNativeQuery(0); - javaNamedQueries = typeResource.annotations(NamedNativeQueryAnnotation.ANNOTATION_NAME, NamedNativeQueries.ANNOTATION_NAME); + javaNamedQueries = typeResource.annotations(NamedNativeQueryAnnotation.ANNOTATION_NAME, NamedNativeQueriesAnnotation.ANNOTATION_NAME); assertEquals(1, CollectionTools.size(javaNamedQueries)); - javaNamedQueries = typeResource.annotations(NamedNativeQueryAnnotation.ANNOTATION_NAME, NamedNativeQueries.ANNOTATION_NAME); + javaNamedQueries = typeResource.annotations(NamedNativeQueryAnnotation.ANNOTATION_NAME, NamedNativeQueriesAnnotation.ANNOTATION_NAME); assertEquals("BAZ", javaNamedQueries.next().getName()); entity.removeNamedNativeQuery(0); - javaNamedQueries = typeResource.annotations(NamedNativeQueryAnnotation.ANNOTATION_NAME, NamedNativeQueries.ANNOTATION_NAME); + javaNamedQueries = typeResource.annotations(NamedNativeQueryAnnotation.ANNOTATION_NAME, NamedNativeQueriesAnnotation.ANNOTATION_NAME); assertEquals(0, CollectionTools.size(javaNamedQueries)); } @@ -2755,7 +2755,7 @@ public class JavaEntityTests extends ContextModelTestCase entity.addNamedNativeQuery(1).setName("BAR"); entity.addNamedNativeQuery(2).setName("BAZ"); - ListIterator<NamedNativeQueryAnnotation> javaNamedQueries = typeResource.annotations(NamedNativeQueryAnnotation.ANNOTATION_NAME, NamedNativeQueries.ANNOTATION_NAME); + ListIterator<NamedNativeQueryAnnotation> javaNamedQueries = typeResource.annotations(NamedNativeQueryAnnotation.ANNOTATION_NAME, NamedNativeQueriesAnnotation.ANNOTATION_NAME); assertEquals(3, CollectionTools.size(javaNamedQueries)); @@ -2765,7 +2765,7 @@ public class JavaEntityTests extends ContextModelTestCase assertEquals("BAZ", namedQueries.next().getName()); assertEquals("FOO", namedQueries.next().getName()); - javaNamedQueries = typeResource.annotations(NamedNativeQueryAnnotation.ANNOTATION_NAME, NamedNativeQueries.ANNOTATION_NAME); + javaNamedQueries = typeResource.annotations(NamedNativeQueryAnnotation.ANNOTATION_NAME, NamedNativeQueriesAnnotation.ANNOTATION_NAME); assertEquals("BAR", javaNamedQueries.next().getName()); assertEquals("BAZ", javaNamedQueries.next().getName()); assertEquals("FOO", javaNamedQueries.next().getName()); @@ -2777,7 +2777,7 @@ public class JavaEntityTests extends ContextModelTestCase assertEquals("BAR", namedQueries.next().getName()); assertEquals("FOO", namedQueries.next().getName()); - javaNamedQueries = typeResource.annotations(NamedNativeQueryAnnotation.ANNOTATION_NAME, NamedNativeQueries.ANNOTATION_NAME); + javaNamedQueries = typeResource.annotations(NamedNativeQueryAnnotation.ANNOTATION_NAME, NamedNativeQueriesAnnotation.ANNOTATION_NAME); assertEquals("BAZ", javaNamedQueries.next().getName()); assertEquals("BAR", javaNamedQueries.next().getName()); assertEquals("FOO", javaNamedQueries.next().getName()); @@ -2792,9 +2792,9 @@ public class JavaEntityTests extends ContextModelTestCase assertEquals(0, CollectionTools.size(entity.getPersistenceUnit().allQueries())); - ((NamedNativeQueryAnnotation) typeResource.addAnnotation(0, NamedNativeQueryAnnotation.ANNOTATION_NAME, NamedNativeQueries.ANNOTATION_NAME)).setName("FOO"); - ((NamedNativeQueryAnnotation) typeResource.addAnnotation(1, NamedNativeQueryAnnotation.ANNOTATION_NAME, NamedNativeQueries.ANNOTATION_NAME)).setName("BAR"); - ((NamedNativeQueryAnnotation) typeResource.addAnnotation(2, NamedNativeQueryAnnotation.ANNOTATION_NAME, NamedNativeQueries.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<NamedNativeQuery> namedQueries = entity.namedNativeQueries(); assertEquals("FOO", namedQueries.next().getName()); assertEquals("BAR", namedQueries.next().getName()); @@ -2802,34 +2802,34 @@ public class JavaEntityTests extends ContextModelTestCase assertFalse(namedQueries.hasNext()); assertEquals(3, CollectionTools.size(entity.getPersistenceUnit().allQueries())); - typeResource.move(2, 0, NamedNativeQueries.ANNOTATION_NAME); + typeResource.move(2, 0, NamedNativeQueriesAnnotation.ANNOTATION_NAME); namedQueries = entity.namedNativeQueries(); assertEquals("BAR", namedQueries.next().getName()); assertEquals("BAZ", namedQueries.next().getName()); assertEquals("FOO", namedQueries.next().getName()); assertFalse(namedQueries.hasNext()); - typeResource.move(0, 1, NamedNativeQueries.ANNOTATION_NAME); + typeResource.move(0, 1, NamedNativeQueriesAnnotation.ANNOTATION_NAME); namedQueries = entity.namedNativeQueries(); assertEquals("BAZ", namedQueries.next().getName()); assertEquals("BAR", namedQueries.next().getName()); assertEquals("FOO", namedQueries.next().getName()); assertFalse(namedQueries.hasNext()); - typeResource.removeAnnotation(1, NamedNativeQueryAnnotation.ANNOTATION_NAME, NamedNativeQueries.ANNOTATION_NAME); + typeResource.removeAnnotation(1, NamedNativeQueryAnnotation.ANNOTATION_NAME, NamedNativeQueriesAnnotation.ANNOTATION_NAME); namedQueries = entity.namedNativeQueries(); assertEquals("BAZ", namedQueries.next().getName()); assertEquals("FOO", namedQueries.next().getName()); assertFalse(namedQueries.hasNext()); assertEquals(2, CollectionTools.size(entity.getPersistenceUnit().allQueries())); - typeResource.removeAnnotation(1, NamedNativeQueryAnnotation.ANNOTATION_NAME, NamedNativeQueries.ANNOTATION_NAME); + typeResource.removeAnnotation(1, NamedNativeQueryAnnotation.ANNOTATION_NAME, NamedNativeQueriesAnnotation.ANNOTATION_NAME); namedQueries = entity.namedNativeQueries(); assertEquals("BAZ", namedQueries.next().getName()); assertFalse(namedQueries.hasNext()); assertEquals(1, CollectionTools.size(entity.getPersistenceUnit().allQueries())); - typeResource.removeAnnotation(0, NamedNativeQueryAnnotation.ANNOTATION_NAME, NamedNativeQueries.ANNOTATION_NAME); + typeResource.removeAnnotation(0, NamedNativeQueryAnnotation.ANNOTATION_NAME, NamedNativeQueriesAnnotation.ANNOTATION_NAME); namedQueries = entity.namedNativeQueries(); assertFalse(namedQueries.hasNext()); assertEquals(0, CollectionTools.size(entity.getPersistenceUnit().allQueries())); @@ -2844,9 +2844,9 @@ public class JavaEntityTests extends ContextModelTestCase assertEquals(0, entity.namedNativeQueriesSize()); - ((NamedNativeQueryAnnotation) typeResource.addAnnotation(0, NamedNativeQueryAnnotation.ANNOTATION_NAME, NamedNativeQueries.ANNOTATION_NAME)).setName("FOO"); - ((NamedNativeQueryAnnotation) typeResource.addAnnotation(1, NamedNativeQueryAnnotation.ANNOTATION_NAME, NamedNativeQueries.ANNOTATION_NAME)).setName("BAR"); - ((NamedNativeQueryAnnotation) typeResource.addAnnotation(2, NamedNativeQueryAnnotation.ANNOTATION_NAME, NamedNativeQueries.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.namedNativeQueriesSize()); } 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 235bcd1eb5..999c85b3eb 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 @@ -25,24 +25,24 @@ import org.eclipse.jpt.core.context.PersistentAttribute; import org.eclipse.jpt.core.context.TemporalType; import org.eclipse.jpt.core.context.TransientMapping; import org.eclipse.jpt.core.context.VersionMapping; -import org.eclipse.jpt.core.resource.java.Basic; +import org.eclipse.jpt.core.resource.java.BasicAnnotation; import org.eclipse.jpt.core.resource.java.ColumnAnnotation; -import org.eclipse.jpt.core.resource.java.Embedded; -import org.eclipse.jpt.core.resource.java.EmbeddedId; +import org.eclipse.jpt.core.resource.java.EmbeddedAnnotation; +import org.eclipse.jpt.core.resource.java.EmbeddedIdAnnotation; import org.eclipse.jpt.core.resource.java.GeneratedValueAnnotation; -import org.eclipse.jpt.core.resource.java.Id; +import org.eclipse.jpt.core.resource.java.IdAnnotation; import org.eclipse.jpt.core.resource.java.JPA; import org.eclipse.jpt.core.resource.java.JavaResourcePersistentAttribute; import org.eclipse.jpt.core.resource.java.JavaResourcePersistentType; -import org.eclipse.jpt.core.resource.java.ManyToMany; -import org.eclipse.jpt.core.resource.java.ManyToOne; -import org.eclipse.jpt.core.resource.java.OneToMany; -import org.eclipse.jpt.core.resource.java.OneToOne; +import org.eclipse.jpt.core.resource.java.ManyToManyAnnotation; +import org.eclipse.jpt.core.resource.java.ManyToOneAnnotation; +import org.eclipse.jpt.core.resource.java.OneToManyAnnotation; +import org.eclipse.jpt.core.resource.java.OneToOneAnnotation; import org.eclipse.jpt.core.resource.java.SequenceGeneratorAnnotation; import org.eclipse.jpt.core.resource.java.TableGeneratorAnnotation; -import org.eclipse.jpt.core.resource.java.Temporal; -import org.eclipse.jpt.core.resource.java.Transient; -import org.eclipse.jpt.core.resource.java.Version; +import org.eclipse.jpt.core.resource.java.TemporalAnnotation; +import org.eclipse.jpt.core.resource.java.TransientAnnotation; +import org.eclipse.jpt.core.resource.java.VersionAnnotation; import org.eclipse.jpt.core.tests.internal.context.ContextModelTestCase; import org.eclipse.jpt.utility.internal.CollectionTools; import org.eclipse.jpt.utility.internal.iterators.ArrayIterator; @@ -155,10 +155,10 @@ public class JavaIdMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = jpaProject().getJavaPersistentTypeResource(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.attributes().next(); - assertNull(attributeResource.getMappingAnnotation(Id.ANNOTATION_NAME)); - assertNotNull(attributeResource.getMappingAnnotation(Basic.ANNOTATION_NAME)); + assertNull(attributeResource.getMappingAnnotation(IdAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getMappingAnnotation(BasicAnnotation.ANNOTATION_NAME)); assertNotNull(attributeResource.getAnnotation(ColumnAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getAnnotation(Temporal.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)); @@ -184,9 +184,9 @@ public class JavaIdMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = jpaProject().getJavaPersistentTypeResource(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.attributes().next(); - assertNull(attributeResource.getMappingAnnotation(Id.ANNOTATION_NAME)); + assertNull(attributeResource.getMappingAnnotation(IdAnnotation.ANNOTATION_NAME)); assertNotNull(attributeResource.getAnnotation(ColumnAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getAnnotation(Temporal.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)); @@ -212,10 +212,10 @@ public class JavaIdMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = jpaProject().getJavaPersistentTypeResource(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.attributes().next(); - assertNull(attributeResource.getMappingAnnotation(Id.ANNOTATION_NAME)); - assertNotNull(attributeResource.getMappingAnnotation(Version.ANNOTATION_NAME)); + assertNull(attributeResource.getMappingAnnotation(IdAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getMappingAnnotation(VersionAnnotation.ANNOTATION_NAME)); assertNotNull(attributeResource.getAnnotation(ColumnAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getAnnotation(Temporal.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)); @@ -240,10 +240,10 @@ public class JavaIdMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = jpaProject().getJavaPersistentTypeResource(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.attributes().next(); - assertNull(attributeResource.getMappingAnnotation(Id.ANNOTATION_NAME)); - assertNotNull(attributeResource.getMappingAnnotation(Embedded.ANNOTATION_NAME)); + assertNull(attributeResource.getMappingAnnotation(IdAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getMappingAnnotation(EmbeddedAnnotation.ANNOTATION_NAME)); assertNull(attributeResource.getAnnotation(ColumnAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(Temporal.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)); @@ -268,10 +268,10 @@ public class JavaIdMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = jpaProject().getJavaPersistentTypeResource(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.attributes().next(); - assertNull(attributeResource.getMappingAnnotation(Id.ANNOTATION_NAME)); - assertNotNull(attributeResource.getMappingAnnotation(Transient.ANNOTATION_NAME)); + assertNull(attributeResource.getMappingAnnotation(IdAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getMappingAnnotation(TransientAnnotation.ANNOTATION_NAME)); assertNull(attributeResource.getAnnotation(ColumnAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(Temporal.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)); @@ -296,10 +296,10 @@ public class JavaIdMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = jpaProject().getJavaPersistentTypeResource(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.attributes().next(); - assertNull(attributeResource.getMappingAnnotation(Id.ANNOTATION_NAME)); - assertNotNull(attributeResource.getMappingAnnotation(EmbeddedId.ANNOTATION_NAME)); + assertNull(attributeResource.getMappingAnnotation(IdAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getMappingAnnotation(EmbeddedIdAnnotation.ANNOTATION_NAME)); assertNull(attributeResource.getAnnotation(ColumnAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(Temporal.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)); @@ -324,10 +324,10 @@ public class JavaIdMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = jpaProject().getJavaPersistentTypeResource(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.attributes().next(); - assertNull(attributeResource.getMappingAnnotation(Id.ANNOTATION_NAME)); - assertNotNull(attributeResource.getMappingAnnotation(OneToOne.ANNOTATION_NAME)); + assertNull(attributeResource.getMappingAnnotation(IdAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getMappingAnnotation(OneToOneAnnotation.ANNOTATION_NAME)); assertNull(attributeResource.getAnnotation(ColumnAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(Temporal.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)); @@ -352,10 +352,10 @@ public class JavaIdMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = jpaProject().getJavaPersistentTypeResource(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.attributes().next(); - assertNull(attributeResource.getMappingAnnotation(Id.ANNOTATION_NAME)); - assertNotNull(attributeResource.getMappingAnnotation(OneToMany.ANNOTATION_NAME)); + assertNull(attributeResource.getMappingAnnotation(IdAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getMappingAnnotation(OneToManyAnnotation.ANNOTATION_NAME)); assertNull(attributeResource.getAnnotation(ColumnAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(Temporal.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)); @@ -380,10 +380,10 @@ public class JavaIdMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = jpaProject().getJavaPersistentTypeResource(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.attributes().next(); - assertNull(attributeResource.getMappingAnnotation(Id.ANNOTATION_NAME)); - assertNotNull(attributeResource.getMappingAnnotation(ManyToOne.ANNOTATION_NAME)); + assertNull(attributeResource.getMappingAnnotation(IdAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getMappingAnnotation(ManyToOneAnnotation.ANNOTATION_NAME)); assertNull(attributeResource.getAnnotation(ColumnAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(Temporal.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)); @@ -408,10 +408,10 @@ public class JavaIdMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = jpaProject().getJavaPersistentTypeResource(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.attributes().next(); - assertNull(attributeResource.getMappingAnnotation(Id.ANNOTATION_NAME)); - assertNotNull(attributeResource.getMappingAnnotation(ManyToMany.ANNOTATION_NAME)); + assertNull(attributeResource.getMappingAnnotation(IdAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getMappingAnnotation(ManyToManyAnnotation.ANNOTATION_NAME)); assertNull(attributeResource.getAnnotation(ColumnAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(Temporal.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)); @@ -449,12 +449,12 @@ public class JavaIdMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = jpaProject().getJavaPersistentTypeResource(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.attributes().next(); - Temporal temporal = (Temporal) attributeResource.getAnnotation(Temporal.ANNOTATION_NAME); + TemporalAnnotation temporal = (TemporalAnnotation) attributeResource.getAnnotation(TemporalAnnotation.ANNOTATION_NAME); assertEquals(org.eclipse.jpt.core.resource.java.TemporalType.TIME, temporal.getValue()); idMapping.setTemporal(null); - assertNull(attributeResource.getAnnotation(Temporal.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(TemporalAnnotation.ANNOTATION_NAME)); } public void testGetTemporalUpdatesFromResourceModelChange() throws Exception { @@ -469,12 +469,12 @@ public class JavaIdMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = jpaProject().getJavaPersistentTypeResource(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.attributes().next(); - Temporal temporal = (Temporal) attributeResource.addAnnotation(Temporal.ANNOTATION_NAME); + TemporalAnnotation temporal = (TemporalAnnotation) attributeResource.addAnnotation(TemporalAnnotation.ANNOTATION_NAME); temporal.setValue(org.eclipse.jpt.core.resource.java.TemporalType.DATE); assertEquals(TemporalType.DATE, idMapping.getTemporal()); - attributeResource.removeAnnotation(Temporal.ANNOTATION_NAME); + attributeResource.removeAnnotation(TemporalAnnotation.ANNOTATION_NAME); assertNull(idMapping.getTemporal()); assertFalse(idMapping.isDefault()); 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 196389abda..fe413a26fc 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 @@ -29,22 +29,22 @@ import org.eclipse.jpt.core.context.TypeMapping; import org.eclipse.jpt.core.context.VersionMapping; import org.eclipse.jpt.core.context.java.JavaPersistentType; import org.eclipse.jpt.core.context.persistence.ClassRef; -import org.eclipse.jpt.core.resource.java.Basic; -import org.eclipse.jpt.core.resource.java.Embedded; -import org.eclipse.jpt.core.resource.java.EmbeddedId; -import org.eclipse.jpt.core.resource.java.Id; +import org.eclipse.jpt.core.resource.java.BasicAnnotation; +import org.eclipse.jpt.core.resource.java.EmbeddedAnnotation; +import org.eclipse.jpt.core.resource.java.EmbeddedIdAnnotation; +import org.eclipse.jpt.core.resource.java.IdAnnotation; import org.eclipse.jpt.core.resource.java.JPA; import org.eclipse.jpt.core.resource.java.JavaResourcePersistentAttribute; import org.eclipse.jpt.core.resource.java.JavaResourcePersistentType; import org.eclipse.jpt.core.resource.java.JoinTableAnnotation; -import org.eclipse.jpt.core.resource.java.ManyToMany; -import org.eclipse.jpt.core.resource.java.ManyToOne; -import org.eclipse.jpt.core.resource.java.MapKey; -import org.eclipse.jpt.core.resource.java.OneToMany; -import org.eclipse.jpt.core.resource.java.OneToOne; -import org.eclipse.jpt.core.resource.java.OrderBy; -import org.eclipse.jpt.core.resource.java.Transient; -import org.eclipse.jpt.core.resource.java.Version; +import org.eclipse.jpt.core.resource.java.ManyToManyAnnotation; +import org.eclipse.jpt.core.resource.java.ManyToOneAnnotation; +import org.eclipse.jpt.core.resource.java.MapKeyAnnotation; +import org.eclipse.jpt.core.resource.java.OneToManyAnnotation; +import org.eclipse.jpt.core.resource.java.OneToOneAnnotation; +import org.eclipse.jpt.core.resource.java.OrderByAnnotation; +import org.eclipse.jpt.core.resource.java.TransientAnnotation; +import org.eclipse.jpt.core.resource.java.VersionAnnotation; import org.eclipse.jpt.core.tests.internal.context.ContextModelTestCase; import org.eclipse.jpt.core.tests.internal.projects.TestJavaProject.SourceWriter; import org.eclipse.jpt.utility.internal.iterators.ArrayIterator; @@ -206,10 +206,10 @@ public class JavaManyToManyMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = jpaProject().getJavaPersistentTypeResource(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.attributes().next(); - assertNull(attributeResource.getMappingAnnotation(ManyToMany.ANNOTATION_NAME)); - assertNotNull(attributeResource.getMappingAnnotation(Basic.ANNOTATION_NAME)); + assertNull(attributeResource.getMappingAnnotation(ManyToManyAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getMappingAnnotation(BasicAnnotation.ANNOTATION_NAME)); assertNull(attributeResource.getAnnotation(JoinTableAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(OrderBy.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(OrderByAnnotation.ANNOTATION_NAME)); } public void testMorphToDefault() throws Exception { @@ -228,9 +228,9 @@ public class JavaManyToManyMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = jpaProject().getJavaPersistentTypeResource(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.attributes().next(); - assertNull(attributeResource.getMappingAnnotation(ManyToMany.ANNOTATION_NAME)); + assertNull(attributeResource.getMappingAnnotation(ManyToManyAnnotation.ANNOTATION_NAME)); assertNull(attributeResource.getAnnotation(JoinTableAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(OrderBy.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(OrderByAnnotation.ANNOTATION_NAME)); } public void testMorphToVersionMapping() throws Exception { @@ -249,10 +249,10 @@ public class JavaManyToManyMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = jpaProject().getJavaPersistentTypeResource(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.attributes().next(); - assertNull(attributeResource.getMappingAnnotation(ManyToMany.ANNOTATION_NAME)); - assertNotNull(attributeResource.getMappingAnnotation(Version.ANNOTATION_NAME)); + assertNull(attributeResource.getMappingAnnotation(ManyToManyAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getMappingAnnotation(VersionAnnotation.ANNOTATION_NAME)); assertNull(attributeResource.getAnnotation(JoinTableAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(OrderBy.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(OrderByAnnotation.ANNOTATION_NAME)); } public void testMorphToIdMapping() throws Exception { @@ -271,10 +271,10 @@ public class JavaManyToManyMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = jpaProject().getJavaPersistentTypeResource(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.attributes().next(); - assertNull(attributeResource.getMappingAnnotation(ManyToMany.ANNOTATION_NAME)); - assertNotNull(attributeResource.getMappingAnnotation(Id.ANNOTATION_NAME)); + assertNull(attributeResource.getMappingAnnotation(ManyToManyAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getMappingAnnotation(IdAnnotation.ANNOTATION_NAME)); assertNull(attributeResource.getAnnotation(JoinTableAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(OrderBy.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(OrderByAnnotation.ANNOTATION_NAME)); } public void testMorphToEmbeddedMapping() throws Exception { @@ -293,10 +293,10 @@ public class JavaManyToManyMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = jpaProject().getJavaPersistentTypeResource(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.attributes().next(); - assertNull(attributeResource.getMappingAnnotation(ManyToMany.ANNOTATION_NAME)); - assertNotNull(attributeResource.getMappingAnnotation(Embedded.ANNOTATION_NAME)); + assertNull(attributeResource.getMappingAnnotation(ManyToManyAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getMappingAnnotation(EmbeddedAnnotation.ANNOTATION_NAME)); assertNull(attributeResource.getAnnotation(JoinTableAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(OrderBy.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(OrderByAnnotation.ANNOTATION_NAME)); } public void testMorphToEmbeddedIdMapping() throws Exception { @@ -315,10 +315,10 @@ public class JavaManyToManyMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = jpaProject().getJavaPersistentTypeResource(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.attributes().next(); - assertNull(attributeResource.getMappingAnnotation(ManyToMany.ANNOTATION_NAME)); - assertNotNull(attributeResource.getMappingAnnotation(EmbeddedId.ANNOTATION_NAME)); + assertNull(attributeResource.getMappingAnnotation(ManyToManyAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getMappingAnnotation(EmbeddedIdAnnotation.ANNOTATION_NAME)); assertNull(attributeResource.getAnnotation(JoinTableAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(OrderBy.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(OrderByAnnotation.ANNOTATION_NAME)); } public void testMorphToTransientMapping() throws Exception { @@ -337,10 +337,10 @@ public class JavaManyToManyMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = jpaProject().getJavaPersistentTypeResource(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.attributes().next(); - assertNull(attributeResource.getMappingAnnotation(ManyToMany.ANNOTATION_NAME)); - assertNotNull(attributeResource.getMappingAnnotation(Transient.ANNOTATION_NAME)); + assertNull(attributeResource.getMappingAnnotation(ManyToManyAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getMappingAnnotation(TransientAnnotation.ANNOTATION_NAME)); assertNull(attributeResource.getAnnotation(JoinTableAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(OrderBy.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(OrderByAnnotation.ANNOTATION_NAME)); } public void testMorphToOneToOneMapping() throws Exception { @@ -359,10 +359,10 @@ public class JavaManyToManyMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = jpaProject().getJavaPersistentTypeResource(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.attributes().next(); - assertNull(attributeResource.getMappingAnnotation(ManyToMany.ANNOTATION_NAME)); - assertNotNull(attributeResource.getMappingAnnotation(OneToOne.ANNOTATION_NAME)); + assertNull(attributeResource.getMappingAnnotation(ManyToManyAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getMappingAnnotation(OneToOneAnnotation.ANNOTATION_NAME)); assertNotNull(attributeResource.getAnnotation(JoinTableAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(OrderBy.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(OrderByAnnotation.ANNOTATION_NAME)); } public void testMorphToOneToManyMapping() throws Exception { @@ -381,10 +381,10 @@ public class JavaManyToManyMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = jpaProject().getJavaPersistentTypeResource(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.attributes().next(); - assertNull(attributeResource.getMappingAnnotation(ManyToMany.ANNOTATION_NAME)); - assertNotNull(attributeResource.getMappingAnnotation(OneToMany.ANNOTATION_NAME)); + assertNull(attributeResource.getMappingAnnotation(ManyToManyAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getMappingAnnotation(OneToManyAnnotation.ANNOTATION_NAME)); assertNotNull(attributeResource.getAnnotation(JoinTableAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getAnnotation(OrderBy.ANNOTATION_NAME)); + assertNotNull(attributeResource.getAnnotation(OrderByAnnotation.ANNOTATION_NAME)); } public void testMorphToManyToOneMapping() throws Exception { @@ -403,10 +403,10 @@ public class JavaManyToManyMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = jpaProject().getJavaPersistentTypeResource(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.attributes().next(); - assertNull(attributeResource.getMappingAnnotation(ManyToMany.ANNOTATION_NAME)); - assertNotNull(attributeResource.getMappingAnnotation(ManyToOne.ANNOTATION_NAME)); + assertNull(attributeResource.getMappingAnnotation(ManyToManyAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getMappingAnnotation(ManyToOneAnnotation.ANNOTATION_NAME)); assertNotNull(attributeResource.getAnnotation(JoinTableAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(OrderBy.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(OrderByAnnotation.ANNOTATION_NAME)); } public void testUpdateSpecifiedTargetEntity() throws Exception { @@ -418,7 +418,7 @@ public class JavaManyToManyMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = jpaProject().getJavaPersistentTypeResource(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.attributes().next(); - ManyToMany manyToMany = (ManyToMany) attributeResource.getMappingAnnotation(); + ManyToManyAnnotation manyToMany = (ManyToManyAnnotation) attributeResource.getMappingAnnotation(); assertNull(manyToManyMapping.getSpecifiedTargetEntity()); assertNull(manyToMany.getTargetEntity()); @@ -443,7 +443,7 @@ public class JavaManyToManyMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = jpaProject().getJavaPersistentTypeResource(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.attributes().next(); - ManyToMany manyToMany = (ManyToMany) attributeResource.getMappingAnnotation(); + ManyToManyAnnotation manyToMany = (ManyToManyAnnotation) attributeResource.getMappingAnnotation(); assertNull(manyToManyMapping.getSpecifiedTargetEntity()); assertNull(manyToMany.getTargetEntity()); @@ -468,7 +468,7 @@ public class JavaManyToManyMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = jpaProject().getJavaPersistentTypeResource(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.attributes().next(); - ManyToMany manyToMany = (ManyToMany) attributeResource.getMappingAnnotation(); + ManyToManyAnnotation manyToMany = (ManyToManyAnnotation) attributeResource.getMappingAnnotation(); assertNull(manyToManyMapping.getSpecifiedFetch()); assertNull(manyToMany.getFetch()); @@ -498,7 +498,7 @@ public class JavaManyToManyMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = jpaProject().getJavaPersistentTypeResource(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.attributes().next(); - ManyToMany manyToMany = (ManyToMany) attributeResource.getMappingAnnotation(); + ManyToManyAnnotation manyToMany = (ManyToManyAnnotation) attributeResource.getMappingAnnotation(); assertNull(manyToManyMapping.getSpecifiedFetch()); assertNull(manyToMany.getFetch()); @@ -528,7 +528,7 @@ public class JavaManyToManyMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = jpaProject().getJavaPersistentTypeResource(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.attributes().next(); - ManyToMany manyToMany = (ManyToMany) attributeResource.getMappingAnnotation(); + ManyToManyAnnotation manyToMany = (ManyToManyAnnotation) attributeResource.getMappingAnnotation(); assertNull(manyToManyMapping.getMappedBy()); assertNull(manyToMany.getMappedBy()); @@ -553,7 +553,7 @@ public class JavaManyToManyMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = jpaProject().getJavaPersistentTypeResource(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.attributes().next(); - ManyToMany manyToMany = (ManyToMany) attributeResource.getMappingAnnotation(); + ManyToManyAnnotation manyToMany = (ManyToManyAnnotation) attributeResource.getMappingAnnotation(); assertNull(manyToManyMapping.getMappedBy()); assertNull(manyToMany.getMappedBy()); @@ -713,12 +713,12 @@ public class JavaManyToManyMappingTests extends ContextModelTestCase JavaResourcePersistentAttribute attributeResource = typeResource.attributes().next(); assertNull(manyToManyMapping.getMapKey()); - assertNull(attributeResource.getAnnotation(MapKey.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(MapKeyAnnotation.ANNOTATION_NAME)); //set mapKey in the resource model, verify context model does not change - attributeResource.addAnnotation(MapKey.ANNOTATION_NAME); + attributeResource.addAnnotation(MapKeyAnnotation.ANNOTATION_NAME); assertNull(manyToManyMapping.getMapKey()); - MapKey mapKey = (MapKey) attributeResource.getAnnotation(MapKey.ANNOTATION_NAME); + MapKeyAnnotation mapKey = (MapKeyAnnotation) attributeResource.getAnnotation(MapKeyAnnotation.ANNOTATION_NAME); assertNotNull(mapKey); //set mapKey name in the resource model, verify context model updated @@ -732,9 +732,9 @@ public class JavaManyToManyMappingTests extends ContextModelTestCase assertNull(mapKey.getName()); mapKey.setName("myMapKey"); - attributeResource.removeAnnotation(MapKey.ANNOTATION_NAME); + attributeResource.removeAnnotation(MapKeyAnnotation.ANNOTATION_NAME); assertNull(manyToManyMapping.getMapKey()); - assertNull(attributeResource.getAnnotation(MapKey.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(MapKeyAnnotation.ANNOTATION_NAME)); } public void testModifyMapKey() throws Exception { @@ -748,18 +748,18 @@ public class JavaManyToManyMappingTests extends ContextModelTestCase JavaResourcePersistentAttribute attributeResource = typeResource.attributes().next(); assertNull(manyToManyMapping.getMapKey()); - assertNull(attributeResource.getAnnotation(MapKey.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(MapKeyAnnotation.ANNOTATION_NAME)); //set mapKey in the context model, verify resource model updated manyToManyMapping.setMapKey("myMapKey"); - MapKey mapKey = (MapKey) attributeResource.getAnnotation(MapKey.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.getAnnotation(MapKey.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(MapKeyAnnotation.ANNOTATION_NAME)); } public void testUpdateOrderBy() throws Exception { @@ -773,19 +773,19 @@ public class JavaManyToManyMappingTests extends ContextModelTestCase JavaResourcePersistentAttribute attributeResource = typeResource.attributes().next(); assertNull(manyToManyMapping.getOrderBy()); - assertNull(attributeResource.getAnnotation(OrderBy.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(OrderByAnnotation.ANNOTATION_NAME)); //set orderBy in the resource model, verify context model updated - attributeResource.addAnnotation(OrderBy.ANNOTATION_NAME); - OrderBy orderBy = (OrderBy) attributeResource.getAnnotation(OrderBy.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.removeAnnotation(OrderBy.ANNOTATION_NAME); + attributeResource.removeAnnotation(OrderByAnnotation.ANNOTATION_NAME); assertNull(manyToManyMapping.getOrderBy()); - assertNull(attributeResource.getAnnotation(OrderBy.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(OrderByAnnotation.ANNOTATION_NAME)); } public void testModifyOrderBy() throws Exception { @@ -799,18 +799,18 @@ public class JavaManyToManyMappingTests extends ContextModelTestCase JavaResourcePersistentAttribute attributeResource = typeResource.attributes().next(); assertNull(manyToManyMapping.getOrderBy()); - assertNull(attributeResource.getAnnotation(OrderBy.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()); - OrderBy orderBy = (OrderBy) attributeResource.getAnnotation(OrderBy.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.getAnnotation(OrderBy.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(OrderByAnnotation.ANNOTATION_NAME)); } public void testUpdateNoOrdering() throws Exception { @@ -824,20 +824,20 @@ public class JavaManyToManyMappingTests extends ContextModelTestCase JavaResourcePersistentAttribute attributeResource = typeResource.attributes().next(); assertTrue(manyToManyMapping.isNoOrdering()); - assertNull(attributeResource.getAnnotation(OrderBy.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(OrderByAnnotation.ANNOTATION_NAME)); //set orderBy in the resource model, verify context model updated - attributeResource.addAnnotation(OrderBy.ANNOTATION_NAME); + attributeResource.addAnnotation(OrderByAnnotation.ANNOTATION_NAME); assertFalse(manyToManyMapping.isNoOrdering()); - OrderBy orderBy = (OrderBy) attributeResource.getAnnotation(OrderBy.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.removeAnnotation(OrderBy.ANNOTATION_NAME); + attributeResource.removeAnnotation(OrderByAnnotation.ANNOTATION_NAME); assertTrue(manyToManyMapping.isNoOrdering()); - assertNull(attributeResource.getAnnotation(OrderBy.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(OrderByAnnotation.ANNOTATION_NAME)); } public void testModifyNoOrdering() throws Exception { @@ -851,7 +851,7 @@ public class JavaManyToManyMappingTests extends ContextModelTestCase JavaResourcePersistentAttribute attributeResource = typeResource.attributes().next(); assertTrue(manyToManyMapping.isNoOrdering()); - assertNull(attributeResource.getAnnotation(OrderBy.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(OrderByAnnotation.ANNOTATION_NAME)); // manyToManyMapping.setNoOrdering(false); //this does nothing // //set mappedBy in the context model, verify resource model updated @@ -877,20 +877,20 @@ public class JavaManyToManyMappingTests extends ContextModelTestCase JavaResourcePersistentAttribute attributeResource = typeResource.attributes().next(); assertFalse(manyToManyMapping.isPkOrdering()); - assertNull(attributeResource.getAnnotation(OrderBy.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(OrderByAnnotation.ANNOTATION_NAME)); //set orderBy in the resource model, verify context model updated - attributeResource.addAnnotation(OrderBy.ANNOTATION_NAME); + attributeResource.addAnnotation(OrderByAnnotation.ANNOTATION_NAME); assertTrue(manyToManyMapping.isPkOrdering()); - OrderBy orderBy = (OrderBy) attributeResource.getAnnotation(OrderBy.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.removeAnnotation(OrderBy.ANNOTATION_NAME); + attributeResource.removeAnnotation(OrderByAnnotation.ANNOTATION_NAME); assertFalse(manyToManyMapping.isPkOrdering()); - assertNull(attributeResource.getAnnotation(OrderBy.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(OrderByAnnotation.ANNOTATION_NAME)); } public void testUpdateCustomOrdering() throws Exception { @@ -904,20 +904,20 @@ public class JavaManyToManyMappingTests extends ContextModelTestCase JavaResourcePersistentAttribute attributeResource = typeResource.attributes().next(); assertFalse(manyToManyMapping.isCustomOrdering()); - assertNull(attributeResource.getAnnotation(OrderBy.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(OrderByAnnotation.ANNOTATION_NAME)); //set orderBy in the resource model, verify context model updated - attributeResource.addAnnotation(OrderBy.ANNOTATION_NAME); + attributeResource.addAnnotation(OrderByAnnotation.ANNOTATION_NAME); assertFalse(manyToManyMapping.isCustomOrdering()); - OrderBy orderBy = (OrderBy) attributeResource.getAnnotation(OrderBy.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.removeAnnotation(OrderBy.ANNOTATION_NAME); + attributeResource.removeAnnotation(OrderByAnnotation.ANNOTATION_NAME); assertFalse(manyToManyMapping.isCustomOrdering()); - assertNull(attributeResource.getAnnotation(OrderBy.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(OrderByAnnotation.ANNOTATION_NAME)); } } 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 ee0d6237f3..34257f9919 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 @@ -30,22 +30,22 @@ import org.eclipse.jpt.core.context.VersionMapping; import org.eclipse.jpt.core.context.java.JavaJoinColumn; import org.eclipse.jpt.core.context.java.JavaPersistentType; import org.eclipse.jpt.core.context.persistence.ClassRef; -import org.eclipse.jpt.core.resource.java.Basic; -import org.eclipse.jpt.core.resource.java.Embedded; -import org.eclipse.jpt.core.resource.java.EmbeddedId; -import org.eclipse.jpt.core.resource.java.Id; +import org.eclipse.jpt.core.resource.java.BasicAnnotation; +import org.eclipse.jpt.core.resource.java.EmbeddedAnnotation; +import org.eclipse.jpt.core.resource.java.EmbeddedIdAnnotation; +import org.eclipse.jpt.core.resource.java.IdAnnotation; import org.eclipse.jpt.core.resource.java.JPA; import org.eclipse.jpt.core.resource.java.JavaResourceNode; import org.eclipse.jpt.core.resource.java.JavaResourcePersistentAttribute; import org.eclipse.jpt.core.resource.java.JavaResourcePersistentType; import org.eclipse.jpt.core.resource.java.JoinColumnAnnotation; -import org.eclipse.jpt.core.resource.java.JoinColumns; -import org.eclipse.jpt.core.resource.java.ManyToMany; -import org.eclipse.jpt.core.resource.java.ManyToOne; -import org.eclipse.jpt.core.resource.java.OneToMany; -import org.eclipse.jpt.core.resource.java.OneToOne; -import org.eclipse.jpt.core.resource.java.Transient; -import org.eclipse.jpt.core.resource.java.Version; +import org.eclipse.jpt.core.resource.java.JoinColumnsAnnotation; +import org.eclipse.jpt.core.resource.java.ManyToManyAnnotation; +import org.eclipse.jpt.core.resource.java.ManyToOneAnnotation; +import org.eclipse.jpt.core.resource.java.OneToManyAnnotation; +import org.eclipse.jpt.core.resource.java.OneToOneAnnotation; +import org.eclipse.jpt.core.resource.java.TransientAnnotation; +import org.eclipse.jpt.core.resource.java.VersionAnnotation; import org.eclipse.jpt.core.tests.internal.context.ContextModelTestCase; import org.eclipse.jpt.core.tests.internal.projects.TestJavaProject.SourceWriter; import org.eclipse.jpt.utility.internal.CollectionTools; @@ -209,8 +209,8 @@ public class JavaManyToOneMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = jpaProject().getJavaPersistentTypeResource(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.attributes().next(); - assertNull(attributeResource.getMappingAnnotation(ManyToOne.ANNOTATION_NAME)); - assertNotNull(attributeResource.getMappingAnnotation(Basic.ANNOTATION_NAME)); + assertNull(attributeResource.getMappingAnnotation(ManyToOneAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getMappingAnnotation(BasicAnnotation.ANNOTATION_NAME)); assertNull(attributeResource.getAnnotation(JoinColumnAnnotation.ANNOTATION_NAME)); } @@ -229,7 +229,7 @@ public class JavaManyToOneMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = jpaProject().getJavaPersistentTypeResource(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.attributes().next(); - assertNull(attributeResource.getMappingAnnotation(ManyToOne.ANNOTATION_NAME)); + assertNull(attributeResource.getMappingAnnotation(ManyToOneAnnotation.ANNOTATION_NAME)); assertNull(attributeResource.getAnnotation(JoinColumnAnnotation.ANNOTATION_NAME)); } @@ -248,8 +248,8 @@ public class JavaManyToOneMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = jpaProject().getJavaPersistentTypeResource(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.attributes().next(); - assertNull(attributeResource.getMappingAnnotation(ManyToOne.ANNOTATION_NAME)); - assertNotNull(attributeResource.getMappingAnnotation(Version.ANNOTATION_NAME)); + assertNull(attributeResource.getMappingAnnotation(ManyToOneAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getMappingAnnotation(VersionAnnotation.ANNOTATION_NAME)); assertNull(attributeResource.getAnnotation(JoinColumnAnnotation.ANNOTATION_NAME)); } @@ -268,8 +268,8 @@ public class JavaManyToOneMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = jpaProject().getJavaPersistentTypeResource(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.attributes().next(); - assertNull(attributeResource.getMappingAnnotation(ManyToOne.ANNOTATION_NAME)); - assertNotNull(attributeResource.getMappingAnnotation(Id.ANNOTATION_NAME)); + assertNull(attributeResource.getMappingAnnotation(ManyToOneAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getMappingAnnotation(IdAnnotation.ANNOTATION_NAME)); assertNull(attributeResource.getAnnotation(JoinColumnAnnotation.ANNOTATION_NAME)); } @@ -288,8 +288,8 @@ public class JavaManyToOneMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = jpaProject().getJavaPersistentTypeResource(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.attributes().next(); - assertNull(attributeResource.getMappingAnnotation(ManyToOne.ANNOTATION_NAME)); - assertNotNull(attributeResource.getMappingAnnotation(Embedded.ANNOTATION_NAME)); + assertNull(attributeResource.getMappingAnnotation(ManyToOneAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getMappingAnnotation(EmbeddedAnnotation.ANNOTATION_NAME)); assertNull(attributeResource.getAnnotation(JoinColumnAnnotation.ANNOTATION_NAME)); } @@ -308,8 +308,8 @@ public class JavaManyToOneMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = jpaProject().getJavaPersistentTypeResource(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.attributes().next(); - assertNull(attributeResource.getMappingAnnotation(ManyToOne.ANNOTATION_NAME)); - assertNotNull(attributeResource.getMappingAnnotation(EmbeddedId.ANNOTATION_NAME)); + assertNull(attributeResource.getMappingAnnotation(ManyToOneAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getMappingAnnotation(EmbeddedIdAnnotation.ANNOTATION_NAME)); assertNull(attributeResource.getAnnotation(JoinColumnAnnotation.ANNOTATION_NAME)); } @@ -328,8 +328,8 @@ public class JavaManyToOneMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = jpaProject().getJavaPersistentTypeResource(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.attributes().next(); - assertNull(attributeResource.getMappingAnnotation(ManyToOne.ANNOTATION_NAME)); - assertNotNull(attributeResource.getMappingAnnotation(Transient.ANNOTATION_NAME)); + assertNull(attributeResource.getMappingAnnotation(ManyToOneAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getMappingAnnotation(TransientAnnotation.ANNOTATION_NAME)); assertNull(attributeResource.getAnnotation(JoinColumnAnnotation.ANNOTATION_NAME)); } @@ -348,8 +348,8 @@ public class JavaManyToOneMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = jpaProject().getJavaPersistentTypeResource(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.attributes().next(); - assertNull(attributeResource.getMappingAnnotation(ManyToOne.ANNOTATION_NAME)); - assertNotNull(attributeResource.getMappingAnnotation(OneToOne.ANNOTATION_NAME)); + assertNull(attributeResource.getMappingAnnotation(ManyToOneAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getMappingAnnotation(OneToOneAnnotation.ANNOTATION_NAME)); assertNotNull(attributeResource.getAnnotation(JoinColumnAnnotation.ANNOTATION_NAME)); } @@ -368,8 +368,8 @@ public class JavaManyToOneMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = jpaProject().getJavaPersistentTypeResource(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.attributes().next(); - assertNull(attributeResource.getMappingAnnotation(ManyToOne.ANNOTATION_NAME)); - assertNotNull(attributeResource.getMappingAnnotation(OneToMany.ANNOTATION_NAME)); + assertNull(attributeResource.getMappingAnnotation(ManyToOneAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getMappingAnnotation(OneToManyAnnotation.ANNOTATION_NAME)); assertNotNull(attributeResource.getAnnotation(JoinColumnAnnotation.ANNOTATION_NAME)); } @@ -388,8 +388,8 @@ public class JavaManyToOneMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = jpaProject().getJavaPersistentTypeResource(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.attributes().next(); - assertNull(attributeResource.getMappingAnnotation(ManyToOne.ANNOTATION_NAME)); - assertNotNull(attributeResource.getMappingAnnotation(ManyToMany.ANNOTATION_NAME)); + assertNull(attributeResource.getMappingAnnotation(ManyToOneAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getMappingAnnotation(ManyToManyAnnotation.ANNOTATION_NAME)); assertNull(attributeResource.getAnnotation(JoinColumnAnnotation.ANNOTATION_NAME)); } @@ -402,7 +402,7 @@ public class JavaManyToOneMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = jpaProject().getJavaPersistentTypeResource(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.attributes().next(); - ManyToOne manyToOne = (ManyToOne) attributeResource.getMappingAnnotation(); + ManyToOneAnnotation manyToOne = (ManyToOneAnnotation) attributeResource.getMappingAnnotation(); assertNull(manyToOneMapping.getSpecifiedTargetEntity()); assertNull(manyToOne.getTargetEntity()); @@ -427,7 +427,7 @@ public class JavaManyToOneMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = jpaProject().getJavaPersistentTypeResource(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.attributes().next(); - ManyToOne manyToOne = (ManyToOne) attributeResource.getMappingAnnotation(); + ManyToOneAnnotation manyToOne = (ManyToOneAnnotation) attributeResource.getMappingAnnotation(); assertNull(manyToOneMapping.getSpecifiedTargetEntity()); assertNull(manyToOne.getTargetEntity()); @@ -452,7 +452,7 @@ public class JavaManyToOneMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = jpaProject().getJavaPersistentTypeResource(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.attributes().next(); - ManyToOne manyToOne = (ManyToOne) attributeResource.getMappingAnnotation(); + ManyToOneAnnotation manyToOne = (ManyToOneAnnotation) attributeResource.getMappingAnnotation(); assertNull(manyToOneMapping.getSpecifiedOptional()); assertNull(manyToOne.getOptional()); @@ -482,7 +482,7 @@ public class JavaManyToOneMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = jpaProject().getJavaPersistentTypeResource(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.attributes().next(); - ManyToOne manyToOne = (ManyToOne) attributeResource.getMappingAnnotation(); + ManyToOneAnnotation manyToOne = (ManyToOneAnnotation) attributeResource.getMappingAnnotation(); assertNull(manyToOneMapping.getSpecifiedOptional()); assertNull(manyToOne.getOptional()); @@ -619,7 +619,7 @@ public class JavaManyToOneMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = jpaProject().getJavaPersistentTypeResource(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.attributes().next(); - Iterator<JavaResourceNode> joinColumns = attributeResource.annotations(JoinColumnAnnotation.ANNOTATION_NAME, JoinColumns.ANNOTATION_NAME); + Iterator<JavaResourceNode> joinColumns = attributeResource.annotations(JoinColumnAnnotation.ANNOTATION_NAME, JoinColumnsAnnotation.ANNOTATION_NAME); assertEquals("BAZ", ((JoinColumnAnnotation) joinColumns.next()).getName()); assertEquals("BAR", ((JoinColumnAnnotation) joinColumns.next()).getName()); @@ -640,7 +640,7 @@ public class JavaManyToOneMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = jpaProject().getJavaPersistentTypeResource(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.attributes().next(); - Iterator<JavaResourceNode> joinColumns = attributeResource.annotations(JoinColumnAnnotation.ANNOTATION_NAME, JoinColumns.ANNOTATION_NAME); + Iterator<JavaResourceNode> joinColumns = attributeResource.annotations(JoinColumnAnnotation.ANNOTATION_NAME, JoinColumnsAnnotation.ANNOTATION_NAME); assertEquals("FOO", ((JoinColumnAnnotation) joinColumns.next()).getName()); assertEquals("BAR", ((JoinColumnAnnotation) joinColumns.next()).getName()); @@ -661,11 +661,11 @@ public class JavaManyToOneMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = jpaProject().getJavaPersistentTypeResource(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.attributes().next(); - assertEquals(3, CollectionTools.size(attributeResource.annotations(JoinColumnAnnotation.ANNOTATION_NAME, JoinColumns.ANNOTATION_NAME))); + assertEquals(3, CollectionTools.size(attributeResource.annotations(JoinColumnAnnotation.ANNOTATION_NAME, JoinColumnsAnnotation.ANNOTATION_NAME))); manyToOneMapping.removeSpecifiedJoinColumn(1); - Iterator<JavaResourceNode> joinColumnResources = attributeResource.annotations(JoinColumnAnnotation.ANNOTATION_NAME, JoinColumns.ANNOTATION_NAME); + Iterator<JavaResourceNode> joinColumnResources = attributeResource.annotations(JoinColumnAnnotation.ANNOTATION_NAME, JoinColumnsAnnotation.ANNOTATION_NAME); assertEquals("FOO", ((JoinColumnAnnotation) joinColumnResources.next()).getName()); assertEquals("BAZ", ((JoinColumnAnnotation) joinColumnResources.next()).getName()); assertFalse(joinColumnResources.hasNext()); @@ -677,7 +677,7 @@ public class JavaManyToOneMappingTests extends ContextModelTestCase manyToOneMapping.removeSpecifiedJoinColumn(1); - joinColumnResources = attributeResource.annotations(JoinColumnAnnotation.ANNOTATION_NAME, JoinColumns.ANNOTATION_NAME); + joinColumnResources = attributeResource.annotations(JoinColumnAnnotation.ANNOTATION_NAME, JoinColumnsAnnotation.ANNOTATION_NAME); assertEquals("FOO", ((JoinColumnAnnotation) joinColumnResources.next()).getName()); assertFalse(joinColumnResources.hasNext()); @@ -687,12 +687,12 @@ public class JavaManyToOneMappingTests extends ContextModelTestCase manyToOneMapping.removeSpecifiedJoinColumn(0); - joinColumnResources = attributeResource.annotations(JoinColumnAnnotation.ANNOTATION_NAME, JoinColumns.ANNOTATION_NAME); + joinColumnResources = attributeResource.annotations(JoinColumnAnnotation.ANNOTATION_NAME, JoinColumnsAnnotation.ANNOTATION_NAME); assertFalse(joinColumnResources.hasNext()); joinColumns = manyToOneMapping.specifiedJoinColumns(); assertFalse(joinColumns.hasNext()); - assertNull(attributeResource.getAnnotation(JoinColumns.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(JoinColumnsAnnotation.ANNOTATION_NAME)); } public void testMoveSpecifiedJoinColumn() throws Exception { @@ -708,7 +708,7 @@ public class JavaManyToOneMappingTests extends ContextModelTestCase JavaResourcePersistentAttribute attributeResource = jpaProject().getJavaPersistentTypeResource(FULLY_QUALIFIED_TYPE_NAME).attributes().next(); - ListIterator<JoinColumnAnnotation> javaJoinColumns = attributeResource.annotations(JoinColumnAnnotation.ANNOTATION_NAME, JoinColumns.ANNOTATION_NAME); + ListIterator<JoinColumnAnnotation> javaJoinColumns = attributeResource.annotations(JoinColumnAnnotation.ANNOTATION_NAME, JoinColumnsAnnotation.ANNOTATION_NAME); assertEquals(3, CollectionTools.size(javaJoinColumns)); @@ -718,7 +718,7 @@ public class JavaManyToOneMappingTests extends ContextModelTestCase assertEquals("BAZ", primaryKeyJoinColumns.next().getSpecifiedName()); assertEquals("FOO", primaryKeyJoinColumns.next().getSpecifiedName()); - javaJoinColumns = attributeResource.annotations(JoinColumnAnnotation.ANNOTATION_NAME, JoinColumns.ANNOTATION_NAME); + javaJoinColumns = attributeResource.annotations(JoinColumnAnnotation.ANNOTATION_NAME, JoinColumnsAnnotation.ANNOTATION_NAME); assertEquals("BAR", javaJoinColumns.next().getName()); assertEquals("BAZ", javaJoinColumns.next().getName()); assertEquals("FOO", javaJoinColumns.next().getName()); @@ -730,7 +730,7 @@ public class JavaManyToOneMappingTests extends ContextModelTestCase assertEquals("BAR", primaryKeyJoinColumns.next().getSpecifiedName()); assertEquals("FOO", primaryKeyJoinColumns.next().getSpecifiedName()); - javaJoinColumns = attributeResource.annotations(JoinColumnAnnotation.ANNOTATION_NAME, JoinColumns.ANNOTATION_NAME); + javaJoinColumns = attributeResource.annotations(JoinColumnAnnotation.ANNOTATION_NAME, JoinColumnsAnnotation.ANNOTATION_NAME); assertEquals("BAZ", javaJoinColumns.next().getName()); assertEquals("BAR", javaJoinColumns.next().getName()); assertEquals("FOO", javaJoinColumns.next().getName()); @@ -744,9 +744,9 @@ public class JavaManyToOneMappingTests extends ContextModelTestCase ManyToOneMapping manyToOneMapping = (ManyToOneMapping) persistentAttribute.getMapping(); JavaResourcePersistentAttribute attributeResource = jpaProject().getJavaPersistentTypeResource(FULLY_QUALIFIED_TYPE_NAME).attributes().next(); - ((JoinColumnAnnotation) attributeResource.addAnnotation(0, JoinColumnAnnotation.ANNOTATION_NAME, JoinColumns.ANNOTATION_NAME)).setName("FOO"); - ((JoinColumnAnnotation) attributeResource.addAnnotation(1, JoinColumnAnnotation.ANNOTATION_NAME, JoinColumns.ANNOTATION_NAME)).setName("BAR"); - ((JoinColumnAnnotation) attributeResource.addAnnotation(2, JoinColumnAnnotation.ANNOTATION_NAME, JoinColumns.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<JoinColumn> joinColumns = manyToOneMapping.specifiedJoinColumns(); assertEquals("FOO", joinColumns.next().getName()); @@ -754,32 +754,32 @@ public class JavaManyToOneMappingTests extends ContextModelTestCase assertEquals("BAZ", joinColumns.next().getName()); assertFalse(joinColumns.hasNext()); - attributeResource.move(2, 0, JoinColumns.ANNOTATION_NAME); + attributeResource.move(2, 0, JoinColumnsAnnotation.ANNOTATION_NAME); joinColumns = manyToOneMapping.specifiedJoinColumns(); assertEquals("BAR", joinColumns.next().getName()); assertEquals("BAZ", joinColumns.next().getName()); assertEquals("FOO", joinColumns.next().getName()); assertFalse(joinColumns.hasNext()); - attributeResource.move(0, 1, JoinColumns.ANNOTATION_NAME); + attributeResource.move(0, 1, JoinColumnsAnnotation.ANNOTATION_NAME); joinColumns = manyToOneMapping.specifiedJoinColumns(); assertEquals("BAZ", joinColumns.next().getName()); assertEquals("BAR", joinColumns.next().getName()); assertEquals("FOO", joinColumns.next().getName()); assertFalse(joinColumns.hasNext()); - attributeResource.removeAnnotation(1, JoinColumnAnnotation.ANNOTATION_NAME, JoinColumns.ANNOTATION_NAME); + attributeResource.removeAnnotation(1, JoinColumnAnnotation.ANNOTATION_NAME, JoinColumnsAnnotation.ANNOTATION_NAME); joinColumns = manyToOneMapping.specifiedJoinColumns(); assertEquals("BAZ", joinColumns.next().getName()); assertEquals("FOO", joinColumns.next().getName()); assertFalse(joinColumns.hasNext()); - attributeResource.removeAnnotation(1, JoinColumnAnnotation.ANNOTATION_NAME, JoinColumns.ANNOTATION_NAME); + attributeResource.removeAnnotation(1, JoinColumnAnnotation.ANNOTATION_NAME, JoinColumnsAnnotation.ANNOTATION_NAME); joinColumns = manyToOneMapping.specifiedJoinColumns(); assertEquals("BAZ", joinColumns.next().getName()); assertFalse(joinColumns.hasNext()); - attributeResource.removeAnnotation(0, JoinColumnAnnotation.ANNOTATION_NAME, JoinColumns.ANNOTATION_NAME); + attributeResource.removeAnnotation(0, JoinColumnAnnotation.ANNOTATION_NAME, JoinColumnsAnnotation.ANNOTATION_NAME); joinColumns = manyToOneMapping.specifiedJoinColumns(); assertFalse(joinColumns.hasNext()); } 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 00820aa15a..64e638cca9 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 @@ -29,22 +29,22 @@ import org.eclipse.jpt.core.context.TypeMapping; import org.eclipse.jpt.core.context.VersionMapping; import org.eclipse.jpt.core.context.java.JavaPersistentType; import org.eclipse.jpt.core.context.persistence.ClassRef; -import org.eclipse.jpt.core.resource.java.Basic; -import org.eclipse.jpt.core.resource.java.Embedded; -import org.eclipse.jpt.core.resource.java.EmbeddedId; -import org.eclipse.jpt.core.resource.java.Id; +import org.eclipse.jpt.core.resource.java.BasicAnnotation; +import org.eclipse.jpt.core.resource.java.EmbeddedAnnotation; +import org.eclipse.jpt.core.resource.java.EmbeddedIdAnnotation; +import org.eclipse.jpt.core.resource.java.IdAnnotation; import org.eclipse.jpt.core.resource.java.JPA; import org.eclipse.jpt.core.resource.java.JavaResourcePersistentAttribute; import org.eclipse.jpt.core.resource.java.JavaResourcePersistentType; import org.eclipse.jpt.core.resource.java.JoinTableAnnotation; -import org.eclipse.jpt.core.resource.java.ManyToMany; -import org.eclipse.jpt.core.resource.java.ManyToOne; -import org.eclipse.jpt.core.resource.java.MapKey; -import org.eclipse.jpt.core.resource.java.OneToMany; -import org.eclipse.jpt.core.resource.java.OneToOne; -import org.eclipse.jpt.core.resource.java.OrderBy; -import org.eclipse.jpt.core.resource.java.Transient; -import org.eclipse.jpt.core.resource.java.Version; +import org.eclipse.jpt.core.resource.java.ManyToManyAnnotation; +import org.eclipse.jpt.core.resource.java.ManyToOneAnnotation; +import org.eclipse.jpt.core.resource.java.MapKeyAnnotation; +import org.eclipse.jpt.core.resource.java.OneToManyAnnotation; +import org.eclipse.jpt.core.resource.java.OneToOneAnnotation; +import org.eclipse.jpt.core.resource.java.OrderByAnnotation; +import org.eclipse.jpt.core.resource.java.TransientAnnotation; +import org.eclipse.jpt.core.resource.java.VersionAnnotation; import org.eclipse.jpt.core.tests.internal.context.ContextModelTestCase; import org.eclipse.jpt.core.tests.internal.projects.TestJavaProject.SourceWriter; import org.eclipse.jpt.utility.internal.iterators.ArrayIterator; @@ -208,10 +208,10 @@ public class JavaOneToManyMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = jpaProject().getJavaPersistentTypeResource(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.attributes().next(); - assertNull(attributeResource.getMappingAnnotation(OneToMany.ANNOTATION_NAME)); - assertNotNull(attributeResource.getMappingAnnotation(Basic.ANNOTATION_NAME)); + assertNull(attributeResource.getMappingAnnotation(OneToManyAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getMappingAnnotation(BasicAnnotation.ANNOTATION_NAME)); assertNull(attributeResource.getAnnotation(JoinTableAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(OrderBy.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(OrderByAnnotation.ANNOTATION_NAME)); } public void testMorphToDefault() throws Exception { @@ -230,9 +230,9 @@ public class JavaOneToManyMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = jpaProject().getJavaPersistentTypeResource(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.attributes().next(); - assertNull(attributeResource.getMappingAnnotation(OneToMany.ANNOTATION_NAME)); + assertNull(attributeResource.getMappingAnnotation(OneToManyAnnotation.ANNOTATION_NAME)); assertNull(attributeResource.getAnnotation(JoinTableAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(OrderBy.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(OrderByAnnotation.ANNOTATION_NAME)); } public void testMorphToVersionMapping() throws Exception { @@ -251,10 +251,10 @@ public class JavaOneToManyMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = jpaProject().getJavaPersistentTypeResource(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.attributes().next(); - assertNull(attributeResource.getMappingAnnotation(OneToMany.ANNOTATION_NAME)); - assertNotNull(attributeResource.getMappingAnnotation(Version.ANNOTATION_NAME)); + assertNull(attributeResource.getMappingAnnotation(OneToManyAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getMappingAnnotation(VersionAnnotation.ANNOTATION_NAME)); assertNull(attributeResource.getAnnotation(JoinTableAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(OrderBy.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(OrderByAnnotation.ANNOTATION_NAME)); } public void testMorphToIdMapping() throws Exception { @@ -273,10 +273,10 @@ public class JavaOneToManyMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = jpaProject().getJavaPersistentTypeResource(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.attributes().next(); - assertNull(attributeResource.getMappingAnnotation(OneToMany.ANNOTATION_NAME)); - assertNotNull(attributeResource.getMappingAnnotation(Id.ANNOTATION_NAME)); + assertNull(attributeResource.getMappingAnnotation(OneToManyAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getMappingAnnotation(IdAnnotation.ANNOTATION_NAME)); assertNull(attributeResource.getAnnotation(JoinTableAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(OrderBy.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(OrderByAnnotation.ANNOTATION_NAME)); } public void testMorphToEmbeddedMapping() throws Exception { @@ -295,10 +295,10 @@ public class JavaOneToManyMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = jpaProject().getJavaPersistentTypeResource(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.attributes().next(); - assertNull(attributeResource.getMappingAnnotation(OneToMany.ANNOTATION_NAME)); - assertNotNull(attributeResource.getMappingAnnotation(Embedded.ANNOTATION_NAME)); + assertNull(attributeResource.getMappingAnnotation(OneToManyAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getMappingAnnotation(EmbeddedAnnotation.ANNOTATION_NAME)); assertNull(attributeResource.getAnnotation(JoinTableAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(OrderBy.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(OrderByAnnotation.ANNOTATION_NAME)); } public void testMorphToEmbeddedIdMapping() throws Exception { @@ -317,10 +317,10 @@ public class JavaOneToManyMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = jpaProject().getJavaPersistentTypeResource(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.attributes().next(); - assertNull(attributeResource.getMappingAnnotation(OneToMany.ANNOTATION_NAME)); - assertNotNull(attributeResource.getMappingAnnotation(EmbeddedId.ANNOTATION_NAME)); + assertNull(attributeResource.getMappingAnnotation(OneToManyAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getMappingAnnotation(EmbeddedIdAnnotation.ANNOTATION_NAME)); assertNull(attributeResource.getAnnotation(JoinTableAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(OrderBy.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(OrderByAnnotation.ANNOTATION_NAME)); } public void testMorphToTransientMapping() throws Exception { @@ -339,10 +339,10 @@ public class JavaOneToManyMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = jpaProject().getJavaPersistentTypeResource(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.attributes().next(); - assertNull(attributeResource.getMappingAnnotation(OneToMany.ANNOTATION_NAME)); - assertNotNull(attributeResource.getMappingAnnotation(Transient.ANNOTATION_NAME)); + assertNull(attributeResource.getMappingAnnotation(OneToManyAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getMappingAnnotation(TransientAnnotation.ANNOTATION_NAME)); assertNull(attributeResource.getAnnotation(JoinTableAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(OrderBy.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(OrderByAnnotation.ANNOTATION_NAME)); } public void testMorphToOneToOneMapping() throws Exception { @@ -361,10 +361,10 @@ public class JavaOneToManyMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = jpaProject().getJavaPersistentTypeResource(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.attributes().next(); - assertNull(attributeResource.getMappingAnnotation(OneToMany.ANNOTATION_NAME)); - assertNotNull(attributeResource.getMappingAnnotation(OneToOne.ANNOTATION_NAME)); + assertNull(attributeResource.getMappingAnnotation(OneToManyAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getMappingAnnotation(OneToOneAnnotation.ANNOTATION_NAME)); assertNotNull(attributeResource.getAnnotation(JoinTableAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(OrderBy.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(OrderByAnnotation.ANNOTATION_NAME)); } public void testMorphToManyToManyMapping() throws Exception { @@ -383,10 +383,10 @@ public class JavaOneToManyMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = jpaProject().getJavaPersistentTypeResource(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.attributes().next(); - assertNull(attributeResource.getMappingAnnotation(OneToMany.ANNOTATION_NAME)); - assertNotNull(attributeResource.getMappingAnnotation(ManyToMany.ANNOTATION_NAME)); + assertNull(attributeResource.getMappingAnnotation(OneToManyAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getMappingAnnotation(ManyToManyAnnotation.ANNOTATION_NAME)); assertNotNull(attributeResource.getAnnotation(JoinTableAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getAnnotation(OrderBy.ANNOTATION_NAME)); + assertNotNull(attributeResource.getAnnotation(OrderByAnnotation.ANNOTATION_NAME)); } public void testMorphToManyToOneMapping() throws Exception { @@ -405,10 +405,10 @@ public class JavaOneToManyMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = jpaProject().getJavaPersistentTypeResource(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.attributes().next(); - assertNull(attributeResource.getMappingAnnotation(OneToMany.ANNOTATION_NAME)); - assertNotNull(attributeResource.getMappingAnnotation(ManyToOne.ANNOTATION_NAME)); + assertNull(attributeResource.getMappingAnnotation(OneToManyAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getMappingAnnotation(ManyToOneAnnotation.ANNOTATION_NAME)); assertNotNull(attributeResource.getAnnotation(JoinTableAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(OrderBy.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(OrderByAnnotation.ANNOTATION_NAME)); } @@ -421,7 +421,7 @@ public class JavaOneToManyMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = jpaProject().getJavaPersistentTypeResource(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.attributes().next(); - OneToMany oneToMany = (OneToMany) attributeResource.getMappingAnnotation(); + OneToManyAnnotation oneToMany = (OneToManyAnnotation) attributeResource.getMappingAnnotation(); assertNull(oneToManyMapping.getSpecifiedTargetEntity()); assertNull(oneToMany.getTargetEntity()); @@ -446,7 +446,7 @@ public class JavaOneToManyMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = jpaProject().getJavaPersistentTypeResource(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.attributes().next(); - OneToMany oneToMany = (OneToMany) attributeResource.getMappingAnnotation(); + OneToManyAnnotation oneToMany = (OneToManyAnnotation) attributeResource.getMappingAnnotation(); assertNull(oneToManyMapping.getSpecifiedTargetEntity()); assertNull(oneToMany.getTargetEntity()); @@ -471,7 +471,7 @@ public class JavaOneToManyMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = jpaProject().getJavaPersistentTypeResource(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.attributes().next(); - OneToMany oneToMany = (OneToMany) attributeResource.getMappingAnnotation(); + OneToManyAnnotation oneToMany = (OneToManyAnnotation) attributeResource.getMappingAnnotation(); assertNull(oneToManyMapping.getSpecifiedFetch()); assertNull(oneToMany.getFetch()); @@ -501,7 +501,7 @@ public class JavaOneToManyMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = jpaProject().getJavaPersistentTypeResource(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.attributes().next(); - OneToMany oneToMany = (OneToMany) attributeResource.getMappingAnnotation(); + OneToManyAnnotation oneToMany = (OneToManyAnnotation) attributeResource.getMappingAnnotation(); assertNull(oneToManyMapping.getSpecifiedFetch()); assertNull(oneToMany.getFetch()); @@ -531,7 +531,7 @@ public class JavaOneToManyMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = jpaProject().getJavaPersistentTypeResource(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.attributes().next(); - OneToMany oneToMany = (OneToMany) attributeResource.getMappingAnnotation(); + OneToManyAnnotation oneToMany = (OneToManyAnnotation) attributeResource.getMappingAnnotation(); assertNull(oneToManyMapping.getMappedBy()); assertNull(oneToMany.getMappedBy()); @@ -556,7 +556,7 @@ public class JavaOneToManyMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = jpaProject().getJavaPersistentTypeResource(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.attributes().next(); - OneToMany oneToMany = (OneToMany) attributeResource.getMappingAnnotation(); + OneToManyAnnotation oneToMany = (OneToManyAnnotation) attributeResource.getMappingAnnotation(); assertNull(oneToManyMapping.getMappedBy()); assertNull(oneToMany.getMappedBy()); @@ -716,12 +716,12 @@ public class JavaOneToManyMappingTests extends ContextModelTestCase JavaResourcePersistentAttribute attributeResource = typeResource.attributes().next(); assertNull(oneToManyMapping.getMapKey()); - assertNull(attributeResource.getAnnotation(MapKey.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(MapKeyAnnotation.ANNOTATION_NAME)); //set mapKey in the resource model, verify context model does not change - attributeResource.addAnnotation(MapKey.ANNOTATION_NAME); + attributeResource.addAnnotation(MapKeyAnnotation.ANNOTATION_NAME); assertNull(oneToManyMapping.getMapKey()); - MapKey mapKey = (MapKey) attributeResource.getAnnotation(MapKey.ANNOTATION_NAME); + MapKeyAnnotation mapKey = (MapKeyAnnotation) attributeResource.getAnnotation(MapKeyAnnotation.ANNOTATION_NAME); assertNotNull(mapKey); //set mapKey name in the resource model, verify context model updated @@ -735,9 +735,9 @@ public class JavaOneToManyMappingTests extends ContextModelTestCase assertNull(mapKey.getName()); mapKey.setName("myMapKey"); - attributeResource.removeAnnotation(MapKey.ANNOTATION_NAME); + attributeResource.removeAnnotation(MapKeyAnnotation.ANNOTATION_NAME); assertNull(oneToManyMapping.getMapKey()); - assertNull(attributeResource.getAnnotation(MapKey.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(MapKeyAnnotation.ANNOTATION_NAME)); } public void testModifyMapKey() throws Exception { @@ -751,18 +751,18 @@ public class JavaOneToManyMappingTests extends ContextModelTestCase JavaResourcePersistentAttribute attributeResource = typeResource.attributes().next(); assertNull(oneToManyMapping.getMapKey()); - assertNull(attributeResource.getAnnotation(MapKey.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(MapKeyAnnotation.ANNOTATION_NAME)); //set mapKey in the context model, verify resource model updated oneToManyMapping.setMapKey("myMapKey"); - MapKey mapKey = (MapKey) attributeResource.getAnnotation(MapKey.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.getAnnotation(MapKey.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(MapKeyAnnotation.ANNOTATION_NAME)); } public void testUpdateOrderBy() throws Exception { @@ -776,19 +776,19 @@ public class JavaOneToManyMappingTests extends ContextModelTestCase JavaResourcePersistentAttribute attributeResource = typeResource.attributes().next(); assertNull(oneToManyMapping.getOrderBy()); - assertNull(attributeResource.getAnnotation(OrderBy.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(OrderByAnnotation.ANNOTATION_NAME)); //set orderBy in the resource model, verify context model updated - attributeResource.addAnnotation(OrderBy.ANNOTATION_NAME); - OrderBy orderBy = (OrderBy) attributeResource.getAnnotation(OrderBy.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.removeAnnotation(OrderBy.ANNOTATION_NAME); + attributeResource.removeAnnotation(OrderByAnnotation.ANNOTATION_NAME); assertNull(oneToManyMapping.getOrderBy()); - assertNull(attributeResource.getAnnotation(OrderBy.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(OrderByAnnotation.ANNOTATION_NAME)); } public void testModifyOrderBy() throws Exception { @@ -802,18 +802,18 @@ public class JavaOneToManyMappingTests extends ContextModelTestCase JavaResourcePersistentAttribute attributeResource = typeResource.attributes().next(); assertNull(oneToManyMapping.getOrderBy()); - assertNull(attributeResource.getAnnotation(OrderBy.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()); - OrderBy orderBy = (OrderBy) attributeResource.getAnnotation(OrderBy.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.getAnnotation(OrderBy.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(OrderByAnnotation.ANNOTATION_NAME)); } public void testUpdateNoOrdering() throws Exception { @@ -827,20 +827,20 @@ public class JavaOneToManyMappingTests extends ContextModelTestCase JavaResourcePersistentAttribute attributeResource = typeResource.attributes().next(); assertTrue(oneToManyMapping.isNoOrdering()); - assertNull(attributeResource.getAnnotation(OrderBy.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(OrderByAnnotation.ANNOTATION_NAME)); //set orderBy in the resource model, verify context model updated - attributeResource.addAnnotation(OrderBy.ANNOTATION_NAME); + attributeResource.addAnnotation(OrderByAnnotation.ANNOTATION_NAME); assertFalse(oneToManyMapping.isNoOrdering()); - OrderBy orderBy = (OrderBy) attributeResource.getAnnotation(OrderBy.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.removeAnnotation(OrderBy.ANNOTATION_NAME); + attributeResource.removeAnnotation(OrderByAnnotation.ANNOTATION_NAME); assertTrue(oneToManyMapping.isNoOrdering()); - assertNull(attributeResource.getAnnotation(OrderBy.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(OrderByAnnotation.ANNOTATION_NAME)); } public void testUpdatePkOrdering() throws Exception { @@ -854,20 +854,20 @@ public class JavaOneToManyMappingTests extends ContextModelTestCase JavaResourcePersistentAttribute attributeResource = typeResource.attributes().next(); assertFalse(oneToManyMapping.isPkOrdering()); - assertNull(attributeResource.getAnnotation(OrderBy.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(OrderByAnnotation.ANNOTATION_NAME)); //set orderBy in the resource model, verify context model updated - attributeResource.addAnnotation(OrderBy.ANNOTATION_NAME); + attributeResource.addAnnotation(OrderByAnnotation.ANNOTATION_NAME); assertTrue(oneToManyMapping.isPkOrdering()); - OrderBy orderBy = (OrderBy) attributeResource.getAnnotation(OrderBy.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.removeAnnotation(OrderBy.ANNOTATION_NAME); + attributeResource.removeAnnotation(OrderByAnnotation.ANNOTATION_NAME); assertFalse(oneToManyMapping.isPkOrdering()); - assertNull(attributeResource.getAnnotation(OrderBy.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(OrderByAnnotation.ANNOTATION_NAME)); } public void testUpdateCustomOrdering() throws Exception { @@ -881,19 +881,19 @@ public class JavaOneToManyMappingTests extends ContextModelTestCase JavaResourcePersistentAttribute attributeResource = typeResource.attributes().next(); assertFalse(oneToManyMapping.isCustomOrdering()); - assertNull(attributeResource.getAnnotation(OrderBy.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(OrderByAnnotation.ANNOTATION_NAME)); //set orderBy in the resource model, verify context model updated - attributeResource.addAnnotation(OrderBy.ANNOTATION_NAME); + attributeResource.addAnnotation(OrderByAnnotation.ANNOTATION_NAME); assertFalse(oneToManyMapping.isCustomOrdering()); - OrderBy orderBy = (OrderBy) attributeResource.getAnnotation(OrderBy.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.removeAnnotation(OrderBy.ANNOTATION_NAME); + attributeResource.removeAnnotation(OrderByAnnotation.ANNOTATION_NAME); assertFalse(oneToManyMapping.isCustomOrdering()); - assertNull(attributeResource.getAnnotation(OrderBy.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(OrderByAnnotation.ANNOTATION_NAME)); } } 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 5907e8c009..1f44cd88c9 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 @@ -31,22 +31,22 @@ import org.eclipse.jpt.core.context.VersionMapping; import org.eclipse.jpt.core.context.java.JavaJoinColumn; import org.eclipse.jpt.core.context.java.JavaPersistentType; import org.eclipse.jpt.core.context.persistence.ClassRef; -import org.eclipse.jpt.core.resource.java.Basic; -import org.eclipse.jpt.core.resource.java.Embedded; -import org.eclipse.jpt.core.resource.java.EmbeddedId; -import org.eclipse.jpt.core.resource.java.Id; +import org.eclipse.jpt.core.resource.java.BasicAnnotation; +import org.eclipse.jpt.core.resource.java.EmbeddedAnnotation; +import org.eclipse.jpt.core.resource.java.EmbeddedIdAnnotation; +import org.eclipse.jpt.core.resource.java.IdAnnotation; import org.eclipse.jpt.core.resource.java.JPA; import org.eclipse.jpt.core.resource.java.JavaResourceNode; import org.eclipse.jpt.core.resource.java.JavaResourcePersistentAttribute; import org.eclipse.jpt.core.resource.java.JavaResourcePersistentType; import org.eclipse.jpt.core.resource.java.JoinColumnAnnotation; -import org.eclipse.jpt.core.resource.java.JoinColumns; -import org.eclipse.jpt.core.resource.java.ManyToMany; -import org.eclipse.jpt.core.resource.java.ManyToOne; -import org.eclipse.jpt.core.resource.java.OneToMany; -import org.eclipse.jpt.core.resource.java.OneToOne; -import org.eclipse.jpt.core.resource.java.Transient; -import org.eclipse.jpt.core.resource.java.Version; +import org.eclipse.jpt.core.resource.java.JoinColumnsAnnotation; +import org.eclipse.jpt.core.resource.java.ManyToManyAnnotation; +import org.eclipse.jpt.core.resource.java.ManyToOneAnnotation; +import org.eclipse.jpt.core.resource.java.OneToManyAnnotation; +import org.eclipse.jpt.core.resource.java.OneToOneAnnotation; +import org.eclipse.jpt.core.resource.java.TransientAnnotation; +import org.eclipse.jpt.core.resource.java.VersionAnnotation; import org.eclipse.jpt.core.tests.internal.context.ContextModelTestCase; import org.eclipse.jpt.core.tests.internal.projects.TestJavaProject.SourceWriter; import org.eclipse.jpt.utility.internal.CollectionTools; @@ -211,8 +211,8 @@ public class JavaOneToOneMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = jpaProject().getJavaPersistentTypeResource(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.attributes().next(); - assertNull(attributeResource.getMappingAnnotation(OneToOne.ANNOTATION_NAME)); - assertNotNull(attributeResource.getMappingAnnotation(Basic.ANNOTATION_NAME)); + assertNull(attributeResource.getMappingAnnotation(OneToOneAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getMappingAnnotation(BasicAnnotation.ANNOTATION_NAME)); assertNull(attributeResource.getAnnotation(JoinColumnAnnotation.ANNOTATION_NAME)); } @@ -231,7 +231,7 @@ public class JavaOneToOneMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = jpaProject().getJavaPersistentTypeResource(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.attributes().next(); - assertNull(attributeResource.getMappingAnnotation(OneToOne.ANNOTATION_NAME)); + assertNull(attributeResource.getMappingAnnotation(OneToOneAnnotation.ANNOTATION_NAME)); assertNull(attributeResource.getAnnotation(JoinColumnAnnotation.ANNOTATION_NAME)); } @@ -250,8 +250,8 @@ public class JavaOneToOneMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = jpaProject().getJavaPersistentTypeResource(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.attributes().next(); - assertNull(attributeResource.getMappingAnnotation(OneToOne.ANNOTATION_NAME)); - assertNotNull(attributeResource.getMappingAnnotation(Version.ANNOTATION_NAME)); + assertNull(attributeResource.getMappingAnnotation(OneToOneAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getMappingAnnotation(VersionAnnotation.ANNOTATION_NAME)); assertNull(attributeResource.getAnnotation(JoinColumnAnnotation.ANNOTATION_NAME)); } @@ -270,8 +270,8 @@ public class JavaOneToOneMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = jpaProject().getJavaPersistentTypeResource(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.attributes().next(); - assertNull(attributeResource.getMappingAnnotation(OneToOne.ANNOTATION_NAME)); - assertNotNull(attributeResource.getMappingAnnotation(Id.ANNOTATION_NAME)); + assertNull(attributeResource.getMappingAnnotation(OneToOneAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getMappingAnnotation(IdAnnotation.ANNOTATION_NAME)); assertNull(attributeResource.getAnnotation(JoinColumnAnnotation.ANNOTATION_NAME)); } @@ -290,8 +290,8 @@ public class JavaOneToOneMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = jpaProject().getJavaPersistentTypeResource(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.attributes().next(); - assertNull(attributeResource.getMappingAnnotation(OneToOne.ANNOTATION_NAME)); - assertNotNull(attributeResource.getMappingAnnotation(Embedded.ANNOTATION_NAME)); + assertNull(attributeResource.getMappingAnnotation(OneToOneAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getMappingAnnotation(EmbeddedAnnotation.ANNOTATION_NAME)); assertNull(attributeResource.getAnnotation(JoinColumnAnnotation.ANNOTATION_NAME)); } @@ -310,8 +310,8 @@ public class JavaOneToOneMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = jpaProject().getJavaPersistentTypeResource(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.attributes().next(); - assertNull(attributeResource.getMappingAnnotation(OneToOne.ANNOTATION_NAME)); - assertNotNull(attributeResource.getMappingAnnotation(EmbeddedId.ANNOTATION_NAME)); + assertNull(attributeResource.getMappingAnnotation(OneToOneAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getMappingAnnotation(EmbeddedIdAnnotation.ANNOTATION_NAME)); assertNull(attributeResource.getAnnotation(JoinColumnAnnotation.ANNOTATION_NAME)); } @@ -330,8 +330,8 @@ public class JavaOneToOneMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = jpaProject().getJavaPersistentTypeResource(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.attributes().next(); - assertNull(attributeResource.getMappingAnnotation(OneToOne.ANNOTATION_NAME)); - assertNotNull(attributeResource.getMappingAnnotation(Transient.ANNOTATION_NAME)); + assertNull(attributeResource.getMappingAnnotation(OneToOneAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getMappingAnnotation(TransientAnnotation.ANNOTATION_NAME)); assertNull(attributeResource.getAnnotation(JoinColumnAnnotation.ANNOTATION_NAME)); } @@ -350,8 +350,8 @@ public class JavaOneToOneMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = jpaProject().getJavaPersistentTypeResource(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.attributes().next(); - assertNull(attributeResource.getMappingAnnotation(OneToOne.ANNOTATION_NAME)); - assertNotNull(attributeResource.getMappingAnnotation(ManyToOne.ANNOTATION_NAME)); + assertNull(attributeResource.getMappingAnnotation(OneToOneAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getMappingAnnotation(ManyToOneAnnotation.ANNOTATION_NAME)); assertNotNull(attributeResource.getAnnotation(JoinColumnAnnotation.ANNOTATION_NAME)); } @@ -370,8 +370,8 @@ public class JavaOneToOneMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = jpaProject().getJavaPersistentTypeResource(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.attributes().next(); - assertNull(attributeResource.getMappingAnnotation(OneToOne.ANNOTATION_NAME)); - assertNotNull(attributeResource.getMappingAnnotation(OneToMany.ANNOTATION_NAME)); + assertNull(attributeResource.getMappingAnnotation(OneToOneAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getMappingAnnotation(OneToManyAnnotation.ANNOTATION_NAME)); assertNotNull(attributeResource.getAnnotation(JoinColumnAnnotation.ANNOTATION_NAME)); } @@ -390,8 +390,8 @@ public class JavaOneToOneMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = jpaProject().getJavaPersistentTypeResource(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.attributes().next(); - assertNull(attributeResource.getMappingAnnotation(OneToOne.ANNOTATION_NAME)); - assertNotNull(attributeResource.getMappingAnnotation(ManyToMany.ANNOTATION_NAME)); + assertNull(attributeResource.getMappingAnnotation(OneToOneAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getMappingAnnotation(ManyToManyAnnotation.ANNOTATION_NAME)); assertNull(attributeResource.getAnnotation(JoinColumnAnnotation.ANNOTATION_NAME)); } @@ -405,7 +405,7 @@ public class JavaOneToOneMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = jpaProject().getJavaPersistentTypeResource(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.attributes().next(); - OneToOne oneToOne = (OneToOne) attributeResource.getMappingAnnotation(); + OneToOneAnnotation oneToOne = (OneToOneAnnotation) attributeResource.getMappingAnnotation(); assertNull(oneToOneMapping.getSpecifiedTargetEntity()); assertNull(oneToOne.getTargetEntity()); @@ -430,7 +430,7 @@ public class JavaOneToOneMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = jpaProject().getJavaPersistentTypeResource(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.attributes().next(); - OneToOne oneToOne = (OneToOne) attributeResource.getMappingAnnotation(); + OneToOneAnnotation oneToOne = (OneToOneAnnotation) attributeResource.getMappingAnnotation(); assertNull(oneToOneMapping.getSpecifiedTargetEntity()); assertNull(oneToOne.getTargetEntity()); @@ -455,7 +455,7 @@ public class JavaOneToOneMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = jpaProject().getJavaPersistentTypeResource(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.attributes().next(); - OneToOne oneToOne = (OneToOne) attributeResource.getMappingAnnotation(); + OneToOneAnnotation oneToOne = (OneToOneAnnotation) attributeResource.getMappingAnnotation(); assertNull(oneToOneMapping.getMappedBy()); assertNull(oneToOne.getMappedBy()); @@ -480,7 +480,7 @@ public class JavaOneToOneMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = jpaProject().getJavaPersistentTypeResource(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.attributes().next(); - OneToOne oneToOne = (OneToOne) attributeResource.getMappingAnnotation(); + OneToOneAnnotation oneToOne = (OneToOneAnnotation) attributeResource.getMappingAnnotation(); assertNull(oneToOneMapping.getMappedBy()); assertNull(oneToOne.getMappedBy()); @@ -505,7 +505,7 @@ public class JavaOneToOneMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = jpaProject().getJavaPersistentTypeResource(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.attributes().next(); - OneToOne oneToOne = (OneToOne) attributeResource.getMappingAnnotation(); + OneToOneAnnotation oneToOne = (OneToOneAnnotation) attributeResource.getMappingAnnotation(); assertNull(oneToOneMapping.getSpecifiedOptional()); assertNull(oneToOne.getOptional()); @@ -535,7 +535,7 @@ public class JavaOneToOneMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = jpaProject().getJavaPersistentTypeResource(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.attributes().next(); - OneToOne oneToOne = (OneToOne) attributeResource.getMappingAnnotation(); + OneToOneAnnotation oneToOne = (OneToOneAnnotation) attributeResource.getMappingAnnotation(); assertNull(oneToOneMapping.getSpecifiedOptional()); assertNull(oneToOne.getOptional()); @@ -565,7 +565,7 @@ public class JavaOneToOneMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = jpaProject().getJavaPersistentTypeResource(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.attributes().next(); - OneToOne oneToOne = (OneToOne) attributeResource.getMappingAnnotation(); + OneToOneAnnotation oneToOne = (OneToOneAnnotation) attributeResource.getMappingAnnotation(); assertNull(oneToOneMapping.getSpecifiedFetch()); assertNull(oneToOne.getFetch()); @@ -595,7 +595,7 @@ public class JavaOneToOneMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = jpaProject().getJavaPersistentTypeResource(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.attributes().next(); - OneToOne oneToOne = (OneToOne) attributeResource.getMappingAnnotation(); + OneToOneAnnotation oneToOne = (OneToOneAnnotation) attributeResource.getMappingAnnotation(); assertNull(oneToOneMapping.getSpecifiedFetch()); assertNull(oneToOne.getFetch()); @@ -735,7 +735,7 @@ public class JavaOneToOneMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = jpaProject().getJavaPersistentTypeResource(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.attributes().next(); - Iterator<JavaResourceNode> joinColumns = attributeResource.annotations(JoinColumnAnnotation.ANNOTATION_NAME, JoinColumns.ANNOTATION_NAME); + Iterator<JavaResourceNode> joinColumns = attributeResource.annotations(JoinColumnAnnotation.ANNOTATION_NAME, JoinColumnsAnnotation.ANNOTATION_NAME); assertEquals("BAZ", ((JoinColumnAnnotation) joinColumns.next()).getName()); assertEquals("BAR", ((JoinColumnAnnotation) joinColumns.next()).getName()); @@ -756,7 +756,7 @@ public class JavaOneToOneMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = jpaProject().getJavaPersistentTypeResource(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.attributes().next(); - Iterator<JavaResourceNode> joinColumns = attributeResource.annotations(JoinColumnAnnotation.ANNOTATION_NAME, JoinColumns.ANNOTATION_NAME); + Iterator<JavaResourceNode> joinColumns = attributeResource.annotations(JoinColumnAnnotation.ANNOTATION_NAME, JoinColumnsAnnotation.ANNOTATION_NAME); assertEquals("FOO", ((JoinColumnAnnotation) joinColumns.next()).getName()); assertEquals("BAR", ((JoinColumnAnnotation) joinColumns.next()).getName()); @@ -777,11 +777,11 @@ public class JavaOneToOneMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = jpaProject().getJavaPersistentTypeResource(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.attributes().next(); - assertEquals(3, CollectionTools.size(attributeResource.annotations(JoinColumnAnnotation.ANNOTATION_NAME, JoinColumns.ANNOTATION_NAME))); + assertEquals(3, CollectionTools.size(attributeResource.annotations(JoinColumnAnnotation.ANNOTATION_NAME, JoinColumnsAnnotation.ANNOTATION_NAME))); oneToOneMapping.removeSpecifiedJoinColumn(1); - Iterator<JavaResourceNode> joinColumnResources = attributeResource.annotations(JoinColumnAnnotation.ANNOTATION_NAME, JoinColumns.ANNOTATION_NAME); + Iterator<JavaResourceNode> joinColumnResources = attributeResource.annotations(JoinColumnAnnotation.ANNOTATION_NAME, JoinColumnsAnnotation.ANNOTATION_NAME); assertEquals("FOO", ((JoinColumnAnnotation) joinColumnResources.next()).getName()); assertEquals("BAZ", ((JoinColumnAnnotation) joinColumnResources.next()).getName()); assertFalse(joinColumnResources.hasNext()); @@ -793,7 +793,7 @@ public class JavaOneToOneMappingTests extends ContextModelTestCase oneToOneMapping.removeSpecifiedJoinColumn(1); - joinColumnResources = attributeResource.annotations(JoinColumnAnnotation.ANNOTATION_NAME, JoinColumns.ANNOTATION_NAME); + joinColumnResources = attributeResource.annotations(JoinColumnAnnotation.ANNOTATION_NAME, JoinColumnsAnnotation.ANNOTATION_NAME); assertEquals("FOO", ((JoinColumnAnnotation) joinColumnResources.next()).getName()); assertFalse(joinColumnResources.hasNext()); @@ -803,12 +803,12 @@ public class JavaOneToOneMappingTests extends ContextModelTestCase oneToOneMapping.removeSpecifiedJoinColumn(0); - joinColumnResources = attributeResource.annotations(JoinColumnAnnotation.ANNOTATION_NAME, JoinColumns.ANNOTATION_NAME); + joinColumnResources = attributeResource.annotations(JoinColumnAnnotation.ANNOTATION_NAME, JoinColumnsAnnotation.ANNOTATION_NAME); assertFalse(joinColumnResources.hasNext()); joinColumns = oneToOneMapping.specifiedJoinColumns(); assertFalse(joinColumns.hasNext()); - assertNull(attributeResource.getAnnotation(JoinColumns.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(JoinColumnsAnnotation.ANNOTATION_NAME)); } public void testMoveSpecifiedJoinColumn() throws Exception { @@ -824,7 +824,7 @@ public class JavaOneToOneMappingTests extends ContextModelTestCase JavaResourcePersistentAttribute attributeResource = jpaProject().getJavaPersistentTypeResource(FULLY_QUALIFIED_TYPE_NAME).attributes().next(); - ListIterator<JoinColumnAnnotation> javaJoinColumns = attributeResource.annotations(JoinColumnAnnotation.ANNOTATION_NAME, JoinColumns.ANNOTATION_NAME); + ListIterator<JoinColumnAnnotation> javaJoinColumns = attributeResource.annotations(JoinColumnAnnotation.ANNOTATION_NAME, JoinColumnsAnnotation.ANNOTATION_NAME); assertEquals(3, CollectionTools.size(javaJoinColumns)); @@ -834,7 +834,7 @@ public class JavaOneToOneMappingTests extends ContextModelTestCase assertEquals("BAZ", primaryKeyJoinColumns.next().getSpecifiedName()); assertEquals("FOO", primaryKeyJoinColumns.next().getSpecifiedName()); - javaJoinColumns = attributeResource.annotations(JoinColumnAnnotation.ANNOTATION_NAME, JoinColumns.ANNOTATION_NAME); + javaJoinColumns = attributeResource.annotations(JoinColumnAnnotation.ANNOTATION_NAME, JoinColumnsAnnotation.ANNOTATION_NAME); assertEquals("BAR", javaJoinColumns.next().getName()); assertEquals("BAZ", javaJoinColumns.next().getName()); assertEquals("FOO", javaJoinColumns.next().getName()); @@ -846,7 +846,7 @@ public class JavaOneToOneMappingTests extends ContextModelTestCase assertEquals("BAR", primaryKeyJoinColumns.next().getSpecifiedName()); assertEquals("FOO", primaryKeyJoinColumns.next().getSpecifiedName()); - javaJoinColumns = attributeResource.annotations(JoinColumnAnnotation.ANNOTATION_NAME, JoinColumns.ANNOTATION_NAME); + javaJoinColumns = attributeResource.annotations(JoinColumnAnnotation.ANNOTATION_NAME, JoinColumnsAnnotation.ANNOTATION_NAME); assertEquals("BAZ", javaJoinColumns.next().getName()); assertEquals("BAR", javaJoinColumns.next().getName()); assertEquals("FOO", javaJoinColumns.next().getName()); @@ -860,9 +860,9 @@ public class JavaOneToOneMappingTests extends ContextModelTestCase OneToOneMapping oneToOneMapping = (OneToOneMapping) persistentAttribute.getMapping(); JavaResourcePersistentAttribute attributeResource = jpaProject().getJavaPersistentTypeResource(FULLY_QUALIFIED_TYPE_NAME).attributes().next(); - ((JoinColumnAnnotation) attributeResource.addAnnotation(0, JoinColumnAnnotation.ANNOTATION_NAME, JoinColumns.ANNOTATION_NAME)).setName("FOO"); - ((JoinColumnAnnotation) attributeResource.addAnnotation(1, JoinColumnAnnotation.ANNOTATION_NAME, JoinColumns.ANNOTATION_NAME)).setName("BAR"); - ((JoinColumnAnnotation) attributeResource.addAnnotation(2, JoinColumnAnnotation.ANNOTATION_NAME, JoinColumns.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<JoinColumn> joinColumns = oneToOneMapping.specifiedJoinColumns(); assertEquals("FOO", joinColumns.next().getName()); @@ -870,32 +870,32 @@ public class JavaOneToOneMappingTests extends ContextModelTestCase assertEquals("BAZ", joinColumns.next().getName()); assertFalse(joinColumns.hasNext()); - attributeResource.move(2, 0, JoinColumns.ANNOTATION_NAME); + attributeResource.move(2, 0, JoinColumnsAnnotation.ANNOTATION_NAME); joinColumns = oneToOneMapping.specifiedJoinColumns(); assertEquals("BAR", joinColumns.next().getName()); assertEquals("BAZ", joinColumns.next().getName()); assertEquals("FOO", joinColumns.next().getName()); assertFalse(joinColumns.hasNext()); - attributeResource.move(0, 1, JoinColumns.ANNOTATION_NAME); + attributeResource.move(0, 1, JoinColumnsAnnotation.ANNOTATION_NAME); joinColumns = oneToOneMapping.specifiedJoinColumns(); assertEquals("BAZ", joinColumns.next().getName()); assertEquals("BAR", joinColumns.next().getName()); assertEquals("FOO", joinColumns.next().getName()); assertFalse(joinColumns.hasNext()); - attributeResource.removeAnnotation(1, JoinColumnAnnotation.ANNOTATION_NAME, JoinColumns.ANNOTATION_NAME); + attributeResource.removeAnnotation(1, JoinColumnAnnotation.ANNOTATION_NAME, JoinColumnsAnnotation.ANNOTATION_NAME); joinColumns = oneToOneMapping.specifiedJoinColumns(); assertEquals("BAZ", joinColumns.next().getName()); assertEquals("FOO", joinColumns.next().getName()); assertFalse(joinColumns.hasNext()); - attributeResource.removeAnnotation(1, JoinColumnAnnotation.ANNOTATION_NAME, JoinColumns.ANNOTATION_NAME); + attributeResource.removeAnnotation(1, JoinColumnAnnotation.ANNOTATION_NAME, JoinColumnsAnnotation.ANNOTATION_NAME); joinColumns = oneToOneMapping.specifiedJoinColumns(); assertEquals("BAZ", joinColumns.next().getName()); assertFalse(joinColumns.hasNext()); - attributeResource.removeAnnotation(0, JoinColumnAnnotation.ANNOTATION_NAME, JoinColumns.ANNOTATION_NAME); + attributeResource.removeAnnotation(0, JoinColumnAnnotation.ANNOTATION_NAME, JoinColumnsAnnotation.ANNOTATION_NAME); joinColumns = oneToOneMapping.specifiedJoinColumns(); assertFalse(joinColumns.hasNext()); } diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/JavaPersistentAttributeTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/JavaPersistentAttributeTests.java index 819f177c05..17f39f6873 100644 --- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/JavaPersistentAttributeTests.java +++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/JavaPersistentAttributeTests.java @@ -17,9 +17,9 @@ import org.eclipse.jpt.core.context.PersistentAttribute; import org.eclipse.jpt.core.context.java.JavaBasicMapping; import org.eclipse.jpt.core.context.java.JavaEmbeddedMapping; import org.eclipse.jpt.core.context.java.JavaIdMapping; -import org.eclipse.jpt.core.resource.java.Basic; -import org.eclipse.jpt.core.resource.java.Embedded; -import org.eclipse.jpt.core.resource.java.Id; +import org.eclipse.jpt.core.resource.java.BasicAnnotation; +import org.eclipse.jpt.core.resource.java.EmbeddedAnnotation; +import org.eclipse.jpt.core.resource.java.IdAnnotation; import org.eclipse.jpt.core.resource.java.JPA; import org.eclipse.jpt.core.resource.java.JavaResourcePersistentAttribute; import org.eclipse.jpt.core.resource.java.JavaResourcePersistentType; @@ -155,7 +155,7 @@ public class JavaPersistentAttributeTests extends ContextModelTestCase JavaResourcePersistentType typeResource = jpaProject().getJavaPersistentTypeResource(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.attributes().next(); assertNotNull(attributeResource.getMappingAnnotation()); - assertTrue(attributeResource.getMappingAnnotation() instanceof Embedded); + assertTrue(attributeResource.getMappingAnnotation() instanceof EmbeddedAnnotation); assertEquals(MappingKeys.EMBEDDED_ATTRIBUTE_MAPPING_KEY, persistentAttribute.getMappingKey()); assertTrue(persistentAttribute.getSpecifiedMapping() instanceof JavaEmbeddedMapping); @@ -173,7 +173,7 @@ public class JavaPersistentAttributeTests extends ContextModelTestCase JavaResourcePersistentType typeResource = jpaProject().getJavaPersistentTypeResource(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.attributes().next(); assertNotNull(attributeResource.getMappingAnnotation()); - assertTrue(attributeResource.getMappingAnnotation() instanceof Embedded); + assertTrue(attributeResource.getMappingAnnotation() instanceof EmbeddedAnnotation); assertEquals(MappingKeys.EMBEDDED_ATTRIBUTE_MAPPING_KEY, persistentAttribute.getMappingKey()); assertTrue(persistentAttribute.getSpecifiedMapping() instanceof JavaEmbeddedMapping); @@ -191,7 +191,7 @@ public class JavaPersistentAttributeTests extends ContextModelTestCase JavaResourcePersistentType typeResource = jpaProject().getJavaPersistentTypeResource(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.attributes().next(); assertNull(attributeResource.getMappingAnnotation()); - assertNull(attributeResource.getMappingAnnotation(Id.ANNOTATION_NAME)); + assertNull(attributeResource.getMappingAnnotation(IdAnnotation.ANNOTATION_NAME)); assertNull(persistentAttribute.getSpecifiedMapping()); } @@ -205,7 +205,7 @@ public class JavaPersistentAttributeTests extends ContextModelTestCase JavaResourcePersistentType typeResource = jpaProject().getJavaPersistentTypeResource(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.attributes().next(); - attributeResource.setMappingAnnotation(Embedded.ANNOTATION_NAME); + attributeResource.setMappingAnnotation(EmbeddedAnnotation.ANNOTATION_NAME); assertEquals(MappingKeys.EMBEDDED_ATTRIBUTE_MAPPING_KEY, persistentAttribute.getMappingKey()); } @@ -219,7 +219,7 @@ public class JavaPersistentAttributeTests extends ContextModelTestCase JavaResourcePersistentType typeResource = jpaProject().getJavaPersistentTypeResource(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.attributes().next(); - attributeResource.setMappingAnnotation(Basic.ANNOTATION_NAME); + attributeResource.setMappingAnnotation(BasicAnnotation.ANNOTATION_NAME); 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/JavaTransientMappingTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/JavaTransientMappingTests.java index 3a5b7f120a..c00fdc2187 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 @@ -24,19 +24,19 @@ import org.eclipse.jpt.core.context.OneToOneMapping; import org.eclipse.jpt.core.context.PersistentAttribute; import org.eclipse.jpt.core.context.TransientMapping; import org.eclipse.jpt.core.context.VersionMapping; -import org.eclipse.jpt.core.resource.java.Basic; -import org.eclipse.jpt.core.resource.java.Embedded; -import org.eclipse.jpt.core.resource.java.EmbeddedId; -import org.eclipse.jpt.core.resource.java.Id; +import org.eclipse.jpt.core.resource.java.BasicAnnotation; +import org.eclipse.jpt.core.resource.java.EmbeddedAnnotation; +import org.eclipse.jpt.core.resource.java.EmbeddedIdAnnotation; +import org.eclipse.jpt.core.resource.java.IdAnnotation; import org.eclipse.jpt.core.resource.java.JPA; import org.eclipse.jpt.core.resource.java.JavaResourcePersistentAttribute; import org.eclipse.jpt.core.resource.java.JavaResourcePersistentType; -import org.eclipse.jpt.core.resource.java.ManyToMany; -import org.eclipse.jpt.core.resource.java.ManyToOne; -import org.eclipse.jpt.core.resource.java.OneToMany; -import org.eclipse.jpt.core.resource.java.OneToOne; -import org.eclipse.jpt.core.resource.java.Transient; -import org.eclipse.jpt.core.resource.java.Version; +import org.eclipse.jpt.core.resource.java.ManyToManyAnnotation; +import org.eclipse.jpt.core.resource.java.ManyToOneAnnotation; +import org.eclipse.jpt.core.resource.java.OneToManyAnnotation; +import org.eclipse.jpt.core.resource.java.OneToOneAnnotation; +import org.eclipse.jpt.core.resource.java.TransientAnnotation; +import org.eclipse.jpt.core.resource.java.VersionAnnotation; import org.eclipse.jpt.core.tests.internal.context.ContextModelTestCase; import org.eclipse.jpt.utility.internal.iterators.ArrayIterator; @@ -89,8 +89,8 @@ public class JavaTransientMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = jpaProject().getJavaPersistentTypeResource(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.attributes().next(); - assertNull(attributeResource.getMappingAnnotation(Transient.ANNOTATION_NAME)); - assertNotNull(attributeResource.getMappingAnnotation(Basic.ANNOTATION_NAME)); + assertNull(attributeResource.getMappingAnnotation(TransientAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getMappingAnnotation(BasicAnnotation.ANNOTATION_NAME)); } public void testMorphToDefault() throws Exception { @@ -107,7 +107,7 @@ public class JavaTransientMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = jpaProject().getJavaPersistentTypeResource(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.attributes().next(); - assertNull(attributeResource.getMappingAnnotation(Transient.ANNOTATION_NAME)); + assertNull(attributeResource.getMappingAnnotation(TransientAnnotation.ANNOTATION_NAME)); } public void testMorphToVersionMapping() throws Exception { @@ -123,8 +123,8 @@ public class JavaTransientMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = jpaProject().getJavaPersistentTypeResource(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.attributes().next(); - assertNull(attributeResource.getMappingAnnotation(Transient.ANNOTATION_NAME)); - assertNotNull(attributeResource.getMappingAnnotation(Version.ANNOTATION_NAME)); + assertNull(attributeResource.getMappingAnnotation(TransientAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getMappingAnnotation(VersionAnnotation.ANNOTATION_NAME)); } public void testMorphToEmbeddedMapping() throws Exception { @@ -140,8 +140,8 @@ public class JavaTransientMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = jpaProject().getJavaPersistentTypeResource(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.attributes().next(); - assertNull(attributeResource.getMappingAnnotation(Transient.ANNOTATION_NAME)); - assertNotNull(attributeResource.getMappingAnnotation(Embedded.ANNOTATION_NAME)); + assertNull(attributeResource.getMappingAnnotation(TransientAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getMappingAnnotation(EmbeddedAnnotation.ANNOTATION_NAME)); } public void testMorphToIdMapping() throws Exception { @@ -157,8 +157,8 @@ public class JavaTransientMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = jpaProject().getJavaPersistentTypeResource(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.attributes().next(); - assertNull(attributeResource.getMappingAnnotation(Transient.ANNOTATION_NAME)); - assertNotNull(attributeResource.getMappingAnnotation(Id.ANNOTATION_NAME)); + assertNull(attributeResource.getMappingAnnotation(TransientAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getMappingAnnotation(IdAnnotation.ANNOTATION_NAME)); } public void testMorphToEmbeddedIdMapping() throws Exception { @@ -174,8 +174,8 @@ public class JavaTransientMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = jpaProject().getJavaPersistentTypeResource(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.attributes().next(); - assertNull(attributeResource.getMappingAnnotation(Transient.ANNOTATION_NAME)); - assertNotNull(attributeResource.getMappingAnnotation(EmbeddedId.ANNOTATION_NAME)); + assertNull(attributeResource.getMappingAnnotation(TransientAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getMappingAnnotation(EmbeddedIdAnnotation.ANNOTATION_NAME)); } public void testMorphToOneToOneMapping() throws Exception { @@ -191,8 +191,8 @@ public class JavaTransientMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = jpaProject().getJavaPersistentTypeResource(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.attributes().next(); - assertNull(attributeResource.getMappingAnnotation(Transient.ANNOTATION_NAME)); - assertNotNull(attributeResource.getMappingAnnotation(OneToOne.ANNOTATION_NAME)); + assertNull(attributeResource.getMappingAnnotation(TransientAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getMappingAnnotation(OneToOneAnnotation.ANNOTATION_NAME)); } public void testMorphToOneToManyMapping() throws Exception { @@ -208,8 +208,8 @@ public class JavaTransientMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = jpaProject().getJavaPersistentTypeResource(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.attributes().next(); - assertNull(attributeResource.getMappingAnnotation(Transient.ANNOTATION_NAME)); - assertNotNull(attributeResource.getMappingAnnotation(OneToMany.ANNOTATION_NAME)); + assertNull(attributeResource.getMappingAnnotation(TransientAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getMappingAnnotation(OneToManyAnnotation.ANNOTATION_NAME)); } public void testMorphToManyToOneMapping() throws Exception { @@ -225,8 +225,8 @@ public class JavaTransientMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = jpaProject().getJavaPersistentTypeResource(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.attributes().next(); - assertNull(attributeResource.getMappingAnnotation(Transient.ANNOTATION_NAME)); - assertNotNull(attributeResource.getMappingAnnotation(ManyToOne.ANNOTATION_NAME)); + assertNull(attributeResource.getMappingAnnotation(TransientAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getMappingAnnotation(ManyToOneAnnotation.ANNOTATION_NAME)); } public void testMorphToManyToManyMapping() throws Exception { @@ -242,8 +242,8 @@ public class JavaTransientMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = jpaProject().getJavaPersistentTypeResource(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.attributes().next(); - assertNull(attributeResource.getMappingAnnotation(Transient.ANNOTATION_NAME)); - assertNotNull(attributeResource.getMappingAnnotation(ManyToMany.ANNOTATION_NAME)); + assertNull(attributeResource.getMappingAnnotation(TransientAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getMappingAnnotation(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 e35d92681f..e6577fcc5b 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 @@ -25,21 +25,21 @@ import org.eclipse.jpt.core.context.PersistentAttribute; import org.eclipse.jpt.core.context.TemporalType; import org.eclipse.jpt.core.context.TransientMapping; import org.eclipse.jpt.core.context.VersionMapping; -import org.eclipse.jpt.core.resource.java.Basic; +import org.eclipse.jpt.core.resource.java.BasicAnnotation; import org.eclipse.jpt.core.resource.java.ColumnAnnotation; -import org.eclipse.jpt.core.resource.java.Embedded; -import org.eclipse.jpt.core.resource.java.EmbeddedId; -import org.eclipse.jpt.core.resource.java.Id; +import org.eclipse.jpt.core.resource.java.EmbeddedAnnotation; +import org.eclipse.jpt.core.resource.java.EmbeddedIdAnnotation; +import org.eclipse.jpt.core.resource.java.IdAnnotation; import org.eclipse.jpt.core.resource.java.JPA; import org.eclipse.jpt.core.resource.java.JavaResourcePersistentAttribute; import org.eclipse.jpt.core.resource.java.JavaResourcePersistentType; -import org.eclipse.jpt.core.resource.java.ManyToMany; -import org.eclipse.jpt.core.resource.java.ManyToOne; -import org.eclipse.jpt.core.resource.java.OneToMany; -import org.eclipse.jpt.core.resource.java.OneToOne; -import org.eclipse.jpt.core.resource.java.Temporal; -import org.eclipse.jpt.core.resource.java.Transient; -import org.eclipse.jpt.core.resource.java.Version; +import org.eclipse.jpt.core.resource.java.ManyToManyAnnotation; +import org.eclipse.jpt.core.resource.java.ManyToOneAnnotation; +import org.eclipse.jpt.core.resource.java.OneToManyAnnotation; +import org.eclipse.jpt.core.resource.java.OneToOneAnnotation; +import org.eclipse.jpt.core.resource.java.TemporalAnnotation; +import org.eclipse.jpt.core.resource.java.TransientAnnotation; +import org.eclipse.jpt.core.resource.java.VersionAnnotation; import org.eclipse.jpt.core.tests.internal.context.ContextModelTestCase; import org.eclipse.jpt.utility.internal.iterators.ArrayIterator; @@ -121,10 +121,10 @@ public class JavaVersionMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = jpaProject().getJavaPersistentTypeResource(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.attributes().next(); - assertNull(attributeResource.getMappingAnnotation(Version.ANNOTATION_NAME)); - assertNotNull(attributeResource.getMappingAnnotation(Basic.ANNOTATION_NAME)); + assertNull(attributeResource.getMappingAnnotation(VersionAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getMappingAnnotation(BasicAnnotation.ANNOTATION_NAME)); assertNotNull(attributeResource.getAnnotation(ColumnAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getAnnotation(Temporal.ANNOTATION_NAME)); + assertNotNull(attributeResource.getAnnotation(TemporalAnnotation.ANNOTATION_NAME)); } public void testMorphToDefault() throws Exception { @@ -144,9 +144,9 @@ public class JavaVersionMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = jpaProject().getJavaPersistentTypeResource(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.attributes().next(); - assertNull(attributeResource.getMappingAnnotation(Version.ANNOTATION_NAME)); + assertNull(attributeResource.getMappingAnnotation(VersionAnnotation.ANNOTATION_NAME)); assertNotNull(attributeResource.getAnnotation(ColumnAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getAnnotation(Temporal.ANNOTATION_NAME)); + assertNotNull(attributeResource.getAnnotation(TemporalAnnotation.ANNOTATION_NAME)); } public void testMorphToIdMapping() throws Exception { @@ -166,10 +166,10 @@ public class JavaVersionMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = jpaProject().getJavaPersistentTypeResource(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.attributes().next(); - assertNull(attributeResource.getMappingAnnotation(Version.ANNOTATION_NAME)); - assertNotNull(attributeResource.getMappingAnnotation(Id.ANNOTATION_NAME)); + assertNull(attributeResource.getMappingAnnotation(VersionAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getMappingAnnotation(IdAnnotation.ANNOTATION_NAME)); assertNotNull(attributeResource.getAnnotation(ColumnAnnotation.ANNOTATION_NAME)); - assertNotNull(attributeResource.getAnnotation(Temporal.ANNOTATION_NAME)); + assertNotNull(attributeResource.getAnnotation(TemporalAnnotation.ANNOTATION_NAME)); } public void testMorphToEmbeddedMapping() throws Exception { @@ -188,10 +188,10 @@ public class JavaVersionMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = jpaProject().getJavaPersistentTypeResource(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.attributes().next(); - assertNull(attributeResource.getMappingAnnotation(Version.ANNOTATION_NAME)); - assertNotNull(attributeResource.getMappingAnnotation(Embedded.ANNOTATION_NAME)); + assertNull(attributeResource.getMappingAnnotation(VersionAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getMappingAnnotation(EmbeddedAnnotation.ANNOTATION_NAME)); assertNull(attributeResource.getAnnotation(ColumnAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(Temporal.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(TemporalAnnotation.ANNOTATION_NAME)); } public void testMorphToTransientMapping() throws Exception { @@ -210,10 +210,10 @@ public class JavaVersionMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = jpaProject().getJavaPersistentTypeResource(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.attributes().next(); - assertNull(attributeResource.getMappingAnnotation(Version.ANNOTATION_NAME)); - assertNotNull(attributeResource.getMappingAnnotation(Transient.ANNOTATION_NAME)); + assertNull(attributeResource.getMappingAnnotation(VersionAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getMappingAnnotation(TransientAnnotation.ANNOTATION_NAME)); assertNull(attributeResource.getAnnotation(ColumnAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(Temporal.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(TemporalAnnotation.ANNOTATION_NAME)); } public void testMorphToEmbeddedIdMapping() throws Exception { @@ -232,10 +232,10 @@ public class JavaVersionMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = jpaProject().getJavaPersistentTypeResource(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.attributes().next(); - assertNull(attributeResource.getMappingAnnotation(Version.ANNOTATION_NAME)); - assertNotNull(attributeResource.getMappingAnnotation(EmbeddedId.ANNOTATION_NAME)); + assertNull(attributeResource.getMappingAnnotation(VersionAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getMappingAnnotation(EmbeddedIdAnnotation.ANNOTATION_NAME)); assertNull(attributeResource.getAnnotation(ColumnAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(Temporal.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(TemporalAnnotation.ANNOTATION_NAME)); } public void testMorphToOneToOneMapping() throws Exception { @@ -254,10 +254,10 @@ public class JavaVersionMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = jpaProject().getJavaPersistentTypeResource(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.attributes().next(); - assertNull(attributeResource.getMappingAnnotation(Version.ANNOTATION_NAME)); - assertNotNull(attributeResource.getMappingAnnotation(OneToOne.ANNOTATION_NAME)); + assertNull(attributeResource.getMappingAnnotation(VersionAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getMappingAnnotation(OneToOneAnnotation.ANNOTATION_NAME)); assertNull(attributeResource.getAnnotation(ColumnAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(Temporal.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(TemporalAnnotation.ANNOTATION_NAME)); } public void testMorphToOneToManyMapping() throws Exception { @@ -276,10 +276,10 @@ public class JavaVersionMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = jpaProject().getJavaPersistentTypeResource(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.attributes().next(); - assertNull(attributeResource.getMappingAnnotation(Version.ANNOTATION_NAME)); - assertNotNull(attributeResource.getMappingAnnotation(OneToMany.ANNOTATION_NAME)); + assertNull(attributeResource.getMappingAnnotation(VersionAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getMappingAnnotation(OneToManyAnnotation.ANNOTATION_NAME)); assertNull(attributeResource.getAnnotation(ColumnAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(Temporal.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(TemporalAnnotation.ANNOTATION_NAME)); } public void testMorphToManyToOneMapping() throws Exception { @@ -298,10 +298,10 @@ public class JavaVersionMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = jpaProject().getJavaPersistentTypeResource(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.attributes().next(); - assertNull(attributeResource.getMappingAnnotation(Version.ANNOTATION_NAME)); - assertNotNull(attributeResource.getMappingAnnotation(ManyToOne.ANNOTATION_NAME)); + assertNull(attributeResource.getMappingAnnotation(VersionAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getMappingAnnotation(ManyToOneAnnotation.ANNOTATION_NAME)); assertNull(attributeResource.getAnnotation(ColumnAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(Temporal.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(TemporalAnnotation.ANNOTATION_NAME)); } public void testMorphToManyToManyMapping() throws Exception { @@ -320,10 +320,10 @@ public class JavaVersionMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = jpaProject().getJavaPersistentTypeResource(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.attributes().next(); - assertNull(attributeResource.getMappingAnnotation(Version.ANNOTATION_NAME)); - assertNotNull(attributeResource.getMappingAnnotation(ManyToMany.ANNOTATION_NAME)); + assertNull(attributeResource.getMappingAnnotation(VersionAnnotation.ANNOTATION_NAME)); + assertNotNull(attributeResource.getMappingAnnotation(ManyToManyAnnotation.ANNOTATION_NAME)); assertNull(attributeResource.getAnnotation(ColumnAnnotation.ANNOTATION_NAME)); - assertNull(attributeResource.getAnnotation(Temporal.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(TemporalAnnotation.ANNOTATION_NAME)); } public void testGetTemporal() throws Exception { @@ -358,12 +358,12 @@ public class JavaVersionMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = jpaProject().getJavaPersistentTypeResource(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.attributes().next(); - Temporal temporal = (Temporal) attributeResource.getAnnotation(Temporal.ANNOTATION_NAME); + TemporalAnnotation temporal = (TemporalAnnotation) attributeResource.getAnnotation(TemporalAnnotation.ANNOTATION_NAME); assertEquals(org.eclipse.jpt.core.resource.java.TemporalType.TIME, temporal.getValue()); versionMapping.setTemporal(null); - assertNull(attributeResource.getAnnotation(Temporal.ANNOTATION_NAME)); + assertNull(attributeResource.getAnnotation(TemporalAnnotation.ANNOTATION_NAME)); } public void testGetTemporalUpdatesFromResourceModelChange() throws Exception { @@ -378,12 +378,12 @@ public class JavaVersionMappingTests extends ContextModelTestCase JavaResourcePersistentType typeResource = jpaProject().getJavaPersistentTypeResource(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.attributes().next(); - Temporal temporal = (Temporal) attributeResource.addAnnotation(Temporal.ANNOTATION_NAME); + TemporalAnnotation temporal = (TemporalAnnotation) attributeResource.addAnnotation(TemporalAnnotation.ANNOTATION_NAME); temporal.setValue(org.eclipse.jpt.core.resource.java.TemporalType.DATE); assertEquals(TemporalType.DATE, versionMapping.getTemporal()); - attributeResource.removeAnnotation(Temporal.ANNOTATION_NAME); + attributeResource.removeAnnotation(TemporalAnnotation.ANNOTATION_NAME); assertNull(versionMapping.getTemporal()); assertFalse(versionMapping.isDefault()); 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 e91be038e8..2f10c668d0 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 @@ -12,7 +12,7 @@ package org.eclipse.jpt.core.tests.internal.resource.java; import java.util.Iterator; import org.eclipse.jdt.core.IType; import org.eclipse.jpt.core.resource.java.AssociationOverrideAnnotation; -import org.eclipse.jpt.core.resource.java.AssociationOverrides; +import org.eclipse.jpt.core.resource.java.AssociationOverridesAnnotation; import org.eclipse.jpt.core.resource.java.JPA; import org.eclipse.jpt.core.resource.java.JavaResourceNode; import org.eclipse.jpt.core.resource.java.JavaResourcePersistentAttribute; @@ -101,7 +101,7 @@ public class AssociationOverridesTests extends JavaResourceModelTestCase { IType testType = this.createTestAssociationOverrideOnField(); JavaResourcePersistentType typeResource = buildJavaTypeResource(testType); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - AssociationOverrides associationOverrides = (AssociationOverrides) attributeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDES); + AssociationOverridesAnnotation associationOverrides = (AssociationOverridesAnnotation) attributeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDES); AssociationOverrideAnnotation associationOverride = associationOverrides.nestedAnnotations().next(); assertNotNull(associationOverride); @@ -112,7 +112,7 @@ public class AssociationOverridesTests extends JavaResourceModelTestCase { IType testType = this.createTestAssociationOverrideOnField(); JavaResourcePersistentType typeResource = buildJavaTypeResource(testType); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - AssociationOverrides associationOverrides = (AssociationOverrides) attributeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDES); + AssociationOverridesAnnotation associationOverrides = (AssociationOverridesAnnotation) attributeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDES); AssociationOverrideAnnotation associationOverride = associationOverrides.nestedAnnotations().next(); assertNotNull(associationOverride); @@ -127,7 +127,7 @@ public class AssociationOverridesTests extends JavaResourceModelTestCase { IType testType = this.createTestAssociationOverrideOnField(); JavaResourcePersistentType typeResource = buildJavaTypeResource(testType); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - AssociationOverrides associationOverrides = (AssociationOverrides) attributeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDES); + AssociationOverridesAnnotation associationOverrides = (AssociationOverridesAnnotation) attributeResource.getAnnotation(JPA.ASSOCIATION_OVERRIDES); AssociationOverrideAnnotation associationOverride = associationOverrides.nestedAnnotations().next(); assertEquals(ASSOCIATION_OVERRIDE_NAME, associationOverride.getName()); 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 f67b3ae213..ff1da40ebc 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 @@ -12,7 +12,7 @@ package org.eclipse.jpt.core.tests.internal.resource.java; import java.util.Iterator; import org.eclipse.jdt.core.IType; import org.eclipse.jpt.core.resource.java.AttributeOverrideAnnotation; -import org.eclipse.jpt.core.resource.java.AttributeOverrides; +import org.eclipse.jpt.core.resource.java.AttributeOverridesAnnotation; import org.eclipse.jpt.core.resource.java.ColumnAnnotation; import org.eclipse.jpt.core.resource.java.JPA; import org.eclipse.jpt.core.resource.java.JavaResourceNode; @@ -105,7 +105,7 @@ public class AttributeOverridesTests extends JavaResourceModelTestCase { IType testType = this.createTestAttributeOverrideOnField(); JavaResourcePersistentType typeResource = buildJavaTypeResource(testType); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - AttributeOverrides attributeOverrides = (AttributeOverrides) attributeResource.getAnnotation(JPA.ATTRIBUTE_OVERRIDES); + AttributeOverridesAnnotation attributeOverrides = (AttributeOverridesAnnotation) attributeResource.getAnnotation(JPA.ATTRIBUTE_OVERRIDES); AttributeOverrideAnnotation attributeOverride = attributeOverrides.nestedAnnotations().next(); assertNotNull(attributeOverride); @@ -116,7 +116,7 @@ public class AttributeOverridesTests extends JavaResourceModelTestCase { IType testType = this.createTestAttributeOverrideOnField(); JavaResourcePersistentType typeResource = buildJavaTypeResource(testType); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - AttributeOverrides attributeOverrides = (AttributeOverrides) attributeResource.getAnnotation(JPA.ATTRIBUTE_OVERRIDES); + AttributeOverridesAnnotation attributeOverrides = (AttributeOverridesAnnotation) attributeResource.getAnnotation(JPA.ATTRIBUTE_OVERRIDES); AttributeOverrideAnnotation attributeOverride = attributeOverrides.nestedAnnotations().next(); ColumnAnnotation column = attributeOverride.getColumn(); assertNotNull(attributeOverride); @@ -127,7 +127,7 @@ public class AttributeOverridesTests extends JavaResourceModelTestCase { IType testType = this.createTestAttributeOverrideOnField(); JavaResourcePersistentType typeResource = buildJavaTypeResource(testType); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - AttributeOverrides attributeOverrides = (AttributeOverrides) attributeResource.getAnnotation(JPA.ATTRIBUTE_OVERRIDES); + AttributeOverridesAnnotation attributeOverrides = (AttributeOverridesAnnotation) attributeResource.getAnnotation(JPA.ATTRIBUTE_OVERRIDES); AttributeOverrideAnnotation attributeOverride = attributeOverrides.nestedAnnotations().next(); assertNotNull(attributeOverride); @@ -142,7 +142,7 @@ public class AttributeOverridesTests extends JavaResourceModelTestCase { IType testType = this.createTestAttributeOverrideOnField(); JavaResourcePersistentType typeResource = buildJavaTypeResource(testType); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - AttributeOverrides attributeOverrides = (AttributeOverrides) attributeResource.getAnnotation(JPA.ATTRIBUTE_OVERRIDES); + AttributeOverridesAnnotation attributeOverrides = (AttributeOverridesAnnotation) attributeResource.getAnnotation(JPA.ATTRIBUTE_OVERRIDES); AttributeOverrideAnnotation attributeOverride = attributeOverrides.nestedAnnotations().next(); assertEquals(ATTRIBUTE_OVERRIDE_NAME, attributeOverride.getName()); @@ -158,7 +158,7 @@ public class AttributeOverridesTests extends JavaResourceModelTestCase { IType testType = this.createTestAttributeOverrideWithColumnOnField(); JavaResourcePersistentType typeResource = buildJavaTypeResource(testType); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - AttributeOverrides attributeOverrides = (AttributeOverrides) attributeResource.getAnnotation(JPA.ATTRIBUTE_OVERRIDES); + AttributeOverridesAnnotation attributeOverrides = (AttributeOverridesAnnotation) attributeResource.getAnnotation(JPA.ATTRIBUTE_OVERRIDES); AttributeOverrideAnnotation attributeOverride = attributeOverrides.nestedAnnotations().next(); ColumnAnnotation column = attributeOverride.getColumn(); 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 85069c9742..5fe9534b62 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 @@ -11,7 +11,7 @@ package org.eclipse.jpt.core.tests.internal.resource.java; import java.util.Iterator; import org.eclipse.jdt.core.IType; -import org.eclipse.jpt.core.resource.java.Basic; +import org.eclipse.jpt.core.resource.java.BasicAnnotation; import org.eclipse.jpt.core.resource.java.FetchType; import org.eclipse.jpt.core.resource.java.JPA; import org.eclipse.jpt.core.resource.java.JavaResourcePersistentAttribute; @@ -72,7 +72,7 @@ public class BasicTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(testType); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - Basic basic = (Basic) attributeResource.getMappingAnnotation(JPA.BASIC); + BasicAnnotation basic = (BasicAnnotation) attributeResource.getMappingAnnotation(JPA.BASIC); assertNotNull(basic); } @@ -81,7 +81,7 @@ public class BasicTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(testType); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - Basic basic = (Basic) attributeResource.getMappingAnnotation(JPA.BASIC); + BasicAnnotation basic = (BasicAnnotation) attributeResource.getMappingAnnotation(JPA.BASIC); assertTrue(basic.getOptional()); } @@ -90,7 +90,7 @@ public class BasicTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(testType); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - Basic basic = (Basic) attributeResource.getMappingAnnotation(JPA.BASIC); + BasicAnnotation basic = (BasicAnnotation) attributeResource.getMappingAnnotation(JPA.BASIC); assertTrue(basic.getOptional()); basic.setOptional(false); @@ -104,7 +104,7 @@ public class BasicTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(testType); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - Basic basic = (Basic) attributeResource.getMappingAnnotation(JPA.BASIC); + BasicAnnotation basic = (BasicAnnotation) attributeResource.getMappingAnnotation(JPA.BASIC); assertTrue(basic.getOptional()); basic.setOptional(null); @@ -119,7 +119,7 @@ public class BasicTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(testType); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - Basic basic = (Basic) attributeResource.getMappingAnnotation(JPA.BASIC); + BasicAnnotation basic = (BasicAnnotation) attributeResource.getMappingAnnotation(JPA.BASIC); assertEquals(FetchType.EAGER, basic.getFetch()); } @@ -128,7 +128,7 @@ public class BasicTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(testType); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - Basic basic = (Basic) attributeResource.getMappingAnnotation(JPA.BASIC); + BasicAnnotation basic = (BasicAnnotation) attributeResource.getMappingAnnotation(JPA.BASIC); assertEquals(FetchType.EAGER, basic.getFetch()); basic.setFetch(FetchType.LAZY); @@ -142,7 +142,7 @@ public class BasicTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(testType); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - Basic basic = (Basic) attributeResource.getMappingAnnotation(JPA.BASIC); + BasicAnnotation basic = (BasicAnnotation) attributeResource.getMappingAnnotation(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/DiscriminatorValueTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/DiscriminatorValueTests.java index 6ad5e3b07c..a2e1f17f36 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 @@ -11,7 +11,7 @@ package org.eclipse.jpt.core.tests.internal.resource.java; import java.util.Iterator; import org.eclipse.jdt.core.IType; -import org.eclipse.jpt.core.resource.java.DiscriminatorValue; +import org.eclipse.jpt.core.resource.java.DiscriminatorValueAnnotation; import org.eclipse.jpt.core.resource.java.JPA; import org.eclipse.jpt.core.resource.java.JavaResourcePersistentType; import org.eclipse.jpt.utility.internal.iterators.ArrayIterator; @@ -54,7 +54,7 @@ public class DiscriminatorValueTests extends JavaResourceModelTestCase { IType testType = this.createTestDiscriminatorValue(); JavaResourcePersistentType typeResource = buildJavaTypeResource(testType); - DiscriminatorValue discriminatorValue = (DiscriminatorValue) typeResource.getAnnotation(JPA.DISCRIMINATOR_VALUE); + DiscriminatorValueAnnotation discriminatorValue = (DiscriminatorValueAnnotation) typeResource.getAnnotation(JPA.DISCRIMINATOR_VALUE); assertNotNull(discriminatorValue); } @@ -62,7 +62,7 @@ public class DiscriminatorValueTests extends JavaResourceModelTestCase { IType testType = this.createTestDiscriminatorValueWithValue(); JavaResourcePersistentType typeResource = buildJavaTypeResource(testType); - DiscriminatorValue discriminatorValue = (DiscriminatorValue) typeResource.getAnnotation(JPA.DISCRIMINATOR_VALUE); + DiscriminatorValueAnnotation discriminatorValue = (DiscriminatorValueAnnotation) typeResource.getAnnotation(JPA.DISCRIMINATOR_VALUE); assertEquals("discriminator", discriminatorValue.getValue()); } @@ -70,7 +70,7 @@ public class DiscriminatorValueTests extends JavaResourceModelTestCase { IType testType = this.createTestDiscriminatorValue(); JavaResourcePersistentType typeResource = buildJavaTypeResource(testType); - DiscriminatorValue discriminatorValue = (DiscriminatorValue) typeResource.getAnnotation(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/EmbeddedIdTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/EmbeddedIdTests.java index 1f7f2e002d..b3991c59cf 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 @@ -11,7 +11,7 @@ package org.eclipse.jpt.core.tests.internal.resource.java; import java.util.Iterator; import org.eclipse.jdt.core.IType; -import org.eclipse.jpt.core.resource.java.EmbeddedId; +import org.eclipse.jpt.core.resource.java.EmbeddedIdAnnotation; import org.eclipse.jpt.core.resource.java.JPA; import org.eclipse.jpt.core.resource.java.JavaResourceNode; import org.eclipse.jpt.core.resource.java.JavaResourcePersistentAttribute; @@ -44,7 +44,7 @@ public class EmbeddedIdTests extends JavaResourceModelTestCase { JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); JavaResourceNode mappingAnnotation = attributeResource.getMappingAnnotation(); - assertTrue(mappingAnnotation instanceof EmbeddedId); + 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 fa610e6920..e604022105 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 @@ -11,7 +11,7 @@ package org.eclipse.jpt.core.tests.internal.resource.java; import java.util.Iterator; import org.eclipse.jdt.core.IType; -import org.eclipse.jpt.core.resource.java.Embedded; +import org.eclipse.jpt.core.resource.java.EmbeddedAnnotation; import org.eclipse.jpt.core.resource.java.JPA; import org.eclipse.jpt.core.resource.java.JavaResourceNode; import org.eclipse.jpt.core.resource.java.JavaResourcePersistentAttribute; @@ -44,7 +44,7 @@ public class EmbeddedTests extends JavaResourceModelTestCase { JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); JavaResourceNode mappingAnnotation = attributeResource.getMappingAnnotation(); - assertTrue(mappingAnnotation instanceof Embedded); + assertTrue(mappingAnnotation instanceof EmbeddedAnnotation); } } 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 592bd41d7b..e4cfc2c24b 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 @@ -12,7 +12,7 @@ package org.eclipse.jpt.core.tests.internal.resource.java; import java.util.Iterator; import org.eclipse.jdt.core.IType; import org.eclipse.jpt.core.resource.java.EnumType; -import org.eclipse.jpt.core.resource.java.Enumerated; +import org.eclipse.jpt.core.resource.java.EnumeratedAnnotation; import org.eclipse.jpt.core.resource.java.JPA; import org.eclipse.jpt.core.resource.java.JavaResourcePersistentAttribute; import org.eclipse.jpt.core.resource.java.JavaResourcePersistentType; @@ -59,7 +59,7 @@ public class EnumeratedTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(testType); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - Enumerated enumerated = (Enumerated) attributeResource.getAnnotation(JPA.ENUMERATED); + EnumeratedAnnotation enumerated = (EnumeratedAnnotation) attributeResource.getAnnotation(JPA.ENUMERATED); assertNotNull(enumerated); } @@ -68,7 +68,7 @@ public class EnumeratedTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(testType); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - Enumerated enumerated = (Enumerated) attributeResource.getAnnotation(JPA.ENUMERATED); + EnumeratedAnnotation enumerated = (EnumeratedAnnotation) attributeResource.getAnnotation(JPA.ENUMERATED); assertEquals(EnumType.ORDINAL, enumerated.getValue()); } @@ -77,7 +77,7 @@ public class EnumeratedTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(testType); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - Enumerated enumerated = (Enumerated) attributeResource.getAnnotation(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/IdTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/IdTests.java index 4bfbe514a9..2125b5bb75 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 @@ -11,7 +11,7 @@ package org.eclipse.jpt.core.tests.internal.resource.java; import java.util.Iterator; import org.eclipse.jdt.core.IType; -import org.eclipse.jpt.core.resource.java.Id; +import org.eclipse.jpt.core.resource.java.IdAnnotation; import org.eclipse.jpt.core.resource.java.JPA; import org.eclipse.jpt.core.resource.java.JavaResourceNode; import org.eclipse.jpt.core.resource.java.JavaResourcePersistentAttribute; @@ -44,7 +44,7 @@ public class IdTests extends JavaResourceModelTestCase { JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); JavaResourceNode mappingAnnotation = attributeResource.getMappingAnnotation(); - assertTrue(mappingAnnotation instanceof Id); + 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 804f41bba3..419d765749 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 @@ -11,7 +11,7 @@ package org.eclipse.jpt.core.tests.internal.resource.java; import java.util.Iterator; import org.eclipse.jdt.core.IType; -import org.eclipse.jpt.core.resource.java.Inheritance; +import org.eclipse.jpt.core.resource.java.InheritanceAnnotation; import org.eclipse.jpt.core.resource.java.InheritanceType; import org.eclipse.jpt.core.resource.java.JPA; import org.eclipse.jpt.core.resource.java.JavaResourcePersistentType; @@ -57,7 +57,7 @@ public class InheritanceTests extends JavaResourceModelTestCase { IType testType = this.createTestInheritance(); JavaResourcePersistentType typeResource = buildJavaTypeResource(testType); - Inheritance inheritance = (Inheritance) typeResource.getAnnotation(JPA.INHERITANCE); + InheritanceAnnotation inheritance = (InheritanceAnnotation) typeResource.getAnnotation(JPA.INHERITANCE); assertNotNull(inheritance); } @@ -65,7 +65,7 @@ public class InheritanceTests extends JavaResourceModelTestCase { IType testType = this.createTestInheritanceWithStrategy(); JavaResourcePersistentType typeResource = buildJavaTypeResource(testType); - Inheritance inheritance = (Inheritance) typeResource.getAnnotation(JPA.INHERITANCE); + InheritanceAnnotation inheritance = (InheritanceAnnotation) typeResource.getAnnotation(JPA.INHERITANCE); assertEquals(InheritanceType.JOINED, inheritance.getStrategy()); } @@ -73,7 +73,7 @@ public class InheritanceTests extends JavaResourceModelTestCase { IType testType = this.createTestInheritance(); JavaResourcePersistentType typeResource = buildJavaTypeResource(testType); - Inheritance inheritance = (Inheritance) typeResource.getAnnotation(JPA.INHERITANCE); + InheritanceAnnotation inheritance = (InheritanceAnnotation) typeResource.getAnnotation(JPA.INHERITANCE); inheritance.setStrategy(InheritanceType.TABLE_PER_CLASS); assertSourceContains("@Inheritance(strategy=TABLE_PER_CLASS)"); 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 c3b33cc30c..0e22fb4b38 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 @@ -16,14 +16,14 @@ import org.eclipse.jdt.core.IType; import org.eclipse.jpt.core.internal.resource.java.IdImpl; import org.eclipse.jpt.core.internal.resource.java.OneToOneImpl; import org.eclipse.jpt.core.resource.java.AttributeOverrideAnnotation; -import org.eclipse.jpt.core.resource.java.Basic; +import org.eclipse.jpt.core.resource.java.BasicAnnotation; import org.eclipse.jpt.core.resource.java.ColumnAnnotation; -import org.eclipse.jpt.core.resource.java.Id; +import org.eclipse.jpt.core.resource.java.IdAnnotation; import org.eclipse.jpt.core.resource.java.JPA; import org.eclipse.jpt.core.resource.java.JavaResourceNode; import org.eclipse.jpt.core.resource.java.JavaResourcePersistentAttribute; import org.eclipse.jpt.core.resource.java.JavaResourcePersistentType; -import org.eclipse.jpt.core.resource.java.OneToMany; +import org.eclipse.jpt.core.resource.java.OneToManyAnnotation; import org.eclipse.jpt.utility.internal.ClassTools; import org.eclipse.jpt.utility.internal.CollectionTools; import org.eclipse.jpt.utility.internal.iterators.ArrayIterator; @@ -401,7 +401,7 @@ public class JavaResourcePersistentAttributeTests extends JavaResourceModelTestC assertNotNull(attributeResource.getMappingAnnotation(JPA.ID)); JavaResourceNode javaAttributeMappingAnnotation = attributeResource.getMappingAnnotation(); - assertTrue(javaAttributeMappingAnnotation instanceof Basic); + assertTrue(javaAttributeMappingAnnotation instanceof BasicAnnotation); assertSourceContains("@Basic"); assertSourceContains("@Id"); @@ -409,7 +409,7 @@ public class JavaResourcePersistentAttributeTests extends JavaResourceModelTestC attributeResource.setMappingAnnotation(JPA.ONE_TO_MANY); assertEquals(1, attributeResource.mappingAnnotationsSize()); javaAttributeMappingAnnotation = attributeResource.getMappingAnnotation(); - assertTrue(javaAttributeMappingAnnotation instanceof OneToMany); + assertTrue(javaAttributeMappingAnnotation instanceof OneToManyAnnotation); assertSourceDoesNotContain("@Id"); assertSourceContains("@OneToMany"); assertSourceDoesNotContain("@Basic"); @@ -423,7 +423,7 @@ public class JavaResourcePersistentAttributeTests extends JavaResourceModelTestC this.createAnnotationAndMembers("Id", ""); attributeResource.setMappingAnnotation(JPA.ID); - assertTrue(attributeResource.getMappingAnnotation() instanceof Id); + assertTrue(attributeResource.getMappingAnnotation() instanceof IdAnnotation); assertSourceContains("@Id"); } @@ -435,7 +435,7 @@ public class JavaResourcePersistentAttributeTests extends JavaResourceModelTestC this.createAnnotationAndMembers("Id", ""); attributeResource.setMappingAnnotation(JPA.ID); - assertTrue(attributeResource.getMappingAnnotation() instanceof Id); + assertTrue(attributeResource.getMappingAnnotation() instanceof IdAnnotation); assertSourceContains("@Id"); assertSourceContains("@Column"); @@ -445,11 +445,11 @@ public class JavaResourcePersistentAttributeTests extends JavaResourceModelTestC IType testType = createTestEntityWithIdColumnGeneratedValue(); JavaResourcePersistentType typeResource = buildJavaTypeResource(testType); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - assertTrue(attributeResource.getMappingAnnotation() instanceof Id); + assertTrue(attributeResource.getMappingAnnotation() instanceof IdAnnotation); this.createAnnotationAndMembers("Basic", ""); attributeResource.setMappingAnnotation(JPA.BASIC); - assertTrue(attributeResource.getMappingAnnotation() instanceof Basic); + assertTrue(attributeResource.getMappingAnnotation() instanceof BasicAnnotation); assertSourceDoesNotContain("@Id"); assertSourceContains("@GeneratedValue"); //not supported by Basic @@ -460,7 +460,7 @@ public class JavaResourcePersistentAttributeTests extends JavaResourceModelTestC IType testType = createTestEntityWithIdColumnGeneratedValue(); JavaResourcePersistentType typeResource = buildJavaTypeResource(testType); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - assertTrue(attributeResource.getMappingAnnotation() instanceof Id); + assertTrue(attributeResource.getMappingAnnotation() instanceof IdAnnotation); attributeResource.setMappingAnnotation(null); assertNull(attributeResource.getMappingAnnotation()); 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 f0aeaf0f06..571be2d017 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 @@ -14,7 +14,7 @@ import org.eclipse.jdt.core.IType; import org.eclipse.jpt.core.resource.java.JPA; import org.eclipse.jpt.core.resource.java.JavaResourcePersistentAttribute; import org.eclipse.jpt.core.resource.java.JavaResourcePersistentType; -import org.eclipse.jpt.core.resource.java.Lob; +import org.eclipse.jpt.core.resource.java.LobAnnotation; import org.eclipse.jpt.utility.internal.iterators.ArrayIterator; public class LobTests extends JavaResourceModelTestCase { @@ -42,7 +42,7 @@ public class LobTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(testType); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - Lob lob = (Lob) attributeResource.getAnnotation(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 787da4adf1..d332d90d8c 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 @@ -15,7 +15,7 @@ import org.eclipse.jpt.core.resource.java.FetchType; import org.eclipse.jpt.core.resource.java.JPA; import org.eclipse.jpt.core.resource.java.JavaResourcePersistentAttribute; import org.eclipse.jpt.core.resource.java.JavaResourcePersistentType; -import org.eclipse.jpt.core.resource.java.ManyToMany; +import org.eclipse.jpt.core.resource.java.ManyToManyAnnotation; import org.eclipse.jpt.utility.internal.iterators.ArrayIterator; public class ManyToManyTests extends JavaResourceModelTestCase { @@ -133,7 +133,7 @@ public class ManyToManyTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(testType); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - ManyToMany manyToMany = (ManyToMany) attributeResource.getMappingAnnotation(JPA.MANY_TO_MANY); + ManyToManyAnnotation manyToMany = (ManyToManyAnnotation) attributeResource.getMappingAnnotation(JPA.MANY_TO_MANY); assertNotNull(manyToMany); } @@ -142,7 +142,7 @@ public class ManyToManyTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(testType); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - ManyToMany manyToMany = (ManyToMany) attributeResource.getMappingAnnotation(JPA.MANY_TO_MANY); + ManyToManyAnnotation manyToMany = (ManyToManyAnnotation) attributeResource.getMappingAnnotation(JPA.MANY_TO_MANY); assertEquals(FetchType.EAGER, manyToMany.getFetch()); } @@ -151,7 +151,7 @@ public class ManyToManyTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(testType); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - ManyToMany manyToMany = (ManyToMany) attributeResource.getMappingAnnotation(JPA.MANY_TO_MANY); + ManyToManyAnnotation manyToMany = (ManyToManyAnnotation) attributeResource.getMappingAnnotation(JPA.MANY_TO_MANY); assertEquals(FetchType.EAGER, manyToMany.getFetch()); manyToMany.setFetch(FetchType.LAZY); @@ -165,7 +165,7 @@ public class ManyToManyTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(testType); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - ManyToMany manyToMany = (ManyToMany) attributeResource.getMappingAnnotation(JPA.MANY_TO_MANY); + ManyToManyAnnotation manyToMany = (ManyToManyAnnotation) attributeResource.getMappingAnnotation(JPA.MANY_TO_MANY); assertEquals(FetchType.EAGER, manyToMany.getFetch()); manyToMany.setFetch(null); @@ -180,7 +180,7 @@ public class ManyToManyTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(testType); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - ManyToMany manyToMany = (ManyToMany) attributeResource.getMappingAnnotation(JPA.MANY_TO_MANY); + ManyToManyAnnotation manyToMany = (ManyToManyAnnotation) attributeResource.getMappingAnnotation(JPA.MANY_TO_MANY); assertEquals(TYPE_NAME, manyToMany.getTargetEntity()); } @@ -189,7 +189,7 @@ public class ManyToManyTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(testType); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - ManyToMany manyToMany = (ManyToMany) attributeResource.getMappingAnnotation(JPA.MANY_TO_MANY); + ManyToManyAnnotation manyToMany = (ManyToManyAnnotation) attributeResource.getMappingAnnotation(JPA.MANY_TO_MANY); assertEquals(TYPE_NAME, manyToMany.getTargetEntity()); manyToMany.setTargetEntity("Foo"); @@ -202,7 +202,7 @@ public class ManyToManyTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(testType); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - ManyToMany manyToMany = (ManyToMany) attributeResource.getMappingAnnotation(JPA.MANY_TO_MANY); + ManyToManyAnnotation manyToMany = (ManyToManyAnnotation) attributeResource.getMappingAnnotation(JPA.MANY_TO_MANY); assertEquals(TYPE_NAME, manyToMany.getTargetEntity()); manyToMany.setTargetEntity(null); @@ -217,7 +217,7 @@ public class ManyToManyTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(testType); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - ManyToMany manyToMany = (ManyToMany) attributeResource.getMappingAnnotation(JPA.MANY_TO_MANY); + ManyToManyAnnotation manyToMany = (ManyToManyAnnotation) attributeResource.getMappingAnnotation(JPA.MANY_TO_MANY); assertEquals(FULLY_QUALIFIED_TYPE_NAME, manyToMany.getFullyQualifiedTargetEntity()); manyToMany.setTargetEntity("Foo"); @@ -234,7 +234,7 @@ public class ManyToManyTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(testType); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - ManyToMany manyToMany = (ManyToMany) attributeResource.getMappingAnnotation(JPA.MANY_TO_MANY); + ManyToManyAnnotation manyToMany = (ManyToManyAnnotation) attributeResource.getMappingAnnotation(JPA.MANY_TO_MANY); assertEquals("foo", manyToMany.getMappedBy()); } @@ -243,7 +243,7 @@ public class ManyToManyTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(testType); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - ManyToMany manyToMany = (ManyToMany) attributeResource.getMappingAnnotation(JPA.MANY_TO_MANY); + ManyToManyAnnotation manyToMany = (ManyToManyAnnotation) attributeResource.getMappingAnnotation(JPA.MANY_TO_MANY); assertEquals(null, manyToMany.getMappedBy()); } @@ -252,7 +252,7 @@ public class ManyToManyTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(testType); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - ManyToMany manyToMany = (ManyToMany) attributeResource.getMappingAnnotation(JPA.MANY_TO_MANY); + ManyToManyAnnotation manyToMany = (ManyToManyAnnotation) attributeResource.getMappingAnnotation(JPA.MANY_TO_MANY); assertNull(manyToMany.getMappedBy()); manyToMany.setMappedBy("bar"); assertEquals("bar", manyToMany.getMappedBy()); @@ -265,7 +265,7 @@ public class ManyToManyTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(testType); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - ManyToMany manyToMany = (ManyToMany) attributeResource.getMappingAnnotation(JPA.MANY_TO_MANY); + ManyToManyAnnotation manyToMany = (ManyToManyAnnotation) attributeResource.getMappingAnnotation(JPA.MANY_TO_MANY); assertEquals("foo", manyToMany.getMappedBy()); manyToMany.setMappedBy(null); @@ -280,7 +280,7 @@ public class ManyToManyTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(testType); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - ManyToMany manyToMany = (ManyToMany) attributeResource.getMappingAnnotation(JPA.MANY_TO_MANY); + ManyToManyAnnotation manyToMany = (ManyToManyAnnotation) attributeResource.getMappingAnnotation(JPA.MANY_TO_MANY); assertFalse(manyToMany.isCascadeAll()); manyToMany.setCascadeAll(true); @@ -294,7 +294,7 @@ public class ManyToManyTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(testType); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - ManyToMany manyToMany = (ManyToMany) attributeResource.getMappingAnnotation(JPA.MANY_TO_MANY); + ManyToManyAnnotation manyToMany = (ManyToManyAnnotation) attributeResource.getMappingAnnotation(JPA.MANY_TO_MANY); assertFalse(manyToMany.isCascadeMerge()); manyToMany.setCascadeMerge(true); @@ -308,7 +308,7 @@ public class ManyToManyTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(testType); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - ManyToMany manyToMany = (ManyToMany) attributeResource.getMappingAnnotation(JPA.MANY_TO_MANY); + ManyToManyAnnotation manyToMany = (ManyToManyAnnotation) attributeResource.getMappingAnnotation(JPA.MANY_TO_MANY); assertFalse(manyToMany.isCascadePersist()); manyToMany.setCascadePersist(true); @@ -322,7 +322,7 @@ public class ManyToManyTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(testType); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - ManyToMany manyToMany = (ManyToMany) attributeResource.getMappingAnnotation(JPA.MANY_TO_MANY); + ManyToManyAnnotation manyToMany = (ManyToManyAnnotation) attributeResource.getMappingAnnotation(JPA.MANY_TO_MANY); assertFalse(manyToMany.isCascadeRemove()); manyToMany.setCascadeRemove(true); @@ -336,7 +336,7 @@ public class ManyToManyTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(testType); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - ManyToMany manyToMany = (ManyToMany) attributeResource.getMappingAnnotation(JPA.MANY_TO_MANY); + ManyToManyAnnotation manyToMany = (ManyToManyAnnotation) attributeResource.getMappingAnnotation(JPA.MANY_TO_MANY); assertFalse(manyToMany.isCascadeRefresh()); manyToMany.setCascadeRefresh(true); @@ -350,7 +350,7 @@ public class ManyToManyTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(testType); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - ManyToMany manyToMany = (ManyToMany) attributeResource.getMappingAnnotation(JPA.MANY_TO_MANY); + ManyToManyAnnotation manyToMany = (ManyToManyAnnotation) attributeResource.getMappingAnnotation(JPA.MANY_TO_MANY); assertTrue(manyToMany.isCascadeAll()); manyToMany.setCascadeAll(true); @@ -375,7 +375,7 @@ public class ManyToManyTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(testType); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - ManyToMany manyToMany = (ManyToMany) attributeResource.getMappingAnnotation(JPA.MANY_TO_MANY); + ManyToManyAnnotation manyToMany = (ManyToManyAnnotation) attributeResource.getMappingAnnotation(JPA.MANY_TO_MANY); assertTrue(manyToMany.isCascadeMerge()); manyToMany.setCascadeMerge(false); //TODO should the resource model handle this and remove both MERGE @@ -393,7 +393,7 @@ public class ManyToManyTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(testType); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - ManyToMany manyToMany = (ManyToMany) attributeResource.getMappingAnnotation(JPA.MANY_TO_MANY); + ManyToManyAnnotation manyToMany = (ManyToManyAnnotation) attributeResource.getMappingAnnotation(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 e27326dbd2..75cbc6af6d 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 @@ -15,7 +15,7 @@ import org.eclipse.jpt.core.resource.java.FetchType; import org.eclipse.jpt.core.resource.java.JPA; import org.eclipse.jpt.core.resource.java.JavaResourcePersistentAttribute; import org.eclipse.jpt.core.resource.java.JavaResourcePersistentType; -import org.eclipse.jpt.core.resource.java.ManyToOne; +import org.eclipse.jpt.core.resource.java.ManyToOneAnnotation; import org.eclipse.jpt.utility.internal.iterators.ArrayIterator; public class ManyToOneTests extends JavaResourceModelTestCase { @@ -132,7 +132,7 @@ public class ManyToOneTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(testType); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - ManyToOne manyToOne = (ManyToOne) attributeResource.getMappingAnnotation(JPA.MANY_TO_ONE); + ManyToOneAnnotation manyToOne = (ManyToOneAnnotation) attributeResource.getMappingAnnotation(JPA.MANY_TO_ONE); assertNotNull(manyToOne); } @@ -141,7 +141,7 @@ public class ManyToOneTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(testType); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - ManyToOne manyToOne = (ManyToOne) attributeResource.getMappingAnnotation(JPA.MANY_TO_ONE); + ManyToOneAnnotation manyToOne = (ManyToOneAnnotation) attributeResource.getMappingAnnotation(JPA.MANY_TO_ONE); assertEquals(FetchType.EAGER, manyToOne.getFetch()); } @@ -150,7 +150,7 @@ public class ManyToOneTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(testType); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - ManyToOne manyToOne = (ManyToOne) attributeResource.getMappingAnnotation(JPA.MANY_TO_ONE); + ManyToOneAnnotation manyToOne = (ManyToOneAnnotation) attributeResource.getMappingAnnotation(JPA.MANY_TO_ONE); assertEquals(FetchType.EAGER, manyToOne.getFetch()); manyToOne.setFetch(FetchType.LAZY); @@ -164,7 +164,7 @@ public class ManyToOneTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(testType); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - ManyToOne manyToOne = (ManyToOne) attributeResource.getMappingAnnotation(JPA.MANY_TO_ONE); + ManyToOneAnnotation manyToOne = (ManyToOneAnnotation) attributeResource.getMappingAnnotation(JPA.MANY_TO_ONE); assertEquals(FetchType.EAGER, manyToOne.getFetch()); manyToOne.setFetch(null); @@ -180,7 +180,7 @@ public class ManyToOneTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(testType); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - ManyToOne manyToOne = (ManyToOne) attributeResource.getMappingAnnotation(JPA.MANY_TO_ONE); + ManyToOneAnnotation manyToOne = (ManyToOneAnnotation) attributeResource.getMappingAnnotation(JPA.MANY_TO_ONE); assertEquals(TYPE_NAME, manyToOne.getTargetEntity()); } @@ -189,7 +189,7 @@ public class ManyToOneTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(testType); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - ManyToOne manyToOne = (ManyToOne) attributeResource.getMappingAnnotation(JPA.MANY_TO_ONE); + ManyToOneAnnotation manyToOne = (ManyToOneAnnotation) attributeResource.getMappingAnnotation(JPA.MANY_TO_ONE); assertEquals(TYPE_NAME, manyToOne.getTargetEntity()); manyToOne.setTargetEntity("Foo"); @@ -202,7 +202,7 @@ public class ManyToOneTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(testType); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - ManyToOne manyToOne = (ManyToOne) attributeResource.getMappingAnnotation(JPA.MANY_TO_ONE); + ManyToOneAnnotation manyToOne = (ManyToOneAnnotation) attributeResource.getMappingAnnotation(JPA.MANY_TO_ONE); assertEquals(TYPE_NAME, manyToOne.getTargetEntity()); manyToOne.setTargetEntity(null); @@ -217,7 +217,7 @@ public class ManyToOneTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(testType); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - ManyToOne manyToOne = (ManyToOne) attributeResource.getMappingAnnotation(JPA.MANY_TO_ONE); + ManyToOneAnnotation manyToOne = (ManyToOneAnnotation) attributeResource.getMappingAnnotation(JPA.MANY_TO_ONE); assertEquals(FULLY_QUALIFIED_TYPE_NAME, manyToOne.getFullyQualifiedTargetEntity()); manyToOne.setTargetEntity("Foo"); @@ -234,7 +234,7 @@ public class ManyToOneTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(testType); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - ManyToOne manyToOne = (ManyToOne) attributeResource.getMappingAnnotation(JPA.MANY_TO_ONE); + ManyToOneAnnotation manyToOne = (ManyToOneAnnotation) attributeResource.getMappingAnnotation(JPA.MANY_TO_ONE); assertEquals(Boolean.TRUE, manyToOne.getOptional()); } @@ -243,7 +243,7 @@ public class ManyToOneTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(testType); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - ManyToOne manyToOne = (ManyToOne) attributeResource.getMappingAnnotation(JPA.MANY_TO_ONE); + ManyToOneAnnotation manyToOne = (ManyToOneAnnotation) attributeResource.getMappingAnnotation(JPA.MANY_TO_ONE); assertEquals(Boolean.TRUE, manyToOne.getOptional()); manyToOne.setOptional(Boolean.FALSE); @@ -257,7 +257,7 @@ public class ManyToOneTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(testType); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - ManyToOne manyToOne = (ManyToOne) attributeResource.getMappingAnnotation(JPA.MANY_TO_ONE); + ManyToOneAnnotation manyToOne = (ManyToOneAnnotation) attributeResource.getMappingAnnotation(JPA.MANY_TO_ONE); assertEquals(Boolean.TRUE, manyToOne.getOptional()); manyToOne.setOptional(null); @@ -272,7 +272,7 @@ public class ManyToOneTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(testType); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - ManyToOne manyToOne = (ManyToOne) attributeResource.getMappingAnnotation(JPA.MANY_TO_ONE); + ManyToOneAnnotation manyToOne = (ManyToOneAnnotation) attributeResource.getMappingAnnotation(JPA.MANY_TO_ONE); assertFalse(manyToOne.isCascadeAll()); manyToOne.setCascadeAll(true); @@ -286,7 +286,7 @@ public class ManyToOneTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(testType); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - ManyToOne manyToOne = (ManyToOne) attributeResource.getMappingAnnotation(JPA.MANY_TO_ONE); + ManyToOneAnnotation manyToOne = (ManyToOneAnnotation) attributeResource.getMappingAnnotation(JPA.MANY_TO_ONE); assertFalse(manyToOne.isCascadeMerge()); manyToOne.setCascadeMerge(true); @@ -300,7 +300,7 @@ public class ManyToOneTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(testType); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - ManyToOne manyToOne = (ManyToOne) attributeResource.getMappingAnnotation(JPA.MANY_TO_ONE); + ManyToOneAnnotation manyToOne = (ManyToOneAnnotation) attributeResource.getMappingAnnotation(JPA.MANY_TO_ONE); assertFalse(manyToOne.isCascadePersist()); manyToOne.setCascadePersist(true); @@ -314,7 +314,7 @@ public class ManyToOneTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(testType); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - ManyToOne manyToOne = (ManyToOne) attributeResource.getMappingAnnotation(JPA.MANY_TO_ONE); + ManyToOneAnnotation manyToOne = (ManyToOneAnnotation) attributeResource.getMappingAnnotation(JPA.MANY_TO_ONE); assertFalse(manyToOne.isCascadeRemove()); manyToOne.setCascadeRemove(true); @@ -328,7 +328,7 @@ public class ManyToOneTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(testType); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - ManyToOne manyToOne = (ManyToOne) attributeResource.getMappingAnnotation(JPA.MANY_TO_ONE); + ManyToOneAnnotation manyToOne = (ManyToOneAnnotation) attributeResource.getMappingAnnotation(JPA.MANY_TO_ONE); assertFalse(manyToOne.isCascadeRefresh()); manyToOne.setCascadeRefresh(true); @@ -342,7 +342,7 @@ public class ManyToOneTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(testType); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - ManyToOne manyToOne = (ManyToOne) attributeResource.getMappingAnnotation(JPA.MANY_TO_ONE); + ManyToOneAnnotation manyToOne = (ManyToOneAnnotation) attributeResource.getMappingAnnotation(JPA.MANY_TO_ONE); assertTrue(manyToOne.isCascadeAll()); manyToOne.setCascadeAll(true); @@ -367,7 +367,7 @@ public class ManyToOneTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(testType); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - ManyToOne manyToOne = (ManyToOne) attributeResource.getMappingAnnotation(JPA.MANY_TO_ONE); + ManyToOneAnnotation manyToOne = (ManyToOneAnnotation) attributeResource.getMappingAnnotation(JPA.MANY_TO_ONE); assertTrue(manyToOne.isCascadeMerge()); manyToOne.setCascadeMerge(false);//TODO should the resource model handle this and remove both MERGE @@ -385,7 +385,7 @@ public class ManyToOneTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(testType); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - ManyToOne manyToOne = (ManyToOne) attributeResource.getMappingAnnotation(JPA.MANY_TO_ONE); + ManyToOneAnnotation manyToOne = (ManyToOneAnnotation) attributeResource.getMappingAnnotation(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 a19fba7569..1692e03434 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 @@ -14,7 +14,7 @@ import org.eclipse.jdt.core.IType; import org.eclipse.jpt.core.resource.java.JPA; import org.eclipse.jpt.core.resource.java.JavaResourcePersistentAttribute; import org.eclipse.jpt.core.resource.java.JavaResourcePersistentType; -import org.eclipse.jpt.core.resource.java.MapKey; +import org.eclipse.jpt.core.resource.java.MapKeyAnnotation; import org.eclipse.jpt.utility.internal.iterators.ArrayIterator; public class MapKeyTests extends JavaResourceModelTestCase { @@ -56,7 +56,7 @@ public class MapKeyTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(testType); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - MapKey mapKey = (MapKey) attributeResource.getAnnotation(JPA.MAP_KEY); + MapKeyAnnotation mapKey = (MapKeyAnnotation) attributeResource.getAnnotation(JPA.MAP_KEY); assertNotNull(mapKey); } @@ -65,7 +65,7 @@ public class MapKeyTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(testType); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - MapKey mapKey = (MapKey) attributeResource.getAnnotation(JPA.MAP_KEY); + MapKeyAnnotation mapKey = (MapKeyAnnotation) attributeResource.getAnnotation(JPA.MAP_KEY); assertEquals("key", mapKey.getName()); } @@ -74,7 +74,7 @@ public class MapKeyTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(testType); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - MapKey mapKey = (MapKey) attributeResource.getAnnotation(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/NamedNativeQueriesTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/NamedNativeQueriesTests.java index 5a5dbbc8f1..eb75a06116 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 @@ -14,7 +14,7 @@ import org.eclipse.jdt.core.IType; import org.eclipse.jpt.core.resource.java.JPA; import org.eclipse.jpt.core.resource.java.JavaResourceNode; import org.eclipse.jpt.core.resource.java.JavaResourcePersistentType; -import org.eclipse.jpt.core.resource.java.NamedNativeQueries; +import org.eclipse.jpt.core.resource.java.NamedNativeQueriesAnnotation; import org.eclipse.jpt.core.resource.java.NamedNativeQueryAnnotation; import org.eclipse.jpt.utility.internal.CollectionTools; import org.eclipse.jpt.utility.internal.iterators.ArrayIterator; @@ -134,7 +134,7 @@ public class NamedNativeQueriesTests extends JavaResourceModelTestCase { IType testType = this.createTestNamedNativeQueries(); JavaResourcePersistentType typeResource = buildJavaTypeResource(testType); - NamedNativeQueries namedQueries = (NamedNativeQueries) typeResource.getAnnotation(JPA.NAMED_NATIVE_QUERIES); + NamedNativeQueriesAnnotation namedQueries = (NamedNativeQueriesAnnotation) typeResource.getAnnotation(JPA.NAMED_NATIVE_QUERIES); NamedNativeQueryAnnotation namedQuery = namedQueries.nestedAnnotations().next(); assertNotNull(namedQuery); } @@ -143,7 +143,7 @@ public class NamedNativeQueriesTests extends JavaResourceModelTestCase { IType testType = this.createTestNamedNativeQueryWithName(); JavaResourcePersistentType typeResource = buildJavaTypeResource(testType); - NamedNativeQueries namedQueries = (NamedNativeQueries) typeResource.getAnnotation(JPA.NAMED_NATIVE_QUERIES); + NamedNativeQueriesAnnotation namedQueries = (NamedNativeQueriesAnnotation) typeResource.getAnnotation(JPA.NAMED_NATIVE_QUERIES); NamedNativeQueryAnnotation namedQuery = namedQueries.nestedAnnotations().next(); assertEquals(QUERY_NAME, namedQuery.getName()); } @@ -152,7 +152,7 @@ public class NamedNativeQueriesTests extends JavaResourceModelTestCase { IType testType = this.createTestNamedNativeQueryWithName(); JavaResourcePersistentType typeResource = buildJavaTypeResource(testType); - NamedNativeQueries namedQueries = (NamedNativeQueries) typeResource.getAnnotation(JPA.NAMED_NATIVE_QUERIES); + NamedNativeQueriesAnnotation namedQueries = (NamedNativeQueriesAnnotation) typeResource.getAnnotation(JPA.NAMED_NATIVE_QUERIES); NamedNativeQueryAnnotation namedQuery = namedQueries.nestedAnnotations().next(); assertEquals(QUERY_NAME, namedQuery.getName()); @@ -171,7 +171,7 @@ public class NamedNativeQueriesTests extends JavaResourceModelTestCase { IType testType = this.createTestNamedNativeQueryWithQuery(); JavaResourcePersistentType typeResource = buildJavaTypeResource(testType); - NamedNativeQueries namedQueries = (NamedNativeQueries) typeResource.getAnnotation(JPA.NAMED_NATIVE_QUERIES); + NamedNativeQueriesAnnotation namedQueries = (NamedNativeQueriesAnnotation) typeResource.getAnnotation(JPA.NAMED_NATIVE_QUERIES); NamedNativeQueryAnnotation namedQuery = namedQueries.nestedAnnotations().next(); assertEquals(QUERY_QUERY, namedQuery.getQuery()); } @@ -180,7 +180,7 @@ public class NamedNativeQueriesTests extends JavaResourceModelTestCase { IType testType = this.createTestNamedNativeQueryWithQuery(); JavaResourcePersistentType typeResource = buildJavaTypeResource(testType); - NamedNativeQueries namedQueries = (NamedNativeQueries) typeResource.getAnnotation(JPA.NAMED_NATIVE_QUERIES); + NamedNativeQueriesAnnotation namedQueries = (NamedNativeQueriesAnnotation) typeResource.getAnnotation(JPA.NAMED_NATIVE_QUERIES); NamedNativeQueryAnnotation namedQuery = namedQueries.nestedAnnotations().next(); assertEquals(QUERY_QUERY, namedQuery.getQuery()); @@ -199,7 +199,7 @@ public class NamedNativeQueriesTests extends JavaResourceModelTestCase { IType testType = this.createTestNamedNativeQueryWithResultClass(); JavaResourcePersistentType typeResource = buildJavaTypeResource(testType); - NamedNativeQueries namedQueries = (NamedNativeQueries) typeResource.getAnnotation(JPA.NAMED_NATIVE_QUERIES); + NamedNativeQueriesAnnotation namedQueries = (NamedNativeQueriesAnnotation) typeResource.getAnnotation(JPA.NAMED_NATIVE_QUERIES); NamedNativeQueryAnnotation namedQuery = namedQueries.nestedAnnotations().next(); assertEquals(QUERY_RESULT_CLASS, namedQuery.getResultClass()); } @@ -208,7 +208,7 @@ public class NamedNativeQueriesTests extends JavaResourceModelTestCase { IType testType = this.createTestNamedNativeQueryWithResultClass(); JavaResourcePersistentType typeResource = buildJavaTypeResource(testType); - NamedNativeQueries namedQueries = (NamedNativeQueries) typeResource.getAnnotation(JPA.NAMED_NATIVE_QUERIES); + NamedNativeQueriesAnnotation namedQueries = (NamedNativeQueriesAnnotation) typeResource.getAnnotation(JPA.NAMED_NATIVE_QUERIES); NamedNativeQueryAnnotation namedQuery = namedQueries.nestedAnnotations().next(); assertEquals(QUERY_RESULT_CLASS, namedQuery.getResultClass()); @@ -227,7 +227,7 @@ public class NamedNativeQueriesTests extends JavaResourceModelTestCase { IType testType = this.createTestNamedNativeQueryWithResultClass(); JavaResourcePersistentType typeResource = buildJavaTypeResource(testType); - NamedNativeQueries namedQueries = (NamedNativeQueries) typeResource.getAnnotation(JPA.NAMED_NATIVE_QUERIES); + NamedNativeQueriesAnnotation namedQueries = (NamedNativeQueriesAnnotation) typeResource.getAnnotation(JPA.NAMED_NATIVE_QUERIES); NamedNativeQueryAnnotation namedQuery = namedQueries.nestedAnnotations().next(); assertNotNull(namedQuery.getResultClass()); assertEquals("Result", namedQuery.getFullyQualifiedResultClass());//bug 196200 changed this @@ -242,7 +242,7 @@ public class NamedNativeQueriesTests extends JavaResourceModelTestCase { IType testType = this.createTestNamedNativeQueryWithResultSetMapping(); JavaResourcePersistentType typeResource = buildJavaTypeResource(testType); - NamedNativeQueries namedQueries = (NamedNativeQueries) typeResource.getAnnotation(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()); } @@ -251,7 +251,7 @@ public class NamedNativeQueriesTests extends JavaResourceModelTestCase { IType testType = this.createTestNamedNativeQueryWithResultSetMapping(); JavaResourcePersistentType typeResource = buildJavaTypeResource(testType); - NamedNativeQueries namedQueries = (NamedNativeQueries) typeResource.getAnnotation(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()); @@ -270,7 +270,7 @@ public class NamedNativeQueriesTests extends JavaResourceModelTestCase { IType testType = this.createTestNamedNativeQueries(); JavaResourcePersistentType typeResource = buildJavaTypeResource(testType); - NamedNativeQueries namedQueries = (NamedNativeQueries) typeResource.getAnnotation(JPA.NAMED_NATIVE_QUERIES); + NamedNativeQueriesAnnotation namedQueries = (NamedNativeQueriesAnnotation) typeResource.getAnnotation(JPA.NAMED_NATIVE_QUERIES); NamedNativeQueryAnnotation namedQuery = namedQueries.nestedAnnotations().next(); assertEquals(0, namedQuery.hintsSize()); @@ -280,7 +280,7 @@ public class NamedNativeQueriesTests extends JavaResourceModelTestCase { IType testType = this.createTestNamedNativeQueries(); JavaResourcePersistentType typeResource = buildJavaTypeResource(testType); - NamedNativeQueries namedQueries = (NamedNativeQueries) typeResource.getAnnotation(JPA.NAMED_NATIVE_QUERIES); + NamedNativeQueriesAnnotation namedQueries = (NamedNativeQueriesAnnotation) typeResource.getAnnotation(JPA.NAMED_NATIVE_QUERIES); NamedNativeQueryAnnotation namedQuery = namedQueries.nestedAnnotations().next(); namedQuery.addHint(0); @@ -293,7 +293,7 @@ public class NamedNativeQueriesTests extends JavaResourceModelTestCase { IType testType = this.createTestNamedNativeQueryWithQueryHints(); JavaResourcePersistentType typeResource = buildJavaTypeResource(testType); - NamedNativeQueries namedQueries = (NamedNativeQueries) typeResource.getAnnotation(JPA.NAMED_NATIVE_QUERIES); + NamedNativeQueriesAnnotation namedQueries = (NamedNativeQueriesAnnotation) typeResource.getAnnotation(JPA.NAMED_NATIVE_QUERIES); NamedNativeQueryAnnotation namedQuery = namedQueries.nestedAnnotations().next(); assertEquals(2, namedQuery.hintsSize()); @@ -303,7 +303,7 @@ public class NamedNativeQueriesTests extends JavaResourceModelTestCase { IType testType = this.createTestNamedNativeQueries(); JavaResourcePersistentType typeResource = buildJavaTypeResource(testType); - NamedNativeQueries namedQueries = (NamedNativeQueries) typeResource.getAnnotation(JPA.NAMED_NATIVE_QUERIES); + NamedNativeQueriesAnnotation namedQueries = (NamedNativeQueriesAnnotation) typeResource.getAnnotation(JPA.NAMED_NATIVE_QUERIES); NamedNativeQueryAnnotation namedQuery = namedQueries.nestedAnnotations().next(); namedQuery.addHint(0).setName("FOO"); @@ -320,7 +320,7 @@ public class NamedNativeQueriesTests extends JavaResourceModelTestCase { IType testType = this.createTestNamedNativeQueryWithQueryHints(); JavaResourcePersistentType typeResource = buildJavaTypeResource(testType); - NamedNativeQueries namedQueries = (NamedNativeQueries) typeResource.getAnnotation(JPA.NAMED_NATIVE_QUERIES); + NamedNativeQueriesAnnotation namedQueries = (NamedNativeQueriesAnnotation) typeResource.getAnnotation(JPA.NAMED_NATIVE_QUERIES); NamedNativeQueryAnnotation namedQuery = namedQueries.nestedAnnotations().next(); namedQuery.addHint(0).setName("BAZ"); @@ -350,7 +350,7 @@ public class NamedNativeQueriesTests extends JavaResourceModelTestCase { IType testType = this.createTestNamedNativeQueryWithQueryHints(); JavaResourcePersistentType typeResource = buildJavaTypeResource(testType); - NamedNativeQueries namedQueries = (NamedNativeQueries) typeResource.getAnnotation(JPA.NAMED_NATIVE_QUERIES); + NamedNativeQueriesAnnotation namedQueries = (NamedNativeQueriesAnnotation) typeResource.getAnnotation(JPA.NAMED_NATIVE_QUERIES); NamedNativeQueryAnnotation namedQuery = namedQueries.nestedAnnotations().next(); namedQuery.addHint(0).setName("BAZ"); @@ -373,7 +373,7 @@ public class NamedNativeQueriesTests extends JavaResourceModelTestCase { IType testType = this.createTestNamedNativeQueryWithQueryHints(); JavaResourcePersistentType typeResource = buildJavaTypeResource(testType); - NamedNativeQueries namedQueries = (NamedNativeQueries) typeResource.getAnnotation(JPA.NAMED_NATIVE_QUERIES); + NamedNativeQueriesAnnotation namedQueries = (NamedNativeQueriesAnnotation) typeResource.getAnnotation(JPA.NAMED_NATIVE_QUERIES); NamedNativeQueryAnnotation namedQuery = namedQueries.nestedAnnotations().next(); namedQuery.addHint(0).setName("BAZ"); 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 ce888f1885..fa37ac561d 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 @@ -14,7 +14,7 @@ import org.eclipse.jdt.core.IType; import org.eclipse.jpt.core.resource.java.JPA; import org.eclipse.jpt.core.resource.java.JavaResourceNode; import org.eclipse.jpt.core.resource.java.JavaResourcePersistentType; -import org.eclipse.jpt.core.resource.java.NamedQueries; +import org.eclipse.jpt.core.resource.java.NamedQueriesAnnotation; import org.eclipse.jpt.core.resource.java.NamedQueryAnnotation; import org.eclipse.jpt.utility.internal.CollectionTools; import org.eclipse.jpt.utility.internal.iterators.ArrayIterator; @@ -115,7 +115,7 @@ public class NamedQueriesTests extends JavaResourceModelTestCase { IType testType = this.createTestNamedQueries(); JavaResourcePersistentType typeResource = buildJavaTypeResource(testType); - NamedQueries namedQueries = (NamedQueries) typeResource.getAnnotation(JPA.NAMED_QUERIES); + NamedQueriesAnnotation namedQueries = (NamedQueriesAnnotation) typeResource.getAnnotation(JPA.NAMED_QUERIES); NamedQueryAnnotation namedQuery = namedQueries.nestedAnnotations().next(); assertNotNull(namedQuery); } @@ -124,7 +124,7 @@ public class NamedQueriesTests extends JavaResourceModelTestCase { IType testType = this.createTestNamedQueryWithName(); JavaResourcePersistentType typeResource = buildJavaTypeResource(testType); - NamedQueries namedQueries = (NamedQueries) typeResource.getAnnotation(JPA.NAMED_QUERIES); + NamedQueriesAnnotation namedQueries = (NamedQueriesAnnotation) typeResource.getAnnotation(JPA.NAMED_QUERIES); NamedQueryAnnotation namedQuery = namedQueries.nestedAnnotations().next(); assertEquals(QUERY_NAME, namedQuery.getName()); } @@ -133,7 +133,7 @@ public class NamedQueriesTests extends JavaResourceModelTestCase { IType testType = this.createTestNamedQueryWithName(); JavaResourcePersistentType typeResource = buildJavaTypeResource(testType); - NamedQueries namedQueries = (NamedQueries) typeResource.getAnnotation(JPA.NAMED_QUERIES); + NamedQueriesAnnotation namedQueries = (NamedQueriesAnnotation) typeResource.getAnnotation(JPA.NAMED_QUERIES); NamedQueryAnnotation namedQuery = namedQueries.nestedAnnotations().next(); assertEquals(QUERY_NAME, namedQuery.getName()); @@ -152,7 +152,7 @@ public class NamedQueriesTests extends JavaResourceModelTestCase { IType testType = this.createTestNamedQueryWithQuery(); JavaResourcePersistentType typeResource = buildJavaTypeResource(testType); - NamedQueries namedQueries = (NamedQueries) typeResource.getAnnotation(JPA.NAMED_QUERIES); + NamedQueriesAnnotation namedQueries = (NamedQueriesAnnotation) typeResource.getAnnotation(JPA.NAMED_QUERIES); NamedQueryAnnotation namedQuery = namedQueries.nestedAnnotations().next(); assertEquals(QUERY_QUERY, namedQuery.getQuery()); } @@ -161,7 +161,7 @@ public class NamedQueriesTests extends JavaResourceModelTestCase { IType testType = this.createTestNamedQueryWithQuery(); JavaResourcePersistentType typeResource = buildJavaTypeResource(testType); - NamedQueries namedQueries = (NamedQueries) typeResource.getAnnotation(JPA.NAMED_QUERIES); + NamedQueriesAnnotation namedQueries = (NamedQueriesAnnotation) typeResource.getAnnotation(JPA.NAMED_QUERIES); NamedQueryAnnotation namedQuery = namedQueries.nestedAnnotations().next(); assertEquals(QUERY_QUERY, namedQuery.getQuery()); @@ -180,7 +180,7 @@ public class NamedQueriesTests extends JavaResourceModelTestCase { IType testType = this.createTestNamedQueries(); JavaResourcePersistentType typeResource = buildJavaTypeResource(testType); - NamedQueries namedQueries = (NamedQueries) typeResource.getAnnotation(JPA.NAMED_QUERIES); + NamedQueriesAnnotation namedQueries = (NamedQueriesAnnotation) typeResource.getAnnotation(JPA.NAMED_QUERIES); NamedQueryAnnotation namedQuery = namedQueries.nestedAnnotations().next(); assertEquals(0, namedQuery.hintsSize()); @@ -190,7 +190,7 @@ public class NamedQueriesTests extends JavaResourceModelTestCase { IType testType = this.createTestNamedQueries(); JavaResourcePersistentType typeResource = buildJavaTypeResource(testType); - NamedQueries namedQueries = (NamedQueries) typeResource.getAnnotation(JPA.NAMED_QUERIES); + NamedQueriesAnnotation namedQueries = (NamedQueriesAnnotation) typeResource.getAnnotation(JPA.NAMED_QUERIES); NamedQueryAnnotation namedQuery = namedQueries.nestedAnnotations().next(); namedQuery.addHint(0); @@ -203,7 +203,7 @@ public class NamedQueriesTests extends JavaResourceModelTestCase { IType testType = this.createTestNamedQueryWithQueryHints(); JavaResourcePersistentType typeResource = buildJavaTypeResource(testType); - NamedQueries namedQueries = (NamedQueries) typeResource.getAnnotation(JPA.NAMED_QUERIES); + NamedQueriesAnnotation namedQueries = (NamedQueriesAnnotation) typeResource.getAnnotation(JPA.NAMED_QUERIES); NamedQueryAnnotation namedQuery = namedQueries.nestedAnnotations().next(); assertEquals(2, namedQuery.hintsSize()); @@ -213,7 +213,7 @@ public class NamedQueriesTests extends JavaResourceModelTestCase { IType testType = this.createTestNamedQueries(); JavaResourcePersistentType typeResource = buildJavaTypeResource(testType); - NamedQueries namedQueries = (NamedQueries) typeResource.getAnnotation(JPA.NAMED_QUERIES); + NamedQueriesAnnotation namedQueries = (NamedQueriesAnnotation) typeResource.getAnnotation(JPA.NAMED_QUERIES); NamedQueryAnnotation namedQuery = namedQueries.nestedAnnotations().next(); namedQuery.addHint(0).setName("FOO"); @@ -231,7 +231,7 @@ public class NamedQueriesTests extends JavaResourceModelTestCase { IType testType = this.createTestNamedQueryWithQueryHints(); JavaResourcePersistentType typeResource = buildJavaTypeResource(testType); - NamedQueries namedQueries = (NamedQueries) typeResource.getAnnotation(JPA.NAMED_QUERIES); + NamedQueriesAnnotation namedQueries = (NamedQueriesAnnotation) typeResource.getAnnotation(JPA.NAMED_QUERIES); NamedQueryAnnotation namedQuery = namedQueries.nestedAnnotations().next(); namedQuery.addHint(0).setName("BAZ"); @@ -260,7 +260,7 @@ public class NamedQueriesTests extends JavaResourceModelTestCase { IType testType = this.createTestNamedQueryWithQueryHints(); JavaResourcePersistentType typeResource = buildJavaTypeResource(testType); - NamedQueries namedQueries = (NamedQueries) typeResource.getAnnotation(JPA.NAMED_QUERIES); + NamedQueriesAnnotation namedQueries = (NamedQueriesAnnotation) typeResource.getAnnotation(JPA.NAMED_QUERIES); NamedQueryAnnotation namedQuery = namedQueries.nestedAnnotations().next(); namedQuery.addHint(0).setName("BAZ"); @@ -282,7 +282,7 @@ public class NamedQueriesTests extends JavaResourceModelTestCase { IType testType = this.createTestNamedQueryWithQueryHints(); JavaResourcePersistentType typeResource = buildJavaTypeResource(testType); - NamedQueries namedQueries = (NamedQueries) typeResource.getAnnotation(JPA.NAMED_QUERIES); + NamedQueriesAnnotation namedQueries = (NamedQueriesAnnotation) typeResource.getAnnotation(JPA.NAMED_QUERIES); NamedQueryAnnotation namedQuery = namedQueries.nestedAnnotations().next(); namedQuery.addHint(0).setName("BAZ"); 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 79b3dbbfaf..b4e5c6ebe8 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 @@ -15,7 +15,7 @@ import org.eclipse.jpt.core.resource.java.FetchType; import org.eclipse.jpt.core.resource.java.JPA; import org.eclipse.jpt.core.resource.java.JavaResourcePersistentAttribute; import org.eclipse.jpt.core.resource.java.JavaResourcePersistentType; -import org.eclipse.jpt.core.resource.java.OneToMany; +import org.eclipse.jpt.core.resource.java.OneToManyAnnotation; import org.eclipse.jpt.utility.internal.iterators.ArrayIterator; public class OneToManyTests extends JavaResourceModelTestCase { @@ -132,7 +132,7 @@ public class OneToManyTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(testType); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - OneToMany oneToMany = (OneToMany) attributeResource.getMappingAnnotation(JPA.ONE_TO_MANY); + OneToManyAnnotation oneToMany = (OneToManyAnnotation) attributeResource.getMappingAnnotation(JPA.ONE_TO_MANY); assertNotNull(oneToMany); } @@ -141,7 +141,7 @@ public class OneToManyTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(testType); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - OneToMany oneToMany = (OneToMany) attributeResource.getMappingAnnotation(JPA.ONE_TO_MANY); + OneToManyAnnotation oneToMany = (OneToManyAnnotation) attributeResource.getMappingAnnotation(JPA.ONE_TO_MANY); assertEquals(FetchType.EAGER, oneToMany.getFetch()); } @@ -150,7 +150,7 @@ public class OneToManyTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(testType); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - OneToMany oneToMany = (OneToMany) attributeResource.getMappingAnnotation(JPA.ONE_TO_MANY); + OneToManyAnnotation oneToMany = (OneToManyAnnotation) attributeResource.getMappingAnnotation(JPA.ONE_TO_MANY); assertEquals(FetchType.EAGER, oneToMany.getFetch()); oneToMany.setFetch(FetchType.LAZY); @@ -164,7 +164,7 @@ public class OneToManyTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(testType); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - OneToMany oneToMany = (OneToMany) attributeResource.getMappingAnnotation(JPA.ONE_TO_MANY); + OneToManyAnnotation oneToMany = (OneToManyAnnotation) attributeResource.getMappingAnnotation(JPA.ONE_TO_MANY); assertEquals(FetchType.EAGER, oneToMany.getFetch()); oneToMany.setFetch(null); @@ -180,7 +180,7 @@ public class OneToManyTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(testType); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - OneToMany oneToMany = (OneToMany) attributeResource.getMappingAnnotation(JPA.ONE_TO_MANY); + OneToManyAnnotation oneToMany = (OneToManyAnnotation) attributeResource.getMappingAnnotation(JPA.ONE_TO_MANY); assertEquals(TYPE_NAME, oneToMany.getTargetEntity()); } @@ -189,7 +189,7 @@ public class OneToManyTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(testType); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - OneToMany oneToMany = (OneToMany) attributeResource.getMappingAnnotation(JPA.ONE_TO_MANY); + OneToManyAnnotation oneToMany = (OneToManyAnnotation) attributeResource.getMappingAnnotation(JPA.ONE_TO_MANY); assertEquals(TYPE_NAME, oneToMany.getTargetEntity()); oneToMany.setTargetEntity("Foo"); @@ -202,7 +202,7 @@ public class OneToManyTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(testType); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - OneToMany oneToMany = (OneToMany) attributeResource.getMappingAnnotation(JPA.ONE_TO_MANY); + OneToManyAnnotation oneToMany = (OneToManyAnnotation) attributeResource.getMappingAnnotation(JPA.ONE_TO_MANY); assertEquals(TYPE_NAME, oneToMany.getTargetEntity()); oneToMany.setTargetEntity(null); @@ -217,7 +217,7 @@ public class OneToManyTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(testType); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - OneToMany oneToMany = (OneToMany) attributeResource.getMappingAnnotation(JPA.ONE_TO_MANY); + OneToManyAnnotation oneToMany = (OneToManyAnnotation) attributeResource.getMappingAnnotation(JPA.ONE_TO_MANY); assertEquals(FULLY_QUALIFIED_TYPE_NAME, oneToMany.getFullyQualifiedTargetEntity()); oneToMany.setTargetEntity("Foo"); @@ -234,7 +234,7 @@ public class OneToManyTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(testType); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - OneToMany oneToMany = (OneToMany) attributeResource.getMappingAnnotation(JPA.ONE_TO_MANY); + OneToManyAnnotation oneToMany = (OneToManyAnnotation) attributeResource.getMappingAnnotation(JPA.ONE_TO_MANY); assertEquals("foo", oneToMany.getMappedBy()); } @@ -244,7 +244,7 @@ public class OneToManyTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(testType); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - OneToMany oneToMany = (OneToMany) attributeResource.getMappingAnnotation(JPA.ONE_TO_MANY); + OneToManyAnnotation oneToMany = (OneToManyAnnotation) attributeResource.getMappingAnnotation(JPA.ONE_TO_MANY); assertEquals(null, oneToMany.getMappedBy()); } @@ -253,7 +253,7 @@ public class OneToManyTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(testType); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - OneToMany oneToMany = (OneToMany) attributeResource.getMappingAnnotation(JPA.ONE_TO_MANY); + OneToManyAnnotation oneToMany = (OneToManyAnnotation) attributeResource.getMappingAnnotation(JPA.ONE_TO_MANY); assertNull(oneToMany.getMappedBy()); oneToMany.setMappedBy("bar"); assertEquals("bar", oneToMany.getMappedBy()); @@ -266,7 +266,7 @@ public class OneToManyTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(testType); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - OneToMany oneToMany = (OneToMany) attributeResource.getMappingAnnotation(JPA.ONE_TO_MANY); + OneToManyAnnotation oneToMany = (OneToManyAnnotation) attributeResource.getMappingAnnotation(JPA.ONE_TO_MANY); assertEquals("foo", oneToMany.getMappedBy()); oneToMany.setMappedBy(null); @@ -281,7 +281,7 @@ public class OneToManyTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(testType); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - OneToMany oneToMany = (OneToMany) attributeResource.getMappingAnnotation(JPA.ONE_TO_MANY); + OneToManyAnnotation oneToMany = (OneToManyAnnotation) attributeResource.getMappingAnnotation(JPA.ONE_TO_MANY); assertFalse(oneToMany.isCascadeAll()); oneToMany.setCascadeAll(true); @@ -295,7 +295,7 @@ public class OneToManyTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(testType); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - OneToMany oneToMany = (OneToMany) attributeResource.getMappingAnnotation(JPA.ONE_TO_MANY); + OneToManyAnnotation oneToMany = (OneToManyAnnotation) attributeResource.getMappingAnnotation(JPA.ONE_TO_MANY); assertFalse(oneToMany.isCascadeMerge()); oneToMany.setCascadeMerge(true); @@ -309,7 +309,7 @@ public class OneToManyTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(testType); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - OneToMany oneToMany = (OneToMany) attributeResource.getMappingAnnotation(JPA.ONE_TO_MANY); + OneToManyAnnotation oneToMany = (OneToManyAnnotation) attributeResource.getMappingAnnotation(JPA.ONE_TO_MANY); assertFalse(oneToMany.isCascadePersist()); oneToMany.setCascadePersist(true); @@ -323,7 +323,7 @@ public class OneToManyTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(testType); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - OneToMany oneToMany = (OneToMany) attributeResource.getMappingAnnotation(JPA.ONE_TO_MANY); + OneToManyAnnotation oneToMany = (OneToManyAnnotation) attributeResource.getMappingAnnotation(JPA.ONE_TO_MANY); assertFalse(oneToMany.isCascadeRemove()); oneToMany.setCascadeRemove(true); @@ -337,7 +337,7 @@ public class OneToManyTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(testType); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - OneToMany oneToMany = (OneToMany) attributeResource.getMappingAnnotation(JPA.ONE_TO_MANY); + OneToManyAnnotation oneToMany = (OneToManyAnnotation) attributeResource.getMappingAnnotation(JPA.ONE_TO_MANY); assertFalse(oneToMany.isCascadeRefresh()); oneToMany.setCascadeRefresh(true); @@ -351,7 +351,7 @@ public class OneToManyTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(testType); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - OneToMany oneToMany = (OneToMany) attributeResource.getMappingAnnotation(JPA.ONE_TO_MANY); + OneToManyAnnotation oneToMany = (OneToManyAnnotation) attributeResource.getMappingAnnotation(JPA.ONE_TO_MANY); assertTrue(oneToMany.isCascadeAll()); oneToMany.setCascadeAll(true); @@ -376,7 +376,7 @@ public class OneToManyTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(testType); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - OneToMany oneToMany = (OneToMany) attributeResource.getMappingAnnotation(JPA.ONE_TO_MANY); + OneToManyAnnotation oneToMany = (OneToManyAnnotation) attributeResource.getMappingAnnotation(JPA.ONE_TO_MANY); assertTrue(oneToMany.isCascadeMerge()); oneToMany.setCascadeMerge(false);//TODO should the resource model handle this and remove both MERGE @@ -394,7 +394,7 @@ public class OneToManyTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(testType); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - OneToMany oneToMany = (OneToMany) attributeResource.getMappingAnnotation(JPA.ONE_TO_MANY); + OneToManyAnnotation oneToMany = (OneToManyAnnotation) attributeResource.getMappingAnnotation(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 5c5001f7d4..141797cfe2 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 @@ -15,7 +15,7 @@ import org.eclipse.jpt.core.resource.java.FetchType; import org.eclipse.jpt.core.resource.java.JPA; import org.eclipse.jpt.core.resource.java.JavaResourcePersistentAttribute; import org.eclipse.jpt.core.resource.java.JavaResourcePersistentType; -import org.eclipse.jpt.core.resource.java.OneToOne; +import org.eclipse.jpt.core.resource.java.OneToOneAnnotation; import org.eclipse.jpt.utility.internal.iterators.ArrayIterator; public class OneToOneTests extends JavaResourceModelTestCase { @@ -146,7 +146,7 @@ public class OneToOneTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(testType); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - OneToOne oneToOne = (OneToOne) attributeResource.getMappingAnnotation(JPA.ONE_TO_ONE); + OneToOneAnnotation oneToOne = (OneToOneAnnotation) attributeResource.getMappingAnnotation(JPA.ONE_TO_ONE); assertNotNull(oneToOne); } @@ -155,7 +155,7 @@ public class OneToOneTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(testType); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - OneToOne oneToOne = (OneToOne) attributeResource.getMappingAnnotation(JPA.ONE_TO_ONE); + OneToOneAnnotation oneToOne = (OneToOneAnnotation) attributeResource.getMappingAnnotation(JPA.ONE_TO_ONE); assertEquals(FetchType.EAGER, oneToOne.getFetch()); } @@ -164,7 +164,7 @@ public class OneToOneTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(testType); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - OneToOne oneToOne = (OneToOne) attributeResource.getMappingAnnotation(JPA.ONE_TO_ONE); + OneToOneAnnotation oneToOne = (OneToOneAnnotation) attributeResource.getMappingAnnotation(JPA.ONE_TO_ONE); assertEquals(FetchType.EAGER, oneToOne.getFetch()); oneToOne.setFetch(FetchType.LAZY); @@ -178,7 +178,7 @@ public class OneToOneTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(testType); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - OneToOne oneToOne = (OneToOne) attributeResource.getMappingAnnotation(JPA.ONE_TO_ONE); + OneToOneAnnotation oneToOne = (OneToOneAnnotation) attributeResource.getMappingAnnotation(JPA.ONE_TO_ONE); assertEquals(FetchType.EAGER, oneToOne.getFetch()); oneToOne.setFetch(null); @@ -194,7 +194,7 @@ public class OneToOneTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(testType); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - OneToOne oneToOne = (OneToOne) attributeResource.getMappingAnnotation(JPA.ONE_TO_ONE); + OneToOneAnnotation oneToOne = (OneToOneAnnotation) attributeResource.getMappingAnnotation(JPA.ONE_TO_ONE); assertEquals(TYPE_NAME, oneToOne.getTargetEntity()); } @@ -203,7 +203,7 @@ public class OneToOneTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(testType); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - OneToOne oneToOne = (OneToOne) attributeResource.getMappingAnnotation(JPA.ONE_TO_ONE); + OneToOneAnnotation oneToOne = (OneToOneAnnotation) attributeResource.getMappingAnnotation(JPA.ONE_TO_ONE); assertEquals(TYPE_NAME, oneToOne.getTargetEntity()); oneToOne.setTargetEntity("Foo"); @@ -216,7 +216,7 @@ public class OneToOneTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(testType); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - OneToOne oneToOne = (OneToOne) attributeResource.getMappingAnnotation(JPA.ONE_TO_ONE); + OneToOneAnnotation oneToOne = (OneToOneAnnotation) attributeResource.getMappingAnnotation(JPA.ONE_TO_ONE); assertEquals(TYPE_NAME, oneToOne.getTargetEntity()); oneToOne.setTargetEntity(null); @@ -231,7 +231,7 @@ public class OneToOneTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(testType); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - OneToOne oneToOne = (OneToOne) attributeResource.getMappingAnnotation(JPA.ONE_TO_ONE); + OneToOneAnnotation oneToOne = (OneToOneAnnotation) attributeResource.getMappingAnnotation(JPA.ONE_TO_ONE); assertEquals(FULLY_QUALIFIED_TYPE_NAME, oneToOne.getFullyQualifiedTargetEntity()); oneToOne.setTargetEntity("Foo"); @@ -248,7 +248,7 @@ public class OneToOneTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(testType); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - OneToOne oneToOne = (OneToOne) attributeResource.getMappingAnnotation(JPA.ONE_TO_ONE); + OneToOneAnnotation oneToOne = (OneToOneAnnotation) attributeResource.getMappingAnnotation(JPA.ONE_TO_ONE); assertEquals(Boolean.TRUE, oneToOne.getOptional()); } @@ -257,7 +257,7 @@ public class OneToOneTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(testType); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - OneToOne oneToOne = (OneToOne) attributeResource.getMappingAnnotation(JPA.ONE_TO_ONE); + OneToOneAnnotation oneToOne = (OneToOneAnnotation) attributeResource.getMappingAnnotation(JPA.ONE_TO_ONE); assertEquals(Boolean.TRUE, oneToOne.getOptional()); oneToOne.setOptional(Boolean.FALSE); @@ -271,7 +271,7 @@ public class OneToOneTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(testType); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - OneToOne oneToOne = (OneToOne) attributeResource.getMappingAnnotation(JPA.ONE_TO_ONE); + OneToOneAnnotation oneToOne = (OneToOneAnnotation) attributeResource.getMappingAnnotation(JPA.ONE_TO_ONE); assertEquals(Boolean.TRUE, oneToOne.getOptional()); oneToOne.setOptional(null); @@ -286,7 +286,7 @@ public class OneToOneTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(testType); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - OneToOne oneToOne = (OneToOne) attributeResource.getMappingAnnotation(JPA.ONE_TO_ONE); + OneToOneAnnotation oneToOne = (OneToOneAnnotation) attributeResource.getMappingAnnotation(JPA.ONE_TO_ONE); assertEquals("foo", oneToOne.getMappedBy()); } @@ -295,7 +295,7 @@ public class OneToOneTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(testType); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - OneToOne oneToOne = (OneToOne) attributeResource.getMappingAnnotation(JPA.ONE_TO_ONE); + OneToOneAnnotation oneToOne = (OneToOneAnnotation) attributeResource.getMappingAnnotation(JPA.ONE_TO_ONE); assertEquals(null, oneToOne.getMappedBy()); } @@ -304,7 +304,7 @@ public class OneToOneTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(testType); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - OneToOne oneToOne = (OneToOne) attributeResource.getMappingAnnotation(JPA.ONE_TO_ONE); + OneToOneAnnotation oneToOne = (OneToOneAnnotation) attributeResource.getMappingAnnotation(JPA.ONE_TO_ONE); assertNull(oneToOne.getMappedBy()); oneToOne.setMappedBy("bar"); assertEquals("bar", oneToOne.getMappedBy()); @@ -317,7 +317,7 @@ public class OneToOneTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(testType); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - OneToOne oneToOne = (OneToOne) attributeResource.getMappingAnnotation(JPA.ONE_TO_ONE); + OneToOneAnnotation oneToOne = (OneToOneAnnotation) attributeResource.getMappingAnnotation(JPA.ONE_TO_ONE); assertEquals("foo", oneToOne.getMappedBy()); oneToOne.setMappedBy(null); @@ -332,7 +332,7 @@ public class OneToOneTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(testType); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - OneToOne oneToOne = (OneToOne) attributeResource.getMappingAnnotation(JPA.ONE_TO_ONE); + OneToOneAnnotation oneToOne = (OneToOneAnnotation) attributeResource.getMappingAnnotation(JPA.ONE_TO_ONE); assertFalse(oneToOne.isCascadeAll()); oneToOne.setCascadeAll(true); @@ -346,7 +346,7 @@ public class OneToOneTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(testType); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - OneToOne oneToOne = (OneToOne) attributeResource.getMappingAnnotation(JPA.ONE_TO_ONE); + OneToOneAnnotation oneToOne = (OneToOneAnnotation) attributeResource.getMappingAnnotation(JPA.ONE_TO_ONE); assertFalse(oneToOne.isCascadeMerge()); oneToOne.setCascadeMerge(true); @@ -360,7 +360,7 @@ public class OneToOneTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(testType); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - OneToOne oneToOne = (OneToOne) attributeResource.getMappingAnnotation(JPA.ONE_TO_ONE); + OneToOneAnnotation oneToOne = (OneToOneAnnotation) attributeResource.getMappingAnnotation(JPA.ONE_TO_ONE); assertFalse(oneToOne.isCascadePersist()); oneToOne.setCascadePersist(true); @@ -374,7 +374,7 @@ public class OneToOneTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(testType); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - OneToOne oneToOne = (OneToOne) attributeResource.getMappingAnnotation(JPA.ONE_TO_ONE); + OneToOneAnnotation oneToOne = (OneToOneAnnotation) attributeResource.getMappingAnnotation(JPA.ONE_TO_ONE); assertFalse(oneToOne.isCascadeRemove()); oneToOne.setCascadeRemove(true); @@ -388,7 +388,7 @@ public class OneToOneTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(testType); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - OneToOne oneToOne = (OneToOne) attributeResource.getMappingAnnotation(JPA.ONE_TO_ONE); + OneToOneAnnotation oneToOne = (OneToOneAnnotation) attributeResource.getMappingAnnotation(JPA.ONE_TO_ONE); assertFalse(oneToOne.isCascadeRefresh()); oneToOne.setCascadeRefresh(true); @@ -402,7 +402,7 @@ public class OneToOneTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(testType); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - OneToOne oneToOne = (OneToOne) attributeResource.getMappingAnnotation(JPA.ONE_TO_ONE); + OneToOneAnnotation oneToOne = (OneToOneAnnotation) attributeResource.getMappingAnnotation(JPA.ONE_TO_ONE); assertTrue(oneToOne.isCascadeAll()); oneToOne.setCascadeAll(true); @@ -427,7 +427,7 @@ public class OneToOneTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(testType); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - OneToOne oneToOne = (OneToOne) attributeResource.getMappingAnnotation(JPA.ONE_TO_ONE); + OneToOneAnnotation oneToOne = (OneToOneAnnotation) attributeResource.getMappingAnnotation(JPA.ONE_TO_ONE); assertTrue(oneToOne.isCascadeMerge()); oneToOne.setCascadeMerge(false);//TODO should the resource model handle this and remove both MERGE @@ -445,7 +445,7 @@ public class OneToOneTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(testType); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - OneToOne oneToOne = (OneToOne) attributeResource.getMappingAnnotation(JPA.ONE_TO_ONE); + OneToOneAnnotation oneToOne = (OneToOneAnnotation) attributeResource.getMappingAnnotation(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 a4cdfa01bc..e8ad7984b6 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 @@ -14,7 +14,7 @@ import org.eclipse.jdt.core.IType; import org.eclipse.jpt.core.resource.java.JPA; import org.eclipse.jpt.core.resource.java.JavaResourcePersistentAttribute; import org.eclipse.jpt.core.resource.java.JavaResourcePersistentType; -import org.eclipse.jpt.core.resource.java.OrderBy; +import org.eclipse.jpt.core.resource.java.OrderByAnnotation; import org.eclipse.jpt.utility.internal.iterators.ArrayIterator; public class OrderByTests extends JavaResourceModelTestCase { @@ -56,7 +56,7 @@ public class OrderByTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(testType); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - OrderBy orderBy = (OrderBy) attributeResource.getAnnotation(JPA.ORDER_BY); + OrderByAnnotation orderBy = (OrderByAnnotation) attributeResource.getAnnotation(JPA.ORDER_BY); assertNotNull(orderBy); } @@ -65,7 +65,7 @@ public class OrderByTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(testType); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - OrderBy orderBy = (OrderBy) attributeResource.getAnnotation(JPA.ORDER_BY); + OrderByAnnotation orderBy = (OrderByAnnotation) attributeResource.getAnnotation(JPA.ORDER_BY); assertEquals("key", orderBy.getValue()); } @@ -74,7 +74,7 @@ public class OrderByTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(testType); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - OrderBy orderBy = (OrderBy) attributeResource.getAnnotation(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/SecondaryTableTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/SecondaryTableTests.java index d6224930be..3aeac765d7 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 @@ -15,7 +15,7 @@ import org.eclipse.jpt.core.resource.java.JPA; import org.eclipse.jpt.core.resource.java.JavaResourcePersistentType; import org.eclipse.jpt.core.resource.java.PrimaryKeyJoinColumnAnnotation; import org.eclipse.jpt.core.resource.java.SecondaryTableAnnotation; -import org.eclipse.jpt.core.resource.java.UniqueConstraint; +import org.eclipse.jpt.core.resource.java.UniqueConstraintAnnotation; import org.eclipse.jpt.utility.internal.iterators.ArrayIterator; public class SecondaryTableTests extends JavaResourceModelTestCase { @@ -299,7 +299,7 @@ public class SecondaryTableTests extends JavaResourceModelTestCase { SecondaryTableAnnotation table = (SecondaryTableAnnotation) typeResource.getAnnotation(JPA.SECONDARY_TABLE); table.removeUniqueConstraint(1); - Iterator<UniqueConstraint> uniqueConstraints = table.uniqueConstraints(); + Iterator<UniqueConstraintAnnotation> uniqueConstraints = table.uniqueConstraints(); assertEquals("BAR", uniqueConstraints.next().columnNames().next()); assertEquals("BAZ", uniqueConstraints.next().columnNames().next()); assertFalse(uniqueConstraints.hasNext()); 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 3adc35e9ff..190d7801c0 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 @@ -16,7 +16,7 @@ import org.eclipse.jpt.core.resource.java.JavaResourceNode; import org.eclipse.jpt.core.resource.java.JavaResourcePersistentType; import org.eclipse.jpt.core.resource.java.PrimaryKeyJoinColumnAnnotation; import org.eclipse.jpt.core.resource.java.SecondaryTableAnnotation; -import org.eclipse.jpt.core.resource.java.SecondaryTables; +import org.eclipse.jpt.core.resource.java.SecondaryTablesAnnotation; import org.eclipse.jpt.utility.internal.CollectionTools; import org.eclipse.jpt.utility.internal.iterators.ArrayIterator; @@ -160,7 +160,7 @@ public class SecondaryTablesTests extends JavaResourceModelTestCase { SecondaryTableAnnotation table = (SecondaryTableAnnotation) typeResource.getAnnotation(JPA.SECONDARY_TABLE); assertNull(table); - SecondaryTables secondaryTables = (SecondaryTables) typeResource.getAnnotation(JPA.SECONDARY_TABLES); + SecondaryTablesAnnotation secondaryTables = (SecondaryTablesAnnotation) typeResource.getAnnotation(JPA.SECONDARY_TABLES); assertNotNull(secondaryTables); SecondaryTableAnnotation secondaryTable = secondaryTables.nestedAnnotationAt(0); @@ -171,7 +171,7 @@ public class SecondaryTablesTests extends JavaResourceModelTestCase { IType testType = this.createTestSecondaryTables(); JavaResourcePersistentType typeResource = buildJavaTypeResource(testType); - SecondaryTables secondaryTables = (SecondaryTables) typeResource.getAnnotation(JPA.SECONDARY_TABLES); + SecondaryTablesAnnotation secondaryTables = (SecondaryTablesAnnotation) typeResource.getAnnotation(JPA.SECONDARY_TABLES); SecondaryTableAnnotation secondaryTable = secondaryTables.nestedAnnotationAt(0); assertNull(secondaryTable.getName()); assertNull(secondaryTable.getCatalog()); @@ -182,7 +182,7 @@ public class SecondaryTablesTests extends JavaResourceModelTestCase { IType testType = this.createTestSecondaryTables(); JavaResourcePersistentType typeResource = buildJavaTypeResource(testType); - SecondaryTables secondaryTables = (SecondaryTables) typeResource.getAnnotation(JPA.SECONDARY_TABLES); + SecondaryTablesAnnotation secondaryTables = (SecondaryTablesAnnotation) typeResource.getAnnotation(JPA.SECONDARY_TABLES); SecondaryTableAnnotation secondaryTable = secondaryTables.nestedAnnotationAt(0); assertNull(secondaryTable.getName()); @@ -197,7 +197,7 @@ public class SecondaryTablesTests extends JavaResourceModelTestCase { IType testType = this.createTestSecondaryTableWithName(); JavaResourcePersistentType typeResource = buildJavaTypeResource(testType); - SecondaryTables secondaryTables = (SecondaryTables) typeResource.getAnnotation(JPA.SECONDARY_TABLES); + SecondaryTablesAnnotation secondaryTables = (SecondaryTablesAnnotation) typeResource.getAnnotation(JPA.SECONDARY_TABLES); SecondaryTableAnnotation secondaryTable = secondaryTables.nestedAnnotationAt(0); assertEquals(TABLE_NAME, secondaryTable.getName()); @@ -211,7 +211,7 @@ public class SecondaryTablesTests extends JavaResourceModelTestCase { IType testType = this.createTestSecondaryTableWithCatalog(); JavaResourcePersistentType typeResource = buildJavaTypeResource(testType); - SecondaryTables secondaryTables = (SecondaryTables) typeResource.getAnnotation(JPA.SECONDARY_TABLES); + SecondaryTablesAnnotation secondaryTables = (SecondaryTablesAnnotation) typeResource.getAnnotation(JPA.SECONDARY_TABLES); SecondaryTableAnnotation secondaryTable = secondaryTables.nestedAnnotationAt(0); assertEquals(CATALOG_NAME, secondaryTable.getCatalog()); } @@ -220,7 +220,7 @@ public class SecondaryTablesTests extends JavaResourceModelTestCase { IType testType = this.createTestSecondaryTables(); JavaResourcePersistentType typeResource = buildJavaTypeResource(testType); - SecondaryTables secondaryTables = (SecondaryTables) typeResource.getAnnotation(JPA.SECONDARY_TABLES); + SecondaryTablesAnnotation secondaryTables = (SecondaryTablesAnnotation) typeResource.getAnnotation(JPA.SECONDARY_TABLES); SecondaryTableAnnotation secondaryTable = secondaryTables.nestedAnnotationAt(0); assertNull(secondaryTable.getCatalog()); @@ -234,7 +234,7 @@ public class SecondaryTablesTests extends JavaResourceModelTestCase { IType testType = this.createTestSecondaryTableWithCatalog(); JavaResourcePersistentType typeResource = buildJavaTypeResource(testType); - SecondaryTables secondaryTables = (SecondaryTables) typeResource.getAnnotation(JPA.SECONDARY_TABLES); + SecondaryTablesAnnotation secondaryTables = (SecondaryTablesAnnotation) typeResource.getAnnotation(JPA.SECONDARY_TABLES); SecondaryTableAnnotation secondaryTable = secondaryTables.nestedAnnotationAt(0); assertEquals(CATALOG_NAME, secondaryTable.getCatalog()); @@ -248,7 +248,7 @@ public class SecondaryTablesTests extends JavaResourceModelTestCase { IType testType = this.createTestSecondaryTableWithSchema(); JavaResourcePersistentType typeResource = buildJavaTypeResource(testType); - SecondaryTables secondaryTables = (SecondaryTables) typeResource.getAnnotation(JPA.SECONDARY_TABLES); + SecondaryTablesAnnotation secondaryTables = (SecondaryTablesAnnotation) typeResource.getAnnotation(JPA.SECONDARY_TABLES); SecondaryTableAnnotation secondaryTable = secondaryTables.nestedAnnotationAt(0); assertNotNull(secondaryTable); assertEquals(SCHEMA_NAME, secondaryTable.getSchema()); @@ -258,7 +258,7 @@ public class SecondaryTablesTests extends JavaResourceModelTestCase { IType testType = this.createTestSecondaryTables(); JavaResourcePersistentType typeResource = buildJavaTypeResource(testType); - SecondaryTables secondaryTables = (SecondaryTables) typeResource.getAnnotation(JPA.SECONDARY_TABLES); + SecondaryTablesAnnotation secondaryTables = (SecondaryTablesAnnotation) typeResource.getAnnotation(JPA.SECONDARY_TABLES); SecondaryTableAnnotation secondaryTable = secondaryTables.nestedAnnotationAt(0); assertNull(secondaryTable.getSchema()); @@ -272,7 +272,7 @@ public class SecondaryTablesTests extends JavaResourceModelTestCase { IType testType = this.createTestSecondaryTableWithSchema(); JavaResourcePersistentType typeResource = buildJavaTypeResource(testType); - SecondaryTables secondaryTables = (SecondaryTables) typeResource.getAnnotation(JPA.SECONDARY_TABLES); + SecondaryTablesAnnotation secondaryTables = (SecondaryTablesAnnotation) typeResource.getAnnotation(JPA.SECONDARY_TABLES); SecondaryTableAnnotation secondaryTable = secondaryTables.nestedAnnotationAt(0); assertEquals(SCHEMA_NAME, secondaryTable.getSchema()); @@ -286,7 +286,7 @@ public class SecondaryTablesTests extends JavaResourceModelTestCase { public void testUniqueConstraints() throws Exception { IType testType = this.createTestSecondaryTables(); JavaResourcePersistentType typeResource = buildJavaTypeResource(testType); - SecondaryTables secondaryTables = (SecondaryTables) typeResource.getAnnotation(JPA.SECONDARY_TABLES); + SecondaryTablesAnnotation secondaryTables = (SecondaryTablesAnnotation) typeResource.getAnnotation(JPA.SECONDARY_TABLES); SecondaryTableAnnotation secondaryTable = secondaryTables.nestedAnnotationAt(0); assertEquals(0, secondaryTable.uniqueConstraintsSize()); @@ -295,7 +295,7 @@ public class SecondaryTablesTests extends JavaResourceModelTestCase { public void testUniqueConstraints2() throws Exception { IType testType = this.createTestSecondaryTables(); JavaResourcePersistentType typeResource = buildJavaTypeResource(testType); - SecondaryTables secondaryTables = (SecondaryTables) typeResource.getAnnotation(JPA.SECONDARY_TABLES); + SecondaryTablesAnnotation secondaryTables = (SecondaryTablesAnnotation) typeResource.getAnnotation(JPA.SECONDARY_TABLES); SecondaryTableAnnotation secondaryTable = secondaryTables.nestedAnnotationAt(0); secondaryTable.addUniqueConstraint(0); @@ -307,7 +307,7 @@ public class SecondaryTablesTests extends JavaResourceModelTestCase { public void testUniqueConstraints3() throws Exception { IType testType = this.createTestSecondaryTableWithUniqueConstraints(); JavaResourcePersistentType typeResource = buildJavaTypeResource(testType); - SecondaryTables secondaryTables = (SecondaryTables) typeResource.getAnnotation(JPA.SECONDARY_TABLES); + SecondaryTablesAnnotation secondaryTables = (SecondaryTablesAnnotation) typeResource.getAnnotation(JPA.SECONDARY_TABLES); SecondaryTableAnnotation secondaryTable = secondaryTables.nestedAnnotationAt(0); assertEquals(2, secondaryTable.uniqueConstraintsSize()); @@ -316,7 +316,7 @@ public class SecondaryTablesTests extends JavaResourceModelTestCase { public void testAddUniqueConstraint() throws Exception { IType testType = this.createTestSecondaryTables(); JavaResourcePersistentType typeResource = buildJavaTypeResource(testType); - SecondaryTables secondaryTables = (SecondaryTables) typeResource.getAnnotation(JPA.SECONDARY_TABLES); + SecondaryTablesAnnotation secondaryTables = (SecondaryTablesAnnotation) typeResource.getAnnotation(JPA.SECONDARY_TABLES); SecondaryTableAnnotation secondaryTable = secondaryTables.nestedAnnotationAt(0); secondaryTable.addUniqueConstraint(0).addColumnName("FOO"); @@ -333,7 +333,7 @@ public class SecondaryTablesTests extends JavaResourceModelTestCase { public void testRemoveUniqueConstraint() throws Exception { IType testType = this.createTestSecondaryTableWithUniqueConstraints(); JavaResourcePersistentType typeResource = buildJavaTypeResource(testType); - SecondaryTables secondaryTables = (SecondaryTables) typeResource.getAnnotation(JPA.SECONDARY_TABLES); + SecondaryTablesAnnotation secondaryTables = (SecondaryTablesAnnotation) typeResource.getAnnotation(JPA.SECONDARY_TABLES); SecondaryTableAnnotation secondaryTable = secondaryTables.nestedAnnotationAt(0); secondaryTable.addUniqueConstraint(0).addColumnName("FOO"); @@ -350,7 +350,7 @@ public class SecondaryTablesTests extends JavaResourceModelTestCase { public void testMoveUniqueConstraint() throws Exception { IType testType = this.createTestSecondaryTableWithUniqueConstraints(); JavaResourcePersistentType typeResource = buildJavaTypeResource(testType); - SecondaryTables secondaryTables = (SecondaryTables) typeResource.getAnnotation(JPA.SECONDARY_TABLES); + SecondaryTablesAnnotation secondaryTables = (SecondaryTablesAnnotation) typeResource.getAnnotation(JPA.SECONDARY_TABLES); SecondaryTableAnnotation secondaryTable = secondaryTables.nestedAnnotationAt(0); secondaryTable.addUniqueConstraint(0).addColumnName("FOO"); @@ -368,7 +368,7 @@ public class SecondaryTablesTests extends JavaResourceModelTestCase { public void testMoveUniqueConstraint2() throws Exception { IType testType = this.createTestSecondaryTableWithUniqueConstraints(); JavaResourcePersistentType typeResource = buildJavaTypeResource(testType); - SecondaryTables secondaryTables = (SecondaryTables) typeResource.getAnnotation(JPA.SECONDARY_TABLES); + SecondaryTablesAnnotation secondaryTables = (SecondaryTablesAnnotation) typeResource.getAnnotation(JPA.SECONDARY_TABLES); SecondaryTableAnnotation secondaryTable = secondaryTables.nestedAnnotationAt(0); secondaryTable.addUniqueConstraint(0).addColumnName("FOO"); 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 e343b88e98..7fcad1f3e5 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 @@ -14,7 +14,7 @@ import org.eclipse.jdt.core.IType; import org.eclipse.jpt.core.resource.java.JPA; import org.eclipse.jpt.core.resource.java.JavaResourcePersistentAttribute; import org.eclipse.jpt.core.resource.java.JavaResourcePersistentType; -import org.eclipse.jpt.core.resource.java.Temporal; +import org.eclipse.jpt.core.resource.java.TemporalAnnotation; import org.eclipse.jpt.core.resource.java.TemporalType; import org.eclipse.jpt.utility.internal.iterators.ArrayIterator; @@ -59,7 +59,7 @@ public class TemporalTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(testType); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - Temporal temporal = (Temporal) attributeResource.getAnnotation(JPA.TEMPORAL); + TemporalAnnotation temporal = (TemporalAnnotation) attributeResource.getAnnotation(JPA.TEMPORAL); assertNotNull(temporal); } @@ -68,7 +68,7 @@ public class TemporalTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(testType); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - Temporal temporal = (Temporal) attributeResource.getAnnotation(JPA.TEMPORAL); + TemporalAnnotation temporal = (TemporalAnnotation) attributeResource.getAnnotation(JPA.TEMPORAL); assertEquals(TemporalType.DATE, temporal.getValue()); } @@ -77,7 +77,7 @@ public class TemporalTests extends JavaResourceModelTestCase { JavaResourcePersistentType typeResource = buildJavaTypeResource(testType); JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); - Temporal temporal = (Temporal) attributeResource.getAnnotation(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 17cf389788..141ed87d81 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 @@ -15,7 +15,7 @@ import org.eclipse.jpt.core.resource.java.JPA; import org.eclipse.jpt.core.resource.java.JavaResourceNode; import org.eclipse.jpt.core.resource.java.JavaResourcePersistentAttribute; import org.eclipse.jpt.core.resource.java.JavaResourcePersistentType; -import org.eclipse.jpt.core.resource.java.Transient; +import org.eclipse.jpt.core.resource.java.TransientAnnotation; import org.eclipse.jpt.utility.internal.iterators.ArrayIterator; public class TransientTests extends JavaResourceModelTestCase { @@ -44,7 +44,7 @@ public class TransientTests extends JavaResourceModelTestCase { JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); JavaResourceNode mappingAnnotation = attributeResource.getMappingAnnotation(); - assertTrue(mappingAnnotation instanceof Transient); + 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 f6bbed5b45..46a5579a71 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 @@ -15,7 +15,7 @@ import org.eclipse.jpt.core.resource.java.JPA; import org.eclipse.jpt.core.resource.java.JavaResourceNode; import org.eclipse.jpt.core.resource.java.JavaResourcePersistentAttribute; import org.eclipse.jpt.core.resource.java.JavaResourcePersistentType; -import org.eclipse.jpt.core.resource.java.Version; +import org.eclipse.jpt.core.resource.java.VersionAnnotation; import org.eclipse.jpt.utility.internal.iterators.ArrayIterator; public class VersionTests extends JavaResourceModelTestCase { @@ -44,6 +44,6 @@ public class VersionTests extends JavaResourceModelTestCase { JavaResourcePersistentAttribute attributeResource = typeResource.fields().next(); JavaResourceNode mappingAnnotation = attributeResource.getMappingAnnotation(); - assertTrue(mappingAnnotation instanceof Version); + assertTrue(mappingAnnotation instanceof VersionAnnotation); } } |