diff options
Diffstat (limited to 'jpa/tests')
22 files changed, 512 insertions, 512 deletions
diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/JavaBasicMappingTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/JavaBasicMappingTests.java index 9eab8efcdf..7df463ad86 100644 --- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/JavaBasicMappingTests.java +++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/JavaBasicMappingTests.java @@ -320,8 +320,8 @@ public class JavaBasicMappingTests extends ContextModelTestCase JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); assertFalse(basicMapping.isDefault()); basicMapping.getColumn().setSpecifiedName("FOO"); - basicMapping.setSpecifiedConverter(Converter.ENUMERATED_CONVERTER); - ((EnumeratedConverter) basicMapping.getSpecifiedConverter()).setSpecifiedEnumType(EnumType.STRING); + basicMapping.setConverter(Converter.ENUMERATED_CONVERTER); + ((EnumeratedConverter) basicMapping.getConverter()).setSpecifiedEnumType(EnumType.STRING); attributeResource.addAnnotation(LobAnnotation.ANNOTATION_NAME); attributeResource.addAnnotation(TemporalAnnotation.ANNOTATION_NAME); basicMapping.setSpecifiedFetch(FetchType.EAGER); @@ -330,7 +330,7 @@ public class JavaBasicMappingTests extends ContextModelTestCase persistentAttribute.setSpecifiedMappingKey(MappingKeys.NULL_ATTRIBUTE_MAPPING_KEY); assertEquals("FOO", ((BasicMapping) persistentAttribute.getMapping()).getColumn().getSpecifiedName()); - assertEquals(EnumType.STRING, ((EnumeratedConverter) ((BasicMapping) persistentAttribute.getMapping()).getSpecifiedConverter()).getEnumType()); + assertEquals(EnumType.STRING, ((EnumeratedConverter) ((BasicMapping) persistentAttribute.getMapping()).getConverter()).getEnumType()); assertNull(((BasicMapping) persistentAttribute.getMapping()).getSpecifiedFetch()); assertNull(((BasicMapping) persistentAttribute.getMapping()).getSpecifiedOptional()); @@ -351,8 +351,8 @@ public class JavaBasicMappingTests extends ContextModelTestCase JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); assertFalse(basicMapping.isDefault()); basicMapping.getColumn().setSpecifiedName("FOO"); - basicMapping.setSpecifiedConverter(Converter.TEMPORAL_CONVERTER); - ((TemporalConverter) basicMapping.getSpecifiedConverter()).setTemporalType(TemporalType.TIME); + basicMapping.setConverter(Converter.TEMPORAL_CONVERTER); + ((TemporalConverter) basicMapping.getConverter()).setTemporalType(TemporalType.TIME); attributeResource.addAnnotation(LobAnnotation.ANNOTATION_NAME); attributeResource.addAnnotation(EnumeratedAnnotation.ANNOTATION_NAME); basicMapping.setSpecifiedFetch(FetchType.EAGER); @@ -361,7 +361,7 @@ public class JavaBasicMappingTests extends ContextModelTestCase persistentAttribute.setSpecifiedMappingKey(MappingKeys.ID_ATTRIBUTE_MAPPING_KEY); assertEquals("FOO", ((IdMapping) persistentAttribute.getMapping()).getColumn().getSpecifiedName()); - assertEquals(TemporalType.TIME, ((TemporalConverter) ((IdMapping) persistentAttribute.getMapping()).getSpecifiedConverter()).getTemporalType()); + assertEquals(TemporalType.TIME, ((TemporalConverter) ((IdMapping) persistentAttribute.getMapping()).getConverter()).getTemporalType()); assertNull(attributeResource.getAnnotation(BasicAnnotation.ANNOTATION_NAME)); assertNotNull(attributeResource.getAnnotation(IdAnnotation.ANNOTATION_NAME)); @@ -381,15 +381,15 @@ public class JavaBasicMappingTests extends ContextModelTestCase JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); assertFalse(basicMapping.isDefault()); basicMapping.getColumn().setSpecifiedName("FOO"); - basicMapping.setSpecifiedConverter(Converter.TEMPORAL_CONVERTER); - ((TemporalConverter) basicMapping.getSpecifiedConverter()).setTemporalType(TemporalType.TIME); + basicMapping.setConverter(Converter.TEMPORAL_CONVERTER); + ((TemporalConverter) basicMapping.getConverter()).setTemporalType(TemporalType.TIME); attributeResource.addAnnotation(LobAnnotation.ANNOTATION_NAME); attributeResource.addAnnotation(EnumeratedAnnotation.ANNOTATION_NAME); assertFalse(basicMapping.isDefault()); persistentAttribute.setSpecifiedMappingKey(MappingKeys.VERSION_ATTRIBUTE_MAPPING_KEY); assertEquals("FOO", ((VersionMapping) persistentAttribute.getMapping()).getColumn().getSpecifiedName()); - assertEquals(TemporalType.TIME, ((TemporalConverter) ((VersionMapping) persistentAttribute.getMapping()).getSpecifiedConverter()).getTemporalType()); + assertEquals(TemporalType.TIME, ((TemporalConverter) ((VersionMapping) persistentAttribute.getMapping()).getConverter()).getTemporalType()); assertNull(attributeResource.getAnnotation(BasicAnnotation.ANNOTATION_NAME)); assertNotNull(attributeResource.getAnnotation(VersionAnnotation.ANNOTATION_NAME)); @@ -739,7 +739,7 @@ public class JavaBasicMappingTests extends ContextModelTestCase PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); BasicMapping basicMapping = (BasicMapping) persistentAttribute.getSpecifiedMapping(); - assertFalse(basicMapping.getSpecifiedConverter().getType() == Converter.LOB_CONVERTER); + assertFalse(basicMapping.getConverter().getType() == Converter.LOB_CONVERTER); } public void testIsLob2() throws Exception { @@ -749,7 +749,7 @@ public class JavaBasicMappingTests extends ContextModelTestCase PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); BasicMapping basicMapping = (BasicMapping) persistentAttribute.getMapping(); - assertTrue(basicMapping.getSpecifiedConverter().getType() == Converter.LOB_CONVERTER); + assertTrue(basicMapping.getConverter().getType() == Converter.LOB_CONVERTER); } public void testSetLob() throws Exception { @@ -759,13 +759,13 @@ public class JavaBasicMappingTests extends ContextModelTestCase PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); BasicMapping basicMapping = (BasicMapping) persistentAttribute.getSpecifiedMapping(); - basicMapping.setSpecifiedConverter(Converter.LOB_CONVERTER); + basicMapping.setConverter(Converter.LOB_CONVERTER); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); assertNotNull(attributeResource.getAnnotation(LobAnnotation.ANNOTATION_NAME)); - basicMapping.setSpecifiedConverter(Converter.NO_CONVERTER); + basicMapping.setConverter(Converter.NO_CONVERTER); assertNull(attributeResource.getAnnotation(LobAnnotation.ANNOTATION_NAME)); } @@ -776,17 +776,17 @@ public class JavaBasicMappingTests extends ContextModelTestCase PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); BasicMapping basicMapping = (BasicMapping) persistentAttribute.getSpecifiedMapping(); - assertFalse(basicMapping.getSpecifiedConverter().getType() == Converter.LOB_CONVERTER); + assertFalse(basicMapping.getConverter().getType() == Converter.LOB_CONVERTER); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); attributeResource.addAnnotation(LobAnnotation.ANNOTATION_NAME); - assertTrue(basicMapping.getSpecifiedConverter().getType() == Converter.LOB_CONVERTER); + assertTrue(basicMapping.getConverter().getType() == Converter.LOB_CONVERTER); attributeResource.removeAnnotation(LobAnnotation.ANNOTATION_NAME); - assertFalse(basicMapping.getSpecifiedConverter().getType() == Converter.LOB_CONVERTER); + assertFalse(basicMapping.getConverter().getType() == Converter.LOB_CONVERTER); } public void testDefaultBasicGetDefaultConverter() throws Exception { @@ -795,7 +795,7 @@ public class JavaBasicMappingTests extends ContextModelTestCase PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); BasicMapping basicMapping = (BasicMapping) persistentAttribute.getMapping(); - assertTrue(basicMapping.getSpecifiedConverter().getType() == Converter.NO_CONVERTER); + assertTrue(basicMapping.getConverter().getType() == Converter.NO_CONVERTER); } public void testSpecifiedBasicGetDefaultConverter() throws Exception { @@ -804,7 +804,7 @@ public class JavaBasicMappingTests extends ContextModelTestCase PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); BasicMapping basicMapping = (BasicMapping) persistentAttribute.getSpecifiedMapping(); - assertTrue(basicMapping.getSpecifiedConverter().getType() == Converter.NO_CONVERTER); + assertTrue(basicMapping.getConverter().getType() == Converter.NO_CONVERTER); } public void testGetEnumerated() throws Exception { @@ -814,15 +814,15 @@ public class JavaBasicMappingTests extends ContextModelTestCase PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); BasicMapping basicMapping = (BasicMapping) persistentAttribute.getSpecifiedMapping(); - assertTrue(basicMapping.getSpecifiedConverter().getType() == Converter.NO_CONVERTER); + assertTrue(basicMapping.getConverter().getType() == Converter.NO_CONVERTER); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); EnumeratedAnnotation enumeratedAnnotation = (EnumeratedAnnotation) attributeResource.addAnnotation(EnumeratedAnnotation.ANNOTATION_NAME); - assertEquals(EnumType.ORDINAL, ((EnumeratedConverter) basicMapping.getSpecifiedConverter()).getDefaultEnumType()); + assertEquals(EnumType.ORDINAL, ((EnumeratedConverter) basicMapping.getConverter()).getDefaultEnumType()); enumeratedAnnotation.setValue(org.eclipse.jpt.core.resource.java.EnumType.STRING); - assertEquals(EnumType.STRING, ((EnumeratedConverter) basicMapping.getSpecifiedConverter()).getSpecifiedEnumType()); + assertEquals(EnumType.STRING, ((EnumeratedConverter) basicMapping.getConverter()).getSpecifiedEnumType()); } public void testGetSpecifiedEnumerated() throws Exception { @@ -832,7 +832,7 @@ public class JavaBasicMappingTests extends ContextModelTestCase PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); BasicMapping basicMapping = (BasicMapping) persistentAttribute.getMapping(); - assertEquals(EnumType.STRING, ((EnumeratedConverter) basicMapping.getSpecifiedConverter()).getSpecifiedEnumType()); + assertEquals(EnumType.STRING, ((EnumeratedConverter) basicMapping.getConverter()).getSpecifiedEnumType()); } public void testSetSpecifiedEnumerated() throws Exception { @@ -841,9 +841,9 @@ public class JavaBasicMappingTests extends ContextModelTestCase PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); BasicMapping basicMapping = (BasicMapping) persistentAttribute.getSpecifiedMapping(); - assertTrue(basicMapping.getSpecifiedConverter().getType() == Converter.NO_CONVERTER); + assertTrue(basicMapping.getConverter().getType() == Converter.NO_CONVERTER); - basicMapping.setSpecifiedConverter(Converter.ENUMERATED_CONVERTER); + basicMapping.setConverter(Converter.ENUMERATED_CONVERTER); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); @@ -852,14 +852,14 @@ public class JavaBasicMappingTests extends ContextModelTestCase assertNotNull(enumerated); assertEquals(null, enumerated.getValue()); - ((EnumeratedConverter) basicMapping.getSpecifiedConverter()).setSpecifiedEnumType(EnumType.STRING); + ((EnumeratedConverter) basicMapping.getConverter()).setSpecifiedEnumType(EnumType.STRING); assertEquals(org.eclipse.jpt.core.resource.java.EnumType.STRING, enumerated.getValue()); - ((EnumeratedConverter) basicMapping.getSpecifiedConverter()).setSpecifiedEnumType(null); + ((EnumeratedConverter) basicMapping.getConverter()).setSpecifiedEnumType(null); assertNotNull(attributeResource.getAnnotation(EnumeratedAnnotation.ANNOTATION_NAME)); assertNull(enumerated.getValue()); - basicMapping.setSpecifiedConverter(Converter.NO_CONVERTER); + basicMapping.setConverter(Converter.NO_CONVERTER); assertNull(attributeResource.getAnnotation(EnumeratedAnnotation.ANNOTATION_NAME)); } @@ -870,7 +870,7 @@ public class JavaBasicMappingTests extends ContextModelTestCase PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); BasicMapping basicMapping = (BasicMapping) persistentAttribute.getSpecifiedMapping(); - assertTrue(basicMapping.getSpecifiedConverter().getType() == Converter.NO_CONVERTER); + assertTrue(basicMapping.getConverter().getType() == Converter.NO_CONVERTER); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); @@ -878,11 +878,11 @@ public class JavaBasicMappingTests extends ContextModelTestCase EnumeratedAnnotation enumerated = (EnumeratedAnnotation) attributeResource.addAnnotation(EnumeratedAnnotation.ANNOTATION_NAME); enumerated.setValue(org.eclipse.jpt.core.resource.java.EnumType.STRING); - assertEquals(EnumType.STRING, ((EnumeratedConverter) basicMapping.getSpecifiedConverter()).getSpecifiedEnumType()); + assertEquals(EnumType.STRING, ((EnumeratedConverter) basicMapping.getConverter()).getSpecifiedEnumType()); enumerated.setValue(null); assertNotNull(attributeResource.getAnnotation(EnumeratedAnnotation.ANNOTATION_NAME)); - assertNull(((EnumeratedConverter) basicMapping.getSpecifiedConverter()).getSpecifiedEnumType()); + assertNull(((EnumeratedConverter) basicMapping.getConverter()).getSpecifiedEnumType()); assertFalse(basicMapping.isDefault()); assertSame(basicMapping, persistentAttribute.getSpecifiedMapping()); } @@ -898,7 +898,7 @@ public class JavaBasicMappingTests extends ContextModelTestCase PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); BasicMapping basicMapping = (BasicMapping) persistentAttribute.getSpecifiedMapping(); - assertEquals(Converter.TEMPORAL_CONVERTER, basicMapping.getSpecifiedConverter().getType()); + assertEquals(Converter.TEMPORAL_CONVERTER, basicMapping.getConverter().getType()); } public void testGetTemporal2() throws Exception { @@ -908,8 +908,8 @@ public class JavaBasicMappingTests extends ContextModelTestCase PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); BasicMapping basicMapping = (BasicMapping) persistentAttribute.getMapping(); - assertEquals(Converter.TEMPORAL_CONVERTER, basicMapping.getSpecifiedConverter().getType()); - assertEquals(TemporalType.TIMESTAMP, ((TemporalConverter) basicMapping.getSpecifiedConverter()).getTemporalType()); + assertEquals(Converter.TEMPORAL_CONVERTER, basicMapping.getConverter().getType()); + assertEquals(TemporalType.TIMESTAMP, ((TemporalConverter) basicMapping.getConverter()).getTemporalType()); } public void testSetTemporal() throws Exception { @@ -918,10 +918,10 @@ public class JavaBasicMappingTests extends ContextModelTestCase PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); BasicMapping basicMapping = (BasicMapping) persistentAttribute.getSpecifiedMapping(); - assertEquals(Converter.NO_CONVERTER, basicMapping.getSpecifiedConverter().getType()); + assertEquals(Converter.NO_CONVERTER, basicMapping.getConverter().getType()); - basicMapping.setSpecifiedConverter(Converter.TEMPORAL_CONVERTER); - ((TemporalConverter) basicMapping.getSpecifiedConverter()).setTemporalType(TemporalType.TIME); + basicMapping.setConverter(Converter.TEMPORAL_CONVERTER); + ((TemporalConverter) basicMapping.getConverter()).setTemporalType(TemporalType.TIME); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); @@ -929,7 +929,7 @@ public class JavaBasicMappingTests extends ContextModelTestCase assertEquals(org.eclipse.jpt.core.resource.java.TemporalType.TIME, temporal.getValue()); - basicMapping.setSpecifiedConverter(Converter.NO_CONVERTER); + basicMapping.setConverter(Converter.NO_CONVERTER); assertNull(attributeResource.getAnnotation(TemporalAnnotation.ANNOTATION_NAME)); } @@ -940,7 +940,7 @@ public class JavaBasicMappingTests extends ContextModelTestCase PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); BasicMapping basicMapping = (BasicMapping) persistentAttribute.getSpecifiedMapping(); - assertEquals(Converter.NO_CONVERTER, basicMapping.getSpecifiedConverter().getType()); + assertEquals(Converter.NO_CONVERTER, basicMapping.getConverter().getType()); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); @@ -948,12 +948,12 @@ public class JavaBasicMappingTests extends ContextModelTestCase TemporalAnnotation temporal = (TemporalAnnotation) attributeResource.addAnnotation(TemporalAnnotation.ANNOTATION_NAME); temporal.setValue(org.eclipse.jpt.core.resource.java.TemporalType.DATE); - assertEquals(Converter.TEMPORAL_CONVERTER, basicMapping.getSpecifiedConverter().getType()); - assertEquals(TemporalType.DATE, ((TemporalConverter) basicMapping.getSpecifiedConverter()).getTemporalType()); + assertEquals(Converter.TEMPORAL_CONVERTER, basicMapping.getConverter().getType()); + assertEquals(TemporalType.DATE, ((TemporalConverter) basicMapping.getConverter()).getTemporalType()); attributeResource.removeAnnotation(TemporalAnnotation.ANNOTATION_NAME); - assertEquals(Converter.NO_CONVERTER, basicMapping.getSpecifiedConverter().getType()); + assertEquals(Converter.NO_CONVERTER, basicMapping.getConverter().getType()); assertFalse(basicMapping.isDefault()); assertSame(basicMapping, persistentAttribute.getSpecifiedMapping()); } diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/JavaIdMappingTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/JavaIdMappingTests.java index 2ac570bcd3..72e1139fe5 100644 --- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/JavaIdMappingTests.java +++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/JavaIdMappingTests.java @@ -119,8 +119,8 @@ public class JavaIdMappingTests extends ContextModelTestCase IdMapping idMapping = (IdMapping) persistentAttribute.getMapping(); assertFalse(idMapping.isDefault()); idMapping.getColumn().setSpecifiedName("FOO"); - idMapping.setSpecifiedConverter(Converter.TEMPORAL_CONVERTER); - ((TemporalConverter) idMapping.getSpecifiedConverter()).setTemporalType(TemporalType.TIME); + idMapping.setConverter(Converter.TEMPORAL_CONVERTER); + ((TemporalConverter) idMapping.getConverter()).setTemporalType(TemporalType.TIME); idMapping.addGeneratedValue(); idMapping.getGeneratorContainer().addTableGenerator(); idMapping.getGeneratorContainer().addSequenceGenerator(); @@ -128,7 +128,7 @@ public class JavaIdMappingTests extends ContextModelTestCase persistentAttribute.setSpecifiedMappingKey(MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY); assertEquals("FOO", ((BasicMapping) persistentAttribute.getMapping()).getColumn().getSpecifiedName()); - assertEquals(TemporalType.TIME, ((TemporalConverter) ((BasicMapping) persistentAttribute.getMapping()).getSpecifiedConverter()).getTemporalType()); + assertEquals(TemporalType.TIME, ((TemporalConverter) ((BasicMapping) persistentAttribute.getMapping()).getConverter()).getTemporalType()); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); @@ -149,8 +149,8 @@ public class JavaIdMappingTests extends ContextModelTestCase IdMapping idMapping = (IdMapping) persistentAttribute.getMapping(); assertFalse(idMapping.isDefault()); idMapping.getColumn().setSpecifiedName("FOO"); - idMapping.setSpecifiedConverter(Converter.TEMPORAL_CONVERTER); - ((TemporalConverter) idMapping.getSpecifiedConverter()).setTemporalType(TemporalType.TIME); + idMapping.setConverter(Converter.TEMPORAL_CONVERTER); + ((TemporalConverter) idMapping.getConverter()).setTemporalType(TemporalType.TIME); idMapping.addGeneratedValue(); idMapping.getGeneratorContainer().addTableGenerator(); idMapping.getGeneratorContainer().addSequenceGenerator(); @@ -158,7 +158,7 @@ public class JavaIdMappingTests extends ContextModelTestCase persistentAttribute.setSpecifiedMappingKey(MappingKeys.NULL_ATTRIBUTE_MAPPING_KEY); assertEquals("FOO", ((BasicMapping) persistentAttribute.getMapping()).getColumn().getSpecifiedName()); - assertEquals(TemporalType.TIME, ((TemporalConverter) ((BasicMapping) persistentAttribute.getMapping()).getSpecifiedConverter()).getTemporalType()); + assertEquals(TemporalType.TIME, ((TemporalConverter) ((BasicMapping) persistentAttribute.getMapping()).getConverter()).getTemporalType()); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); @@ -178,8 +178,8 @@ public class JavaIdMappingTests extends ContextModelTestCase IdMapping idMapping = (IdMapping) persistentAttribute.getMapping(); assertFalse(idMapping.isDefault()); idMapping.getColumn().setSpecifiedName("FOO"); - idMapping.setSpecifiedConverter(Converter.TEMPORAL_CONVERTER); - ((TemporalConverter) idMapping.getSpecifiedConverter()).setTemporalType(TemporalType.TIME); + idMapping.setConverter(Converter.TEMPORAL_CONVERTER); + ((TemporalConverter) idMapping.getConverter()).setTemporalType(TemporalType.TIME); idMapping.addGeneratedValue(); idMapping.getGeneratorContainer().addTableGenerator(); idMapping.getGeneratorContainer().addSequenceGenerator(); @@ -187,7 +187,7 @@ public class JavaIdMappingTests extends ContextModelTestCase persistentAttribute.setSpecifiedMappingKey(MappingKeys.VERSION_ATTRIBUTE_MAPPING_KEY); assertEquals("FOO", ((VersionMapping) persistentAttribute.getMapping()).getColumn().getSpecifiedName()); - assertEquals(TemporalType.TIME, ((TemporalConverter) ((VersionMapping) persistentAttribute.getMapping()).getSpecifiedConverter()).getTemporalType()); + assertEquals(TemporalType.TIME, ((TemporalConverter) ((VersionMapping) persistentAttribute.getMapping()).getConverter()).getTemporalType()); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); @@ -208,8 +208,8 @@ public class JavaIdMappingTests extends ContextModelTestCase IdMapping idMapping = (IdMapping) persistentAttribute.getMapping(); assertFalse(idMapping.isDefault()); idMapping.getColumn().setSpecifiedName("FOO"); - idMapping.setSpecifiedConverter(Converter.TEMPORAL_CONVERTER); - ((TemporalConverter) idMapping.getSpecifiedConverter()).setTemporalType(TemporalType.TIME); + idMapping.setConverter(Converter.TEMPORAL_CONVERTER); + ((TemporalConverter) 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.setSpecifiedConverter(Converter.TEMPORAL_CONVERTER); - ((TemporalConverter) idMapping.getSpecifiedConverter()).setTemporalType(TemporalType.TIME); + idMapping.setConverter(Converter.TEMPORAL_CONVERTER); + ((TemporalConverter) 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.setSpecifiedConverter(Converter.TEMPORAL_CONVERTER); - ((TemporalConverter) idMapping.getSpecifiedConverter()).setTemporalType(TemporalType.TIME); + idMapping.setConverter(Converter.TEMPORAL_CONVERTER); + ((TemporalConverter) 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.setSpecifiedConverter(Converter.TEMPORAL_CONVERTER); - ((TemporalConverter) idMapping.getSpecifiedConverter()).setTemporalType(TemporalType.TIME); + idMapping.setConverter(Converter.TEMPORAL_CONVERTER); + ((TemporalConverter) 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.setSpecifiedConverter(Converter.TEMPORAL_CONVERTER); - ((TemporalConverter) idMapping.getSpecifiedConverter()).setTemporalType(TemporalType.TIME); + idMapping.setConverter(Converter.TEMPORAL_CONVERTER); + ((TemporalConverter) 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.setSpecifiedConverter(Converter.TEMPORAL_CONVERTER); - ((TemporalConverter) idMapping.getSpecifiedConverter()).setTemporalType(TemporalType.TIME); + idMapping.setConverter(Converter.TEMPORAL_CONVERTER); + ((TemporalConverter) 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.setSpecifiedConverter(Converter.TEMPORAL_CONVERTER); - ((TemporalConverter) idMapping.getSpecifiedConverter()).setTemporalType(TemporalType.TIME); + idMapping.setConverter(Converter.TEMPORAL_CONVERTER); + ((TemporalConverter) 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().attributes().next(); IdMapping idMapping = (IdMapping) persistentAttribute.getSpecifiedMapping(); - assertEquals(TemporalType.TIMESTAMP, ((TemporalConverter) idMapping.getSpecifiedConverter()).getTemporalType()); + assertEquals(TemporalType.TIMESTAMP, ((TemporalConverter) idMapping.getConverter()).getTemporalType()); } public void testSetTemporal() throws Exception { @@ -419,10 +419,10 @@ public class JavaIdMappingTests extends ContextModelTestCase PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); IdMapping idMapping = (IdMapping) persistentAttribute.getSpecifiedMapping(); - assertEquals(Converter.NO_CONVERTER, idMapping.getSpecifiedConverter().getType()); + assertEquals(Converter.NO_CONVERTER, idMapping.getConverter().getType()); - idMapping.setSpecifiedConverter(Converter.TEMPORAL_CONVERTER); - ((TemporalConverter) idMapping.getSpecifiedConverter()).setTemporalType(TemporalType.TIME); + idMapping.setConverter(Converter.TEMPORAL_CONVERTER); + ((TemporalConverter) idMapping.getConverter()).setTemporalType(TemporalType.TIME); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); @@ -430,7 +430,7 @@ public class JavaIdMappingTests extends ContextModelTestCase assertEquals(org.eclipse.jpt.core.resource.java.TemporalType.TIME, temporal.getValue()); - idMapping.setSpecifiedConverter(Converter.NO_CONVERTER); + idMapping.setConverter(Converter.NO_CONVERTER); assertNull(attributeResource.getAnnotation(TemporalAnnotation.ANNOTATION_NAME)); } @@ -441,7 +441,7 @@ public class JavaIdMappingTests extends ContextModelTestCase PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); IdMapping idMapping = (IdMapping) persistentAttribute.getSpecifiedMapping(); - assertEquals(Converter.NO_CONVERTER, idMapping.getSpecifiedConverter().getType()); + assertEquals(Converter.NO_CONVERTER, idMapping.getConverter().getType()); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); @@ -449,11 +449,11 @@ public class JavaIdMappingTests extends ContextModelTestCase TemporalAnnotation temporal = (TemporalAnnotation) attributeResource.addAnnotation(TemporalAnnotation.ANNOTATION_NAME); temporal.setValue(org.eclipse.jpt.core.resource.java.TemporalType.DATE); - assertEquals(TemporalType.DATE, ((TemporalConverter) idMapping.getSpecifiedConverter()).getTemporalType()); + assertEquals(TemporalType.DATE, ((TemporalConverter) idMapping.getConverter()).getTemporalType()); attributeResource.removeAnnotation(TemporalAnnotation.ANNOTATION_NAME); - assertEquals(Converter.NO_CONVERTER, idMapping.getSpecifiedConverter().getType()); + assertEquals(Converter.NO_CONVERTER, idMapping.getConverter().getType()); assertFalse(idMapping.isDefault()); assertSame(idMapping, persistentAttribute.getSpecifiedMapping()); } diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/JavaVersionMappingTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/JavaVersionMappingTests.java index 6c8252431a..c978368068 100644 --- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/JavaVersionMappingTests.java +++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/JavaVersionMappingTests.java @@ -96,13 +96,13 @@ public class JavaVersionMappingTests extends ContextModelTestCase VersionMapping versionMapping = (VersionMapping) persistentAttribute.getMapping(); assertFalse(versionMapping.isDefault()); versionMapping.getColumn().setSpecifiedName("FOO"); - versionMapping.setSpecifiedConverter(Converter.TEMPORAL_CONVERTER); - ((TemporalConverter) versionMapping.getSpecifiedConverter()).setTemporalType(TemporalType.TIME); + versionMapping.setConverter(Converter.TEMPORAL_CONVERTER); + ((TemporalConverter) versionMapping.getConverter()).setTemporalType(TemporalType.TIME); assertFalse(versionMapping.isDefault()); persistentAttribute.setSpecifiedMappingKey(MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY); assertEquals("FOO", ((BasicMapping) persistentAttribute.getMapping()).getColumn().getSpecifiedName()); - assertEquals(TemporalType.TIME, ((TemporalConverter) ((BasicMapping) persistentAttribute.getMapping()).getSpecifiedConverter()).getTemporalType()); + assertEquals(TemporalType.TIME, ((TemporalConverter) ((BasicMapping) persistentAttribute.getMapping()).getConverter()).getTemporalType()); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); @@ -120,13 +120,13 @@ public class JavaVersionMappingTests extends ContextModelTestCase VersionMapping versionMapping = (VersionMapping) persistentAttribute.getMapping(); assertFalse(versionMapping.isDefault()); versionMapping.getColumn().setSpecifiedName("FOO"); - versionMapping.setSpecifiedConverter(Converter.TEMPORAL_CONVERTER); - ((TemporalConverter) versionMapping.getSpecifiedConverter()).setTemporalType(TemporalType.TIME); + versionMapping.setConverter(Converter.TEMPORAL_CONVERTER); + ((TemporalConverter) versionMapping.getConverter()).setTemporalType(TemporalType.TIME); assertFalse(versionMapping.isDefault()); persistentAttribute.setSpecifiedMappingKey(MappingKeys.NULL_ATTRIBUTE_MAPPING_KEY); assertEquals("FOO", ((BasicMapping) persistentAttribute.getMapping()).getColumn().getSpecifiedName()); - assertEquals(TemporalType.TIME, ((TemporalConverter) ((BasicMapping) persistentAttribute.getMapping()).getSpecifiedConverter()).getTemporalType()); + assertEquals(TemporalType.TIME, ((TemporalConverter) ((BasicMapping) persistentAttribute.getMapping()).getConverter()).getTemporalType()); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); @@ -143,13 +143,13 @@ public class JavaVersionMappingTests extends ContextModelTestCase VersionMapping versionMapping = (VersionMapping) persistentAttribute.getMapping(); assertFalse(versionMapping.isDefault()); versionMapping.getColumn().setSpecifiedName("FOO"); - versionMapping.setSpecifiedConverter(Converter.TEMPORAL_CONVERTER); - ((TemporalConverter) versionMapping.getSpecifiedConverter()).setTemporalType(TemporalType.TIME); + versionMapping.setConverter(Converter.TEMPORAL_CONVERTER); + ((TemporalConverter) versionMapping.getConverter()).setTemporalType(TemporalType.TIME); assertFalse(versionMapping.isDefault()); persistentAttribute.setSpecifiedMappingKey(MappingKeys.ID_ATTRIBUTE_MAPPING_KEY); assertEquals("FOO", ((IdMapping) persistentAttribute.getMapping()).getColumn().getSpecifiedName()); - assertEquals(TemporalType.TIME, ((TemporalConverter) ((IdMapping) persistentAttribute.getMapping()).getSpecifiedConverter()).getTemporalType()); + assertEquals(TemporalType.TIME, ((TemporalConverter) ((IdMapping) persistentAttribute.getMapping()).getConverter()).getTemporalType()); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); @@ -167,8 +167,8 @@ public class JavaVersionMappingTests extends ContextModelTestCase VersionMapping versionMapping = (VersionMapping) persistentAttribute.getMapping(); assertFalse(versionMapping.isDefault()); versionMapping.getColumn().setSpecifiedName("FOO"); - versionMapping.setSpecifiedConverter(Converter.TEMPORAL_CONVERTER); - ((TemporalConverter) versionMapping.getSpecifiedConverter()).setTemporalType(TemporalType.TIME); + versionMapping.setConverter(Converter.TEMPORAL_CONVERTER); + ((TemporalConverter) versionMapping.getConverter()).setTemporalType(TemporalType.TIME); assertFalse(versionMapping.isDefault()); persistentAttribute.setSpecifiedMappingKey(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.setSpecifiedConverter(Converter.TEMPORAL_CONVERTER); - ((TemporalConverter) versionMapping.getSpecifiedConverter()).setTemporalType(TemporalType.TIME); + versionMapping.setConverter(Converter.TEMPORAL_CONVERTER); + ((TemporalConverter) versionMapping.getConverter()).setTemporalType(TemporalType.TIME); assertFalse(versionMapping.isDefault()); persistentAttribute.setSpecifiedMappingKey(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.setSpecifiedConverter(Converter.TEMPORAL_CONVERTER); - ((TemporalConverter) versionMapping.getSpecifiedConverter()).setTemporalType(TemporalType.TIME); + versionMapping.setConverter(Converter.TEMPORAL_CONVERTER); + ((TemporalConverter) versionMapping.getConverter()).setTemporalType(TemporalType.TIME); assertFalse(versionMapping.isDefault()); persistentAttribute.setSpecifiedMappingKey(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.setSpecifiedConverter(Converter.TEMPORAL_CONVERTER); - ((TemporalConverter) versionMapping.getSpecifiedConverter()).setTemporalType(TemporalType.TIME); + versionMapping.setConverter(Converter.TEMPORAL_CONVERTER); + ((TemporalConverter) versionMapping.getConverter()).setTemporalType(TemporalType.TIME); assertFalse(versionMapping.isDefault()); persistentAttribute.setSpecifiedMappingKey(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.setSpecifiedConverter(Converter.TEMPORAL_CONVERTER); - ((TemporalConverter) versionMapping.getSpecifiedConverter()).setTemporalType(TemporalType.TIME); + versionMapping.setConverter(Converter.TEMPORAL_CONVERTER); + ((TemporalConverter) versionMapping.getConverter()).setTemporalType(TemporalType.TIME); assertFalse(versionMapping.isDefault()); persistentAttribute.setSpecifiedMappingKey(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.setSpecifiedConverter(Converter.TEMPORAL_CONVERTER); - ((TemporalConverter) versionMapping.getSpecifiedConverter()).setTemporalType(TemporalType.TIME); + versionMapping.setConverter(Converter.TEMPORAL_CONVERTER); + ((TemporalConverter) versionMapping.getConverter()).setTemporalType(TemporalType.TIME); assertFalse(versionMapping.isDefault()); persistentAttribute.setSpecifiedMappingKey(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.setSpecifiedConverter(Converter.TEMPORAL_CONVERTER); - ((TemporalConverter) versionMapping.getSpecifiedConverter()).setTemporalType(TemporalType.TIME); + versionMapping.setConverter(Converter.TEMPORAL_CONVERTER); + ((TemporalConverter) versionMapping.getConverter()).setTemporalType(TemporalType.TIME); assertFalse(versionMapping.isDefault()); persistentAttribute.setSpecifiedMappingKey(MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); @@ -328,7 +328,7 @@ public class JavaVersionMappingTests extends ContextModelTestCase PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); VersionMapping versionMapping = (VersionMapping) persistentAttribute.getSpecifiedMapping(); - assertEquals(TemporalType.TIMESTAMP, ((TemporalConverter) versionMapping.getSpecifiedConverter()).getTemporalType()); + assertEquals(TemporalType.TIMESTAMP, ((TemporalConverter) versionMapping.getConverter()).getTemporalType()); } public void testSetTemporal() throws Exception { @@ -337,10 +337,10 @@ public class JavaVersionMappingTests extends ContextModelTestCase PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); VersionMapping versionMapping = (VersionMapping) persistentAttribute.getSpecifiedMapping(); - assertEquals(Converter.NO_CONVERTER, versionMapping.getSpecifiedConverter().getType()); + assertEquals(Converter.NO_CONVERTER, versionMapping.getConverter().getType()); - versionMapping.setSpecifiedConverter(Converter.TEMPORAL_CONVERTER); - ((TemporalConverter) versionMapping.getSpecifiedConverter()).setTemporalType(TemporalType.TIME); + versionMapping.setConverter(Converter.TEMPORAL_CONVERTER); + ((TemporalConverter) versionMapping.getConverter()).setTemporalType(TemporalType.TIME); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); @@ -348,7 +348,7 @@ public class JavaVersionMappingTests extends ContextModelTestCase assertEquals(org.eclipse.jpt.core.resource.java.TemporalType.TIME, temporal.getValue()); - versionMapping.setSpecifiedConverter(Converter.NO_CONVERTER); + versionMapping.setConverter(Converter.NO_CONVERTER); assertNull(attributeResource.getAnnotation(TemporalAnnotation.ANNOTATION_NAME)); } @@ -359,7 +359,7 @@ public class JavaVersionMappingTests extends ContextModelTestCase PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); VersionMapping versionMapping = (VersionMapping) persistentAttribute.getSpecifiedMapping(); - assertEquals(Converter.NO_CONVERTER, versionMapping.getSpecifiedConverter().getType()); + assertEquals(Converter.NO_CONVERTER, versionMapping.getConverter().getType()); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); @@ -367,11 +367,11 @@ public class JavaVersionMappingTests extends ContextModelTestCase TemporalAnnotation temporal = (TemporalAnnotation) attributeResource.addAnnotation(TemporalAnnotation.ANNOTATION_NAME); temporal.setValue(org.eclipse.jpt.core.resource.java.TemporalType.DATE); - assertEquals(TemporalType.DATE, ((TemporalConverter) versionMapping.getSpecifiedConverter()).getTemporalType()); + assertEquals(TemporalType.DATE, ((TemporalConverter) versionMapping.getConverter()).getTemporalType()); attributeResource.removeAnnotation(TemporalAnnotation.ANNOTATION_NAME); - assertEquals(Converter.NO_CONVERTER, versionMapping.getSpecifiedConverter().getType()); + assertEquals(Converter.NO_CONVERTER, versionMapping.getConverter().getType()); assertFalse(versionMapping.isDefault()); assertSame(versionMapping, persistentAttribute.getSpecifiedMapping()); } diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/GenericOrmPersistentTypeTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/GenericOrmPersistentTypeTests.java index f2cac368ef..b61c3c3559 100644 --- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/GenericOrmPersistentTypeTests.java +++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/GenericOrmPersistentTypeTests.java @@ -564,8 +564,8 @@ public class GenericOrmPersistentTypeTests extends ContextModelTestCase employeePersistentType.addSpecifiedAttribute(MappingKeys.ID_ATTRIBUTE_MAPPING_KEY, "id"); employeePersistentType.addSpecifiedAttribute(MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY, "name"); OrmPersistentAttribute startDateAttribute = employeePersistentType.addSpecifiedAttribute(MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY, "startDate"); - ((OrmBasicMapping) startDateAttribute.getSpecifiedMapping()).setSpecifiedConverter(Converter.TEMPORAL_CONVERTER); - ((TemporalConverter) ((OrmBasicMapping) startDateAttribute.getSpecifiedMapping()).getSpecifiedConverter()).setTemporalType(TemporalType.DATE); + ((OrmBasicMapping) startDateAttribute.getSpecifiedMapping()).setConverter(Converter.TEMPORAL_CONVERTER); + ((TemporalConverter) ((OrmBasicMapping) startDateAttribute.getSpecifiedMapping()).getConverter()).setTemporalType(TemporalType.DATE); OrmPersistentAttribute idAttribute = employeePersistentType.getAttributeNamed("id"); JavaPersistentAttribute javaPersistentAttribute = idAttribute.getJavaPersistentAttribute(); diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmBasicMappingTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmBasicMappingTests.java index 2194c1fc00..f24c4cc24d 100644 --- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmBasicMappingTests.java +++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmBasicMappingTests.java @@ -176,21 +176,21 @@ public class OrmBasicMappingTests extends ContextModelTestCase OrmBasicMapping ormBasicMapping = (OrmBasicMapping) ormPersistentAttribute.getMapping(); XmlBasic basicResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getBasics().get(0); - assertEquals(Converter.NO_CONVERTER, ormBasicMapping.getSpecifiedConverter().getType()); + assertEquals(Converter.NO_CONVERTER, ormBasicMapping.getConverter().getType()); assertNull(basicResource.getEnumerated()); //set enumerated in the resource model, verify context model updated basicResource.setEnumerated(org.eclipse.jpt.core.resource.orm.EnumType.ORDINAL); - assertEquals(EnumType.ORDINAL, ((EnumeratedConverter) ormBasicMapping.getSpecifiedConverter()).getSpecifiedEnumType()); + assertEquals(EnumType.ORDINAL, ((EnumeratedConverter) ormBasicMapping.getConverter()).getSpecifiedEnumType()); assertEquals(org.eclipse.jpt.core.resource.orm.EnumType.ORDINAL, basicResource.getEnumerated()); basicResource.setEnumerated(org.eclipse.jpt.core.resource.orm.EnumType.STRING); - assertEquals(EnumType.STRING, ((EnumeratedConverter) ormBasicMapping.getSpecifiedConverter()).getSpecifiedEnumType()); + assertEquals(EnumType.STRING, ((EnumeratedConverter) ormBasicMapping.getConverter()).getSpecifiedEnumType()); assertEquals(org.eclipse.jpt.core.resource.orm.EnumType.STRING, basicResource.getEnumerated()); //set enumerated to null in the resource model basicResource.setEnumerated(null); - assertEquals(Converter.NO_CONVERTER, ormBasicMapping.getSpecifiedConverter().getType()); + assertEquals(Converter.NO_CONVERTER, ormBasicMapping.getConverter().getType()); assertNull(basicResource.getEnumerated()); } @@ -200,23 +200,23 @@ public class OrmBasicMappingTests extends ContextModelTestCase OrmBasicMapping ormBasicMapping = (OrmBasicMapping) ormPersistentAttribute.getMapping(); XmlBasic basicResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getBasics().get(0); - assertEquals(Converter.NO_CONVERTER, ormBasicMapping.getSpecifiedConverter().getType()); + assertEquals(Converter.NO_CONVERTER, ormBasicMapping.getConverter().getType()); assertNull(basicResource.getEnumerated()); //set enumerated in the context model, verify resource model updated - ormBasicMapping.setSpecifiedConverter(Converter.ENUMERATED_CONVERTER); - ((EnumeratedConverter) ormBasicMapping.getSpecifiedConverter()).setSpecifiedEnumType(EnumType.ORDINAL); + ormBasicMapping.setConverter(Converter.ENUMERATED_CONVERTER); + ((EnumeratedConverter) ormBasicMapping.getConverter()).setSpecifiedEnumType(EnumType.ORDINAL); assertEquals(org.eclipse.jpt.core.resource.orm.EnumType.ORDINAL, basicResource.getEnumerated()); - assertEquals(EnumType.ORDINAL, ((EnumeratedConverter) ormBasicMapping.getSpecifiedConverter()).getSpecifiedEnumType()); + assertEquals(EnumType.ORDINAL, ((EnumeratedConverter) ormBasicMapping.getConverter()).getSpecifiedEnumType()); - ((EnumeratedConverter) ormBasicMapping.getSpecifiedConverter()).setSpecifiedEnumType(EnumType.STRING); + ((EnumeratedConverter) ormBasicMapping.getConverter()).setSpecifiedEnumType(EnumType.STRING); assertEquals(org.eclipse.jpt.core.resource.orm.EnumType.STRING, basicResource.getEnumerated()); - assertEquals(EnumType.STRING, ((EnumeratedConverter) ormBasicMapping.getSpecifiedConverter()).getSpecifiedEnumType()); + assertEquals(EnumType.STRING, ((EnumeratedConverter) ormBasicMapping.getConverter()).getSpecifiedEnumType()); //set enumerated to null in the context model - ormBasicMapping.setSpecifiedConverter(Converter.NO_CONVERTER); + ormBasicMapping.setConverter(Converter.NO_CONVERTER); assertNull(basicResource.getEnumerated()); - assertEquals(Converter.NO_CONVERTER, ormBasicMapping.getSpecifiedConverter().getType()); + assertEquals(Converter.NO_CONVERTER, ormBasicMapping.getConverter().getType()); } public void testUpdateSpecifiedOptional() throws Exception { @@ -273,17 +273,17 @@ public class OrmBasicMappingTests extends ContextModelTestCase OrmBasicMapping ormBasicMapping = (OrmBasicMapping) ormPersistentAttribute.getMapping(); XmlBasic basicResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getBasics().get(0); - assertEquals(Converter.NO_CONVERTER, ormBasicMapping.getSpecifiedConverter().getType()); + assertEquals(Converter.NO_CONVERTER, ormBasicMapping.getConverter().getType()); assertFalse(basicResource.isLob()); //set lob in the resource model, verify context model updated basicResource.setLob(true); - assertEquals(Converter.LOB_CONVERTER, ormBasicMapping.getSpecifiedConverter().getType()); + assertEquals(Converter.LOB_CONVERTER, ormBasicMapping.getConverter().getType()); assertTrue(basicResource.isLob()); //set lob to null in the resource model basicResource.setLob(false); - assertEquals(Converter.NO_CONVERTER, ormBasicMapping.getSpecifiedConverter().getType()); + assertEquals(Converter.NO_CONVERTER, ormBasicMapping.getConverter().getType()); assertFalse(basicResource.isLob()); } @@ -293,18 +293,18 @@ public class OrmBasicMappingTests extends ContextModelTestCase OrmBasicMapping ormBasicMapping = (OrmBasicMapping) ormPersistentAttribute.getMapping(); XmlBasic basicResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getBasics().get(0); - assertEquals(Converter.NO_CONVERTER, ormBasicMapping.getSpecifiedConverter().getType()); + assertEquals(Converter.NO_CONVERTER, ormBasicMapping.getConverter().getType()); assertFalse(basicResource.isLob()); //set lob in the context model, verify resource model updated - ormBasicMapping.setSpecifiedConverter(Converter.LOB_CONVERTER); + ormBasicMapping.setConverter(Converter.LOB_CONVERTER); assertTrue(basicResource.isLob()); - assertEquals(Converter.LOB_CONVERTER, ormBasicMapping.getSpecifiedConverter().getType()); + assertEquals(Converter.LOB_CONVERTER, ormBasicMapping.getConverter().getType()); //set lob to false in the context model - ormBasicMapping.setSpecifiedConverter(Converter.NO_CONVERTER); + ormBasicMapping.setConverter(Converter.NO_CONVERTER); assertFalse(basicResource.isLob()); - assertEquals(Converter.NO_CONVERTER, ormBasicMapping.getSpecifiedConverter().getType()); + assertEquals(Converter.NO_CONVERTER, ormBasicMapping.getConverter().getType()); } public void testUpdateTemporal() throws Exception { @@ -313,25 +313,25 @@ public class OrmBasicMappingTests extends ContextModelTestCase OrmBasicMapping ormBasicMapping = (OrmBasicMapping) ormPersistentAttribute.getMapping(); XmlBasic basicResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getBasics().get(0); - assertEquals(Converter.NO_CONVERTER, ormBasicMapping.getSpecifiedConverter().getType()); + assertEquals(Converter.NO_CONVERTER, ormBasicMapping.getConverter().getType()); assertNull(basicResource.getTemporal()); //set temporal in the resource model, verify context model updated basicResource.setTemporal(org.eclipse.jpt.core.resource.orm.TemporalType.DATE); - assertEquals(TemporalType.DATE, ((TemporalConverter) ormBasicMapping.getSpecifiedConverter()).getTemporalType()); + assertEquals(TemporalType.DATE, ((TemporalConverter) ormBasicMapping.getConverter()).getTemporalType()); assertEquals(org.eclipse.jpt.core.resource.orm.TemporalType.DATE, basicResource.getTemporal()); basicResource.setTemporal(org.eclipse.jpt.core.resource.orm.TemporalType.TIME); - assertEquals(TemporalType.TIME, ((TemporalConverter) ormBasicMapping.getSpecifiedConverter()).getTemporalType()); + assertEquals(TemporalType.TIME, ((TemporalConverter) ormBasicMapping.getConverter()).getTemporalType()); assertEquals(org.eclipse.jpt.core.resource.orm.TemporalType.TIME, basicResource.getTemporal()); basicResource.setTemporal(org.eclipse.jpt.core.resource.orm.TemporalType.TIMESTAMP); - assertEquals(TemporalType.TIMESTAMP, ((TemporalConverter) ormBasicMapping.getSpecifiedConverter()).getTemporalType()); + assertEquals(TemporalType.TIMESTAMP, ((TemporalConverter) ormBasicMapping.getConverter()).getTemporalType()); assertEquals(org.eclipse.jpt.core.resource.orm.TemporalType.TIMESTAMP, basicResource.getTemporal()); //set temporal to null in the resource model basicResource.setTemporal(null); - assertEquals(Converter.NO_CONVERTER, ormBasicMapping.getSpecifiedConverter().getType()); + assertEquals(Converter.NO_CONVERTER, ormBasicMapping.getConverter().getType()); assertNull(basicResource.getTemporal()); } @@ -341,27 +341,27 @@ public class OrmBasicMappingTests extends ContextModelTestCase OrmBasicMapping ormBasicMapping = (OrmBasicMapping) ormPersistentAttribute.getMapping(); XmlBasic basicResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getBasics().get(0); - assertEquals(Converter.NO_CONVERTER, ormBasicMapping.getSpecifiedConverter().getType()); + assertEquals(Converter.NO_CONVERTER, ormBasicMapping.getConverter().getType()); assertNull(basicResource.getTemporal()); //set temporal in the context model, verify resource model updated - ormBasicMapping.setSpecifiedConverter(Converter.TEMPORAL_CONVERTER); - ((TemporalConverter) ormBasicMapping.getSpecifiedConverter()).setTemporalType(TemporalType.DATE); + ormBasicMapping.setConverter(Converter.TEMPORAL_CONVERTER); + ((TemporalConverter) ormBasicMapping.getConverter()).setTemporalType(TemporalType.DATE); assertEquals(org.eclipse.jpt.core.resource.orm.TemporalType.DATE, basicResource.getTemporal()); - assertEquals(TemporalType.DATE, ((TemporalConverter) ormBasicMapping.getSpecifiedConverter()).getTemporalType()); + assertEquals(TemporalType.DATE, ((TemporalConverter) ormBasicMapping.getConverter()).getTemporalType()); - ((TemporalConverter) ormBasicMapping.getSpecifiedConverter()).setTemporalType(TemporalType.TIME); + ((TemporalConverter) ormBasicMapping.getConverter()).setTemporalType(TemporalType.TIME); assertEquals(org.eclipse.jpt.core.resource.orm.TemporalType.TIME, basicResource.getTemporal()); - assertEquals(TemporalType.TIME, ((TemporalConverter) ormBasicMapping.getSpecifiedConverter()).getTemporalType()); + assertEquals(TemporalType.TIME, ((TemporalConverter) ormBasicMapping.getConverter()).getTemporalType()); - ((TemporalConverter) ormBasicMapping.getSpecifiedConverter()).setTemporalType(TemporalType.TIMESTAMP); + ((TemporalConverter) ormBasicMapping.getConverter()).setTemporalType(TemporalType.TIMESTAMP); assertEquals(org.eclipse.jpt.core.resource.orm.TemporalType.TIMESTAMP, basicResource.getTemporal()); - assertEquals(TemporalType.TIMESTAMP, ((TemporalConverter) ormBasicMapping.getSpecifiedConverter()).getTemporalType()); + assertEquals(TemporalType.TIMESTAMP, ((TemporalConverter) ormBasicMapping.getConverter()).getTemporalType()); //set temporal to null in the context model - ormBasicMapping.setSpecifiedConverter(Converter.NO_CONVERTER); + ormBasicMapping.setConverter(Converter.NO_CONVERTER); assertNull(basicResource.getTemporal()); - assertEquals(Converter.NO_CONVERTER, ormBasicMapping.getSpecifiedConverter().getType()); + assertEquals(Converter.NO_CONVERTER, ormBasicMapping.getConverter().getType()); } //TODO test defaults @@ -379,7 +379,7 @@ public class OrmBasicMappingTests extends ContextModelTestCase OrmBasicMapping ormBasicMapping = (OrmBasicMapping) ormPersistentAttribute.getMapping(); assertEquals("foo", ormBasicMapping.getName()); - assertEquals(Converter.NO_CONVERTER, ormBasicMapping.getSpecifiedConverter().getType()); + assertEquals(Converter.NO_CONVERTER, ormBasicMapping.getConverter().getType()); assertNull(ormBasicMapping.getSpecifiedFetch()); assertNull(ormBasicMapping.getSpecifiedOptional()); assertEquals(FetchType.EAGER, ormBasicMapping.getFetch()); @@ -425,8 +425,8 @@ public class OrmBasicMappingTests extends ContextModelTestCase OrmBasicMapping ormBasicMapping = (OrmBasicMapping) ormPersistentAttribute.getMapping(); assertEquals("id", ormBasicMapping.getName()); - assertEquals(Converter.ENUMERATED_CONVERTER, ormBasicMapping.getSpecifiedConverter().getType()); - assertEquals(EnumType.STRING, ((EnumeratedConverter) ormBasicMapping.getSpecifiedConverter()).getEnumType()); + assertEquals(Converter.ENUMERATED_CONVERTER, ormBasicMapping.getConverter().getType()); + assertEquals(EnumType.STRING, ((EnumeratedConverter) ormBasicMapping.getConverter()).getEnumType()); assertEquals(FetchType.LAZY, ormBasicMapping.getSpecifiedFetch()); assertEquals(Boolean.FALSE, ormBasicMapping.getSpecifiedOptional()); @@ -452,7 +452,7 @@ public class OrmBasicMappingTests extends ContextModelTestCase OrmBasicMapping ormBasicMapping = (OrmBasicMapping) ormPersistentAttribute.getMapping(); assertEquals("id", ormBasicMapping.getName()); - assertEquals(Converter.NO_CONVERTER, ormBasicMapping.getSpecifiedConverter().getType()); + assertEquals(Converter.NO_CONVERTER, ormBasicMapping.getConverter().getType()); assertEquals(FetchType.EAGER, ormBasicMapping.getSpecifiedFetch()); assertEquals(Boolean.TRUE, ormBasicMapping.getSpecifiedOptional()); @@ -480,7 +480,7 @@ public class OrmBasicMappingTests extends ContextModelTestCase OrmBasicMapping ormBasicMapping = (OrmBasicMapping) ormPersistentAttribute.getMapping(); assertEquals("id", ormBasicMapping.getName()); - assertEquals(Converter.NO_CONVERTER, ormBasicMapping.getSpecifiedConverter().getType()); + assertEquals(Converter.NO_CONVERTER, ormBasicMapping.getConverter().getType()); assertNull(ormBasicMapping.getSpecifiedFetch()); assertNull(ormBasicMapping.getSpecifiedOptional()); assertEquals(FetchType.EAGER, ormBasicMapping.getDefaultFetch()); @@ -524,8 +524,8 @@ public class OrmBasicMappingTests extends ContextModelTestCase BasicMapping basicMapping = (BasicMapping) ormPersistentAttribute.getMapping(); assertFalse(basicMapping.isDefault()); basicMapping.getColumn().setSpecifiedName("FOO"); - basicMapping.setSpecifiedConverter(Converter.TEMPORAL_CONVERTER); - ((TemporalConverter) basicMapping.getSpecifiedConverter()).setTemporalType(TemporalType.TIME); + basicMapping.setConverter(Converter.TEMPORAL_CONVERTER); + ((TemporalConverter) basicMapping.getConverter()).setTemporalType(TemporalType.TIME); basicMapping.setSpecifiedFetch(FetchType.EAGER); basicMapping.setSpecifiedOptional(Boolean.FALSE); assertFalse(basicMapping.isDefault()); @@ -546,8 +546,8 @@ public class OrmBasicMappingTests extends ContextModelTestCase BasicMapping basicMapping = (BasicMapping) ormPersistentAttribute.getMapping(); assertFalse(basicMapping.isDefault()); basicMapping.getColumn().setSpecifiedName("FOO"); - basicMapping.setSpecifiedConverter(Converter.TEMPORAL_CONVERTER); - ((TemporalConverter) basicMapping.getSpecifiedConverter()).setTemporalType(TemporalType.TIME); + basicMapping.setConverter(Converter.TEMPORAL_CONVERTER); + ((TemporalConverter) basicMapping.getConverter()).setTemporalType(TemporalType.TIME); basicMapping.setSpecifiedFetch(FetchType.EAGER); basicMapping.setSpecifiedOptional(Boolean.FALSE); assertFalse(basicMapping.isDefault()); @@ -568,8 +568,8 @@ public class OrmBasicMappingTests extends ContextModelTestCase BasicMapping basicMapping = (BasicMapping) ormPersistentAttribute.getMapping(); assertFalse(basicMapping.isDefault()); basicMapping.getColumn().setSpecifiedName("FOO"); - basicMapping.setSpecifiedConverter(Converter.TEMPORAL_CONVERTER); - ((TemporalConverter) basicMapping.getSpecifiedConverter()).setTemporalType(TemporalType.TIME); + basicMapping.setConverter(Converter.TEMPORAL_CONVERTER); + ((TemporalConverter) basicMapping.getConverter()).setTemporalType(TemporalType.TIME); basicMapping.setSpecifiedFetch(FetchType.EAGER); basicMapping.setSpecifiedOptional(Boolean.FALSE); assertFalse(basicMapping.isDefault()); @@ -589,8 +589,8 @@ public class OrmBasicMappingTests extends ContextModelTestCase BasicMapping basicMapping = (BasicMapping) ormPersistentAttribute.getMapping(); assertFalse(basicMapping.isDefault()); basicMapping.getColumn().setSpecifiedName("FOO"); - basicMapping.setSpecifiedConverter(Converter.TEMPORAL_CONVERTER); - ((TemporalConverter) basicMapping.getSpecifiedConverter()).setTemporalType(TemporalType.TIME); + basicMapping.setConverter(Converter.TEMPORAL_CONVERTER); + ((TemporalConverter) basicMapping.getConverter()).setTemporalType(TemporalType.TIME); basicMapping.setSpecifiedFetch(FetchType.EAGER); basicMapping.setSpecifiedOptional(Boolean.FALSE); assertFalse(basicMapping.isDefault()); @@ -610,8 +610,8 @@ public class OrmBasicMappingTests extends ContextModelTestCase BasicMapping basicMapping = (BasicMapping) ormPersistentAttribute.getMapping(); assertFalse(basicMapping.isDefault()); basicMapping.getColumn().setSpecifiedName("FOO"); - basicMapping.setSpecifiedConverter(Converter.TEMPORAL_CONVERTER); - ((TemporalConverter) basicMapping.getSpecifiedConverter()).setTemporalType(TemporalType.TIME); + basicMapping.setConverter(Converter.TEMPORAL_CONVERTER); + ((TemporalConverter) basicMapping.getConverter()).setTemporalType(TemporalType.TIME); basicMapping.setSpecifiedFetch(FetchType.EAGER); basicMapping.setSpecifiedOptional(Boolean.FALSE); assertFalse(basicMapping.isDefault()); @@ -631,8 +631,8 @@ public class OrmBasicMappingTests extends ContextModelTestCase BasicMapping basicMapping = (BasicMapping) ormPersistentAttribute.getMapping(); assertFalse(basicMapping.isDefault()); basicMapping.getColumn().setSpecifiedName("FOO"); - basicMapping.setSpecifiedConverter(Converter.TEMPORAL_CONVERTER); - ((TemporalConverter) basicMapping.getSpecifiedConverter()).setTemporalType(TemporalType.TIME); + basicMapping.setConverter(Converter.TEMPORAL_CONVERTER); + ((TemporalConverter) basicMapping.getConverter()).setTemporalType(TemporalType.TIME); basicMapping.setSpecifiedFetch(FetchType.EAGER); basicMapping.setSpecifiedOptional(Boolean.FALSE); assertFalse(basicMapping.isDefault()); @@ -652,8 +652,8 @@ public class OrmBasicMappingTests extends ContextModelTestCase BasicMapping basicMapping = (BasicMapping) ormPersistentAttribute.getMapping(); assertFalse(basicMapping.isDefault()); basicMapping.getColumn().setSpecifiedName("FOO"); - basicMapping.setSpecifiedConverter(Converter.TEMPORAL_CONVERTER); - ((TemporalConverter) basicMapping.getSpecifiedConverter()).setTemporalType(TemporalType.TIME); + basicMapping.setConverter(Converter.TEMPORAL_CONVERTER); + ((TemporalConverter) basicMapping.getConverter()).setTemporalType(TemporalType.TIME); basicMapping.setSpecifiedFetch(FetchType.EAGER); basicMapping.setSpecifiedOptional(Boolean.FALSE); assertFalse(basicMapping.isDefault()); @@ -673,8 +673,8 @@ public class OrmBasicMappingTests extends ContextModelTestCase BasicMapping basicMapping = (BasicMapping) ormPersistentAttribute.getMapping(); assertFalse(basicMapping.isDefault()); basicMapping.getColumn().setSpecifiedName("FOO"); - basicMapping.setSpecifiedConverter(Converter.TEMPORAL_CONVERTER); - ((TemporalConverter) basicMapping.getSpecifiedConverter()).setTemporalType(TemporalType.TIME); + basicMapping.setConverter(Converter.TEMPORAL_CONVERTER); + ((TemporalConverter) basicMapping.getConverter()).setTemporalType(TemporalType.TIME); basicMapping.setSpecifiedFetch(FetchType.EAGER); basicMapping.setSpecifiedOptional(Boolean.FALSE); assertFalse(basicMapping.isDefault()); @@ -694,8 +694,8 @@ public class OrmBasicMappingTests extends ContextModelTestCase BasicMapping basicMapping = (BasicMapping) ormPersistentAttribute.getMapping(); assertFalse(basicMapping.isDefault()); basicMapping.getColumn().setSpecifiedName("FOO"); - basicMapping.setSpecifiedConverter(Converter.TEMPORAL_CONVERTER); - ((TemporalConverter) basicMapping.getSpecifiedConverter()).setTemporalType(TemporalType.TIME); + basicMapping.setConverter(Converter.TEMPORAL_CONVERTER); + ((TemporalConverter) basicMapping.getConverter()).setTemporalType(TemporalType.TIME); basicMapping.setSpecifiedFetch(FetchType.EAGER); basicMapping.setSpecifiedOptional(Boolean.FALSE); assertFalse(basicMapping.isDefault()); diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmIdMappingTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmIdMappingTests.java index e1a48c1725..f32cf0d4dc 100644 --- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmIdMappingTests.java +++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmIdMappingTests.java @@ -133,25 +133,25 @@ public class OrmIdMappingTests extends ContextModelTestCase OrmIdMapping ormIdMapping = (OrmIdMapping) ormPersistentAttribute.getMapping(); XmlId idResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getIds().get(0); - assertEquals(Converter.NO_CONVERTER, ormIdMapping.getSpecifiedConverter().getType()); + assertEquals(Converter.NO_CONVERTER, ormIdMapping.getConverter().getType()); assertNull(idResource.getTemporal()); //set temporal in the resource model, verify context model updated idResource.setTemporal(org.eclipse.jpt.core.resource.orm.TemporalType.DATE); - assertEquals(TemporalType.DATE, ((TemporalConverter) ormIdMapping.getSpecifiedConverter()).getTemporalType()); + assertEquals(TemporalType.DATE, ((TemporalConverter) ormIdMapping.getConverter()).getTemporalType()); assertEquals(org.eclipse.jpt.core.resource.orm.TemporalType.DATE, idResource.getTemporal()); idResource.setTemporal(org.eclipse.jpt.core.resource.orm.TemporalType.TIME); - assertEquals(TemporalType.TIME, ((TemporalConverter) ormIdMapping.getSpecifiedConverter()).getTemporalType()); + assertEquals(TemporalType.TIME, ((TemporalConverter) ormIdMapping.getConverter()).getTemporalType()); assertEquals(org.eclipse.jpt.core.resource.orm.TemporalType.TIME, idResource.getTemporal()); idResource.setTemporal(org.eclipse.jpt.core.resource.orm.TemporalType.TIMESTAMP); - assertEquals(TemporalType.TIMESTAMP, ((TemporalConverter) ormIdMapping.getSpecifiedConverter()).getTemporalType()); + assertEquals(TemporalType.TIMESTAMP, ((TemporalConverter) ormIdMapping.getConverter()).getTemporalType()); assertEquals(org.eclipse.jpt.core.resource.orm.TemporalType.TIMESTAMP, idResource.getTemporal()); //set temporal to null in the resource model idResource.setTemporal(null); - assertEquals(Converter.NO_CONVERTER, ormIdMapping.getSpecifiedConverter().getType()); + assertEquals(Converter.NO_CONVERTER, ormIdMapping.getConverter().getType()); assertNull(idResource.getTemporal()); } @@ -161,27 +161,27 @@ public class OrmIdMappingTests extends ContextModelTestCase OrmIdMapping ormIdMapping = (OrmIdMapping) ormPersistentAttribute.getMapping(); XmlId idResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getIds().get(0); - assertEquals(Converter.NO_CONVERTER, ormIdMapping.getSpecifiedConverter().getType()); + assertEquals(Converter.NO_CONVERTER, ormIdMapping.getConverter().getType()); assertNull(idResource.getTemporal()); //set temporal in the context model, verify resource model updated - ormIdMapping.setSpecifiedConverter(Converter.TEMPORAL_CONVERTER); - ((TemporalConverter) ormIdMapping.getSpecifiedConverter()).setTemporalType(TemporalType.DATE); + ormIdMapping.setConverter(Converter.TEMPORAL_CONVERTER); + ((TemporalConverter) ormIdMapping.getConverter()).setTemporalType(TemporalType.DATE); assertEquals(org.eclipse.jpt.core.resource.orm.TemporalType.DATE, idResource.getTemporal()); - assertEquals(TemporalType.DATE, ((TemporalConverter) ormIdMapping.getSpecifiedConverter()).getTemporalType()); + assertEquals(TemporalType.DATE, ((TemporalConverter) ormIdMapping.getConverter()).getTemporalType()); - ((TemporalConverter) ormIdMapping.getSpecifiedConverter()).setTemporalType(TemporalType.TIME); + ((TemporalConverter) ormIdMapping.getConverter()).setTemporalType(TemporalType.TIME); assertEquals(org.eclipse.jpt.core.resource.orm.TemporalType.TIME, idResource.getTemporal()); - assertEquals(TemporalType.TIME, ((TemporalConverter) ormIdMapping.getSpecifiedConverter()).getTemporalType()); + assertEquals(TemporalType.TIME, ((TemporalConverter) ormIdMapping.getConverter()).getTemporalType()); - ((TemporalConverter) ormIdMapping.getSpecifiedConverter()).setTemporalType(TemporalType.TIMESTAMP); + ((TemporalConverter) ormIdMapping.getConverter()).setTemporalType(TemporalType.TIMESTAMP); assertEquals(org.eclipse.jpt.core.resource.orm.TemporalType.TIMESTAMP, idResource.getTemporal()); - assertEquals(TemporalType.TIMESTAMP, ((TemporalConverter) ormIdMapping.getSpecifiedConverter()).getTemporalType()); + assertEquals(TemporalType.TIMESTAMP, ((TemporalConverter) ormIdMapping.getConverter()).getTemporalType()); //set temporal to null in the context model - ormIdMapping.setSpecifiedConverter(Converter.NO_CONVERTER); + ormIdMapping.setConverter(Converter.NO_CONVERTER); assertNull(idResource.getTemporal()); - assertEquals(Converter.NO_CONVERTER, ormIdMapping.getSpecifiedConverter().getType()); + assertEquals(Converter.NO_CONVERTER, ormIdMapping.getConverter().getType()); } //TODO test defaults @@ -417,7 +417,7 @@ public class OrmIdMappingTests extends ContextModelTestCase OrmIdMapping ormIdMapping = (OrmIdMapping) ormPersistentAttribute.getMapping(); assertEquals("foo", ormIdMapping.getName()); - assertEquals(Converter.NO_CONVERTER, ormIdMapping.getSpecifiedConverter().getType()); + assertEquals(Converter.NO_CONVERTER, ormIdMapping.getConverter().getType()); assertNull(ormIdMapping.getGeneratedValue()); assertNull(ormIdMapping.getGeneratorContainer().getSequenceGenerator()); assertNull(ormIdMapping.getGeneratorContainer().getTableGenerator()); @@ -462,8 +462,8 @@ public class OrmIdMappingTests extends ContextModelTestCase OrmIdMapping ormIdMapping = (OrmIdMapping) ormPersistentAttribute.getMapping(); assertEquals("id", ormIdMapping.getName()); - assertEquals(Converter.TEMPORAL_CONVERTER, ormIdMapping.getSpecifiedConverter().getType()); - assertEquals(TemporalType.TIMESTAMP, ((TemporalConverter) ormIdMapping.getSpecifiedConverter()).getTemporalType()); + assertEquals(Converter.TEMPORAL_CONVERTER, ormIdMapping.getConverter().getType()); + assertEquals(TemporalType.TIMESTAMP, ((TemporalConverter) ormIdMapping.getConverter()).getTemporalType()); OrmColumn ormColumn = ormIdMapping.getColumn(); assertEquals("MY_COLUMN", ormColumn.getSpecifiedName()); @@ -510,7 +510,7 @@ public class OrmIdMappingTests extends ContextModelTestCase OrmIdMapping ormIdMapping = (OrmIdMapping) ormPersistentAttribute.getMapping(); assertEquals("id", ormIdMapping.getName()); - assertEquals(Converter.NO_CONVERTER, ormIdMapping.getSpecifiedConverter().getType()); + assertEquals(Converter.NO_CONVERTER, ormIdMapping.getConverter().getType()); assertNull(ormIdMapping.getGeneratedValue()); assertNull(ormIdMapping.getGeneratorContainer().getSequenceGenerator()); assertNull(ormIdMapping.getGeneratorContainer().getTableGenerator()); @@ -539,7 +539,7 @@ public class OrmIdMappingTests extends ContextModelTestCase OrmIdMapping ormIdMapping = (OrmIdMapping) ormPersistentAttribute.getMapping(); assertEquals("id", ormIdMapping.getName()); - assertEquals(Converter.NO_CONVERTER, ormIdMapping.getSpecifiedConverter().getType()); + assertEquals(Converter.NO_CONVERTER, ormIdMapping.getConverter().getType()); assertNull(ormIdMapping.getGeneratedValue()); assertNull(ormIdMapping.getGeneratorContainer().getSequenceGenerator()); assertNull(ormIdMapping.getGeneratorContainer().getTableGenerator()); @@ -581,8 +581,8 @@ public class OrmIdMappingTests extends ContextModelTestCase IdMapping idMapping = (IdMapping) ormPersistentAttribute.getMapping(); assertFalse(idMapping.isDefault()); idMapping.getColumn().setSpecifiedName("FOO"); - idMapping.setSpecifiedConverter(Converter.TEMPORAL_CONVERTER); - ((TemporalConverter) idMapping.getSpecifiedConverter()).setTemporalType(TemporalType.TIME); + idMapping.setConverter(Converter.TEMPORAL_CONVERTER); + ((TemporalConverter) idMapping.getConverter()).setTemporalType(TemporalType.TIME); assertFalse(idMapping.isDefault()); ormPersistentAttribute.setSpecifiedMappingKey(MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY); @@ -601,8 +601,8 @@ public class OrmIdMappingTests extends ContextModelTestCase IdMapping idMapping = (IdMapping) ormPersistentAttribute.getMapping(); assertFalse(idMapping.isDefault()); idMapping.getColumn().setSpecifiedName("FOO"); - idMapping.setSpecifiedConverter(Converter.TEMPORAL_CONVERTER); - ((TemporalConverter) idMapping.getSpecifiedConverter()).setTemporalType(TemporalType.TIME); + idMapping.setConverter(Converter.TEMPORAL_CONVERTER); + ((TemporalConverter) idMapping.getConverter()).setTemporalType(TemporalType.TIME); assertFalse(idMapping.isDefault()); ormPersistentAttribute.setSpecifiedMappingKey(MappingKeys.VERSION_ATTRIBUTE_MAPPING_KEY); @@ -621,8 +621,8 @@ public class OrmIdMappingTests extends ContextModelTestCase IdMapping idMapping = (IdMapping) ormPersistentAttribute.getMapping(); assertFalse(idMapping.isDefault()); idMapping.getColumn().setSpecifiedName("FOO"); - idMapping.setSpecifiedConverter(Converter.TEMPORAL_CONVERTER); - ((TemporalConverter) idMapping.getSpecifiedConverter()).setTemporalType(TemporalType.TIME); + idMapping.setConverter(Converter.TEMPORAL_CONVERTER); + ((TemporalConverter) idMapping.getConverter()).setTemporalType(TemporalType.TIME); assertFalse(idMapping.isDefault()); ormPersistentAttribute.setSpecifiedMappingKey(MappingKeys.TRANSIENT_ATTRIBUTE_MAPPING_KEY); @@ -638,8 +638,8 @@ public class OrmIdMappingTests extends ContextModelTestCase IdMapping idMapping = (IdMapping) ormPersistentAttribute.getMapping(); assertFalse(idMapping.isDefault()); idMapping.getColumn().setSpecifiedName("FOO"); - idMapping.setSpecifiedConverter(Converter.TEMPORAL_CONVERTER); - ((TemporalConverter) idMapping.getSpecifiedConverter()).setTemporalType(TemporalType.TIME); + idMapping.setConverter(Converter.TEMPORAL_CONVERTER); + ((TemporalConverter) idMapping.getConverter()).setTemporalType(TemporalType.TIME); assertFalse(idMapping.isDefault()); ormPersistentAttribute.setSpecifiedMappingKey(MappingKeys.EMBEDDED_ATTRIBUTE_MAPPING_KEY); @@ -657,8 +657,8 @@ public class OrmIdMappingTests extends ContextModelTestCase IdMapping idMapping = (IdMapping) ormPersistentAttribute.getMapping(); assertFalse(idMapping.isDefault()); idMapping.getColumn().setSpecifiedName("FOO"); - idMapping.setSpecifiedConverter(Converter.TEMPORAL_CONVERTER); - ((TemporalConverter) idMapping.getSpecifiedConverter()).setTemporalType(TemporalType.TIME); + idMapping.setConverter(Converter.TEMPORAL_CONVERTER); + ((TemporalConverter) idMapping.getConverter()).setTemporalType(TemporalType.TIME); assertFalse(idMapping.isDefault()); ormPersistentAttribute.setSpecifiedMappingKey(MappingKeys.EMBEDDED_ID_ATTRIBUTE_MAPPING_KEY); @@ -674,8 +674,8 @@ public class OrmIdMappingTests extends ContextModelTestCase IdMapping idMapping = (IdMapping) ormPersistentAttribute.getMapping(); assertFalse(idMapping.isDefault()); idMapping.getColumn().setSpecifiedName("FOO"); - idMapping.setSpecifiedConverter(Converter.TEMPORAL_CONVERTER); - ((TemporalConverter) idMapping.getSpecifiedConverter()).setTemporalType(TemporalType.TIME); + idMapping.setConverter(Converter.TEMPORAL_CONVERTER); + ((TemporalConverter) idMapping.getConverter()).setTemporalType(TemporalType.TIME); assertFalse(idMapping.isDefault()); ormPersistentAttribute.setSpecifiedMappingKey(MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY); @@ -693,8 +693,8 @@ public class OrmIdMappingTests extends ContextModelTestCase IdMapping idMapping = (IdMapping) ormPersistentAttribute.getMapping(); assertFalse(idMapping.isDefault()); idMapping.getColumn().setSpecifiedName("FOO"); - idMapping.setSpecifiedConverter(Converter.TEMPORAL_CONVERTER); - ((TemporalConverter) idMapping.getSpecifiedConverter()).setTemporalType(TemporalType.TIME); + idMapping.setConverter(Converter.TEMPORAL_CONVERTER); + ((TemporalConverter) idMapping.getConverter()).setTemporalType(TemporalType.TIME); assertFalse(idMapping.isDefault()); ormPersistentAttribute.setSpecifiedMappingKey(MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY); @@ -712,8 +712,8 @@ public class OrmIdMappingTests extends ContextModelTestCase IdMapping idMapping = (IdMapping) ormPersistentAttribute.getMapping(); assertFalse(idMapping.isDefault()); idMapping.getColumn().setSpecifiedName("FOO"); - idMapping.setSpecifiedConverter(Converter.TEMPORAL_CONVERTER); - ((TemporalConverter) idMapping.getSpecifiedConverter()).setTemporalType(TemporalType.TIME); + idMapping.setConverter(Converter.TEMPORAL_CONVERTER); + ((TemporalConverter) idMapping.getConverter()).setTemporalType(TemporalType.TIME); assertFalse(idMapping.isDefault()); ormPersistentAttribute.setSpecifiedMappingKey(MappingKeys.MANY_TO_ONE_ATTRIBUTE_MAPPING_KEY); @@ -731,8 +731,8 @@ public class OrmIdMappingTests extends ContextModelTestCase IdMapping idMapping = (IdMapping) ormPersistentAttribute.getMapping(); assertFalse(idMapping.isDefault()); idMapping.getColumn().setSpecifiedName("FOO"); - idMapping.setSpecifiedConverter(Converter.TEMPORAL_CONVERTER); - ((TemporalConverter) idMapping.getSpecifiedConverter()).setTemporalType(TemporalType.TIME); + idMapping.setConverter(Converter.TEMPORAL_CONVERTER); + ((TemporalConverter) idMapping.getConverter()).setTemporalType(TemporalType.TIME); assertFalse(idMapping.isDefault()); ormPersistentAttribute.setSpecifiedMappingKey(MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmVersionMappingTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmVersionMappingTests.java index ad7094c7cb..73c1b1795b 100644 --- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmVersionMappingTests.java +++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmVersionMappingTests.java @@ -121,25 +121,25 @@ public class OrmVersionMappingTests extends ContextModelTestCase OrmVersionMapping ormVersionMapping = (OrmVersionMapping) ormPersistentAttribute.getMapping(); XmlVersion versionResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getVersions().get(0); - assertEquals(Converter.NO_CONVERTER, ormVersionMapping.getSpecifiedConverter().getType()); + assertEquals(Converter.NO_CONVERTER, ormVersionMapping.getConverter().getType()); assertNull(versionResource.getTemporal()); //set temporal in the resource model, verify context model updated versionResource.setTemporal(org.eclipse.jpt.core.resource.orm.TemporalType.DATE); - assertEquals(TemporalType.DATE, ((TemporalConverter) ormVersionMapping.getSpecifiedConverter()).getTemporalType()); + assertEquals(TemporalType.DATE, ((TemporalConverter) ormVersionMapping.getConverter()).getTemporalType()); assertEquals(org.eclipse.jpt.core.resource.orm.TemporalType.DATE, versionResource.getTemporal()); versionResource.setTemporal(org.eclipse.jpt.core.resource.orm.TemporalType.TIME); - assertEquals(TemporalType.TIME, ((TemporalConverter) ormVersionMapping.getSpecifiedConverter()).getTemporalType()); + assertEquals(TemporalType.TIME, ((TemporalConverter) ormVersionMapping.getConverter()).getTemporalType()); assertEquals(org.eclipse.jpt.core.resource.orm.TemporalType.TIME, versionResource.getTemporal()); versionResource.setTemporal(org.eclipse.jpt.core.resource.orm.TemporalType.TIMESTAMP); - assertEquals(TemporalType.TIMESTAMP, ((TemporalConverter) ormVersionMapping.getSpecifiedConverter()).getTemporalType()); + assertEquals(TemporalType.TIMESTAMP, ((TemporalConverter) ormVersionMapping.getConverter()).getTemporalType()); assertEquals(org.eclipse.jpt.core.resource.orm.TemporalType.TIMESTAMP, versionResource.getTemporal()); //set temporal to null in the resource model versionResource.setTemporal(null); - assertEquals(Converter.NO_CONVERTER, ormVersionMapping.getSpecifiedConverter().getType()); + assertEquals(Converter.NO_CONVERTER, ormVersionMapping.getConverter().getType()); assertNull(versionResource.getTemporal()); } @@ -149,27 +149,27 @@ public class OrmVersionMappingTests extends ContextModelTestCase OrmVersionMapping ormVersionMapping = (OrmVersionMapping) ormPersistentAttribute.getMapping(); XmlVersion versionResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getVersions().get(0); - assertEquals(Converter.NO_CONVERTER, ormVersionMapping.getSpecifiedConverter().getType()); + assertEquals(Converter.NO_CONVERTER, ormVersionMapping.getConverter().getType()); assertNull(versionResource.getTemporal()); //set temporal in the context model, verify resource model updated - ormVersionMapping.setSpecifiedConverter(Converter.TEMPORAL_CONVERTER); - ((TemporalConverter) ormVersionMapping.getSpecifiedConverter()).setTemporalType(TemporalType.DATE); + ormVersionMapping.setConverter(Converter.TEMPORAL_CONVERTER); + ((TemporalConverter) ormVersionMapping.getConverter()).setTemporalType(TemporalType.DATE); assertEquals(org.eclipse.jpt.core.resource.orm.TemporalType.DATE, versionResource.getTemporal()); - assertEquals(TemporalType.DATE, ((TemporalConverter) ormVersionMapping.getSpecifiedConverter()).getTemporalType()); + assertEquals(TemporalType.DATE, ((TemporalConverter) ormVersionMapping.getConverter()).getTemporalType()); - ((TemporalConverter) ormVersionMapping.getSpecifiedConverter()).setTemporalType(TemporalType.TIME); + ((TemporalConverter) ormVersionMapping.getConverter()).setTemporalType(TemporalType.TIME); assertEquals(org.eclipse.jpt.core.resource.orm.TemporalType.TIME, versionResource.getTemporal()); - assertEquals(TemporalType.TIME, ((TemporalConverter) ormVersionMapping.getSpecifiedConverter()).getTemporalType()); + assertEquals(TemporalType.TIME, ((TemporalConverter) ormVersionMapping.getConverter()).getTemporalType()); - ((TemporalConverter) ormVersionMapping.getSpecifiedConverter()).setTemporalType(TemporalType.TIMESTAMP); + ((TemporalConverter) ormVersionMapping.getConverter()).setTemporalType(TemporalType.TIMESTAMP); assertEquals(org.eclipse.jpt.core.resource.orm.TemporalType.TIMESTAMP, versionResource.getTemporal()); - assertEquals(TemporalType.TIMESTAMP, ((TemporalConverter) ormVersionMapping.getSpecifiedConverter()).getTemporalType()); + assertEquals(TemporalType.TIMESTAMP, ((TemporalConverter) ormVersionMapping.getConverter()).getTemporalType()); //set temporal to null in the context model - ormVersionMapping.setSpecifiedConverter(Converter.NO_CONVERTER); + ormVersionMapping.setConverter(Converter.NO_CONVERTER); assertNull(versionResource.getTemporal()); - assertEquals(Converter.NO_CONVERTER, ormVersionMapping.getSpecifiedConverter().getType()); + assertEquals(Converter.NO_CONVERTER, ormVersionMapping.getConverter().getType()); } //TODO test defaults @@ -186,7 +186,7 @@ public class OrmVersionMappingTests extends ContextModelTestCase OrmVersionMapping ormVersionMapping = (OrmVersionMapping) ormPersistentAttribute.getMapping(); assertEquals("foo", ormVersionMapping.getName()); - assertEquals(Converter.NO_CONVERTER, ormVersionMapping.getSpecifiedConverter().getType()); + assertEquals(Converter.NO_CONVERTER, ormVersionMapping.getConverter().getType()); OrmColumn ormColumn = ormVersionMapping.getColumn(); @@ -228,8 +228,8 @@ public class OrmVersionMappingTests extends ContextModelTestCase OrmVersionMapping ormVersionMapping = (OrmVersionMapping) ormPersistentAttribute.getMapping(); assertEquals("id", ormVersionMapping.getName()); - assertEquals(Converter.TEMPORAL_CONVERTER, ormVersionMapping.getSpecifiedConverter().getType()); - assertEquals(TemporalType.TIMESTAMP, ((TemporalConverter) ormVersionMapping.getSpecifiedConverter()).getTemporalType()); + assertEquals(Converter.TEMPORAL_CONVERTER, ormVersionMapping.getConverter().getType()); + assertEquals(TemporalType.TIMESTAMP, ((TemporalConverter) ormVersionMapping.getConverter()).getTemporalType()); OrmColumn ormColumn = ormVersionMapping.getColumn(); assertEquals("MY_COLUMN", ormColumn.getSpecifiedName()); @@ -258,7 +258,7 @@ public class OrmVersionMappingTests extends ContextModelTestCase OrmVersionMapping ormVersionMapping = (OrmVersionMapping) ormPersistentAttribute.getMapping(); assertEquals("id", ormVersionMapping.getName()); - assertEquals(Converter.NO_CONVERTER, ormVersionMapping.getSpecifiedConverter().getType()); + assertEquals(Converter.NO_CONVERTER, ormVersionMapping.getConverter().getType()); OrmColumn ormColumn = ormVersionMapping.getColumn(); assertEquals("id", ormColumn.getName()); @@ -284,7 +284,7 @@ public class OrmVersionMappingTests extends ContextModelTestCase OrmVersionMapping ormVersionMapping = (OrmVersionMapping) ormPersistentAttribute.getMapping(); assertEquals("id", ormVersionMapping.getName()); - assertEquals(Converter.NO_CONVERTER, ormVersionMapping.getSpecifiedConverter().getType()); + assertEquals(Converter.NO_CONVERTER, ormVersionMapping.getConverter().getType()); OrmColumn ormColumn = ormVersionMapping.getColumn(); assertNull(ormColumn.getSpecifiedName()); @@ -318,8 +318,8 @@ public class OrmVersionMappingTests extends ContextModelTestCase VersionMapping versionMapping = (VersionMapping) ormPersistentAttribute.getMapping(); assertFalse(versionMapping.isDefault()); versionMapping.getColumn().setSpecifiedName("FOO"); - versionMapping.setSpecifiedConverter(Converter.TEMPORAL_CONVERTER); - ((TemporalConverter) versionMapping.getSpecifiedConverter()).setTemporalType(TemporalType.TIME); + versionMapping.setConverter(Converter.TEMPORAL_CONVERTER); + ((TemporalConverter) versionMapping.getConverter()).setTemporalType(TemporalType.TIME); assertFalse(versionMapping.isDefault()); ormPersistentAttribute.setSpecifiedMappingKey(MappingKeys.ID_ATTRIBUTE_MAPPING_KEY); @@ -338,8 +338,8 @@ public class OrmVersionMappingTests extends ContextModelTestCase VersionMapping versionMapping = (VersionMapping) ormPersistentAttribute.getMapping(); assertFalse(versionMapping.isDefault()); versionMapping.getColumn().setSpecifiedName("FOO"); - versionMapping.setSpecifiedConverter(Converter.TEMPORAL_CONVERTER); - ((TemporalConverter) versionMapping.getSpecifiedConverter()).setTemporalType(TemporalType.TIME); + versionMapping.setConverter(Converter.TEMPORAL_CONVERTER); + ((TemporalConverter) versionMapping.getConverter()).setTemporalType(TemporalType.TIME); assertFalse(versionMapping.isDefault()); ormPersistentAttribute.setSpecifiedMappingKey(MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY); @@ -358,8 +358,8 @@ public class OrmVersionMappingTests extends ContextModelTestCase VersionMapping versionMapping = (VersionMapping) ormPersistentAttribute.getMapping(); assertFalse(versionMapping.isDefault()); versionMapping.getColumn().setSpecifiedName("FOO"); - versionMapping.setSpecifiedConverter(Converter.TEMPORAL_CONVERTER); - ((TemporalConverter) versionMapping.getSpecifiedConverter()).setTemporalType(TemporalType.TIME); + versionMapping.setConverter(Converter.TEMPORAL_CONVERTER); + ((TemporalConverter) versionMapping.getConverter()).setTemporalType(TemporalType.TIME); assertFalse(versionMapping.isDefault()); ormPersistentAttribute.setSpecifiedMappingKey(MappingKeys.TRANSIENT_ATTRIBUTE_MAPPING_KEY); @@ -377,8 +377,8 @@ public class OrmVersionMappingTests extends ContextModelTestCase VersionMapping versionMapping = (VersionMapping) ormPersistentAttribute.getMapping(); assertFalse(versionMapping.isDefault()); versionMapping.getColumn().setSpecifiedName("FOO"); - versionMapping.setSpecifiedConverter(Converter.TEMPORAL_CONVERTER); - ((TemporalConverter) versionMapping.getSpecifiedConverter()).setTemporalType(TemporalType.TIME); + versionMapping.setConverter(Converter.TEMPORAL_CONVERTER); + ((TemporalConverter) versionMapping.getConverter()).setTemporalType(TemporalType.TIME); assertFalse(versionMapping.isDefault()); ormPersistentAttribute.setSpecifiedMappingKey(MappingKeys.EMBEDDED_ATTRIBUTE_MAPPING_KEY); @@ -396,8 +396,8 @@ public class OrmVersionMappingTests extends ContextModelTestCase VersionMapping versionMapping = (VersionMapping) ormPersistentAttribute.getMapping(); assertFalse(versionMapping.isDefault()); versionMapping.getColumn().setSpecifiedName("FOO"); - versionMapping.setSpecifiedConverter(Converter.TEMPORAL_CONVERTER); - ((TemporalConverter) versionMapping.getSpecifiedConverter()).setTemporalType(TemporalType.TIME); + versionMapping.setConverter(Converter.TEMPORAL_CONVERTER); + ((TemporalConverter) versionMapping.getConverter()).setTemporalType(TemporalType.TIME); assertFalse(versionMapping.isDefault()); ormPersistentAttribute.setSpecifiedMappingKey(MappingKeys.EMBEDDED_ID_ATTRIBUTE_MAPPING_KEY); @@ -415,8 +415,8 @@ public class OrmVersionMappingTests extends ContextModelTestCase VersionMapping versionMapping = (VersionMapping) ormPersistentAttribute.getMapping(); assertFalse(versionMapping.isDefault()); versionMapping.getColumn().setSpecifiedName("FOO"); - versionMapping.setSpecifiedConverter(Converter.TEMPORAL_CONVERTER); - ((TemporalConverter) versionMapping.getSpecifiedConverter()).setTemporalType(TemporalType.TIME); + versionMapping.setConverter(Converter.TEMPORAL_CONVERTER); + ((TemporalConverter) versionMapping.getConverter()).setTemporalType(TemporalType.TIME); assertFalse(versionMapping.isDefault()); ormPersistentAttribute.setSpecifiedMappingKey(MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY); @@ -434,8 +434,8 @@ public class OrmVersionMappingTests extends ContextModelTestCase VersionMapping versionMapping = (VersionMapping) ormPersistentAttribute.getMapping(); assertFalse(versionMapping.isDefault()); versionMapping.getColumn().setSpecifiedName("FOO"); - versionMapping.setSpecifiedConverter(Converter.TEMPORAL_CONVERTER); - ((TemporalConverter) versionMapping.getSpecifiedConverter()).setTemporalType(TemporalType.TIME); + versionMapping.setConverter(Converter.TEMPORAL_CONVERTER); + ((TemporalConverter) versionMapping.getConverter()).setTemporalType(TemporalType.TIME); assertFalse(versionMapping.isDefault()); ormPersistentAttribute.setSpecifiedMappingKey(MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY); @@ -453,8 +453,8 @@ public class OrmVersionMappingTests extends ContextModelTestCase VersionMapping versionMapping = (VersionMapping) ormPersistentAttribute.getMapping(); assertFalse(versionMapping.isDefault()); versionMapping.getColumn().setSpecifiedName("FOO"); - versionMapping.setSpecifiedConverter(Converter.TEMPORAL_CONVERTER); - ((TemporalConverter) versionMapping.getSpecifiedConverter()).setTemporalType(TemporalType.TIME); + versionMapping.setConverter(Converter.TEMPORAL_CONVERTER); + ((TemporalConverter) versionMapping.getConverter()).setTemporalType(TemporalType.TIME); assertFalse(versionMapping.isDefault()); ormPersistentAttribute.setSpecifiedMappingKey(MappingKeys.MANY_TO_ONE_ATTRIBUTE_MAPPING_KEY); @@ -472,8 +472,8 @@ public class OrmVersionMappingTests extends ContextModelTestCase VersionMapping versionMapping = (VersionMapping) ormPersistentAttribute.getMapping(); assertFalse(versionMapping.isDefault()); versionMapping.getColumn().setSpecifiedName("FOO"); - versionMapping.setSpecifiedConverter(Converter.TEMPORAL_CONVERTER); - ((TemporalConverter) versionMapping.getSpecifiedConverter()).setTemporalType(TemporalType.TIME); + versionMapping.setConverter(Converter.TEMPORAL_CONVERTER); + ((TemporalConverter) versionMapping.getConverter()).setTemporalType(TemporalType.TIME); assertFalse(versionMapping.isDefault()); ormPersistentAttribute.setSpecifiedMappingKey(MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); diff --git a/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink/core/tests/internal/context/java/EclipseLinkJavaBasicMappingTests.java b/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink/core/tests/internal/context/java/EclipseLinkJavaBasicMappingTests.java index 516d440aca..0aa57e7ec7 100644 --- a/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink/core/tests/internal/context/java/EclipseLinkJavaBasicMappingTests.java +++ b/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink/core/tests/internal/context/java/EclipseLinkJavaBasicMappingTests.java @@ -127,7 +127,7 @@ public class EclipseLinkJavaBasicMappingTests extends EclipseLinkContextModelTes PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); BasicMapping basicMapping = (BasicMapping) persistentAttribute.getSpecifiedMapping(); - assertEquals(EclipseLinkConvert.ECLIPSE_LINK_CONVERTER, basicMapping.getSpecifiedConverter().getType()); + assertEquals(EclipseLinkConvert.ECLIPSE_LINK_CONVERTER, basicMapping.getConverter().getType()); } public void testGetConvert2() throws Exception { @@ -137,8 +137,8 @@ public class EclipseLinkJavaBasicMappingTests extends EclipseLinkContextModelTes PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); BasicMapping basicMapping = (BasicMapping) persistentAttribute.getMapping(); - assertEquals(EclipseLinkConvert.ECLIPSE_LINK_CONVERTER, basicMapping.getSpecifiedConverter().getType()); - assertEquals(EclipseLinkConvert.CLASS_INSTANCE_CONVERTER, ((EclipseLinkConvert) basicMapping.getSpecifiedConverter()).getConverterName()); + assertEquals(EclipseLinkConvert.ECLIPSE_LINK_CONVERTER, basicMapping.getConverter().getType()); + assertEquals(EclipseLinkConvert.CLASS_INSTANCE_CONVERTER, ((EclipseLinkConvert) basicMapping.getConverter()).getConverterName()); } public void testSetConvert() throws Exception { @@ -147,10 +147,10 @@ public class EclipseLinkJavaBasicMappingTests extends EclipseLinkContextModelTes PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); BasicMapping basicMapping = (BasicMapping) persistentAttribute.getSpecifiedMapping(); - assertEquals(Converter.NO_CONVERTER, basicMapping.getSpecifiedConverter().getType()); + assertEquals(Converter.NO_CONVERTER, basicMapping.getConverter().getType()); - basicMapping.setSpecifiedConverter(Converter.TEMPORAL_CONVERTER); - ((TemporalConverter) basicMapping.getSpecifiedConverter()).setTemporalType(TemporalType.TIME); + basicMapping.setConverter(Converter.TEMPORAL_CONVERTER); + ((TemporalConverter) basicMapping.getConverter()).setTemporalType(TemporalType.TIME); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); @@ -158,7 +158,7 @@ public class EclipseLinkJavaBasicMappingTests extends EclipseLinkContextModelTes assertEquals(org.eclipse.jpt.core.resource.java.TemporalType.TIME, temporal.getValue()); - basicMapping.setSpecifiedConverter(Converter.NO_CONVERTER); + basicMapping.setConverter(Converter.NO_CONVERTER); assertNull(attributeResource.getAnnotation(TemporalAnnotation.ANNOTATION_NAME)); } @@ -169,7 +169,7 @@ public class EclipseLinkJavaBasicMappingTests extends EclipseLinkContextModelTes PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); BasicMapping basicMapping = (BasicMapping) persistentAttribute.getSpecifiedMapping(); - assertEquals(Converter.NO_CONVERTER, basicMapping.getSpecifiedConverter().getType()); + assertEquals(Converter.NO_CONVERTER, basicMapping.getConverter().getType()); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); @@ -177,12 +177,12 @@ public class EclipseLinkJavaBasicMappingTests extends EclipseLinkContextModelTes EclipseLinkConvertAnnotation convert = (EclipseLinkConvertAnnotation) attributeResource.addAnnotation(EclipseLinkConvertAnnotation.ANNOTATION_NAME); convert.setValue("foo"); - assertEquals(EclipseLinkConvert.ECLIPSE_LINK_CONVERTER, basicMapping.getSpecifiedConverter().getType()); - assertEquals("foo", ((EclipseLinkConvert) basicMapping.getSpecifiedConverter()).getConverterName()); + assertEquals(EclipseLinkConvert.ECLIPSE_LINK_CONVERTER, basicMapping.getConverter().getType()); + assertEquals("foo", ((EclipseLinkConvert) basicMapping.getConverter()).getConverterName()); attributeResource.removeAnnotation(EclipseLinkConvertAnnotation.ANNOTATION_NAME); - assertEquals(Converter.NO_CONVERTER, basicMapping.getSpecifiedConverter().getType()); + assertEquals(Converter.NO_CONVERTER, basicMapping.getConverter().getType()); assertFalse(basicMapping.isDefault()); assertSame(basicMapping, persistentAttribute.getSpecifiedMapping()); } diff --git a/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink/core/tests/internal/context/java/EclipseLinkJavaConvertTests.java b/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink/core/tests/internal/context/java/EclipseLinkJavaConvertTests.java index b015ee3265..291a85c15f 100644 --- a/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink/core/tests/internal/context/java/EclipseLinkJavaConvertTests.java +++ b/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink/core/tests/internal/context/java/EclipseLinkJavaConvertTests.java @@ -101,7 +101,7 @@ public class EclipseLinkJavaConvertTests extends EclipseLinkContextModelTestCase PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); BasicMapping basicMapping = (BasicMapping) persistentAttribute.getSpecifiedMapping(); - EclipseLinkConvert eclipseLinkConvert = (EclipseLinkConvert) basicMapping.getSpecifiedConverter(); + EclipseLinkConvert eclipseLinkConvert = (EclipseLinkConvert) basicMapping.getConverter(); assertEquals(EclipseLinkConvert.NO_CONVERTER, eclipseLinkConvert.getConverterName()); assertEquals(EclipseLinkConvert.NO_CONVERTER, eclipseLinkConvert.getDefaultConverterName()); @@ -114,7 +114,7 @@ public class EclipseLinkJavaConvertTests extends EclipseLinkContextModelTestCase PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); BasicMapping basicMapping = (BasicMapping) persistentAttribute.getMapping(); - EclipseLinkConvert eclipseLinkConvert = (EclipseLinkConvert) basicMapping.getSpecifiedConverter(); + EclipseLinkConvert eclipseLinkConvert = (EclipseLinkConvert) basicMapping.getConverter(); assertEquals(EclipseLinkConvert.CLASS_INSTANCE_CONVERTER, eclipseLinkConvert.getConverterName()); } @@ -125,8 +125,8 @@ public class EclipseLinkJavaConvertTests extends EclipseLinkContextModelTestCase PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); BasicMapping basicMapping = (BasicMapping) persistentAttribute.getSpecifiedMapping(); - basicMapping.setSpecifiedConverter(EclipseLinkConvert.ECLIPSE_LINK_CONVERTER); - EclipseLinkConvert eclipseLinkConvert = (EclipseLinkConvert) basicMapping.getSpecifiedConverter(); + basicMapping.setConverter(EclipseLinkConvert.ECLIPSE_LINK_CONVERTER); + EclipseLinkConvert eclipseLinkConvert = (EclipseLinkConvert) basicMapping.getConverter(); assertEquals(null, eclipseLinkConvert.getSpecifiedConverterName()); eclipseLinkConvert.setSpecifiedConverterName("foo"); @@ -150,7 +150,7 @@ public class EclipseLinkJavaConvertTests extends EclipseLinkContextModelTestCase PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); BasicMapping basicMapping = (BasicMapping) persistentAttribute.getSpecifiedMapping(); - assertEquals(Converter.NO_CONVERTER, basicMapping.getSpecifiedConverter().getType()); + assertEquals(Converter.NO_CONVERTER, basicMapping.getConverter().getType()); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); @@ -158,12 +158,12 @@ public class EclipseLinkJavaConvertTests extends EclipseLinkContextModelTestCase EclipseLinkConvertAnnotation convert = (EclipseLinkConvertAnnotation) attributeResource.addAnnotation(EclipseLinkConvertAnnotation.ANNOTATION_NAME); convert.setValue("foo"); - assertEquals(EclipseLinkConvert.ECLIPSE_LINK_CONVERTER, basicMapping.getSpecifiedConverter().getType()); - assertEquals("foo", ((EclipseLinkConvert) basicMapping.getSpecifiedConverter()).getConverterName()); + assertEquals(EclipseLinkConvert.ECLIPSE_LINK_CONVERTER, basicMapping.getConverter().getType()); + assertEquals("foo", ((EclipseLinkConvert) basicMapping.getConverter()).getConverterName()); attributeResource.removeAnnotation(EclipseLinkConvertAnnotation.ANNOTATION_NAME); - assertEquals(Converter.NO_CONVERTER, basicMapping.getSpecifiedConverter().getType()); + assertEquals(Converter.NO_CONVERTER, basicMapping.getConverter().getType()); assertFalse(basicMapping.isDefault()); assertSame(basicMapping, persistentAttribute.getSpecifiedMapping()); } @@ -175,7 +175,7 @@ public class EclipseLinkJavaConvertTests extends EclipseLinkContextModelTestCase PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); BasicMapping basicMapping = (BasicMapping) persistentAttribute.getMapping(); - EclipseLinkConvert eclipseLinkConvert = (EclipseLinkConvert) basicMapping.getSpecifiedConverter(); + EclipseLinkConvert eclipseLinkConvert = (EclipseLinkConvert) basicMapping.getConverter(); assertEquals(EclipseLinkConverter.TYPE_CONVERTER, eclipseLinkConvert.getConverter().getType()); } @@ -186,7 +186,7 @@ public class EclipseLinkJavaConvertTests extends EclipseLinkContextModelTestCase PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); BasicMapping basicMapping = (BasicMapping) persistentAttribute.getMapping(); - EclipseLinkConvert eclipseLinkConvert = (EclipseLinkConvert) basicMapping.getSpecifiedConverter(); + EclipseLinkConvert eclipseLinkConvert = (EclipseLinkConvert) basicMapping.getConverter(); assertEquals(null, eclipseLinkConvert.getConverter()); @@ -212,7 +212,7 @@ public class EclipseLinkJavaConvertTests extends EclipseLinkContextModelTestCase assertNotNull(attributeResource.getAnnotation(EclipseLinkStructConverterAnnotation.ANNOTATION_NAME)); - basicMapping.setSpecifiedConverter(Converter.NO_CONVERTER); + basicMapping.setConverter(Converter.NO_CONVERTER); assertNull(attributeResource.getAnnotation(EclipseLinkStructConverterAnnotation.ANNOTATION_NAME)); assertNull(attributeResource.getAnnotation(EclipseLinkConvertAnnotation.ANNOTATION_NAME)); diff --git a/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink/core/tests/internal/context/java/EclipseLinkJavaConverterTests.java b/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink/core/tests/internal/context/java/EclipseLinkJavaConverterTests.java index 00b26d3cfd..7c70cd56a1 100644 --- a/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink/core/tests/internal/context/java/EclipseLinkJavaConverterTests.java +++ b/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink/core/tests/internal/context/java/EclipseLinkJavaConverterTests.java @@ -77,7 +77,7 @@ public class EclipseLinkJavaConverterTests extends EclipseLinkContextModelTestCa PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); BasicMapping basicMapping = (BasicMapping) persistentAttribute.getMapping(); - EclipseLinkConvert eclipseLinkConvert = (EclipseLinkConvert) basicMapping.getSpecifiedConverter(); + EclipseLinkConvert eclipseLinkConvert = (EclipseLinkConvert) basicMapping.getConverter(); EclipseLinkCustomConverter converter = (EclipseLinkCustomConverter) eclipseLinkConvert.getConverter(); assertEquals("foo", converter.getName()); @@ -89,7 +89,7 @@ public class EclipseLinkJavaConverterTests extends EclipseLinkContextModelTestCa PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); BasicMapping basicMapping = (BasicMapping) persistentAttribute.getMapping(); - EclipseLinkConvert eclipseLinkConvert = (EclipseLinkConvert) basicMapping.getSpecifiedConverter(); + EclipseLinkConvert eclipseLinkConvert = (EclipseLinkConvert) basicMapping.getConverter(); EclipseLinkCustomConverter converter = (EclipseLinkCustomConverter) eclipseLinkConvert.getConverter(); assertEquals("foo", converter.getName()); @@ -120,7 +120,7 @@ public class EclipseLinkJavaConverterTests extends EclipseLinkContextModelTestCa PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); BasicMapping basicMapping = (BasicMapping) persistentAttribute.getMapping(); - EclipseLinkConvert eclipseLinkConvert = (EclipseLinkConvert) basicMapping.getSpecifiedConverter(); + EclipseLinkConvert eclipseLinkConvert = (EclipseLinkConvert) basicMapping.getConverter(); EclipseLinkCustomConverter converter = (EclipseLinkCustomConverter) eclipseLinkConvert.getConverter(); assertEquals("foo", converter.getName()); @@ -148,7 +148,7 @@ public class EclipseLinkJavaConverterTests extends EclipseLinkContextModelTestCa PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); BasicMapping basicMapping = (BasicMapping) persistentAttribute.getMapping(); - EclipseLinkConvert eclipseLinkConvert = (EclipseLinkConvert) basicMapping.getSpecifiedConverter(); + EclipseLinkConvert eclipseLinkConvert = (EclipseLinkConvert) basicMapping.getConverter(); EclipseLinkCustomConverter converter = (EclipseLinkCustomConverter) eclipseLinkConvert.getConverter(); assertEquals("Foo", converter.getConverterClass()); @@ -160,7 +160,7 @@ public class EclipseLinkJavaConverterTests extends EclipseLinkContextModelTestCa PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); BasicMapping basicMapping = (BasicMapping) persistentAttribute.getMapping(); - EclipseLinkConvert eclipseLinkConvert = (EclipseLinkConvert) basicMapping.getSpecifiedConverter(); + EclipseLinkConvert eclipseLinkConvert = (EclipseLinkConvert) basicMapping.getConverter(); EclipseLinkCustomConverter converter = (EclipseLinkCustomConverter) eclipseLinkConvert.getConverter(); assertEquals("Foo", converter.getConverterClass()); @@ -191,7 +191,7 @@ public class EclipseLinkJavaConverterTests extends EclipseLinkContextModelTestCa PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); BasicMapping basicMapping = (BasicMapping) persistentAttribute.getMapping(); - EclipseLinkConvert eclipseLinkConvert = (EclipseLinkConvert) basicMapping.getSpecifiedConverter(); + EclipseLinkConvert eclipseLinkConvert = (EclipseLinkConvert) basicMapping.getConverter(); EclipseLinkCustomConverter converter = (EclipseLinkCustomConverter) eclipseLinkConvert.getConverter(); assertEquals("Foo", converter.getConverterClass()); diff --git a/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink/core/tests/internal/context/java/EclipseLinkJavaIdMappingTests.java b/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink/core/tests/internal/context/java/EclipseLinkJavaIdMappingTests.java index 66429bc3e3..116777091d 100644 --- a/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink/core/tests/internal/context/java/EclipseLinkJavaIdMappingTests.java +++ b/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink/core/tests/internal/context/java/EclipseLinkJavaIdMappingTests.java @@ -128,7 +128,7 @@ public class EclipseLinkJavaIdMappingTests extends EclipseLinkContextModelTestCa PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); IdMapping idMapping = (IdMapping) persistentAttribute.getSpecifiedMapping(); - assertEquals(EclipseLinkConvert.ECLIPSE_LINK_CONVERTER, idMapping.getSpecifiedConverter().getType()); + assertEquals(EclipseLinkConvert.ECLIPSE_LINK_CONVERTER, idMapping.getConverter().getType()); } public void testGetConvert2() throws Exception { @@ -138,8 +138,8 @@ public class EclipseLinkJavaIdMappingTests extends EclipseLinkContextModelTestCa PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); IdMapping idMapping = (IdMapping) persistentAttribute.getMapping(); - assertEquals(EclipseLinkConvert.ECLIPSE_LINK_CONVERTER, idMapping.getSpecifiedConverter().getType()); - assertEquals(EclipseLinkConvert.CLASS_INSTANCE_CONVERTER, ((EclipseLinkConvert) idMapping.getSpecifiedConverter()).getConverterName()); + assertEquals(EclipseLinkConvert.ECLIPSE_LINK_CONVERTER, idMapping.getConverter().getType()); + assertEquals(EclipseLinkConvert.CLASS_INSTANCE_CONVERTER, ((EclipseLinkConvert) idMapping.getConverter()).getConverterName()); } public void testSetConvert() throws Exception { @@ -148,10 +148,10 @@ public class EclipseLinkJavaIdMappingTests extends EclipseLinkContextModelTestCa PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); IdMapping idMapping = (IdMapping) persistentAttribute.getSpecifiedMapping(); - assertEquals(Converter.NO_CONVERTER, idMapping.getSpecifiedConverter().getType()); + assertEquals(Converter.NO_CONVERTER, idMapping.getConverter().getType()); - idMapping.setSpecifiedConverter(Converter.TEMPORAL_CONVERTER); - ((TemporalConverter) idMapping.getSpecifiedConverter()).setTemporalType(TemporalType.TIME); + idMapping.setConverter(Converter.TEMPORAL_CONVERTER); + ((TemporalConverter) idMapping.getConverter()).setTemporalType(TemporalType.TIME); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); @@ -159,7 +159,7 @@ public class EclipseLinkJavaIdMappingTests extends EclipseLinkContextModelTestCa assertEquals(org.eclipse.jpt.core.resource.java.TemporalType.TIME, temporal.getValue()); - idMapping.setSpecifiedConverter(Converter.NO_CONVERTER); + idMapping.setConverter(Converter.NO_CONVERTER); assertNull(attributeResource.getAnnotation(TemporalAnnotation.ANNOTATION_NAME)); } @@ -170,7 +170,7 @@ public class EclipseLinkJavaIdMappingTests extends EclipseLinkContextModelTestCa PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); IdMapping idMapping = (IdMapping) persistentAttribute.getSpecifiedMapping(); - assertEquals(Converter.NO_CONVERTER, idMapping.getSpecifiedConverter().getType()); + assertEquals(Converter.NO_CONVERTER, idMapping.getConverter().getType()); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); @@ -178,12 +178,12 @@ public class EclipseLinkJavaIdMappingTests extends EclipseLinkContextModelTestCa EclipseLinkConvertAnnotation convert = (EclipseLinkConvertAnnotation) attributeResource.addAnnotation(EclipseLinkConvertAnnotation.ANNOTATION_NAME); convert.setValue("foo"); - assertEquals(EclipseLinkConvert.ECLIPSE_LINK_CONVERTER, idMapping.getSpecifiedConverter().getType()); - assertEquals("foo", ((EclipseLinkConvert) idMapping.getSpecifiedConverter()).getConverterName()); + assertEquals(EclipseLinkConvert.ECLIPSE_LINK_CONVERTER, idMapping.getConverter().getType()); + assertEquals("foo", ((EclipseLinkConvert) idMapping.getConverter()).getConverterName()); attributeResource.removeAnnotation(EclipseLinkConvertAnnotation.ANNOTATION_NAME); - assertEquals(Converter.NO_CONVERTER, idMapping.getSpecifiedConverter().getType()); + assertEquals(Converter.NO_CONVERTER, idMapping.getConverter().getType()); assertFalse(idMapping.isDefault()); assertSame(idMapping, persistentAttribute.getSpecifiedMapping()); } diff --git a/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink/core/tests/internal/context/java/EclipseLinkJavaObjectTypeConverterTests.java b/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink/core/tests/internal/context/java/EclipseLinkJavaObjectTypeConverterTests.java index 83a1c583a5..cc6954d544 100644 --- a/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink/core/tests/internal/context/java/EclipseLinkJavaObjectTypeConverterTests.java +++ b/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink/core/tests/internal/context/java/EclipseLinkJavaObjectTypeConverterTests.java @@ -118,7 +118,7 @@ public class EclipseLinkJavaObjectTypeConverterTests extends EclipseLinkContextM PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); BasicMapping basicMapping = (BasicMapping) persistentAttribute.getMapping(); - EclipseLinkConvert eclipseLinkConvert = (EclipseLinkConvert) basicMapping.getSpecifiedConverter(); + EclipseLinkConvert eclipseLinkConvert = (EclipseLinkConvert) basicMapping.getConverter(); EclipseLinkObjectTypeConverter converter = (EclipseLinkObjectTypeConverter) eclipseLinkConvert.getConverter(); assertEquals("foo", converter.getName()); @@ -130,7 +130,7 @@ public class EclipseLinkJavaObjectTypeConverterTests extends EclipseLinkContextM PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); BasicMapping basicMapping = (BasicMapping) persistentAttribute.getMapping(); - EclipseLinkConvert eclipseLinkConvert = (EclipseLinkConvert) basicMapping.getSpecifiedConverter(); + EclipseLinkConvert eclipseLinkConvert = (EclipseLinkConvert) basicMapping.getConverter(); EclipseLinkObjectTypeConverter converter = (EclipseLinkObjectTypeConverter) eclipseLinkConvert.getConverter(); assertEquals("foo", converter.getName()); @@ -161,7 +161,7 @@ public class EclipseLinkJavaObjectTypeConverterTests extends EclipseLinkContextM PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); BasicMapping basicMapping = (BasicMapping) persistentAttribute.getMapping(); - EclipseLinkConvert eclipseLinkConvert = (EclipseLinkConvert) basicMapping.getSpecifiedConverter(); + EclipseLinkConvert eclipseLinkConvert = (EclipseLinkConvert) basicMapping.getConverter(); EclipseLinkObjectTypeConverter converter = (EclipseLinkObjectTypeConverter) eclipseLinkConvert.getConverter(); assertEquals("foo", converter.getName()); @@ -188,7 +188,7 @@ public class EclipseLinkJavaObjectTypeConverterTests extends EclipseLinkContextM PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); BasicMapping basicMapping = (BasicMapping) persistentAttribute.getMapping(); - EclipseLinkConvert eclipseLinkConvert = (EclipseLinkConvert) basicMapping.getSpecifiedConverter(); + EclipseLinkConvert eclipseLinkConvert = (EclipseLinkConvert) basicMapping.getConverter(); EclipseLinkObjectTypeConverter converter = (EclipseLinkObjectTypeConverter) eclipseLinkConvert.getConverter(); assertEquals("Foo", converter.getDataType()); @@ -200,7 +200,7 @@ public class EclipseLinkJavaObjectTypeConverterTests extends EclipseLinkContextM PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); BasicMapping basicMapping = (BasicMapping) persistentAttribute.getMapping(); - EclipseLinkConvert eclipseLinkConvert = (EclipseLinkConvert) basicMapping.getSpecifiedConverter(); + EclipseLinkConvert eclipseLinkConvert = (EclipseLinkConvert) basicMapping.getConverter(); EclipseLinkObjectTypeConverter converter = (EclipseLinkObjectTypeConverter) eclipseLinkConvert.getConverter(); assertEquals("Foo", converter.getDataType()); @@ -231,7 +231,7 @@ public class EclipseLinkJavaObjectTypeConverterTests extends EclipseLinkContextM PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); BasicMapping basicMapping = (BasicMapping) persistentAttribute.getMapping(); - EclipseLinkConvert eclipseLinkConvert = (EclipseLinkConvert) basicMapping.getSpecifiedConverter(); + EclipseLinkConvert eclipseLinkConvert = (EclipseLinkConvert) basicMapping.getConverter(); EclipseLinkObjectTypeConverter converter = (EclipseLinkObjectTypeConverter) eclipseLinkConvert.getConverter(); assertEquals("Foo", converter.getDataType()); @@ -258,7 +258,7 @@ public class EclipseLinkJavaObjectTypeConverterTests extends EclipseLinkContextM PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); BasicMapping basicMapping = (BasicMapping) persistentAttribute.getMapping(); - EclipseLinkConvert eclipseLinkConvert = (EclipseLinkConvert) basicMapping.getSpecifiedConverter(); + EclipseLinkConvert eclipseLinkConvert = (EclipseLinkConvert) basicMapping.getConverter(); EclipseLinkObjectTypeConverter converter = (EclipseLinkObjectTypeConverter) eclipseLinkConvert.getConverter(); assertEquals("Foo", converter.getObjectType()); @@ -270,7 +270,7 @@ public class EclipseLinkJavaObjectTypeConverterTests extends EclipseLinkContextM PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); BasicMapping basicMapping = (BasicMapping) persistentAttribute.getMapping(); - EclipseLinkConvert eclipseLinkConvert = (EclipseLinkConvert) basicMapping.getSpecifiedConverter(); + EclipseLinkConvert eclipseLinkConvert = (EclipseLinkConvert) basicMapping.getConverter(); EclipseLinkObjectTypeConverter converter = (EclipseLinkObjectTypeConverter) eclipseLinkConvert.getConverter(); assertEquals("Foo", converter.getObjectType()); @@ -301,7 +301,7 @@ public class EclipseLinkJavaObjectTypeConverterTests extends EclipseLinkContextM PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); BasicMapping basicMapping = (BasicMapping) persistentAttribute.getMapping(); - EclipseLinkConvert eclipseLinkConvert = (EclipseLinkConvert) basicMapping.getSpecifiedConverter(); + EclipseLinkConvert eclipseLinkConvert = (EclipseLinkConvert) basicMapping.getConverter(); EclipseLinkObjectTypeConverter converter = (EclipseLinkObjectTypeConverter) eclipseLinkConvert.getConverter(); assertEquals("Foo", converter.getObjectType()); @@ -329,7 +329,7 @@ public class EclipseLinkJavaObjectTypeConverterTests extends EclipseLinkContextM PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); BasicMapping basicMapping = (BasicMapping) persistentAttribute.getMapping(); - EclipseLinkConvert eclipseLinkConvert = (EclipseLinkConvert) basicMapping.getSpecifiedConverter(); + EclipseLinkConvert eclipseLinkConvert = (EclipseLinkConvert) basicMapping.getConverter(); EclipseLinkObjectTypeConverter converter = (EclipseLinkObjectTypeConverter) eclipseLinkConvert.getConverter(); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); @@ -389,7 +389,7 @@ public class EclipseLinkJavaObjectTypeConverterTests extends EclipseLinkContextM PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); BasicMapping basicMapping = (BasicMapping) persistentAttribute.getMapping(); - EclipseLinkConvert eclipseLinkConvert = (EclipseLinkConvert) basicMapping.getSpecifiedConverter(); + EclipseLinkConvert eclipseLinkConvert = (EclipseLinkConvert) basicMapping.getConverter(); EclipseLinkObjectTypeConverter converter = (EclipseLinkObjectTypeConverter) eclipseLinkConvert.getConverter(); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); @@ -427,7 +427,7 @@ public class EclipseLinkJavaObjectTypeConverterTests extends EclipseLinkContextM PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); BasicMapping basicMapping = (BasicMapping) persistentAttribute.getMapping(); - EclipseLinkConvert eclipseLinkConvert = (EclipseLinkConvert) basicMapping.getSpecifiedConverter(); + EclipseLinkConvert eclipseLinkConvert = (EclipseLinkConvert) basicMapping.getConverter(); EclipseLinkObjectTypeConverter converter = (EclipseLinkObjectTypeConverter) eclipseLinkConvert.getConverter(); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); @@ -464,7 +464,7 @@ public class EclipseLinkJavaObjectTypeConverterTests extends EclipseLinkContextM PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); BasicMapping basicMapping = (BasicMapping) persistentAttribute.getMapping(); - EclipseLinkConvert eclipseLinkConvert = (EclipseLinkConvert) basicMapping.getSpecifiedConverter(); + EclipseLinkConvert eclipseLinkConvert = (EclipseLinkConvert) basicMapping.getConverter(); EclipseLinkObjectTypeConverter converter = (EclipseLinkObjectTypeConverter) eclipseLinkConvert.getConverter(); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); @@ -518,7 +518,7 @@ public class EclipseLinkJavaObjectTypeConverterTests extends EclipseLinkContextM PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); BasicMapping basicMapping = (BasicMapping) persistentAttribute.getMapping(); - EclipseLinkConvert eclipseLinkConvert = (EclipseLinkConvert) basicMapping.getSpecifiedConverter(); + EclipseLinkConvert eclipseLinkConvert = (EclipseLinkConvert) basicMapping.getConverter(); EclipseLinkObjectTypeConverter converter = (EclipseLinkObjectTypeConverter) eclipseLinkConvert.getConverter(); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); @@ -541,7 +541,7 @@ public class EclipseLinkJavaObjectTypeConverterTests extends EclipseLinkContextM PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); BasicMapping basicMapping = (BasicMapping) persistentAttribute.getMapping(); - EclipseLinkConvert eclipseLinkConvert = (EclipseLinkConvert) basicMapping.getSpecifiedConverter(); + EclipseLinkConvert eclipseLinkConvert = (EclipseLinkConvert) basicMapping.getConverter(); EclipseLinkObjectTypeConverter converter = (EclipseLinkObjectTypeConverter) eclipseLinkConvert.getConverter(); assertEquals("bar", converter.getDefaultObjectValue()); @@ -553,7 +553,7 @@ public class EclipseLinkJavaObjectTypeConverterTests extends EclipseLinkContextM PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); BasicMapping basicMapping = (BasicMapping) persistentAttribute.getMapping(); - EclipseLinkConvert eclipseLinkConvert = (EclipseLinkConvert) basicMapping.getSpecifiedConverter(); + EclipseLinkConvert eclipseLinkConvert = (EclipseLinkConvert) basicMapping.getConverter(); EclipseLinkObjectTypeConverter converter = (EclipseLinkObjectTypeConverter) eclipseLinkConvert.getConverter(); assertEquals("bar", converter.getDefaultObjectValue()); @@ -584,7 +584,7 @@ public class EclipseLinkJavaObjectTypeConverterTests extends EclipseLinkContextM PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); BasicMapping basicMapping = (BasicMapping) persistentAttribute.getMapping(); - EclipseLinkConvert eclipseLinkConvert = (EclipseLinkConvert) basicMapping.getSpecifiedConverter(); + EclipseLinkConvert eclipseLinkConvert = (EclipseLinkConvert) basicMapping.getConverter(); EclipseLinkObjectTypeConverter converter = (EclipseLinkObjectTypeConverter) eclipseLinkConvert.getConverter(); assertEquals("bar", converter.getDefaultObjectValue()); @@ -611,7 +611,7 @@ public class EclipseLinkJavaObjectTypeConverterTests extends EclipseLinkContextM PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); BasicMapping basicMapping = (BasicMapping) persistentAttribute.getMapping(); - EclipseLinkConvert eclipseLinkConvert = (EclipseLinkConvert) basicMapping.getSpecifiedConverter(); + EclipseLinkConvert eclipseLinkConvert = (EclipseLinkConvert) basicMapping.getConverter(); EclipseLinkObjectTypeConverter converter = (EclipseLinkObjectTypeConverter) eclipseLinkConvert.getConverter(); assertEquals(1, converter.conversionValuesSize()); diff --git a/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink/core/tests/internal/context/java/EclipseLinkJavaStructConverterTests.java b/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink/core/tests/internal/context/java/EclipseLinkJavaStructConverterTests.java index ad3139a4a0..d5a80fb5b7 100644 --- a/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink/core/tests/internal/context/java/EclipseLinkJavaStructConverterTests.java +++ b/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink/core/tests/internal/context/java/EclipseLinkJavaStructConverterTests.java @@ -76,7 +76,7 @@ public class EclipseLinkJavaStructConverterTests extends EclipseLinkContextModel PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); BasicMapping basicMapping = (BasicMapping) persistentAttribute.getMapping(); - EclipseLinkConvert eclipseLinkConvert = (EclipseLinkConvert) basicMapping.getSpecifiedConverter(); + EclipseLinkConvert eclipseLinkConvert = (EclipseLinkConvert) basicMapping.getConverter(); EclipseLinkStructConverter converter = (EclipseLinkStructConverter) eclipseLinkConvert.getConverter(); assertEquals("foo", converter.getName()); @@ -88,7 +88,7 @@ public class EclipseLinkJavaStructConverterTests extends EclipseLinkContextModel PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); BasicMapping basicMapping = (BasicMapping) persistentAttribute.getMapping(); - EclipseLinkConvert eclipseLinkConvert = (EclipseLinkConvert) basicMapping.getSpecifiedConverter(); + EclipseLinkConvert eclipseLinkConvert = (EclipseLinkConvert) basicMapping.getConverter(); EclipseLinkStructConverter converter = (EclipseLinkStructConverter) eclipseLinkConvert.getConverter(); assertEquals("foo", converter.getName()); @@ -119,7 +119,7 @@ public class EclipseLinkJavaStructConverterTests extends EclipseLinkContextModel PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); BasicMapping basicMapping = (BasicMapping) persistentAttribute.getMapping(); - EclipseLinkConvert eclipseLinkConvert = (EclipseLinkConvert) basicMapping.getSpecifiedConverter(); + EclipseLinkConvert eclipseLinkConvert = (EclipseLinkConvert) basicMapping.getConverter(); EclipseLinkStructConverter converter = (EclipseLinkStructConverter) eclipseLinkConvert.getConverter(); assertEquals("foo", converter.getName()); @@ -147,7 +147,7 @@ public class EclipseLinkJavaStructConverterTests extends EclipseLinkContextModel PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); BasicMapping basicMapping = (BasicMapping) persistentAttribute.getMapping(); - EclipseLinkConvert eclipseLinkConvert = (EclipseLinkConvert) basicMapping.getSpecifiedConverter(); + EclipseLinkConvert eclipseLinkConvert = (EclipseLinkConvert) basicMapping.getConverter(); EclipseLinkStructConverter converter = (EclipseLinkStructConverter) eclipseLinkConvert.getConverter(); assertEquals("Foo", converter.getConverterClass()); @@ -159,7 +159,7 @@ public class EclipseLinkJavaStructConverterTests extends EclipseLinkContextModel PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); BasicMapping basicMapping = (BasicMapping) persistentAttribute.getMapping(); - EclipseLinkConvert eclipseLinkConvert = (EclipseLinkConvert) basicMapping.getSpecifiedConverter(); + EclipseLinkConvert eclipseLinkConvert = (EclipseLinkConvert) basicMapping.getConverter(); EclipseLinkStructConverter converter = (EclipseLinkStructConverter) eclipseLinkConvert.getConverter(); assertEquals("Foo", converter.getConverterClass()); @@ -190,7 +190,7 @@ public class EclipseLinkJavaStructConverterTests extends EclipseLinkContextModel PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); BasicMapping basicMapping = (BasicMapping) persistentAttribute.getMapping(); - EclipseLinkConvert eclipseLinkConvert = (EclipseLinkConvert) basicMapping.getSpecifiedConverter(); + EclipseLinkConvert eclipseLinkConvert = (EclipseLinkConvert) basicMapping.getConverter(); EclipseLinkStructConverter converter = (EclipseLinkStructConverter) eclipseLinkConvert.getConverter(); assertEquals("Foo", converter.getConverterClass()); diff --git a/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink/core/tests/internal/context/java/EclipseLinkJavaTypeConverterTests.java b/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink/core/tests/internal/context/java/EclipseLinkJavaTypeConverterTests.java index df4eb3ed67..48ca7da643 100644 --- a/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink/core/tests/internal/context/java/EclipseLinkJavaTypeConverterTests.java +++ b/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink/core/tests/internal/context/java/EclipseLinkJavaTypeConverterTests.java @@ -95,7 +95,7 @@ public class EclipseLinkJavaTypeConverterTests extends EclipseLinkContextModelTe PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); BasicMapping basicMapping = (BasicMapping) persistentAttribute.getMapping(); - EclipseLinkConvert eclipseLinkConvert = (EclipseLinkConvert) basicMapping.getSpecifiedConverter(); + EclipseLinkConvert eclipseLinkConvert = (EclipseLinkConvert) basicMapping.getConverter(); EclipseLinkTypeConverter converter = (EclipseLinkTypeConverter) eclipseLinkConvert.getConverter(); assertEquals("foo", converter.getName()); @@ -107,7 +107,7 @@ public class EclipseLinkJavaTypeConverterTests extends EclipseLinkContextModelTe PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); BasicMapping basicMapping = (BasicMapping) persistentAttribute.getMapping(); - EclipseLinkConvert eclipseLinkConvert = (EclipseLinkConvert) basicMapping.getSpecifiedConverter(); + EclipseLinkConvert eclipseLinkConvert = (EclipseLinkConvert) basicMapping.getConverter(); EclipseLinkTypeConverter converter = (EclipseLinkTypeConverter) eclipseLinkConvert.getConverter(); assertEquals("foo", converter.getName()); @@ -138,7 +138,7 @@ public class EclipseLinkJavaTypeConverterTests extends EclipseLinkContextModelTe PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); BasicMapping basicMapping = (BasicMapping) persistentAttribute.getMapping(); - EclipseLinkConvert eclipseLinkConvert = (EclipseLinkConvert) basicMapping.getSpecifiedConverter(); + EclipseLinkConvert eclipseLinkConvert = (EclipseLinkConvert) basicMapping.getConverter(); EclipseLinkTypeConverter converter = (EclipseLinkTypeConverter) eclipseLinkConvert.getConverter(); assertEquals("foo", converter.getName()); @@ -165,7 +165,7 @@ public class EclipseLinkJavaTypeConverterTests extends EclipseLinkContextModelTe PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); BasicMapping basicMapping = (BasicMapping) persistentAttribute.getMapping(); - EclipseLinkConvert eclipseLinkConvert = (EclipseLinkConvert) basicMapping.getSpecifiedConverter(); + EclipseLinkConvert eclipseLinkConvert = (EclipseLinkConvert) basicMapping.getConverter(); EclipseLinkTypeConverter converter = (EclipseLinkTypeConverter) eclipseLinkConvert.getConverter(); assertEquals("Foo", converter.getDataType()); @@ -177,7 +177,7 @@ public class EclipseLinkJavaTypeConverterTests extends EclipseLinkContextModelTe PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); BasicMapping basicMapping = (BasicMapping) persistentAttribute.getMapping(); - EclipseLinkConvert eclipseLinkConvert = (EclipseLinkConvert) basicMapping.getSpecifiedConverter(); + EclipseLinkConvert eclipseLinkConvert = (EclipseLinkConvert) basicMapping.getConverter(); EclipseLinkTypeConverter converter = (EclipseLinkTypeConverter) eclipseLinkConvert.getConverter(); assertEquals("Foo", converter.getDataType()); @@ -208,7 +208,7 @@ public class EclipseLinkJavaTypeConverterTests extends EclipseLinkContextModelTe PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); BasicMapping basicMapping = (BasicMapping) persistentAttribute.getMapping(); - EclipseLinkConvert eclipseLinkConvert = (EclipseLinkConvert) basicMapping.getSpecifiedConverter(); + EclipseLinkConvert eclipseLinkConvert = (EclipseLinkConvert) basicMapping.getConverter(); EclipseLinkTypeConverter converter = (EclipseLinkTypeConverter) eclipseLinkConvert.getConverter(); assertEquals("Foo", converter.getDataType()); @@ -235,7 +235,7 @@ public class EclipseLinkJavaTypeConverterTests extends EclipseLinkContextModelTe PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); BasicMapping basicMapping = (BasicMapping) persistentAttribute.getMapping(); - EclipseLinkConvert eclipseLinkConvert = (EclipseLinkConvert) basicMapping.getSpecifiedConverter(); + EclipseLinkConvert eclipseLinkConvert = (EclipseLinkConvert) basicMapping.getConverter(); EclipseLinkTypeConverter converter = (EclipseLinkTypeConverter) eclipseLinkConvert.getConverter(); assertEquals("Foo", converter.getObjectType()); @@ -247,7 +247,7 @@ public class EclipseLinkJavaTypeConverterTests extends EclipseLinkContextModelTe PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); BasicMapping basicMapping = (BasicMapping) persistentAttribute.getMapping(); - EclipseLinkConvert eclipseLinkConvert = (EclipseLinkConvert) basicMapping.getSpecifiedConverter(); + EclipseLinkConvert eclipseLinkConvert = (EclipseLinkConvert) basicMapping.getConverter(); EclipseLinkTypeConverter converter = (EclipseLinkTypeConverter) eclipseLinkConvert.getConverter(); assertEquals("Foo", converter.getObjectType()); @@ -278,7 +278,7 @@ public class EclipseLinkJavaTypeConverterTests extends EclipseLinkContextModelTe PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); BasicMapping basicMapping = (BasicMapping) persistentAttribute.getMapping(); - EclipseLinkConvert eclipseLinkConvert = (EclipseLinkConvert) basicMapping.getSpecifiedConverter(); + EclipseLinkConvert eclipseLinkConvert = (EclipseLinkConvert) basicMapping.getConverter(); EclipseLinkTypeConverter converter = (EclipseLinkTypeConverter) eclipseLinkConvert.getConverter(); assertEquals("Foo", converter.getObjectType()); diff --git a/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink/core/tests/internal/context/java/EclipseLinkJavaVersionMappingTests.java b/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink/core/tests/internal/context/java/EclipseLinkJavaVersionMappingTests.java index 1ed75c9ae9..844fd99c33 100644 --- a/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink/core/tests/internal/context/java/EclipseLinkJavaVersionMappingTests.java +++ b/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink/core/tests/internal/context/java/EclipseLinkJavaVersionMappingTests.java @@ -127,7 +127,7 @@ public class EclipseLinkJavaVersionMappingTests extends EclipseLinkContextModelT PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); VersionMapping versionMapping = (VersionMapping) persistentAttribute.getSpecifiedMapping(); - assertEquals(EclipseLinkConvert.ECLIPSE_LINK_CONVERTER, versionMapping.getSpecifiedConverter().getType()); + assertEquals(EclipseLinkConvert.ECLIPSE_LINK_CONVERTER, versionMapping.getConverter().getType()); } public void testGetConvert2() throws Exception { @@ -137,8 +137,8 @@ public class EclipseLinkJavaVersionMappingTests extends EclipseLinkContextModelT PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); VersionMapping versionMapping = (VersionMapping) persistentAttribute.getMapping(); - assertEquals(EclipseLinkConvert.ECLIPSE_LINK_CONVERTER, versionMapping.getSpecifiedConverter().getType()); - assertEquals(EclipseLinkConvert.CLASS_INSTANCE_CONVERTER, ((EclipseLinkConvert) versionMapping.getSpecifiedConverter()).getConverterName()); + assertEquals(EclipseLinkConvert.ECLIPSE_LINK_CONVERTER, versionMapping.getConverter().getType()); + assertEquals(EclipseLinkConvert.CLASS_INSTANCE_CONVERTER, ((EclipseLinkConvert) versionMapping.getConverter()).getConverterName()); } public void testSetConvert() throws Exception { @@ -147,10 +147,10 @@ public class EclipseLinkJavaVersionMappingTests extends EclipseLinkContextModelT PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); VersionMapping versionMapping = (VersionMapping) persistentAttribute.getSpecifiedMapping(); - assertEquals(Converter.NO_CONVERTER, versionMapping.getSpecifiedConverter().getType()); + assertEquals(Converter.NO_CONVERTER, versionMapping.getConverter().getType()); - versionMapping.setSpecifiedConverter(Converter.TEMPORAL_CONVERTER); - ((TemporalConverter) versionMapping.getSpecifiedConverter()).setTemporalType(TemporalType.TIME); + versionMapping.setConverter(Converter.TEMPORAL_CONVERTER); + ((TemporalConverter) versionMapping.getConverter()).setTemporalType(TemporalType.TIME); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.persistableAttributes().next(); @@ -158,7 +158,7 @@ public class EclipseLinkJavaVersionMappingTests extends EclipseLinkContextModelT assertEquals(org.eclipse.jpt.core.resource.java.TemporalType.TIME, temporal.getValue()); - versionMapping.setSpecifiedConverter(Converter.NO_CONVERTER); + versionMapping.setConverter(Converter.NO_CONVERTER); assertNull(attributeResource.getAnnotation(TemporalAnnotation.ANNOTATION_NAME)); } @@ -169,7 +169,7 @@ public class EclipseLinkJavaVersionMappingTests extends EclipseLinkContextModelT PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next(); VersionMapping versionMapping = (VersionMapping) persistentAttribute.getSpecifiedMapping(); - assertEquals(Converter.NO_CONVERTER, versionMapping.getSpecifiedConverter().getType()); + assertEquals(Converter.NO_CONVERTER, versionMapping.getConverter().getType()); JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); @@ -177,12 +177,12 @@ public class EclipseLinkJavaVersionMappingTests extends EclipseLinkContextModelT EclipseLinkConvertAnnotation convert = (EclipseLinkConvertAnnotation) attributeResource.addAnnotation(EclipseLinkConvertAnnotation.ANNOTATION_NAME); convert.setValue("foo"); - assertEquals(EclipseLinkConvert.ECLIPSE_LINK_CONVERTER, versionMapping.getSpecifiedConverter().getType()); - assertEquals("foo", ((EclipseLinkConvert) versionMapping.getSpecifiedConverter()).getConverterName()); + assertEquals(EclipseLinkConvert.ECLIPSE_LINK_CONVERTER, versionMapping.getConverter().getType()); + assertEquals("foo", ((EclipseLinkConvert) versionMapping.getConverter()).getConverterName()); attributeResource.removeAnnotation(EclipseLinkConvertAnnotation.ANNOTATION_NAME); - assertEquals(Converter.NO_CONVERTER, versionMapping.getSpecifiedConverter().getType()); + assertEquals(Converter.NO_CONVERTER, versionMapping.getConverter().getType()); assertFalse(versionMapping.isDefault()); assertSame(versionMapping, persistentAttribute.getSpecifiedMapping()); } diff --git a/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmBasicMappingTests.java b/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmBasicMappingTests.java index 6c66520d5e..d2f24d6cad 100644 --- a/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmBasicMappingTests.java +++ b/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmBasicMappingTests.java @@ -314,47 +314,47 @@ public class EclipseLinkOrmBasicMappingTests XmlBasic basicResource = (XmlBasic) getXmlEntityMappings().getEntities().get(0).getAttributes().getBasics().get(0); JavaBasicMapping javaBasicMapping = (JavaBasicMapping) ormPersistentType.getJavaPersistentType().getAttributeNamed("id").getMapping(); - assertEquals(Converter.NO_CONVERTER, ormBasicMapping.getSpecifiedConverter().getType()); + assertEquals(Converter.NO_CONVERTER, ormBasicMapping.getConverter().getType()); assertEquals(null, basicResource.getConvert()); //set lob in the resource model, verify context model updated basicResource.setConvert("myConvert"); - assertEquals(EclipseLinkConvert.ECLIPSE_LINK_CONVERTER, ormBasicMapping.getSpecifiedConverter().getType()); + assertEquals(EclipseLinkConvert.ECLIPSE_LINK_CONVERTER, ormBasicMapping.getConverter().getType()); assertEquals("myConvert", basicResource.getConvert()); //set lob to null in the resource model basicResource.setConvert(null); - assertEquals(Converter.NO_CONVERTER, ormBasicMapping.getSpecifiedConverter().getType()); + assertEquals(Converter.NO_CONVERTER, ormBasicMapping.getConverter().getType()); assertEquals(null, basicResource.getConvert()); - javaBasicMapping.setSpecifiedConverter(EclipseLinkConvert.ECLIPSE_LINK_CONVERTER); - ((EclipseLinkConvert) javaBasicMapping.getSpecifiedConverter()).setSpecifiedConverterName("foo"); + javaBasicMapping.setConverter(EclipseLinkConvert.ECLIPSE_LINK_CONVERTER); + ((EclipseLinkConvert) javaBasicMapping.getConverter()).setSpecifiedConverterName("foo"); - assertEquals(Converter.NO_CONVERTER, ormBasicMapping.getSpecifiedConverter().getType()); + assertEquals(Converter.NO_CONVERTER, ormBasicMapping.getConverter().getType()); assertEquals(null, basicResource.getConvert()); - assertEquals("foo", ((EclipseLinkConvert) javaBasicMapping.getSpecifiedConverter()).getSpecifiedConverterName()); + assertEquals("foo", ((EclipseLinkConvert) javaBasicMapping.getConverter()).getSpecifiedConverterName()); ormPersistentType.removeSpecifiedAttribute(ormPersistentAttribute); ormPersistentAttribute = ormPersistentType.virtualAttributes().next(); ormBasicMapping = (OrmBasicMapping) ormPersistentAttribute.getMapping(); - assertEquals(EclipseLinkConvert.ECLIPSE_LINK_CONVERTER, ormBasicMapping.getSpecifiedConverter().getType()); - assertEquals("foo", ((EclipseLinkConvert) ormBasicMapping.getSpecifiedConverter()).getSpecifiedConverterName()); + assertEquals(EclipseLinkConvert.ECLIPSE_LINK_CONVERTER, ormBasicMapping.getConverter().getType()); + assertEquals("foo", ((EclipseLinkConvert) ormBasicMapping.getConverter()).getSpecifiedConverterName()); assertEquals(null, basicResource.getConvert()); - assertEquals("foo", ((EclipseLinkConvert) javaBasicMapping.getSpecifiedConverter()).getSpecifiedConverterName()); + assertEquals("foo", ((EclipseLinkConvert) javaBasicMapping.getConverter()).getSpecifiedConverterName()); - ((EclipseLinkConvert) javaBasicMapping.getSpecifiedConverter()).setSpecifiedConverterName("bar"); - assertEquals(EclipseLinkConvert.ECLIPSE_LINK_CONVERTER, ormBasicMapping.getSpecifiedConverter().getType()); - assertEquals("bar", ((EclipseLinkConvert) ormBasicMapping.getSpecifiedConverter()).getSpecifiedConverterName()); + ((EclipseLinkConvert) javaBasicMapping.getConverter()).setSpecifiedConverterName("bar"); + assertEquals(EclipseLinkConvert.ECLIPSE_LINK_CONVERTER, ormBasicMapping.getConverter().getType()); + assertEquals("bar", ((EclipseLinkConvert) ormBasicMapping.getConverter()).getSpecifiedConverterName()); assertEquals(null, basicResource.getConvert()); - assertEquals("bar", ((EclipseLinkConvert) javaBasicMapping.getSpecifiedConverter()).getSpecifiedConverterName()); + assertEquals("bar", ((EclipseLinkConvert) javaBasicMapping.getConverter()).getSpecifiedConverterName()); - javaBasicMapping.setSpecifiedConverter(Converter.NO_CONVERTER); - assertEquals(Converter.NO_CONVERTER, ormBasicMapping.getSpecifiedConverter().getType()); + javaBasicMapping.setConverter(Converter.NO_CONVERTER); + assertEquals(Converter.NO_CONVERTER, ormBasicMapping.getConverter().getType()); assertEquals(null, basicResource.getConvert()); - assertEquals(Converter.NO_CONVERTER, javaBasicMapping.getSpecifiedConverter().getType()); + assertEquals(Converter.NO_CONVERTER, javaBasicMapping.getConverter().getType()); } public void testModifyConvert() throws Exception { @@ -363,27 +363,27 @@ public class EclipseLinkOrmBasicMappingTests OrmBasicMapping ormBasicMapping = (OrmBasicMapping) ormPersistentAttribute.getMapping(); XmlBasic basicResource = (XmlBasic) getXmlEntityMappings().getEntities().get(0).getAttributes().getBasics().get(0); - assertEquals(Converter.NO_CONVERTER, ormBasicMapping.getSpecifiedConverter().getType()); + assertEquals(Converter.NO_CONVERTER, ormBasicMapping.getConverter().getType()); assertEquals(null, basicResource.getConvert()); //set lob in the context model, verify resource model updated - ormBasicMapping.setSpecifiedConverter(EclipseLinkConvert.ECLIPSE_LINK_CONVERTER); + ormBasicMapping.setConverter(EclipseLinkConvert.ECLIPSE_LINK_CONVERTER); assertEquals("", basicResource.getConvert()); - assertEquals(EclipseLinkConvert.ECLIPSE_LINK_CONVERTER, ormBasicMapping.getSpecifiedConverter().getType()); + assertEquals(EclipseLinkConvert.ECLIPSE_LINK_CONVERTER, ormBasicMapping.getConverter().getType()); - ((EclipseLinkConvert) ormBasicMapping.getSpecifiedConverter()).setSpecifiedConverterName("bar"); + ((EclipseLinkConvert) ormBasicMapping.getConverter()).setSpecifiedConverterName("bar"); assertEquals("bar", basicResource.getConvert()); - assertEquals(EclipseLinkConvert.ECLIPSE_LINK_CONVERTER, ormBasicMapping.getSpecifiedConverter().getType()); - assertEquals("bar", ((EclipseLinkConvert) ormBasicMapping.getSpecifiedConverter()).getSpecifiedConverterName()); + assertEquals(EclipseLinkConvert.ECLIPSE_LINK_CONVERTER, ormBasicMapping.getConverter().getType()); + assertEquals("bar", ((EclipseLinkConvert) ormBasicMapping.getConverter()).getSpecifiedConverterName()); - ((EclipseLinkConvert) ormBasicMapping.getSpecifiedConverter()).setSpecifiedConverterName(null); + ((EclipseLinkConvert) ormBasicMapping.getConverter()).setSpecifiedConverterName(null); - assertEquals(Converter.NO_CONVERTER, ormBasicMapping.getSpecifiedConverter().getType()); + assertEquals(Converter.NO_CONVERTER, ormBasicMapping.getConverter().getType()); assertEquals(null, basicResource.getConvert()); //set lob to false in the context model - ormBasicMapping.setSpecifiedConverter(Converter.NO_CONVERTER); - assertEquals(Converter.NO_CONVERTER, ormBasicMapping.getSpecifiedConverter().getType()); + ormBasicMapping.setConverter(Converter.NO_CONVERTER); + assertEquals(Converter.NO_CONVERTER, ormBasicMapping.getConverter().getType()); assertEquals(null, basicResource.getConvert()); } } diff --git a/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmConverterTests.java b/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmConverterTests.java index 6bcd38c089..58d3471dde 100644 --- a/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmConverterTests.java +++ b/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmConverterTests.java @@ -64,9 +64,9 @@ public class EclipseLinkOrmConverterTests OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.addSpecifiedAttribute(MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY, "id"); OrmBasicMapping ormBasicMapping = (OrmBasicMapping) ormPersistentAttribute.getMapping(); - ormBasicMapping.setSpecifiedConverter(EclipseLinkConvert.ECLIPSE_LINK_CONVERTER); - ((EclipseLinkConvert) ormBasicMapping.getSpecifiedConverter()).setConverter(EclipseLinkConverter.CUSTOM_CONVERTER); - OrmEclipseLinkCustomConverter ormConverter = (OrmEclipseLinkCustomConverter) ((EclipseLinkConvert) ormBasicMapping.getSpecifiedConverter()).getConverter(); + ormBasicMapping.setConverter(EclipseLinkConvert.ECLIPSE_LINK_CONVERTER); + ((EclipseLinkConvert) ormBasicMapping.getConverter()).setConverter(EclipseLinkConverter.CUSTOM_CONVERTER); + OrmEclipseLinkCustomConverter ormConverter = (OrmEclipseLinkCustomConverter) ((EclipseLinkConvert) ormBasicMapping.getConverter()).getConverter(); XmlConverter converterResource = ((XmlBasic) getXmlEntityMappings().getEntities().get(0).getAttributes().getBasics().get(0)).getConverter(); JavaBasicMapping javaBasicMapping = (JavaBasicMapping) ormPersistentType.getJavaPersistentType().getAttributeNamed("id").getMapping(); @@ -88,9 +88,9 @@ public class EclipseLinkOrmConverterTests ormPersistentAttribute = ormPersistentType.virtualAttributes().next(); ormBasicMapping = (OrmBasicMapping) ormPersistentAttribute.getMapping(); - ormConverter = (OrmEclipseLinkCustomConverter) ((EclipseLinkConvert) ormBasicMapping.getSpecifiedConverter()).getConverter(); + ormConverter = (OrmEclipseLinkCustomConverter) ((EclipseLinkConvert) ormBasicMapping.getConverter()).getConverter(); - EclipseLinkCustomConverter javaConverter = ((EclipseLinkCustomConverter) ((EclipseLinkConvert) javaBasicMapping.getSpecifiedConverter()).getConverter()); + EclipseLinkCustomConverter javaConverter = ((EclipseLinkCustomConverter) ((EclipseLinkConvert) javaBasicMapping.getConverter()).getConverter()); javaConverter.setConverterClass("bar"); assertEquals("bar", ormConverter.getConverterClass()); assertEquals("bar", javaConverter.getConverterClass()); @@ -99,7 +99,7 @@ public class EclipseLinkOrmConverterTests ormPersistentType.getMapping().setSpecifiedMetadataComplete(Boolean.TRUE); ormPersistentAttribute = ormPersistentType.virtualAttributes().next(); ormBasicMapping = (OrmBasicMapping) ormPersistentAttribute.getMapping(); - assertEquals(Converter.NO_CONVERTER, ormBasicMapping.getSpecifiedConverter().getType()); + assertEquals(Converter.NO_CONVERTER, ormBasicMapping.getConverter().getType()); assertEquals("bar", javaConverter.getConverterClass()); } @@ -107,9 +107,9 @@ public class EclipseLinkOrmConverterTests OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo"); OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.addSpecifiedAttribute(MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY, "basicMapping"); OrmBasicMapping ormBasicMapping = ((OrmBasicMapping) ormPersistentAttribute.getMapping()); - ormBasicMapping.setSpecifiedConverter(EclipseLinkConvert.ECLIPSE_LINK_CONVERTER); - ((EclipseLinkConvert) ormBasicMapping.getSpecifiedConverter()).setConverter(EclipseLinkConverter.CUSTOM_CONVERTER); - OrmEclipseLinkCustomConverter ormConverter = (OrmEclipseLinkCustomConverter) ((EclipseLinkConvert) ormBasicMapping.getSpecifiedConverter()).getConverter(); + ormBasicMapping.setConverter(EclipseLinkConvert.ECLIPSE_LINK_CONVERTER); + ((EclipseLinkConvert) ormBasicMapping.getConverter()).setConverter(EclipseLinkConverter.CUSTOM_CONVERTER); + OrmEclipseLinkCustomConverter ormConverter = (OrmEclipseLinkCustomConverter) ((EclipseLinkConvert) ormBasicMapping.getConverter()).getConverter(); XmlConverter converterResource = ((XmlBasic) getXmlEntityMappings().getEntities().get(0).getAttributes().getBasics().get(0)).getConverter(); assertEquals(null, ormConverter.getConverterClass()); @@ -131,9 +131,9 @@ public class EclipseLinkOrmConverterTests OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.addSpecifiedAttribute(MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY, "id"); OrmBasicMapping ormBasicMapping = ((OrmBasicMapping) ormPersistentAttribute.getMapping()); - ormBasicMapping.setSpecifiedConverter(EclipseLinkConvert.ECLIPSE_LINK_CONVERTER); - ((EclipseLinkConvert) ormBasicMapping.getSpecifiedConverter()).setConverter(EclipseLinkConverter.CUSTOM_CONVERTER); - OrmEclipseLinkCustomConverter ormConverter = (OrmEclipseLinkCustomConverter) ((EclipseLinkConvert) ormBasicMapping.getSpecifiedConverter()).getConverter(); + ormBasicMapping.setConverter(EclipseLinkConvert.ECLIPSE_LINK_CONVERTER); + ((EclipseLinkConvert) ormBasicMapping.getConverter()).setConverter(EclipseLinkConverter.CUSTOM_CONVERTER); + OrmEclipseLinkCustomConverter ormConverter = (OrmEclipseLinkCustomConverter) ((EclipseLinkConvert) ormBasicMapping.getConverter()).getConverter(); XmlConverter converterResource = ((XmlBasic) getXmlEntityMappings().getEntities().get(0).getAttributes().getBasics().get(0)).getConverter(); JavaBasicMapping javaBasicMapping = (JavaBasicMapping) ormPersistentType.getJavaPersistentType().getAttributeNamed("id").getMapping(); @@ -155,9 +155,9 @@ public class EclipseLinkOrmConverterTests ormPersistentAttribute = ormPersistentType.virtualAttributes().next(); ormBasicMapping = (OrmBasicMapping) ormPersistentAttribute.getMapping(); - ormConverter = (OrmEclipseLinkCustomConverter) ((EclipseLinkConvert) ormBasicMapping.getSpecifiedConverter()).getConverter(); + ormConverter = (OrmEclipseLinkCustomConverter) ((EclipseLinkConvert) ormBasicMapping.getConverter()).getConverter(); - EclipseLinkCustomConverter javaConverter = ((EclipseLinkCustomConverter) ((EclipseLinkConvert) javaBasicMapping.getSpecifiedConverter()).getConverter()); + EclipseLinkCustomConverter javaConverter = ((EclipseLinkCustomConverter) ((EclipseLinkConvert) javaBasicMapping.getConverter()).getConverter()); javaConverter.setName("bar"); assertEquals("bar", ormConverter.getName()); assertEquals("bar", javaConverter.getName()); @@ -166,7 +166,7 @@ public class EclipseLinkOrmConverterTests ormPersistentType.getMapping().setSpecifiedMetadataComplete(Boolean.TRUE); ormPersistentAttribute = ormPersistentType.virtualAttributes().next(); ormBasicMapping = (OrmBasicMapping) ormPersistentAttribute.getMapping(); - assertEquals(Converter.NO_CONVERTER, ormBasicMapping.getSpecifiedConverter().getType()); + assertEquals(Converter.NO_CONVERTER, ormBasicMapping.getConverter().getType()); assertEquals("bar", javaConverter.getName()); } @@ -174,9 +174,9 @@ public class EclipseLinkOrmConverterTests OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo"); OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.addSpecifiedAttribute(MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY, "basicMapping"); OrmBasicMapping ormBasicMapping = ((OrmBasicMapping) ormPersistentAttribute.getMapping()); - ormBasicMapping.setSpecifiedConverter(EclipseLinkConvert.ECLIPSE_LINK_CONVERTER); - ((EclipseLinkConvert) ormBasicMapping.getSpecifiedConverter()).setConverter(EclipseLinkConverter.CUSTOM_CONVERTER); - OrmEclipseLinkCustomConverter ormConverter = (OrmEclipseLinkCustomConverter) ((EclipseLinkConvert) ormBasicMapping.getSpecifiedConverter()).getConverter(); + ormBasicMapping.setConverter(EclipseLinkConvert.ECLIPSE_LINK_CONVERTER); + ((EclipseLinkConvert) ormBasicMapping.getConverter()).setConverter(EclipseLinkConverter.CUSTOM_CONVERTER); + OrmEclipseLinkCustomConverter ormConverter = (OrmEclipseLinkCustomConverter) ((EclipseLinkConvert) ormBasicMapping.getConverter()).getConverter(); XmlConverter converterResource = ((XmlBasic) getXmlEntityMappings().getEntities().get(0).getAttributes().getBasics().get(0)).getConverter(); assertEquals(null, ormConverter.getName()); diff --git a/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmIdMappingTests.java b/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmIdMappingTests.java index 15a1d819f7..6edf577efd 100644 --- a/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmIdMappingTests.java +++ b/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmIdMappingTests.java @@ -313,47 +313,47 @@ public class EclipseLinkOrmIdMappingTests XmlId basicResource = (XmlId) getXmlEntityMappings().getEntities().get(0).getAttributes().getIds().get(0); JavaIdMapping javaIdMapping = (JavaIdMapping) ormPersistentType.getJavaPersistentType().getAttributeNamed("id").getMapping(); - assertEquals(Converter.NO_CONVERTER, ormIdMapping.getSpecifiedConverter().getType()); + assertEquals(Converter.NO_CONVERTER, ormIdMapping.getConverter().getType()); assertEquals(null, basicResource.getConvert()); //set lob in the resource model, verify context model updated basicResource.setConvert("myConvert"); - assertEquals(EclipseLinkConvert.ECLIPSE_LINK_CONVERTER, ormIdMapping.getSpecifiedConverter().getType()); + assertEquals(EclipseLinkConvert.ECLIPSE_LINK_CONVERTER, ormIdMapping.getConverter().getType()); assertEquals("myConvert", basicResource.getConvert()); //set lob to null in the resource model basicResource.setConvert(null); - assertEquals(Converter.NO_CONVERTER, ormIdMapping.getSpecifiedConverter().getType()); + assertEquals(Converter.NO_CONVERTER, ormIdMapping.getConverter().getType()); assertEquals(null, basicResource.getConvert()); - javaIdMapping.setSpecifiedConverter(EclipseLinkConvert.ECLIPSE_LINK_CONVERTER); - ((EclipseLinkConvert) javaIdMapping.getSpecifiedConverter()).setSpecifiedConverterName("foo"); + javaIdMapping.setConverter(EclipseLinkConvert.ECLIPSE_LINK_CONVERTER); + ((EclipseLinkConvert) javaIdMapping.getConverter()).setSpecifiedConverterName("foo"); - assertEquals(Converter.NO_CONVERTER, ormIdMapping.getSpecifiedConverter().getType()); + assertEquals(Converter.NO_CONVERTER, ormIdMapping.getConverter().getType()); assertEquals(null, basicResource.getConvert()); - assertEquals("foo", ((EclipseLinkConvert) javaIdMapping.getSpecifiedConverter()).getSpecifiedConverterName()); + assertEquals("foo", ((EclipseLinkConvert) javaIdMapping.getConverter()).getSpecifiedConverterName()); ormPersistentType.removeSpecifiedAttribute(ormPersistentAttribute); ormPersistentAttribute = ormPersistentType.virtualAttributes().next(); ormIdMapping = (OrmIdMapping) ormPersistentAttribute.getMapping(); - assertEquals(EclipseLinkConvert.ECLIPSE_LINK_CONVERTER, ormIdMapping.getSpecifiedConverter().getType()); - assertEquals("foo", ((EclipseLinkConvert) ormIdMapping.getSpecifiedConverter()).getSpecifiedConverterName()); + assertEquals(EclipseLinkConvert.ECLIPSE_LINK_CONVERTER, ormIdMapping.getConverter().getType()); + assertEquals("foo", ((EclipseLinkConvert) ormIdMapping.getConverter()).getSpecifiedConverterName()); assertEquals(null, basicResource.getConvert()); - assertEquals("foo", ((EclipseLinkConvert) javaIdMapping.getSpecifiedConverter()).getSpecifiedConverterName()); + assertEquals("foo", ((EclipseLinkConvert) javaIdMapping.getConverter()).getSpecifiedConverterName()); - ((EclipseLinkConvert) javaIdMapping.getSpecifiedConverter()).setSpecifiedConverterName("bar"); - assertEquals(EclipseLinkConvert.ECLIPSE_LINK_CONVERTER, ormIdMapping.getSpecifiedConverter().getType()); - assertEquals("bar", ((EclipseLinkConvert) ormIdMapping.getSpecifiedConverter()).getSpecifiedConverterName()); + ((EclipseLinkConvert) javaIdMapping.getConverter()).setSpecifiedConverterName("bar"); + assertEquals(EclipseLinkConvert.ECLIPSE_LINK_CONVERTER, ormIdMapping.getConverter().getType()); + assertEquals("bar", ((EclipseLinkConvert) ormIdMapping.getConverter()).getSpecifiedConverterName()); assertEquals(null, basicResource.getConvert()); - assertEquals("bar", ((EclipseLinkConvert) javaIdMapping.getSpecifiedConverter()).getSpecifiedConverterName()); + assertEquals("bar", ((EclipseLinkConvert) javaIdMapping.getConverter()).getSpecifiedConverterName()); - javaIdMapping.setSpecifiedConverter(Converter.NO_CONVERTER); - assertEquals(Converter.NO_CONVERTER, ormIdMapping.getSpecifiedConverter().getType()); + javaIdMapping.setConverter(Converter.NO_CONVERTER); + assertEquals(Converter.NO_CONVERTER, ormIdMapping.getConverter().getType()); assertEquals(null, basicResource.getConvert()); - assertEquals(Converter.NO_CONVERTER, javaIdMapping.getSpecifiedConverter().getType()); + assertEquals(Converter.NO_CONVERTER, javaIdMapping.getConverter().getType()); } public void testModifyConvert() throws Exception { @@ -362,27 +362,27 @@ public class EclipseLinkOrmIdMappingTests OrmIdMapping ormIdMapping = (OrmIdMapping) ormPersistentAttribute.getMapping(); XmlId basicResource = (XmlId) getXmlEntityMappings().getEntities().get(0).getAttributes().getIds().get(0); - assertEquals(Converter.NO_CONVERTER, ormIdMapping.getSpecifiedConverter().getType()); + assertEquals(Converter.NO_CONVERTER, ormIdMapping.getConverter().getType()); assertEquals(null, basicResource.getConvert()); //set lob in the context model, verify resource model updated - ormIdMapping.setSpecifiedConverter(EclipseLinkConvert.ECLIPSE_LINK_CONVERTER); + ormIdMapping.setConverter(EclipseLinkConvert.ECLIPSE_LINK_CONVERTER); assertEquals("", basicResource.getConvert()); - assertEquals(EclipseLinkConvert.ECLIPSE_LINK_CONVERTER, ormIdMapping.getSpecifiedConverter().getType()); + assertEquals(EclipseLinkConvert.ECLIPSE_LINK_CONVERTER, ormIdMapping.getConverter().getType()); - ((EclipseLinkConvert) ormIdMapping.getSpecifiedConverter()).setSpecifiedConverterName("bar"); + ((EclipseLinkConvert) ormIdMapping.getConverter()).setSpecifiedConverterName("bar"); assertEquals("bar", basicResource.getConvert()); - assertEquals(EclipseLinkConvert.ECLIPSE_LINK_CONVERTER, ormIdMapping.getSpecifiedConverter().getType()); - assertEquals("bar", ((EclipseLinkConvert) ormIdMapping.getSpecifiedConverter()).getSpecifiedConverterName()); + assertEquals(EclipseLinkConvert.ECLIPSE_LINK_CONVERTER, ormIdMapping.getConverter().getType()); + assertEquals("bar", ((EclipseLinkConvert) ormIdMapping.getConverter()).getSpecifiedConverterName()); - ((EclipseLinkConvert) ormIdMapping.getSpecifiedConverter()).setSpecifiedConverterName(null); + ((EclipseLinkConvert) ormIdMapping.getConverter()).setSpecifiedConverterName(null); - assertEquals(Converter.NO_CONVERTER, ormIdMapping.getSpecifiedConverter().getType()); + assertEquals(Converter.NO_CONVERTER, ormIdMapping.getConverter().getType()); assertEquals(null, basicResource.getConvert()); //set lob to false in the context model - ormIdMapping.setSpecifiedConverter(Converter.NO_CONVERTER); - assertEquals(Converter.NO_CONVERTER, ormIdMapping.getSpecifiedConverter().getType()); + ormIdMapping.setConverter(Converter.NO_CONVERTER); + assertEquals(Converter.NO_CONVERTER, ormIdMapping.getConverter().getType()); assertEquals(null, basicResource.getConvert()); } } diff --git a/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmObjectTypeConverterTests.java b/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmObjectTypeConverterTests.java index eadcc9196d..ed4a19e3b8 100644 --- a/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmObjectTypeConverterTests.java +++ b/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmObjectTypeConverterTests.java @@ -88,9 +88,9 @@ public class EclipseLinkOrmObjectTypeConverterTests OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.addSpecifiedAttribute(MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY, "id"); OrmBasicMapping ormBasicMapping = (OrmBasicMapping) ormPersistentAttribute.getMapping(); - ormBasicMapping.setSpecifiedConverter(EclipseLinkConvert.ECLIPSE_LINK_CONVERTER); - ((EclipseLinkConvert) ormBasicMapping.getSpecifiedConverter()).setConverter(EclipseLinkConverter.OBJECT_TYPE_CONVERTER); - EclipseLinkObjectTypeConverter ormConverter = (EclipseLinkObjectTypeConverter) ((EclipseLinkConvert) ormBasicMapping.getSpecifiedConverter()).getConverter(); + ormBasicMapping.setConverter(EclipseLinkConvert.ECLIPSE_LINK_CONVERTER); + ((EclipseLinkConvert) ormBasicMapping.getConverter()).setConverter(EclipseLinkConverter.OBJECT_TYPE_CONVERTER); + EclipseLinkObjectTypeConverter ormConverter = (EclipseLinkObjectTypeConverter) ((EclipseLinkConvert) ormBasicMapping.getConverter()).getConverter(); XmlObjectTypeConverter converterResource = ((XmlBasic) getXmlEntityMappings().getEntities().get(0).getAttributes().getBasics().get(0)).getObjectTypeConverter(); JavaBasicMapping javaBasicMapping = (JavaBasicMapping) ormPersistentType.getJavaPersistentType().getAttributeNamed("id").getMapping(); @@ -113,9 +113,9 @@ public class EclipseLinkOrmObjectTypeConverterTests ormPersistentAttribute = ormPersistentType.virtualAttributes().next(); ormBasicMapping = (OrmBasicMapping) ormPersistentAttribute.getMapping(); - ormConverter = (EclipseLinkObjectTypeConverter) ((EclipseLinkConvert) ormBasicMapping.getSpecifiedConverter()).getConverter(); + ormConverter = (EclipseLinkObjectTypeConverter) ((EclipseLinkConvert) ormBasicMapping.getConverter()).getConverter(); - EclipseLinkObjectTypeConverter javaConverter = ((EclipseLinkObjectTypeConverter) ((EclipseLinkConvert) javaBasicMapping.getSpecifiedConverter()).getConverter()); + EclipseLinkObjectTypeConverter javaConverter = ((EclipseLinkObjectTypeConverter) ((EclipseLinkConvert) javaBasicMapping.getConverter()).getConverter()); javaConverter.setDataType("bar"); assertEquals("bar", ormConverter.getDataType()); assertEquals("bar", javaConverter.getDataType()); @@ -124,7 +124,7 @@ public class EclipseLinkOrmObjectTypeConverterTests ormPersistentType.getMapping().setSpecifiedMetadataComplete(Boolean.TRUE); ormPersistentAttribute = ormPersistentType.virtualAttributes().next(); ormBasicMapping = (OrmBasicMapping) ormPersistentAttribute.getMapping(); - assertEquals(Converter.NO_CONVERTER, ormBasicMapping.getSpecifiedConverter().getType()); + assertEquals(Converter.NO_CONVERTER, ormBasicMapping.getConverter().getType()); assertEquals("bar", javaConverter.getDataType()); } @@ -132,9 +132,9 @@ public class EclipseLinkOrmObjectTypeConverterTests OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo"); OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.addSpecifiedAttribute(MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY, "basicMapping"); OrmBasicMapping ormBasicMapping = ((OrmBasicMapping) ormPersistentAttribute.getMapping()); - ormBasicMapping.setSpecifiedConverter(EclipseLinkConvert.ECLIPSE_LINK_CONVERTER); - ((EclipseLinkConvert) ormBasicMapping.getSpecifiedConverter()).setConverter(EclipseLinkConverter.OBJECT_TYPE_CONVERTER); - EclipseLinkObjectTypeConverter ormConverter = (EclipseLinkObjectTypeConverter) ((EclipseLinkConvert) ormBasicMapping.getSpecifiedConverter()).getConverter(); + ormBasicMapping.setConverter(EclipseLinkConvert.ECLIPSE_LINK_CONVERTER); + ((EclipseLinkConvert) ormBasicMapping.getConverter()).setConverter(EclipseLinkConverter.OBJECT_TYPE_CONVERTER); + EclipseLinkObjectTypeConverter ormConverter = (EclipseLinkObjectTypeConverter) ((EclipseLinkConvert) ormBasicMapping.getConverter()).getConverter(); XmlObjectTypeConverter converterResource = ((XmlBasic) getXmlEntityMappings().getEntities().get(0).getAttributes().getBasics().get(0)).getObjectTypeConverter(); assertEquals(null, ormConverter.getDataType()); @@ -156,9 +156,9 @@ public class EclipseLinkOrmObjectTypeConverterTests OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.addSpecifiedAttribute(MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY, "id"); OrmBasicMapping ormBasicMapping = (OrmBasicMapping) ormPersistentAttribute.getMapping(); - ormBasicMapping.setSpecifiedConverter(EclipseLinkConvert.ECLIPSE_LINK_CONVERTER); - ((EclipseLinkConvert) ormBasicMapping.getSpecifiedConverter()).setConverter(EclipseLinkConverter.OBJECT_TYPE_CONVERTER); - EclipseLinkObjectTypeConverter ormConverter = (EclipseLinkObjectTypeConverter) ((EclipseLinkConvert) ormBasicMapping.getSpecifiedConverter()).getConverter(); + ormBasicMapping.setConverter(EclipseLinkConvert.ECLIPSE_LINK_CONVERTER); + ((EclipseLinkConvert) ormBasicMapping.getConverter()).setConverter(EclipseLinkConverter.OBJECT_TYPE_CONVERTER); + EclipseLinkObjectTypeConverter ormConverter = (EclipseLinkObjectTypeConverter) ((EclipseLinkConvert) ormBasicMapping.getConverter()).getConverter(); XmlObjectTypeConverter converterResource = ((XmlBasic) getXmlEntityMappings().getEntities().get(0).getAttributes().getBasics().get(0)).getObjectTypeConverter(); JavaBasicMapping javaBasicMapping = (JavaBasicMapping) ormPersistentType.getJavaPersistentType().getAttributeNamed("id").getMapping(); @@ -181,9 +181,9 @@ public class EclipseLinkOrmObjectTypeConverterTests ormPersistentAttribute = ormPersistentType.virtualAttributes().next(); ormBasicMapping = (OrmBasicMapping) ormPersistentAttribute.getMapping(); - ormConverter = (EclipseLinkObjectTypeConverter) ((EclipseLinkConvert) ormBasicMapping.getSpecifiedConverter()).getConverter(); + ormConverter = (EclipseLinkObjectTypeConverter) ((EclipseLinkConvert) ormBasicMapping.getConverter()).getConverter(); - EclipseLinkObjectTypeConverter javaConverter = ((EclipseLinkObjectTypeConverter) ((EclipseLinkConvert) javaBasicMapping.getSpecifiedConverter()).getConverter()); + EclipseLinkObjectTypeConverter javaConverter = ((EclipseLinkObjectTypeConverter) ((EclipseLinkConvert) javaBasicMapping.getConverter()).getConverter()); javaConverter.setObjectType("bar"); assertEquals("bar", ormConverter.getObjectType()); assertEquals("bar", javaConverter.getObjectType()); @@ -192,7 +192,7 @@ public class EclipseLinkOrmObjectTypeConverterTests ormPersistentType.getMapping().setSpecifiedMetadataComplete(Boolean.TRUE); ormPersistentAttribute = ormPersistentType.virtualAttributes().next(); ormBasicMapping = (OrmBasicMapping) ormPersistentAttribute.getMapping(); - assertEquals(Converter.NO_CONVERTER, ormBasicMapping.getSpecifiedConverter().getType()); + assertEquals(Converter.NO_CONVERTER, ormBasicMapping.getConverter().getType()); assertEquals("bar", javaConverter.getObjectType()); } @@ -200,9 +200,9 @@ public class EclipseLinkOrmObjectTypeConverterTests OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo"); OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.addSpecifiedAttribute(MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY, "basicMapping"); OrmBasicMapping ormBasicMapping = ((OrmBasicMapping) ormPersistentAttribute.getMapping()); - ormBasicMapping.setSpecifiedConverter(EclipseLinkConvert.ECLIPSE_LINK_CONVERTER); - ((EclipseLinkConvert) ormBasicMapping.getSpecifiedConverter()).setConverter(EclipseLinkConverter.OBJECT_TYPE_CONVERTER); - EclipseLinkObjectTypeConverter ormConverter = (EclipseLinkObjectTypeConverter) ((EclipseLinkConvert) ormBasicMapping.getSpecifiedConverter()).getConverter(); + ormBasicMapping.setConverter(EclipseLinkConvert.ECLIPSE_LINK_CONVERTER); + ((EclipseLinkConvert) ormBasicMapping.getConverter()).setConverter(EclipseLinkConverter.OBJECT_TYPE_CONVERTER); + EclipseLinkObjectTypeConverter ormConverter = (EclipseLinkObjectTypeConverter) ((EclipseLinkConvert) ormBasicMapping.getConverter()).getConverter(); XmlObjectTypeConverter converterResource = ((XmlBasic) getXmlEntityMappings().getEntities().get(0).getAttributes().getBasics().get(0)).getObjectTypeConverter(); assertEquals(null, ormConverter.getObjectType()); @@ -224,9 +224,9 @@ public class EclipseLinkOrmObjectTypeConverterTests OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.addSpecifiedAttribute(MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY, "id"); OrmBasicMapping ormBasicMapping = ((OrmBasicMapping) ormPersistentAttribute.getMapping()); - ormBasicMapping.setSpecifiedConverter(EclipseLinkConvert.ECLIPSE_LINK_CONVERTER); - ((EclipseLinkConvert) ormBasicMapping.getSpecifiedConverter()).setConverter(EclipseLinkConverter.OBJECT_TYPE_CONVERTER); - OrmEclipseLinkObjectTypeConverter ormConverter = (OrmEclipseLinkObjectTypeConverter) ((EclipseLinkConvert) ormBasicMapping.getSpecifiedConverter()).getConverter(); + ormBasicMapping.setConverter(EclipseLinkConvert.ECLIPSE_LINK_CONVERTER); + ((EclipseLinkConvert) ormBasicMapping.getConverter()).setConverter(EclipseLinkConverter.OBJECT_TYPE_CONVERTER); + OrmEclipseLinkObjectTypeConverter ormConverter = (OrmEclipseLinkObjectTypeConverter) ((EclipseLinkConvert) ormBasicMapping.getConverter()).getConverter(); XmlObjectTypeConverter converterResource = ((XmlBasic) getXmlEntityMappings().getEntities().get(0).getAttributes().getBasics().get(0)).getObjectTypeConverter(); JavaBasicMapping javaBasicMapping = (JavaBasicMapping) ormPersistentType.getJavaPersistentType().getAttributeNamed("id").getMapping(); @@ -250,9 +250,9 @@ public class EclipseLinkOrmObjectTypeConverterTests ormPersistentAttribute = ormPersistentType.virtualAttributes().next(); ormBasicMapping = (OrmBasicMapping) ormPersistentAttribute.getMapping(); - ormConverter = (OrmEclipseLinkObjectTypeConverter) ((EclipseLinkConvert) ormBasicMapping.getSpecifiedConverter()).getConverter(); + ormConverter = (OrmEclipseLinkObjectTypeConverter) ((EclipseLinkConvert) ormBasicMapping.getConverter()).getConverter(); - EclipseLinkObjectTypeConverter javaConverter = ((EclipseLinkObjectTypeConverter) ((EclipseLinkConvert) javaBasicMapping.getSpecifiedConverter()).getConverter()); + EclipseLinkObjectTypeConverter javaConverter = ((EclipseLinkObjectTypeConverter) ((EclipseLinkConvert) javaBasicMapping.getConverter()).getConverter()); javaConverter.setName("bar"); assertEquals("bar", ormConverter.getName()); assertEquals("bar", javaConverter.getName()); @@ -263,7 +263,7 @@ public class EclipseLinkOrmObjectTypeConverterTests ormPersistentType.getMapping().setSpecifiedMetadataComplete(Boolean.TRUE); ormPersistentAttribute = ormPersistentType.virtualAttributes().next(); ormBasicMapping = (OrmBasicMapping) ormPersistentAttribute.getMapping(); - assertEquals(Converter.NO_CONVERTER, ormBasicMapping.getSpecifiedConverter().getType()); + assertEquals(Converter.NO_CONVERTER, ormBasicMapping.getConverter().getType()); assertEquals("bar", javaConverter.getName()); } @@ -271,9 +271,9 @@ public class EclipseLinkOrmObjectTypeConverterTests OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo"); OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.addSpecifiedAttribute(MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY, "basicMapping"); OrmBasicMapping ormBasicMapping = ((OrmBasicMapping) ormPersistentAttribute.getMapping()); - ormBasicMapping.setSpecifiedConverter(EclipseLinkConvert.ECLIPSE_LINK_CONVERTER); - ((EclipseLinkConvert) ormBasicMapping.getSpecifiedConverter()).setConverter(EclipseLinkConverter.OBJECT_TYPE_CONVERTER); - OrmEclipseLinkObjectTypeConverter ormConverter = (OrmEclipseLinkObjectTypeConverter) ((EclipseLinkConvert) ormBasicMapping.getSpecifiedConverter()).getConverter(); + ormBasicMapping.setConverter(EclipseLinkConvert.ECLIPSE_LINK_CONVERTER); + ((EclipseLinkConvert) ormBasicMapping.getConverter()).setConverter(EclipseLinkConverter.OBJECT_TYPE_CONVERTER); + OrmEclipseLinkObjectTypeConverter ormConverter = (OrmEclipseLinkObjectTypeConverter) ((EclipseLinkConvert) ormBasicMapping.getConverter()).getConverter(); XmlObjectTypeConverter converterResource = ((XmlBasic) getXmlEntityMappings().getEntities().get(0).getAttributes().getBasics().get(0)).getObjectTypeConverter(); assertEquals(null, ormConverter.getName()); @@ -295,9 +295,9 @@ public class EclipseLinkOrmObjectTypeConverterTests OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.addSpecifiedAttribute(MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY, "id"); OrmBasicMapping ormBasicMapping = (OrmBasicMapping) ormPersistentAttribute.getMapping(); - ormBasicMapping.setSpecifiedConverter(EclipseLinkConvert.ECLIPSE_LINK_CONVERTER); - ((EclipseLinkConvert) ormBasicMapping.getSpecifiedConverter()).setConverter(EclipseLinkConverter.OBJECT_TYPE_CONVERTER); - EclipseLinkObjectTypeConverter ormConverter = (EclipseLinkObjectTypeConverter) ((EclipseLinkConvert) ormBasicMapping.getSpecifiedConverter()).getConverter(); + ormBasicMapping.setConverter(EclipseLinkConvert.ECLIPSE_LINK_CONVERTER); + ((EclipseLinkConvert) ormBasicMapping.getConverter()).setConverter(EclipseLinkConverter.OBJECT_TYPE_CONVERTER); + EclipseLinkObjectTypeConverter ormConverter = (EclipseLinkObjectTypeConverter) ((EclipseLinkConvert) ormBasicMapping.getConverter()).getConverter(); XmlObjectTypeConverter converterResource = ((XmlBasic) getXmlEntityMappings().getEntities().get(0).getAttributes().getBasics().get(0)).getObjectTypeConverter(); JavaBasicMapping javaBasicMapping = (JavaBasicMapping) ormPersistentType.getJavaPersistentType().getAttributeNamed("id").getMapping(); @@ -320,9 +320,9 @@ public class EclipseLinkOrmObjectTypeConverterTests ormPersistentAttribute = ormPersistentType.virtualAttributes().next(); ormBasicMapping = (OrmBasicMapping) ormPersistentAttribute.getMapping(); - ormConverter = (EclipseLinkObjectTypeConverter) ((EclipseLinkConvert) ormBasicMapping.getSpecifiedConverter()).getConverter(); + ormConverter = (EclipseLinkObjectTypeConverter) ((EclipseLinkConvert) ormBasicMapping.getConverter()).getConverter(); - EclipseLinkObjectTypeConverter javaConverter = ((EclipseLinkObjectTypeConverter) ((EclipseLinkConvert) javaBasicMapping.getSpecifiedConverter()).getConverter()); + EclipseLinkObjectTypeConverter javaConverter = ((EclipseLinkObjectTypeConverter) ((EclipseLinkConvert) javaBasicMapping.getConverter()).getConverter()); javaConverter.setDefaultObjectValue("bar"); assertEquals("bar", ormConverter.getDefaultObjectValue()); assertEquals("bar", javaConverter.getDefaultObjectValue()); @@ -331,7 +331,7 @@ public class EclipseLinkOrmObjectTypeConverterTests ormPersistentType.getMapping().setSpecifiedMetadataComplete(Boolean.TRUE); ormPersistentAttribute = ormPersistentType.virtualAttributes().next(); ormBasicMapping = (OrmBasicMapping) ormPersistentAttribute.getMapping(); - assertEquals(Converter.NO_CONVERTER, ormBasicMapping.getSpecifiedConverter().getType()); + assertEquals(Converter.NO_CONVERTER, ormBasicMapping.getConverter().getType()); assertEquals("bar", javaConverter.getDefaultObjectValue()); } @@ -339,9 +339,9 @@ public class EclipseLinkOrmObjectTypeConverterTests OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo"); OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.addSpecifiedAttribute(MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY, "basicMapping"); OrmBasicMapping ormBasicMapping = ((OrmBasicMapping) ormPersistentAttribute.getMapping()); - ormBasicMapping.setSpecifiedConverter(EclipseLinkConvert.ECLIPSE_LINK_CONVERTER); - ((EclipseLinkConvert) ormBasicMapping.getSpecifiedConverter()).setConverter(EclipseLinkConverter.OBJECT_TYPE_CONVERTER); - EclipseLinkObjectTypeConverter ormConverter = (EclipseLinkObjectTypeConverter) ((EclipseLinkConvert) ormBasicMapping.getSpecifiedConverter()).getConverter(); + ormBasicMapping.setConverter(EclipseLinkConvert.ECLIPSE_LINK_CONVERTER); + ((EclipseLinkConvert) ormBasicMapping.getConverter()).setConverter(EclipseLinkConverter.OBJECT_TYPE_CONVERTER); + EclipseLinkObjectTypeConverter ormConverter = (EclipseLinkObjectTypeConverter) ((EclipseLinkConvert) ormBasicMapping.getConverter()).getConverter(); XmlObjectTypeConverter converterResource = ((XmlBasic) getXmlEntityMappings().getEntities().get(0).getAttributes().getBasics().get(0)).getObjectTypeConverter(); assertEquals(null, ormConverter.getDefaultObjectValue()); @@ -364,9 +364,9 @@ public class EclipseLinkOrmObjectTypeConverterTests OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.addSpecifiedAttribute(MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY, "id"); OrmBasicMapping ormBasicMapping = (OrmBasicMapping) ormPersistentAttribute.getMapping(); - ormBasicMapping.setSpecifiedConverter(EclipseLinkConvert.ECLIPSE_LINK_CONVERTER); - ((EclipseLinkConvert) ormBasicMapping.getSpecifiedConverter()).setConverter(EclipseLinkConverter.OBJECT_TYPE_CONVERTER); - EclipseLinkObjectTypeConverter ormConverter = (EclipseLinkObjectTypeConverter) ((EclipseLinkConvert) ormBasicMapping.getSpecifiedConverter()).getConverter(); + ormBasicMapping.setConverter(EclipseLinkConvert.ECLIPSE_LINK_CONVERTER); + ((EclipseLinkConvert) ormBasicMapping.getConverter()).setConverter(EclipseLinkConverter.OBJECT_TYPE_CONVERTER); + EclipseLinkObjectTypeConverter ormConverter = (EclipseLinkObjectTypeConverter) ((EclipseLinkConvert) ormBasicMapping.getConverter()).getConverter(); XmlObjectTypeConverter converterResource = ((XmlBasic) getXmlEntityMappings().getEntities().get(0).getAttributes().getBasics().get(0)).getObjectTypeConverter(); JavaBasicMapping javaBasicMapping = (JavaBasicMapping) ormPersistentType.getJavaPersistentType().getAttributeNamed("id").getMapping(); @@ -444,7 +444,7 @@ public class EclipseLinkOrmObjectTypeConverterTests //add conversion value to java context model, verify does not affect orm context model - EclipseLinkObjectTypeConverter javaConverter = (EclipseLinkObjectTypeConverter) ((JavaEclipseLinkConvert) javaBasicMapping.getSpecifiedConverter()).getConverter(); + EclipseLinkObjectTypeConverter javaConverter = (EclipseLinkObjectTypeConverter) ((JavaEclipseLinkConvert) javaBasicMapping.getConverter()).getConverter(); EclipseLinkConversionValue javaConversionValue = javaConverter.addConversionValue(); javaConversionValue.setDataValue("baz"); @@ -457,7 +457,7 @@ public class EclipseLinkOrmObjectTypeConverterTests ormPersistentType.removeSpecifiedAttribute(ormPersistentAttribute); ormPersistentAttribute = ormPersistentType.virtualAttributes().next(); ormBasicMapping = (OrmBasicMapping) ormPersistentAttribute.getMapping(); - ormConverter = (EclipseLinkObjectTypeConverter) ((EclipseLinkConvert) ormBasicMapping.getSpecifiedConverter()).getConverter(); + ormConverter = (EclipseLinkObjectTypeConverter) ((EclipseLinkConvert) ormBasicMapping.getConverter()).getConverter(); assertEquals(1, ormConverter.conversionValuesSize()); contextConversionValues = ormConverter.conversionValues(); @@ -471,16 +471,16 @@ public class EclipseLinkOrmObjectTypeConverterTests ormPersistentType.getMapping().setSpecifiedMetadataComplete(Boolean.TRUE); ormPersistentAttribute = ormPersistentType.virtualAttributes().next(); ormBasicMapping = (OrmBasicMapping) ormPersistentAttribute.getMapping(); - assertEquals(EclipseLinkConverter.NO_CONVERTER, ormBasicMapping.getSpecifiedConverter().getType()); + assertEquals(EclipseLinkConverter.NO_CONVERTER, ormBasicMapping.getConverter().getType()); } public void testModifyConversionValues() throws Exception { OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.addSpecifiedAttribute(MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY, "id"); OrmBasicMapping ormBasicMapping = (OrmBasicMapping) ormPersistentAttribute.getMapping(); - ormBasicMapping.setSpecifiedConverter(EclipseLinkConvert.ECLIPSE_LINK_CONVERTER); - ((EclipseLinkConvert) ormBasicMapping.getSpecifiedConverter()).setConverter(EclipseLinkConverter.OBJECT_TYPE_CONVERTER); - EclipseLinkObjectTypeConverter ormConverter = (EclipseLinkObjectTypeConverter) ((EclipseLinkConvert) ormBasicMapping.getSpecifiedConverter()).getConverter(); + ormBasicMapping.setConverter(EclipseLinkConvert.ECLIPSE_LINK_CONVERTER); + ((EclipseLinkConvert) ormBasicMapping.getConverter()).setConverter(EclipseLinkConverter.OBJECT_TYPE_CONVERTER); + EclipseLinkObjectTypeConverter ormConverter = (EclipseLinkObjectTypeConverter) ((EclipseLinkConvert) ormBasicMapping.getConverter()).getConverter(); XmlObjectTypeConverter converterResource = ((XmlBasic) getXmlEntityMappings().getEntities().get(0).getAttributes().getBasics().get(0)).getObjectTypeConverter(); assertEquals(0, ormConverter.conversionValuesSize()); @@ -559,7 +559,7 @@ public class EclipseLinkOrmObjectTypeConverterTests OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.getAttributeNamed("id"); OrmBasicMapping ormBasicMapping = (OrmBasicMapping) ormPersistentAttribute.getMapping(); - EclipseLinkConvert eclipseLinkConvert = (EclipseLinkConvert) ormBasicMapping.getSpecifiedConverter(); + EclipseLinkConvert eclipseLinkConvert = (EclipseLinkConvert) ormBasicMapping.getConverter(); EclipseLinkObjectTypeConverter converter = (EclipseLinkObjectTypeConverter) eclipseLinkConvert.getConverter(); assertEquals(1, converter.conversionValuesSize()); diff --git a/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmStructConverterTests.java b/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmStructConverterTests.java index 836e590f01..e9f20b6144 100644 --- a/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmStructConverterTests.java +++ b/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmStructConverterTests.java @@ -64,9 +64,9 @@ public class EclipseLinkOrmStructConverterTests OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.addSpecifiedAttribute(MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY, "id"); OrmBasicMapping ormBasicMapping = (OrmBasicMapping) ormPersistentAttribute.getMapping(); - ormBasicMapping.setSpecifiedConverter(EclipseLinkConvert.ECLIPSE_LINK_CONVERTER); - ((EclipseLinkConvert) ormBasicMapping.getSpecifiedConverter()).setConverter(EclipseLinkConverter.STRUCT_CONVERTER); - EclipseLinkStructConverter ormConverter = (EclipseLinkStructConverter) ((EclipseLinkConvert) ormBasicMapping.getSpecifiedConverter()).getConverter(); + ormBasicMapping.setConverter(EclipseLinkConvert.ECLIPSE_LINK_CONVERTER); + ((EclipseLinkConvert) ormBasicMapping.getConverter()).setConverter(EclipseLinkConverter.STRUCT_CONVERTER); + EclipseLinkStructConverter ormConverter = (EclipseLinkStructConverter) ((EclipseLinkConvert) ormBasicMapping.getConverter()).getConverter(); XmlStructConverter converterResource = ((XmlBasic) getXmlEntityMappings().getEntities().get(0).getAttributes().getBasics().get(0)).getStructConverter(); JavaBasicMapping javaBasicMapping = (JavaBasicMapping) ormPersistentType.getJavaPersistentType().getAttributeNamed("id").getMapping(); @@ -89,9 +89,9 @@ public class EclipseLinkOrmStructConverterTests ormPersistentAttribute = ormPersistentType.virtualAttributes().next(); ormBasicMapping = (OrmBasicMapping) ormPersistentAttribute.getMapping(); - ormConverter = (EclipseLinkStructConverter) ((EclipseLinkConvert) ormBasicMapping.getSpecifiedConverter()).getConverter(); + ormConverter = (EclipseLinkStructConverter) ((EclipseLinkConvert) ormBasicMapping.getConverter()).getConverter(); - EclipseLinkStructConverter javaConverter = ((EclipseLinkStructConverter) ((EclipseLinkConvert) javaBasicMapping.getSpecifiedConverter()).getConverter()); + EclipseLinkStructConverter javaConverter = ((EclipseLinkStructConverter) ((EclipseLinkConvert) javaBasicMapping.getConverter()).getConverter()); javaConverter.setConverterClass("bar"); assertEquals("bar", ormConverter.getConverterClass()); assertEquals("bar", javaConverter.getConverterClass()); @@ -100,7 +100,7 @@ public class EclipseLinkOrmStructConverterTests ormPersistentType.getMapping().setSpecifiedMetadataComplete(Boolean.TRUE); ormPersistentAttribute = ormPersistentType.virtualAttributes().next(); ormBasicMapping = (OrmBasicMapping) ormPersistentAttribute.getMapping(); - assertEquals(Converter.NO_CONVERTER, ormBasicMapping.getSpecifiedConverter().getType()); + assertEquals(Converter.NO_CONVERTER, ormBasicMapping.getConverter().getType()); assertEquals("bar", javaConverter.getConverterClass()); } @@ -108,9 +108,9 @@ public class EclipseLinkOrmStructConverterTests OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo"); OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.addSpecifiedAttribute(MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY, "basicMapping"); OrmBasicMapping ormBasicMapping = ((OrmBasicMapping) ormPersistentAttribute.getMapping()); - ormBasicMapping.setSpecifiedConverter(EclipseLinkConvert.ECLIPSE_LINK_CONVERTER); - ((EclipseLinkConvert) ormBasicMapping.getSpecifiedConverter()).setConverter(EclipseLinkConverter.STRUCT_CONVERTER); - EclipseLinkStructConverter ormConverter = (EclipseLinkStructConverter) ((EclipseLinkConvert) ormBasicMapping.getSpecifiedConverter()).getConverter(); + ormBasicMapping.setConverter(EclipseLinkConvert.ECLIPSE_LINK_CONVERTER); + ((EclipseLinkConvert) ormBasicMapping.getConverter()).setConverter(EclipseLinkConverter.STRUCT_CONVERTER); + EclipseLinkStructConverter ormConverter = (EclipseLinkStructConverter) ((EclipseLinkConvert) ormBasicMapping.getConverter()).getConverter(); XmlStructConverter converterResource = ((XmlBasic) getXmlEntityMappings().getEntities().get(0).getAttributes().getBasics().get(0)).getStructConverter(); assertEquals(null, ormConverter.getConverterClass()); @@ -132,9 +132,9 @@ public class EclipseLinkOrmStructConverterTests OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.addSpecifiedAttribute(MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY, "id"); OrmBasicMapping ormBasicMapping = ((OrmBasicMapping) ormPersistentAttribute.getMapping()); - ormBasicMapping.setSpecifiedConverter(EclipseLinkConvert.ECLIPSE_LINK_CONVERTER); - ((EclipseLinkConvert) ormBasicMapping.getSpecifiedConverter()).setConverter(EclipseLinkConverter.STRUCT_CONVERTER); - OrmEclipseLinkStructConverter ormConverter = (OrmEclipseLinkStructConverter) ((EclipseLinkConvert) ormBasicMapping.getSpecifiedConverter()).getConverter(); + ormBasicMapping.setConverter(EclipseLinkConvert.ECLIPSE_LINK_CONVERTER); + ((EclipseLinkConvert) ormBasicMapping.getConverter()).setConverter(EclipseLinkConverter.STRUCT_CONVERTER); + OrmEclipseLinkStructConverter ormConverter = (OrmEclipseLinkStructConverter) ((EclipseLinkConvert) ormBasicMapping.getConverter()).getConverter(); XmlStructConverter converterResource = ((XmlBasic) getXmlEntityMappings().getEntities().get(0).getAttributes().getBasics().get(0)).getStructConverter(); JavaBasicMapping javaBasicMapping = (JavaBasicMapping) ormPersistentType.getJavaPersistentType().getAttributeNamed("id").getMapping(); @@ -158,9 +158,9 @@ public class EclipseLinkOrmStructConverterTests ormPersistentAttribute = ormPersistentType.virtualAttributes().next(); ormBasicMapping = (OrmBasicMapping) ormPersistentAttribute.getMapping(); - ormConverter = (OrmEclipseLinkStructConverter) ((EclipseLinkConvert) ormBasicMapping.getSpecifiedConverter()).getConverter(); + ormConverter = (OrmEclipseLinkStructConverter) ((EclipseLinkConvert) ormBasicMapping.getConverter()).getConverter(); - EclipseLinkStructConverter javaConverter = ((EclipseLinkStructConverter) ((EclipseLinkConvert) javaBasicMapping.getSpecifiedConverter()).getConverter()); + EclipseLinkStructConverter javaConverter = ((EclipseLinkStructConverter) ((EclipseLinkConvert) javaBasicMapping.getConverter()).getConverter()); javaConverter.setName("bar"); assertEquals("bar", ormConverter.getName()); assertEquals("bar", javaConverter.getName()); @@ -171,7 +171,7 @@ public class EclipseLinkOrmStructConverterTests ormPersistentType.getMapping().setSpecifiedMetadataComplete(Boolean.TRUE); ormPersistentAttribute = ormPersistentType.virtualAttributes().next(); ormBasicMapping = (OrmBasicMapping) ormPersistentAttribute.getMapping(); - assertEquals(Converter.NO_CONVERTER, ormBasicMapping.getSpecifiedConverter().getType()); + assertEquals(Converter.NO_CONVERTER, ormBasicMapping.getConverter().getType()); assertEquals("bar", javaConverter.getName()); } @@ -179,9 +179,9 @@ public class EclipseLinkOrmStructConverterTests OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo"); OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.addSpecifiedAttribute(MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY, "basicMapping"); OrmBasicMapping ormBasicMapping = ((OrmBasicMapping) ormPersistentAttribute.getMapping()); - ormBasicMapping.setSpecifiedConverter(EclipseLinkConvert.ECLIPSE_LINK_CONVERTER); - ((EclipseLinkConvert) ormBasicMapping.getSpecifiedConverter()).setConverter(EclipseLinkConverter.STRUCT_CONVERTER); - OrmEclipseLinkStructConverter ormConverter = (OrmEclipseLinkStructConverter) ((EclipseLinkConvert) ormBasicMapping.getSpecifiedConverter()).getConverter(); + ormBasicMapping.setConverter(EclipseLinkConvert.ECLIPSE_LINK_CONVERTER); + ((EclipseLinkConvert) ormBasicMapping.getConverter()).setConverter(EclipseLinkConverter.STRUCT_CONVERTER); + OrmEclipseLinkStructConverter ormConverter = (OrmEclipseLinkStructConverter) ((EclipseLinkConvert) ormBasicMapping.getConverter()).getConverter(); XmlStructConverter converterResource = ((XmlBasic) getXmlEntityMappings().getEntities().get(0).getAttributes().getBasics().get(0)).getStructConverter(); assertEquals(null, ormConverter.getName()); diff --git a/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmTypeConverterTests.java b/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmTypeConverterTests.java index ec8a046476..14b2dd4f3e 100644 --- a/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmTypeConverterTests.java +++ b/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmTypeConverterTests.java @@ -64,9 +64,9 @@ public class EclipseLinkOrmTypeConverterTests OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.addSpecifiedAttribute(MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY, "id"); OrmBasicMapping ormBasicMapping = (OrmBasicMapping) ormPersistentAttribute.getMapping(); - ormBasicMapping.setSpecifiedConverter(EclipseLinkConvert.ECLIPSE_LINK_CONVERTER); - ((EclipseLinkConvert) ormBasicMapping.getSpecifiedConverter()).setConverter(EclipseLinkConverter.TYPE_CONVERTER); - EclipseLinkTypeConverter ormConverter = (EclipseLinkTypeConverter) ((EclipseLinkConvert) ormBasicMapping.getSpecifiedConverter()).getConverter(); + ormBasicMapping.setConverter(EclipseLinkConvert.ECLIPSE_LINK_CONVERTER); + ((EclipseLinkConvert) ormBasicMapping.getConverter()).setConverter(EclipseLinkConverter.TYPE_CONVERTER); + EclipseLinkTypeConverter ormConverter = (EclipseLinkTypeConverter) ((EclipseLinkConvert) ormBasicMapping.getConverter()).getConverter(); XmlTypeConverter converterResource = ((XmlBasic) getXmlEntityMappings().getEntities().get(0).getAttributes().getBasics().get(0)).getTypeConverter(); JavaBasicMapping javaBasicMapping = (JavaBasicMapping) ormPersistentType.getJavaPersistentType().getAttributeNamed("id").getMapping(); @@ -89,9 +89,9 @@ public class EclipseLinkOrmTypeConverterTests ormPersistentAttribute = ormPersistentType.virtualAttributes().next(); ormBasicMapping = (OrmBasicMapping) ormPersistentAttribute.getMapping(); - ormConverter = (EclipseLinkTypeConverter) ((EclipseLinkConvert) ormBasicMapping.getSpecifiedConverter()).getConverter(); + ormConverter = (EclipseLinkTypeConverter) ((EclipseLinkConvert) ormBasicMapping.getConverter()).getConverter(); - EclipseLinkTypeConverter javaConverter = ((EclipseLinkTypeConverter) ((EclipseLinkConvert) javaBasicMapping.getSpecifiedConverter()).getConverter()); + EclipseLinkTypeConverter javaConverter = ((EclipseLinkTypeConverter) ((EclipseLinkConvert) javaBasicMapping.getConverter()).getConverter()); javaConverter.setDataType("bar"); assertEquals("bar", ormConverter.getDataType()); assertEquals("bar", javaConverter.getDataType()); @@ -100,7 +100,7 @@ public class EclipseLinkOrmTypeConverterTests ormPersistentType.getMapping().setSpecifiedMetadataComplete(Boolean.TRUE); ormPersistentAttribute = ormPersistentType.virtualAttributes().next(); ormBasicMapping = (OrmBasicMapping) ormPersistentAttribute.getMapping(); - assertEquals(Converter.NO_CONVERTER, ormBasicMapping.getSpecifiedConverter().getType()); + assertEquals(Converter.NO_CONVERTER, ormBasicMapping.getConverter().getType()); assertEquals("bar", javaConverter.getDataType()); } @@ -108,9 +108,9 @@ public class EclipseLinkOrmTypeConverterTests OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo"); OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.addSpecifiedAttribute(MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY, "basicMapping"); OrmBasicMapping ormBasicMapping = ((OrmBasicMapping) ormPersistentAttribute.getMapping()); - ormBasicMapping.setSpecifiedConverter(EclipseLinkConvert.ECLIPSE_LINK_CONVERTER); - ((EclipseLinkConvert) ormBasicMapping.getSpecifiedConverter()).setConverter(EclipseLinkConverter.TYPE_CONVERTER); - EclipseLinkTypeConverter ormConverter = (EclipseLinkTypeConverter) ((EclipseLinkConvert) ormBasicMapping.getSpecifiedConverter()).getConverter(); + ormBasicMapping.setConverter(EclipseLinkConvert.ECLIPSE_LINK_CONVERTER); + ((EclipseLinkConvert) ormBasicMapping.getConverter()).setConverter(EclipseLinkConverter.TYPE_CONVERTER); + EclipseLinkTypeConverter ormConverter = (EclipseLinkTypeConverter) ((EclipseLinkConvert) ormBasicMapping.getConverter()).getConverter(); XmlTypeConverter converterResource = ((XmlBasic) getXmlEntityMappings().getEntities().get(0).getAttributes().getBasics().get(0)).getTypeConverter(); assertEquals(null, ormConverter.getDataType()); @@ -132,9 +132,9 @@ public class EclipseLinkOrmTypeConverterTests OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.addSpecifiedAttribute(MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY, "id"); OrmBasicMapping ormBasicMapping = (OrmBasicMapping) ormPersistentAttribute.getMapping(); - ormBasicMapping.setSpecifiedConverter(EclipseLinkConvert.ECLIPSE_LINK_CONVERTER); - ((EclipseLinkConvert) ormBasicMapping.getSpecifiedConverter()).setConverter(EclipseLinkConverter.TYPE_CONVERTER); - EclipseLinkTypeConverter ormConverter = (EclipseLinkTypeConverter) ((EclipseLinkConvert) ormBasicMapping.getSpecifiedConverter()).getConverter(); + ormBasicMapping.setConverter(EclipseLinkConvert.ECLIPSE_LINK_CONVERTER); + ((EclipseLinkConvert) ormBasicMapping.getConverter()).setConverter(EclipseLinkConverter.TYPE_CONVERTER); + EclipseLinkTypeConverter ormConverter = (EclipseLinkTypeConverter) ((EclipseLinkConvert) ormBasicMapping.getConverter()).getConverter(); XmlTypeConverter converterResource = ((XmlBasic) getXmlEntityMappings().getEntities().get(0).getAttributes().getBasics().get(0)).getTypeConverter(); JavaBasicMapping javaBasicMapping = (JavaBasicMapping) ormPersistentType.getJavaPersistentType().getAttributeNamed("id").getMapping(); @@ -157,9 +157,9 @@ public class EclipseLinkOrmTypeConverterTests ormPersistentAttribute = ormPersistentType.virtualAttributes().next(); ormBasicMapping = (OrmBasicMapping) ormPersistentAttribute.getMapping(); - ormConverter = (EclipseLinkTypeConverter) ((EclipseLinkConvert) ormBasicMapping.getSpecifiedConverter()).getConverter(); + ormConverter = (EclipseLinkTypeConverter) ((EclipseLinkConvert) ormBasicMapping.getConverter()).getConverter(); - EclipseLinkTypeConverter javaConverter = ((EclipseLinkTypeConverter) ((EclipseLinkConvert) javaBasicMapping.getSpecifiedConverter()).getConverter()); + EclipseLinkTypeConverter javaConverter = ((EclipseLinkTypeConverter) ((EclipseLinkConvert) javaBasicMapping.getConverter()).getConverter()); javaConverter.setObjectType("bar"); assertEquals("bar", ormConverter.getObjectType()); assertEquals("bar", javaConverter.getObjectType()); @@ -168,7 +168,7 @@ public class EclipseLinkOrmTypeConverterTests ormPersistentType.getMapping().setSpecifiedMetadataComplete(Boolean.TRUE); ormPersistentAttribute = ormPersistentType.virtualAttributes().next(); ormBasicMapping = (OrmBasicMapping) ormPersistentAttribute.getMapping(); - assertEquals(Converter.NO_CONVERTER, ormBasicMapping.getSpecifiedConverter().getType()); + assertEquals(Converter.NO_CONVERTER, ormBasicMapping.getConverter().getType()); assertEquals("bar", javaConverter.getObjectType()); } @@ -176,9 +176,9 @@ public class EclipseLinkOrmTypeConverterTests OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo"); OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.addSpecifiedAttribute(MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY, "basicMapping"); OrmBasicMapping ormBasicMapping = ((OrmBasicMapping) ormPersistentAttribute.getMapping()); - ormBasicMapping.setSpecifiedConverter(EclipseLinkConvert.ECLIPSE_LINK_CONVERTER); - ((EclipseLinkConvert) ormBasicMapping.getSpecifiedConverter()).setConverter(EclipseLinkConverter.TYPE_CONVERTER); - EclipseLinkTypeConverter ormConverter = (EclipseLinkTypeConverter) ((EclipseLinkConvert) ormBasicMapping.getSpecifiedConverter()).getConverter(); + ormBasicMapping.setConverter(EclipseLinkConvert.ECLIPSE_LINK_CONVERTER); + ((EclipseLinkConvert) ormBasicMapping.getConverter()).setConverter(EclipseLinkConverter.TYPE_CONVERTER); + EclipseLinkTypeConverter ormConverter = (EclipseLinkTypeConverter) ((EclipseLinkConvert) ormBasicMapping.getConverter()).getConverter(); XmlTypeConverter converterResource = ((XmlBasic) getXmlEntityMappings().getEntities().get(0).getAttributes().getBasics().get(0)).getTypeConverter(); assertEquals(null, ormConverter.getObjectType()); @@ -200,9 +200,9 @@ public class EclipseLinkOrmTypeConverterTests OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.addSpecifiedAttribute(MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY, "id"); OrmBasicMapping ormBasicMapping = ((OrmBasicMapping) ormPersistentAttribute.getMapping()); - ormBasicMapping.setSpecifiedConverter(EclipseLinkConvert.ECLIPSE_LINK_CONVERTER); - ((EclipseLinkConvert) ormBasicMapping.getSpecifiedConverter()).setConverter(EclipseLinkConverter.TYPE_CONVERTER); - OrmEclipseLinkTypeConverter ormConverter = (OrmEclipseLinkTypeConverter) ((EclipseLinkConvert) ormBasicMapping.getSpecifiedConverter()).getConverter(); + ormBasicMapping.setConverter(EclipseLinkConvert.ECLIPSE_LINK_CONVERTER); + ((EclipseLinkConvert) ormBasicMapping.getConverter()).setConverter(EclipseLinkConverter.TYPE_CONVERTER); + OrmEclipseLinkTypeConverter ormConverter = (OrmEclipseLinkTypeConverter) ((EclipseLinkConvert) ormBasicMapping.getConverter()).getConverter(); XmlTypeConverter converterResource = ((XmlBasic) getXmlEntityMappings().getEntities().get(0).getAttributes().getBasics().get(0)).getTypeConverter(); JavaBasicMapping javaBasicMapping = (JavaBasicMapping) ormPersistentType.getJavaPersistentType().getAttributeNamed("id").getMapping(); @@ -226,9 +226,9 @@ public class EclipseLinkOrmTypeConverterTests ormPersistentAttribute = ormPersistentType.virtualAttributes().next(); ormBasicMapping = (OrmBasicMapping) ormPersistentAttribute.getMapping(); - ormConverter = (OrmEclipseLinkTypeConverter) ((EclipseLinkConvert) ormBasicMapping.getSpecifiedConverter()).getConverter(); + ormConverter = (OrmEclipseLinkTypeConverter) ((EclipseLinkConvert) ormBasicMapping.getConverter()).getConverter(); - EclipseLinkTypeConverter javaConverter = ((EclipseLinkTypeConverter) ((EclipseLinkConvert) javaBasicMapping.getSpecifiedConverter()).getConverter()); + EclipseLinkTypeConverter javaConverter = ((EclipseLinkTypeConverter) ((EclipseLinkConvert) javaBasicMapping.getConverter()).getConverter()); javaConverter.setName("bar"); assertEquals("bar", ormConverter.getName()); assertEquals("bar", javaConverter.getName()); @@ -239,7 +239,7 @@ public class EclipseLinkOrmTypeConverterTests ormPersistentType.getMapping().setSpecifiedMetadataComplete(Boolean.TRUE); ormPersistentAttribute = ormPersistentType.virtualAttributes().next(); ormBasicMapping = (OrmBasicMapping) ormPersistentAttribute.getMapping(); - assertEquals(Converter.NO_CONVERTER, ormBasicMapping.getSpecifiedConverter().getType()); + assertEquals(Converter.NO_CONVERTER, ormBasicMapping.getConverter().getType()); assertEquals("bar", javaConverter.getName()); } @@ -247,9 +247,9 @@ public class EclipseLinkOrmTypeConverterTests OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "model.Foo"); OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.addSpecifiedAttribute(MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY, "basicMapping"); OrmBasicMapping ormBasicMapping = ((OrmBasicMapping) ormPersistentAttribute.getMapping()); - ormBasicMapping.setSpecifiedConverter(EclipseLinkConvert.ECLIPSE_LINK_CONVERTER); - ((EclipseLinkConvert) ormBasicMapping.getSpecifiedConverter()).setConverter(EclipseLinkConverter.TYPE_CONVERTER); - OrmEclipseLinkTypeConverter ormConverter = (OrmEclipseLinkTypeConverter) ((EclipseLinkConvert) ormBasicMapping.getSpecifiedConverter()).getConverter(); + ormBasicMapping.setConverter(EclipseLinkConvert.ECLIPSE_LINK_CONVERTER); + ((EclipseLinkConvert) ormBasicMapping.getConverter()).setConverter(EclipseLinkConverter.TYPE_CONVERTER); + OrmEclipseLinkTypeConverter ormConverter = (OrmEclipseLinkTypeConverter) ((EclipseLinkConvert) ormBasicMapping.getConverter()).getConverter(); XmlTypeConverter converterResource = ((XmlBasic) getXmlEntityMappings().getEntities().get(0).getAttributes().getBasics().get(0)).getTypeConverter(); assertEquals(null, ormConverter.getName()); diff --git a/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmVersionMappingTests.java b/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmVersionMappingTests.java index 2aac7ffd04..c1c89f2350 100644 --- a/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmVersionMappingTests.java +++ b/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmVersionMappingTests.java @@ -313,47 +313,47 @@ public class EclipseLinkOrmVersionMappingTests XmlVersion basicResource = (XmlVersion) getXmlEntityMappings().getEntities().get(0).getAttributes().getVersions().get(0); JavaVersionMapping javaVersionMapping = (JavaVersionMapping) ormPersistentType.getJavaPersistentType().getAttributeNamed("id").getMapping(); - assertEquals(Converter.NO_CONVERTER, ormVersionMapping.getSpecifiedConverter().getType()); + assertEquals(Converter.NO_CONVERTER, ormVersionMapping.getConverter().getType()); assertEquals(null, basicResource.getConvert()); //set lob in the resource model, verify context model updated basicResource.setConvert("myConvert"); - assertEquals(EclipseLinkConvert.ECLIPSE_LINK_CONVERTER, ormVersionMapping.getSpecifiedConverter().getType()); + assertEquals(EclipseLinkConvert.ECLIPSE_LINK_CONVERTER, ormVersionMapping.getConverter().getType()); assertEquals("myConvert", basicResource.getConvert()); //set lob to null in the resource model basicResource.setConvert(null); - assertEquals(Converter.NO_CONVERTER, ormVersionMapping.getSpecifiedConverter().getType()); + assertEquals(Converter.NO_CONVERTER, ormVersionMapping.getConverter().getType()); assertEquals(null, basicResource.getConvert()); - javaVersionMapping.setSpecifiedConverter(EclipseLinkConvert.ECLIPSE_LINK_CONVERTER); - ((EclipseLinkConvert) javaVersionMapping.getSpecifiedConverter()).setSpecifiedConverterName("foo"); + javaVersionMapping.setConverter(EclipseLinkConvert.ECLIPSE_LINK_CONVERTER); + ((EclipseLinkConvert) javaVersionMapping.getConverter()).setSpecifiedConverterName("foo"); - assertEquals(Converter.NO_CONVERTER, ormVersionMapping.getSpecifiedConverter().getType()); + assertEquals(Converter.NO_CONVERTER, ormVersionMapping.getConverter().getType()); assertEquals(null, basicResource.getConvert()); - assertEquals("foo", ((EclipseLinkConvert) javaVersionMapping.getSpecifiedConverter()).getSpecifiedConverterName()); + assertEquals("foo", ((EclipseLinkConvert) javaVersionMapping.getConverter()).getSpecifiedConverterName()); ormPersistentType.removeSpecifiedAttribute(ormPersistentAttribute); ormPersistentAttribute = ormPersistentType.virtualAttributes().next(); ormVersionMapping = (OrmVersionMapping) ormPersistentAttribute.getMapping(); - assertEquals(EclipseLinkConvert.ECLIPSE_LINK_CONVERTER, ormVersionMapping.getSpecifiedConverter().getType()); - assertEquals("foo", ((EclipseLinkConvert) ormVersionMapping.getSpecifiedConverter()).getSpecifiedConverterName()); + assertEquals(EclipseLinkConvert.ECLIPSE_LINK_CONVERTER, ormVersionMapping.getConverter().getType()); + assertEquals("foo", ((EclipseLinkConvert) ormVersionMapping.getConverter()).getSpecifiedConverterName()); assertEquals(null, basicResource.getConvert()); - assertEquals("foo", ((EclipseLinkConvert) javaVersionMapping.getSpecifiedConverter()).getSpecifiedConverterName()); + assertEquals("foo", ((EclipseLinkConvert) javaVersionMapping.getConverter()).getSpecifiedConverterName()); - ((EclipseLinkConvert) javaVersionMapping.getSpecifiedConverter()).setSpecifiedConverterName("bar"); - assertEquals(EclipseLinkConvert.ECLIPSE_LINK_CONVERTER, ormVersionMapping.getSpecifiedConverter().getType()); - assertEquals("bar", ((EclipseLinkConvert) ormVersionMapping.getSpecifiedConverter()).getSpecifiedConverterName()); + ((EclipseLinkConvert) javaVersionMapping.getConverter()).setSpecifiedConverterName("bar"); + assertEquals(EclipseLinkConvert.ECLIPSE_LINK_CONVERTER, ormVersionMapping.getConverter().getType()); + assertEquals("bar", ((EclipseLinkConvert) ormVersionMapping.getConverter()).getSpecifiedConverterName()); assertEquals(null, basicResource.getConvert()); - assertEquals("bar", ((EclipseLinkConvert) javaVersionMapping.getSpecifiedConverter()).getSpecifiedConverterName()); + assertEquals("bar", ((EclipseLinkConvert) javaVersionMapping.getConverter()).getSpecifiedConverterName()); - javaVersionMapping.setSpecifiedConverter(Converter.NO_CONVERTER); - assertEquals(Converter.NO_CONVERTER, ormVersionMapping.getSpecifiedConverter().getType()); + javaVersionMapping.setConverter(Converter.NO_CONVERTER); + assertEquals(Converter.NO_CONVERTER, ormVersionMapping.getConverter().getType()); assertEquals(null, basicResource.getConvert()); - assertEquals(Converter.NO_CONVERTER, javaVersionMapping.getSpecifiedConverter().getType()); + assertEquals(Converter.NO_CONVERTER, javaVersionMapping.getConverter().getType()); } public void testModifyConvert() throws Exception { @@ -362,27 +362,27 @@ public class EclipseLinkOrmVersionMappingTests OrmVersionMapping ormVersionMapping = (OrmVersionMapping) ormPersistentAttribute.getMapping(); XmlVersion basicResource = (XmlVersion) getXmlEntityMappings().getEntities().get(0).getAttributes().getVersions().get(0); - assertEquals(Converter.NO_CONVERTER, ormVersionMapping.getSpecifiedConverter().getType()); + assertEquals(Converter.NO_CONVERTER, ormVersionMapping.getConverter().getType()); assertEquals(null, basicResource.getConvert()); //set lob in the context model, verify resource model updated - ormVersionMapping.setSpecifiedConverter(EclipseLinkConvert.ECLIPSE_LINK_CONVERTER); + ormVersionMapping.setConverter(EclipseLinkConvert.ECLIPSE_LINK_CONVERTER); assertEquals("", basicResource.getConvert()); - assertEquals(EclipseLinkConvert.ECLIPSE_LINK_CONVERTER, ormVersionMapping.getSpecifiedConverter().getType()); + assertEquals(EclipseLinkConvert.ECLIPSE_LINK_CONVERTER, ormVersionMapping.getConverter().getType()); - ((EclipseLinkConvert) ormVersionMapping.getSpecifiedConverter()).setSpecifiedConverterName("bar"); + ((EclipseLinkConvert) ormVersionMapping.getConverter()).setSpecifiedConverterName("bar"); assertEquals("bar", basicResource.getConvert()); - assertEquals(EclipseLinkConvert.ECLIPSE_LINK_CONVERTER, ormVersionMapping.getSpecifiedConverter().getType()); - assertEquals("bar", ((EclipseLinkConvert) ormVersionMapping.getSpecifiedConverter()).getSpecifiedConverterName()); + assertEquals(EclipseLinkConvert.ECLIPSE_LINK_CONVERTER, ormVersionMapping.getConverter().getType()); + assertEquals("bar", ((EclipseLinkConvert) ormVersionMapping.getConverter()).getSpecifiedConverterName()); - ((EclipseLinkConvert) ormVersionMapping.getSpecifiedConverter()).setSpecifiedConverterName(null); + ((EclipseLinkConvert) ormVersionMapping.getConverter()).setSpecifiedConverterName(null); - assertEquals(Converter.NO_CONVERTER, ormVersionMapping.getSpecifiedConverter().getType()); + assertEquals(Converter.NO_CONVERTER, ormVersionMapping.getConverter().getType()); assertEquals(null, basicResource.getConvert()); //set lob to false in the context model - ormVersionMapping.setSpecifiedConverter(Converter.NO_CONVERTER); - assertEquals(Converter.NO_CONVERTER, ormVersionMapping.getSpecifiedConverter().getType()); + ormVersionMapping.setConverter(Converter.NO_CONVERTER); + assertEquals(Converter.NO_CONVERTER, ormVersionMapping.getConverter().getType()); assertEquals(null, basicResource.getConvert()); } } |