Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbvosburgh2012-03-08 00:00:04 +0000
committerbvosburgh2012-03-08 00:00:04 +0000
commit09789fe56dd933bdca86683f0d696a6d2b912ad8 (patch)
treefa17f6976d109b945245af908074929eaeb2f742 /jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa
parent54a77902ae5cb01c9ce91b989ee0b1c48dbb6b44 (diff)
downloadwebtools.dali-09789fe56dd933bdca86683f0d696a6d2b912ad8.tar.gz
webtools.dali-09789fe56dd933bdca86683f0d696a6d2b912ad8.tar.xz
webtools.dali-09789fe56dd933bdca86683f0d696a6d2b912ad8.zip
cache resource annotation text ranges
Diffstat (limited to 'jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa')
-rw-r--r--jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaBasicMappingTests.java52
-rw-r--r--jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaIdMappingTests.java58
-rw-r--r--jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaVersionMappingTests.java58
-rw-r--r--jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/GenericOrmPersistentTypeTests.java6
-rw-r--r--jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmBasicMappingTests.java78
-rw-r--r--jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmIdMappingTests.java62
-rw-r--r--jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmVersionMappingTests.java62
-rw-r--r--jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/java/GenericJavaBasicMapping2_0Tests.java24
-rw-r--r--jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/java/GenericJavaElementCollectionMapping2_0Tests.java24
-rw-r--r--jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/java/GenericJavaIdMapping2_0Tests.java54
-rw-r--r--jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/java/GenericJavaManyToManyMapping2_0Tests.java24
-rw-r--r--jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/java/GenericJavaOneToManyMapping2_0Tests.java24
-rw-r--r--jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/java/GenericJavaVersionMapping2_0Tests.java54
-rw-r--r--jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/orm/GenericOrmElementCollectionMapping2_0Tests.java34
-rw-r--r--jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/orm/GenericOrmManyToManyMapping2_0Tests.java53
-rw-r--r--jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/orm/GenericOrmOneToManyMapping2_0Tests.java52
16 files changed, 359 insertions, 360 deletions
diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaBasicMappingTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaBasicMappingTests.java
index d247f2f4b2..4675a60f81 100644
--- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaBasicMappingTests.java
+++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaBasicMappingTests.java
@@ -24,7 +24,7 @@ import org.eclipse.jpt.jpa.core.context.BasicMapping;
import org.eclipse.jpt.jpa.core.context.EmbeddedIdMapping;
import org.eclipse.jpt.jpa.core.context.EmbeddedMapping;
import org.eclipse.jpt.jpa.core.context.EnumType;
-import org.eclipse.jpt.jpa.core.context.EnumeratedConverter;
+import org.eclipse.jpt.jpa.core.context.BaseEnumeratedConverter;
import org.eclipse.jpt.jpa.core.context.FetchType;
import org.eclipse.jpt.jpa.core.context.IdMapping;
import org.eclipse.jpt.jpa.core.context.LobConverter;
@@ -33,7 +33,7 @@ import org.eclipse.jpt.jpa.core.context.ManyToOneMapping;
import org.eclipse.jpt.jpa.core.context.OneToManyMapping;
import org.eclipse.jpt.jpa.core.context.OneToOneMapping;
import org.eclipse.jpt.jpa.core.context.PersistentAttribute;
-import org.eclipse.jpt.jpa.core.context.TemporalConverter;
+import org.eclipse.jpt.jpa.core.context.BaseTemporalConverter;
import org.eclipse.jpt.jpa.core.context.TemporalType;
import org.eclipse.jpt.jpa.core.context.TransientMapping;
import org.eclipse.jpt.jpa.core.context.VersionMapping;
@@ -323,8 +323,8 @@ public class JavaBasicMappingTests extends ContextModelTestCase
JavaResourceField resourceField = resourceType.getFields().iterator().next();
assertFalse(basicMapping.isDefault());
basicMapping.getColumn().setSpecifiedName("FOO");
- basicMapping.setConverter(EnumeratedConverter.class);
- ((EnumeratedConverter) basicMapping.getConverter()).setSpecifiedEnumType(EnumType.STRING);
+ basicMapping.setConverter(BaseEnumeratedConverter.class);
+ ((BaseEnumeratedConverter) basicMapping.getConverter()).setSpecifiedEnumType(EnumType.STRING);
resourceField.addAnnotation(LobAnnotation.ANNOTATION_NAME);
resourceField.addAnnotation(TemporalAnnotation.ANNOTATION_NAME);
basicMapping.setSpecifiedFetch(FetchType.EAGER);
@@ -333,7 +333,7 @@ public class JavaBasicMappingTests extends ContextModelTestCase
persistentAttribute.setMappingKey(MappingKeys.NULL_ATTRIBUTE_MAPPING_KEY);
assertEquals("FOO", ((BasicMapping) persistentAttribute.getMapping()).getColumn().getSpecifiedName());
- assertEquals(EnumType.STRING, ((EnumeratedConverter) ((BasicMapping) persistentAttribute.getMapping()).getConverter()).getEnumType());
+ assertEquals(EnumType.STRING, ((BaseEnumeratedConverter) ((BasicMapping) persistentAttribute.getMapping()).getConverter()).getEnumType());
assertNull(((BasicMapping) persistentAttribute.getMapping()).getSpecifiedFetch());
assertNull(((BasicMapping) persistentAttribute.getMapping()).getSpecifiedOptional());
@@ -354,8 +354,8 @@ public class JavaBasicMappingTests extends ContextModelTestCase
JavaResourceField resourceField = resourceType.getFields().iterator().next();
assertFalse(basicMapping.isDefault());
basicMapping.getColumn().setSpecifiedName("FOO");
- basicMapping.setConverter(TemporalConverter.class);
- ((TemporalConverter) basicMapping.getConverter()).setTemporalType(TemporalType.TIME);
+ basicMapping.setConverter(BaseTemporalConverter.class);
+ ((BaseTemporalConverter) basicMapping.getConverter()).setTemporalType(TemporalType.TIME);
resourceField.addAnnotation(LobAnnotation.ANNOTATION_NAME);
resourceField.addAnnotation(EnumeratedAnnotation.ANNOTATION_NAME);
basicMapping.setSpecifiedFetch(FetchType.EAGER);
@@ -364,7 +364,7 @@ public class JavaBasicMappingTests extends ContextModelTestCase
persistentAttribute.setMappingKey(MappingKeys.ID_ATTRIBUTE_MAPPING_KEY);
assertEquals("FOO", ((IdMapping) persistentAttribute.getMapping()).getColumn().getSpecifiedName());
- assertEquals(TemporalType.TIME, ((TemporalConverter) ((IdMapping) persistentAttribute.getMapping()).getConverter()).getTemporalType());
+ assertEquals(TemporalType.TIME, ((BaseTemporalConverter) ((IdMapping) persistentAttribute.getMapping()).getConverter()).getTemporalType());
assertNull(resourceField.getAnnotation(BasicAnnotation.ANNOTATION_NAME));
assertNotNull(resourceField.getAnnotation(IdAnnotation.ANNOTATION_NAME));
@@ -384,15 +384,15 @@ public class JavaBasicMappingTests extends ContextModelTestCase
JavaResourceField resourceField = resourceType.getFields().iterator().next();
assertFalse(basicMapping.isDefault());
basicMapping.getColumn().setSpecifiedName("FOO");
- basicMapping.setConverter(TemporalConverter.class);
- ((TemporalConverter) basicMapping.getConverter()).setTemporalType(TemporalType.TIME);
+ basicMapping.setConverter(BaseTemporalConverter.class);
+ ((BaseTemporalConverter) basicMapping.getConverter()).setTemporalType(TemporalType.TIME);
resourceField.addAnnotation(LobAnnotation.ANNOTATION_NAME);
resourceField.addAnnotation(EnumeratedAnnotation.ANNOTATION_NAME);
assertFalse(basicMapping.isDefault());
persistentAttribute.setMappingKey(MappingKeys.VERSION_ATTRIBUTE_MAPPING_KEY);
assertEquals("FOO", ((VersionMapping) persistentAttribute.getMapping()).getColumn().getSpecifiedName());
- assertEquals(TemporalType.TIME, ((TemporalConverter) ((VersionMapping) persistentAttribute.getMapping()).getConverter()).getTemporalType());
+ assertEquals(TemporalType.TIME, ((BaseTemporalConverter) ((VersionMapping) persistentAttribute.getMapping()).getConverter()).getTemporalType());
assertNull(resourceField.getAnnotation(BasicAnnotation.ANNOTATION_NAME));
assertNotNull(resourceField.getAnnotation(VersionAnnotation.ANNOTATION_NAME));
@@ -829,11 +829,11 @@ public class JavaBasicMappingTests extends ContextModelTestCase
JavaResourceField resourceField = resourceType.getFields().iterator().next();
EnumeratedAnnotation enumeratedAnnotation = (EnumeratedAnnotation) resourceField.addAnnotation(EnumeratedAnnotation.ANNOTATION_NAME);
getJpaProject().synchronizeContextModel();
- assertEquals(EnumType.ORDINAL, ((EnumeratedConverter) basicMapping.getConverter()).getDefaultEnumType());
+ assertEquals(EnumType.ORDINAL, ((BaseEnumeratedConverter) basicMapping.getConverter()).getDefaultEnumType());
enumeratedAnnotation.setValue(org.eclipse.jpt.jpa.core.resource.java.EnumType.STRING);
getJpaProject().synchronizeContextModel();
- assertEquals(EnumType.STRING, ((EnumeratedConverter) basicMapping.getConverter()).getSpecifiedEnumType());
+ assertEquals(EnumType.STRING, ((BaseEnumeratedConverter) basicMapping.getConverter()).getSpecifiedEnumType());
}
public void testGetSpecifiedEnumerated() throws Exception {
@@ -843,7 +843,7 @@ public class JavaBasicMappingTests extends ContextModelTestCase
PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next();
BasicMapping basicMapping = (BasicMapping) persistentAttribute.getMapping();
- assertEquals(EnumType.STRING, ((EnumeratedConverter) basicMapping.getConverter()).getSpecifiedEnumType());
+ assertEquals(EnumType.STRING, ((BaseEnumeratedConverter) basicMapping.getConverter()).getSpecifiedEnumType());
}
public void testSetSpecifiedEnumerated() throws Exception {
@@ -854,7 +854,7 @@ public class JavaBasicMappingTests extends ContextModelTestCase
BasicMapping basicMapping = (BasicMapping) persistentAttribute.getMapping();
assertNull(basicMapping.getConverter().getType());
- basicMapping.setConverter(EnumeratedConverter.class);
+ basicMapping.setConverter(BaseEnumeratedConverter.class);
JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE);
JavaResourceField resourceField = resourceType.getFields().iterator().next();
@@ -863,10 +863,10 @@ public class JavaBasicMappingTests extends ContextModelTestCase
assertNotNull(enumerated);
assertEquals(null, enumerated.getValue());
- ((EnumeratedConverter) basicMapping.getConverter()).setSpecifiedEnumType(EnumType.STRING);
+ ((BaseEnumeratedConverter) basicMapping.getConverter()).setSpecifiedEnumType(EnumType.STRING);
assertEquals(org.eclipse.jpt.jpa.core.resource.java.EnumType.STRING, enumerated.getValue());
- ((EnumeratedConverter) basicMapping.getConverter()).setSpecifiedEnumType(null);
+ ((BaseEnumeratedConverter) basicMapping.getConverter()).setSpecifiedEnumType(null);
assertNotNull(resourceField.getAnnotation(EnumeratedAnnotation.ANNOTATION_NAME));
assertNull(enumerated.getValue());
@@ -890,12 +890,12 @@ public class JavaBasicMappingTests extends ContextModelTestCase
enumerated.setValue(org.eclipse.jpt.jpa.core.resource.java.EnumType.STRING);
getJpaProject().synchronizeContextModel();
- assertEquals(EnumType.STRING, ((EnumeratedConverter) basicMapping.getConverter()).getSpecifiedEnumType());
+ assertEquals(EnumType.STRING, ((BaseEnumeratedConverter) basicMapping.getConverter()).getSpecifiedEnumType());
enumerated.setValue(null);
getJpaProject().synchronizeContextModel();
assertNotNull(resourceField.getAnnotation(EnumeratedAnnotation.ANNOTATION_NAME));
- assertNull(((EnumeratedConverter) basicMapping.getConverter()).getSpecifiedEnumType());
+ assertNull(((BaseEnumeratedConverter) basicMapping.getConverter()).getSpecifiedEnumType());
assertFalse(basicMapping.isDefault());
assertSame(basicMapping, persistentAttribute.getMapping());
}
@@ -912,7 +912,7 @@ public class JavaBasicMappingTests extends ContextModelTestCase
PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next();
BasicMapping basicMapping = (BasicMapping) persistentAttribute.getMapping();
- assertEquals(TemporalConverter.class, basicMapping.getConverter().getType());
+ assertEquals(BaseTemporalConverter.class, basicMapping.getConverter().getType());
}
public void testGetTemporal2() throws Exception {
@@ -922,8 +922,8 @@ public class JavaBasicMappingTests extends ContextModelTestCase
PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next();
BasicMapping basicMapping = (BasicMapping) persistentAttribute.getMapping();
- assertEquals(TemporalConverter.class, basicMapping.getConverter().getType());
- assertEquals(TemporalType.TIMESTAMP, ((TemporalConverter) basicMapping.getConverter()).getTemporalType());
+ assertEquals(BaseTemporalConverter.class, basicMapping.getConverter().getType());
+ assertEquals(TemporalType.TIMESTAMP, ((BaseTemporalConverter) basicMapping.getConverter()).getTemporalType());
}
public void testSetTemporal() throws Exception {
@@ -934,8 +934,8 @@ public class JavaBasicMappingTests extends ContextModelTestCase
BasicMapping basicMapping = (BasicMapping) persistentAttribute.getMapping();
assertNull(basicMapping.getConverter().getType());
- basicMapping.setConverter(TemporalConverter.class);
- ((TemporalConverter) basicMapping.getConverter()).setTemporalType(TemporalType.TIME);
+ basicMapping.setConverter(BaseTemporalConverter.class);
+ ((BaseTemporalConverter) basicMapping.getConverter()).setTemporalType(TemporalType.TIME);
JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE);
JavaResourceField resourceField = resourceType.getFields().iterator().next();
@@ -963,8 +963,8 @@ public class JavaBasicMappingTests extends ContextModelTestCase
temporal.setValue(org.eclipse.jpt.jpa.core.resource.java.TemporalType.DATE);
getJpaProject().synchronizeContextModel();
- assertEquals(TemporalConverter.class, basicMapping.getConverter().getType());
- assertEquals(TemporalType.DATE, ((TemporalConverter) basicMapping.getConverter()).getTemporalType());
+ assertEquals(BaseTemporalConverter.class, basicMapping.getConverter().getType());
+ assertEquals(TemporalType.DATE, ((BaseTemporalConverter) basicMapping.getConverter()).getTemporalType());
resourceField.removeAnnotation(TemporalAnnotation.ANNOTATION_NAME);
getJpaProject().synchronizeContextModel();
diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaIdMappingTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaIdMappingTests.java
index 38c7d85056..cb24daae2b 100644
--- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaIdMappingTests.java
+++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaIdMappingTests.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007, 2011 Oracle. All rights reserved.
+ * Copyright (c) 2007, 2012 Oracle. All rights reserved.
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0, which accompanies this distribution
* and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -25,7 +25,7 @@ import org.eclipse.jpt.jpa.core.context.ManyToOneMapping;
import org.eclipse.jpt.jpa.core.context.OneToManyMapping;
import org.eclipse.jpt.jpa.core.context.OneToOneMapping;
import org.eclipse.jpt.jpa.core.context.PersistentAttribute;
-import org.eclipse.jpt.jpa.core.context.TemporalConverter;
+import org.eclipse.jpt.jpa.core.context.BaseTemporalConverter;
import org.eclipse.jpt.jpa.core.context.TemporalType;
import org.eclipse.jpt.jpa.core.context.TransientMapping;
import org.eclipse.jpt.jpa.core.context.VersionMapping;
@@ -119,8 +119,8 @@ public class JavaIdMappingTests extends ContextModelTestCase
IdMapping idMapping = (IdMapping) persistentAttribute.getMapping();
assertFalse(idMapping.isDefault());
idMapping.getColumn().setSpecifiedName("FOO");
- idMapping.setConverter(TemporalConverter.class);
- ((TemporalConverter) idMapping.getConverter()).setTemporalType(TemporalType.TIME);
+ idMapping.setConverter(BaseTemporalConverter.class);
+ ((BaseTemporalConverter) idMapping.getConverter()).setTemporalType(TemporalType.TIME);
idMapping.addGeneratedValue();
idMapping.getGeneratorContainer().addTableGenerator();
idMapping.getGeneratorContainer().addSequenceGenerator();
@@ -128,7 +128,7 @@ public class JavaIdMappingTests extends ContextModelTestCase
persistentAttribute.setMappingKey(MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY);
assertEquals("FOO", ((BasicMapping) persistentAttribute.getMapping()).getColumn().getSpecifiedName());
- assertEquals(TemporalType.TIME, ((TemporalConverter) ((BasicMapping) persistentAttribute.getMapping()).getConverter()).getTemporalType());
+ assertEquals(TemporalType.TIME, ((BaseTemporalConverter) ((BasicMapping) persistentAttribute.getMapping()).getConverter()).getTemporalType());
JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE);
JavaResourceField resourceField = resourceType.getFields().iterator().next();
@@ -149,8 +149,8 @@ public class JavaIdMappingTests extends ContextModelTestCase
IdMapping idMapping = (IdMapping) persistentAttribute.getMapping();
assertFalse(idMapping.isDefault());
idMapping.getColumn().setSpecifiedName("FOO");
- idMapping.setConverter(TemporalConverter.class);
- ((TemporalConverter) idMapping.getConverter()).setTemporalType(TemporalType.TIME);
+ idMapping.setConverter(BaseTemporalConverter.class);
+ ((BaseTemporalConverter) idMapping.getConverter()).setTemporalType(TemporalType.TIME);
idMapping.addGeneratedValue();
idMapping.getGeneratorContainer().addTableGenerator();
idMapping.getGeneratorContainer().addSequenceGenerator();
@@ -158,7 +158,7 @@ public class JavaIdMappingTests extends ContextModelTestCase
persistentAttribute.setMappingKey(MappingKeys.NULL_ATTRIBUTE_MAPPING_KEY);
assertEquals("FOO", ((BasicMapping) persistentAttribute.getMapping()).getColumn().getSpecifiedName());
- assertEquals(TemporalType.TIME, ((TemporalConverter) ((BasicMapping) persistentAttribute.getMapping()).getConverter()).getTemporalType());
+ assertEquals(TemporalType.TIME, ((BaseTemporalConverter) ((BasicMapping) persistentAttribute.getMapping()).getConverter()).getTemporalType());
JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE);
JavaResourceField resourceField = resourceType.getFields().iterator().next();
@@ -178,8 +178,8 @@ public class JavaIdMappingTests extends ContextModelTestCase
IdMapping idMapping = (IdMapping) persistentAttribute.getMapping();
assertFalse(idMapping.isDefault());
idMapping.getColumn().setSpecifiedName("FOO");
- idMapping.setConverter(TemporalConverter.class);
- ((TemporalConverter) idMapping.getConverter()).setTemporalType(TemporalType.TIME);
+ idMapping.setConverter(BaseTemporalConverter.class);
+ ((BaseTemporalConverter) idMapping.getConverter()).setTemporalType(TemporalType.TIME);
idMapping.addGeneratedValue();
idMapping.getGeneratorContainer().addTableGenerator();
idMapping.getGeneratorContainer().addSequenceGenerator();
@@ -187,7 +187,7 @@ public class JavaIdMappingTests extends ContextModelTestCase
persistentAttribute.setMappingKey(MappingKeys.VERSION_ATTRIBUTE_MAPPING_KEY);
assertEquals("FOO", ((VersionMapping) persistentAttribute.getMapping()).getColumn().getSpecifiedName());
- assertEquals(TemporalType.TIME, ((TemporalConverter) ((VersionMapping) persistentAttribute.getMapping()).getConverter()).getTemporalType());
+ assertEquals(TemporalType.TIME, ((BaseTemporalConverter) ((VersionMapping) persistentAttribute.getMapping()).getConverter()).getTemporalType());
JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE);
JavaResourceField resourceField = resourceType.getFields().iterator().next();
@@ -208,8 +208,8 @@ public class JavaIdMappingTests extends ContextModelTestCase
IdMapping idMapping = (IdMapping) persistentAttribute.getMapping();
assertFalse(idMapping.isDefault());
idMapping.getColumn().setSpecifiedName("FOO");
- idMapping.setConverter(TemporalConverter.class);
- ((TemporalConverter) idMapping.getConverter()).setTemporalType(TemporalType.TIME);
+ idMapping.setConverter(BaseTemporalConverter.class);
+ ((BaseTemporalConverter) idMapping.getConverter()).setTemporalType(TemporalType.TIME);
idMapping.addGeneratedValue();
idMapping.getGeneratorContainer().addTableGenerator();
idMapping.getGeneratorContainer().addSequenceGenerator();
@@ -237,8 +237,8 @@ public class JavaIdMappingTests extends ContextModelTestCase
IdMapping idMapping = (IdMapping) persistentAttribute.getMapping();
assertFalse(idMapping.isDefault());
idMapping.getColumn().setSpecifiedName("FOO");
- idMapping.setConverter(TemporalConverter.class);
- ((TemporalConverter) idMapping.getConverter()).setTemporalType(TemporalType.TIME);
+ idMapping.setConverter(BaseTemporalConverter.class);
+ ((BaseTemporalConverter) idMapping.getConverter()).setTemporalType(TemporalType.TIME);
idMapping.addGeneratedValue();
idMapping.getGeneratorContainer().addTableGenerator();
idMapping.getGeneratorContainer().addSequenceGenerator();
@@ -266,8 +266,8 @@ public class JavaIdMappingTests extends ContextModelTestCase
IdMapping idMapping = (IdMapping) persistentAttribute.getMapping();
assertFalse(idMapping.isDefault());
idMapping.getColumn().setSpecifiedName("FOO");
- idMapping.setConverter(TemporalConverter.class);
- ((TemporalConverter) idMapping.getConverter()).setTemporalType(TemporalType.TIME);
+ idMapping.setConverter(BaseTemporalConverter.class);
+ ((BaseTemporalConverter) idMapping.getConverter()).setTemporalType(TemporalType.TIME);
idMapping.addGeneratedValue();
idMapping.getGeneratorContainer().addTableGenerator();
idMapping.getGeneratorContainer().addSequenceGenerator();
@@ -295,8 +295,8 @@ public class JavaIdMappingTests extends ContextModelTestCase
IdMapping idMapping = (IdMapping) persistentAttribute.getMapping();
assertFalse(idMapping.isDefault());
idMapping.getColumn().setSpecifiedName("FOO");
- idMapping.setConverter(TemporalConverter.class);
- ((TemporalConverter) idMapping.getConverter()).setTemporalType(TemporalType.TIME);
+ idMapping.setConverter(BaseTemporalConverter.class);
+ ((BaseTemporalConverter) idMapping.getConverter()).setTemporalType(TemporalType.TIME);
idMapping.addGeneratedValue();
idMapping.getGeneratorContainer().addTableGenerator();
idMapping.getGeneratorContainer().addSequenceGenerator();
@@ -324,8 +324,8 @@ public class JavaIdMappingTests extends ContextModelTestCase
IdMapping idMapping = (IdMapping) persistentAttribute.getMapping();
assertFalse(idMapping.isDefault());
idMapping.getColumn().setSpecifiedName("FOO");
- idMapping.setConverter(TemporalConverter.class);
- ((TemporalConverter) idMapping.getConverter()).setTemporalType(TemporalType.TIME);
+ idMapping.setConverter(BaseTemporalConverter.class);
+ ((BaseTemporalConverter) idMapping.getConverter()).setTemporalType(TemporalType.TIME);
idMapping.addGeneratedValue();
idMapping.getGeneratorContainer().addTableGenerator();
idMapping.getGeneratorContainer().addSequenceGenerator();
@@ -353,8 +353,8 @@ public class JavaIdMappingTests extends ContextModelTestCase
IdMapping idMapping = (IdMapping) persistentAttribute.getMapping();
assertFalse(idMapping.isDefault());
idMapping.getColumn().setSpecifiedName("FOO");
- idMapping.setConverter(TemporalConverter.class);
- ((TemporalConverter) idMapping.getConverter()).setTemporalType(TemporalType.TIME);
+ idMapping.setConverter(BaseTemporalConverter.class);
+ ((BaseTemporalConverter) idMapping.getConverter()).setTemporalType(TemporalType.TIME);
idMapping.addGeneratedValue();
idMapping.getGeneratorContainer().addTableGenerator();
idMapping.getGeneratorContainer().addSequenceGenerator();
@@ -382,8 +382,8 @@ public class JavaIdMappingTests extends ContextModelTestCase
IdMapping idMapping = (IdMapping) persistentAttribute.getMapping();
assertFalse(idMapping.isDefault());
idMapping.getColumn().setSpecifiedName("FOO");
- idMapping.setConverter(TemporalConverter.class);
- ((TemporalConverter) idMapping.getConverter()).setTemporalType(TemporalType.TIME);
+ idMapping.setConverter(BaseTemporalConverter.class);
+ ((BaseTemporalConverter) idMapping.getConverter()).setTemporalType(TemporalType.TIME);
idMapping.addGeneratedValue();
idMapping.getGeneratorContainer().addTableGenerator();
idMapping.getGeneratorContainer().addSequenceGenerator();
@@ -410,7 +410,7 @@ public class JavaIdMappingTests extends ContextModelTestCase
PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next();
IdMapping idMapping = (IdMapping) persistentAttribute.getMapping();
- assertEquals(TemporalType.TIMESTAMP, ((TemporalConverter) idMapping.getConverter()).getTemporalType());
+ assertEquals(TemporalType.TIMESTAMP, ((BaseTemporalConverter) idMapping.getConverter()).getTemporalType());
}
public void testSetTemporal() throws Exception {
@@ -421,8 +421,8 @@ public class JavaIdMappingTests extends ContextModelTestCase
IdMapping idMapping = (IdMapping) persistentAttribute.getMapping();
assertNull(idMapping.getConverter().getType());
- idMapping.setConverter(TemporalConverter.class);
- ((TemporalConverter) idMapping.getConverter()).setTemporalType(TemporalType.TIME);
+ idMapping.setConverter(BaseTemporalConverter.class);
+ ((BaseTemporalConverter) idMapping.getConverter()).setTemporalType(TemporalType.TIME);
JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE);
JavaResourceField resourceField = resourceType.getFields().iterator().next();
@@ -450,7 +450,7 @@ public class JavaIdMappingTests extends ContextModelTestCase
temporal.setValue(org.eclipse.jpt.jpa.core.resource.java.TemporalType.DATE);
getJpaProject().synchronizeContextModel();
- assertEquals(TemporalType.DATE, ((TemporalConverter) idMapping.getConverter()).getTemporalType());
+ assertEquals(TemporalType.DATE, ((BaseTemporalConverter) idMapping.getConverter()).getTemporalType());
resourceField.removeAnnotation(TemporalAnnotation.ANNOTATION_NAME);
getJpaProject().synchronizeContextModel();
diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaVersionMappingTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaVersionMappingTests.java
index ddf1b927f4..5c42e01a02 100644
--- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaVersionMappingTests.java
+++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaVersionMappingTests.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007, 2011 Oracle. All rights reserved.
+ * Copyright (c) 2007, 2012 Oracle. All rights reserved.
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0, which accompanies this distribution
* and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -25,7 +25,7 @@ import org.eclipse.jpt.jpa.core.context.ManyToOneMapping;
import org.eclipse.jpt.jpa.core.context.OneToManyMapping;
import org.eclipse.jpt.jpa.core.context.OneToOneMapping;
import org.eclipse.jpt.jpa.core.context.PersistentAttribute;
-import org.eclipse.jpt.jpa.core.context.TemporalConverter;
+import org.eclipse.jpt.jpa.core.context.BaseTemporalConverter;
import org.eclipse.jpt.jpa.core.context.TemporalType;
import org.eclipse.jpt.jpa.core.context.TransientMapping;
import org.eclipse.jpt.jpa.core.context.VersionMapping;
@@ -96,13 +96,13 @@ public class JavaVersionMappingTests extends ContextModelTestCase
VersionMapping versionMapping = (VersionMapping) persistentAttribute.getMapping();
assertFalse(versionMapping.isDefault());
versionMapping.getColumn().setSpecifiedName("FOO");
- versionMapping.setConverter(TemporalConverter.class);
- ((TemporalConverter) versionMapping.getConverter()).setTemporalType(TemporalType.TIME);
+ versionMapping.setConverter(BaseTemporalConverter.class);
+ ((BaseTemporalConverter) versionMapping.getConverter()).setTemporalType(TemporalType.TIME);
assertFalse(versionMapping.isDefault());
persistentAttribute.setMappingKey(MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY);
assertEquals("FOO", ((BasicMapping) persistentAttribute.getMapping()).getColumn().getSpecifiedName());
- assertEquals(TemporalType.TIME, ((TemporalConverter) ((BasicMapping) persistentAttribute.getMapping()).getConverter()).getTemporalType());
+ assertEquals(TemporalType.TIME, ((BaseTemporalConverter) ((BasicMapping) persistentAttribute.getMapping()).getConverter()).getTemporalType());
JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE);
JavaResourceField resourceField = resourceType.getFields().iterator().next();
@@ -120,13 +120,13 @@ public class JavaVersionMappingTests extends ContextModelTestCase
VersionMapping versionMapping = (VersionMapping) persistentAttribute.getMapping();
assertFalse(versionMapping.isDefault());
versionMapping.getColumn().setSpecifiedName("FOO");
- versionMapping.setConverter(TemporalConverter.class);
- ((TemporalConverter) versionMapping.getConverter()).setTemporalType(TemporalType.TIME);
+ versionMapping.setConverter(BaseTemporalConverter.class);
+ ((BaseTemporalConverter) versionMapping.getConverter()).setTemporalType(TemporalType.TIME);
assertFalse(versionMapping.isDefault());
persistentAttribute.setMappingKey(MappingKeys.NULL_ATTRIBUTE_MAPPING_KEY);
assertEquals("FOO", ((BasicMapping) persistentAttribute.getMapping()).getColumn().getSpecifiedName());
- assertEquals(TemporalType.TIME, ((TemporalConverter) ((BasicMapping) persistentAttribute.getMapping()).getConverter()).getTemporalType());
+ assertEquals(TemporalType.TIME, ((BaseTemporalConverter) ((BasicMapping) persistentAttribute.getMapping()).getConverter()).getTemporalType());
JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE);
JavaResourceField resourceField = resourceType.getFields().iterator().next();
@@ -143,13 +143,13 @@ public class JavaVersionMappingTests extends ContextModelTestCase
VersionMapping versionMapping = (VersionMapping) persistentAttribute.getMapping();
assertFalse(versionMapping.isDefault());
versionMapping.getColumn().setSpecifiedName("FOO");
- versionMapping.setConverter(TemporalConverter.class);
- ((TemporalConverter) versionMapping.getConverter()).setTemporalType(TemporalType.TIME);
+ versionMapping.setConverter(BaseTemporalConverter.class);
+ ((BaseTemporalConverter) versionMapping.getConverter()).setTemporalType(TemporalType.TIME);
assertFalse(versionMapping.isDefault());
persistentAttribute.setMappingKey(MappingKeys.ID_ATTRIBUTE_MAPPING_KEY);
assertEquals("FOO", ((IdMapping) persistentAttribute.getMapping()).getColumn().getSpecifiedName());
- assertEquals(TemporalType.TIME, ((TemporalConverter) ((IdMapping) persistentAttribute.getMapping()).getConverter()).getTemporalType());
+ assertEquals(TemporalType.TIME, ((BaseTemporalConverter) ((IdMapping) persistentAttribute.getMapping()).getConverter()).getTemporalType());
JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE);
JavaResourceField resourceField = resourceType.getFields().iterator().next();
@@ -167,8 +167,8 @@ public class JavaVersionMappingTests extends ContextModelTestCase
VersionMapping versionMapping = (VersionMapping) persistentAttribute.getMapping();
assertFalse(versionMapping.isDefault());
versionMapping.getColumn().setSpecifiedName("FOO");
- versionMapping.setConverter(TemporalConverter.class);
- ((TemporalConverter) versionMapping.getConverter()).setTemporalType(TemporalType.TIME);
+ versionMapping.setConverter(BaseTemporalConverter.class);
+ ((BaseTemporalConverter) versionMapping.getConverter()).setTemporalType(TemporalType.TIME);
assertFalse(versionMapping.isDefault());
persistentAttribute.setMappingKey(MappingKeys.EMBEDDED_ATTRIBUTE_MAPPING_KEY);
@@ -190,8 +190,8 @@ public class JavaVersionMappingTests extends ContextModelTestCase
VersionMapping versionMapping = (VersionMapping) persistentAttribute.getMapping();
assertFalse(versionMapping.isDefault());
versionMapping.getColumn().setSpecifiedName("FOO");
- versionMapping.setConverter(TemporalConverter.class);
- ((TemporalConverter) versionMapping.getConverter()).setTemporalType(TemporalType.TIME);
+ versionMapping.setConverter(BaseTemporalConverter.class);
+ ((BaseTemporalConverter) versionMapping.getConverter()).setTemporalType(TemporalType.TIME);
assertFalse(versionMapping.isDefault());
persistentAttribute.setMappingKey(MappingKeys.TRANSIENT_ATTRIBUTE_MAPPING_KEY);
@@ -213,8 +213,8 @@ public class JavaVersionMappingTests extends ContextModelTestCase
VersionMapping versionMapping = (VersionMapping) persistentAttribute.getMapping();
assertFalse(versionMapping.isDefault());
versionMapping.getColumn().setSpecifiedName("FOO");
- versionMapping.setConverter(TemporalConverter.class);
- ((TemporalConverter) versionMapping.getConverter()).setTemporalType(TemporalType.TIME);
+ versionMapping.setConverter(BaseTemporalConverter.class);
+ ((BaseTemporalConverter) versionMapping.getConverter()).setTemporalType(TemporalType.TIME);
assertFalse(versionMapping.isDefault());
persistentAttribute.setMappingKey(MappingKeys.EMBEDDED_ID_ATTRIBUTE_MAPPING_KEY);
@@ -236,8 +236,8 @@ public class JavaVersionMappingTests extends ContextModelTestCase
VersionMapping versionMapping = (VersionMapping) persistentAttribute.getMapping();
assertFalse(versionMapping.isDefault());
versionMapping.getColumn().setSpecifiedName("FOO");
- versionMapping.setConverter(TemporalConverter.class);
- ((TemporalConverter) versionMapping.getConverter()).setTemporalType(TemporalType.TIME);
+ versionMapping.setConverter(BaseTemporalConverter.class);
+ ((BaseTemporalConverter) versionMapping.getConverter()).setTemporalType(TemporalType.TIME);
assertFalse(versionMapping.isDefault());
persistentAttribute.setMappingKey(MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY);
@@ -259,8 +259,8 @@ public class JavaVersionMappingTests extends ContextModelTestCase
VersionMapping versionMapping = (VersionMapping) persistentAttribute.getMapping();
assertFalse(versionMapping.isDefault());
versionMapping.getColumn().setSpecifiedName("FOO");
- versionMapping.setConverter(TemporalConverter.class);
- ((TemporalConverter) versionMapping.getConverter()).setTemporalType(TemporalType.TIME);
+ versionMapping.setConverter(BaseTemporalConverter.class);
+ ((BaseTemporalConverter) versionMapping.getConverter()).setTemporalType(TemporalType.TIME);
assertFalse(versionMapping.isDefault());
persistentAttribute.setMappingKey(MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY);
@@ -282,8 +282,8 @@ public class JavaVersionMappingTests extends ContextModelTestCase
VersionMapping versionMapping = (VersionMapping) persistentAttribute.getMapping();
assertFalse(versionMapping.isDefault());
versionMapping.getColumn().setSpecifiedName("FOO");
- versionMapping.setConverter(TemporalConverter.class);
- ((TemporalConverter) versionMapping.getConverter()).setTemporalType(TemporalType.TIME);
+ versionMapping.setConverter(BaseTemporalConverter.class);
+ ((BaseTemporalConverter) versionMapping.getConverter()).setTemporalType(TemporalType.TIME);
assertFalse(versionMapping.isDefault());
persistentAttribute.setMappingKey(MappingKeys.MANY_TO_ONE_ATTRIBUTE_MAPPING_KEY);
@@ -305,8 +305,8 @@ public class JavaVersionMappingTests extends ContextModelTestCase
VersionMapping versionMapping = (VersionMapping) persistentAttribute.getMapping();
assertFalse(versionMapping.isDefault());
versionMapping.getColumn().setSpecifiedName("FOO");
- versionMapping.setConverter(TemporalConverter.class);
- ((TemporalConverter) versionMapping.getConverter()).setTemporalType(TemporalType.TIME);
+ versionMapping.setConverter(BaseTemporalConverter.class);
+ ((BaseTemporalConverter) versionMapping.getConverter()).setTemporalType(TemporalType.TIME);
assertFalse(versionMapping.isDefault());
persistentAttribute.setMappingKey(MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY);
@@ -328,7 +328,7 @@ public class JavaVersionMappingTests extends ContextModelTestCase
PersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next();
VersionMapping versionMapping = (VersionMapping) persistentAttribute.getMapping();
- assertEquals(TemporalType.TIMESTAMP, ((TemporalConverter) versionMapping.getConverter()).getTemporalType());
+ assertEquals(TemporalType.TIMESTAMP, ((BaseTemporalConverter) versionMapping.getConverter()).getTemporalType());
}
public void testSetTemporal() throws Exception {
@@ -339,8 +339,8 @@ public class JavaVersionMappingTests extends ContextModelTestCase
VersionMapping versionMapping = (VersionMapping) persistentAttribute.getMapping();
assertNull(versionMapping.getConverter().getType());
- versionMapping.setConverter(TemporalConverter.class);
- ((TemporalConverter) versionMapping.getConverter()).setTemporalType(TemporalType.TIME);
+ versionMapping.setConverter(BaseTemporalConverter.class);
+ ((BaseTemporalConverter) versionMapping.getConverter()).setTemporalType(TemporalType.TIME);
JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE);
JavaResourceField resourceField = resourceType.getFields().iterator().next();
@@ -368,7 +368,7 @@ public class JavaVersionMappingTests extends ContextModelTestCase
temporal.setValue(org.eclipse.jpt.jpa.core.resource.java.TemporalType.DATE);
getJpaProject().synchronizeContextModel();
- assertEquals(TemporalType.DATE, ((TemporalConverter) versionMapping.getConverter()).getTemporalType());
+ assertEquals(TemporalType.DATE, ((BaseTemporalConverter) versionMapping.getConverter()).getTemporalType());
resourceField.removeAnnotation(TemporalAnnotation.ANNOTATION_NAME);
getJpaProject().synchronizeContextModel();
diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/GenericOrmPersistentTypeTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/GenericOrmPersistentTypeTests.java
index cfe190a4a2..639420c29d 100644
--- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/GenericOrmPersistentTypeTests.java
+++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/GenericOrmPersistentTypeTests.java
@@ -13,7 +13,7 @@ import java.util.Iterator;
import org.eclipse.jpt.common.core.tests.internal.projects.TestJavaProject.SourceWriter;
import org.eclipse.jpt.jpa.core.JptJpaCorePlugin;
import org.eclipse.jpt.jpa.core.MappingKeys;
-import org.eclipse.jpt.jpa.core.context.TemporalConverter;
+import org.eclipse.jpt.jpa.core.context.BaseTemporalConverter;
import org.eclipse.jpt.jpa.core.context.TemporalType;
import org.eclipse.jpt.jpa.core.context.java.JavaPersistentAttribute;
import org.eclipse.jpt.jpa.core.context.orm.OrmBasicMapping;
@@ -489,8 +489,8 @@ public class GenericOrmPersistentTypeTests extends ContextModelTestCase
attribute = employeePersistentType.addAttributeToXml(employeePersistentType.getAttributeNamed("startDate"), MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY);
attribute.getMapping().setName("name");
OrmPersistentAttribute startDateAttribute = employeePersistentType.addAttributeToXml(employeePersistentType.getAttributeNamed("startDate"), MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY);
- ((OrmBasicMapping) startDateAttribute.getMapping()).setConverter(TemporalConverter.class);
- ((TemporalConverter) ((OrmBasicMapping) startDateAttribute.getMapping()).getConverter()).setTemporalType(TemporalType.DATE);
+ ((OrmBasicMapping) startDateAttribute.getMapping()).setConverter(BaseTemporalConverter.class);
+ ((BaseTemporalConverter) ((OrmBasicMapping) startDateAttribute.getMapping()).getConverter()).setTemporalType(TemporalType.DATE);
OrmReadOnlyPersistentAttribute idAttribute = employeePersistentType.getAttributeNamed("id");
JavaPersistentAttribute javaPersistentAttribute = idAttribute.getJavaPersistentAttribute();
diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmBasicMappingTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmBasicMappingTests.java
index 65e40de006..90467e1087 100644
--- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmBasicMappingTests.java
+++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmBasicMappingTests.java
@@ -19,7 +19,7 @@ import org.eclipse.jpt.jpa.core.context.Column;
import org.eclipse.jpt.jpa.core.context.EmbeddedIdMapping;
import org.eclipse.jpt.jpa.core.context.EmbeddedMapping;
import org.eclipse.jpt.jpa.core.context.EnumType;
-import org.eclipse.jpt.jpa.core.context.EnumeratedConverter;
+import org.eclipse.jpt.jpa.core.context.BaseEnumeratedConverter;
import org.eclipse.jpt.jpa.core.context.FetchType;
import org.eclipse.jpt.jpa.core.context.IdMapping;
import org.eclipse.jpt.jpa.core.context.LobConverter;
@@ -27,7 +27,7 @@ import org.eclipse.jpt.jpa.core.context.ManyToManyMapping;
import org.eclipse.jpt.jpa.core.context.ManyToOneMapping;
import org.eclipse.jpt.jpa.core.context.OneToManyMapping;
import org.eclipse.jpt.jpa.core.context.OneToOneMapping;
-import org.eclipse.jpt.jpa.core.context.TemporalConverter;
+import org.eclipse.jpt.jpa.core.context.BaseTemporalConverter;
import org.eclipse.jpt.jpa.core.context.TemporalType;
import org.eclipse.jpt.jpa.core.context.TransientMapping;
import org.eclipse.jpt.jpa.core.context.VersionMapping;
@@ -188,11 +188,11 @@ public class OrmBasicMappingTests extends ContextModelTestCase
//set enumerated in the resource model, verify context model updated
basicResource.setEnumerated(org.eclipse.jpt.jpa.core.resource.orm.EnumType.ORDINAL);
- assertEquals(EnumType.ORDINAL, ((EnumeratedConverter) ormBasicMapping.getConverter()).getSpecifiedEnumType());
+ assertEquals(EnumType.ORDINAL, ((BaseEnumeratedConverter) ormBasicMapping.getConverter()).getSpecifiedEnumType());
assertEquals(org.eclipse.jpt.jpa.core.resource.orm.EnumType.ORDINAL, basicResource.getEnumerated());
basicResource.setEnumerated(org.eclipse.jpt.jpa.core.resource.orm.EnumType.STRING);
- assertEquals(EnumType.STRING, ((EnumeratedConverter) ormBasicMapping.getConverter()).getSpecifiedEnumType());
+ assertEquals(EnumType.STRING, ((BaseEnumeratedConverter) ormBasicMapping.getConverter()).getSpecifiedEnumType());
assertEquals(org.eclipse.jpt.jpa.core.resource.orm.EnumType.STRING, basicResource.getEnumerated());
//set enumerated to null in the resource model
@@ -212,14 +212,14 @@ public class OrmBasicMappingTests extends ContextModelTestCase
assertNull(basicResource.getEnumerated());
//set enumerated in the context model, verify resource model updated
- ormBasicMapping.setConverter(EnumeratedConverter.class);
- ((EnumeratedConverter) ormBasicMapping.getConverter()).setSpecifiedEnumType(EnumType.ORDINAL);
+ ormBasicMapping.setConverter(BaseEnumeratedConverter.class);
+ ((BaseEnumeratedConverter) ormBasicMapping.getConverter()).setSpecifiedEnumType(EnumType.ORDINAL);
assertEquals(org.eclipse.jpt.jpa.core.resource.orm.EnumType.ORDINAL, basicResource.getEnumerated());
- assertEquals(EnumType.ORDINAL, ((EnumeratedConverter) ormBasicMapping.getConverter()).getSpecifiedEnumType());
+ assertEquals(EnumType.ORDINAL, ((BaseEnumeratedConverter) ormBasicMapping.getConverter()).getSpecifiedEnumType());
- ((EnumeratedConverter) ormBasicMapping.getConverter()).setSpecifiedEnumType(EnumType.STRING);
+ ((BaseEnumeratedConverter) ormBasicMapping.getConverter()).setSpecifiedEnumType(EnumType.STRING);
assertEquals(org.eclipse.jpt.jpa.core.resource.orm.EnumType.STRING, basicResource.getEnumerated());
- assertEquals(EnumType.STRING, ((EnumeratedConverter) ormBasicMapping.getConverter()).getSpecifiedEnumType());
+ assertEquals(EnumType.STRING, ((BaseEnumeratedConverter) ormBasicMapping.getConverter()).getSpecifiedEnumType());
//set enumerated to null in the context model
ormBasicMapping.setConverter(null);
@@ -331,15 +331,15 @@ public class OrmBasicMappingTests extends ContextModelTestCase
//set temporal in the resource model, verify context model updated
basicResource.setTemporal(org.eclipse.jpt.jpa.core.resource.orm.TemporalType.DATE);
- assertEquals(TemporalType.DATE, ((TemporalConverter) ormBasicMapping.getConverter()).getTemporalType());
+ assertEquals(TemporalType.DATE, ((BaseTemporalConverter) ormBasicMapping.getConverter()).getTemporalType());
assertEquals(org.eclipse.jpt.jpa.core.resource.orm.TemporalType.DATE, basicResource.getTemporal());
basicResource.setTemporal(org.eclipse.jpt.jpa.core.resource.orm.TemporalType.TIME);
- assertEquals(TemporalType.TIME, ((TemporalConverter) ormBasicMapping.getConverter()).getTemporalType());
+ assertEquals(TemporalType.TIME, ((BaseTemporalConverter) ormBasicMapping.getConverter()).getTemporalType());
assertEquals(org.eclipse.jpt.jpa.core.resource.orm.TemporalType.TIME, basicResource.getTemporal());
basicResource.setTemporal(org.eclipse.jpt.jpa.core.resource.orm.TemporalType.TIMESTAMP);
- assertEquals(TemporalType.TIMESTAMP, ((TemporalConverter) ormBasicMapping.getConverter()).getTemporalType());
+ assertEquals(TemporalType.TIMESTAMP, ((BaseTemporalConverter) ormBasicMapping.getConverter()).getTemporalType());
assertEquals(org.eclipse.jpt.jpa.core.resource.orm.TemporalType.TIMESTAMP, basicResource.getTemporal());
//set temporal to null in the resource model
@@ -359,18 +359,18 @@ public class OrmBasicMappingTests extends ContextModelTestCase
assertNull(basicResource.getTemporal());
//set temporal in the context model, verify resource model updated
- ormBasicMapping.setConverter(TemporalConverter.class);
- ((TemporalConverter) ormBasicMapping.getConverter()).setTemporalType(TemporalType.DATE);
+ ormBasicMapping.setConverter(BaseTemporalConverter.class);
+ ((BaseTemporalConverter) ormBasicMapping.getConverter()).setTemporalType(TemporalType.DATE);
assertEquals(org.eclipse.jpt.jpa.core.resource.orm.TemporalType.DATE, basicResource.getTemporal());
- assertEquals(TemporalType.DATE, ((TemporalConverter) ormBasicMapping.getConverter()).getTemporalType());
+ assertEquals(TemporalType.DATE, ((BaseTemporalConverter) ormBasicMapping.getConverter()).getTemporalType());
- ((TemporalConverter) ormBasicMapping.getConverter()).setTemporalType(TemporalType.TIME);
+ ((BaseTemporalConverter) ormBasicMapping.getConverter()).setTemporalType(TemporalType.TIME);
assertEquals(org.eclipse.jpt.jpa.core.resource.orm.TemporalType.TIME, basicResource.getTemporal());
- assertEquals(TemporalType.TIME, ((TemporalConverter) ormBasicMapping.getConverter()).getTemporalType());
+ assertEquals(TemporalType.TIME, ((BaseTemporalConverter) ormBasicMapping.getConverter()).getTemporalType());
- ((TemporalConverter) ormBasicMapping.getConverter()).setTemporalType(TemporalType.TIMESTAMP);
+ ((BaseTemporalConverter) ormBasicMapping.getConverter()).setTemporalType(TemporalType.TIMESTAMP);
assertEquals(org.eclipse.jpt.jpa.core.resource.orm.TemporalType.TIMESTAMP, basicResource.getTemporal());
- assertEquals(TemporalType.TIMESTAMP, ((TemporalConverter) ormBasicMapping.getConverter()).getTemporalType());
+ assertEquals(TemporalType.TIMESTAMP, ((BaseTemporalConverter) ormBasicMapping.getConverter()).getTemporalType());
//set temporal to null in the context model
ormBasicMapping.setConverter(null);
@@ -440,8 +440,8 @@ public class OrmBasicMappingTests extends ContextModelTestCase
BasicMapping basicMapping = (BasicMapping) ormPersistentAttribute.getMapping();
assertEquals("id", basicMapping.getName());
- assertEquals(EnumeratedConverter.class, basicMapping.getConverter().getType());
- assertEquals(EnumType.STRING, ((EnumeratedConverter) basicMapping.getConverter()).getEnumType());
+ assertEquals(BaseEnumeratedConverter.class, basicMapping.getConverter().getType());
+ assertEquals(EnumType.STRING, ((BaseEnumeratedConverter) basicMapping.getConverter()).getEnumType());
assertEquals(FetchType.LAZY, basicMapping.getSpecifiedFetch());
assertEquals(Boolean.FALSE, basicMapping.getSpecifiedOptional());
@@ -539,8 +539,8 @@ public class OrmBasicMappingTests extends ContextModelTestCase
BasicMapping basicMapping = (BasicMapping) ormPersistentAttribute.getMapping();
assertFalse(basicMapping.isDefault());
basicMapping.getColumn().setSpecifiedName("FOO");
- basicMapping.setConverter(TemporalConverter.class);
- ((TemporalConverter) basicMapping.getConverter()).setTemporalType(TemporalType.TIME);
+ basicMapping.setConverter(BaseTemporalConverter.class);
+ ((BaseTemporalConverter) basicMapping.getConverter()).setTemporalType(TemporalType.TIME);
basicMapping.setSpecifiedFetch(FetchType.EAGER);
basicMapping.setSpecifiedOptional(Boolean.FALSE);
assertFalse(basicMapping.isDefault());
@@ -561,8 +561,8 @@ public class OrmBasicMappingTests extends ContextModelTestCase
BasicMapping basicMapping = (BasicMapping) ormPersistentAttribute.getMapping();
assertFalse(basicMapping.isDefault());
basicMapping.getColumn().setSpecifiedName("FOO");
- basicMapping.setConverter(TemporalConverter.class);
- ((TemporalConverter) basicMapping.getConverter()).setTemporalType(TemporalType.TIME);
+ basicMapping.setConverter(BaseTemporalConverter.class);
+ ((BaseTemporalConverter) basicMapping.getConverter()).setTemporalType(TemporalType.TIME);
basicMapping.setSpecifiedFetch(FetchType.EAGER);
basicMapping.setSpecifiedOptional(Boolean.FALSE);
assertFalse(basicMapping.isDefault());
@@ -583,8 +583,8 @@ public class OrmBasicMappingTests extends ContextModelTestCase
BasicMapping basicMapping = (BasicMapping) ormPersistentAttribute.getMapping();
assertFalse(basicMapping.isDefault());
basicMapping.getColumn().setSpecifiedName("FOO");
- basicMapping.setConverter(TemporalConverter.class);
- ((TemporalConverter) basicMapping.getConverter()).setTemporalType(TemporalType.TIME);
+ basicMapping.setConverter(BaseTemporalConverter.class);
+ ((BaseTemporalConverter) basicMapping.getConverter()).setTemporalType(TemporalType.TIME);
basicMapping.setSpecifiedFetch(FetchType.EAGER);
basicMapping.setSpecifiedOptional(Boolean.FALSE);
assertFalse(basicMapping.isDefault());
@@ -604,8 +604,8 @@ public class OrmBasicMappingTests extends ContextModelTestCase
BasicMapping basicMapping = (BasicMapping) ormPersistentAttribute.getMapping();
assertFalse(basicMapping.isDefault());
basicMapping.getColumn().setSpecifiedName("FOO");
- basicMapping.setConverter(TemporalConverter.class);
- ((TemporalConverter) basicMapping.getConverter()).setTemporalType(TemporalType.TIME);
+ basicMapping.setConverter(BaseTemporalConverter.class);
+ ((BaseTemporalConverter) basicMapping.getConverter()).setTemporalType(TemporalType.TIME);
basicMapping.setSpecifiedFetch(FetchType.EAGER);
basicMapping.setSpecifiedOptional(Boolean.FALSE);
assertFalse(basicMapping.isDefault());
@@ -625,8 +625,8 @@ public class OrmBasicMappingTests extends ContextModelTestCase
BasicMapping basicMapping = (BasicMapping) ormPersistentAttribute.getMapping();
assertFalse(basicMapping.isDefault());
basicMapping.getColumn().setSpecifiedName("FOO");
- basicMapping.setConverter(TemporalConverter.class);
- ((TemporalConverter) basicMapping.getConverter()).setTemporalType(TemporalType.TIME);
+ basicMapping.setConverter(BaseTemporalConverter.class);
+ ((BaseTemporalConverter) basicMapping.getConverter()).setTemporalType(TemporalType.TIME);
basicMapping.setSpecifiedFetch(FetchType.EAGER);
basicMapping.setSpecifiedOptional(Boolean.FALSE);
assertFalse(basicMapping.isDefault());
@@ -646,8 +646,8 @@ public class OrmBasicMappingTests extends ContextModelTestCase
BasicMapping basicMapping = (BasicMapping) ormPersistentAttribute.getMapping();
assertFalse(basicMapping.isDefault());
basicMapping.getColumn().setSpecifiedName("FOO");
- basicMapping.setConverter(TemporalConverter.class);
- ((TemporalConverter) basicMapping.getConverter()).setTemporalType(TemporalType.TIME);
+ basicMapping.setConverter(BaseTemporalConverter.class);
+ ((BaseTemporalConverter) basicMapping.getConverter()).setTemporalType(TemporalType.TIME);
basicMapping.setSpecifiedFetch(FetchType.EAGER);
basicMapping.setSpecifiedOptional(Boolean.FALSE);
assertFalse(basicMapping.isDefault());
@@ -667,8 +667,8 @@ public class OrmBasicMappingTests extends ContextModelTestCase
BasicMapping basicMapping = (BasicMapping) ormPersistentAttribute.getMapping();
assertFalse(basicMapping.isDefault());
basicMapping.getColumn().setSpecifiedName("FOO");
- basicMapping.setConverter(TemporalConverter.class);
- ((TemporalConverter) basicMapping.getConverter()).setTemporalType(TemporalType.TIME);
+ basicMapping.setConverter(BaseTemporalConverter.class);
+ ((BaseTemporalConverter) basicMapping.getConverter()).setTemporalType(TemporalType.TIME);
basicMapping.setSpecifiedFetch(FetchType.EAGER);
basicMapping.setSpecifiedOptional(Boolean.FALSE);
assertFalse(basicMapping.isDefault());
@@ -688,8 +688,8 @@ public class OrmBasicMappingTests extends ContextModelTestCase
BasicMapping basicMapping = (BasicMapping) ormPersistentAttribute.getMapping();
assertFalse(basicMapping.isDefault());
basicMapping.getColumn().setSpecifiedName("FOO");
- basicMapping.setConverter(TemporalConverter.class);
- ((TemporalConverter) basicMapping.getConverter()).setTemporalType(TemporalType.TIME);
+ basicMapping.setConverter(BaseTemporalConverter.class);
+ ((BaseTemporalConverter) basicMapping.getConverter()).setTemporalType(TemporalType.TIME);
basicMapping.setSpecifiedFetch(FetchType.EAGER);
basicMapping.setSpecifiedOptional(Boolean.FALSE);
assertFalse(basicMapping.isDefault());
@@ -709,8 +709,8 @@ public class OrmBasicMappingTests extends ContextModelTestCase
BasicMapping basicMapping = (BasicMapping) ormPersistentAttribute.getMapping();
assertFalse(basicMapping.isDefault());
basicMapping.getColumn().setSpecifiedName("FOO");
- basicMapping.setConverter(TemporalConverter.class);
- ((TemporalConverter) basicMapping.getConverter()).setTemporalType(TemporalType.TIME);
+ basicMapping.setConverter(BaseTemporalConverter.class);
+ ((BaseTemporalConverter) basicMapping.getConverter()).setTemporalType(TemporalType.TIME);
basicMapping.setSpecifiedFetch(FetchType.EAGER);
basicMapping.setSpecifiedOptional(Boolean.FALSE);
assertFalse(basicMapping.isDefault());
diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmIdMappingTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmIdMappingTests.java
index f9f9da2d48..9f8e6a8197 100644
--- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmIdMappingTests.java
+++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmIdMappingTests.java
@@ -27,7 +27,7 @@ import org.eclipse.jpt.jpa.core.context.OneToManyMapping;
import org.eclipse.jpt.jpa.core.context.OneToOneMapping;
import org.eclipse.jpt.jpa.core.context.SequenceGenerator;
import org.eclipse.jpt.jpa.core.context.TableGenerator;
-import org.eclipse.jpt.jpa.core.context.TemporalConverter;
+import org.eclipse.jpt.jpa.core.context.BaseTemporalConverter;
import org.eclipse.jpt.jpa.core.context.TemporalType;
import org.eclipse.jpt.jpa.core.context.TransientMapping;
import org.eclipse.jpt.jpa.core.context.VersionMapping;
@@ -142,15 +142,15 @@ public class OrmIdMappingTests extends ContextModelTestCase
//set temporal in the resource model, verify context model updated
idResource.setTemporal(org.eclipse.jpt.jpa.core.resource.orm.TemporalType.DATE);
- assertEquals(TemporalType.DATE, ((TemporalConverter) ormIdMapping.getConverter()).getTemporalType());
+ assertEquals(TemporalType.DATE, ((BaseTemporalConverter) ormIdMapping.getConverter()).getTemporalType());
assertEquals(org.eclipse.jpt.jpa.core.resource.orm.TemporalType.DATE, idResource.getTemporal());
idResource.setTemporal(org.eclipse.jpt.jpa.core.resource.orm.TemporalType.TIME);
- assertEquals(TemporalType.TIME, ((TemporalConverter) ormIdMapping.getConverter()).getTemporalType());
+ assertEquals(TemporalType.TIME, ((BaseTemporalConverter) ormIdMapping.getConverter()).getTemporalType());
assertEquals(org.eclipse.jpt.jpa.core.resource.orm.TemporalType.TIME, idResource.getTemporal());
idResource.setTemporal(org.eclipse.jpt.jpa.core.resource.orm.TemporalType.TIMESTAMP);
- assertEquals(TemporalType.TIMESTAMP, ((TemporalConverter) ormIdMapping.getConverter()).getTemporalType());
+ assertEquals(TemporalType.TIMESTAMP, ((BaseTemporalConverter) ormIdMapping.getConverter()).getTemporalType());
assertEquals(org.eclipse.jpt.jpa.core.resource.orm.TemporalType.TIMESTAMP, idResource.getTemporal());
//set temporal to null in the resource model
@@ -170,18 +170,18 @@ public class OrmIdMappingTests extends ContextModelTestCase
assertNull(idResource.getTemporal());
//set temporal in the context model, verify resource model updated
- ormIdMapping.setConverter(TemporalConverter.class);
- ((TemporalConverter) ormIdMapping.getConverter()).setTemporalType(TemporalType.DATE);
+ ormIdMapping.setConverter(BaseTemporalConverter.class);
+ ((BaseTemporalConverter) ormIdMapping.getConverter()).setTemporalType(TemporalType.DATE);
assertEquals(org.eclipse.jpt.jpa.core.resource.orm.TemporalType.DATE, idResource.getTemporal());
- assertEquals(TemporalType.DATE, ((TemporalConverter) ormIdMapping.getConverter()).getTemporalType());
+ assertEquals(TemporalType.DATE, ((BaseTemporalConverter) ormIdMapping.getConverter()).getTemporalType());
- ((TemporalConverter) ormIdMapping.getConverter()).setTemporalType(TemporalType.TIME);
+ ((BaseTemporalConverter) ormIdMapping.getConverter()).setTemporalType(TemporalType.TIME);
assertEquals(org.eclipse.jpt.jpa.core.resource.orm.TemporalType.TIME, idResource.getTemporal());
- assertEquals(TemporalType.TIME, ((TemporalConverter) ormIdMapping.getConverter()).getTemporalType());
+ assertEquals(TemporalType.TIME, ((BaseTemporalConverter) ormIdMapping.getConverter()).getTemporalType());
- ((TemporalConverter) ormIdMapping.getConverter()).setTemporalType(TemporalType.TIMESTAMP);
+ ((BaseTemporalConverter) ormIdMapping.getConverter()).setTemporalType(TemporalType.TIMESTAMP);
assertEquals(org.eclipse.jpt.jpa.core.resource.orm.TemporalType.TIMESTAMP, idResource.getTemporal());
- assertEquals(TemporalType.TIMESTAMP, ((TemporalConverter) ormIdMapping.getConverter()).getTemporalType());
+ assertEquals(TemporalType.TIMESTAMP, ((BaseTemporalConverter) ormIdMapping.getConverter()).getTemporalType());
//set temporal to null in the context model
ormIdMapping.setConverter(null);
@@ -477,8 +477,8 @@ public class OrmIdMappingTests extends ContextModelTestCase
IdMapping idMapping = (IdMapping) ormPersistentAttribute.getMapping();
assertEquals("id", idMapping.getName());
- assertEquals(TemporalConverter.class, idMapping.getConverter().getType());
- assertEquals(TemporalType.TIMESTAMP, ((TemporalConverter) idMapping.getConverter()).getTemporalType());
+ assertEquals(BaseTemporalConverter.class, idMapping.getConverter().getType());
+ assertEquals(TemporalType.TIMESTAMP, ((BaseTemporalConverter) idMapping.getConverter()).getTemporalType());
Column column = idMapping.getColumn();
assertEquals("MY_COLUMN", column.getSpecifiedName());
@@ -604,8 +604,8 @@ public class OrmIdMappingTests extends ContextModelTestCase
IdMapping idMapping = (IdMapping) ormPersistentAttribute.getMapping();
assertFalse(idMapping.isDefault());
idMapping.getColumn().setSpecifiedName("FOO");
- idMapping.setConverter(TemporalConverter.class);
- ((TemporalConverter) idMapping.getConverter()).setTemporalType(TemporalType.TIME);
+ idMapping.setConverter(BaseTemporalConverter.class);
+ ((BaseTemporalConverter) idMapping.getConverter()).setTemporalType(TemporalType.TIME);
assertFalse(idMapping.isDefault());
ormPersistentAttribute.setMappingKey(MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY);
@@ -624,8 +624,8 @@ public class OrmIdMappingTests extends ContextModelTestCase
IdMapping idMapping = (IdMapping) ormPersistentAttribute.getMapping();
assertFalse(idMapping.isDefault());
idMapping.getColumn().setSpecifiedName("FOO");
- idMapping.setConverter(TemporalConverter.class);
- ((TemporalConverter) idMapping.getConverter()).setTemporalType(TemporalType.TIME);
+ idMapping.setConverter(BaseTemporalConverter.class);
+ ((BaseTemporalConverter) idMapping.getConverter()).setTemporalType(TemporalType.TIME);
assertFalse(idMapping.isDefault());
ormPersistentAttribute.setMappingKey(MappingKeys.VERSION_ATTRIBUTE_MAPPING_KEY);
@@ -644,8 +644,8 @@ public class OrmIdMappingTests extends ContextModelTestCase
IdMapping idMapping = (IdMapping) ormPersistentAttribute.getMapping();
assertFalse(idMapping.isDefault());
idMapping.getColumn().setSpecifiedName("FOO");
- idMapping.setConverter(TemporalConverter.class);
- ((TemporalConverter) idMapping.getConverter()).setTemporalType(TemporalType.TIME);
+ idMapping.setConverter(BaseTemporalConverter.class);
+ ((BaseTemporalConverter) idMapping.getConverter()).setTemporalType(TemporalType.TIME);
assertFalse(idMapping.isDefault());
ormPersistentAttribute.setMappingKey(MappingKeys.TRANSIENT_ATTRIBUTE_MAPPING_KEY);
@@ -661,8 +661,8 @@ public class OrmIdMappingTests extends ContextModelTestCase
IdMapping idMapping = (IdMapping) ormPersistentAttribute.getMapping();
assertFalse(idMapping.isDefault());
idMapping.getColumn().setSpecifiedName("FOO");
- idMapping.setConverter(TemporalConverter.class);
- ((TemporalConverter) idMapping.getConverter()).setTemporalType(TemporalType.TIME);
+ idMapping.setConverter(BaseTemporalConverter.class);
+ ((BaseTemporalConverter) idMapping.getConverter()).setTemporalType(TemporalType.TIME);
assertFalse(idMapping.isDefault());
ormPersistentAttribute.setMappingKey(MappingKeys.EMBEDDED_ATTRIBUTE_MAPPING_KEY);
@@ -680,8 +680,8 @@ public class OrmIdMappingTests extends ContextModelTestCase
IdMapping idMapping = (IdMapping) ormPersistentAttribute.getMapping();
assertFalse(idMapping.isDefault());
idMapping.getColumn().setSpecifiedName("FOO");
- idMapping.setConverter(TemporalConverter.class);
- ((TemporalConverter) idMapping.getConverter()).setTemporalType(TemporalType.TIME);
+ idMapping.setConverter(BaseTemporalConverter.class);
+ ((BaseTemporalConverter) idMapping.getConverter()).setTemporalType(TemporalType.TIME);
assertFalse(idMapping.isDefault());
ormPersistentAttribute.setMappingKey(MappingKeys.EMBEDDED_ID_ATTRIBUTE_MAPPING_KEY);
@@ -697,8 +697,8 @@ public class OrmIdMappingTests extends ContextModelTestCase
IdMapping idMapping = (IdMapping) ormPersistentAttribute.getMapping();
assertFalse(idMapping.isDefault());
idMapping.getColumn().setSpecifiedName("FOO");
- idMapping.setConverter(TemporalConverter.class);
- ((TemporalConverter) idMapping.getConverter()).setTemporalType(TemporalType.TIME);
+ idMapping.setConverter(BaseTemporalConverter.class);
+ ((BaseTemporalConverter) idMapping.getConverter()).setTemporalType(TemporalType.TIME);
assertFalse(idMapping.isDefault());
ormPersistentAttribute.setMappingKey(MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY);
@@ -716,8 +716,8 @@ public class OrmIdMappingTests extends ContextModelTestCase
IdMapping idMapping = (IdMapping) ormPersistentAttribute.getMapping();
assertFalse(idMapping.isDefault());
idMapping.getColumn().setSpecifiedName("FOO");
- idMapping.setConverter(TemporalConverter.class);
- ((TemporalConverter) idMapping.getConverter()).setTemporalType(TemporalType.TIME);
+ idMapping.setConverter(BaseTemporalConverter.class);
+ ((BaseTemporalConverter) idMapping.getConverter()).setTemporalType(TemporalType.TIME);
assertFalse(idMapping.isDefault());
ormPersistentAttribute.setMappingKey(MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY);
@@ -735,8 +735,8 @@ public class OrmIdMappingTests extends ContextModelTestCase
IdMapping idMapping = (IdMapping) ormPersistentAttribute.getMapping();
assertFalse(idMapping.isDefault());
idMapping.getColumn().setSpecifiedName("FOO");
- idMapping.setConverter(TemporalConverter.class);
- ((TemporalConverter) idMapping.getConverter()).setTemporalType(TemporalType.TIME);
+ idMapping.setConverter(BaseTemporalConverter.class);
+ ((BaseTemporalConverter) idMapping.getConverter()).setTemporalType(TemporalType.TIME);
assertFalse(idMapping.isDefault());
ormPersistentAttribute.setMappingKey(MappingKeys.MANY_TO_ONE_ATTRIBUTE_MAPPING_KEY);
@@ -754,8 +754,8 @@ public class OrmIdMappingTests extends ContextModelTestCase
IdMapping idMapping = (IdMapping) ormPersistentAttribute.getMapping();
assertFalse(idMapping.isDefault());
idMapping.getColumn().setSpecifiedName("FOO");
- idMapping.setConverter(TemporalConverter.class);
- ((TemporalConverter) idMapping.getConverter()).setTemporalType(TemporalType.TIME);
+ idMapping.setConverter(BaseTemporalConverter.class);
+ ((BaseTemporalConverter) idMapping.getConverter()).setTemporalType(TemporalType.TIME);
assertFalse(idMapping.isDefault());
ormPersistentAttribute.setMappingKey(MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY);
diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmVersionMappingTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmVersionMappingTests.java
index f2c0a0a69e..4ab3647e4e 100644
--- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmVersionMappingTests.java
+++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmVersionMappingTests.java
@@ -23,7 +23,7 @@ import org.eclipse.jpt.jpa.core.context.ManyToManyMapping;
import org.eclipse.jpt.jpa.core.context.ManyToOneMapping;
import org.eclipse.jpt.jpa.core.context.OneToManyMapping;
import org.eclipse.jpt.jpa.core.context.OneToOneMapping;
-import org.eclipse.jpt.jpa.core.context.TemporalConverter;
+import org.eclipse.jpt.jpa.core.context.BaseTemporalConverter;
import org.eclipse.jpt.jpa.core.context.TemporalType;
import org.eclipse.jpt.jpa.core.context.TransientMapping;
import org.eclipse.jpt.jpa.core.context.VersionMapping;
@@ -130,15 +130,15 @@ public class OrmVersionMappingTests extends ContextModelTestCase
//set temporal in the resource model, verify context model updated
versionResource.setTemporal(org.eclipse.jpt.jpa.core.resource.orm.TemporalType.DATE);
- assertEquals(TemporalType.DATE, ((TemporalConverter) ormVersionMapping.getConverter()).getTemporalType());
+ assertEquals(TemporalType.DATE, ((BaseTemporalConverter) ormVersionMapping.getConverter()).getTemporalType());
assertEquals(org.eclipse.jpt.jpa.core.resource.orm.TemporalType.DATE, versionResource.getTemporal());
versionResource.setTemporal(org.eclipse.jpt.jpa.core.resource.orm.TemporalType.TIME);
- assertEquals(TemporalType.TIME, ((TemporalConverter) ormVersionMapping.getConverter()).getTemporalType());
+ assertEquals(TemporalType.TIME, ((BaseTemporalConverter) ormVersionMapping.getConverter()).getTemporalType());
assertEquals(org.eclipse.jpt.jpa.core.resource.orm.TemporalType.TIME, versionResource.getTemporal());
versionResource.setTemporal(org.eclipse.jpt.jpa.core.resource.orm.TemporalType.TIMESTAMP);
- assertEquals(TemporalType.TIMESTAMP, ((TemporalConverter) ormVersionMapping.getConverter()).getTemporalType());
+ assertEquals(TemporalType.TIMESTAMP, ((BaseTemporalConverter) ormVersionMapping.getConverter()).getTemporalType());
assertEquals(org.eclipse.jpt.jpa.core.resource.orm.TemporalType.TIMESTAMP, versionResource.getTemporal());
//set temporal to null in the resource model
@@ -158,18 +158,18 @@ public class OrmVersionMappingTests extends ContextModelTestCase
assertNull(versionResource.getTemporal());
//set temporal in the context model, verify resource model updated
- ormVersionMapping.setConverter(TemporalConverter.class);
- ((TemporalConverter) ormVersionMapping.getConverter()).setTemporalType(TemporalType.DATE);
+ ormVersionMapping.setConverter(BaseTemporalConverter.class);
+ ((BaseTemporalConverter) ormVersionMapping.getConverter()).setTemporalType(TemporalType.DATE);
assertEquals(org.eclipse.jpt.jpa.core.resource.orm.TemporalType.DATE, versionResource.getTemporal());
- assertEquals(TemporalType.DATE, ((TemporalConverter) ormVersionMapping.getConverter()).getTemporalType());
+ assertEquals(TemporalType.DATE, ((BaseTemporalConverter) ormVersionMapping.getConverter()).getTemporalType());
- ((TemporalConverter) ormVersionMapping.getConverter()).setTemporalType(TemporalType.TIME);
+ ((BaseTemporalConverter) ormVersionMapping.getConverter()).setTemporalType(TemporalType.TIME);
assertEquals(org.eclipse.jpt.jpa.core.resource.orm.TemporalType.TIME, versionResource.getTemporal());
- assertEquals(TemporalType.TIME, ((TemporalConverter) ormVersionMapping.getConverter()).getTemporalType());
+ assertEquals(TemporalType.TIME, ((BaseTemporalConverter) ormVersionMapping.getConverter()).getTemporalType());
- ((TemporalConverter) ormVersionMapping.getConverter()).setTemporalType(TemporalType.TIMESTAMP);
+ ((BaseTemporalConverter) ormVersionMapping.getConverter()).setTemporalType(TemporalType.TIMESTAMP);
assertEquals(org.eclipse.jpt.jpa.core.resource.orm.TemporalType.TIMESTAMP, versionResource.getTemporal());
- assertEquals(TemporalType.TIMESTAMP, ((TemporalConverter) ormVersionMapping.getConverter()).getTemporalType());
+ assertEquals(TemporalType.TIMESTAMP, ((BaseTemporalConverter) ormVersionMapping.getConverter()).getTemporalType());
//set temporal to null in the context model
ormVersionMapping.setConverter(null);
@@ -233,8 +233,8 @@ public class OrmVersionMappingTests extends ContextModelTestCase
VersionMapping versionMapping = (VersionMapping) ormPersistentAttribute.getMapping();
assertEquals("id", versionMapping.getName());
- assertEquals(TemporalConverter.class, versionMapping.getConverter().getType());
- assertEquals(TemporalType.TIMESTAMP, ((TemporalConverter) versionMapping.getConverter()).getTemporalType());
+ assertEquals(BaseTemporalConverter.class, versionMapping.getConverter().getType());
+ assertEquals(TemporalType.TIMESTAMP, ((BaseTemporalConverter) versionMapping.getConverter()).getTemporalType());
Column column = versionMapping.getColumn();
assertEquals("MY_COLUMN", column.getSpecifiedName());
@@ -325,8 +325,8 @@ public class OrmVersionMappingTests extends ContextModelTestCase
VersionMapping versionMapping = (VersionMapping) ormPersistentAttribute.getMapping();
assertFalse(versionMapping.isDefault());
versionMapping.getColumn().setSpecifiedName("FOO");
- versionMapping.setConverter(TemporalConverter.class);
- ((TemporalConverter) versionMapping.getConverter()).setTemporalType(TemporalType.TIME);
+ versionMapping.setConverter(BaseTemporalConverter.class);
+ ((BaseTemporalConverter) versionMapping.getConverter()).setTemporalType(TemporalType.TIME);
assertFalse(versionMapping.isDefault());
ormPersistentAttribute.setMappingKey(MappingKeys.ID_ATTRIBUTE_MAPPING_KEY);
@@ -345,8 +345,8 @@ public class OrmVersionMappingTests extends ContextModelTestCase
VersionMapping versionMapping = (VersionMapping) ormPersistentAttribute.getMapping();
assertFalse(versionMapping.isDefault());
versionMapping.getColumn().setSpecifiedName("FOO");
- versionMapping.setConverter(TemporalConverter.class);
- ((TemporalConverter) versionMapping.getConverter()).setTemporalType(TemporalType.TIME);
+ versionMapping.setConverter(BaseTemporalConverter.class);
+ ((BaseTemporalConverter) versionMapping.getConverter()).setTemporalType(TemporalType.TIME);
assertFalse(versionMapping.isDefault());
ormPersistentAttribute.setMappingKey(MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY);
@@ -365,8 +365,8 @@ public class OrmVersionMappingTests extends ContextModelTestCase
VersionMapping versionMapping = (VersionMapping) ormPersistentAttribute.getMapping();
assertFalse(versionMapping.isDefault());
versionMapping.getColumn().setSpecifiedName("FOO");
- versionMapping.setConverter(TemporalConverter.class);
- ((TemporalConverter) versionMapping.getConverter()).setTemporalType(TemporalType.TIME);
+ versionMapping.setConverter(BaseTemporalConverter.class);
+ ((BaseTemporalConverter) versionMapping.getConverter()).setTemporalType(TemporalType.TIME);
assertFalse(versionMapping.isDefault());
ormPersistentAttribute.setMappingKey(MappingKeys.TRANSIENT_ATTRIBUTE_MAPPING_KEY);
@@ -384,8 +384,8 @@ public class OrmVersionMappingTests extends ContextModelTestCase
VersionMapping versionMapping = (VersionMapping) ormPersistentAttribute.getMapping();
assertFalse(versionMapping.isDefault());
versionMapping.getColumn().setSpecifiedName("FOO");
- versionMapping.setConverter(TemporalConverter.class);
- ((TemporalConverter) versionMapping.getConverter()).setTemporalType(TemporalType.TIME);
+ versionMapping.setConverter(BaseTemporalConverter.class);
+ ((BaseTemporalConverter) versionMapping.getConverter()).setTemporalType(TemporalType.TIME);
assertFalse(versionMapping.isDefault());
ormPersistentAttribute.setMappingKey(MappingKeys.EMBEDDED_ATTRIBUTE_MAPPING_KEY);
@@ -403,8 +403,8 @@ public class OrmVersionMappingTests extends ContextModelTestCase
VersionMapping versionMapping = (VersionMapping) ormPersistentAttribute.getMapping();
assertFalse(versionMapping.isDefault());
versionMapping.getColumn().setSpecifiedName("FOO");
- versionMapping.setConverter(TemporalConverter.class);
- ((TemporalConverter) versionMapping.getConverter()).setTemporalType(TemporalType.TIME);
+ versionMapping.setConverter(BaseTemporalConverter.class);
+ ((BaseTemporalConverter) versionMapping.getConverter()).setTemporalType(TemporalType.TIME);
assertFalse(versionMapping.isDefault());
ormPersistentAttribute.setMappingKey(MappingKeys.EMBEDDED_ID_ATTRIBUTE_MAPPING_KEY);
@@ -422,8 +422,8 @@ public class OrmVersionMappingTests extends ContextModelTestCase
VersionMapping versionMapping = (VersionMapping) ormPersistentAttribute.getMapping();
assertFalse(versionMapping.isDefault());
versionMapping.getColumn().setSpecifiedName("FOO");
- versionMapping.setConverter(TemporalConverter.class);
- ((TemporalConverter) versionMapping.getConverter()).setTemporalType(TemporalType.TIME);
+ versionMapping.setConverter(BaseTemporalConverter.class);
+ ((BaseTemporalConverter) versionMapping.getConverter()).setTemporalType(TemporalType.TIME);
assertFalse(versionMapping.isDefault());
ormPersistentAttribute.setMappingKey(MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY);
@@ -441,8 +441,8 @@ public class OrmVersionMappingTests extends ContextModelTestCase
VersionMapping versionMapping = (VersionMapping) ormPersistentAttribute.getMapping();
assertFalse(versionMapping.isDefault());
versionMapping.getColumn().setSpecifiedName("FOO");
- versionMapping.setConverter(TemporalConverter.class);
- ((TemporalConverter) versionMapping.getConverter()).setTemporalType(TemporalType.TIME);
+ versionMapping.setConverter(BaseTemporalConverter.class);
+ ((BaseTemporalConverter) versionMapping.getConverter()).setTemporalType(TemporalType.TIME);
assertFalse(versionMapping.isDefault());
ormPersistentAttribute.setMappingKey(MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY);
@@ -460,8 +460,8 @@ public class OrmVersionMappingTests extends ContextModelTestCase
VersionMapping versionMapping = (VersionMapping) ormPersistentAttribute.getMapping();
assertFalse(versionMapping.isDefault());
versionMapping.getColumn().setSpecifiedName("FOO");
- versionMapping.setConverter(TemporalConverter.class);
- ((TemporalConverter) versionMapping.getConverter()).setTemporalType(TemporalType.TIME);
+ versionMapping.setConverter(BaseTemporalConverter.class);
+ ((BaseTemporalConverter) versionMapping.getConverter()).setTemporalType(TemporalType.TIME);
assertFalse(versionMapping.isDefault());
ormPersistentAttribute.setMappingKey(MappingKeys.MANY_TO_ONE_ATTRIBUTE_MAPPING_KEY);
@@ -479,8 +479,8 @@ public class OrmVersionMappingTests extends ContextModelTestCase
VersionMapping versionMapping = (VersionMapping) ormPersistentAttribute.getMapping();
assertFalse(versionMapping.isDefault());
versionMapping.getColumn().setSpecifiedName("FOO");
- versionMapping.setConverter(TemporalConverter.class);
- ((TemporalConverter) versionMapping.getConverter()).setTemporalType(TemporalType.TIME);
+ versionMapping.setConverter(BaseTemporalConverter.class);
+ ((BaseTemporalConverter) versionMapping.getConverter()).setTemporalType(TemporalType.TIME);
assertFalse(versionMapping.isDefault());
ormPersistentAttribute.setMappingKey(MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY);
diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/java/GenericJavaBasicMapping2_0Tests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/java/GenericJavaBasicMapping2_0Tests.java
index f957f6b0a7..2737f5ab6b 100644
--- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/java/GenericJavaBasicMapping2_0Tests.java
+++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/java/GenericJavaBasicMapping2_0Tests.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2011 Oracle. All rights reserved.
+ * Copyright (c) 2011, 2012 Oracle. All rights reserved.
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0, which accompanies this distribution
* and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -20,7 +20,7 @@ import org.eclipse.jpt.jpa.core.context.BasicMapping;
import org.eclipse.jpt.jpa.core.context.EmbeddedIdMapping;
import org.eclipse.jpt.jpa.core.context.EmbeddedMapping;
import org.eclipse.jpt.jpa.core.context.EnumType;
-import org.eclipse.jpt.jpa.core.context.EnumeratedConverter;
+import org.eclipse.jpt.jpa.core.context.BaseEnumeratedConverter;
import org.eclipse.jpt.jpa.core.context.FetchType;
import org.eclipse.jpt.jpa.core.context.IdMapping;
import org.eclipse.jpt.jpa.core.context.ManyToManyMapping;
@@ -28,7 +28,7 @@ import org.eclipse.jpt.jpa.core.context.ManyToOneMapping;
import org.eclipse.jpt.jpa.core.context.OneToManyMapping;
import org.eclipse.jpt.jpa.core.context.OneToOneMapping;
import org.eclipse.jpt.jpa.core.context.PersistentAttribute;
-import org.eclipse.jpt.jpa.core.context.TemporalConverter;
+import org.eclipse.jpt.jpa.core.context.BaseTemporalConverter;
import org.eclipse.jpt.jpa.core.context.TemporalType;
import org.eclipse.jpt.jpa.core.context.TransientMapping;
import org.eclipse.jpt.jpa.core.context.VersionMapping;
@@ -89,8 +89,8 @@ public class GenericJavaBasicMapping2_0Tests extends Generic2_0ContextModelTestC
JavaResourceField resourceField = resourceType.getFields().iterator().next();
assertFalse(basicMapping.isDefault());
basicMapping.getColumn().setSpecifiedName("FOO");
- basicMapping.setConverter(EnumeratedConverter.class);
- ((EnumeratedConverter) basicMapping.getConverter()).setSpecifiedEnumType(EnumType.STRING);
+ basicMapping.setConverter(BaseEnumeratedConverter.class);
+ ((BaseEnumeratedConverter) basicMapping.getConverter()).setSpecifiedEnumType(EnumType.STRING);
resourceField.addAnnotation(LobAnnotation.ANNOTATION_NAME);
resourceField.addAnnotation(TemporalAnnotation.ANNOTATION_NAME);
resourceField.addAnnotation(Access2_0Annotation.ANNOTATION_NAME);
@@ -100,7 +100,7 @@ public class GenericJavaBasicMapping2_0Tests extends Generic2_0ContextModelTestC
persistentAttribute.setMappingKey(MappingKeys.NULL_ATTRIBUTE_MAPPING_KEY);
assertEquals("FOO", ((BasicMapping) persistentAttribute.getMapping()).getColumn().getSpecifiedName());
- assertEquals(EnumType.STRING, ((EnumeratedConverter) ((BasicMapping) persistentAttribute.getMapping()).getConverter()).getEnumType());
+ assertEquals(EnumType.STRING, ((BaseEnumeratedConverter) ((BasicMapping) persistentAttribute.getMapping()).getConverter()).getEnumType());
assertNull(((BasicMapping) persistentAttribute.getMapping()).getSpecifiedFetch());
assertNull(((BasicMapping) persistentAttribute.getMapping()).getSpecifiedOptional());
@@ -122,8 +122,8 @@ public class GenericJavaBasicMapping2_0Tests extends Generic2_0ContextModelTestC
JavaResourceField resourceField = resourceType.getFields().iterator().next();
assertFalse(basicMapping.isDefault());
basicMapping.getColumn().setSpecifiedName("FOO");
- basicMapping.setConverter(TemporalConverter.class);
- ((TemporalConverter) basicMapping.getConverter()).setTemporalType(TemporalType.TIME);
+ basicMapping.setConverter(BaseTemporalConverter.class);
+ ((BaseTemporalConverter) basicMapping.getConverter()).setTemporalType(TemporalType.TIME);
resourceField.addAnnotation(LobAnnotation.ANNOTATION_NAME);
resourceField.addAnnotation(EnumeratedAnnotation.ANNOTATION_NAME);
resourceField.addAnnotation(Access2_0Annotation.ANNOTATION_NAME);
@@ -133,7 +133,7 @@ public class GenericJavaBasicMapping2_0Tests extends Generic2_0ContextModelTestC
persistentAttribute.setMappingKey(MappingKeys.ID_ATTRIBUTE_MAPPING_KEY);
assertEquals("FOO", ((IdMapping) persistentAttribute.getMapping()).getColumn().getSpecifiedName());
- assertEquals(TemporalType.TIME, ((TemporalConverter) ((IdMapping) persistentAttribute.getMapping()).getConverter()).getTemporalType());
+ assertEquals(TemporalType.TIME, ((BaseTemporalConverter) ((IdMapping) persistentAttribute.getMapping()).getConverter()).getTemporalType());
assertNull(resourceField.getAnnotation(BasicAnnotation.ANNOTATION_NAME));
assertNotNull(resourceField.getAnnotation(IdAnnotation.ANNOTATION_NAME));
@@ -154,8 +154,8 @@ public class GenericJavaBasicMapping2_0Tests extends Generic2_0ContextModelTestC
JavaResourceField resourceField = resourceType.getFields().iterator().next();
assertFalse(basicMapping.isDefault());
basicMapping.getColumn().setSpecifiedName("FOO");
- basicMapping.setConverter(TemporalConverter.class);
- ((TemporalConverter) basicMapping.getConverter()).setTemporalType(TemporalType.TIME);
+ basicMapping.setConverter(BaseTemporalConverter.class);
+ ((BaseTemporalConverter) basicMapping.getConverter()).setTemporalType(TemporalType.TIME);
resourceField.addAnnotation(LobAnnotation.ANNOTATION_NAME);
resourceField.addAnnotation(EnumeratedAnnotation.ANNOTATION_NAME);
resourceField.addAnnotation(Access2_0Annotation.ANNOTATION_NAME);
@@ -163,7 +163,7 @@ public class GenericJavaBasicMapping2_0Tests extends Generic2_0ContextModelTestC
persistentAttribute.setMappingKey(MappingKeys.VERSION_ATTRIBUTE_MAPPING_KEY);
assertEquals("FOO", ((VersionMapping) persistentAttribute.getMapping()).getColumn().getSpecifiedName());
- assertEquals(TemporalType.TIME, ((TemporalConverter) ((VersionMapping) persistentAttribute.getMapping()).getConverter()).getTemporalType());
+ assertEquals(TemporalType.TIME, ((BaseTemporalConverter) ((VersionMapping) persistentAttribute.getMapping()).getConverter()).getTemporalType());
assertNull(resourceField.getAnnotation(BasicAnnotation.ANNOTATION_NAME));
assertNotNull(resourceField.getAnnotation(VersionAnnotation.ANNOTATION_NAME));
diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/java/GenericJavaElementCollectionMapping2_0Tests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/java/GenericJavaElementCollectionMapping2_0Tests.java
index 83afeea0e1..dffdb9a48f 100644
--- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/java/GenericJavaElementCollectionMapping2_0Tests.java
+++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/java/GenericJavaElementCollectionMapping2_0Tests.java
@@ -28,7 +28,7 @@ import org.eclipse.jpt.jpa.core.context.Embeddable;
import org.eclipse.jpt.jpa.core.context.EmbeddedIdMapping;
import org.eclipse.jpt.jpa.core.context.EmbeddedMapping;
import org.eclipse.jpt.jpa.core.context.EnumType;
-import org.eclipse.jpt.jpa.core.context.EnumeratedConverter;
+import org.eclipse.jpt.jpa.core.context.BaseEnumeratedConverter;
import org.eclipse.jpt.jpa.core.context.FetchType;
import org.eclipse.jpt.jpa.core.context.IdMapping;
import org.eclipse.jpt.jpa.core.context.JoinColumn;
@@ -38,7 +38,7 @@ import org.eclipse.jpt.jpa.core.context.OneToManyMapping;
import org.eclipse.jpt.jpa.core.context.PersistentAttribute;
import org.eclipse.jpt.jpa.core.context.PersistentType;
import org.eclipse.jpt.jpa.core.context.ReadOnlyAttributeOverride;
-import org.eclipse.jpt.jpa.core.context.TemporalConverter;
+import org.eclipse.jpt.jpa.core.context.BaseTemporalConverter;
import org.eclipse.jpt.jpa.core.context.TemporalType;
import org.eclipse.jpt.jpa.core.context.TransientMapping;
import org.eclipse.jpt.jpa.core.context.TypeMapping;
@@ -2203,7 +2203,7 @@ public class GenericJavaElementCollectionMapping2_0Tests extends Generic2_0Conte
ElementCollectionMapping2_0 elementCollectionMapping = (ElementCollectionMapping2_0) persistentAttribute.getMapping();
assertNull(elementCollectionMapping.getMapKeyConverter().getType());
- elementCollectionMapping.setMapKeyConverter(EnumeratedConverter.class);
+ elementCollectionMapping.setMapKeyConverter(BaseEnumeratedConverter.class);
JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE);
JavaResourceField resourceField = resourceType.getFields().iterator().next();
@@ -2212,10 +2212,10 @@ public class GenericJavaElementCollectionMapping2_0Tests extends Generic2_0Conte
assertNotNull(enumerated);
assertEquals(null, enumerated.getValue());
- ((EnumeratedConverter) elementCollectionMapping.getMapKeyConverter()).setSpecifiedEnumType(EnumType.STRING);
+ ((BaseEnumeratedConverter) elementCollectionMapping.getMapKeyConverter()).setSpecifiedEnumType(EnumType.STRING);
assertEquals(org.eclipse.jpt.jpa.core.resource.java.EnumType.STRING, enumerated.getValue());
- ((EnumeratedConverter) elementCollectionMapping.getMapKeyConverter()).setSpecifiedEnumType(null);
+ ((BaseEnumeratedConverter) elementCollectionMapping.getMapKeyConverter()).setSpecifiedEnumType(null);
assertNotNull(resourceField.getAnnotation(MapKeyEnumerated2_0Annotation.ANNOTATION_NAME));
assertNull(enumerated.getValue());
@@ -2239,12 +2239,12 @@ public class GenericJavaElementCollectionMapping2_0Tests extends Generic2_0Conte
enumerated.setValue(org.eclipse.jpt.jpa.core.resource.java.EnumType.STRING);
getJpaProject().synchronizeContextModel();
- assertEquals(EnumType.STRING, ((EnumeratedConverter) elementCollectionMapping.getMapKeyConverter()).getSpecifiedEnumType());
+ assertEquals(EnumType.STRING, ((BaseEnumeratedConverter) elementCollectionMapping.getMapKeyConverter()).getSpecifiedEnumType());
enumerated.setValue(null);
getJpaProject().synchronizeContextModel();
assertNotNull(resourceField.getAnnotation(MapKeyEnumerated2_0Annotation.ANNOTATION_NAME));
- assertNull(((EnumeratedConverter) elementCollectionMapping.getMapKeyConverter()).getSpecifiedEnumType());
+ assertNull(((BaseEnumeratedConverter) elementCollectionMapping.getMapKeyConverter()).getSpecifiedEnumType());
assertFalse(elementCollectionMapping.isDefault());
assertSame(elementCollectionMapping, persistentAttribute.getMapping());
}
@@ -2257,7 +2257,7 @@ public class GenericJavaElementCollectionMapping2_0Tests extends Generic2_0Conte
ElementCollectionMapping2_0 elementCollectionMapping = (ElementCollectionMapping2_0) persistentAttribute.getMapping();
assertNull(elementCollectionMapping.getMapKeyConverter().getType());
- elementCollectionMapping.setMapKeyConverter(TemporalConverter.class);
+ elementCollectionMapping.setMapKeyConverter(BaseTemporalConverter.class);
JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE);
JavaResourceField resourceField = resourceType.getFields().iterator().next();
@@ -2266,10 +2266,10 @@ public class GenericJavaElementCollectionMapping2_0Tests extends Generic2_0Conte
assertNotNull(temporal);
assertEquals(null, temporal.getValue());
- ((TemporalConverter) elementCollectionMapping.getMapKeyConverter()).setTemporalType(TemporalType.TIME);
+ ((BaseTemporalConverter) elementCollectionMapping.getMapKeyConverter()).setTemporalType(TemporalType.TIME);
assertEquals(org.eclipse.jpt.jpa.core.resource.java.TemporalType.TIME, temporal.getValue());
- ((TemporalConverter) elementCollectionMapping.getMapKeyConverter()).setTemporalType(null);
+ ((BaseTemporalConverter) elementCollectionMapping.getMapKeyConverter()).setTemporalType(null);
assertNull(resourceField.getAnnotation(MapKeyTemporal2_0Annotation.ANNOTATION_NAME));
}
@@ -2289,12 +2289,12 @@ public class GenericJavaElementCollectionMapping2_0Tests extends Generic2_0Conte
temporal.setValue(org.eclipse.jpt.jpa.core.resource.java.TemporalType.TIME);
getJpaProject().synchronizeContextModel();
- assertEquals(TemporalType.TIME, ((TemporalConverter) elementCollectionMapping.getMapKeyConverter()).getTemporalType());
+ assertEquals(TemporalType.TIME, ((BaseTemporalConverter) elementCollectionMapping.getMapKeyConverter()).getTemporalType());
temporal.setValue(null);
getJpaProject().synchronizeContextModel();
assertNotNull(resourceField.getAnnotation(MapKeyTemporal2_0Annotation.ANNOTATION_NAME));
- assertNull(((TemporalConverter) elementCollectionMapping.getMapKeyConverter()).getTemporalType());
+ assertNull(((BaseTemporalConverter) elementCollectionMapping.getMapKeyConverter()).getTemporalType());
assertFalse(elementCollectionMapping.isDefault());
assertSame(elementCollectionMapping, persistentAttribute.getMapping());
}
diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/java/GenericJavaIdMapping2_0Tests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/java/GenericJavaIdMapping2_0Tests.java
index 263c0dde49..8010736106 100644
--- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/java/GenericJavaIdMapping2_0Tests.java
+++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/java/GenericJavaIdMapping2_0Tests.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2011 Oracle. All rights reserved.
+ * Copyright (c) 2011, 2012 Oracle. All rights reserved.
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0, which accompanies this distribution
* and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -25,7 +25,7 @@ import org.eclipse.jpt.jpa.core.context.ManyToOneMapping;
import org.eclipse.jpt.jpa.core.context.OneToManyMapping;
import org.eclipse.jpt.jpa.core.context.OneToOneMapping;
import org.eclipse.jpt.jpa.core.context.PersistentAttribute;
-import org.eclipse.jpt.jpa.core.context.TemporalConverter;
+import org.eclipse.jpt.jpa.core.context.BaseTemporalConverter;
import org.eclipse.jpt.jpa.core.context.TemporalType;
import org.eclipse.jpt.jpa.core.context.TransientMapping;
import org.eclipse.jpt.jpa.core.context.VersionMapping;
@@ -87,8 +87,8 @@ public class GenericJavaIdMapping2_0Tests extends Generic2_0ContextModelTestCase
JavaResourceField resourceField = resourceType.getFields().iterator().next();
assertFalse(idMapping.isDefault());
idMapping.getColumn().setSpecifiedName("FOO");
- idMapping.setConverter(TemporalConverter.class);
- ((TemporalConverter) idMapping.getConverter()).setTemporalType(TemporalType.TIME);
+ idMapping.setConverter(BaseTemporalConverter.class);
+ ((BaseTemporalConverter) idMapping.getConverter()).setTemporalType(TemporalType.TIME);
idMapping.addGeneratedValue();
idMapping.getGeneratorContainer().addTableGenerator();
idMapping.getGeneratorContainer().addSequenceGenerator();
@@ -97,7 +97,7 @@ public class GenericJavaIdMapping2_0Tests extends Generic2_0ContextModelTestCase
persistentAttribute.setMappingKey(MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY);
assertEquals("FOO", ((BasicMapping) persistentAttribute.getMapping()).getColumn().getSpecifiedName());
- assertEquals(TemporalType.TIME, ((TemporalConverter) ((BasicMapping) persistentAttribute.getMapping()).getConverter()).getTemporalType());
+ assertEquals(TemporalType.TIME, ((BaseTemporalConverter) ((BasicMapping) persistentAttribute.getMapping()).getConverter()).getTemporalType());
assertNull(resourceField.getAnnotation(IdAnnotation.ANNOTATION_NAME));
assertNotNull(resourceField.getAnnotation(BasicAnnotation.ANNOTATION_NAME));
@@ -119,8 +119,8 @@ public class GenericJavaIdMapping2_0Tests extends Generic2_0ContextModelTestCase
JavaResourceField resourceField = resourceType.getFields().iterator().next();
assertFalse(idMapping.isDefault());
idMapping.getColumn().setSpecifiedName("FOO");
- idMapping.setConverter(TemporalConverter.class);
- ((TemporalConverter) idMapping.getConverter()).setTemporalType(TemporalType.TIME);
+ idMapping.setConverter(BaseTemporalConverter.class);
+ ((BaseTemporalConverter) idMapping.getConverter()).setTemporalType(TemporalType.TIME);
idMapping.addGeneratedValue();
idMapping.getGeneratorContainer().addTableGenerator();
idMapping.getGeneratorContainer().addSequenceGenerator();
@@ -129,7 +129,7 @@ public class GenericJavaIdMapping2_0Tests extends Generic2_0ContextModelTestCase
persistentAttribute.setMappingKey(MappingKeys.NULL_ATTRIBUTE_MAPPING_KEY);
assertEquals("FOO", ((BasicMapping) persistentAttribute.getMapping()).getColumn().getSpecifiedName());
- assertEquals(TemporalType.TIME, ((TemporalConverter) ((BasicMapping) persistentAttribute.getMapping()).getConverter()).getTemporalType());
+ assertEquals(TemporalType.TIME, ((BaseTemporalConverter) ((BasicMapping) persistentAttribute.getMapping()).getConverter()).getTemporalType());
assertNull(resourceField.getAnnotation(IdAnnotation.ANNOTATION_NAME));
assertNotNull(resourceField.getAnnotation(Access2_0Annotation.ANNOTATION_NAME));
@@ -150,8 +150,8 @@ public class GenericJavaIdMapping2_0Tests extends Generic2_0ContextModelTestCase
JavaResourceField resourceField = resourceType.getFields().iterator().next();
assertFalse(idMapping.isDefault());
idMapping.getColumn().setSpecifiedName("FOO");
- idMapping.setConverter(TemporalConverter.class);
- ((TemporalConverter) idMapping.getConverter()).setTemporalType(TemporalType.TIME);
+ idMapping.setConverter(BaseTemporalConverter.class);
+ ((BaseTemporalConverter) idMapping.getConverter()).setTemporalType(TemporalType.TIME);
resourceField.addAnnotation(Access2_0Annotation.ANNOTATION_NAME);
idMapping.addGeneratedValue();
idMapping.getGeneratorContainer().addTableGenerator();
@@ -160,7 +160,7 @@ public class GenericJavaIdMapping2_0Tests extends Generic2_0ContextModelTestCase
persistentAttribute.setMappingKey(MappingKeys.VERSION_ATTRIBUTE_MAPPING_KEY);
assertEquals("FOO", ((VersionMapping) persistentAttribute.getMapping()).getColumn().getSpecifiedName());
- assertEquals(TemporalType.TIME, ((TemporalConverter) ((VersionMapping) persistentAttribute.getMapping()).getConverter()).getTemporalType());
+ assertEquals(TemporalType.TIME, ((BaseTemporalConverter) ((VersionMapping) persistentAttribute.getMapping()).getConverter()).getTemporalType());
assertNull(resourceField.getAnnotation(IdAnnotation.ANNOTATION_NAME));
assertNotNull(resourceField.getAnnotation(VersionAnnotation.ANNOTATION_NAME));
@@ -182,8 +182,8 @@ public class GenericJavaIdMapping2_0Tests extends Generic2_0ContextModelTestCase
JavaResourceField resourceField = resourceType.getFields().iterator().next();
assertFalse(idMapping.isDefault());
idMapping.getColumn().setSpecifiedName("FOO");
- idMapping.setConverter(TemporalConverter.class);
- ((TemporalConverter) idMapping.getConverter()).setTemporalType(TemporalType.TIME);
+ idMapping.setConverter(BaseTemporalConverter.class);
+ ((BaseTemporalConverter) idMapping.getConverter()).setTemporalType(TemporalType.TIME);
idMapping.addGeneratedValue();
idMapping.getGeneratorContainer().addTableGenerator();
idMapping.getGeneratorContainer().addSequenceGenerator();
@@ -213,8 +213,8 @@ public class GenericJavaIdMapping2_0Tests extends Generic2_0ContextModelTestCase
JavaResourceField resourceField = resourceType.getFields().iterator().next();
assertFalse(idMapping.isDefault());
idMapping.getColumn().setSpecifiedName("FOO");
- idMapping.setConverter(TemporalConverter.class);
- ((TemporalConverter) idMapping.getConverter()).setTemporalType(TemporalType.TIME);
+ idMapping.setConverter(BaseTemporalConverter.class);
+ ((BaseTemporalConverter) idMapping.getConverter()).setTemporalType(TemporalType.TIME);
idMapping.addGeneratedValue();
idMapping.getGeneratorContainer().addTableGenerator();
idMapping.getGeneratorContainer().addSequenceGenerator();
@@ -244,8 +244,8 @@ public class GenericJavaIdMapping2_0Tests extends Generic2_0ContextModelTestCase
JavaResourceField resourceField = resourceType.getFields().iterator().next();
assertFalse(idMapping.isDefault());
idMapping.getColumn().setSpecifiedName("FOO");
- idMapping.setConverter(TemporalConverter.class);
- ((TemporalConverter) idMapping.getConverter()).setTemporalType(TemporalType.TIME);
+ idMapping.setConverter(BaseTemporalConverter.class);
+ ((BaseTemporalConverter) idMapping.getConverter()).setTemporalType(TemporalType.TIME);
idMapping.addGeneratedValue();
idMapping.getGeneratorContainer().addTableGenerator();
idMapping.getGeneratorContainer().addSequenceGenerator();
@@ -275,8 +275,8 @@ public class GenericJavaIdMapping2_0Tests extends Generic2_0ContextModelTestCase
JavaResourceField resourceField = resourceType.getFields().iterator().next();
assertFalse(idMapping.isDefault());
idMapping.getColumn().setSpecifiedName("FOO");
- idMapping.setConverter(TemporalConverter.class);
- ((TemporalConverter) idMapping.getConverter()).setTemporalType(TemporalType.TIME);
+ idMapping.setConverter(BaseTemporalConverter.class);
+ ((BaseTemporalConverter) idMapping.getConverter()).setTemporalType(TemporalType.TIME);
idMapping.addGeneratedValue();
idMapping.getGeneratorContainer().addTableGenerator();
idMapping.getGeneratorContainer().addSequenceGenerator();
@@ -306,8 +306,8 @@ public class GenericJavaIdMapping2_0Tests extends Generic2_0ContextModelTestCase
JavaResourceField resourceField = resourceType.getFields().iterator().next();
assertFalse(idMapping.isDefault());
idMapping.getColumn().setSpecifiedName("FOO");
- idMapping.setConverter(TemporalConverter.class);
- ((TemporalConverter) idMapping.getConverter()).setTemporalType(TemporalType.TIME);
+ idMapping.setConverter(BaseTemporalConverter.class);
+ ((BaseTemporalConverter) idMapping.getConverter()).setTemporalType(TemporalType.TIME);
idMapping.addGeneratedValue();
idMapping.getGeneratorContainer().addTableGenerator();
idMapping.getGeneratorContainer().addSequenceGenerator();
@@ -337,8 +337,8 @@ public class GenericJavaIdMapping2_0Tests extends Generic2_0ContextModelTestCase
JavaResourceField resourceField = resourceType.getFields().iterator().next();
assertFalse(idMapping.isDefault());
idMapping.getColumn().setSpecifiedName("FOO");
- idMapping.setConverter(TemporalConverter.class);
- ((TemporalConverter) idMapping.getConverter()).setTemporalType(TemporalType.TIME);
+ idMapping.setConverter(BaseTemporalConverter.class);
+ ((BaseTemporalConverter) idMapping.getConverter()).setTemporalType(TemporalType.TIME);
idMapping.addGeneratedValue();
idMapping.getGeneratorContainer().addTableGenerator();
idMapping.getGeneratorContainer().addSequenceGenerator();
@@ -368,8 +368,8 @@ public class GenericJavaIdMapping2_0Tests extends Generic2_0ContextModelTestCase
JavaResourceField resourceField = resourceType.getFields().iterator().next();
assertFalse(idMapping.isDefault());
idMapping.getColumn().setSpecifiedName("FOO");
- idMapping.setConverter(TemporalConverter.class);
- ((TemporalConverter) idMapping.getConverter()).setTemporalType(TemporalType.TIME);
+ idMapping.setConverter(BaseTemporalConverter.class);
+ ((BaseTemporalConverter) idMapping.getConverter()).setTemporalType(TemporalType.TIME);
idMapping.addGeneratedValue();
idMapping.getGeneratorContainer().addTableGenerator();
idMapping.getGeneratorContainer().addSequenceGenerator();
@@ -400,8 +400,8 @@ public class GenericJavaIdMapping2_0Tests extends Generic2_0ContextModelTestCase
JavaResourceField resourceField = resourceType.getFields().iterator().next();
assertFalse(idMapping.isDefault());
idMapping.getColumn().setSpecifiedName("FOO");
- idMapping.setConverter(TemporalConverter.class);
- ((TemporalConverter) idMapping.getConverter()).setTemporalType(TemporalType.TIME);
+ idMapping.setConverter(BaseTemporalConverter.class);
+ ((BaseTemporalConverter) idMapping.getConverter()).setTemporalType(TemporalType.TIME);
idMapping.addGeneratedValue();
idMapping.getGeneratorContainer().addTableGenerator();
idMapping.getGeneratorContainer().addSequenceGenerator();
diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/java/GenericJavaManyToManyMapping2_0Tests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/java/GenericJavaManyToManyMapping2_0Tests.java
index 7337b6dc63..ac5137a041 100644
--- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/java/GenericJavaManyToManyMapping2_0Tests.java
+++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/java/GenericJavaManyToManyMapping2_0Tests.java
@@ -27,7 +27,7 @@ import org.eclipse.jpt.jpa.core.context.EmbeddedIdMapping;
import org.eclipse.jpt.jpa.core.context.EmbeddedMapping;
import org.eclipse.jpt.jpa.core.context.Entity;
import org.eclipse.jpt.jpa.core.context.EnumType;
-import org.eclipse.jpt.jpa.core.context.EnumeratedConverter;
+import org.eclipse.jpt.jpa.core.context.BaseEnumeratedConverter;
import org.eclipse.jpt.jpa.core.context.IdMapping;
import org.eclipse.jpt.jpa.core.context.JoinColumn;
import org.eclipse.jpt.jpa.core.context.JoinTableRelationshipStrategy;
@@ -38,7 +38,7 @@ import org.eclipse.jpt.jpa.core.context.OneToOneMapping;
import org.eclipse.jpt.jpa.core.context.PersistentAttribute;
import org.eclipse.jpt.jpa.core.context.PersistentType;
import org.eclipse.jpt.jpa.core.context.ReadOnlyAttributeOverride;
-import org.eclipse.jpt.jpa.core.context.TemporalConverter;
+import org.eclipse.jpt.jpa.core.context.BaseTemporalConverter;
import org.eclipse.jpt.jpa.core.context.TemporalType;
import org.eclipse.jpt.jpa.core.context.TransientMapping;
import org.eclipse.jpt.jpa.core.context.VersionMapping;
@@ -1540,7 +1540,7 @@ public class GenericJavaManyToManyMapping2_0Tests
JavaManyToManyMapping2_0 manyToManyMapping = (JavaManyToManyMapping2_0) persistentAttribute.getMapping();
assertNull(manyToManyMapping.getMapKeyConverter().getType());
- manyToManyMapping.setMapKeyConverter(EnumeratedConverter.class);
+ manyToManyMapping.setMapKeyConverter(BaseEnumeratedConverter.class);
JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE);
JavaResourceField resourceField = resourceType.getFields().iterator().next();
@@ -1549,10 +1549,10 @@ public class GenericJavaManyToManyMapping2_0Tests
assertNotNull(enumerated);
assertEquals(null, enumerated.getValue());
- ((EnumeratedConverter) manyToManyMapping.getMapKeyConverter()).setSpecifiedEnumType(EnumType.STRING);
+ ((BaseEnumeratedConverter) manyToManyMapping.getMapKeyConverter()).setSpecifiedEnumType(EnumType.STRING);
assertEquals(org.eclipse.jpt.jpa.core.resource.java.EnumType.STRING, enumerated.getValue());
- ((EnumeratedConverter) manyToManyMapping.getMapKeyConverter()).setSpecifiedEnumType(null);
+ ((BaseEnumeratedConverter) manyToManyMapping.getMapKeyConverter()).setSpecifiedEnumType(null);
assertNotNull(resourceField.getAnnotation(MapKeyEnumerated2_0Annotation.ANNOTATION_NAME));
assertNull(enumerated.getValue());
@@ -1576,12 +1576,12 @@ public class GenericJavaManyToManyMapping2_0Tests
enumerated.setValue(org.eclipse.jpt.jpa.core.resource.java.EnumType.STRING);
getJpaProject().synchronizeContextModel();
- assertEquals(EnumType.STRING, ((EnumeratedConverter) manyToManyMapping.getMapKeyConverter()).getSpecifiedEnumType());
+ assertEquals(EnumType.STRING, ((BaseEnumeratedConverter) manyToManyMapping.getMapKeyConverter()).getSpecifiedEnumType());
enumerated.setValue(null);
getJpaProject().synchronizeContextModel();
assertNotNull(resourceField.getAnnotation(MapKeyEnumerated2_0Annotation.ANNOTATION_NAME));
- assertNull(((EnumeratedConverter) manyToManyMapping.getMapKeyConverter()).getSpecifiedEnumType());
+ assertNull(((BaseEnumeratedConverter) manyToManyMapping.getMapKeyConverter()).getSpecifiedEnumType());
assertFalse(manyToManyMapping.isDefault());
assertSame(manyToManyMapping, persistentAttribute.getMapping());
}
@@ -1594,7 +1594,7 @@ public class GenericJavaManyToManyMapping2_0Tests
JavaManyToManyMapping2_0 manyToManyMapping = (JavaManyToManyMapping2_0) persistentAttribute.getMapping();
assertNull(manyToManyMapping.getMapKeyConverter().getType());
- manyToManyMapping.setMapKeyConverter(TemporalConverter.class);
+ manyToManyMapping.setMapKeyConverter(BaseTemporalConverter.class);
JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE);
JavaResourceField resourceField = resourceType.getFields().iterator().next();
@@ -1603,10 +1603,10 @@ public class GenericJavaManyToManyMapping2_0Tests
assertNotNull(temporal);
assertEquals(null, temporal.getValue());
- ((TemporalConverter) manyToManyMapping.getMapKeyConverter()).setTemporalType(TemporalType.TIME);
+ ((BaseTemporalConverter) manyToManyMapping.getMapKeyConverter()).setTemporalType(TemporalType.TIME);
assertEquals(org.eclipse.jpt.jpa.core.resource.java.TemporalType.TIME, temporal.getValue());
- ((TemporalConverter) manyToManyMapping.getMapKeyConverter()).setTemporalType(null);
+ ((BaseTemporalConverter) manyToManyMapping.getMapKeyConverter()).setTemporalType(null);
assertNull(resourceField.getAnnotation(MapKeyTemporal2_0Annotation.ANNOTATION_NAME));
}
@@ -1626,12 +1626,12 @@ public class GenericJavaManyToManyMapping2_0Tests
temporal.setValue(org.eclipse.jpt.jpa.core.resource.java.TemporalType.TIME);
getJpaProject().synchronizeContextModel();
- assertEquals(TemporalType.TIME, ((TemporalConverter) manyToManyMapping.getMapKeyConverter()).getTemporalType());
+ assertEquals(TemporalType.TIME, ((BaseTemporalConverter) manyToManyMapping.getMapKeyConverter()).getTemporalType());
temporal.setValue(null);
getJpaProject().synchronizeContextModel();
assertNotNull(resourceField.getAnnotation(MapKeyTemporal2_0Annotation.ANNOTATION_NAME));
- assertNull(((TemporalConverter) manyToManyMapping.getMapKeyConverter()).getTemporalType());
+ assertNull(((BaseTemporalConverter) manyToManyMapping.getMapKeyConverter()).getTemporalType());
assertFalse(manyToManyMapping.isDefault());
assertSame(manyToManyMapping, persistentAttribute.getMapping());
}
diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/java/GenericJavaOneToManyMapping2_0Tests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/java/GenericJavaOneToManyMapping2_0Tests.java
index a194e43ca6..489deda957 100644
--- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/java/GenericJavaOneToManyMapping2_0Tests.java
+++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/java/GenericJavaOneToManyMapping2_0Tests.java
@@ -28,7 +28,7 @@ import org.eclipse.jpt.jpa.core.context.EmbeddedIdMapping;
import org.eclipse.jpt.jpa.core.context.EmbeddedMapping;
import org.eclipse.jpt.jpa.core.context.Entity;
import org.eclipse.jpt.jpa.core.context.EnumType;
-import org.eclipse.jpt.jpa.core.context.EnumeratedConverter;
+import org.eclipse.jpt.jpa.core.context.BaseEnumeratedConverter;
import org.eclipse.jpt.jpa.core.context.IdMapping;
import org.eclipse.jpt.jpa.core.context.JoinColumn;
import org.eclipse.jpt.jpa.core.context.JoinColumnRelationship;
@@ -38,7 +38,7 @@ import org.eclipse.jpt.jpa.core.context.OneToManyMapping;
import org.eclipse.jpt.jpa.core.context.OneToOneMapping;
import org.eclipse.jpt.jpa.core.context.PersistentAttribute;
import org.eclipse.jpt.jpa.core.context.ReadOnlyAttributeOverride;
-import org.eclipse.jpt.jpa.core.context.TemporalConverter;
+import org.eclipse.jpt.jpa.core.context.BaseTemporalConverter;
import org.eclipse.jpt.jpa.core.context.TemporalType;
import org.eclipse.jpt.jpa.core.context.TransientMapping;
import org.eclipse.jpt.jpa.core.context.VersionMapping;
@@ -1801,7 +1801,7 @@ public class GenericJavaOneToManyMapping2_0Tests
JavaOneToManyMapping2_0 oneToManyMapping = (JavaOneToManyMapping2_0) persistentAttribute.getMapping();
assertNull(oneToManyMapping.getMapKeyConverter().getType());
- oneToManyMapping.setMapKeyConverter(EnumeratedConverter.class);
+ oneToManyMapping.setMapKeyConverter(BaseEnumeratedConverter.class);
JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE);
JavaResourceField resourceField = resourceType.getFields().iterator().next();
@@ -1810,10 +1810,10 @@ public class GenericJavaOneToManyMapping2_0Tests
assertNotNull(enumerated);
assertEquals(null, enumerated.getValue());
- ((EnumeratedConverter) oneToManyMapping.getMapKeyConverter()).setSpecifiedEnumType(EnumType.STRING);
+ ((BaseEnumeratedConverter) oneToManyMapping.getMapKeyConverter()).setSpecifiedEnumType(EnumType.STRING);
assertEquals(org.eclipse.jpt.jpa.core.resource.java.EnumType.STRING, enumerated.getValue());
- ((EnumeratedConverter) oneToManyMapping.getMapKeyConverter()).setSpecifiedEnumType(null);
+ ((BaseEnumeratedConverter) oneToManyMapping.getMapKeyConverter()).setSpecifiedEnumType(null);
assertNotNull(resourceField.getAnnotation(MapKeyEnumerated2_0Annotation.ANNOTATION_NAME));
assertNull(enumerated.getValue());
@@ -1837,12 +1837,12 @@ public class GenericJavaOneToManyMapping2_0Tests
enumerated.setValue(org.eclipse.jpt.jpa.core.resource.java.EnumType.STRING);
getJpaProject().synchronizeContextModel();
- assertEquals(EnumType.STRING, ((EnumeratedConverter) oneToManyMapping.getMapKeyConverter()).getSpecifiedEnumType());
+ assertEquals(EnumType.STRING, ((BaseEnumeratedConverter) oneToManyMapping.getMapKeyConverter()).getSpecifiedEnumType());
enumerated.setValue(null);
getJpaProject().synchronizeContextModel();
assertNotNull(resourceField.getAnnotation(MapKeyEnumerated2_0Annotation.ANNOTATION_NAME));
- assertNull(((EnumeratedConverter) oneToManyMapping.getMapKeyConverter()).getSpecifiedEnumType());
+ assertNull(((BaseEnumeratedConverter) oneToManyMapping.getMapKeyConverter()).getSpecifiedEnumType());
assertFalse(oneToManyMapping.isDefault());
assertSame(oneToManyMapping, persistentAttribute.getMapping());
}
@@ -1855,7 +1855,7 @@ public class GenericJavaOneToManyMapping2_0Tests
JavaOneToManyMapping2_0 oneToManyMapping = (JavaOneToManyMapping2_0) persistentAttribute.getMapping();
assertNull(oneToManyMapping.getMapKeyConverter().getType());
- oneToManyMapping.setMapKeyConverter(TemporalConverter.class);
+ oneToManyMapping.setMapKeyConverter(BaseTemporalConverter.class);
JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE);
JavaResourceField resourceField = resourceType.getFields().iterator().next();
@@ -1864,10 +1864,10 @@ public class GenericJavaOneToManyMapping2_0Tests
assertNotNull(temporal);
assertEquals(null, temporal.getValue());
- ((TemporalConverter) oneToManyMapping.getMapKeyConverter()).setTemporalType(TemporalType.TIME);
+ ((BaseTemporalConverter) oneToManyMapping.getMapKeyConverter()).setTemporalType(TemporalType.TIME);
assertEquals(org.eclipse.jpt.jpa.core.resource.java.TemporalType.TIME, temporal.getValue());
- ((TemporalConverter) oneToManyMapping.getMapKeyConverter()).setTemporalType(null);
+ ((BaseTemporalConverter) oneToManyMapping.getMapKeyConverter()).setTemporalType(null);
assertNull(resourceField.getAnnotation(MapKeyTemporal2_0Annotation.ANNOTATION_NAME));
}
@@ -1887,12 +1887,12 @@ public class GenericJavaOneToManyMapping2_0Tests
temporal.setValue(org.eclipse.jpt.jpa.core.resource.java.TemporalType.TIME);
getJpaProject().synchronizeContextModel();
- assertEquals(TemporalType.TIME, ((TemporalConverter) oneToManyMapping.getMapKeyConverter()).getTemporalType());
+ assertEquals(TemporalType.TIME, ((BaseTemporalConverter) oneToManyMapping.getMapKeyConverter()).getTemporalType());
temporal.setValue(null);
getJpaProject().synchronizeContextModel();
assertNotNull(resourceField.getAnnotation(MapKeyTemporal2_0Annotation.ANNOTATION_NAME));
- assertNull(((TemporalConverter) oneToManyMapping.getMapKeyConverter()).getTemporalType());
+ assertNull(((BaseTemporalConverter) oneToManyMapping.getMapKeyConverter()).getTemporalType());
assertFalse(oneToManyMapping.isDefault());
assertSame(oneToManyMapping, persistentAttribute.getMapping());
}
diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/java/GenericJavaVersionMapping2_0Tests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/java/GenericJavaVersionMapping2_0Tests.java
index 5fd0a4ff32..9f5434f05e 100644
--- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/java/GenericJavaVersionMapping2_0Tests.java
+++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/java/GenericJavaVersionMapping2_0Tests.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2011 Oracle. All rights reserved.
+ * Copyright (c) 2011, 2012 Oracle. All rights reserved.
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0, which accompanies this distribution
* and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -25,7 +25,7 @@ import org.eclipse.jpt.jpa.core.context.ManyToOneMapping;
import org.eclipse.jpt.jpa.core.context.OneToManyMapping;
import org.eclipse.jpt.jpa.core.context.OneToOneMapping;
import org.eclipse.jpt.jpa.core.context.PersistentAttribute;
-import org.eclipse.jpt.jpa.core.context.TemporalConverter;
+import org.eclipse.jpt.jpa.core.context.BaseTemporalConverter;
import org.eclipse.jpt.jpa.core.context.TemporalType;
import org.eclipse.jpt.jpa.core.context.TransientMapping;
import org.eclipse.jpt.jpa.core.context.VersionMapping;
@@ -83,14 +83,14 @@ public class GenericJavaVersionMapping2_0Tests extends Generic2_0ContextModelTes
JavaResourceField resourceField = resourceType.getFields().iterator().next();
assertFalse(versionMapping.isDefault());
versionMapping.getColumn().setSpecifiedName("FOO");
- versionMapping.setConverter(TemporalConverter.class);
- ((TemporalConverter) versionMapping.getConverter()).setTemporalType(TemporalType.TIME);
+ versionMapping.setConverter(BaseTemporalConverter.class);
+ ((BaseTemporalConverter) versionMapping.getConverter()).setTemporalType(TemporalType.TIME);
resourceField.addAnnotation(Access2_0Annotation.ANNOTATION_NAME);
assertFalse(versionMapping.isDefault());
persistentAttribute.setMappingKey(MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY);
assertEquals("FOO", ((BasicMapping) persistentAttribute.getMapping()).getColumn().getSpecifiedName());
- assertEquals(TemporalType.TIME, ((TemporalConverter) ((BasicMapping) persistentAttribute.getMapping()).getConverter()).getTemporalType());
+ assertEquals(TemporalType.TIME, ((BaseTemporalConverter) ((BasicMapping) persistentAttribute.getMapping()).getConverter()).getTemporalType());
assertNull(resourceField.getAnnotation(VersionAnnotation.ANNOTATION_NAME));
assertNotNull(resourceField.getAnnotation(BasicAnnotation.ANNOTATION_NAME));
@@ -107,16 +107,16 @@ public class GenericJavaVersionMapping2_0Tests extends Generic2_0ContextModelTes
VersionMapping versionMapping = (VersionMapping) persistentAttribute.getMapping();
assertFalse(versionMapping.isDefault());
versionMapping.getColumn().setSpecifiedName("FOO");
- versionMapping.setConverter(TemporalConverter.class);
+ versionMapping.setConverter(BaseTemporalConverter.class);
JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE);
JavaResourceField resourceField = resourceType.getFields().iterator().next();
- ((TemporalConverter) versionMapping.getConverter()).setTemporalType(TemporalType.TIME);
+ ((BaseTemporalConverter) versionMapping.getConverter()).setTemporalType(TemporalType.TIME);
resourceField.addAnnotation(Access2_0Annotation.ANNOTATION_NAME);
assertFalse(versionMapping.isDefault());
persistentAttribute.setMappingKey(MappingKeys.NULL_ATTRIBUTE_MAPPING_KEY);
assertEquals("FOO", ((BasicMapping) persistentAttribute.getMapping()).getColumn().getSpecifiedName());
- assertEquals(TemporalType.TIME, ((TemporalConverter) ((BasicMapping) persistentAttribute.getMapping()).getConverter()).getTemporalType());
+ assertEquals(TemporalType.TIME, ((BaseTemporalConverter) ((BasicMapping) persistentAttribute.getMapping()).getConverter()).getTemporalType());
assertNull(resourceField.getAnnotation(VersionAnnotation.ANNOTATION_NAME));
assertNotNull(resourceField.getAnnotation(Access2_0Annotation.ANNOTATION_NAME));
@@ -134,14 +134,14 @@ public class GenericJavaVersionMapping2_0Tests extends Generic2_0ContextModelTes
JavaResourceField resourceField = resourceType.getFields().iterator().next();
assertFalse(versionMapping.isDefault());
versionMapping.getColumn().setSpecifiedName("FOO");
- versionMapping.setConverter(TemporalConverter.class);
- ((TemporalConverter) versionMapping.getConverter()).setTemporalType(TemporalType.TIME);
+ versionMapping.setConverter(BaseTemporalConverter.class);
+ ((BaseTemporalConverter) versionMapping.getConverter()).setTemporalType(TemporalType.TIME);
resourceField.addAnnotation(Access2_0Annotation.ANNOTATION_NAME);
assertFalse(versionMapping.isDefault());
persistentAttribute.setMappingKey(MappingKeys.ID_ATTRIBUTE_MAPPING_KEY);
assertEquals("FOO", ((IdMapping) persistentAttribute.getMapping()).getColumn().getSpecifiedName());
- assertEquals(TemporalType.TIME, ((TemporalConverter) ((IdMapping) persistentAttribute.getMapping()).getConverter()).getTemporalType());
+ assertEquals(TemporalType.TIME, ((BaseTemporalConverter) ((IdMapping) persistentAttribute.getMapping()).getConverter()).getTemporalType());
assertNull(resourceField.getAnnotation(VersionAnnotation.ANNOTATION_NAME));
assertNotNull(resourceField.getAnnotation(Access2_0Annotation.ANNOTATION_NAME));
@@ -160,8 +160,8 @@ public class GenericJavaVersionMapping2_0Tests extends Generic2_0ContextModelTes
JavaResourceField resourceField = resourceType.getFields().iterator().next();
assertFalse(versionMapping.isDefault());
versionMapping.getColumn().setSpecifiedName("FOO");
- versionMapping.setConverter(TemporalConverter.class);
- ((TemporalConverter) versionMapping.getConverter()).setTemporalType(TemporalType.TIME);
+ versionMapping.setConverter(BaseTemporalConverter.class);
+ ((BaseTemporalConverter) versionMapping.getConverter()).setTemporalType(TemporalType.TIME);
resourceField.addAnnotation(Access2_0Annotation.ANNOTATION_NAME);
assertFalse(versionMapping.isDefault());
@@ -185,8 +185,8 @@ public class GenericJavaVersionMapping2_0Tests extends Generic2_0ContextModelTes
JavaResourceField resourceField = resourceType.getFields().iterator().next();
assertFalse(versionMapping.isDefault());
versionMapping.getColumn().setSpecifiedName("FOO");
- versionMapping.setConverter(TemporalConverter.class);
- ((TemporalConverter) versionMapping.getConverter()).setTemporalType(TemporalType.TIME);
+ versionMapping.setConverter(BaseTemporalConverter.class);
+ ((BaseTemporalConverter) versionMapping.getConverter()).setTemporalType(TemporalType.TIME);
resourceField.addAnnotation(Access2_0Annotation.ANNOTATION_NAME);
assertFalse(versionMapping.isDefault());
@@ -210,8 +210,8 @@ public class GenericJavaVersionMapping2_0Tests extends Generic2_0ContextModelTes
JavaResourceField resourceField = resourceType.getFields().iterator().next();
assertFalse(versionMapping.isDefault());
versionMapping.getColumn().setSpecifiedName("FOO");
- versionMapping.setConverter(TemporalConverter.class);
- ((TemporalConverter) versionMapping.getConverter()).setTemporalType(TemporalType.TIME);
+ versionMapping.setConverter(BaseTemporalConverter.class);
+ ((BaseTemporalConverter) versionMapping.getConverter()).setTemporalType(TemporalType.TIME);
resourceField.addAnnotation(Access2_0Annotation.ANNOTATION_NAME);
assertFalse(versionMapping.isDefault());
@@ -235,8 +235,8 @@ public class GenericJavaVersionMapping2_0Tests extends Generic2_0ContextModelTes
JavaResourceField resourceField = resourceType.getFields().iterator().next();
assertFalse(versionMapping.isDefault());
versionMapping.getColumn().setSpecifiedName("FOO");
- versionMapping.setConverter(TemporalConverter.class);
- ((TemporalConverter) versionMapping.getConverter()).setTemporalType(TemporalType.TIME);
+ versionMapping.setConverter(BaseTemporalConverter.class);
+ ((BaseTemporalConverter) versionMapping.getConverter()).setTemporalType(TemporalType.TIME);
resourceField.addAnnotation(Access2_0Annotation.ANNOTATION_NAME);
assertFalse(versionMapping.isDefault());
@@ -260,8 +260,8 @@ public class GenericJavaVersionMapping2_0Tests extends Generic2_0ContextModelTes
JavaResourceField resourceField = resourceType.getFields().iterator().next();
assertFalse(versionMapping.isDefault());
versionMapping.getColumn().setSpecifiedName("FOO");
- versionMapping.setConverter(TemporalConverter.class);
- ((TemporalConverter) versionMapping.getConverter()).setTemporalType(TemporalType.TIME);
+ versionMapping.setConverter(BaseTemporalConverter.class);
+ ((BaseTemporalConverter) versionMapping.getConverter()).setTemporalType(TemporalType.TIME);
resourceField.addAnnotation(Access2_0Annotation.ANNOTATION_NAME);
assertFalse(versionMapping.isDefault());
@@ -285,8 +285,8 @@ public class GenericJavaVersionMapping2_0Tests extends Generic2_0ContextModelTes
JavaResourceField resourceField = resourceType.getFields().iterator().next();
assertFalse(versionMapping.isDefault());
versionMapping.getColumn().setSpecifiedName("FOO");
- versionMapping.setConverter(TemporalConverter.class);
- ((TemporalConverter) versionMapping.getConverter()).setTemporalType(TemporalType.TIME);
+ versionMapping.setConverter(BaseTemporalConverter.class);
+ ((BaseTemporalConverter) versionMapping.getConverter()).setTemporalType(TemporalType.TIME);
resourceField.addAnnotation(Access2_0Annotation.ANNOTATION_NAME);
assertFalse(versionMapping.isDefault());
@@ -310,8 +310,8 @@ public class GenericJavaVersionMapping2_0Tests extends Generic2_0ContextModelTes
JavaResourceField resourceField = resourceType.getFields().iterator().next();
assertFalse(versionMapping.isDefault());
versionMapping.getColumn().setSpecifiedName("FOO");
- versionMapping.setConverter(TemporalConverter.class);
- ((TemporalConverter) versionMapping.getConverter()).setTemporalType(TemporalType.TIME);
+ versionMapping.setConverter(BaseTemporalConverter.class);
+ ((BaseTemporalConverter) versionMapping.getConverter()).setTemporalType(TemporalType.TIME);
resourceField.addAnnotation(Access2_0Annotation.ANNOTATION_NAME);
assertFalse(versionMapping.isDefault());
@@ -335,8 +335,8 @@ public class GenericJavaVersionMapping2_0Tests extends Generic2_0ContextModelTes
JavaResourceField resourceField = resourceType.getFields().iterator().next();
assertFalse(versionMapping.isDefault());
versionMapping.getColumn().setSpecifiedName("FOO");
- versionMapping.setConverter(TemporalConverter.class);
- ((TemporalConverter) versionMapping.getConverter()).setTemporalType(TemporalType.TIME);
+ versionMapping.setConverter(BaseTemporalConverter.class);
+ ((BaseTemporalConverter) versionMapping.getConverter()).setTemporalType(TemporalType.TIME);
resourceField.addAnnotation(Access2_0Annotation.ANNOTATION_NAME);
assertFalse(versionMapping.isDefault());
diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/orm/GenericOrmElementCollectionMapping2_0Tests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/orm/GenericOrmElementCollectionMapping2_0Tests.java
index 88665cdb67..1194bbcd35 100644
--- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/orm/GenericOrmElementCollectionMapping2_0Tests.java
+++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/orm/GenericOrmElementCollectionMapping2_0Tests.java
@@ -22,7 +22,7 @@ import org.eclipse.jpt.jpa.core.context.Column;
import org.eclipse.jpt.jpa.core.context.EmbeddedIdMapping;
import org.eclipse.jpt.jpa.core.context.EmbeddedMapping;
import org.eclipse.jpt.jpa.core.context.EnumType;
-import org.eclipse.jpt.jpa.core.context.EnumeratedConverter;
+import org.eclipse.jpt.jpa.core.context.BaseEnumeratedConverter;
import org.eclipse.jpt.jpa.core.context.FetchType;
import org.eclipse.jpt.jpa.core.context.IdMapping;
import org.eclipse.jpt.jpa.core.context.JoinColumn;
@@ -31,7 +31,7 @@ import org.eclipse.jpt.jpa.core.context.ManyToOneMapping;
import org.eclipse.jpt.jpa.core.context.OneToManyMapping;
import org.eclipse.jpt.jpa.core.context.ReadOnlyAttributeOverride;
import org.eclipse.jpt.jpa.core.context.ReadOnlyColumn;
-import org.eclipse.jpt.jpa.core.context.TemporalConverter;
+import org.eclipse.jpt.jpa.core.context.BaseTemporalConverter;
import org.eclipse.jpt.jpa.core.context.TemporalType;
import org.eclipse.jpt.jpa.core.context.TransientMapping;
import org.eclipse.jpt.jpa.core.context.VersionMapping;
@@ -1496,11 +1496,11 @@ public class GenericOrmElementCollectionMapping2_0Tests extends Generic2_0Contex
//set enumerated in the resource model, verify context model updated
elementCollectionResource.setMapKeyEnumerated(org.eclipse.jpt.jpa.core.resource.orm.EnumType.ORDINAL);
- assertEquals(EnumType.ORDINAL, ((EnumeratedConverter) ormElementCollectionMapping.getMapKeyConverter()).getSpecifiedEnumType());
+ assertEquals(EnumType.ORDINAL, ((BaseEnumeratedConverter) ormElementCollectionMapping.getMapKeyConverter()).getSpecifiedEnumType());
assertEquals(org.eclipse.jpt.jpa.core.resource.orm.EnumType.ORDINAL, elementCollectionResource.getMapKeyEnumerated());
elementCollectionResource.setMapKeyEnumerated(org.eclipse.jpt.jpa.core.resource.orm.EnumType.STRING);
- assertEquals(EnumType.STRING, ((EnumeratedConverter) ormElementCollectionMapping.getMapKeyConverter()).getSpecifiedEnumType());
+ assertEquals(EnumType.STRING, ((BaseEnumeratedConverter) ormElementCollectionMapping.getMapKeyConverter()).getSpecifiedEnumType());
assertEquals(org.eclipse.jpt.jpa.core.resource.orm.EnumType.STRING, elementCollectionResource.getMapKeyEnumerated());
//set enumerated to null in the resource model
@@ -1520,14 +1520,14 @@ public class GenericOrmElementCollectionMapping2_0Tests extends Generic2_0Contex
assertNull(elementCollectionResource.getMapKeyEnumerated());
//set enumerated in the context model, verify resource model updated
- ormElementCollectionMapping.setMapKeyConverter(EnumeratedConverter.class);
- ((EnumeratedConverter) ormElementCollectionMapping.getMapKeyConverter()).setSpecifiedEnumType(EnumType.ORDINAL);
+ ormElementCollectionMapping.setMapKeyConverter(BaseEnumeratedConverter.class);
+ ((BaseEnumeratedConverter) ormElementCollectionMapping.getMapKeyConverter()).setSpecifiedEnumType(EnumType.ORDINAL);
assertEquals(org.eclipse.jpt.jpa.core.resource.orm.EnumType.ORDINAL, elementCollectionResource.getMapKeyEnumerated());
- assertEquals(EnumType.ORDINAL, ((EnumeratedConverter) ormElementCollectionMapping.getMapKeyConverter()).getSpecifiedEnumType());
+ assertEquals(EnumType.ORDINAL, ((BaseEnumeratedConverter) ormElementCollectionMapping.getMapKeyConverter()).getSpecifiedEnumType());
- ((EnumeratedConverter) ormElementCollectionMapping.getMapKeyConverter()).setSpecifiedEnumType(EnumType.STRING);
+ ((BaseEnumeratedConverter) ormElementCollectionMapping.getMapKeyConverter()).setSpecifiedEnumType(EnumType.STRING);
assertEquals(org.eclipse.jpt.jpa.core.resource.orm.EnumType.STRING, elementCollectionResource.getMapKeyEnumerated());
- assertEquals(EnumType.STRING, ((EnumeratedConverter) ormElementCollectionMapping.getMapKeyConverter()).getSpecifiedEnumType());
+ assertEquals(EnumType.STRING, ((BaseEnumeratedConverter) ormElementCollectionMapping.getMapKeyConverter()).getSpecifiedEnumType());
//set enumerated to null in the context model
ormElementCollectionMapping.setMapKeyConverter(null);
@@ -1547,15 +1547,15 @@ public class GenericOrmElementCollectionMapping2_0Tests extends Generic2_0Contex
//set temporal in the resource model, verify context model updated
elementCollectionResource.setMapKeyTemporal(org.eclipse.jpt.jpa.core.resource.orm.TemporalType.DATE);
- assertEquals(TemporalType.DATE, ((TemporalConverter) ormElementCollectionMapping.getMapKeyConverter()).getTemporalType());
+ assertEquals(TemporalType.DATE, ((BaseTemporalConverter) ormElementCollectionMapping.getMapKeyConverter()).getTemporalType());
assertEquals(org.eclipse.jpt.jpa.core.resource.orm.TemporalType.DATE, elementCollectionResource.getMapKeyTemporal());
elementCollectionResource.setMapKeyTemporal(org.eclipse.jpt.jpa.core.resource.orm.TemporalType.TIME);
- assertEquals(TemporalType.TIME, ((TemporalConverter) ormElementCollectionMapping.getMapKeyConverter()).getTemporalType());
+ assertEquals(TemporalType.TIME, ((BaseTemporalConverter) ormElementCollectionMapping.getMapKeyConverter()).getTemporalType());
assertEquals(org.eclipse.jpt.jpa.core.resource.orm.TemporalType.TIME, elementCollectionResource.getMapKeyTemporal());
elementCollectionResource.setMapKeyTemporal(org.eclipse.jpt.jpa.core.resource.orm.TemporalType.TIMESTAMP);
- assertEquals(TemporalType.TIMESTAMP, ((TemporalConverter) ormElementCollectionMapping.getMapKeyConverter()).getTemporalType());
+ assertEquals(TemporalType.TIMESTAMP, ((BaseTemporalConverter) ormElementCollectionMapping.getMapKeyConverter()).getTemporalType());
assertEquals(org.eclipse.jpt.jpa.core.resource.orm.TemporalType.TIMESTAMP, elementCollectionResource.getMapKeyTemporal());
//set temporal to null in the resource model
@@ -1575,14 +1575,14 @@ public class GenericOrmElementCollectionMapping2_0Tests extends Generic2_0Contex
assertNull(elementCollectionResource.getMapKeyTemporal());
//set temporal in the context model, verify resource model updated
- ormElementCollectionMapping.setMapKeyConverter(TemporalConverter.class);
- ((TemporalConverter) ormElementCollectionMapping.getMapKeyConverter()).setTemporalType(TemporalType.DATE);
+ ormElementCollectionMapping.setMapKeyConverter(BaseTemporalConverter.class);
+ ((BaseTemporalConverter) ormElementCollectionMapping.getMapKeyConverter()).setTemporalType(TemporalType.DATE);
assertEquals(org.eclipse.jpt.jpa.core.resource.orm.TemporalType.DATE, elementCollectionResource.getMapKeyTemporal());
- assertEquals(TemporalType.DATE, ((TemporalConverter) ormElementCollectionMapping.getMapKeyConverter()).getTemporalType());
+ assertEquals(TemporalType.DATE, ((BaseTemporalConverter) ormElementCollectionMapping.getMapKeyConverter()).getTemporalType());
- ((TemporalConverter) ormElementCollectionMapping.getMapKeyConverter()).setTemporalType(TemporalType.TIME);
+ ((BaseTemporalConverter) ormElementCollectionMapping.getMapKeyConverter()).setTemporalType(TemporalType.TIME);
assertEquals(org.eclipse.jpt.jpa.core.resource.orm.TemporalType.TIME, elementCollectionResource.getMapKeyTemporal());
- assertEquals(TemporalType.TIME, ((TemporalConverter) ormElementCollectionMapping.getMapKeyConverter()).getTemporalType());
+ assertEquals(TemporalType.TIME, ((BaseTemporalConverter) ormElementCollectionMapping.getMapKeyConverter()).getTemporalType());
//set temporal to null in the context model
ormElementCollectionMapping.setMapKeyConverter(null);
diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/orm/GenericOrmManyToManyMapping2_0Tests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/orm/GenericOrmManyToManyMapping2_0Tests.java
index 65d572259c..148a505fdb 100644
--- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/orm/GenericOrmManyToManyMapping2_0Tests.java
+++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/orm/GenericOrmManyToManyMapping2_0Tests.java
@@ -1,13 +1,12 @@
/*******************************************************************************
- * Copyright (c) 2009, 2012 Oracle.
- * All rights reserved. This program and the accompanying materials are
- * made available under the terms of the Eclipse Public License v1.0 which
- * accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Oracle - initial API and implementation
- *******************************************************************************/
+ * Copyright (c) 2009, 2012 Oracle. All rights reserved.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0, which accompanies this distribution
+ * and is available at http://www.eclipse.org/legal/epl-v10.html.
+ *
+ * Contributors:
+ * Oracle - initial API and implementation
+ ******************************************************************************/
package org.eclipse.jpt.jpa.core.tests.internal.jpa2.context.orm;
import java.util.Iterator;
@@ -20,13 +19,13 @@ import org.eclipse.jpt.jpa.core.context.AttributeMapping;
import org.eclipse.jpt.jpa.core.context.Column;
import org.eclipse.jpt.jpa.core.context.Entity;
import org.eclipse.jpt.jpa.core.context.EnumType;
-import org.eclipse.jpt.jpa.core.context.EnumeratedConverter;
+import org.eclipse.jpt.jpa.core.context.BaseEnumeratedConverter;
import org.eclipse.jpt.jpa.core.context.FetchType;
import org.eclipse.jpt.jpa.core.context.JoinColumn;
import org.eclipse.jpt.jpa.core.context.ManyToManyMapping;
import org.eclipse.jpt.jpa.core.context.ReadOnlyColumn;
import org.eclipse.jpt.jpa.core.context.ReadOnlyPersistentAttribute;
-import org.eclipse.jpt.jpa.core.context.TemporalConverter;
+import org.eclipse.jpt.jpa.core.context.BaseTemporalConverter;
import org.eclipse.jpt.jpa.core.context.TemporalType;
import org.eclipse.jpt.jpa.core.context.java.JavaManyToManyMapping;
import org.eclipse.jpt.jpa.core.context.orm.OrmEntity;
@@ -903,7 +902,7 @@ public class GenericOrmManyToManyMapping2_0Tests
assertEquals(FetchType.EAGER, virtualManyToManyMapping.getSpecifiedFetch());
assertEquals("Address", virtualManyToManyMapping.getSpecifiedTargetEntity());
assertNull(virtualManyToManyMapping.getRelationship().getMappedByStrategy().getMappedByAttribute());
- assertEquals(EnumType.STRING, ((EnumeratedConverter) virtualManyToManyMapping.getMapKeyConverter()).getEnumType());
+ assertEquals(EnumType.STRING, ((BaseEnumeratedConverter) virtualManyToManyMapping.getMapKeyConverter()).getEnumType());
Cascade2_0 cascade = (Cascade2_0) virtualManyToManyMapping.getCascade();
assertTrue(cascade.isAll());
@@ -964,11 +963,11 @@ public class GenericOrmManyToManyMapping2_0Tests
//set enumerated in the resource model, verify context model updated
manyToManyResource.setMapKeyEnumerated(org.eclipse.jpt.jpa.core.resource.orm.EnumType.ORDINAL);
- assertEquals(EnumType.ORDINAL, ((EnumeratedConverter) ormManyToManyMapping.getMapKeyConverter()).getSpecifiedEnumType());
+ assertEquals(EnumType.ORDINAL, ((BaseEnumeratedConverter) ormManyToManyMapping.getMapKeyConverter()).getSpecifiedEnumType());
assertEquals(org.eclipse.jpt.jpa.core.resource.orm.EnumType.ORDINAL, manyToManyResource.getMapKeyEnumerated());
manyToManyResource.setMapKeyEnumerated(org.eclipse.jpt.jpa.core.resource.orm.EnumType.STRING);
- assertEquals(EnumType.STRING, ((EnumeratedConverter) ormManyToManyMapping.getMapKeyConverter()).getSpecifiedEnumType());
+ assertEquals(EnumType.STRING, ((BaseEnumeratedConverter) ormManyToManyMapping.getMapKeyConverter()).getSpecifiedEnumType());
assertEquals(org.eclipse.jpt.jpa.core.resource.orm.EnumType.STRING, manyToManyResource.getMapKeyEnumerated());
//set enumerated to null in the resource model
@@ -988,14 +987,14 @@ public class GenericOrmManyToManyMapping2_0Tests
assertNull(manyToManyResource.getMapKeyEnumerated());
//set enumerated in the context model, verify resource model updated
- ormManyToManyMapping.setMapKeyConverter(EnumeratedConverter.class);
- ((EnumeratedConverter) ormManyToManyMapping.getMapKeyConverter()).setSpecifiedEnumType(EnumType.ORDINAL);
+ ormManyToManyMapping.setMapKeyConverter(BaseEnumeratedConverter.class);
+ ((BaseEnumeratedConverter) ormManyToManyMapping.getMapKeyConverter()).setSpecifiedEnumType(EnumType.ORDINAL);
assertEquals(org.eclipse.jpt.jpa.core.resource.orm.EnumType.ORDINAL, manyToManyResource.getMapKeyEnumerated());
- assertEquals(EnumType.ORDINAL, ((EnumeratedConverter) ormManyToManyMapping.getMapKeyConverter()).getSpecifiedEnumType());
+ assertEquals(EnumType.ORDINAL, ((BaseEnumeratedConverter) ormManyToManyMapping.getMapKeyConverter()).getSpecifiedEnumType());
- ((EnumeratedConverter) ormManyToManyMapping.getMapKeyConverter()).setSpecifiedEnumType(EnumType.STRING);
+ ((BaseEnumeratedConverter) ormManyToManyMapping.getMapKeyConverter()).setSpecifiedEnumType(EnumType.STRING);
assertEquals(org.eclipse.jpt.jpa.core.resource.orm.EnumType.STRING, manyToManyResource.getMapKeyEnumerated());
- assertEquals(EnumType.STRING, ((EnumeratedConverter) ormManyToManyMapping.getMapKeyConverter()).getSpecifiedEnumType());
+ assertEquals(EnumType.STRING, ((BaseEnumeratedConverter) ormManyToManyMapping.getMapKeyConverter()).getSpecifiedEnumType());
//set enumerated to null in the context model
ormManyToManyMapping.setMapKeyConverter(null);
@@ -1015,15 +1014,15 @@ public class GenericOrmManyToManyMapping2_0Tests
//set temporal in the resource model, verify context model updated
manyToManyResource.setMapKeyTemporal(org.eclipse.jpt.jpa.core.resource.orm.TemporalType.DATE);
- assertEquals(TemporalType.DATE, ((TemporalConverter) ormManyToManyMapping.getMapKeyConverter()).getTemporalType());
+ assertEquals(TemporalType.DATE, ((BaseTemporalConverter) ormManyToManyMapping.getMapKeyConverter()).getTemporalType());
assertEquals(org.eclipse.jpt.jpa.core.resource.orm.TemporalType.DATE, manyToManyResource.getMapKeyTemporal());
manyToManyResource.setMapKeyTemporal(org.eclipse.jpt.jpa.core.resource.orm.TemporalType.TIME);
- assertEquals(TemporalType.TIME, ((TemporalConverter) ormManyToManyMapping.getMapKeyConverter()).getTemporalType());
+ assertEquals(TemporalType.TIME, ((BaseTemporalConverter) ormManyToManyMapping.getMapKeyConverter()).getTemporalType());
assertEquals(org.eclipse.jpt.jpa.core.resource.orm.TemporalType.TIME, manyToManyResource.getMapKeyTemporal());
manyToManyResource.setMapKeyTemporal(org.eclipse.jpt.jpa.core.resource.orm.TemporalType.TIMESTAMP);
- assertEquals(TemporalType.TIMESTAMP, ((TemporalConverter) ormManyToManyMapping.getMapKeyConverter()).getTemporalType());
+ assertEquals(TemporalType.TIMESTAMP, ((BaseTemporalConverter) ormManyToManyMapping.getMapKeyConverter()).getTemporalType());
assertEquals(org.eclipse.jpt.jpa.core.resource.orm.TemporalType.TIMESTAMP, manyToManyResource.getMapKeyTemporal());
//set temporal to null in the resource model
@@ -1043,14 +1042,14 @@ public class GenericOrmManyToManyMapping2_0Tests
assertNull(manyToManyResource.getMapKeyTemporal());
//set temporal in the context model, verify resource model updated
- ormManyToManyMapping.setMapKeyConverter(TemporalConverter.class);
- ((TemporalConverter) ormManyToManyMapping.getMapKeyConverter()).setTemporalType(TemporalType.DATE);
+ ormManyToManyMapping.setMapKeyConverter(BaseTemporalConverter.class);
+ ((BaseTemporalConverter) ormManyToManyMapping.getMapKeyConverter()).setTemporalType(TemporalType.DATE);
assertEquals(org.eclipse.jpt.jpa.core.resource.orm.TemporalType.DATE, manyToManyResource.getMapKeyTemporal());
- assertEquals(TemporalType.DATE, ((TemporalConverter) ormManyToManyMapping.getMapKeyConverter()).getTemporalType());
+ assertEquals(TemporalType.DATE, ((BaseTemporalConverter) ormManyToManyMapping.getMapKeyConverter()).getTemporalType());
- ((TemporalConverter) ormManyToManyMapping.getMapKeyConverter()).setTemporalType(TemporalType.TIME);
+ ((BaseTemporalConverter) ormManyToManyMapping.getMapKeyConverter()).setTemporalType(TemporalType.TIME);
assertEquals(org.eclipse.jpt.jpa.core.resource.orm.TemporalType.TIME, manyToManyResource.getMapKeyTemporal());
- assertEquals(TemporalType.TIME, ((TemporalConverter) ormManyToManyMapping.getMapKeyConverter()).getTemporalType());
+ assertEquals(TemporalType.TIME, ((BaseTemporalConverter) ormManyToManyMapping.getMapKeyConverter()).getTemporalType());
//set temporal to null in the context model
ormManyToManyMapping.setMapKeyConverter(null);
diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/orm/GenericOrmOneToManyMapping2_0Tests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/orm/GenericOrmOneToManyMapping2_0Tests.java
index 9db51ae92b..357c01c4ce 100644
--- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/orm/GenericOrmOneToManyMapping2_0Tests.java
+++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/orm/GenericOrmOneToManyMapping2_0Tests.java
@@ -1,12 +1,12 @@
/*******************************************************************************
-* Copyright (c) 2009, 2012 Oracle. All rights reserved.
-* This program and the accompanying materials are made available under the
-* terms of the Eclipse Public License v1.0, which accompanies this distribution
-* and is available at http://www.eclipse.org/legal/epl-v10.html.
-*
-* Contributors:
-* Oracle - initial API and implementation
- *******************************************************************************/
+ * Copyright (c) 2009, 2012 Oracle. All rights reserved.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0, which accompanies this distribution
+ * and is available at http://www.eclipse.org/legal/epl-v10.html.
+ *
+ * Contributors:
+ * Oracle - initial API and implementation
+ ******************************************************************************/
package org.eclipse.jpt.jpa.core.tests.internal.jpa2.context.orm;
import java.util.Iterator;
@@ -22,13 +22,13 @@ import org.eclipse.jpt.jpa.core.context.AttributeMapping;
import org.eclipse.jpt.jpa.core.context.Column;
import org.eclipse.jpt.jpa.core.context.Entity;
import org.eclipse.jpt.jpa.core.context.EnumType;
-import org.eclipse.jpt.jpa.core.context.EnumeratedConverter;
+import org.eclipse.jpt.jpa.core.context.BaseEnumeratedConverter;
import org.eclipse.jpt.jpa.core.context.FetchType;
import org.eclipse.jpt.jpa.core.context.JoinColumn;
import org.eclipse.jpt.jpa.core.context.OneToManyMapping;
import org.eclipse.jpt.jpa.core.context.ReadOnlyColumn;
import org.eclipse.jpt.jpa.core.context.ReadOnlyPersistentAttribute;
-import org.eclipse.jpt.jpa.core.context.TemporalConverter;
+import org.eclipse.jpt.jpa.core.context.BaseTemporalConverter;
import org.eclipse.jpt.jpa.core.context.TemporalType;
import org.eclipse.jpt.jpa.core.context.java.JavaEntity;
import org.eclipse.jpt.jpa.core.context.java.JavaOneToManyMapping;
@@ -1191,7 +1191,7 @@ public class GenericOrmOneToManyMapping2_0Tests
assertEquals("Address", virtualOneToManyMapping.getSpecifiedTargetEntity());
assertNull(virtualOneToManyMapping.getRelationship().
getMappedByStrategy().getMappedByAttribute());
- assertEquals(EnumType.STRING, ((EnumeratedConverter) virtualOneToManyMapping.getMapKeyConverter()).getEnumType());
+ assertEquals(EnumType.STRING, ((BaseEnumeratedConverter) virtualOneToManyMapping.getMapKeyConverter()).getEnumType());
Cascade2_0 cascade = (Cascade2_0) virtualOneToManyMapping.getCascade();
assertTrue(cascade.isAll());
@@ -1256,11 +1256,11 @@ public class GenericOrmOneToManyMapping2_0Tests
//set enumerated in the resource model, verify context model updated
oneToManyResource.setMapKeyEnumerated(org.eclipse.jpt.jpa.core.resource.orm.EnumType.ORDINAL);
- assertEquals(EnumType.ORDINAL, ((EnumeratedConverter) ormOneToManyMapping.getMapKeyConverter()).getSpecifiedEnumType());
+ assertEquals(EnumType.ORDINAL, ((BaseEnumeratedConverter) ormOneToManyMapping.getMapKeyConverter()).getSpecifiedEnumType());
assertEquals(org.eclipse.jpt.jpa.core.resource.orm.EnumType.ORDINAL, oneToManyResource.getMapKeyEnumerated());
oneToManyResource.setMapKeyEnumerated(org.eclipse.jpt.jpa.core.resource.orm.EnumType.STRING);
- assertEquals(EnumType.STRING, ((EnumeratedConverter) ormOneToManyMapping.getMapKeyConverter()).getSpecifiedEnumType());
+ assertEquals(EnumType.STRING, ((BaseEnumeratedConverter) ormOneToManyMapping.getMapKeyConverter()).getSpecifiedEnumType());
assertEquals(org.eclipse.jpt.jpa.core.resource.orm.EnumType.STRING, oneToManyResource.getMapKeyEnumerated());
//set enumerated to null in the resource model
@@ -1280,14 +1280,14 @@ public class GenericOrmOneToManyMapping2_0Tests
assertNull(oneToManyResource.getMapKeyEnumerated());
//set enumerated in the context model, verify resource model updated
- ormOneToManyMapping.setMapKeyConverter(EnumeratedConverter.class);
- ((EnumeratedConverter) ormOneToManyMapping.getMapKeyConverter()).setSpecifiedEnumType(EnumType.ORDINAL);
+ ormOneToManyMapping.setMapKeyConverter(BaseEnumeratedConverter.class);
+ ((BaseEnumeratedConverter) ormOneToManyMapping.getMapKeyConverter()).setSpecifiedEnumType(EnumType.ORDINAL);
assertEquals(org.eclipse.jpt.jpa.core.resource.orm.EnumType.ORDINAL, oneToManyResource.getMapKeyEnumerated());
- assertEquals(EnumType.ORDINAL, ((EnumeratedConverter) ormOneToManyMapping.getMapKeyConverter()).getSpecifiedEnumType());
+ assertEquals(EnumType.ORDINAL, ((BaseEnumeratedConverter) ormOneToManyMapping.getMapKeyConverter()).getSpecifiedEnumType());
- ((EnumeratedConverter) ormOneToManyMapping.getMapKeyConverter()).setSpecifiedEnumType(EnumType.STRING);
+ ((BaseEnumeratedConverter) ormOneToManyMapping.getMapKeyConverter()).setSpecifiedEnumType(EnumType.STRING);
assertEquals(org.eclipse.jpt.jpa.core.resource.orm.EnumType.STRING, oneToManyResource.getMapKeyEnumerated());
- assertEquals(EnumType.STRING, ((EnumeratedConverter) ormOneToManyMapping.getMapKeyConverter()).getSpecifiedEnumType());
+ assertEquals(EnumType.STRING, ((BaseEnumeratedConverter) ormOneToManyMapping.getMapKeyConverter()).getSpecifiedEnumType());
//set enumerated to null in the context model
ormOneToManyMapping.setMapKeyConverter(null);
@@ -1307,15 +1307,15 @@ public class GenericOrmOneToManyMapping2_0Tests
//set temporal in the resource model, verify context model updated
oneToManyResource.setMapKeyTemporal(org.eclipse.jpt.jpa.core.resource.orm.TemporalType.DATE);
- assertEquals(TemporalType.DATE, ((TemporalConverter) ormOneToManyMapping.getMapKeyConverter()).getTemporalType());
+ assertEquals(TemporalType.DATE, ((BaseTemporalConverter) ormOneToManyMapping.getMapKeyConverter()).getTemporalType());
assertEquals(org.eclipse.jpt.jpa.core.resource.orm.TemporalType.DATE, oneToManyResource.getMapKeyTemporal());
oneToManyResource.setMapKeyTemporal(org.eclipse.jpt.jpa.core.resource.orm.TemporalType.TIME);
- assertEquals(TemporalType.TIME, ((TemporalConverter) ormOneToManyMapping.getMapKeyConverter()).getTemporalType());
+ assertEquals(TemporalType.TIME, ((BaseTemporalConverter) ormOneToManyMapping.getMapKeyConverter()).getTemporalType());
assertEquals(org.eclipse.jpt.jpa.core.resource.orm.TemporalType.TIME, oneToManyResource.getMapKeyTemporal());
oneToManyResource.setMapKeyTemporal(org.eclipse.jpt.jpa.core.resource.orm.TemporalType.TIMESTAMP);
- assertEquals(TemporalType.TIMESTAMP, ((TemporalConverter) ormOneToManyMapping.getMapKeyConverter()).getTemporalType());
+ assertEquals(TemporalType.TIMESTAMP, ((BaseTemporalConverter) ormOneToManyMapping.getMapKeyConverter()).getTemporalType());
assertEquals(org.eclipse.jpt.jpa.core.resource.orm.TemporalType.TIMESTAMP, oneToManyResource.getMapKeyTemporal());
//set temporal to null in the resource model
@@ -1335,14 +1335,14 @@ public class GenericOrmOneToManyMapping2_0Tests
assertNull(oneToManyResource.getMapKeyTemporal());
//set temporal in the context model, verify resource model updated
- ormOneToManyMapping.setMapKeyConverter(TemporalConverter.class);
- ((TemporalConverter) ormOneToManyMapping.getMapKeyConverter()).setTemporalType(TemporalType.DATE);
+ ormOneToManyMapping.setMapKeyConverter(BaseTemporalConverter.class);
+ ((BaseTemporalConverter) ormOneToManyMapping.getMapKeyConverter()).setTemporalType(TemporalType.DATE);
assertEquals(org.eclipse.jpt.jpa.core.resource.orm.TemporalType.DATE, oneToManyResource.getMapKeyTemporal());
- assertEquals(TemporalType.DATE, ((TemporalConverter) ormOneToManyMapping.getMapKeyConverter()).getTemporalType());
+ assertEquals(TemporalType.DATE, ((BaseTemporalConverter) ormOneToManyMapping.getMapKeyConverter()).getTemporalType());
- ((TemporalConverter) ormOneToManyMapping.getMapKeyConverter()).setTemporalType(TemporalType.TIME);
+ ((BaseTemporalConverter) ormOneToManyMapping.getMapKeyConverter()).setTemporalType(TemporalType.TIME);
assertEquals(org.eclipse.jpt.jpa.core.resource.orm.TemporalType.TIME, oneToManyResource.getMapKeyTemporal());
- assertEquals(TemporalType.TIME, ((TemporalConverter) ormOneToManyMapping.getMapKeyConverter()).getTemporalType());
+ assertEquals(TemporalType.TIME, ((BaseTemporalConverter) ormOneToManyMapping.getMapKeyConverter()).getTemporalType());
//set temporal to null in the context model
ormOneToManyMapping.setMapKeyConverter(null);

Back to the top