Log Message
Remove Mapper stuff deprecated in 1.2.x.
Modified Paths
- trunk/xstream/src/java/com/thoughtworks/xstream/mapper/Mapper.java
- trunk/xstream/src/java/com/thoughtworks/xstream/mapper/MapperWrapper.java
Diff
Modified: trunk/xstream/src/java/com/thoughtworks/xstream/mapper/Mapper.java (2194 => 2195)
--- trunk/xstream/src/java/com/thoughtworks/xstream/mapper/Mapper.java 2013-12-22 00:00:05 UTC (rev 2194)
+++ trunk/xstream/src/java/com/thoughtworks/xstream/mapper/Mapper.java 2013-12-22 00:02:21 UTC (rev 2195)
@@ -102,21 +102,6 @@
String getKeyFieldName();
}
- /**
- * @deprecated As of 1.3, use {@link #getConverterFromItemType(String, Class, Class)}
- */
- SingleValueConverter getConverterFromItemType(String fieldName, Class type);
-
- /**
- * @deprecated As of 1.3, use {@link #getConverterFromItemType(String, Class, Class)}
- */
- SingleValueConverter getConverterFromItemType(Class type);
-
- /**
- * @deprecated As of 1.3, use {@link #getConverterFromAttribute(Class, String, Class)}
- */
- SingleValueConverter getConverterFromAttribute(String name);
-
Converter getLocalConverter(Class definedIn, String fieldName);
Mapper lookupMapperOfType(Class type);
@@ -134,28 +119,6 @@
SingleValueConverter getConverterFromItemType(String fieldName, Class type, Class definedIn);
/**
- * Returns an alias for a single field defined in an specific type.
- *
- * @param definedIn the type where the field was defined
- * @param fieldName the field name
- * @return the alias for this field or its own name if no alias was defined
- * @since 1.2.2
- * @deprecated As of 1.3, use combination of {@link #serializedMember(Class, String)} and {@link #getConverterFromItemType(String, Class, Class)}
- */
- String aliasForAttribute(Class definedIn, String fieldName);
-
- /**
- * Returns the field name for an aliased attribute.
- *
- * @param definedIn the type where the field was defined
- * @param alias the alias
- * @return the original attribute name
- * @since 1.2.2
- * @deprecated As of 1.3, use combination of {@link #realMember(Class, String)} and {@link #getConverterFromItemType(String, Class, Class)}
- */
- String attributeForAlias(Class definedIn, String alias);
-
- /**
* Returns which converter to use for an specific attribute in a type.
*
* @param definedIn the field's parent
Modified: trunk/xstream/src/java/com/thoughtworks/xstream/mapper/MapperWrapper.java (2194 => 2195)
--- trunk/xstream/src/java/com/thoughtworks/xstream/mapper/MapperWrapper.java 2013-12-22 00:00:05 UTC (rev 2194)
+++ trunk/xstream/src/java/com/thoughtworks/xstream/mapper/MapperWrapper.java 2013-12-22 00:02:21 UTC (rev 2195)
@@ -74,27 +74,6 @@
return wrapped.shouldSerializeMember(definedIn, fieldName);
}
- /**
- * @deprecated As of 1.3, use {@link #getConverterFromItemType(String, Class, Class)}
- */
- public SingleValueConverter getConverterFromItemType(String fieldName, Class type) {
- return wrapped.getConverterFromItemType(fieldName, type);
- }
-
- /**
- * @deprecated As of 1.3, use {@link #getConverterFromItemType(String, Class, Class)}
- */
- public SingleValueConverter getConverterFromItemType(Class type) {
- return wrapped.getConverterFromItemType(type);
- }
-
- /**
- * @deprecated As of 1.3, use {@link #getConverterFromAttribute(Class, String, Class)}
- */
- public SingleValueConverter getConverterFromAttribute(String name) {
- return wrapped.getConverterFromAttribute(name);
- }
-
public Converter getLocalConverter(Class definedIn, String fieldName) {
return wrapped.getLocalConverter(definedIn, fieldName);
}
@@ -108,20 +87,6 @@
}
/**
- * @deprecated As of 1.3, use combination of {@link #serializedMember(Class, String)} and {@link #getConverterFromItemType(String, Class, Class)}
- */
- public String aliasForAttribute(Class definedIn, String fieldName) {
- return wrapped.aliasForAttribute(definedIn, fieldName);
- }
-
- /**
- * @deprecated As of 1.3, use combination of {@link #realMember(Class, String)} and {@link #getConverterFromItemType(String, Class, Class)}
- */
- public String attributeForAlias(Class definedIn, String alias) {
- return wrapped.attributeForAlias(definedIn, alias);
- }
-
- /**
* @deprecated As of 1.3.1, use {@link #getConverterFromAttribute(Class, String, Class)}
*/
public SingleValueConverter getConverterFromAttribute(Class type, String attribute) {
To unsubscribe from this list please visit:
