You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2012/01/08 14:59:46 UTC
svn commit: r1228848 [2/5] - in /cxf/trunk:
api/src/main/java/org/apache/cxf/message/
api/src/main/java/org/apache/cxf/service/model/
api/src/main/java/org/apache/cxf/ws/addressing/
api/src/main/java/org/apache/cxf/wsdl/ api/src/test/java/org/apache/cx...
Modified: cxf/trunk/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/utils/CorbaUtils.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/utils/CorbaUtils.java?rev=1228848&r1=1228847&r2=1228848&view=diff
==============================================================================
--- cxf/trunk/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/utils/CorbaUtils.java (original)
+++ cxf/trunk/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/utils/CorbaUtils.java Sun Jan 8 13:59:37 2012
@@ -208,7 +208,7 @@ public final class CorbaUtils {
String[] members = new String[enums.size()];
for (int i = 0; i < members.length; ++i) {
- members[i] = ((Enumerator) enums.get(i)).getValue();
+ members[i] = enums.get(i).getValue();
}
name = getTypeCodeName(name);
tc = orb.create_enum_tc(enumType.getRepositoryID(), name, members);
@@ -219,7 +219,7 @@ public final class CorbaUtils {
List<MemberType> list = exceptType.getMember();
StructMember[] members = new StructMember[list.size()];
for (int i = 0; i < members.length; ++i) {
- MemberType member = (MemberType) list.get(i);
+ MemberType member = list.get(i);
members[i] = new StructMember(member.getName(),
getTypeCode(orb, member.getIdltype(), typeMap, seenTypes),
null);
@@ -253,7 +253,7 @@ public final class CorbaUtils {
List<MemberType> list = structType.getMember();
StructMember[] members = new StructMember[list.size()];
for (int i = 0; i < members.length; ++i) {
- MemberType member = (MemberType) list.get(i);
+ MemberType member = list.get(i);
members[i] = new StructMember(member.getName(),
getTypeCode(orb, member.getIdltype(), typeMap, seenTypes),
null);
@@ -381,7 +381,7 @@ public final class CorbaUtils {
return orb.create_union_tc(unionType.getRepositoryID(),
getTypeCodeName(unionType.getName()),
discTC,
- (UnionMember[])members.values().toArray(
+ members.values().toArray(
new UnionMember[members.size()]));
}
}
@@ -420,7 +420,7 @@ public final class CorbaUtils {
public static CorbaTypeImpl getCorbaType(QName idlType, CorbaTypeMap typeMap) {
if (!isPrimitiveIdlType(idlType) && (typeMap != null)) {
- return (CorbaTypeImpl) typeMap.getType(idlType.getLocalPart());
+ return typeMap.getType(idlType.getLocalPart());
}
return null;
}
Modified: cxf/trunk/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaConduitTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaConduitTest.java?rev=1228848&r1=1228847&r2=1228848&view=diff
==============================================================================
--- cxf/trunk/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaConduitTest.java (original)
+++ cxf/trunk/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaConduitTest.java Sun Jan 8 13:59:37 2012
@@ -264,7 +264,7 @@ public class CorbaConduitTest extends As
assertNotNull("list should not be null", list != null);
message.setStreamableArguments(arguments);
- NVList listArgs = (NVList)conduit.getArguments(message);
+ NVList listArgs = conduit.getArguments(message);
assertNotNull("listArgs should not be null", listArgs != null);
assertNotNull("listArgs Item should not be null", listArgs.item(0) != null);
assertEquals("Name should be equal", listArgs.item(0).name(), "object");
@@ -284,12 +284,12 @@ public class CorbaConduitTest extends As
CorbaStreamable arg = message.createStreamableObject(obj1, objName);
CorbaConduit conduit = setupCorbaConduit(false);
- NamedValue ret = (NamedValue)conduit.getReturn(message);
+ NamedValue ret = conduit.getReturn(message);
assertNotNull("Return should not be null", ret != null);
assertEquals("name should be equal", ret.name(), "return");
message.setStreamableReturn(arg);
- NamedValue ret2 = (NamedValue)conduit.getReturn(message);
+ NamedValue ret2 = conduit.getReturn(message);
assertNotNull("Return2 should not be null", ret2 != null);
assertEquals("name should be equal", ret2.name(), "returnName");
}
@@ -356,7 +356,7 @@ public class CorbaConduitTest extends As
//msg.put(CorbaConstants.CORBA_ENDPOINT_OBJECT, obj);
Request r = control.createMock(Request.class);
- NVList nvList = (NVList)orb.create_list(0);
+ NVList nvList = orb.create_list(0);
NamedValue ret = control.createMock(NamedValue.class);
ExceptionList exList = control.createMock(ExceptionList.class);
Modified: cxf/trunk/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaServerConduitTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaServerConduitTest.java?rev=1228848&r1=1228847&r2=1228848&view=diff
==============================================================================
--- cxf/trunk/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaServerConduitTest.java (original)
+++ cxf/trunk/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaServerConduitTest.java Sun Jan 8 13:59:37 2012
@@ -195,7 +195,7 @@ public class CorbaServerConduitTest exte
@Test
public void testBuildRequestResult() {
- NVList list = (NVList)orb.create_list(0);
+ NVList list = orb.create_list(0);
CorbaServerConduit conduit = setupCorbaServerConduit(false);
CorbaMessage msg = control.createMock(CorbaMessage.class);
Exchange exchange = control.createMock(Exchange.class);
@@ -221,7 +221,7 @@ public class CorbaServerConduitTest exte
@Test
public void testBuildRequestResultException() {
- NVList list = (NVList)orb.create_list(0);
+ NVList list = orb.create_list(0);
CorbaServerConduit conduit = setupCorbaServerConduit(false);
CorbaMessage msg = control.createMock(CorbaMessage.class);
Exchange exchange = control.createMock(Exchange.class);
@@ -261,7 +261,7 @@ public class CorbaServerConduitTest exte
arguments[0] = arg;
arguments[0].setMode(org.omg.CORBA.ARG_OUT.value);
- NVList nvlist = (NVList)orb.create_list(2);
+ NVList nvlist = orb.create_list(2);
Any value = orb.create_any();
value.insert_Streamable(arguments[0]);
nvlist.add_value(arguments[0].getName(), value, arguments[0].getMode());
Modified: cxf/trunk/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/TestUtils.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/TestUtils.java?rev=1228848&r1=1228847&r2=1228848&view=diff
==============================================================================
--- cxf/trunk/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/TestUtils.java (original)
+++ cxf/trunk/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/TestUtils.java Sun Jan 8 13:59:37 2012
@@ -62,7 +62,7 @@ public class TestUtils {
"/wsdl_corbabinding/exceptions.wsdl",
"ExceptionTestCORBAService",
"ExceptionTestCORBAPort");
- CorbaBindingFactory corbaBF = (CorbaBindingFactory)factory;
+ CorbaBindingFactory corbaBF = factory;
return (CorbaDestination)corbaBF.getDestination(endpointInfo);
}
@@ -71,7 +71,7 @@ public class TestUtils {
"/wsdl_corbabinding/ComplexTypes.wsdl",
"ComplexTypesCORBAService",
"ComplexTypesCORBAPort");
- CorbaBindingFactory corbaBF = (CorbaBindingFactory)factory;
+ CorbaBindingFactory corbaBF = factory;
return (CorbaDestination)corbaBF.getDestination(endpointInfo);
}
public CorbaDestination getComplexTypesTestDestinationYoko() throws Exception {
@@ -79,7 +79,7 @@ public class TestUtils {
"/wsdl_corbabinding/ComplexTypesYoko.wsdl",
"ComplexTypesCORBAService",
"ComplexTypesCORBAPort");
- CorbaBindingFactory corbaBF = (CorbaBindingFactory)factory;
+ CorbaBindingFactory corbaBF = factory;
return (CorbaDestination)corbaBF.getDestination(endpointInfo);
}
Modified: cxf/trunk/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaObjectReaderTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaObjectReaderTest.java?rev=1228848&r1=1228847&r2=1228848&view=diff
==============================================================================
--- cxf/trunk/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaObjectReaderTest.java (original)
+++ cxf/trunk/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaObjectReaderTest.java Sun Jan 8 13:59:37 2012
@@ -493,7 +493,7 @@ public class CorbaObjectReaderTest exten
// create the following fixed
// fixed<5,2>
- oStream.write_fixed(new java.math.BigDecimal("12345.67").movePointRight((int)2));
+ oStream.write_fixed(new java.math.BigDecimal("12345.67").movePointRight(2));
InputStream iStream = oStream.create_input_stream();
CorbaObjectReader reader = new CorbaObjectReader(iStream);
Modified: cxf/trunk/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaEnumHandlerTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaEnumHandlerTest.java?rev=1228848&r1=1228847&r2=1228848&view=diff
==============================================================================
--- cxf/trunk/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaEnumHandlerTest.java (original)
+++ cxf/trunk/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaEnumHandlerTest.java Sun Jan 8 13:59:37 2012
@@ -84,6 +84,6 @@ public class CorbaEnumHandlerTest extend
obj.setValue(members[1]);
assertTrue(obj.getValue().equals(enumerator1.getValue()));
- assertTrue(obj.getIndex() == (long)1);
+ assertTrue(obj.getIndex() == 1);
}
}
Modified: cxf/trunk/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaFixedHandlerTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaFixedHandlerTest.java?rev=1228848&r1=1228847&r2=1228848&view=diff
==============================================================================
--- cxf/trunk/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaFixedHandlerTest.java (original)
+++ cxf/trunk/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaFixedHandlerTest.java Sun Jan 8 13:59:37 2012
@@ -57,8 +57,8 @@ public class CorbaFixedHandlerTest exten
public void testCorbaFixedHandler() {
Fixed fixedType = new Fixed();
fixedType.setName("FixedType");
- fixedType.setDigits((long)3);
- fixedType.setScale((long)2);
+ fixedType.setDigits(3);
+ fixedType.setScale(2);
QName fixedName = new QName(fixedType.getName());
QName fixedIdlType =
Modified: cxf/trunk/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaHandlerUtilsTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaHandlerUtilsTest.java?rev=1228848&r1=1228847&r2=1228848&view=diff
==============================================================================
--- cxf/trunk/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaHandlerUtilsTest.java (original)
+++ cxf/trunk/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaHandlerUtilsTest.java Sun Jan 8 13:59:37 2012
@@ -61,7 +61,7 @@ public class CorbaHandlerUtilsTest exten
bus = BusFactory.getDefaultBus();
BindingFactoryManager bfm = bus.getExtension(BindingFactoryManager.class);
- factory = (BindingFactory)bfm.getBindingFactory("http://cxf.apache.org/bindings/corba");
+ factory = bfm.getBindingFactory("http://cxf.apache.org/bindings/corba");
bfm.registerBindingFactory(CorbaConstants.NU_WSDL_CORBA, factory);
java.util.Properties props = System.getProperties();
Modified: cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/ReadHeadersInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/ReadHeadersInterceptor.java?rev=1228848&r1=1228847&r2=1228848&view=diff
==============================================================================
--- cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/ReadHeadersInterceptor.java (original)
+++ cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/ReadHeadersInterceptor.java Sun Jan 8 13:59:37 2012
@@ -127,7 +127,7 @@ public class ReadHeadersInterceptor exte
XMLStreamReader xmlReader = message.getContent(XMLStreamReader.class);
if (xmlReader == null) {
- InputStream in = (InputStream)message.getContent(InputStream.class);
+ InputStream in = message.getContent(InputStream.class);
if (in == null) {
throw new RuntimeException("Can't find input stream in message");
}
Modified: cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapActionInInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapActionInInterceptor.java?rev=1228848&r1=1228847&r2=1228848&view=diff
==============================================================================
--- cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapActionInInterceptor.java (original)
+++ cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapActionInInterceptor.java Sun Jan 8 13:59:37 2012
@@ -113,7 +113,7 @@ public class SoapActionInInterceptor ext
return;
}
for (BindingOperationInfo boi : bops) {
- SoapOperationInfo soi = (SoapOperationInfo) boi.getExtensor(SoapOperationInfo.class);
+ SoapOperationInfo soi = boi.getExtensor(SoapOperationInfo.class);
if (soi != null && action.equals(soi.getAction())) {
if (bindingOp != null) {
//more than one op with the same action, will need to parse normally
Modified: cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapHeaderOutFilterInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapHeaderOutFilterInterceptor.java?rev=1228848&r1=1228847&r2=1228848&view=diff
==============================================================================
--- cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapHeaderOutFilterInterceptor.java (original)
+++ cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapHeaderOutFilterInterceptor.java Sun Jan 8 13:59:37 2012
@@ -37,7 +37,7 @@ public class SoapHeaderOutFilterIntercep
Iterator<Header> iter = message.getHeaders().iterator();
while (iter.hasNext()) {
- Header hdr = (Header) iter.next();
+ Header hdr = iter.next();
//Only remove inbound marked headers..
if (hdr.getDirection() == Header.Direction.DIRECTION_IN) {
iter.remove();
Modified: cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapPreProtocolOutInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapPreProtocolOutInterceptor.java?rev=1228848&r1=1228847&r2=1228848&view=diff
==============================================================================
--- cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapPreProtocolOutInterceptor.java (original)
+++ cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapPreProtocolOutInterceptor.java Sun Jan 8 13:59:37 2012
@@ -146,7 +146,7 @@ public class SoapPreProtocolOutIntercept
if (null != dboi) {
boi = dboi;
}
- SoapOperationInfo soi = (SoapOperationInfo) boi.getExtensor(SoapOperationInfo.class);
+ SoapOperationInfo soi = boi.getExtensor(SoapOperationInfo.class);
action = soi == null ? "\"\"" : soi.getAction() == null ? "\"\"" : soi.getAction();
}
}
Modified: cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/model/SoapBindingInfo.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/model/SoapBindingInfo.java?rev=1228848&r1=1228847&r2=1228848&view=diff
==============================================================================
--- cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/model/SoapBindingInfo.java (original)
+++ cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/model/SoapBindingInfo.java Sun Jan 8 13:59:37 2012
@@ -101,7 +101,7 @@ public class SoapBindingInfo extends Bin
* @return
*/
public String getSoapAction(OperationInfo operation) {
- BindingOperationInfo b = (BindingOperationInfo) getOperation(operation.getName());
+ BindingOperationInfo b = getOperation(operation.getName());
SoapOperationInfo opInfo = b.getExtensor(SoapOperationInfo.class);
if (opInfo != null && opInfo.getAction() != null) {
Modified: cxf/trunk/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/RPCInInterceptorTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/RPCInInterceptorTest.java?rev=1228848&r1=1228847&r2=1228848&view=diff
==============================================================================
--- cxf/trunk/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/RPCInInterceptorTest.java (original)
+++ cxf/trunk/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/RPCInInterceptorTest.java Sun Jan 8 13:59:37 2012
@@ -85,7 +85,7 @@ public class RPCInInterceptorTest extend
interceptor.handleMessage(soapMessage);
- List<?> parameters = (List<?>) soapMessage.getContent(List.class);
+ List<?> parameters = soapMessage.getContent(List.class);
assertEquals(1, parameters.size());
Object obj = parameters.get(0);
@@ -104,7 +104,7 @@ public class RPCInInterceptorTest extend
interceptor.handleMessage(soapMessage);
- List<?> parameters = (List<?>) soapMessage.getContent(List.class);
+ List<?> parameters = soapMessage.getContent(List.class);
assertEquals(2, parameters.size());
Object obj = parameters.get(1);
Modified: cxf/trunk/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/ReadHeaderInterceptorTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/ReadHeaderInterceptorTest.java?rev=1228848&r1=1228847&r2=1228848&view=diff
==============================================================================
--- cxf/trunk/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/ReadHeaderInterceptorTest.java (original)
+++ cxf/trunk/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/ReadHeaderInterceptorTest.java Sun Jan 8 13:59:37 2012
@@ -130,10 +130,10 @@ public class ReadHeaderInterceptorTest e
}
assertEquals(2, reservationChilds.size());
assertEquals("reference", reservationChilds.get(0).getLocalName());
- assertEquals("uuid:093a2da1-q345-739r-ba5d-pqff98fe8j7d", ((Element)reservationChilds.get(0))
+ assertEquals("uuid:093a2da1-q345-739r-ba5d-pqff98fe8j7d", reservationChilds.get(0)
.getTextContent());
- assertEquals("dateAndTime", ((Element)reservationChilds.get(1)).getLocalName());
- assertEquals("2001-11-29T13:20:00.000-05:00", ((Element)reservationChilds.get(1))
+ assertEquals("dateAndTime", reservationChilds.get(1).getLocalName());
+ assertEquals("2001-11-29T13:20:00.000-05:00", reservationChilds.get(1)
.getTextContent());
}
Modified: cxf/trunk/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapOutInterceptorTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapOutInterceptorTest.java?rev=1228848&r1=1228847&r2=1228848&view=diff
==============================================================================
--- cxf/trunk/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapOutInterceptorTest.java (original)
+++ cxf/trunk/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapOutInterceptorTest.java Sun Jan 8 13:59:37 2012
@@ -69,7 +69,7 @@ public class SoapOutInterceptorTest exte
assertNotNull(soapMessage.getHeaders());
- Exception oe = (Exception)soapMessage.getContent(Exception.class);
+ Exception oe = soapMessage.getContent(Exception.class);
if (oe != null) {
throw oe;
}
@@ -91,7 +91,7 @@ public class SoapOutInterceptorTest exte
assertNotNull(soapMessage.getHeaders());
- Exception oe = (Exception)soapMessage.getContent(Exception.class);
+ Exception oe = soapMessage.getContent(Exception.class);
if (oe != null) {
throw oe;
}
Modified: cxf/trunk/rt/core/src/main/java/org/apache/cxf/binding/BindingFactoryManagerImpl.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/java/org/apache/cxf/binding/BindingFactoryManagerImpl.java?rev=1228848&r1=1228847&r2=1228848&view=diff
==============================================================================
--- cxf/trunk/rt/core/src/main/java/org/apache/cxf/binding/BindingFactoryManagerImpl.java (original)
+++ cxf/trunk/rt/core/src/main/java/org/apache/cxf/binding/BindingFactoryManagerImpl.java Sun Jan 8 13:59:37 2012
@@ -135,7 +135,7 @@ public final class BindingFactoryManager
if (bean instanceof AbstractBindingFactory) {
for (String ns
: ((AbstractBindingFactory)bean).getActivationNamespaces()) {
- registerBindingFactory(ns, (BindingFactory)bean);
+ registerBindingFactory(ns, bean);
}
} else {
try {
Modified: cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/blueprint/BundleDelegatingClassLoader.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/blueprint/BundleDelegatingClassLoader.java?rev=1228848&r1=1228847&r2=1228848&view=diff
==============================================================================
--- cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/blueprint/BundleDelegatingClassLoader.java (original)
+++ cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/blueprint/BundleDelegatingClassLoader.java Sun Jan 8 13:59:37 2012
@@ -83,7 +83,7 @@ public class BundleDelegatingClassLoader
urls = AccessController.doPrivileged(new PrivilegedExceptionAction<Enumeration<URL>>() {
@SuppressWarnings("unchecked")
public Enumeration<URL> run() throws IOException {
- return (Enumeration<URL>)bundle.getResources(name);
+ return bundle.getResources(name);
}
});
Modified: cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/blueprint/ConfigurerImpl.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/blueprint/ConfigurerImpl.java?rev=1228848&r1=1228847&r2=1228848&view=diff
==============================================================================
--- cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/blueprint/ConfigurerImpl.java (original)
+++ cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/blueprint/ConfigurerImpl.java Sun Jan 8 13:59:37 2012
@@ -125,7 +125,7 @@ public class ConfigurerImpl implements C
}
if (cm instanceof BeanMetadata) {
ReflectionUtil.setAccessible(m);
- m.invoke(container, (BeanMetadata)cm, beanInstance);
+ m.invoke(container, cm, beanInstance);
}
} else {
//Aries blueprint 0.3.x
Modified: cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/osgi/ManagedWorkQueueList.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/osgi/ManagedWorkQueueList.java?rev=1228848&r1=1228847&r2=1228848&view=diff
==============================================================================
--- cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/osgi/ManagedWorkQueueList.java (original)
+++ cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/osgi/ManagedWorkQueueList.java Sun Jan 8 13:59:37 2012
@@ -56,7 +56,7 @@ public class ManagedWorkQueueList implem
return;
}
Dictionary<String, String> properties = CastUtils.cast(props);
- String queueName = (String)properties.get(AutomaticWorkQueueImpl.PROPERTY_NAME);
+ String queueName = properties.get(AutomaticWorkQueueImpl.PROPERTY_NAME);
if (queues.containsKey(queueName)) {
queues.get(queueName).update(properties);
} else {
Modified: cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/spring/SpringBeanLocator.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/spring/SpringBeanLocator.java?rev=1228848&r1=1228847&r2=1228848&view=diff
==============================================================================
--- cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/spring/SpringBeanLocator.java (original)
+++ cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/spring/SpringBeanLocator.java Sun Jan 8 13:59:37 2012
@@ -243,7 +243,7 @@ public class SpringBeanLocator implement
return true;
}
} else {
- if (searchValue.equals((String)o)) {
+ if (searchValue.equals(o)) {
return true;
}
}
Modified: cxf/trunk/rt/core/src/main/java/org/apache/cxf/configuration/spring/ConfigurerImpl.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/java/org/apache/cxf/configuration/spring/ConfigurerImpl.java?rev=1228848&r1=1228847&r2=1228848&view=diff
==============================================================================
--- cxf/trunk/rt/core/src/main/java/org/apache/cxf/configuration/spring/ConfigurerImpl.java (original)
+++ cxf/trunk/rt/core/src/main/java/org/apache/cxf/configuration/spring/ConfigurerImpl.java Sun Jan 8 13:59:37 2012
@@ -134,7 +134,7 @@ public class ConfigurerImpl extends Bean
final String beanName = bn;
setBeanWiringInfoResolver(new BeanWiringInfoResolver() {
public BeanWiringInfo resolveWiringInfo(Object instance) {
- if (null != beanName && !"".equals(beanName)) {
+ if (!"".equals(beanName)) {
return new BeanWiringInfo(beanName);
}
return null;
Modified: cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java?rev=1228848&r1=1228847&r2=1228848&view=diff
==============================================================================
--- cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java (original)
+++ cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java Sun Jan 8 13:59:37 2012
@@ -506,9 +506,7 @@ public class ClientImpl
message.put(Message.INVOCATION_CONTEXT, context);
setContext(reqContext, message);
- if (null != reqContext) {
- exchange.putAll(reqContext);
- }
+ exchange.putAll(reqContext);
setParameters(params, message);
Modified: cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/AbstractFaultChainInitiatorObserver.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/AbstractFaultChainInitiatorObserver.java?rev=1228848&r1=1228847&r2=1228848&view=diff
==============================================================================
--- cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/AbstractFaultChainInitiatorObserver.java (original)
+++ cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/AbstractFaultChainInitiatorObserver.java Sun Jan 8 13:59:37 2012
@@ -74,7 +74,7 @@ public abstract class AbstractFaultChain
if (!(ex instanceof Fault)) {
ex = new Fault(ex);
}
- FaultMode mode = (FaultMode)message.get(FaultMode.class);
+ FaultMode mode = message.get(FaultMode.class);
faultMessage = exchange.getOutMessage();
if (null == faultMessage) {
Modified: cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/AbstractInDatabindingInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/AbstractInDatabindingInterceptor.java?rev=1228848&r1=1228847&r2=1228848&view=diff
==============================================================================
--- cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/AbstractInDatabindingInterceptor.java (original)
+++ cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/AbstractInDatabindingInterceptor.java Sun Jan 8 13:59:37 2012
@@ -167,7 +167,7 @@ public abstract class AbstractInDatabind
continue;
}
- MessagePartInfo p = (MessagePartInfo)msgInfo.getMessageParts().get(index);
+ MessagePartInfo p = msgInfo.getMessageParts().get(index);
if (name.getNamespaceURI() == null || name.getNamespaceURI().length() == 0) {
// message part has same namespace with the message
name = new QName(p.getMessageInfo().getName().getNamespaceURI(), name.getLocalPart());
Modified: cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/BareInInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/BareInInterceptor.java?rev=1228848&r1=1228847&r2=1228848&view=diff
==============================================================================
--- cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/BareInInterceptor.java (original)
+++ cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/BareInInterceptor.java Sun Jan 8 13:59:37 2012
@@ -100,7 +100,7 @@ public class BareInInterceptor extends A
}
}
- } else if (msgInfo == null) {
+ } else {
// XXX - Is the call to
// AbstractInDatabindingInterceptor.getMessageInfo()
// necessary? Should we put the BindingMessageInfo on
Modified: cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/ClientFaultConverter.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/ClientFaultConverter.java?rev=1228848&r1=1228847&r2=1228848&view=diff
==============================================================================
--- cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/ClientFaultConverter.java (original)
+++ cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/ClientFaultConverter.java Sun Jan 8 13:59:37 2012
@@ -184,7 +184,7 @@ public class ClientFaultConverter extend
} catch (Exception e1) {
LogUtils.log(LOG, Level.INFO, "EXCEPTION_WHILE_CREATING_EXCEPTION", e1, e1.getMessage());
}
- } else if (e != null) {
+ } else {
if (fault.getMessage() != null) {
Field f;
try {
@@ -268,7 +268,7 @@ public class ClientFaultConverter extend
}
try {
Field field = cls.getField("TYPE");
- Object obj = (Object)cls;
+ Object obj = cls;
Object type = field.get(obj);
if (type instanceof Class) {
return (Class<?>)type;
Modified: cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/StaxInInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/StaxInInterceptor.java?rev=1228848&r1=1228847&r2=1228848&view=diff
==============================================================================
--- cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/StaxInInterceptor.java (original)
+++ cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/StaxInInterceptor.java Sun Jan 8 13:59:37 2012
@@ -121,7 +121,7 @@ public class StaxInInterceptor extends A
if (o instanceof XMLInputFactory) {
return (XMLInputFactory)o;
} else if (o != null) {
- XMLInputFactory xif = (XMLInputFactory)factories.get(o);
+ XMLInputFactory xif = factories.get(o);
if (xif == null) {
Class<?> cls;
if (o instanceof Class) {
Modified: cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/StaxOutInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/StaxOutInterceptor.java?rev=1228848&r1=1228847&r2=1228848&view=diff
==============================================================================
--- cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/StaxOutInterceptor.java (original)
+++ cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/StaxOutInterceptor.java Sun Jan 8 13:59:37 2012
@@ -118,7 +118,7 @@ public class StaxOutInterceptor extends
m.put(FORCE_START_DOCUMENT, Boolean.TRUE);
return (XMLOutputFactory)o;
} else if (o != null) {
- XMLOutputFactory xif = (XMLOutputFactory)factories.get(o);
+ XMLOutputFactory xif = factories.get(o);
if (xif == null) {
Class<?> cls;
if (o instanceof Class) {
Modified: cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/URIMappingInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/URIMappingInterceptor.java?rev=1228848&r1=1228847&r2=1228848&view=diff
==============================================================================
--- cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/URIMappingInterceptor.java (original)
+++ cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/URIMappingInterceptor.java Sun Jan 8 13:59:37 2012
@@ -151,7 +151,7 @@ public class URIMappingInterceptor exten
if (rest != null && rest.size() > 0) {
LOG.fine("Set the following parameters to null: " + rest);
for (Iterator<String> iter = rest.iterator(); iter.hasNext();) {
- String key = (String)iter.next();
+ String key = iter.next();
orderedParameters.put(key, null);
}
}
@@ -221,7 +221,7 @@ public class URIMappingInterceptor exten
// TODO check the parameter name here
Object param = null;
- if (type != null && type.isPrimitive() && queries.get(key) != null) {
+ if (type.isPrimitive() && queries.get(key) != null) {
param = PrimitiveUtils.read(queries.get(key), type);
} else {
param = readType(queries.get(key), type);
Modified: cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/security/JAASLoginInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/security/JAASLoginInterceptor.java?rev=1228848&r1=1228847&r2=1228848&view=diff
==============================================================================
--- cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/security/JAASLoginInterceptor.java (original)
+++ cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/security/JAASLoginInterceptor.java Sun Jan 8 13:59:37 2012
@@ -96,7 +96,7 @@ public class JAASLoginInterceptor extend
String name = null;
String password = null;
- AuthorizationPolicy policy = (AuthorizationPolicy)message.get(AuthorizationPolicy.class);
+ AuthorizationPolicy policy = message.get(AuthorizationPolicy.class);
if (policy != null) {
name = policy.getUserName();
password = policy.getPassword();
Modified: cxf/trunk/rt/core/src/main/java/org/apache/cxf/transport/http/UrlUtilities.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/java/org/apache/cxf/transport/http/UrlUtilities.java?rev=1228848&r1=1228847&r2=1228848&view=diff
==============================================================================
--- cxf/trunk/rt/core/src/main/java/org/apache/cxf/transport/http/UrlUtilities.java (original)
+++ cxf/trunk/rt/core/src/main/java/org/apache/cxf/transport/http/UrlUtilities.java Sun Jan 8 13:59:37 2012
@@ -42,7 +42,7 @@ public final class UrlUtilities {
Map<String, String> ht = new HashMap<String, String>();
StringTokenizer st = new StringTokenizer(s, "&");
while (st.hasMoreTokens()) {
- String pair = (String)st.nextToken();
+ String pair = st.nextToken();
int pos = pair.indexOf('=');
if (pos == -1) {
ht.put(pair.toLowerCase(), "");
Modified: cxf/trunk/rt/core/src/main/java/org/apache/cxf/workqueue/AutomaticWorkQueueImpl.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/java/org/apache/cxf/workqueue/AutomaticWorkQueueImpl.java?rev=1228848&r1=1228847&r2=1228848&view=diff
==============================================================================
--- cxf/trunk/rt/core/src/main/java/org/apache/cxf/workqueue/AutomaticWorkQueueImpl.java (original)
+++ cxf/trunk/rt/core/src/main/java/org/apache/cxf/workqueue/AutomaticWorkQueueImpl.java Sun Jan 8 13:59:37 2012
@@ -557,23 +557,23 @@ public class AutomaticWorkQueueImpl impl
return executor.getActiveCount();
}
public void update(Dictionary<String, String> config) {
- String s = (String)config.get("highWaterMark");
+ String s = config.get("highWaterMark");
if (s != null) {
this.highWaterMark = Integer.parseInt(s);
}
- s = (String)config.get("lowWaterMark");
+ s = config.get("lowWaterMark");
if (s != null) {
this.lowWaterMark = Integer.parseInt(s);
}
- s = (String)config.get("initialSize");
+ s = config.get("initialSize");
if (s != null) {
this.initialThreads = Integer.parseInt(s);
}
- s = (String)config.get("dequeueTimeout");
+ s = config.get("dequeueTimeout");
if (s != null) {
this.dequeueTimeout = Long.parseLong(s);
}
- s = (String)config.get("queueSize");
+ s = config.get("queueSize");
if (s != null) {
this.maxQueueSize = Integer.parseInt(s);
}
Modified: cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLServiceBuilder.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLServiceBuilder.java?rev=1228848&r1=1228847&r2=1228848&view=diff
==============================================================================
--- cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLServiceBuilder.java (original)
+++ cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLServiceBuilder.java Sun Jan 8 13:59:37 2012
@@ -21,7 +21,6 @@ package org.apache.cxf.wsdl11;
import java.util.ArrayList;
import java.util.Collection;
-import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
@@ -428,10 +427,10 @@ public class WSDLServiceBuilder {
if (null != elements && elements.size() > 0) {
for (ExtensibilityElement el : CastUtils.cast(elements, ExtensibilityElement.class)) {
if (el instanceof SOAPBinding) {
- ns = (String)((SOAPBinding)el).getTransportURI();
+ ns = ((SOAPBinding)el).getTransportURI();
break;
} else if (el instanceof SOAP12Binding) {
- ns = (String)((SOAP12Binding)el).getTransportURI();
+ ns = ((SOAP12Binding)el).getTransportURI();
break;
// TODO: this is really ugly, but how to link between
// this binding and this transport ?
@@ -457,8 +456,7 @@ public class WSDLServiceBuilder {
if (factory instanceof WSDLEndpointFactory) {
WSDLEndpointFactory wFactory = (WSDLEndpointFactory)factory;
ei = wFactory.createEndpointInfo(service, bi,
- port == null ? Collections.emptyList()
- : port.getExtensibilityElements());
+ port.getExtensibilityElements());
}
if (ei == null) {
Modified: cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/extension/ExtensionTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/extension/ExtensionTest.java?rev=1228848&r1=1228847&r2=1228848&view=diff
==============================================================================
--- cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/extension/ExtensionTest.java (original)
+++ cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/extension/ExtensionTest.java Sun Jan 8 13:59:37 2012
@@ -89,7 +89,7 @@ public class ExtensionTest extends Asser
e.setInterfaceName(Assert.class.getName());
Class<?> cls = e.loadInterface(cl);
- assertTrue("Object is not type Class", cls instanceof Class);
+ assertNotNull(cls);
}
class MyServiceConstructorThrowsException {
Modified: cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/AegisXMLStreamDataWriter.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/AegisXMLStreamDataWriter.java?rev=1228848&r1=1228847&r2=1228848&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/AegisXMLStreamDataWriter.java (original)
+++ cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/AegisXMLStreamDataWriter.java Sun Jan 8 13:59:37 2012
@@ -112,7 +112,7 @@ public class AegisXMLStreamDataWriter ex
java.lang.reflect.Type objectType) throws Exception {
AegisType aegisType = null;
if (objectType instanceof Class) {
- aegisType = getContext().getTypeMapping().getType((Class<?>)objectType);
+ aegisType = getContext().getTypeMapping().getType(objectType);
}
if (aegisType == null) {
TypeCreator creator = getContext().getTypeMapping().getTypeCreator();
Modified: cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/BeanType.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/BeanType.java?rev=1228848&r1=1228847&r2=1228848&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/BeanType.java (original)
+++ cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/BeanType.java Sun Jan 8 13:59:37 2012
@@ -587,7 +587,7 @@ public class BeanType extends AegisType
AegisType superType = tm.getType(c);
if (superType == null) {
// if we call createType, we know that we'll get a BeanType. */
- superType = (BeanType)getTypeMapping().getTypeCreator().createType(c);
+ superType = getTypeMapping().getTypeCreator().createType(c);
if (superType != null) {
tm.register(superType);
this.info.setExtension(true);
Modified: cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/XMLBeanTypeInfo.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/XMLBeanTypeInfo.java?rev=1228848&r1=1228847&r2=1228848&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/XMLBeanTypeInfo.java (original)
+++ cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/XMLBeanTypeInfo.java Sun Jan 8 13:59:37 2012
@@ -179,7 +179,7 @@ public class XMLBeanTypeInfo extends Bea
for (Element mapping2 : mappings) {
List<Element> elements = DOMUtils.getChildrenWithName(mapping2, "", "property");
for (int i = 0; i < elements.size(); i++) {
- Element e = (Element)elements.get(i);
+ Element e = elements.get(i);
String name = DOMUtils.getAttributeValueEmptyNull(e, "name");
if (name != null && name.equals(name2)) {
Modified: cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/xml/SourceType.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/xml/SourceType.java?rev=1228848&r1=1228847&r2=1228848&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/xml/SourceType.java (original)
+++ cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/xml/SourceType.java Sun Jan 8 13:59:37 2012
@@ -97,7 +97,7 @@ public class SourceType extends AegisTyp
StaxUtils.writeElement(element, writer, false);
} else {
- StaxUtils.copy((Source)object, writer);
+ StaxUtils.copy(object, writer);
}
}
Modified: cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/client/ClientServiceConfigTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/client/ClientServiceConfigTest.java?rev=1228848&r1=1228847&r2=1228848&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/client/ClientServiceConfigTest.java (original)
+++ cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/client/ClientServiceConfigTest.java Sun Jan 8 13:59:37 2012
@@ -62,7 +62,7 @@ public class ClientServiceConfigTest ext
JaxWsProxyFactoryBean factory = new JaxWsProxyFactoryBean();
factory.setDataBinding(new AegisDatabinding());
factory.setAddress("local://JaxWsEcho");
- Echo client = (Echo) factory.create(Echo.class);
+ Echo client = factory.create(Echo.class);
Holder<String> sholder = new Holder<String>();
client.echo("Channa Doll", sholder);
assertEquals("Channa Doll", sholder.value);
Modified: cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/AnnotatedTypeTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/AnnotatedTypeTest.java?rev=1228848&r1=1228847&r2=1228848&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/AnnotatedTypeTest.java (original)
+++ cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/AnnotatedTypeTest.java Sun Jan 8 13:59:37 2012
@@ -78,7 +78,7 @@ public class AnnotatedTypeTest extends A
} else {
fail("Unexpected element name: " + element.getLocalPart());
}
- element = (QName)elements.next();
+ element = elements.next();
assertFalse(elements.hasNext());
custom = info.getType(element);
@@ -140,7 +140,7 @@ public class AnnotatedTypeTest extends A
assertTrue(elements.hasNext());
// minOccurs = 1 second
- element = (QName)elements.next();
+ element = elements.next();
if ("minOccursProperty".equals(element.getLocalPart())) {
assertEquals(1, info.getMinOccurs(element));
} else {
Modified: cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/JaxbTypeTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/JaxbTypeTest.java?rev=1228848&r1=1228847&r2=1228848&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/JaxbTypeTest.java (original)
+++ cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/JaxbTypeTest.java Sun Jan 8 13:59:37 2012
@@ -78,7 +78,7 @@ public class JaxbTypeTest extends Abstra
} else {
fail("Unexpected element name: " + element.getLocalPart());
}
- element = (QName)elements.next();
+ element = elements.next();
assertFalse(elements.hasNext());
custom = info.getType(element);
@@ -140,7 +140,7 @@ public class JaxbTypeTest extends Abstra
assertTrue(elements.hasNext());
// minOccurs = 1 second
- element = (QName)elements.next();
+ element = elements.next();
if ("minOccursProperty".equals(element.getLocalPart())) {
assertEquals(1, info.getMinOccurs(element));
} else {
Modified: cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/XFireTypeTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/XFireTypeTest.java?rev=1228848&r1=1228847&r2=1228848&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/XFireTypeTest.java (original)
+++ cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/XFireTypeTest.java Sun Jan 8 13:59:37 2012
@@ -78,7 +78,7 @@ public class XFireTypeTest extends Abstr
} else {
fail("Unexpected element name: " + element.getLocalPart());
}
- element = (QName)elements.next();
+ element = elements.next();
assertFalse(elements.hasNext());
custom = info.getType(element);
@@ -140,7 +140,7 @@ public class XFireTypeTest extends Abstr
assertTrue(elements.hasNext());
// minOccurs = 1 second
- element = (QName)elements.next();
+ element = elements.next();
if ("minOccursProperty".equals(element.getLocalPart())) {
assertEquals(1, info.getMinOccurs(element));
} else {
Modified: cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java?rev=1228848&r1=1228847&r2=1228848&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java (original)
+++ cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java Sun Jan 8 13:59:37 2012
@@ -704,7 +704,7 @@ public final class JAXBEncoderDecoder {
Type tp2 = ((ParameterizedType)genericType).getRawType();
if (tp2 instanceof Class) {
Class<?> cls = (Class<?>)tp2;
- if (!cls.isInterface() && List.class.isAssignableFrom((Class<?>)cls)) {
+ if (!cls.isInterface() && List.class.isAssignableFrom(cls)) {
try {
return CastUtils.cast((List<?>)cls.newInstance());
} catch (Exception e) {
Modified: cxf/trunk/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/BareInInterceptorTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/BareInInterceptorTest.java?rev=1228848&r1=1228847&r2=1228848&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/BareInInterceptorTest.java (original)
+++ cxf/trunk/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/BareInInterceptorTest.java Sun Jan 8 13:59:37 2012
@@ -150,7 +150,7 @@ public class BareInInterceptorTest exten
message.setContent(XMLStreamReader.class, XMLInputFactory.newInstance()
.createXMLStreamReader(getTestStream(getClass(), "resources/bareNoParamDocLitBareReq.xml")));
- XMLStreamReader reader = (XMLStreamReader)message.getContent(XMLStreamReader.class);
+ XMLStreamReader reader = message.getContent(XMLStreamReader.class);
// skip to the end element of soap body, so that we can serve an empty request to
// interceptor
StaxUtils.skipToStartOfElement(reader);
Modified: cxf/trunk/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/DocLiteralInInterceptorTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/DocLiteralInInterceptorTest.java?rev=1228848&r1=1228847&r2=1228848&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/DocLiteralInInterceptorTest.java (original)
+++ cxf/trunk/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/DocLiteralInInterceptorTest.java Sun Jan 8 13:59:37 2012
@@ -99,7 +99,7 @@ public class DocLiteralInInterceptorTest
message.setContent(XMLStreamReader.class, XMLInputFactory.newInstance()
.createXMLStreamReader(getTestStream(getClass(), "resources/GreetMeDocLiteralReq.xml")));
- XMLStreamReader reader = (XMLStreamReader)message.getContent(XMLStreamReader.class);
+ XMLStreamReader reader = message.getContent(XMLStreamReader.class);
// skip the start element of soap body
StaxUtils.skipToStartOfElement(reader);
@@ -125,7 +125,7 @@ public class DocLiteralInInterceptorTest
DocLiteralInInterceptor interceptor = new DocLiteralInInterceptor();
message.setContent(XMLStreamReader.class, XMLInputFactory.newInstance()
.createXMLStreamReader(getTestStream(getClass(), "resources/sayHiDocLitBareReq.xml")));
- XMLStreamReader reader = (XMLStreamReader)message.getContent(XMLStreamReader.class);
+ XMLStreamReader reader = message.getContent(XMLStreamReader.class);
// skip the start element of soap body
StaxUtils.skipToStartOfElement(reader);
@@ -153,7 +153,7 @@ public class DocLiteralInInterceptorTest
message.setContent(XMLStreamReader.class, XMLInputFactory.newInstance()
.createXMLStreamReader(getTestStream(getClass(), "resources/bareNoParamDocLitBareReq.xml")));
- XMLStreamReader reader = (XMLStreamReader)message.getContent(XMLStreamReader.class);
+ XMLStreamReader reader = message.getContent(XMLStreamReader.class);
// skip the start element of soap body, so that we can serve an empty request to
// interceptor
StaxUtils.skipToStartOfElement(reader);
Modified: cxf/trunk/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBWrapperHelperTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBWrapperHelperTest.java?rev=1228848&r1=1228847&r2=1228848&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBWrapperHelperTest.java (original)
+++ cxf/trunk/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBWrapperHelperTest.java Sun Jan 8 13:59:37 2012
@@ -76,7 +76,7 @@ public class JAXBWrapperHelperTest exten
assertTrue(lst.get(2) instanceof boolean[]);
assertTrue(((boolean[])lst.get(2))[0]);
assertFalse(((boolean[])lst.get(2))[1]);
- assertEquals("hello", (String)lst.get(3));
+ assertEquals("hello", lst.get(3));
lst.set(0, Boolean.TRUE);
Object o = wh.createWrapperObject(lst);
Modified: cxf/trunk/rt/databinding/jibx/src/main/java/org/apache/cxf/jibx/JibxSimpleTypes.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/jibx/src/main/java/org/apache/cxf/jibx/JibxSimpleTypes.java?rev=1228848&r1=1228847&r2=1228848&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/jibx/src/main/java/org/apache/cxf/jibx/JibxSimpleTypes.java (original)
+++ cxf/trunk/rt/databinding/jibx/src/main/java/org/apache/cxf/jibx/JibxSimpleTypes.java Sun Jan 8 13:59:37 2012
@@ -177,9 +177,9 @@ public final class JibxSimpleTypes {
public static QName schemaType(final Class<?> type) {
String jtype = type.getName();
- QName stype = (QName)simplePrimitiveTypeMap.get(jtype);
+ QName stype = simplePrimitiveTypeMap.get(jtype);
if (stype == null) {
- stype = (QName)simpleObjectTypeMap.get(jtype);
+ stype = simpleObjectTypeMap.get(jtype);
}
return stype;
}
Modified: cxf/trunk/rt/databinding/jibx/src/main/java/org/apache/cxf/jibx/JibxUtil.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/jibx/src/main/java/org/apache/cxf/jibx/JibxUtil.java?rev=1228848&r1=1228847&r2=1228848&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/jibx/src/main/java/org/apache/cxf/jibx/JibxUtil.java (original)
+++ cxf/trunk/rt/databinding/jibx/src/main/java/org/apache/cxf/jibx/JibxUtil.java Sun Jan 8 13:59:37 2012
@@ -173,9 +173,9 @@ public final class JibxUtil {
}
public static QName getSchemaType(final String jtype) {
- QName stype = (QName)simplePrimitiveTypeMap.get(jtype);
+ QName stype = simplePrimitiveTypeMap.get(jtype);
if (stype == null) {
- stype = (QName)simpleObjectTypeMap.get(jtype);
+ stype = simpleObjectTypeMap.get(jtype);
}
return stype;
}
Modified: cxf/trunk/rt/databinding/sdo/src/main/java/org/apache/cxf/sdo/tools/SDODatabinding.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/sdo/src/main/java/org/apache/cxf/sdo/tools/SDODatabinding.java?rev=1228848&r1=1228847&r2=1228848&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/sdo/src/main/java/org/apache/cxf/sdo/tools/SDODatabinding.java (original)
+++ cxf/trunk/rt/databinding/sdo/src/main/java/org/apache/cxf/sdo/tools/SDODatabinding.java Sun Jan 8 13:59:37 2012
@@ -243,7 +243,7 @@ public class SDODatabinding extends XSD2
if (eClassifier instanceof EClass) {
// complex type
- GenClass genEClass = (GenClass)genClasses.get(eClassifier);
+ GenClass genEClass = genClasses.get(eClassifier);
if (genEClass != null) {
name = genEClass.getGenPackage().getInterfacePackageName()
+ '.' + genEClass.getInterfaceName();
Modified: cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/ServerWebApplicationException.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/ServerWebApplicationException.java?rev=1228848&r1=1228847&r2=1228848&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/ServerWebApplicationException.java (original)
+++ cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/ServerWebApplicationException.java Sun Jan 8 13:59:37 2012
@@ -86,7 +86,7 @@ public class ServerWebApplicationExcepti
@SuppressWarnings("unchecked")
public MultivaluedMap<String, String> getHeaders() {
- return (MultivaluedMap<String, String>)((MultivaluedMap)super.getResponse().getMetadata());
+ return (MultivaluedMap)super.getResponse().getMetadata();
}
@Override
@@ -179,7 +179,7 @@ public class ServerWebApplicationExcepti
}
return (T)reader.readFrom(entityCls, entityCls, annotations, mt,
- (MultivaluedMap<String, String>)headers,
+ headers,
inputStream);
} catch (Exception ex) {
throw new ClientWebApplicationException(ex);
Modified: cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/cors/CrossOriginResourceSharingFilter.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/cors/CrossOriginResourceSharingFilter.java?rev=1228848&r1=1228847&r2=1228848&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/cors/CrossOriginResourceSharingFilter.java (original)
+++ cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/cors/CrossOriginResourceSharingFilter.java Sun Jan 8 13:59:37 2012
@@ -331,7 +331,7 @@ public class CrossOriginResourceSharingF
/* Common to simple and preflight */
rbuilder.header(CorsHeaderConstants.HEADER_AC_ALLOW_ORIGIN,
- (String)m.getExchange().get(CorsHeaderConstants.HEADER_ORIGIN));
+ m.getExchange().get(CorsHeaderConstants.HEADER_ORIGIN));
rbuilder.header(CorsHeaderConstants.HEADER_AC_ALLOW_CREDENTIALS,
Boolean.toString(allowCredentials));
Modified: cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/SecurityContextImpl.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/SecurityContextImpl.java?rev=1228848&r1=1228847&r2=1228848&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/SecurityContextImpl.java (original)
+++ cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/SecurityContextImpl.java Sun Jan 8 13:59:37 2012
@@ -47,7 +47,7 @@ public class SecurityContextImpl impleme
public Principal getUserPrincipal() {
org.apache.cxf.security.SecurityContext sc =
- (org.apache.cxf.security.SecurityContext)m.get(org.apache.cxf.security.SecurityContext.class);
+ m.get(org.apache.cxf.security.SecurityContext.class);
return sc == null ? null : sc.getUserPrincipal();
}
@@ -59,7 +59,7 @@ public class SecurityContextImpl impleme
public boolean isUserInRole(String role) {
org.apache.cxf.security.SecurityContext sc =
- (org.apache.cxf.security.SecurityContext)m.get(org.apache.cxf.security.SecurityContext.class);
+ m.get(org.apache.cxf.security.SecurityContext.class);
return sc == null ? false : sc.isUserInRole(role);
}
Modified: cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/ClassResourceInfo.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/ClassResourceInfo.java?rev=1228848&r1=1228847&r2=1228848&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/ClassResourceInfo.java (original)
+++ cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/ClassResourceInfo.java Sun Jan 8 13:59:37 2012
@@ -229,7 +229,7 @@ public class ClassResourceInfo extends A
return JAXRSUtils.parseMediaTypes(producesTypes);
}
return JAXRSUtils.getProduceTypes(
- (Produces)AnnotationUtils.getClassAnnotation(getServiceClass(), Produces.class));
+ AnnotationUtils.getClassAnnotation(getServiceClass(), Produces.class));
}
public List<MediaType> getConsumeMime() {
@@ -237,11 +237,11 @@ public class ClassResourceInfo extends A
return JAXRSUtils.parseMediaTypes(consumesTypes);
}
return JAXRSUtils.getConsumeTypes(
- (Consumes)AnnotationUtils.getClassAnnotation(getServiceClass(), Consumes.class));
+ AnnotationUtils.getClassAnnotation(getServiceClass(), Consumes.class));
}
public Path getPath() {
- return (Path)AnnotationUtils.getClassAnnotation(getServiceClass(), Path.class);
+ return AnnotationUtils.getClassAnnotation(getServiceClass(), Path.class);
}
private void addParamMethod(Method m) {
Modified: cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/OperationResourceInfo.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/OperationResourceInfo.java?rev=1228848&r1=1228847&r2=1228848&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/OperationResourceInfo.java (original)
+++ cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/OperationResourceInfo.java Sun Jan 8 13:59:37 2012
@@ -164,7 +164,7 @@ public class OperationResourceInfo {
consumeMimes = JAXRSUtils.sortMediaTypes(consumeMediaTypes);
} else {
Consumes cm =
- (Consumes)AnnotationUtils.getMethodAnnotation(annotatedMethod, Consumes.class);
+ AnnotationUtils.getMethodAnnotation(annotatedMethod, Consumes.class);
if (cm != null) {
consumeMimes = JAXRSUtils.sortMediaTypes(JAXRSUtils.getMediaTypes(cm.value()));
} else if (classResourceInfo != null) {
@@ -175,7 +175,7 @@ public class OperationResourceInfo {
produceMimes = JAXRSUtils.sortMediaTypes(produceMediaTypes);
} else {
Produces pm =
- (Produces)AnnotationUtils.getMethodAnnotation(annotatedMethod, Produces.class);
+ AnnotationUtils.getMethodAnnotation(annotatedMethod, Produces.class);
if (pm != null) {
produceMimes = JAXRSUtils.sortMediaTypes(JAXRSUtils.getMediaTypes(pm.value()));
} else if (classResourceInfo != null) {
@@ -202,10 +202,10 @@ public class OperationResourceInfo {
}
private void checkDefaultParameterValue() {
- DefaultValue dv = (DefaultValue)AnnotationUtils.getMethodAnnotation(annotatedMethod,
+ DefaultValue dv = AnnotationUtils.getMethodAnnotation(annotatedMethod,
DefaultValue.class);
if (dv == null && classResourceInfo != null) {
- dv = (DefaultValue)AnnotationUtils.getClassAnnotation(
+ dv = AnnotationUtils.getClassAnnotation(
classResourceInfo.getServiceClass(),
DefaultValue.class);
}
Modified: cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/FormEncodingProvider.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/FormEncodingProvider.java?rev=1228848&r1=1228847&r2=1228848&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/FormEncodingProvider.java (original)
+++ cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/FormEncodingProvider.java Sun Jan 8 13:59:37 2012
@@ -138,9 +138,8 @@ public class FormEncodingProvider implem
return (MultivaluedMap<String, String>)clazz.newInstance();
}
- @SuppressWarnings("unchecked")
private Object getFormObject(Class<?> clazz, MultivaluedMap<String, String> params) {
- return Form.class.isAssignableFrom(clazz) ? new Form((MultivaluedMap)params) : params;
+ return Form.class.isAssignableFrom(clazz) ? new Form(params) : params;
}
/**
Modified: cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/SourceProvider.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/SourceProvider.java?rev=1228848&r1=1228847&r2=1228848&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/SourceProvider.java (original)
+++ cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/SourceProvider.java Sun Jan 8 13:59:37 2012
@@ -143,7 +143,7 @@ public class SourceProvider extends Abst
protected XMLStreamReader getReaderFromMessage() {
MessageContext mc = getContext();
if (mc != null) {
- return (XMLStreamReader)mc.getContent(XMLStreamReader.class);
+ return mc.getContent(XMLStreamReader.class);
} else {
return null;
}
Modified: cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/XMLBeansJSONProvider.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/XMLBeansJSONProvider.java?rev=1228848&r1=1228847&r2=1228848&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/XMLBeansJSONProvider.java (original)
+++ cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/XMLBeansJSONProvider.java Sun Jan 8 13:59:37 2012
@@ -93,7 +93,7 @@ public class XMLBeansJSONProvider extend
xsw.writeStartDocument();
if (obj instanceof XmlObject) {
- XmlObject xObj = (XmlObject)obj;
+ XmlObject xObj = obj;
XMLBeanStreamSerializer ser = new XMLBeanStreamSerializer();
ser.serialize(xObj, xsw);
}
Modified: cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/JAXRSUtils.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/JAXRSUtils.java?rev=1228848&r1=1228847&r2=1228848&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/JAXRSUtils.java (original)
+++ cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/JAXRSUtils.java Sun Jan 8 13:59:37 2012
@@ -740,7 +740,7 @@ public final class JAXRSUtils {
String enc = HttpUtils.getEncoding(mt, "UTF-8");
String body = FormUtils.readBody(m.getContent(InputStream.class), enc);
HttpServletRequest request = (HttpServletRequest)m.get(AbstractHTTPDestination.HTTP_REQUEST);
- FormUtils.populateMapFromString(params, (String)body, enc, decode, request);
+ FormUtils.populateMapFromString(params, body, enc, decode, request);
} else {
if (mt != null && "multipart".equalsIgnoreCase(mt.getType())
&& MediaType.MULTIPART_FORM_DATA_TYPE.isCompatible(mt)) {
Modified: cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/client/JAXRSClientFactoryBeanTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/client/JAXRSClientFactoryBeanTest.java?rev=1228848&r1=1228847&r2=1228848&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/client/JAXRSClientFactoryBeanTest.java (original)
+++ cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/client/JAXRSClientFactoryBeanTest.java Sun Jan 8 13:59:37 2012
@@ -141,7 +141,7 @@ public class JAXRSClientFactoryBeanTest
bean.setResourceClass(BookStoreSubresourcesOnly.class);
TestFeature testFeature = new TestFeature();
List<AbstractFeature> features = new ArrayList<AbstractFeature>();
- features.add((AbstractFeature)testFeature);
+ features.add(testFeature);
bean.setFeatures(features);
BookStoreSubresourcesOnly store = bean.create(BookStoreSubresourcesOnly.class, 1, 2, 3);
Modified: cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/wadl/WadlGeneratorTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/wadl/WadlGeneratorTest.java?rev=1228848&r1=1228847&r2=1228848&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/wadl/WadlGeneratorTest.java (original)
+++ cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/wadl/WadlGeneratorTest.java Sun Jan 8 13:59:37 2012
@@ -89,7 +89,7 @@ public class WadlGeneratorTest extends A
ByteArrayOutputStream os = new ByteArrayOutputStream();
new JSONProvider().writeTo(
- (Document)r.getEntity(), Document.class, Document.class,
+ r.getEntity(), Document.class, Document.class,
new Annotation[]{}, MediaType.APPLICATION_JSON_TYPE,
new MetadataMap<String, Object>(), os);
String s = os.toString();
Modified: cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/DataBindingJSONProviderTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/DataBindingJSONProviderTest.java?rev=1228848&r1=1228847&r2=1228848&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/DataBindingJSONProviderTest.java (original)
+++ cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/DataBindingJSONProviderTest.java Sun Jan 8 13:59:37 2012
@@ -96,7 +96,7 @@ public class DataBindingJSONProviderTest
p.setDataBinding(binding);
p.setNamespaceMap(Collections.singletonMap("http://apache.org/structure/types", "p0"));
ByteArrayInputStream is = new ByteArrayInputStream(data.getBytes());
- Structure struct = (Structure)p.readFrom((Class)Structure.class, Structure.class,
+ Structure struct = (Structure)p.readFrom(Structure.class, Structure.class,
new Annotation[0], MediaType.APPLICATION_JSON_TYPE,
new MetadataMap<String, String>(), is);
assertEquals("sdo", struct.getText());
@@ -129,7 +129,7 @@ public class DataBindingJSONProviderTest
DataBindingJSONProvider p = new DataBindingJSONProvider();
p.setDataBinding(binding);
ByteArrayInputStream is = new ByteArrayInputStream(data.getBytes());
- Book book = (Book)p.readFrom((Class)Book.class, Book.class,
+ Book book = (Book)p.readFrom(Book.class, Book.class,
new Annotation[0], MediaType.APPLICATION_JSON_TYPE,
new MetadataMap<String, String>(), is);
assertEquals("CXF", book.getName());
@@ -187,7 +187,7 @@ public class DataBindingJSONProviderTest
DataBindingJSONProvider p = new DataBindingJSONProvider();
p.setDataBinding(binding);
ByteArrayInputStream is = new ByteArrayInputStream(data.getBytes());
- Book book = (Book)p.readFrom((Class)Book.class, Book.class,
+ Book book = (Book)p.readFrom(Book.class, Book.class,
new Annotation[0], MediaType.APPLICATION_XML_TYPE,
new MetadataMap<String, String>(), is);
assertEquals("CXF", book.getName());
Modified: cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/DataBindingProviderTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/DataBindingProviderTest.java?rev=1228848&r1=1228847&r2=1228848&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/DataBindingProviderTest.java (original)
+++ cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/DataBindingProviderTest.java Sun Jan 8 13:59:37 2012
@@ -101,7 +101,7 @@ public class DataBindingProviderTest ext
binding.initialize(s);
DataBindingProvider p = new DataBindingProvider(binding);
ByteArrayInputStream is = new ByteArrayInputStream(data.getBytes());
- Book book = (Book)p.readFrom((Class)Book.class, Book.class,
+ Book book = (Book)p.readFrom(Book.class, Book.class,
new Annotation[0], MediaType.APPLICATION_XML_TYPE,
new MetadataMap<String, String>(), is);
assertEquals("CXF", book.getName());
@@ -173,7 +173,7 @@ public class DataBindingProviderTest ext
binding.initialize(s);
DataBindingProvider p = new DataBindingProvider(binding);
ByteArrayInputStream is = new ByteArrayInputStream(data.getBytes());
- Structure struct = (Structure)p.readFrom((Class)Structure.class, Structure.class,
+ Structure struct = (Structure)p.readFrom(Structure.class, Structure.class,
new Annotation[0], MediaType.APPLICATION_XML_TYPE,
new MetadataMap<String, String>(), is);
assertEquals("sdo", struct.getText());
@@ -209,7 +209,7 @@ public class DataBindingProviderTest ext
binding.initialize(s);
DataBindingProvider p = new DataBindingProvider(binding);
ByteArrayInputStream is = new ByteArrayInputStream(data.getBytes());
- Address address = (Address)p.readFrom((Class)Address.class, Address.class,
+ Address address = (Address)p.readFrom(Address.class, Address.class,
new Annotation[0], MediaType.APPLICATION_XML_TYPE,
new MetadataMap<String, String>(), is);
assertEquals("Street 1", address.getAddressLine1());
Modified: cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/JAXBElementProviderTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/JAXBElementProviderTest.java?rev=1228848&r1=1228847&r2=1228848&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/JAXBElementProviderTest.java (original)
+++ cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/JAXBElementProviderTest.java Sun Jan 8 13:59:37 2012
@@ -1262,7 +1262,7 @@ public class JAXBElementProviderTest ext
};
provider.setMarshallerProperties(props);
- provider.writeTo("123", String.class, (Type)String.class, new Annotation[]{},
+ provider.writeTo("123", String.class, String.class, new Annotation[]{},
MediaType.APPLICATION_XML_TYPE, new MetadataMap<String, Object>(),
new ByteArrayOutputStream());
Modified: cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/PrimitiveTextProviderTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/PrimitiveTextProviderTest.java?rev=1228848&r1=1228847&r2=1228848&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/PrimitiveTextProviderTest.java (original)
+++ cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/PrimitiveTextProviderTest.java Sun Jan 8 13:59:37 2012
@@ -127,7 +127,7 @@ public class PrimitiveTextProviderTest e
MessageBodyReader p = new PrimitiveTextProvider();
- String value = (String)p.readFrom((Class)String.class, null,
+ String value = (String)p.readFrom(String.class, null,
new Annotation[]{},
MediaType.valueOf(MediaType.APPLICATION_XML + ";charset=UTF-8"), null,
new ByteArrayInputStream(s.getBytes("UTF-8")));
Modified: cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/ProviderFactoryTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/ProviderFactoryTest.java?rev=1228848&r1=1228847&r2=1228848&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/ProviderFactoryTest.java (original)
+++ cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/ProviderFactoryTest.java Sun Jan 8 13:59:37 2012
@@ -574,7 +574,7 @@ public class ProviderFactoryTest extends
@Test
public void testRegisterCustomEntityProvider() throws Exception {
- ProviderFactory pf = (ProviderFactory)ProviderFactory.getInstance();
+ ProviderFactory pf = ProviderFactory.getInstance();
pf.registerUserProvider(new CustomWidgetProvider());
verifyProvider(pf, org.apache.cxf.jaxrs.resources.Book.class, CustomWidgetProvider.class,
Modified: cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/XPathProviderTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/XPathProviderTest.java?rev=1228848&r1=1228847&r2=1228848&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/XPathProviderTest.java (original)
+++ cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/XPathProviderTest.java Sun Jan 8 13:59:37 2012
@@ -34,26 +34,26 @@ public class XPathProviderTest extends A
public void testIsReadableClassName() {
XPathProvider provider = new XPathProvider();
provider.setExpression("/");
- assertTrue(provider.isReadable((Class)Book.class, null, null, null));
- assertTrue(provider.isReadable((Class)BookStore.class, null, null, null));
+ assertTrue(provider.isReadable(Book.class, null, null, null));
+ assertTrue(provider.isReadable(BookStore.class, null, null, null));
provider.setClassName(Book.class.getName());
- assertFalse(provider.isReadable((Class)BookStore.class, null, null, null));
- assertTrue(provider.isReadable((Class)Book.class, null, null, null));
+ assertFalse(provider.isReadable(BookStore.class, null, null, null));
+ assertTrue(provider.isReadable(Book.class, null, null, null));
provider.setClassName(null);
- assertTrue(provider.isReadable((Class)Book.class, null, null, null));
- assertTrue(provider.isReadable((Class)BookStore.class, null, null, null));
+ assertTrue(provider.isReadable(Book.class, null, null, null));
+ assertTrue(provider.isReadable(BookStore.class, null, null, null));
}
@Test
public void testIsReadableClassNames() {
XPathProvider provider = new XPathProvider();
- assertFalse(provider.isReadable((Class)Book.class, null, null, null));
- assertFalse(provider.isReadable((Class)BookStore.class, null, null, null));
+ assertFalse(provider.isReadable(Book.class, null, null, null));
+ assertFalse(provider.isReadable(BookStore.class, null, null, null));
Map<String, String> map = new HashMap<String, String>();
map.put(Book.class.getName(), "/");
provider.setExpressions(map);
- assertFalse(provider.isReadable((Class)BookStore.class, null, null, null));
- assertTrue(provider.isReadable((Class)Book.class, null, null, null));
+ assertFalse(provider.isReadable(BookStore.class, null, null, null));
+ assertTrue(provider.isReadable(Book.class, null, null, null));
}
@SuppressWarnings("unchecked")
Modified: cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/resources/sdo/impl/SdoFactoryImpl.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/resources/sdo/impl/SdoFactoryImpl.java?rev=1228848&r1=1228847&r2=1228848&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/resources/sdo/impl/SdoFactoryImpl.java (original)
+++ cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/resources/sdo/impl/SdoFactoryImpl.java Sun Jan 8 13:59:37 2012
@@ -108,7 +108,7 @@ public class SdoFactoryImpl extends Fact
}
isInitialized = true;
- ModelFactoryImpl theModelPackageImpl = (ModelFactoryImpl)ModelFactoryImpl.init();
+ ModelFactoryImpl theModelPackageImpl = ModelFactoryImpl.init();
Property property = null;
// Add supertypes to types