Log Message
Rename new method ignoreUnknownFields to ignoreUnknownElements.
Modified Paths
- trunk/xstream/src/java/com/thoughtworks/xstream/XStream.java
- trunk/xstream/src/test/com/thoughtworks/acceptance/ImplicitArrayTest.java
- trunk/xstream/src/test/com/thoughtworks/acceptance/ImplicitCollectionTest.java
- trunk/xstream/src/test/com/thoughtworks/acceptance/ImplicitMapTest.java
- trunk/xstream/src/test/com/thoughtworks/acceptance/OmitFieldsTest.java
- trunk/xstream-distribution/src/content/changes.html
Diff
Modified: trunk/xstream/src/java/com/thoughtworks/xstream/XStream.java (2049 => 2050)
--- trunk/xstream/src/java/com/thoughtworks/xstream/XStream.java 2013-03-19 02:13:13 UTC (rev 2049)
+++ trunk/xstream/src/java/com/thoughtworks/xstream/XStream.java 2013-03-19 02:21:43 UTC (rev 2050)
@@ -1783,31 +1783,31 @@
}
/**
- * Ignore all unknown fields.
+ * Ignore all unknown elements.
*
* @since upcoming
*/
- public void ignoreUnknownFields() {
- ignoreUnknownFields(IGNORE_ALL);
+ public void ignoreUnknownElements() {
+ ignoreUnknownElements(IGNORE_ALL);
}
/**
- * Add pattern for unknown field names to ignore.
+ * Add pattern for unknown element names to ignore.
*
* @param pattern the name pattern as regular _expression_
* @since upcoming
*/
- public void ignoreUnknownFields(String pattern) {
- ignoreUnknownFields(Pattern.compile(pattern));
+ public void ignoreUnknownElements(String pattern) {
+ ignoreUnknownElements(Pattern.compile(pattern));
}
/**
- * Add pattern for unknown field names to ignore.
+ * Add pattern for unknown element names to ignore.
*
* @param pattern the name pattern as regular _expression_
* @since upcoming
*/
- private void ignoreUnknownFields(Pattern pattern) {
+ private void ignoreUnknownElements(Pattern pattern) {
if (fieldAliasingMapper == null) {
throw new com.thoughtworks.xstream.InitializationException("No "
+ FieldAliasingMapper.class.getName()
Modified: trunk/xstream/src/test/com/thoughtworks/acceptance/ImplicitArrayTest.java (2049 => 2050)
--- trunk/xstream/src/test/com/thoughtworks/acceptance/ImplicitArrayTest.java 2013-03-19 02:13:13 UTC (rev 2049)
+++ trunk/xstream/src/test/com/thoughtworks/acceptance/ImplicitArrayTest.java 2013-03-19 02:21:43 UTC (rev 2050)
@@ -27,7 +27,7 @@
xstream.alias("farm", Farm.class);
xstream.alias("animal", Animal.class);
xstream.alias("MEGA-farm", MegaFarm.class);
- xstream.ignoreUnknownFields();
+ xstream.ignoreUnknownElements();
}
public static class Farm extends StandardObject {
Modified: trunk/xstream/src/test/com/thoughtworks/acceptance/ImplicitCollectionTest.java (2049 => 2050)
--- trunk/xstream/src/test/com/thoughtworks/acceptance/ImplicitCollectionTest.java 2013-03-19 02:13:13 UTC (rev 2049)
+++ trunk/xstream/src/test/com/thoughtworks/acceptance/ImplicitCollectionTest.java 2013-03-19 02:21:43 UTC (rev 2050)
@@ -57,7 +57,7 @@
xstream.alias("room", Room.class);
xstream.alias("house", House.class);
xstream.alias("person", Person.class);
- xstream.ignoreUnknownFields();
+ xstream.ignoreUnknownElements();
}
public void testWithout() {
Modified: trunk/xstream/src/test/com/thoughtworks/acceptance/ImplicitMapTest.java (2049 => 2050)
--- trunk/xstream/src/test/com/thoughtworks/acceptance/ImplicitMapTest.java 2013-03-19 02:13:13 UTC (rev 2049)
+++ trunk/xstream/src/test/com/thoughtworks/acceptance/ImplicitMapTest.java 2013-03-19 02:21:43 UTC (rev 2050)
@@ -63,7 +63,7 @@
xstream.alias("software", Software.class);
xstream.alias("hardware", Hardware.class);
xstream.alias("product", Product.class);
- xstream.ignoreUnknownFields();
+ xstream.ignoreUnknownElements();
}
public void testWithout() {
Modified: trunk/xstream/src/test/com/thoughtworks/acceptance/OmitFieldsTest.java (2049 => 2050)
--- trunk/xstream/src/test/com/thoughtworks/acceptance/OmitFieldsTest.java 2013-03-19 02:13:13 UTC (rev 2049)
+++ trunk/xstream/src/test/com/thoughtworks/acceptance/OmitFieldsTest.java 2013-03-19 02:21:43 UTC (rev 2050)
@@ -309,7 +309,7 @@
assertEquals("d", out.derived);
}
- public void testIgnoreUnknownFieldsMatchingPattern() {
+ public void testIgnoreUnknownElementsMatchingPattern() {
String actualXml = ""
+ "<thing>\n"
+ " <sometimesIgnore>foo</sometimesIgnore>\n"
@@ -320,7 +320,7 @@
xstream.alias("thing", DerivedThing.class);
xstream.omitField(Thing.class, "sometimesIgnore");
- xstream.ignoreUnknownFields("foo.*");
+ xstream.ignoreUnknownElements("foo.*");
DerivedThing out = (DerivedThing)xstream.fromXML(actualXml);
assertEquals(null, out.alwaysIgnore);
Modified: trunk/xstream-distribution/src/content/changes.html (2049 => 2050)
--- trunk/xstream-distribution/src/content/changes.html 2013-03-19 02:13:13 UTC (rev 2049)
+++ trunk/xstream-distribution/src/content/changes.html 2013-03-19 02:21:43 UTC (rev 2050)
@@ -45,7 +45,7 @@
<h2>Major changes</h2>
<ul>
- <li>JIRA:XSTR-691: Allow unknown XML elements to be ignored using new method XStream.ignoreUnknownFields.</li>
+ <li>JIRA:XSTR-691: Allow unknown XML elements to be ignored using new method XStream.ignoreUnknownElements.</li>
<li>JIRA:XSTR-723: XStream will now detect a working enhanced mode dynamically instead using lists of known
vendors. This allows enhanced support for JamVM if it is bundled with OpenJDK. It will currently fail on a
runtime based on GNU Classpath (at least up to version 0.98).</li>
To unsubscribe from this list please visit:
