diff --git a/build.gradle b/build.gradle
index d760fe264f..65d166ad42 100644
--- a/build.gradle
+++ b/build.gradle
@@ -162,13 +162,14 @@ configure(allprojects) { project ->
 			dependency "commons-fileupload:commons-fileupload:1.4"
 			dependency "org.synchronoss.cloud:nio-multipart-parser:1.1.0"
 
-			dependency("dom4j:dom4j:1.6.1") {
-				exclude group: "xml-apis", name: "xml-apis"
+			dependency("org.dom4j:dom4j:2.1.3") {
+				exclude group: "jaxen", name: "jaxen"
+				exclude group: "net.java.dev.msv", name: "xsdlib"
+				exclude group: "pull-parser", name: "pull-parser"
+				exclude group: "xpp3", name: "xpp3"
 			}
-			dependency("jaxen:jaxen:1.1.1") {
-				exclude group: "xml-apis", name: "xml-apis"
-				exclude group: "xom", name: "xom"
-				exclude group: "xerces", name: "xercesImpl"
+			dependency("jaxen:jaxen:1.2.0") {
+				exclude group: "dom4j", name: "dom4j"
 			}
 
 			dependency("junit:junit:4.13") {
diff --git a/spring-webmvc/spring-webmvc.gradle b/spring-webmvc/spring-webmvc.gradle
index 61b1d4dbbd..8e573cf4b3 100644
--- a/spring-webmvc/spring-webmvc.gradle
+++ b/spring-webmvc/spring-webmvc.gradle
@@ -52,7 +52,7 @@ dependencies {
 	testCompile("commons-io:commons-io")
 	testCompile("joda-time:joda-time")
 	testCompile("org.mozilla:rhino")
-	testCompile("dom4j:dom4j")
+	testCompile("org.dom4j:dom4j")
 	testCompile("jaxen:jaxen")
 	testCompile("org.xmlunit:xmlunit-assertj")
 	testCompile("org.xmlunit:xmlunit-matchers")
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/CheckboxTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/CheckboxTagTests.java
index a951289796..164a415826 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/CheckboxTagTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/CheckboxTagTests.java
@@ -81,7 +81,7 @@ public class CheckboxTagTests extends AbstractFormTagTests {
 		Document document = reader.read(new StringReader(output));
 		Element rootElement = document.getRootElement();
 		assertThat(rootElement.elements().size()).as("Both tag and hidden element not rendered").isEqualTo(2);
-		Element checkboxElement = (Element) rootElement.elements().get(0);
+		Element checkboxElement = rootElement.elements().get(0);
 		assertThat(checkboxElement.getName()).isEqualTo("input");
 		assertThat(checkboxElement.attribute("type").getValue()).isEqualTo("checkbox");
 		assertThat(checkboxElement.attribute("id").getValue()).isEqualTo("someBoolean1");
@@ -104,7 +104,7 @@ public class CheckboxTagTests extends AbstractFormTagTests {
 		Document document = reader.read(new StringReader(output));
 		Element rootElement = document.getRootElement();
 		assertThat(rootElement.elements().size()).as("Both tag and hidden element not rendered").isEqualTo(2);
-		Element checkboxElement = (Element) rootElement.elements().get(0);
+		Element checkboxElement = rootElement.elements().get(0);
 		assertThat(checkboxElement.getName()).isEqualTo("input");
 		assertThat(checkboxElement.attribute("type").getValue()).isEqualTo("checkbox");
 		assertThat(checkboxElement.attribute("id").getValue()).isEqualTo("someMapkey1");
@@ -133,7 +133,7 @@ public class CheckboxTagTests extends AbstractFormTagTests {
 		Document document = reader.read(new StringReader(output));
 		Element rootElement = document.getRootElement();
 		assertThat(rootElement.elements().size()).as("Both tag and hidden element not rendered").isEqualTo(2);
-		Element checkboxElement = (Element) rootElement.elements().get(0);
+		Element checkboxElement = rootElement.elements().get(0);
 		assertThat(checkboxElement.getName()).isEqualTo("input");
 		assertThat(checkboxElement.attribute("type").getValue()).isEqualTo("checkbox");
 		assertThat(checkboxElement.attribute("name").getValue()).isEqualTo("someBoolean");
@@ -155,7 +155,7 @@ public class CheckboxTagTests extends AbstractFormTagTests {
 
 		SAXReader reader = new SAXReader();
 		Document document = reader.read(new StringReader(output));
-		Element checkboxElement = (Element) document.getRootElement().elements().get(0);
+		Element checkboxElement = document.getRootElement().elements().get(0);
 		assertThat(checkboxElement.getName()).isEqualTo("input");
 		assertThat(checkboxElement.attribute("type").getValue()).isEqualTo("checkbox");
 		assertThat(checkboxElement.attribute("name").getValue()).isEqualTo("jedi");
@@ -177,7 +177,7 @@ public class CheckboxTagTests extends AbstractFormTagTests {
 
 		SAXReader reader = new SAXReader();
 		Document document = reader.read(new StringReader(output));
-		Element checkboxElement = (Element) document.getRootElement().elements().get(0);
+		Element checkboxElement = document.getRootElement().elements().get(0);
 		assertThat(checkboxElement.getName()).isEqualTo("input");
 		assertThat(checkboxElement.attribute("type").getValue()).isEqualTo("checkbox");
 		assertThat(checkboxElement.attribute("name").getValue()).isEqualTo("someBoolean");
@@ -199,7 +199,7 @@ public class CheckboxTagTests extends AbstractFormTagTests {
 
 		SAXReader reader = new SAXReader();
 		Document document = reader.read(new StringReader(output));
-		Element checkboxElement = (Element) document.getRootElement().elements().get(0);
+		Element checkboxElement = document.getRootElement().elements().get(0);
 		assertThat(checkboxElement.getName()).isEqualTo("input");
 		assertThat(checkboxElement.attribute("type").getValue()).isEqualTo("checkbox");
 		assertThat(checkboxElement.attribute("name").getValue()).isEqualTo("jedi");
@@ -222,7 +222,7 @@ public class CheckboxTagTests extends AbstractFormTagTests {
 
 		SAXReader reader = new SAXReader();
 		Document document = reader.read(new StringReader(output));
-		Element checkboxElement = (Element) document.getRootElement().elements().get(0);
+		Element checkboxElement = document.getRootElement().elements().get(0);
 		assertThat(checkboxElement.getName()).isEqualTo("input");
 		assertThat(checkboxElement.attribute("type").getValue()).isEqualTo("checkbox");
 		assertThat(checkboxElement.attribute("name").getValue()).isEqualTo("name");
@@ -245,7 +245,7 @@ public class CheckboxTagTests extends AbstractFormTagTests {
 
 		SAXReader reader = new SAXReader();
 		Document document = reader.read(new StringReader(output));
-		Element checkboxElement = (Element) document.getRootElement().elements().get(0);
+		Element checkboxElement = document.getRootElement().elements().get(0);
 		assertThat(checkboxElement.getName()).isEqualTo("input");
 		assertThat(checkboxElement.attribute("type").getValue()).isEqualTo("checkbox");
 		assertThat(checkboxElement.attribute("name").getValue()).isEqualTo("name");
@@ -272,7 +272,7 @@ public class CheckboxTagTests extends AbstractFormTagTests {
 
 		SAXReader reader = new SAXReader();
 		Document document = reader.read(new StringReader(output));
-		Element checkboxElement = (Element) document.getRootElement().elements().get(0);
+		Element checkboxElement = document.getRootElement().elements().get(0);
 		assertThat(checkboxElement.getName()).isEqualTo("input");
 		assertThat(checkboxElement.attribute("type").getValue()).isEqualTo("checkbox");
 		assertThat(checkboxElement.attribute("name").getValue()).isEqualTo("name");
@@ -294,7 +294,7 @@ public class CheckboxTagTests extends AbstractFormTagTests {
 
 		SAXReader reader = new SAXReader();
 		Document document = reader.read(new StringReader(output));
-		Element checkboxElement = (Element) document.getRootElement().elements().get(0);
+		Element checkboxElement = document.getRootElement().elements().get(0);
 		assertThat(checkboxElement.getName()).isEqualTo("input");
 		assertThat(checkboxElement.attribute("type").getValue()).isEqualTo("checkbox");
 		assertThat(checkboxElement.attribute("name").getValue()).isEqualTo("stringArray");
@@ -316,7 +316,7 @@ public class CheckboxTagTests extends AbstractFormTagTests {
 
 		SAXReader reader = new SAXReader();
 		Document document = reader.read(new StringReader(output));
-		Element checkboxElement = (Element) document.getRootElement().elements().get(0);
+		Element checkboxElement = document.getRootElement().elements().get(0);
 		assertThat(checkboxElement.getName()).isEqualTo("input");
 		assertThat(checkboxElement.attribute("type").getValue()).isEqualTo("checkbox");
 		assertThat(checkboxElement.attribute("name").getValue()).isEqualTo("stringArray");
@@ -344,7 +344,7 @@ public class CheckboxTagTests extends AbstractFormTagTests {
 
 		SAXReader reader = new SAXReader();
 		Document document = reader.read(new StringReader(output));
-		Element checkboxElement = (Element) document.getRootElement().elements().get(0);
+		Element checkboxElement = document.getRootElement().elements().get(0);
 		assertThat(checkboxElement.getName()).isEqualTo("input");
 		assertThat(checkboxElement.attribute("type").getValue()).isEqualTo("checkbox");
 		assertThat(checkboxElement.attribute("name").getValue()).isEqualTo("stringArray");
@@ -372,7 +372,7 @@ public class CheckboxTagTests extends AbstractFormTagTests {
 
 		SAXReader reader = new SAXReader();
 		Document document = reader.read(new StringReader(output));
-		Element checkboxElement = (Element) document.getRootElement().elements().get(0);
+		Element checkboxElement = document.getRootElement().elements().get(0);
 		assertThat(checkboxElement.getName()).isEqualTo("input");
 		assertThat(checkboxElement.attribute("type").getValue()).isEqualTo("checkbox");
 		assertThat(checkboxElement.attribute("name").getValue()).isEqualTo("someIntegerArray");
@@ -394,7 +394,7 @@ public class CheckboxTagTests extends AbstractFormTagTests {
 
 		SAXReader reader = new SAXReader();
 		Document document = reader.read(new StringReader(output));
-		Element checkboxElement = (Element) document.getRootElement().elements().get(0);
+		Element checkboxElement = document.getRootElement().elements().get(0);
 		assertThat(checkboxElement.getName()).isEqualTo("input");
 		assertThat(checkboxElement.attribute("type").getValue()).isEqualTo("checkbox");
 		assertThat(checkboxElement.attribute("name").getValue()).isEqualTo("someList");
@@ -417,7 +417,7 @@ public class CheckboxTagTests extends AbstractFormTagTests {
 
 		SAXReader reader = new SAXReader();
 		Document document = reader.read(new StringReader(output));
-		Element checkboxElement = (Element) document.getRootElement().elements().get(0);
+		Element checkboxElement = document.getRootElement().elements().get(0);
 		assertThat(checkboxElement.getName()).isEqualTo("input");
 		assertThat(checkboxElement.attribute("type").getValue()).isEqualTo("checkbox");
 		assertThat(checkboxElement.attribute("name").getValue()).isEqualTo("date");
@@ -441,7 +441,7 @@ public class CheckboxTagTests extends AbstractFormTagTests {
 
 		SAXReader reader = new SAXReader();
 		Document document = reader.read(new StringReader(output));
-		Element checkboxElement = (Element) document.getRootElement().elements().get(0);
+		Element checkboxElement = document.getRootElement().elements().get(0);
 		assertThat(checkboxElement.getName()).isEqualTo("input");
 		assertThat(checkboxElement.attribute("type").getValue()).isEqualTo("checkbox");
 		assertThat(checkboxElement.attribute("name").getValue()).isEqualTo("date");
@@ -464,7 +464,7 @@ public class CheckboxTagTests extends AbstractFormTagTests {
 
 		SAXReader reader = new SAXReader();
 		Document document = reader.read(new StringReader(output));
-		Element checkboxElement = (Element) document.getRootElement().elements().get(0);
+		Element checkboxElement = document.getRootElement().elements().get(0);
 		assertThat(checkboxElement.getName()).isEqualTo("input");
 		assertThat(checkboxElement.attribute("type").getValue()).isEqualTo("checkbox");
 		assertThat(checkboxElement.attribute("name").getValue()).isEqualTo("otherColours");
@@ -486,7 +486,7 @@ public class CheckboxTagTests extends AbstractFormTagTests {
 
 		SAXReader reader = new SAXReader();
 		Document document = reader.read(new StringReader(output));
-		Element checkboxElement = (Element) document.getRootElement().elements().get(0);
+		Element checkboxElement = document.getRootElement().elements().get(0);
 		assertThat(checkboxElement.getName()).isEqualTo("input");
 		assertThat(checkboxElement.attribute("type").getValue()).isEqualTo("checkbox");
 		assertThat(checkboxElement.attribute("name").getValue()).isEqualTo("otherColours");
@@ -508,7 +508,7 @@ public class CheckboxTagTests extends AbstractFormTagTests {
 
 		SAXReader reader = new SAXReader();
 		Document document = reader.read(new StringReader(output));
-		Element checkboxElement = (Element) document.getRootElement().elements().get(0);
+		Element checkboxElement = document.getRootElement().elements().get(0);
 		assertThat(checkboxElement.getName()).isEqualTo("input");
 		assertThat(checkboxElement.attribute("type").getValue()).isEqualTo("checkbox");
 		assertThat(checkboxElement.attribute("name").getValue()).isEqualTo("pets");
@@ -530,7 +530,7 @@ public class CheckboxTagTests extends AbstractFormTagTests {
 
 		SAXReader reader = new SAXReader();
 		Document document = reader.read(new StringReader(output));
-		Element checkboxElement = (Element) document.getRootElement().elements().get(0);
+		Element checkboxElement = document.getRootElement().elements().get(0);
 		assertThat(checkboxElement.getName()).isEqualTo("input");
 		assertThat(checkboxElement.attribute("type").getValue()).isEqualTo("checkbox");
 		assertThat(checkboxElement.attribute("name").getValue()).isEqualTo("pets");
@@ -552,7 +552,7 @@ public class CheckboxTagTests extends AbstractFormTagTests {
 
 		SAXReader reader = new SAXReader();
 		Document document = reader.read(new StringReader(output));
-		Element checkboxElement = (Element) document.getRootElement().elements().get(0);
+		Element checkboxElement = document.getRootElement().elements().get(0);
 		assertThat(checkboxElement.getName()).isEqualTo("input");
 		assertThat(checkboxElement.attribute("type").getValue()).isEqualTo("checkbox");
 		assertThat(checkboxElement.attribute("name").getValue()).isEqualTo("pets");
@@ -575,7 +575,7 @@ public class CheckboxTagTests extends AbstractFormTagTests {
 
 		SAXReader reader = new SAXReader();
 		Document document = reader.read(new StringReader(output));
-		Element checkboxElement = (Element) document.getRootElement().elements().get(0);
+		Element checkboxElement = document.getRootElement().elements().get(0);
 		assertThat(checkboxElement.getName()).isEqualTo("input");
 		assertThat(checkboxElement.attribute("type").getValue()).isEqualTo("checkbox");
 		assertThat(checkboxElement.attribute("name").getValue()).isEqualTo("pets");
@@ -603,7 +603,7 @@ public class CheckboxTagTests extends AbstractFormTagTests {
 
 		SAXReader reader = new SAXReader();
 		Document document = reader.read(new StringReader(output));
-		Element checkboxElement = (Element) document.getRootElement().elements().get(0);
+		Element checkboxElement = document.getRootElement().elements().get(0);
 		assertThat(checkboxElement.getName()).isEqualTo("input");
 		assertThat(checkboxElement.attribute("type").getValue()).isEqualTo("checkbox");
 		assertThat(checkboxElement.attribute("name").getValue()).isEqualTo("pets");
@@ -633,7 +633,7 @@ public class CheckboxTagTests extends AbstractFormTagTests {
 		Document document = reader.read(new StringReader(output));
 		Element rootElement = document.getRootElement();
 		assertThat(rootElement.elements().size()).as("Both tag and hidden element rendered incorrectly").isEqualTo(1);
-		Element checkboxElement = (Element) rootElement.elements().get(0);
+		Element checkboxElement = rootElement.elements().get(0);
 		assertThat(checkboxElement.getName()).isEqualTo("input");
 		assertThat(checkboxElement.attribute("type").getValue()).isEqualTo("checkbox");
 		assertThat(checkboxElement.attribute("name").getValue()).isEqualTo("someBoolean");
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/CheckboxesTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/CheckboxesTagTests.java
index 52600f060a..c7455c7f85 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/CheckboxesTagTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/CheckboxesTagTests.java
@@ -89,24 +89,24 @@ public class CheckboxesTagTests extends AbstractFormTagTests {
 		output = "<doc>" + output + "</doc>";
 		SAXReader reader = new SAXReader();
 		Document document = reader.read(new StringReader(output));
-		Element spanElement1 = (Element) document.getRootElement().elements().get(0);
-		Element checkboxElement1 = (Element) spanElement1.elements().get(0);
+		Element spanElement1 = document.getRootElement().elements().get(0);
+		Element checkboxElement1 = spanElement1.elements().get(0);
 		assertThat(checkboxElement1.getName()).isEqualTo("input");
 		assertThat(checkboxElement1.attribute("type").getValue()).isEqualTo("checkbox");
 		assertThat(checkboxElement1.attribute("name").getValue()).isEqualTo("stringArray");
 		assertThat(checkboxElement1.attribute("checked").getValue()).isEqualTo("checked");
 		assertThat(checkboxElement1.attribute("value").getValue()).isEqualTo("foo");
 		assertThat(spanElement1.getStringValue()).isEqualTo("foo");
-		Element spanElement2 = (Element) document.getRootElement().elements().get(1);
-		Element checkboxElement2 = (Element) spanElement2.elements().get(0);
+		Element spanElement2 = document.getRootElement().elements().get(1);
+		Element checkboxElement2 = spanElement2.elements().get(0);
 		assertThat(checkboxElement2.getName()).isEqualTo("input");
 		assertThat(checkboxElement2.attribute("type").getValue()).isEqualTo("checkbox");
 		assertThat(checkboxElement2.attribute("name").getValue()).isEqualTo("stringArray");
 		assertThat(checkboxElement2.attribute("checked").getValue()).isEqualTo("checked");
 		assertThat(checkboxElement2.attribute("value").getValue()).isEqualTo("bar");
 		assertThat(spanElement2.getStringValue()).isEqualTo("bar");
-		Element spanElement3 = (Element) document.getRootElement().elements().get(2);
-		Element checkboxElement3 = (Element) spanElement3.elements().get(0);
+		Element spanElement3 = document.getRootElement().elements().get(2);
+		Element checkboxElement3 = spanElement3.elements().get(0);
 		assertThat(checkboxElement3.getName()).isEqualTo("input");
 		assertThat(checkboxElement3.attribute("type").getValue()).isEqualTo("checkbox");
 		assertThat(checkboxElement3.attribute("name").getValue()).isEqualTo("stringArray");
@@ -134,8 +134,8 @@ public class CheckboxesTagTests extends AbstractFormTagTests {
 		output = "<doc>" + output + "</doc>";
 		SAXReader reader = new SAXReader();
 		Document document = reader.read(new StringReader(output));
-		Element spanElement1 = (Element) document.getRootElement().elements().get(0);
-		Element checkboxElement1 = (Element) spanElement1.elements().get(0);
+		Element spanElement1 = document.getRootElement().elements().get(0);
+		Element checkboxElement1 = spanElement1.elements().get(0);
 		assertThat(checkboxElement1.getName()).isEqualTo("input");
 		assertThat(checkboxElement1.attribute("type").getValue()).isEqualTo("checkbox");
 		assertThat(checkboxElement1.attribute("name").getValue()).isEqualTo("stringArray");
@@ -145,8 +145,8 @@ public class CheckboxesTagTests extends AbstractFormTagTests {
 		assertThat(checkboxElement1.attribute(dynamicAttribute1).getValue()).isEqualTo(dynamicAttribute1);
 		assertThat(checkboxElement1.attribute(dynamicAttribute2).getValue()).isEqualTo(dynamicAttribute2);
 
-		Element spanElement2 = (Element) document.getRootElement().elements().get(1);
-		Element checkboxElement2 = (Element) spanElement2.elements().get(0);
+		Element spanElement2 = document.getRootElement().elements().get(1);
+		Element checkboxElement2 = spanElement2.elements().get(0);
 		assertThat(checkboxElement2.getName()).isEqualTo("input");
 		assertThat(checkboxElement2.attribute("type").getValue()).isEqualTo("checkbox");
 		assertThat(checkboxElement2.attribute("name").getValue()).isEqualTo("stringArray");
@@ -156,8 +156,8 @@ public class CheckboxesTagTests extends AbstractFormTagTests {
 		assertThat(checkboxElement2.attribute(dynamicAttribute1).getValue()).isEqualTo(dynamicAttribute1);
 		assertThat(checkboxElement2.attribute(dynamicAttribute2).getValue()).isEqualTo(dynamicAttribute2);
 
-		Element spanElement3 = (Element) document.getRootElement().elements().get(2);
-		Element checkboxElement3 = (Element) spanElement3.elements().get(0);
+		Element spanElement3 = document.getRootElement().elements().get(2);
+		Element checkboxElement3 = spanElement3.elements().get(0);
 		assertThat(checkboxElement3.getName()).isEqualTo("input");
 		assertThat(checkboxElement3.attribute("type").getValue()).isEqualTo("checkbox");
 		assertThat(checkboxElement3.attribute("name").getValue()).isEqualTo("stringArray");
@@ -166,7 +166,6 @@ public class CheckboxesTagTests extends AbstractFormTagTests {
 		assertThat(spanElement3.getStringValue()).isEqualTo("baz");
 		assertThat(checkboxElement3.attribute(dynamicAttribute1).getValue()).isEqualTo(dynamicAttribute1);
 		assertThat(checkboxElement3.attribute(dynamicAttribute2).getValue()).isEqualTo(dynamicAttribute2);
-
 	}
 
 	@Test
@@ -183,30 +182,30 @@ public class CheckboxesTagTests extends AbstractFormTagTests {
 		output = "<doc>" + output + "</doc>";
 		SAXReader reader = new SAXReader();
 		Document document = reader.read(new StringReader(output));
-		Element spanElement1 = (Element) document.getRootElement().elements().get(0);
+		Element spanElement1 = document.getRootElement().elements().get(0);
 		Element delimiterElement1 = spanElement1.element("br");
 		assertThat(delimiterElement1).isNull();
-		Element checkboxElement1 = (Element) spanElement1.elements().get(0);
+		Element checkboxElement1 = spanElement1.elements().get(0);
 		assertThat(checkboxElement1.getName()).isEqualTo("input");
 		assertThat(checkboxElement1.attribute("type").getValue()).isEqualTo("checkbox");
 		assertThat(checkboxElement1.attribute("name").getValue()).isEqualTo("stringArray");
 		assertThat(checkboxElement1.attribute("checked").getValue()).isEqualTo("checked");
 		assertThat(checkboxElement1.attribute("value").getValue()).isEqualTo("foo");
 		assertThat(spanElement1.getStringValue()).isEqualTo("foo");
-		Element spanElement2 = (Element) document.getRootElement().elements().get(1);
-		Element delimiterElement2 = (Element) spanElement2.elements().get(0);
+		Element spanElement2 = document.getRootElement().elements().get(1);
+		Element delimiterElement2 = spanElement2.elements().get(0);
 		assertThat(delimiterElement2.getName()).isEqualTo("br");
-		Element checkboxElement2 = (Element) spanElement2.elements().get(1);
+		Element checkboxElement2 = spanElement2.elements().get(1);
 		assertThat(checkboxElement2.getName()).isEqualTo("input");
 		assertThat(checkboxElement2.attribute("type").getValue()).isEqualTo("checkbox");
 		assertThat(checkboxElement2.attribute("name").getValue()).isEqualTo("stringArray");
 		assertThat(checkboxElement2.attribute("checked").getValue()).isEqualTo("checked");
 		assertThat(checkboxElement2.attribute("value").getValue()).isEqualTo("bar");
 		assertThat(spanElement2.getStringValue()).isEqualTo("bar");
-		Element spanElement3 = (Element) document.getRootElement().elements().get(2);
-		Element delimiterElement3 = (Element) spanElement3.elements().get(0);
+		Element spanElement3 = document.getRootElement().elements().get(2);
+		Element delimiterElement3 = spanElement3.elements().get(0);
 		assertThat(delimiterElement3.getName()).isEqualTo("br");
-		Element checkboxElement3 = (Element) spanElement3.elements().get(1);
+		Element checkboxElement3 = spanElement3.elements().get(1);
 		assertThat(checkboxElement3.getName()).isEqualTo("input");
 		assertThat(checkboxElement3.attribute("type").getValue()).isEqualTo("checkbox");
 		assertThat(checkboxElement3.attribute("name").getValue()).isEqualTo("stringArray");
@@ -233,24 +232,24 @@ public class CheckboxesTagTests extends AbstractFormTagTests {
 
 		SAXReader reader = new SAXReader();
 		Document document = reader.read(new StringReader(output));
-		Element spanElement1 = (Element) document.getRootElement().elements().get(0);
-		Element checkboxElement1 = (Element) spanElement1.elements().get(0);
+		Element spanElement1 = document.getRootElement().elements().get(0);
+		Element checkboxElement1 = spanElement1.elements().get(0);
 		assertThat(checkboxElement1.getName()).isEqualTo("input");
 		assertThat(checkboxElement1.attribute("type").getValue()).isEqualTo("checkbox");
 		assertThat(checkboxElement1.attribute("name").getValue()).isEqualTo("stringArray");
 		assertThat(checkboxElement1.attribute("checked").getValue()).isEqualTo("checked");
 		assertThat(checkboxElement1.attribute("value").getValue()).isEqualTo("foo");
 		assertThat(spanElement1.getStringValue()).isEqualTo("FOO");
-		Element spanElement2 = (Element) document.getRootElement().elements().get(1);
-		Element checkboxElement2 = (Element) spanElement2.elements().get(0);
+		Element spanElement2 = document.getRootElement().elements().get(1);
+		Element checkboxElement2 = spanElement2.elements().get(0);
 		assertThat(checkboxElement2.getName()).isEqualTo("input");
 		assertThat(checkboxElement2.attribute("type").getValue()).isEqualTo("checkbox");
 		assertThat(checkboxElement2.attribute("name").getValue()).isEqualTo("stringArray");
 		assertThat(checkboxElement2.attribute("checked").getValue()).isEqualTo("checked");
 		assertThat(checkboxElement2.attribute("value").getValue()).isEqualTo("bar");
 		assertThat(spanElement2.getStringValue()).isEqualTo("BAR");
-		Element spanElement3 = (Element) document.getRootElement().elements().get(2);
-		Element checkboxElement3 = (Element) spanElement3.elements().get(0);
+		Element spanElement3 = document.getRootElement().elements().get(2);
+		Element checkboxElement3 = spanElement3.elements().get(0);
 		assertThat(checkboxElement3.getName()).isEqualTo("input");
 		assertThat(checkboxElement3.attribute("type").getValue()).isEqualTo("checkbox");
 		assertThat(checkboxElement3.attribute("name").getValue()).isEqualTo("stringArray");
@@ -278,24 +277,24 @@ public class CheckboxesTagTests extends AbstractFormTagTests {
 
 		SAXReader reader = new SAXReader();
 		Document document = reader.read(new StringReader(output));
-		Element spanElement1 = (Element) document.getRootElement().elements().get(0);
-		Element checkboxElement1 = (Element) spanElement1.elements().get(0);
+		Element spanElement1 = document.getRootElement().elements().get(0);
+		Element checkboxElement1 = spanElement1.elements().get(0);
 		assertThat(checkboxElement1.getName()).isEqualTo("input");
 		assertThat(checkboxElement1.attribute("type").getValue()).isEqualTo("checkbox");
 		assertThat(checkboxElement1.attribute("name").getValue()).isEqualTo("someSet");
 		assertThat(checkboxElement1.attribute("checked").getValue()).isEqualTo("checked");
 		assertThat(checkboxElement1.attribute("value").getValue()).isEqualTo("PET1");
 		assertThat(spanElement1.getStringValue()).isEqualTo("PET1Label");
-		Element spanElement2 = (Element) document.getRootElement().elements().get(1);
-		Element checkboxElement2 = (Element) spanElement2.elements().get(0);
+		Element spanElement2 = document.getRootElement().elements().get(1);
+		Element checkboxElement2 = spanElement2.elements().get(0);
 		assertThat(checkboxElement2.getName()).isEqualTo("input");
 		assertThat(checkboxElement2.attribute("type").getValue()).isEqualTo("checkbox");
 		assertThat(checkboxElement2.attribute("name").getValue()).isEqualTo("someSet");
 		assertThat(checkboxElement2.attribute("checked").getValue()).isEqualTo("checked");
 		assertThat(checkboxElement2.attribute("value").getValue()).isEqualTo("PET2");
 		assertThat(spanElement2.getStringValue()).isEqualTo("PET2Label");
-		Element spanElement3 = (Element) document.getRootElement().elements().get(2);
-		Element checkboxElement3 = (Element) spanElement3.elements().get(0);
+		Element spanElement3 = document.getRootElement().elements().get(2);
+		Element checkboxElement3 = spanElement3.elements().get(0);
 		assertThat(checkboxElement3.getName()).isEqualTo("input");
 		assertThat(checkboxElement3.attribute("type").getValue()).isEqualTo("checkbox");
 		assertThat(checkboxElement3.attribute("name").getValue()).isEqualTo("someSet");
@@ -324,24 +323,24 @@ public class CheckboxesTagTests extends AbstractFormTagTests {
 
 		SAXReader reader = new SAXReader();
 		Document document = reader.read(new StringReader(output));
-		Element spanElement1 = (Element) document.getRootElement().elements().get(0);
-		Element checkboxElement1 = (Element) spanElement1.elements().get(0);
+		Element spanElement1 = document.getRootElement().elements().get(0);
+		Element checkboxElement1 = spanElement1.elements().get(0);
 		assertThat(checkboxElement1.getName()).isEqualTo("input");
 		assertThat(checkboxElement1.attribute("type").getValue()).isEqualTo("checkbox");
 		assertThat(checkboxElement1.attribute("name").getValue()).isEqualTo("stringArray");
 		assertThat(checkboxElement1.attribute("checked").getValue()).isEqualTo("checked");
 		assertThat(checkboxElement1.attribute("value").getValue()).isEqualTo("foo");
 		assertThat(spanElement1.getStringValue()).isEqualTo("FOO");
-		Element spanElement2 = (Element) document.getRootElement().elements().get(1);
-		Element checkboxElement2 = (Element) spanElement2.elements().get(0);
+		Element spanElement2 = document.getRootElement().elements().get(1);
+		Element checkboxElement2 = spanElement2.elements().get(0);
 		assertThat(checkboxElement2.getName()).isEqualTo("input");
 		assertThat(checkboxElement2.attribute("type").getValue()).isEqualTo("checkbox");
 		assertThat(checkboxElement2.attribute("name").getValue()).isEqualTo("stringArray");
 		assertThat(checkboxElement2.attribute("checked").getValue()).isEqualTo("checked");
 		assertThat(checkboxElement2.attribute("value").getValue()).isEqualTo("bar");
 		assertThat(spanElement2.getStringValue()).isEqualTo((delimiter + "BAR"));
-		Element spanElement3 = (Element) document.getRootElement().elements().get(2);
-		Element checkboxElement3 = (Element) spanElement3.elements().get(0);
+		Element spanElement3 = document.getRootElement().elements().get(2);
+		Element checkboxElement3 = spanElement3.elements().get(0);
 		assertThat(checkboxElement3.getName()).isEqualTo("input");
 		assertThat(checkboxElement3.attribute("type").getValue()).isEqualTo("checkbox");
 		assertThat(checkboxElement3.attribute("name").getValue()).isEqualTo("stringArray");
@@ -370,22 +369,22 @@ public class CheckboxesTagTests extends AbstractFormTagTests {
 
 		SAXReader reader = new SAXReader();
 		Document document = reader.read(new StringReader(output));
-		Element spanElement1 = (Element) document.getRootElement().elements().get(0);
-		Element checkboxElement1 = (Element) spanElement1.elements().get(0);
+		Element spanElement1 = document.getRootElement().elements().get(0);
+		Element checkboxElement1 = spanElement1.elements().get(0);
 		assertThat(checkboxElement1.getName()).isEqualTo("input");
 		assertThat(checkboxElement1.attribute("type").getValue()).isEqualTo("checkbox");
 		assertThat(checkboxElement1.attribute("name").getValue()).isEqualTo("stringArray");
 		assertThat(checkboxElement1.attribute("checked").getValue()).isEqualTo("checked");
 		assertThat(checkboxElement1.attribute("value").getValue()).isEqualTo("   foo");
-		Element spanElement2 = (Element) document.getRootElement().elements().get(1);
-		Element checkboxElement2 = (Element) spanElement2.elements().get(0);
+		Element spanElement2 = document.getRootElement().elements().get(1);
+		Element checkboxElement2 = spanElement2.elements().get(0);
 		assertThat(checkboxElement2.getName()).isEqualTo("input");
 		assertThat(checkboxElement2.attribute("type").getValue()).isEqualTo("checkbox");
 		assertThat(checkboxElement2.attribute("name").getValue()).isEqualTo("stringArray");
 		assertThat(checkboxElement2.attribute("checked").getValue()).isEqualTo("checked");
 		assertThat(checkboxElement2.attribute("value").getValue()).isEqualTo("   bar");
-		Element spanElement3 = (Element) document.getRootElement().elements().get(2);
-		Element checkboxElement3 = (Element) spanElement3.elements().get(0);
+		Element spanElement3 = document.getRootElement().elements().get(2);
+		Element checkboxElement3 = spanElement3.elements().get(0);
 		assertThat(checkboxElement3.getName()).isEqualTo("input");
 		assertThat(checkboxElement3.attribute("type").getValue()).isEqualTo("checkbox");
 		assertThat(checkboxElement3.attribute("name").getValue()).isEqualTo("stringArray");
@@ -412,22 +411,22 @@ public class CheckboxesTagTests extends AbstractFormTagTests {
 
 		SAXReader reader = new SAXReader();
 		Document document = reader.read(new StringReader(output));
-		Element spanElement1 = (Element) document.getRootElement().elements().get(0);
-		Element checkboxElement1 = (Element) spanElement1.elements().get(0);
+		Element spanElement1 = document.getRootElement().elements().get(0);
+		Element checkboxElement1 = spanElement1.elements().get(0);
 		assertThat(checkboxElement1.getName()).isEqualTo("input");
 		assertThat(checkboxElement1.attribute("type").getValue()).isEqualTo("checkbox");
 		assertThat(checkboxElement1.attribute("name").getValue()).isEqualTo("stringArray");
 		assertThat(checkboxElement1.attribute("checked").getValue()).isEqualTo("checked");
 		assertThat(checkboxElement1.attribute("value").getValue()).isEqualTo("FOO");
-		Element spanElement2 = (Element) document.getRootElement().elements().get(1);
-		Element checkboxElement2 = (Element) spanElement2.elements().get(0);
+		Element spanElement2 = document.getRootElement().elements().get(1);
+		Element checkboxElement2 = spanElement2.elements().get(0);
 		assertThat(checkboxElement2.getName()).isEqualTo("input");
 		assertThat(checkboxElement2.attribute("type").getValue()).isEqualTo("checkbox");
 		assertThat(checkboxElement2.attribute("name").getValue()).isEqualTo("stringArray");
 		assertThat(checkboxElement2.attribute("checked").getValue()).isEqualTo("checked");
 		assertThat(checkboxElement2.attribute("value").getValue()).isEqualTo("BAR");
-		Element spanElement3 = (Element) document.getRootElement().elements().get(2);
-		Element checkboxElement3 = (Element) spanElement3.elements().get(0);
+		Element spanElement3 = document.getRootElement().elements().get(2);
+		Element checkboxElement3 = spanElement3.elements().get(0);
 		assertThat(checkboxElement3.getName()).isEqualTo("input");
 		assertThat(checkboxElement3.attribute("type").getValue()).isEqualTo("checkbox");
 		assertThat(checkboxElement3.attribute("name").getValue()).isEqualTo("stringArray");
@@ -464,22 +463,22 @@ public class CheckboxesTagTests extends AbstractFormTagTests {
 
 		SAXReader reader = new SAXReader();
 		Document document = reader.read(new StringReader(output));
-		Element spanElement1 = (Element) document.getRootElement().elements().get(0);
-		Element checkboxElement1 = (Element) spanElement1.elements().get(0);
+		Element spanElement1 = document.getRootElement().elements().get(0);
+		Element checkboxElement1 = spanElement1.elements().get(0);
 		assertThat(checkboxElement1.getName()).isEqualTo("input");
 		assertThat(checkboxElement1.attribute("type").getValue()).isEqualTo("checkbox");
 		assertThat(checkboxElement1.attribute("name").getValue()).isEqualTo("stringArray");
 		assertThat(checkboxElement1.attribute("checked").getValue()).isEqualTo("checked");
 		assertThat(checkboxElement1.attribute("value").getValue()).isEqualTo("   foo");
-		Element spanElement2 = (Element) document.getRootElement().elements().get(1);
-		Element checkboxElement2 = (Element) spanElement2.elements().get(0);
+		Element spanElement2 = document.getRootElement().elements().get(1);
+		Element checkboxElement2 = spanElement2.elements().get(0);
 		assertThat(checkboxElement2.getName()).isEqualTo("input");
 		assertThat(checkboxElement2.attribute("type").getValue()).isEqualTo("checkbox");
 		assertThat(checkboxElement2.attribute("name").getValue()).isEqualTo("stringArray");
 		assertThat(checkboxElement2.attribute("checked").getValue()).isEqualTo("checked");
 		assertThat(checkboxElement2.attribute("value").getValue()).isEqualTo("   bar");
-		Element spanElement3 = (Element) document.getRootElement().elements().get(2);
-		Element checkboxElement3 = (Element) spanElement3.elements().get(0);
+		Element spanElement3 = document.getRootElement().elements().get(2);
+		Element checkboxElement3 = spanElement3.elements().get(0);
 		assertThat(checkboxElement3.getName()).isEqualTo("input");
 		assertThat(checkboxElement3.attribute("type").getValue()).isEqualTo("checkbox");
 		assertThat(checkboxElement3.attribute("name").getValue()).isEqualTo("stringArray");
@@ -510,40 +509,40 @@ public class CheckboxesTagTests extends AbstractFormTagTests {
 
 		SAXReader reader = new SAXReader();
 		Document document = reader.read(new StringReader(output));
-		Element spanElement1 = (Element) document.getRootElement().elements().get(0);
-		Element checkboxElement1 = (Element) spanElement1.elements().get(0);
+		Element spanElement1 = document.getRootElement().elements().get(0);
+		Element checkboxElement1 = spanElement1.elements().get(0);
 		assertThat(checkboxElement1.getName()).isEqualTo("input");
 		assertThat(checkboxElement1.attribute("type").getValue()).isEqualTo("checkbox");
 		assertThat(checkboxElement1.attribute("name").getValue()).isEqualTo("pets");
 		assertThat(checkboxElement1.attribute("checked").getValue()).isEqualTo("checked");
 		assertThat(checkboxElement1.attribute("value").getValue()).isEqualTo("Rudiger");
 		assertThat(spanElement1.getStringValue()).isEqualTo("RUDIGER");
-		Element spanElement2 = (Element) document.getRootElement().elements().get(1);
-		Element checkboxElement2 = (Element) spanElement2.elements().get(0);
+		Element spanElement2 = document.getRootElement().elements().get(1);
+		Element checkboxElement2 = spanElement2.elements().get(0);
 		assertThat(checkboxElement2.getName()).isEqualTo("input");
 		assertThat(checkboxElement2.attribute("type").getValue()).isEqualTo("checkbox");
 		assertThat(checkboxElement2.attribute("name").getValue()).isEqualTo("pets");
 		assertThat(checkboxElement2.attribute("checked").getValue()).isEqualTo("checked");
 		assertThat(checkboxElement2.attribute("value").getValue()).isEqualTo("Spot");
 		assertThat(spanElement2.getStringValue()).isEqualTo("SPOT");
-		Element spanElement3 = (Element) document.getRootElement().elements().get(2);
-		Element checkboxElement3 = (Element) spanElement3.elements().get(0);
+		Element spanElement3 = document.getRootElement().elements().get(2);
+		Element checkboxElement3 = spanElement3.elements().get(0);
 		assertThat(checkboxElement3.getName()).isEqualTo("input");
 		assertThat(checkboxElement3.attribute("type").getValue()).isEqualTo("checkbox");
 		assertThat(checkboxElement3.attribute("name").getValue()).isEqualTo("pets");
 		assertThat(checkboxElement3.attribute("checked")).as("not checked").isNull();
 		assertThat(checkboxElement3.attribute("value").getValue()).isEqualTo("Checkers");
 		assertThat(spanElement3.getStringValue()).isEqualTo("CHECKERS");
-		Element spanElement4 = (Element) document.getRootElement().elements().get(3);
-		Element checkboxElement4 = (Element) spanElement4.elements().get(0);
+		Element spanElement4 = document.getRootElement().elements().get(3);
+		Element checkboxElement4 = spanElement4.elements().get(0);
 		assertThat(checkboxElement4.getName()).isEqualTo("input");
 		assertThat(checkboxElement4.attribute("type").getValue()).isEqualTo("checkbox");
 		assertThat(checkboxElement4.attribute("name").getValue()).isEqualTo("pets");
 		assertThat(checkboxElement4.attribute("checked").getValue()).isEqualTo("checked");
 		assertThat(checkboxElement4.attribute("value").getValue()).isEqualTo("Fluffy");
 		assertThat(spanElement4.getStringValue()).isEqualTo("FLUFFY");
-		Element spanElement5 = (Element) document.getRootElement().elements().get(4);
-		Element checkboxElement5 = (Element) spanElement5.elements().get(0);
+		Element spanElement5 = document.getRootElement().elements().get(4);
+		Element checkboxElement5 = spanElement5.elements().get(0);
 		assertThat(checkboxElement5.getName()).isEqualTo("input");
 		assertThat(checkboxElement5.attribute("type").getValue()).isEqualTo("checkbox");
 		assertThat(checkboxElement5.attribute("name").getValue()).isEqualTo("pets");
@@ -576,8 +575,8 @@ public class CheckboxesTagTests extends AbstractFormTagTests {
 
 		SAXReader reader = new SAXReader();
 		Document document = reader.read(new StringReader(output));
-		Element spanElement1 = (Element) document.getRootElement().elements().get(0);
-		Element checkboxElement1 = (Element) spanElement1.elements().get(0);
+		Element spanElement1 = document.getRootElement().elements().get(0);
+		Element checkboxElement1 = spanElement1.elements().get(0);
 		assertThat(checkboxElement1.getName()).isEqualTo("input");
 		assertThat(checkboxElement1.attribute("type").getValue()).isEqualTo("checkbox");
 		assertThat(checkboxElement1.attribute("name").getValue()).isEqualTo("someSet");
@@ -585,8 +584,8 @@ public class CheckboxesTagTests extends AbstractFormTagTests {
 		assertThat(checkboxElement1.attribute("checked").getValue()).isEqualTo("checked");
 		assertThat(checkboxElement1.attribute("value").getValue()).isEqualTo("PET1");
 		assertThat(spanElement1.getStringValue()).isEqualTo("PET1");
-		Element spanElement2 = (Element) document.getRootElement().elements().get(1);
-		Element checkboxElement2 = (Element) spanElement2.elements().get(0);
+		Element spanElement2 = document.getRootElement().elements().get(1);
+		Element checkboxElement2 = spanElement2.elements().get(0);
 		assertThat(checkboxElement2.getName()).isEqualTo("input");
 		assertThat(checkboxElement2.attribute("type").getValue()).isEqualTo("checkbox");
 		assertThat(checkboxElement2.attribute("name").getValue()).isEqualTo("someSet");
@@ -594,8 +593,8 @@ public class CheckboxesTagTests extends AbstractFormTagTests {
 		assertThat(checkboxElement2.attribute("checked").getValue()).isEqualTo("checked");
 		assertThat(checkboxElement2.attribute("value").getValue()).isEqualTo("PET2");
 		assertThat(spanElement2.getStringValue()).isEqualTo("PET2");
-		Element spanElement3 = (Element) document.getRootElement().elements().get(2);
-		Element checkboxElement3 = (Element) spanElement3.elements().get(0);
+		Element spanElement3 = document.getRootElement().elements().get(2);
+		Element checkboxElement3 = spanElement3.elements().get(0);
 		assertThat(checkboxElement3.getName()).isEqualTo("input");
 		assertThat(checkboxElement3.attribute("type").getValue()).isEqualTo("checkbox");
 		assertThat(checkboxElement3.attribute("name").getValue()).isEqualTo("someSet");
@@ -632,40 +631,40 @@ public class CheckboxesTagTests extends AbstractFormTagTests {
 
 		SAXReader reader = new SAXReader();
 		Document document = reader.read(new StringReader(output));
-		Element spanElement1 = (Element) document.getRootElement().elements().get(0);
-		Element checkboxElement1 = (Element) spanElement1.elements().get(0);
+		Element spanElement1 = document.getRootElement().elements().get(0);
+		Element checkboxElement1 = spanElement1.elements().get(0);
 		assertThat(checkboxElement1.getName()).isEqualTo("input");
 		assertThat(checkboxElement1.attribute("type").getValue()).isEqualTo("checkbox");
 		assertThat(checkboxElement1.attribute("name").getValue()).isEqualTo("pets");
 		assertThat(checkboxElement1.attribute("checked").getValue()).isEqualTo("checked");
 		assertThat(checkboxElement1.attribute("value").getValue()).isEqualTo("Rudiger");
 		assertThat(spanElement1.getStringValue()).isEqualTo("RUDIGER");
-		Element spanElement2 = (Element) document.getRootElement().elements().get(1);
-		Element checkboxElement2 = (Element) spanElement2.elements().get(0);
+		Element spanElement2 = document.getRootElement().elements().get(1);
+		Element checkboxElement2 = spanElement2.elements().get(0);
 		assertThat(checkboxElement2.getName()).isEqualTo("input");
 		assertThat(checkboxElement2.attribute("type").getValue()).isEqualTo("checkbox");
 		assertThat(checkboxElement2.attribute("name").getValue()).isEqualTo("pets");
 		assertThat(checkboxElement2.attribute("checked").getValue()).isEqualTo("checked");
 		assertThat(checkboxElement2.attribute("value").getValue()).isEqualTo("Spot");
 		assertThat(spanElement2.getStringValue()).isEqualTo("SPOT");
-		Element spanElement3 = (Element) document.getRootElement().elements().get(2);
-		Element checkboxElement3 = (Element) spanElement3.elements().get(0);
+		Element spanElement3 = document.getRootElement().elements().get(2);
+		Element checkboxElement3 = spanElement3.elements().get(0);
 		assertThat(checkboxElement3.getName()).isEqualTo("input");
 		assertThat(checkboxElement3.attribute("type").getValue()).isEqualTo("checkbox");
 		assertThat(checkboxElement3.attribute("name").getValue()).isEqualTo("pets");
 		assertThat(checkboxElement3.attribute("checked")).as("not checked").isNull();
 		assertThat(checkboxElement3.attribute("value").getValue()).isEqualTo("Checkers");
 		assertThat(spanElement3.getStringValue()).isEqualTo("CHECKERS");
-		Element spanElement4 = (Element) document.getRootElement().elements().get(3);
-		Element checkboxElement4 = (Element) spanElement4.elements().get(0);
+		Element spanElement4 = document.getRootElement().elements().get(3);
+		Element checkboxElement4 = spanElement4.elements().get(0);
 		assertThat(checkboxElement4.getName()).isEqualTo("input");
 		assertThat(checkboxElement4.attribute("type").getValue()).isEqualTo("checkbox");
 		assertThat(checkboxElement4.attribute("name").getValue()).isEqualTo("pets");
 		assertThat(checkboxElement4.attribute("checked").getValue()).isEqualTo("checked");
 		assertThat(checkboxElement4.attribute("value").getValue()).isEqualTo("Fluffy");
 		assertThat(spanElement4.getStringValue()).isEqualTo("FLUFFY");
-		Element spanElement5 = (Element) document.getRootElement().elements().get(4);
-		Element checkboxElement5 = (Element) spanElement5.elements().get(0);
+		Element spanElement5 = document.getRootElement().elements().get(4);
+		Element checkboxElement5 = spanElement5.elements().get(0);
 		assertThat(checkboxElement5.getName()).isEqualTo("input");
 		assertThat(checkboxElement5.attribute("type").getValue()).isEqualTo("checkbox");
 		assertThat(checkboxElement5.attribute("name").getValue()).isEqualTo("pets");
@@ -697,8 +696,8 @@ public class CheckboxesTagTests extends AbstractFormTagTests {
 		Document document = reader.read(new StringReader(output));
 		Element rootElement = document.getRootElement();
 		assertThat(rootElement.elements().size()).as("Both tag and hidden element rendered incorrectly").isEqualTo(3);
-		Element spanElement = (Element) document.getRootElement().elements().get(0);
-		Element checkboxElement = (Element) spanElement.elements().get(0);
+		Element spanElement = document.getRootElement().elements().get(0);
+		Element checkboxElement = spanElement.elements().get(0);
 		assertThat(checkboxElement.getName()).isEqualTo("input");
 		assertThat(checkboxElement.attribute("type").getValue()).isEqualTo("checkbox");
 		assertThat(checkboxElement.attribute("name").getValue()).isEqualTo("stringArray");
@@ -721,7 +720,7 @@ public class CheckboxesTagTests extends AbstractFormTagTests {
 
 		SAXReader reader = new SAXReader();
 		Document document = reader.read(new StringReader(output));
-		Element spanElement = (Element) document.getRootElement().elements().get(0);
+		Element spanElement = document.getRootElement().elements().get(0);
 		assertThat(spanElement.getName()).isEqualTo("element");
 	}
 
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/RadioButtonTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/RadioButtonTagTests.java
index f8f258627e..fe5c805d8a 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/RadioButtonTagTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/RadioButtonTagTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -133,7 +133,7 @@ public class RadioButtonTagTests extends AbstractFormTagTests {
 		assertTagClosed(output);
 		assertContainsAttribute(output, "name", "myFloat");
 		assertContainsAttribute(output, "type", "radio");
-		assertContainsAttribute(output, "value", "F" + getFloat().toString());
+		assertContainsAttribute(output, "value", "F" + getFloat());
 		assertContainsAttribute(output, "checked", "checked");
 	}
 
@@ -185,7 +185,7 @@ public class RadioButtonTagTests extends AbstractFormTagTests {
 
 		SAXReader reader = new SAXReader();
 		Document document = reader.read(new StringReader(output));
-		Element checkboxElement = (Element) document.getRootElement().elements().get(0);
+		Element checkboxElement = document.getRootElement().elements().get(0);
 		assertThat(checkboxElement.getName()).isEqualTo("input");
 		assertThat(checkboxElement.attribute("type").getValue()).isEqualTo("radio");
 		assertThat(checkboxElement.attribute("name").getValue()).isEqualTo("pets");
@@ -208,7 +208,7 @@ public class RadioButtonTagTests extends AbstractFormTagTests {
 
 		SAXReader reader = new SAXReader();
 		Document document = reader.read(new StringReader(output));
-		Element checkboxElement = (Element) document.getRootElement().elements().get(0);
+		Element checkboxElement = document.getRootElement().elements().get(0);
 		assertThat(checkboxElement.getName()).isEqualTo("input");
 		assertThat(checkboxElement.attribute("type").getValue()).isEqualTo("radio");
 		assertThat(checkboxElement.attribute("name").getValue()).isEqualTo("pets");
@@ -236,7 +236,7 @@ public class RadioButtonTagTests extends AbstractFormTagTests {
 
 		SAXReader reader = new SAXReader();
 		Document document = reader.read(new StringReader(output));
-		Element checkboxElement = (Element) document.getRootElement().elements().get(0);
+		Element checkboxElement = document.getRootElement().elements().get(0);
 		assertThat(checkboxElement.getName()).isEqualTo("input");
 		assertThat(checkboxElement.attribute("type").getValue()).isEqualTo("radio");
 		assertThat(checkboxElement.attribute("name").getValue()).isEqualTo("pets");
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/RadioButtonsTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/RadioButtonsTagTests.java
index c3dfdb30d3..50bbf2c2ec 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/RadioButtonsTagTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/RadioButtonsTagTests.java
@@ -84,24 +84,24 @@ public class RadioButtonsTagTests extends AbstractFormTagTests {
 		output = "<doc>" + output + "</doc>";
 		SAXReader reader = new SAXReader();
 		Document document = reader.read(new StringReader(output));
-		Element spanElement1 = (Element) document.getRootElement().elements().get(0);
-		Element radioButtonElement1 = (Element) spanElement1.elements().get(0);
+		Element spanElement1 = document.getRootElement().elements().get(0);
+		Element radioButtonElement1 = spanElement1.elements().get(0);
 		assertThat(radioButtonElement1.getName()).isEqualTo("input");
 		assertThat(radioButtonElement1.attribute("type").getValue()).isEqualTo("radio");
 		assertThat(radioButtonElement1.attribute("name").getValue()).isEqualTo("stringArray");
 		assertThat(radioButtonElement1.attribute("checked").getValue()).isEqualTo("checked");
 		assertThat(radioButtonElement1.attribute("value").getValue()).isEqualTo("foo");
 		assertThat(spanElement1.getStringValue()).isEqualTo("foo");
-		Element spanElement2 = (Element) document.getRootElement().elements().get(1);
-		Element radioButtonElement2 = (Element) spanElement2.elements().get(0);
+		Element spanElement2 = document.getRootElement().elements().get(1);
+		Element radioButtonElement2 = spanElement2.elements().get(0);
 		assertThat(radioButtonElement2.getName()).isEqualTo("input");
 		assertThat(radioButtonElement2.attribute("type").getValue()).isEqualTo("radio");
 		assertThat(radioButtonElement2.attribute("name").getValue()).isEqualTo("stringArray");
 		assertThat(radioButtonElement2.attribute("checked").getValue()).isEqualTo("checked");
 		assertThat(radioButtonElement2.attribute("value").getValue()).isEqualTo("bar");
 		assertThat(spanElement2.getStringValue()).isEqualTo("bar");
-		Element spanElement3 = (Element) document.getRootElement().elements().get(2);
-		Element radioButtonElement3 = (Element) spanElement3.elements().get(0);
+		Element spanElement3 = document.getRootElement().elements().get(2);
+		Element radioButtonElement3 = spanElement3.elements().get(0);
 		assertThat(radioButtonElement3.getName()).isEqualTo("input");
 		assertThat(radioButtonElement3.attribute("type").getValue()).isEqualTo("radio");
 		assertThat(radioButtonElement3.attribute("name").getValue()).isEqualTo("stringArray");
@@ -129,8 +129,8 @@ public class RadioButtonsTagTests extends AbstractFormTagTests {
 		output = "<doc>" + output + "</doc>";
 		SAXReader reader = new SAXReader();
 		Document document = reader.read(new StringReader(output));
-		Element spanElement1 = (Element) document.getRootElement().elements().get(0);
-		Element radioButtonElement1 = (Element) spanElement1.elements().get(0);
+		Element spanElement1 = document.getRootElement().elements().get(0);
+		Element radioButtonElement1 = spanElement1.elements().get(0);
 		assertThat(radioButtonElement1.getName()).isEqualTo("input");
 		assertThat(radioButtonElement1.attribute("type").getValue()).isEqualTo("radio");
 		assertThat(radioButtonElement1.attribute("name").getValue()).isEqualTo("stringArray");
@@ -140,8 +140,8 @@ public class RadioButtonsTagTests extends AbstractFormTagTests {
 		assertThat(radioButtonElement1.attribute(dynamicAttribute1).getValue()).isEqualTo(dynamicAttribute1);
 		assertThat(radioButtonElement1.attribute(dynamicAttribute2).getValue()).isEqualTo(dynamicAttribute2);
 
-		Element spanElement2 = (Element) document.getRootElement().elements().get(1);
-		Element radioButtonElement2 = (Element) spanElement2.elements().get(0);
+		Element spanElement2 = document.getRootElement().elements().get(1);
+		Element radioButtonElement2 = spanElement2.elements().get(0);
 		assertThat(radioButtonElement2.getName()).isEqualTo("input");
 		assertThat(radioButtonElement2.attribute("type").getValue()).isEqualTo("radio");
 		assertThat(radioButtonElement2.attribute("name").getValue()).isEqualTo("stringArray");
@@ -151,8 +151,8 @@ public class RadioButtonsTagTests extends AbstractFormTagTests {
 		assertThat(radioButtonElement2.attribute(dynamicAttribute1).getValue()).isEqualTo(dynamicAttribute1);
 		assertThat(radioButtonElement2.attribute(dynamicAttribute2).getValue()).isEqualTo(dynamicAttribute2);
 
-		Element spanElement3 = (Element) document.getRootElement().elements().get(2);
-		Element radioButtonElement3 = (Element) spanElement3.elements().get(0);
+		Element spanElement3 = document.getRootElement().elements().get(2);
+		Element radioButtonElement3 = spanElement3.elements().get(0);
 		assertThat(radioButtonElement3.getName()).isEqualTo("input");
 		assertThat(radioButtonElement3.attribute("type").getValue()).isEqualTo("radio");
 		assertThat(radioButtonElement3.attribute("name").getValue()).isEqualTo("stringArray");
@@ -178,30 +178,30 @@ public class RadioButtonsTagTests extends AbstractFormTagTests {
 		output = "<doc>" + output + "</doc>";
 		SAXReader reader = new SAXReader();
 		Document document = reader.read(new StringReader(output));
-		Element spanElement1 = (Element) document.getRootElement().elements().get(0);
+		Element spanElement1 = document.getRootElement().elements().get(0);
 		Element delimiterElement1 = spanElement1.element("br");
 		assertThat(delimiterElement1).isNull();
-		Element radioButtonElement1 = (Element) spanElement1.elements().get(0);
+		Element radioButtonElement1 = spanElement1.elements().get(0);
 		assertThat(radioButtonElement1.getName()).isEqualTo("input");
 		assertThat(radioButtonElement1.attribute("type").getValue()).isEqualTo("radio");
 		assertThat(radioButtonElement1.attribute("name").getValue()).isEqualTo("stringArray");
 		assertThat(radioButtonElement1.attribute("checked").getValue()).isEqualTo("checked");
 		assertThat(radioButtonElement1.attribute("value").getValue()).isEqualTo("foo");
 		assertThat(spanElement1.getStringValue()).isEqualTo("foo");
-		Element spanElement2 = (Element) document.getRootElement().elements().get(1);
-		Element delimiterElement2 = (Element) spanElement2.elements().get(0);
+		Element spanElement2 = document.getRootElement().elements().get(1);
+		Element delimiterElement2 = spanElement2.elements().get(0);
 		assertThat(delimiterElement2.getName()).isEqualTo("br");
-		Element radioButtonElement2 = (Element) spanElement2.elements().get(1);
+		Element radioButtonElement2 = spanElement2.elements().get(1);
 		assertThat(radioButtonElement2.getName()).isEqualTo("input");
 		assertThat(radioButtonElement2.attribute("type").getValue()).isEqualTo("radio");
 		assertThat(radioButtonElement2.attribute("name").getValue()).isEqualTo("stringArray");
 		assertThat(radioButtonElement2.attribute("checked").getValue()).isEqualTo("checked");
 		assertThat(radioButtonElement2.attribute("value").getValue()).isEqualTo("bar");
 		assertThat(spanElement2.getStringValue()).isEqualTo("bar");
-		Element spanElement3 = (Element) document.getRootElement().elements().get(2);
-		Element delimiterElement3 = (Element) spanElement3.elements().get(0);
+		Element spanElement3 = document.getRootElement().elements().get(2);
+		Element delimiterElement3 = spanElement3.elements().get(0);
 		assertThat(delimiterElement3.getName()).isEqualTo("br");
-		Element radioButtonElement3 = (Element) spanElement3.elements().get(1);
+		Element radioButtonElement3 = spanElement3.elements().get(1);
 		assertThat(radioButtonElement3.getName()).isEqualTo("input");
 		assertThat(radioButtonElement3.attribute("type").getValue()).isEqualTo("radio");
 		assertThat(radioButtonElement3.attribute("name").getValue()).isEqualTo("stringArray");
@@ -228,24 +228,24 @@ public class RadioButtonsTagTests extends AbstractFormTagTests {
 
 		SAXReader reader = new SAXReader();
 		Document document = reader.read(new StringReader(output));
-		Element spanElement1 = (Element) document.getRootElement().elements().get(0);
-		Element radioButtonElement1 = (Element) spanElement1.elements().get(0);
+		Element spanElement1 = document.getRootElement().elements().get(0);
+		Element radioButtonElement1 = spanElement1.elements().get(0);
 		assertThat(radioButtonElement1.getName()).isEqualTo("input");
 		assertThat(radioButtonElement1.attribute("type").getValue()).isEqualTo("radio");
 		assertThat(radioButtonElement1.attribute("name").getValue()).isEqualTo("stringArray");
 		assertThat(radioButtonElement1.attribute("checked").getValue()).isEqualTo("checked");
 		assertThat(radioButtonElement1.attribute("value").getValue()).isEqualTo("foo");
 		assertThat(spanElement1.getStringValue()).isEqualTo("FOO");
-		Element spanElement2 = (Element) document.getRootElement().elements().get(1);
-		Element radioButtonElement2 = (Element) spanElement2.elements().get(0);
+		Element spanElement2 = document.getRootElement().elements().get(1);
+		Element radioButtonElement2 = spanElement2.elements().get(0);
 		assertThat(radioButtonElement2.getName()).isEqualTo("input");
 		assertThat(radioButtonElement2.attribute("type").getValue()).isEqualTo("radio");
 		assertThat(radioButtonElement2.attribute("name").getValue()).isEqualTo("stringArray");
 		assertThat(radioButtonElement2.attribute("checked").getValue()).isEqualTo("checked");
 		assertThat(radioButtonElement2.attribute("value").getValue()).isEqualTo("bar");
 		assertThat(spanElement2.getStringValue()).isEqualTo("BAR");
-		Element spanElement3 = (Element) document.getRootElement().elements().get(2);
-		Element radioButtonElement3 = (Element) spanElement3.elements().get(0);
+		Element spanElement3 = document.getRootElement().elements().get(2);
+		Element radioButtonElement3 = spanElement3.elements().get(0);
 		assertThat(radioButtonElement3.getName()).isEqualTo("input");
 		assertThat(radioButtonElement3.attribute("type").getValue()).isEqualTo("radio");
 		assertThat(radioButtonElement3.attribute("name").getValue()).isEqualTo("stringArray");
@@ -274,24 +274,24 @@ public class RadioButtonsTagTests extends AbstractFormTagTests {
 
 		SAXReader reader = new SAXReader();
 		Document document = reader.read(new StringReader(output));
-		Element spanElement1 = (Element) document.getRootElement().elements().get(0);
-		Element radioButtonElement1 = (Element) spanElement1.elements().get(0);
+		Element spanElement1 = document.getRootElement().elements().get(0);
+		Element radioButtonElement1 = spanElement1.elements().get(0);
 		assertThat(radioButtonElement1.getName()).isEqualTo("input");
 		assertThat(radioButtonElement1.attribute("type").getValue()).isEqualTo("radio");
 		assertThat(radioButtonElement1.attribute("name").getValue()).isEqualTo("stringArray");
 		assertThat(radioButtonElement1.attribute("checked").getValue()).isEqualTo("checked");
 		assertThat(radioButtonElement1.attribute("value").getValue()).isEqualTo("foo");
 		assertThat(spanElement1.getStringValue()).isEqualTo("FOO");
-		Element spanElement2 = (Element) document.getRootElement().elements().get(1);
-		Element radioButtonElement2 = (Element) spanElement2.elements().get(0);
+		Element spanElement2 = document.getRootElement().elements().get(1);
+		Element radioButtonElement2 = spanElement2.elements().get(0);
 		assertThat(radioButtonElement2.getName()).isEqualTo("input");
 		assertThat(radioButtonElement2.attribute("type").getValue()).isEqualTo("radio");
 		assertThat(radioButtonElement2.attribute("name").getValue()).isEqualTo("stringArray");
 		assertThat(radioButtonElement2.attribute("checked").getValue()).isEqualTo("checked");
 		assertThat(radioButtonElement2.attribute("value").getValue()).isEqualTo("bar");
 		assertThat(spanElement2.getStringValue()).isEqualTo((delimiter + "BAR"));
-		Element spanElement3 = (Element) document.getRootElement().elements().get(2);
-		Element radioButtonElement3 = (Element) spanElement3.elements().get(0);
+		Element spanElement3 = document.getRootElement().elements().get(2);
+		Element radioButtonElement3 = spanElement3.elements().get(0);
 		assertThat(radioButtonElement3.getName()).isEqualTo("input");
 		assertThat(radioButtonElement3.attribute("type").getValue()).isEqualTo("radio");
 		assertThat(radioButtonElement3.attribute("name").getValue()).isEqualTo("stringArray");
@@ -320,22 +320,22 @@ public class RadioButtonsTagTests extends AbstractFormTagTests {
 
 		SAXReader reader = new SAXReader();
 		Document document = reader.read(new StringReader(output));
-		Element spanElement1 = (Element) document.getRootElement().elements().get(0);
-		Element radioButtonElement1 = (Element) spanElement1.elements().get(0);
+		Element spanElement1 = document.getRootElement().elements().get(0);
+		Element radioButtonElement1 = spanElement1.elements().get(0);
 		assertThat(radioButtonElement1.getName()).isEqualTo("input");
 		assertThat(radioButtonElement1.attribute("type").getValue()).isEqualTo("radio");
 		assertThat(radioButtonElement1.attribute("name").getValue()).isEqualTo("stringArray");
 		assertThat(radioButtonElement1.attribute("checked").getValue()).isEqualTo("checked");
 		assertThat(radioButtonElement1.attribute("value").getValue()).isEqualTo("   foo");
-		Element spanElement2 = (Element) document.getRootElement().elements().get(1);
-		Element radioButtonElement2 = (Element) spanElement2.elements().get(0);
+		Element spanElement2 = document.getRootElement().elements().get(1);
+		Element radioButtonElement2 = spanElement2.elements().get(0);
 		assertThat(radioButtonElement2.getName()).isEqualTo("input");
 		assertThat(radioButtonElement2.attribute("type").getValue()).isEqualTo("radio");
 		assertThat(radioButtonElement2.attribute("name").getValue()).isEqualTo("stringArray");
 		assertThat(radioButtonElement2.attribute("checked").getValue()).isEqualTo("checked");
 		assertThat(radioButtonElement2.attribute("value").getValue()).isEqualTo("   bar");
-		Element spanElement3 = (Element) document.getRootElement().elements().get(2);
-		Element radioButtonElement3 = (Element) spanElement3.elements().get(0);
+		Element spanElement3 = document.getRootElement().elements().get(2);
+		Element radioButtonElement3 = spanElement3.elements().get(0);
 		assertThat(radioButtonElement3.getName()).isEqualTo("input");
 		assertThat(radioButtonElement3.attribute("type").getValue()).isEqualTo("radio");
 		assertThat(radioButtonElement3.attribute("name").getValue()).isEqualTo("stringArray");
@@ -366,40 +366,40 @@ public class RadioButtonsTagTests extends AbstractFormTagTests {
 
 		SAXReader reader = new SAXReader();
 		Document document = reader.read(new StringReader(output));
-		Element spanElement1 = (Element) document.getRootElement().elements().get(0);
-		Element radioButtonElement1 = (Element) spanElement1.elements().get(0);
+		Element spanElement1 = document.getRootElement().elements().get(0);
+		Element radioButtonElement1 = spanElement1.elements().get(0);
 		assertThat(radioButtonElement1.getName()).isEqualTo("input");
 		assertThat(radioButtonElement1.attribute("type").getValue()).isEqualTo("radio");
 		assertThat(radioButtonElement1.attribute("name").getValue()).isEqualTo("pets");
 		assertThat(radioButtonElement1.attribute("checked").getValue()).isEqualTo("checked");
 		assertThat(radioButtonElement1.attribute("value").getValue()).isEqualTo("Rudiger");
 		assertThat(spanElement1.getStringValue()).isEqualTo("RUDIGER");
-		Element spanElement2 = (Element) document.getRootElement().elements().get(1);
-		Element radioButtonElement2 = (Element) spanElement2.elements().get(0);
+		Element spanElement2 = document.getRootElement().elements().get(1);
+		Element radioButtonElement2 = spanElement2.elements().get(0);
 		assertThat(radioButtonElement2.getName()).isEqualTo("input");
 		assertThat(radioButtonElement2.attribute("type").getValue()).isEqualTo("radio");
 		assertThat(radioButtonElement2.attribute("name").getValue()).isEqualTo("pets");
 		assertThat(radioButtonElement2.attribute("checked").getValue()).isEqualTo("checked");
 		assertThat(radioButtonElement2.attribute("value").getValue()).isEqualTo("Spot");
 		assertThat(spanElement2.getStringValue()).isEqualTo("SPOT");
-		Element spanElement3 = (Element) document.getRootElement().elements().get(2);
-		Element radioButtonElement3 = (Element) spanElement3.elements().get(0);
+		Element spanElement3 = document.getRootElement().elements().get(2);
+		Element radioButtonElement3 = spanElement3.elements().get(0);
 		assertThat(radioButtonElement3.getName()).isEqualTo("input");
 		assertThat(radioButtonElement3.attribute("type").getValue()).isEqualTo("radio");
 		assertThat(radioButtonElement3.attribute("name").getValue()).isEqualTo("pets");
 		assertThat(radioButtonElement3.attribute("checked")).as("not checked").isNull();
 		assertThat(radioButtonElement3.attribute("value").getValue()).isEqualTo("Checkers");
 		assertThat(spanElement3.getStringValue()).isEqualTo("CHECKERS");
-		Element spanElement4 = (Element) document.getRootElement().elements().get(3);
-		Element radioButtonElement4 = (Element) spanElement4.elements().get(0);
+		Element spanElement4 = document.getRootElement().elements().get(3);
+		Element radioButtonElement4 = spanElement4.elements().get(0);
 		assertThat(radioButtonElement4.getName()).isEqualTo("input");
 		assertThat(radioButtonElement4.attribute("type").getValue()).isEqualTo("radio");
 		assertThat(radioButtonElement4.attribute("name").getValue()).isEqualTo("pets");
 		assertThat(radioButtonElement4.attribute("checked").getValue()).isEqualTo("checked");
 		assertThat(radioButtonElement4.attribute("value").getValue()).isEqualTo("Fluffy");
 		assertThat(spanElement4.getStringValue()).isEqualTo("FLUFFY");
-		Element spanElement5 = (Element) document.getRootElement().elements().get(4);
-		Element radioButtonElement5 = (Element) spanElement5.elements().get(0);
+		Element spanElement5 = document.getRootElement().elements().get(4);
+		Element radioButtonElement5 = spanElement5.elements().get(0);
 		assertThat(radioButtonElement5.getName()).isEqualTo("input");
 		assertThat(radioButtonElement5.attribute("type").getValue()).isEqualTo("radio");
 		assertThat(radioButtonElement5.attribute("name").getValue()).isEqualTo("pets");
@@ -436,40 +436,40 @@ public class RadioButtonsTagTests extends AbstractFormTagTests {
 
 		SAXReader reader = new SAXReader();
 		Document document = reader.read(new StringReader(output));
-		Element spanElement1 = (Element) document.getRootElement().elements().get(0);
-		Element radioButtonElement1 = (Element) spanElement1.elements().get(0);
+		Element spanElement1 = document.getRootElement().elements().get(0);
+		Element radioButtonElement1 = spanElement1.elements().get(0);
 		assertThat(radioButtonElement1.getName()).isEqualTo("input");
 		assertThat(radioButtonElement1.attribute("type").getValue()).isEqualTo("radio");
 		assertThat(radioButtonElement1.attribute("name").getValue()).isEqualTo("pets");
 		assertThat(radioButtonElement1.attribute("checked").getValue()).isEqualTo("checked");
 		assertThat(radioButtonElement1.attribute("value").getValue()).isEqualTo("Rudiger");
 		assertThat(spanElement1.getStringValue()).isEqualTo("RUDIGER");
-		Element spanElement2 = (Element) document.getRootElement().elements().get(1);
-		Element radioButtonElement2 = (Element) spanElement2.elements().get(0);
+		Element spanElement2 = document.getRootElement().elements().get(1);
+		Element radioButtonElement2 = spanElement2.elements().get(0);
 		assertThat(radioButtonElement2.getName()).isEqualTo("input");
 		assertThat(radioButtonElement2.attribute("type").getValue()).isEqualTo("radio");
 		assertThat(radioButtonElement2.attribute("name").getValue()).isEqualTo("pets");
 		assertThat(radioButtonElement2.attribute("checked").getValue()).isEqualTo("checked");
 		assertThat(radioButtonElement2.attribute("value").getValue()).isEqualTo("Spot");
 		assertThat(spanElement2.getStringValue()).isEqualTo("SPOT");
-		Element spanElement3 = (Element) document.getRootElement().elements().get(2);
-		Element radioButtonElement3 = (Element) spanElement3.elements().get(0);
+		Element spanElement3 = document.getRootElement().elements().get(2);
+		Element radioButtonElement3 = spanElement3.elements().get(0);
 		assertThat(radioButtonElement3.getName()).isEqualTo("input");
 		assertThat(radioButtonElement3.attribute("type").getValue()).isEqualTo("radio");
 		assertThat(radioButtonElement3.attribute("name").getValue()).isEqualTo("pets");
 		assertThat(radioButtonElement3.attribute("checked")).as("not checked").isNull();
 		assertThat(radioButtonElement3.attribute("value").getValue()).isEqualTo("Checkers");
 		assertThat(spanElement3.getStringValue()).isEqualTo("CHECKERS");
-		Element spanElement4 = (Element) document.getRootElement().elements().get(3);
-		Element radioButtonElement4 = (Element) spanElement4.elements().get(0);
+		Element spanElement4 = document.getRootElement().elements().get(3);
+		Element radioButtonElement4 = spanElement4.elements().get(0);
 		assertThat(radioButtonElement4.getName()).isEqualTo("input");
 		assertThat(radioButtonElement4.attribute("type").getValue()).isEqualTo("radio");
 		assertThat(radioButtonElement4.attribute("name").getValue()).isEqualTo("pets");
 		assertThat(radioButtonElement4.attribute("checked").getValue()).isEqualTo("checked");
 		assertThat(radioButtonElement4.attribute("value").getValue()).isEqualTo("Fluffy");
 		assertThat(spanElement4.getStringValue()).isEqualTo("FLUFFY");
-		Element spanElement5 = (Element) document.getRootElement().elements().get(4);
-		Element radioButtonElement5 = (Element) spanElement5.elements().get(0);
+		Element spanElement5 = document.getRootElement().elements().get(4);
+		Element radioButtonElement5 = spanElement5.elements().get(0);
 		assertThat(radioButtonElement5.getName()).isEqualTo("input");
 		assertThat(radioButtonElement5.attribute("type").getValue()).isEqualTo("radio");
 		assertThat(radioButtonElement5.attribute("name").getValue()).isEqualTo("pets");
@@ -549,8 +549,8 @@ public class RadioButtonsTagTests extends AbstractFormTagTests {
 		Document document = reader.read(new StringReader(output));
 		Element rootElement = document.getRootElement();
 		assertThat(rootElement.elements().size()).as("Both tag and hidden element rendered incorrectly").isEqualTo(3);
-		Element spanElement = (Element) document.getRootElement().elements().get(0);
-		Element radioButtonElement = (Element) spanElement.elements().get(0);
+		Element spanElement = document.getRootElement().elements().get(0);
+		Element radioButtonElement = spanElement.elements().get(0);
 		assertThat(radioButtonElement.getName()).isEqualTo("input");
 		assertThat(radioButtonElement.attribute("type").getValue()).isEqualTo("radio");
 		assertThat(radioButtonElement.attribute("name").getValue()).isEqualTo("stringArray");
@@ -573,7 +573,7 @@ public class RadioButtonsTagTests extends AbstractFormTagTests {
 
 		SAXReader reader = new SAXReader();
 		Document document = reader.read(new StringReader(output));
-		Element spanElement = (Element) document.getRootElement().elements().get(0);
+		Element spanElement = document.getRootElement().elements().get(0);
 		assertThat(spanElement.getName()).isEqualTo("element");
 	}
 
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/xslt/XsltViewTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/xslt/XsltViewTests.java
index 71d1b33de5..72c7b13ec2 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/xslt/XsltViewTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/xslt/XsltViewTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -185,9 +185,9 @@ public class XsltViewTests {
 	}
 
 	private void assertRowElement(Element elem, String id, String name, String price) {
-		Element idElem = (Element) elem.elements().get(0);
-		Element nameElem = (Element) elem.elements().get(1);
-		Element priceElem = (Element) elem.elements().get(2);
+		Element idElem = elem.elements().get(0);
+		Element nameElem = elem.elements().get(1);
+		Element priceElem = elem.elements().get(2);
 
 		assertThat(idElem.getText()).as("ID incorrect.").isEqualTo(id);
 		assertThat(nameElem.getText()).as("Name incorrect.").isEqualTo(name);