You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by se...@apache.org on 2013/04/24 20:16:39 UTC
svn commit: r1471575 - in /commons/proper/chain/trunk:
core/src/test/java/org/apache/commons/chain2/impl/
web/src/main/java/org/apache/commons/chain2/web/faces/
Author: sebb
Date: Wed Apr 24 18:16:38 2013
New Revision: 1471575
URL: http://svn.apache.org/r1471575
Log:
Unnecessary casts
Modified:
commons/proper/chain/trunk/core/src/test/java/org/apache/commons/chain2/impl/ContextBaseTestCase.java
commons/proper/chain/trunk/core/src/test/java/org/apache/commons/chain2/impl/TestContextTestCase.java
commons/proper/chain/trunk/web/src/main/java/org/apache/commons/chain2/web/faces/FacesWebContext.java
Modified: commons/proper/chain/trunk/core/src/test/java/org/apache/commons/chain2/impl/ContextBaseTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/core/src/test/java/org/apache/commons/chain2/impl/ContextBaseTestCase.java?rev=1471575&r1=1471574&r2=1471575&view=diff
==============================================================================
--- commons/proper/chain/trunk/core/src/test/java/org/apache/commons/chain2/impl/ContextBaseTestCase.java (original)
+++ commons/proper/chain/trunk/core/src/test/java/org/apache/commons/chain2/impl/ContextBaseTestCase.java Wed Apr 24 18:16:38 2013
@@ -93,32 +93,28 @@ public class ContextBaseTestCase {
value = context.get("foo");
assertNotNull("Returned foo", value);
assertTrue("Returned foo type", value instanceof String);
- assertEquals("Returned foo value", "This is foo",
- (String) value);
+ assertEquals("Returned foo value", "This is foo", value);
context.put("bar", "This is bar");
checkAttributeCount(2);
value = context.get("bar");
assertNotNull("Returned bar", value);
assertTrue("Returned bar type", value instanceof String);
- assertEquals("Returned bar value", "This is bar",
- (String) value);
+ assertEquals("Returned bar value", "This is bar", value);
context.put("baz", "This is baz");
checkAttributeCount(3);
value = context.get("baz");
assertNotNull("Returned baz", value);
assertTrue("Returned baz type", value instanceof String);
- assertEquals("Returned baz value", "This is baz",
- (String) value);
+ assertEquals("Returned baz value", "This is baz", value);
context.put("baz", "This is new baz");
checkAttributeCount(3); // Replaced, not added
value = context.get("baz");
assertNotNull("Returned baz", value);
assertTrue("Returned baz type", value instanceof String);
- assertEquals("Returned baz value", "This is new baz",
- (String) value);
+ assertEquals("Returned baz value", "This is new baz", value);
context.remove("bar");
checkAttributeCount(2);
@@ -321,9 +317,9 @@ public class ContextBaseTestCase {
// Check postconditions
checkAttributeCount(3);
- assertEquals("foo value", (String) context.get("foo"));
- assertEquals("bar value", (String) context.get("bar"));
- assertEquals("baz value", (String) context.get("baz"));
+ assertEquals("foo value", context.get("foo"));
+ assertEquals("bar value", context.get("bar"));
+ assertEquals("baz value", context.get("baz"));
assertTrue(context.containsKey("foo"));
assertTrue(context.containsKey("bar"));
assertTrue(context.containsKey("baz"));
Modified: commons/proper/chain/trunk/core/src/test/java/org/apache/commons/chain2/impl/TestContextTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/core/src/test/java/org/apache/commons/chain2/impl/TestContextTestCase.java?rev=1471575&r1=1471574&r2=1471575&view=diff
==============================================================================
--- commons/proper/chain/trunk/core/src/test/java/org/apache/commons/chain2/impl/TestContextTestCase.java (original)
+++ commons/proper/chain/trunk/core/src/test/java/org/apache/commons/chain2/impl/TestContextTestCase.java Wed Apr 24 18:16:38 2013
@@ -56,8 +56,8 @@ public class TestContextTestCase extends
public void testPristine() {
super.testPristine();
- assertEquals("readOnly", (String) context.get("readOnly"));
- assertEquals("readWrite", (String) context.get("readWrite"));
+ assertEquals("readOnly", context.get("readOnly"));
+ assertEquals("readWrite", context.get("readWrite"));
assertEquals("writeOnly", ((TestContext) context).returnWriteOnly());
}
@@ -80,7 +80,7 @@ public class TestContextTestCase extends
// Expected result
}
assertEquals("readOnly unchanged", "readOnly",
- (String) context.get("readOnly"));
+ context.get("readOnly"));
}
Modified: commons/proper/chain/trunk/web/src/main/java/org/apache/commons/chain2/web/faces/FacesWebContext.java
URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/web/src/main/java/org/apache/commons/chain2/web/faces/FacesWebContext.java?rev=1471575&r1=1471574&r2=1471575&view=diff
==============================================================================
--- commons/proper/chain/trunk/web/src/main/java/org/apache/commons/chain2/web/faces/FacesWebContext.java (original)
+++ commons/proper/chain/trunk/web/src/main/java/org/apache/commons/chain2/web/faces/FacesWebContext.java Wed Apr 24 18:16:38 2013
@@ -106,8 +106,7 @@ public class FacesWebContext extends Web
*/
public Map<String, Object> getApplicationScope() {
@SuppressWarnings("unchecked") // Assume faces is following contract
- Map<String, Object> scope = (Map<String, Object>)
- context.getExternalContext().getApplicationMap();
+ Map<String, Object> scope = context.getExternalContext().getApplicationMap();
return (scope);
}
@@ -118,8 +117,7 @@ public class FacesWebContext extends Web
*/
public Map<String, String> getHeader() {
@SuppressWarnings("unchecked") // Assume faces is following contract
- Map<String, String> headers = (Map<String, String>)
- context.getExternalContext().getRequestHeaderMap();
+ Map<String, String> headers = context.getExternalContext().getRequestHeaderMap();
return (headers);
}
@@ -131,8 +129,7 @@ public class FacesWebContext extends Web
*/
public Map<String, String[]> getHeaderValues() {
@SuppressWarnings("unchecked") // Assume faces is following contract
- Map<String, String[]> headerValues = (Map<String, String[]>)
- context.getExternalContext().getRequestHeaderValuesMap();
+ Map<String, String[]> headerValues = context.getExternalContext().getRequestHeaderValuesMap();
return (headerValues);
}
@@ -144,8 +141,7 @@ public class FacesWebContext extends Web
*/
public Map<String, String> getInitParam() {
@SuppressWarnings("unchecked") // Assume faces is following contract
- Map<String, String> initParams = (Map<String, String>)
- context.getExternalContext().getInitParameterMap();
+ Map<String, String> initParams = context.getExternalContext().getInitParameterMap();
return (initParams);
}
@@ -157,8 +153,7 @@ public class FacesWebContext extends Web
*/
public Map<String, String> getParam() {
@SuppressWarnings("unchecked")
- Map<String, String> params = (Map<String, String>)
- context.getExternalContext().getRequestParameterMap();
+ Map<String, String> params = context.getExternalContext().getRequestParameterMap();
return (params);
}
@@ -170,8 +165,7 @@ public class FacesWebContext extends Web
*/
public Map<String, String[]> getParamValues() {
@SuppressWarnings("unchecked") // Assume faces is following contract
- Map<String, String[]> paramValues = (Map<String, String[]>)
- context.getExternalContext().getRequestParameterValuesMap();
+ Map<String, String[]> paramValues = context.getExternalContext().getRequestParameterValuesMap();
return (paramValues);
}
@@ -184,8 +178,7 @@ public class FacesWebContext extends Web
*/
public Map<String, Cookie> getCookies() {
@SuppressWarnings("unchecked") // Assume faces is following contract
- Map<String, Object> facesCookieMap = (Map<String, Object>)
- context.getExternalContext().getRequestCookieMap();
+ Map<String, Object> facesCookieMap = context.getExternalContext().getRequestCookieMap();
/* This ugly hack was done because the faces API implements
* the cookie collection using <String, Object> instead of <String, Cookie>.
@@ -199,7 +192,7 @@ public class FacesWebContext extends Web
if (cookieObj instanceof Cookie) {
// See comment above about type safety check
@SuppressWarnings("unchecked")
- Map<String, Cookie> cookieMap = (Map<String, Cookie>) Collections.checkedMap(
+ Map<String, Cookie> cookieMap = Collections.checkedMap(
(Map) facesCookieMap, String.class, Cookie.class);
return cookieMap;
@@ -220,8 +213,7 @@ public class FacesWebContext extends Web
*/
public Map<String, Object> getRequestScope() {
@SuppressWarnings("unchecked") // Assume faces is following contract
- Map<String, Object> scope = (Map<String, Object>)
- context.getExternalContext().getRequestMap();
+ Map<String, Object> scope = context.getExternalContext().getRequestMap();
return (scope);
}
@@ -233,8 +225,7 @@ public class FacesWebContext extends Web
*/
public Map<String, Object> getSessionScope() {
@SuppressWarnings("unchecked") // Assume faces is following contract
- Map<String, Object> scope = (Map<String, Object>)
- context.getExternalContext().getSessionMap();
+ Map<String, Object> scope = context.getExternalContext().getSessionMap();
return (scope);
}