cxf-commits mailing list archives

Site index · List index

Message view	« Date » · « Thread »
Top	« Date » · « Thread »
From	dk...@apache.org
Subject	svn commit: r1228848 [3/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...
Date	Sun, 08 Jan 2012 13:59:46 GMT
Modified: cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/JAXRSUtilsTest.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/JAXRSUtilsTest.java?rev=1228848&r1=1228847&r2=1228848&view=diff ============================================================================== --- cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/JAXRSUtilsTest.java (original) +++ cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/JAXRSUtilsTest.java Sun Jan 8 13:59:37 2012 @@ -1122,7 +1122,7 @@ public class JAXRSUtilsTest extends Asse assertEquals("A", cb1.getA()); assertEquals(new Long(123), cb1.getB()); - List<String> list1 = (List<String>)cb1.getC(); + List<String> list1 = cb1.getC(); assertEquals(3, list1.size()); assertEquals("1", list1.get(0)); assertEquals("2", list1.get(1)); @@ -1133,7 +1133,7 @@ public class JAXRSUtilsTest extends Asse assertEquals("B", cb2.getA()); assertEquals(new Long(456), cb2.getB()); - List<String> list2 = (List<String>)cb2.getC(); + List<String> list2 = cb2.getC(); assertEquals(3, list2.size()); assertEquals("4", list2.get(0)); assertEquals("5", list2.get(1)); @@ -1161,7 +1161,7 @@ public class JAXRSUtilsTest extends Asse assertEquals("C", cb3.getA()); assertEquals(new Long(789), cb3.getB()); - List<String> list3 = (List<String>)cb3.getC(); + List<String> list3 = cb3.getC(); assertEquals(3, list3.size()); assertEquals("7", list3.get(0)); assertEquals("8", list3.get(1)); Modified: cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/DispatchImpl.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/DispatchImpl.java?rev=1228848&r1=1228847&r2=1228848&view=diff ============================================================================== --- cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/DispatchImpl.java (original) +++ cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/DispatchImpl.java Sun Jan 8 13:59:37 2012 @@ -508,7 +508,7 @@ public class DispatchImpl<T> implements } } for (BindingOperationInfo bop : bindingInfo.getOperations()) { - SoapOperationInfo soi = (SoapOperationInfo)bop.getExtensor(SoapOperationInfo.class); + SoapOperationInfo soi = bop.getExtensor(SoapOperationInfo.class); if (soi != null) { // operation style overrides binding style, if present String operationStyle = soi.getStyle() != null ? soi.getStyle() : bindingStyle; Modified: cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointImpl.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointImpl.java?rev=1228848&r1=1228847&r2=1228848&view=diff ============================================================================== --- cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointImpl.java (original) +++ cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointImpl.java Sun Jan 8 13:59:37 2012 @@ -480,7 +480,7 @@ public class EndpointImpl extends javax. } org.apache.cxf.endpoint.Endpoint getEndpoint() { - return ((ServerImpl)getServer(null)).getEndpoint(); + return getServer(null).getEndpoint(); } private void configureObject(Object instance) { Modified: cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointReferenceBuilder.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointReferenceBuilder.java?rev=1228848&r1=1228847&r2=1228848&view=diff ============================================================================== --- cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointReferenceBuilder.java (original) +++ cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointReferenceBuilder.java Sun Jan 8 13:59:37 2012 @@ -57,7 +57,7 @@ public class EndpointReferenceBuilder { Iterator<ExtensibilityElement> extensionElements = portExtensors.iterator(); QName wsaEpr = new QName(Names.WSA_NAMESPACE_NAME, "EndpointReference"); while (extensionElements.hasNext()) { - ExtensibilityElement ext = (ExtensibilityElement)extensionElements.next(); + ExtensibilityElement ext = extensionElements.next(); if (ext instanceof UnknownExtensibilityElement && wsaEpr.equals(ext.getElementType())) { Element eprEle = ((UnknownExtensibilityElement)ext).getElement(); List<Element> addressElements = DOMUtils.getChildrenWithName(eprEle, Modified: cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JAXWSMethodDispatcher.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JAXWSMethodDispatcher.java?rev=1228848&r1=1228847&r2=1228848&view=diff ============================================================================== --- cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JAXWSMethodDispatcher.java (original) +++ cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JAXWSMethodDispatcher.java Sun Jan 8 13:59:37 2012 @@ -86,7 +86,7 @@ public class JAXWSMethodDispatcher exten if (!endpointClass.isAssignableFrom(method.getDeclaringClass())) { try { Method m2 = endpointClass.getMethod(method.getName(), - (Class[])method.getParameterTypes()); + method.getParameterTypes()); if (Modifier.isVolatile(m2.getModifiers())) { //bridge method, need to map the generics Class<?> params[] = method.getParameterTypes(); Modified: cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/context/WrappedMessageContext.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/context/WrappedMessageContext.java?rev=1228848&r1=1228847&r2=1228848&view=diff ============================================================================== --- cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/context/WrappedMessageContext.java (original) +++ cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/context/WrappedMessageContext.java Sun Jan 8 13:59:37 2012 @@ -240,7 +240,7 @@ public class WrappedMessageContext imple //may have to create the out message and add the headers Message tmp = createResponseMessage(); if (tmp != null) { - ret = (Map<?, ?>)tmp.get(Message.PROTOCOL_HEADERS); + ret = tmp.get(Message.PROTOCOL_HEADERS); } } ret = mp; Modified: cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/logical/LogicalHandlerFaultOutInterceptor.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/logical/LogicalHandlerFaultOutInterceptor.java?rev=1228848&r1=1228847&r2=1228848&view=diff ============================================================================== --- cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/logical/LogicalHandlerFaultOutInterceptor.java (original) +++ cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/logical/LogicalHandlerFaultOutInterceptor.java Sun Jan 8 13:59:37 2012 @@ -125,7 +125,7 @@ public class LogicalHandlerFaultOutInter Exception ex = new Fault(exception); - FaultMode mode = (FaultMode)message.get(FaultMode.class); + FaultMode mode = message.get(FaultMode.class); Message faultMessage = exchange.getOutMessage(); if (null == faultMessage) { Modified: cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/logical/LogicalHandlerOutInterceptor.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/logical/LogicalHandlerOutInterceptor.java?rev=1228848&r1=1228847&r2=1228848&view=diff ============================================================================== --- cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/logical/LogicalHandlerOutInterceptor.java (original) +++ cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/logical/LogicalHandlerOutInterceptor.java Sun Jan 8 13:59:37 2012 @@ -146,7 +146,7 @@ public class LogicalHandlerOutIntercepto responseMsg.setExchange(message.getExchange()); responseMsg = e.getBinding().createMessage(responseMsg); - MessageObserver observer = (MessageObserver)message.getExchange() + MessageObserver observer = message.getExchange() .get(MessageObserver.class); if (observer != null) { //client side outbound, the request message becomes the response message Modified: cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/logical/LogicalMessageImpl.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/logical/LogicalMessageImpl.java?rev=1228848&r1=1228847&r2=1228848&view=diff ============================================================================== --- cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/logical/LogicalMessageImpl.java (original) +++ cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/logical/LogicalMessageImpl.java Sun Jan 8 13:59:37 2012 @@ -156,14 +156,14 @@ public class LogicalMessageImpl implemen } if (mode == Service.Mode.PAYLOAD) { - source = (Source)obj; + source = obj; } else { try { CachedOutputStream cos = new CachedOutputStream(); StaxUtils.copy(obj, cos); InputStream in = cos.getInputStream(); SOAPMessage msg = initSOAPMessage(in); - source = new DOMSource(((SOAPMessage)msg).getSOAPBody().getFirstChild()); + source = new DOMSource(msg.getSOAPBody().getFirstChild()); in.close(); cos.close(); } catch (Exception e) { @@ -172,7 +172,7 @@ public class LogicalMessageImpl implemen } } else if (message instanceof XMLMessage) { if (obj != null) { - source = (Source)obj; + source = obj; } else if (message.getContent(DataSource.class) != null) { throw new Fault(new org.apache.cxf.common.i18n.Message( "GETPAYLOAD_OF_DATASOURCE_NOT_VALID_XMLHTTPBINDING", @@ -194,7 +194,7 @@ public class LogicalMessageImpl implemen // instead of creating a new empty one. SOAPMessage msg = initSOAPMessage(null); write(s, msg.getSOAPBody()); - s = new DOMSource(((SOAPMessage)msg).getSOAPPart()); + s = new DOMSource(msg.getSOAPPart()); } catch (Exception e) { throw new Fault(e); } Modified: cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/soap/SOAPHandlerFaultOutInterceptor.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/soap/SOAPHandlerFaultOutInterceptor.java?rev=1228848&r1=1228847&r2=1228848&view=diff ============================================================================== --- cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/soap/SOAPHandlerFaultOutInterceptor.java (original) +++ cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/soap/SOAPHandlerFaultOutInterceptor.java Sun Jan 8 13:59:37 2012 @@ -151,7 +151,7 @@ public class SOAPHandlerFaultOutIntercep soapFault.addDetail().appendChild(nd); } } else if (exception instanceof Fault) { - SoapFault sf = SoapFault.createFault((Fault)exception, ((SoapMessage)message) + SoapFault sf = SoapFault.createFault((Fault)exception, message .getVersion()); soapFault.setFaultString(sf.getReason()); soapFault.setFaultCode(sf.getFaultCode()); Modified: cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/soap/SOAPHandlerInterceptor.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/soap/SOAPHandlerInterceptor.java?rev=1228848&r1=1228847&r2=1228848&view=diff ============================================================================== --- cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/soap/SOAPHandlerInterceptor.java (original) +++ cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/soap/SOAPHandlerInterceptor.java Sun Jan 8 13:59:37 2012 @@ -185,7 +185,7 @@ public class SOAPHandlerInterceptor exte if (getInvoker(message).isOutbound()) { message.getInterceptorChain().abort(); - MessageObserver observer = (MessageObserver)message.getExchange().get(MessageObserver.class); + MessageObserver observer = message.getExchange().get(MessageObserver.class); if (!message.getExchange().isOneWay() && observer != null) { Endpoint e = message.getExchange().get(Endpoint.class); Modified: cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/SwAOutInterceptor.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/SwAOutInterceptor.java?rev=1228848&r1=1228847&r2=1228848&view=diff ============================================================================== --- cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/SwAOutInterceptor.java (original) +++ cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/SwAOutInterceptor.java Sun Jan 8 13:59:37 2012 @@ -244,7 +244,7 @@ public class SwAOutInterceptor extends A ByteArrayOutputStream bwriter = new ByteArrayOutputStream(); XMLStreamWriter writer = StaxUtils.createXMLStreamWriter(bwriter); try { - StaxUtils.copy((Source)o, writer); + StaxUtils.copy(o, writer); writer.flush(); ds = new ByteDataSource(bwriter.toByteArray(), ct); } catch (XMLStreamException e1) { Modified: cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/spring/JaxWsWebServicePublisherBeanPostProcessor.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/spring/JaxWsWebServicePublisherBeanPostProcessor.java?rev=1228848&r1=1228847&r2=1228848&view=diff ============================================================================== --- cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/spring/JaxWsWebServicePublisherBeanPostProcessor.java (original) +++ cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/spring/JaxWsWebServicePublisherBeanPostProcessor.java Sun Jan 8 13:59:37 2012 @@ -133,7 +133,7 @@ public class JaxWsWebServicePublisherBea Class<?> clazz = ClassHelper.getRealClass(bean); if (clazz.isAnnotationPresent(WebService.class)) { - WebService ws = (WebService)clazz.getAnnotation(WebService.class); + WebService ws = clazz.getAnnotation(WebService.class); String url = urlPrefix + ws.serviceName(); Message message = new Message("SELECTED_SERVICE", LOG, beanName, clazz.getName(), @@ -161,9 +161,8 @@ public class JaxWsWebServicePublisherBea new IllegalArgumentException( "prototypeServerFactoryBeanName must indicate a scope='prototype' bean"); } - serverFactory = (ServerFactoryBean) - beanFactory.getBean(prototypeServerFactoryBeanName, - ServerFactoryBean.class); + serverFactory = beanFactory.getBean(prototypeServerFactoryBeanName, + ServerFactoryBean.class); customizedServerFactory = true; } else { serverFactory = new JaxWsServerFactoryBean(); @@ -181,9 +180,8 @@ public class JaxWsWebServicePublisherBea "prototypeDataBindingBeanName must indicate a scope='prototype' bean"); } customizedDataBinding = true; - dataBinding = (DataBinding) - beanFactory.getBean(prototypeDataBindingBeanName, - DataBinding.class); + dataBinding = beanFactory.getBean(prototypeDataBindingBeanName, + DataBinding.class); } else { dataBinding = new JAXBDataBinding(); } Modified: cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsEndpointImpl.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsEndpointImpl.java?rev=1228848&r1=1228847&r2=1228848&view=diff ============================================================================== --- cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsEndpointImpl.java (original) +++ cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsEndpointImpl.java Sun Jan 8 13:59:37 2012 @@ -222,7 +222,7 @@ public class JaxWsEndpointImpl extends E if (bindingExtensors != null) { Iterator<ExtensibilityElement> extensionElements = bindingExtensors.iterator(); while (extensionElements.hasNext()) { - ExtensibilityElement ext = (ExtensibilityElement)extensionElements.next(); + ExtensibilityElement ext = extensionElements.next(); if (ext instanceof UnknownExtensibilityElement && Boolean.TRUE.equals(ext.getRequired())) { for (WebServiceFeature feature : this.wsFeatures) { if (feature instanceof RespectBindingFeature && feature.isEnabled()) { @@ -246,7 +246,7 @@ public class JaxWsEndpointImpl extends E Iterator<ExtensibilityElement> extensionElements = portExtensors.iterator(); QName wsaEpr = new QName(Names.WSA_NAMESPACE_NAME, "EndpointReference"); while (extensionElements.hasNext()) { - ExtensibilityElement ext = (ExtensibilityElement)extensionElements.next(); + ExtensibilityElement ext = extensionElements.next(); if (ext instanceof UnknownExtensibilityElement && wsaEpr.equals(ext.getElementType())) { DOMSource domSource = new DOMSource(((UnknownExtensibilityElement)ext).getElement()); W3CEndpointReference w3cEPR = new W3CEndpointReference(domSource); @@ -266,7 +266,7 @@ public class JaxWsEndpointImpl extends E Iterator<ExtensibilityElement> extensionElements = exts.iterator(); while (extensionElements.hasNext() && !found) { ExtensibilityElement ext = - (ExtensibilityElement)extensionElements.next(); + extensionElements.next(); found = JAXWSAConstants.WSAW_USINGADDRESSING_QNAME.equals(ext.getElementType()); } } @@ -278,7 +278,7 @@ public class JaxWsEndpointImpl extends E Iterator<ExtensibilityElement> extensionElements = exts.iterator(); while (extensionElements.hasNext() && !found) { ExtensibilityElement ext = - (ExtensibilityElement)extensionElements.next(); + extensionElements.next(); if (JAXWSAConstants.WSAW_USINGADDRESSING_QNAME.equals(ext.getElementType()) && ext.getRequired() != null) { return ext.getRequired(); Modified: cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceConfiguration.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceConfiguration.java?rev=1228848&r1=1228847&r2=1228848&view=diff ============================================================================== --- cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceConfiguration.java (original) +++ cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceConfiguration.java Sun Jan 8 13:59:37 2012 @@ -219,7 +219,7 @@ public class JaxWsServiceConfiguration e private Method getDeclaredMethod(Class<?> endpointClass, Method method) { if (!method.getDeclaringClass().equals(endpointClass)) { try { - method = endpointClass.getMethod(method.getName(), (Class[])method.getParameterTypes()); + method = endpointClass.getMethod(method.getName(), method.getParameterTypes()); } catch (SecurityException e) { throw new ServiceConstructionException(e); } catch (NoSuchMethodException e) { Modified: cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/SOAPBindingTest.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/SOAPBindingTest.java?rev=1228848&r1=1228847&r2=1228848&view=diff ============================================================================== --- cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/SOAPBindingTest.java (original) +++ cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/SOAPBindingTest.java Sun Jan 8 13:59:37 2012 @@ -46,7 +46,7 @@ public class SOAPBindingTest extends Abs ServiceImpl service = new ServiceImpl(getBus(), wsdl1, SERVICE_1, ServiceImpl.class); - CalculatorPortType cal = (CalculatorPortType)service.getPort(PORT_1, CalculatorPortType.class); + CalculatorPortType cal = service.getPort(PORT_1, CalculatorPortType.class); BindingProvider bindingProvider = (BindingProvider)cal; @@ -87,7 +87,7 @@ public class SOAPBindingTest extends Abs ServiceImpl service = new ServiceImpl(getBus(), wsdl1, SERVICE_1, ServiceImpl.class); - CalculatorPortType cal = (CalculatorPortType)service.getPort(PORT_1, CalculatorPortType.class); + CalculatorPortType cal = service.getPort(PORT_1, CalculatorPortType.class); BindingProvider bindingProvider = (BindingProvider)cal; Modified: cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ServiceImplTest.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ServiceImplTest.java?rev=1228848&r1=1228847&r2=1228848&view=diff ============================================================================== --- cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ServiceImplTest.java (original) +++ cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ServiceImplTest.java Sun Jan 8 13:59:37 2012 @@ -183,7 +183,7 @@ public class ServiceImplTest extends Abs ServiceImpl service = new ServiceImpl(getBus(), wsdl1, SERVICE_1, ServiceImpl.class); - CalculatorPortType cal = (CalculatorPortType)service.getPort(PORT_1, CalculatorPortType.class); + CalculatorPortType cal = service.getPort(PORT_1, CalculatorPortType.class); assertNotNull(cal); } @@ -198,7 +198,7 @@ public class ServiceImplTest extends Abs ServiceImpl service = new ServiceImpl(getBus(), wsdl1, SERVICE_1, ServiceImpl.class); - CalculatorPortType cal1 = (CalculatorPortType)service.getPort(PORT_1, CalculatorPortType.class); + CalculatorPortType cal1 = service.getPort(PORT_1, CalculatorPortType.class); assertNotNull(cal1); ClientProxy cp = (ClientProxy)Proxy.getInvocationHandler(cal1); @@ -210,7 +210,7 @@ public class ServiceImplTest extends Abs System.gc(); System.gc(); - CalculatorPortType cal2 = (CalculatorPortType)service.getPort(PORT_1, CalculatorPortType.class); + CalculatorPortType cal2 = service.getPort(PORT_1, CalculatorPortType.class); assertNotNull(cal2); cp = (ClientProxy)Proxy.getInvocationHandler(cal2); @@ -259,7 +259,7 @@ public class ServiceImplTest extends Abs service.setHandlerResolver(resolver); - CalculatorPortType cal = (CalculatorPortType)service.getPort(PORT_1, CalculatorPortType.class); + CalculatorPortType cal = service.getPort(PORT_1, CalculatorPortType.class); assertNotNull(cal); PortInfo info = resolver.getPortInfo(); Modified: cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetUtils.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetUtils.java?rev=1228848&r1=1228847&r2=1228848&view=diff ============================================================================== --- cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetUtils.java (original) +++ cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetUtils.java Sun Jan 8 13:59:37 2012 @@ -411,7 +411,7 @@ public class WSDLGetUtils { Types types = def.getTypes(); if (types != null) { for (ExtensibilityElement el - : CastUtils.cast((List<?>)types.getExtensibilityElements(), ExtensibilityElement.class)) { + : CastUtils.cast(types.getExtensibilityElements(), ExtensibilityElement.class)) { if (el instanceof Schema) { Schema see = (Schema)el; updateSchemaImports(bus, see, doneSchemas, base); Modified: cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/DefaultServiceConfiguration.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/DefaultServiceConfiguration.java?rev=1228848&r1=1228847&r2=1228848&view=diff ============================================================================== --- cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/DefaultServiceConfiguration.java (original) +++ cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/DefaultServiceConfiguration.java Sun Jan 8 13:59:37 2012 @@ -282,7 +282,7 @@ public class DefaultServiceConfiguration rawClass = Array.newInstance(rawClass, 0).getClass(); } else { if (rawType instanceof ParameterizedType) { - rawType = (Class<?>)((ParameterizedType)rawType).getRawType(); + rawType = ((ParameterizedType)rawType).getRawType(); } rawClass = (Class<?>)rawType; } Modified: cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java?rev=1228848&r1=1228847&r2=1228848&view=diff ============================================================================== --- cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java (original) +++ cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java Sun Jan 8 13:59:37 2012 @@ -1687,7 +1687,7 @@ public class ReflectionServiceFactoryBea } private static Class<?> createArrayClass(GenericArrayType atp) { - Type tp = ((GenericArrayType)atp).getGenericComponentType(); + Type tp = atp.getGenericComponentType(); Class<?> rawClass = null; if (tp instanceof Class) { rawClass = (Class<?>)tp; @@ -1696,7 +1696,7 @@ public class ReflectionServiceFactoryBea } else if (tp instanceof ParameterizedType) { rawClass = (Class<?>)((ParameterizedType)tp).getRawType(); if (List.class.isAssignableFrom(rawClass)) { - rawClass = getClass((ParameterizedType)tp); + rawClass = getClass(tp); rawClass = Array.newInstance(rawClass, 0).getClass(); } } @@ -2280,7 +2280,7 @@ public class ReflectionServiceFactoryBea protected void processTypes(Class<?> sc, Type tp) { if (tp instanceof ParameterizedType) { ParameterizedType ptp = (ParameterizedType)tp; - Type c = (Class<?>)ptp.getRawType(); + Type c = ptp.getRawType(); Map<String, Class<?>> m = new HashMap<String, Class<?>>(); parameterizedTypes.put(c, m); for (int x = 0; x < ptp.getActualTypeArguments().length; x++) { Modified: cxf/trunk/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/ParticleInfo.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/ParticleInfo.java?rev=1228848&r1=1228847&r2=1228848&view=diff ============================================================================== --- cxf/trunk/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/ParticleInfo.java (original) +++ cxf/trunk/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/ParticleInfo.java Sun Jan 8 13:59:37 2012 @@ -131,7 +131,7 @@ public final class ParticleInfo implemen SchemaCollection schemaCollection, NamespacePrefixAccumulator prefixAccumulator, QName contextName) { XmlSchemaParticle sequenceParticle = - XmlSchemaUtils.getObjectParticle((XmlSchemaObject)sequenceObject, contextName); + XmlSchemaUtils.getObjectParticle(sequenceObject, contextName); ParticleInfo elementInfo = new ParticleInfo(); XmlSchemaParticle realParticle = sequenceParticle; Modified: cxf/trunk/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/JsSimpleDomNode.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/JsSimpleDomNode.java?rev=1228848&r1=1228847&r2=1228848&view=diff ============================================================================== --- cxf/trunk/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/JsSimpleDomNode.java (original) +++ cxf/trunk/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/JsSimpleDomNode.java Sun Jan 8 13:59:37 2012 @@ -193,7 +193,7 @@ public class JsSimpleDomNode extends Scr while (node != null) { JsSimpleDomNode prev = null; if (x > 0) { - prev = (JsSimpleDomNode)children.get(x - 1); + prev = children.get(x - 1); } children.add(x, newObject(node, prev)); if (x > 0) { Modified: cxf/trunk/rt/management/src/main/java/org/apache/cxf/management/jmx/InstrumentationManagerImpl.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/management/src/main/java/org/apache/cxf/management/jmx/InstrumentationManagerImpl.java?rev=1228848&r1=1228847&r2=1228848&view=diff ============================================================================== --- cxf/trunk/rt/management/src/main/java/org/apache/cxf/management/jmx/InstrumentationManagerImpl.java (original) +++ cxf/trunk/rt/management/src/main/java/org/apache/cxf/management/jmx/InstrumentationManagerImpl.java Sun Jan 8 13:59:37 2012 @@ -166,7 +166,7 @@ public class InstrumentationManagerImpl // ignore } } else { - mbs = (MBeanServer)servers.get(0); + mbs = servers.get(0); } } } @@ -287,7 +287,7 @@ public class InstrumentationManagerImpl //Using the array to hold the busMBeans to avoid the CurrentModificationException Object[] mBeans = busMBeans.toArray(); for (Object name : mBeans) { - busMBeans.remove((ObjectName)name); + busMBeans.remove(name); try { unregister((ObjectName)name); } catch (JMException jmex) { Modified: cxf/trunk/rt/management/src/main/java/org/apache/cxf/management/jmx/export/runtime/ModelMBeanInfoSupporter.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/management/src/main/java/org/apache/cxf/management/jmx/export/runtime/ModelMBeanInfoSupporter.java?rev=1228848&r1=1228847&r2=1228848&view=diff ============================================================================== --- cxf/trunk/rt/management/src/main/java/org/apache/cxf/management/jmx/export/runtime/ModelMBeanInfoSupporter.java (original) +++ cxf/trunk/rt/management/src/main/java/org/apache/cxf/management/jmx/export/runtime/ModelMBeanInfoSupporter.java Sun Jan 8 13:59:37 2012 @@ -126,16 +126,16 @@ public class ModelMBeanInfoSupporter { public ModelMBeanInfo buildModelMBeanInfo(Descriptor desc) { ModelMBeanOperationInfo[] ops = - (ModelMBeanOperationInfo[])operations.values().toArray(new ModelMBeanOperationInfo[0]); + operations.values().toArray(new ModelMBeanOperationInfo[0]); ModelMBeanAttributeInfo[] atts = - (ModelMBeanAttributeInfo[])attributes.values().toArray(new ModelMBeanAttributeInfo[0]); + attributes.values().toArray(new ModelMBeanAttributeInfo[0]); ModelMBeanConstructorInfo[] cons = - (ModelMBeanConstructorInfo[])constructors.values().toArray(new ModelMBeanConstructorInfo[0]); + constructors.values().toArray(new ModelMBeanConstructorInfo[0]); ModelMBeanNotificationInfo[] notifs = - (ModelMBeanNotificationInfo[])notifications.values().toArray(new ModelMBeanNotificationInfo[0]); + notifications.values().toArray(new ModelMBeanNotificationInfo[0]); return new ModelMBeanInfoSupport("javax.management.modelmbean.ModelMBeanInfo", "description", Modified: cxf/trunk/rt/management/src/main/java/org/apache/cxf/management/utils/ManagementConsole.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/management/src/main/java/org/apache/cxf/management/utils/ManagementConsole.java?rev=1228848&r1=1228847&r2=1228848&view=diff ============================================================================== --- cxf/trunk/rt/management/src/main/java/org/apache/cxf/management/utils/ManagementConsole.java (original) +++ cxf/trunk/rt/management/src/main/java/org/apache/cxf/management/utils/ManagementConsole.java Sun Jan 8 13:59:37 2012 @@ -120,7 +120,7 @@ public final class ManagementConsole { if (it.hasNext()) { // only deal with the first endpoint object which retrun from the list. - endpointName = (ObjectName)it.next(); + endpointName = it.next(); mbsc.invoke(endpointName, operation, new Object[0], new String[0]); System.out.println("invoke endpoint " + endpointName + " operation " + operation + " succeed!"); Modified: cxf/trunk/rt/management/src/test/java/org/apache/cxf/management/InstrumentationManagerTest.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/management/src/test/java/org/apache/cxf/management/InstrumentationManagerTest.java?rev=1228848&r1=1228847&r2=1228848&view=diff ============================================================================== --- cxf/trunk/rt/management/src/test/java/org/apache/cxf/management/InstrumentationManagerTest.java (original) +++ cxf/trunk/rt/management/src/test/java/org/apache/cxf/management/InstrumentationManagerTest.java Sun Jan 8 13:59:37 2012 @@ -83,7 +83,7 @@ public class InstrumentationManagerTest assertEquals(2, s.size()); Iterator<ObjectName> it = s.iterator(); while (it.hasNext()) { - ObjectName n = (ObjectName)it.next(); + ObjectName n = it.next(); Long result = (Long)mbs.invoke(n, "getWorkQueueMaxSize", new Object[0], new String[0]); assertEquals(result, Long.valueOf(256)); Modified: cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/Headers.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/Headers.java?rev=1228848&r1=1228847&r2=1228848&view=diff ============================================================================== --- cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/Headers.java (original) +++ cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/Headers.java Sun Jan 8 13:59:37 2012 @@ -326,7 +326,7 @@ public class Headers { //TODO how to deal with the fields for (Enumeration<String> e = req.getHeaderNames(); e.hasMoreElements();) { - String fname = (String)e.nextElement(); + String fname = e.nextElement(); String mappedName = HttpHeaderHelper.getHeaderKey(fname); List<String> values; if (headers.containsKey(mappedName)) { @@ -336,7 +336,7 @@ public class Headers { headers.put(mappedName, values); } for (Enumeration<String> e2 = req.getHeaders(fname); e2.hasMoreElements();) { - String val = (String)e2.nextElement(); + String val = e2.nextElement(); values.add(val); } } @@ -397,7 +397,7 @@ public class Headers { message.getContextualProperty(ADD_HEADERS_PROPERTY)); for (Iterator<?> iter = headers.keySet().iterator(); iter.hasNext();) { String header = (String)iter.next(); - List<?> headerList = (List<?>)headers.get(header); + List<?> headerList = headers.get(header); if (addHeaders \|\| HTTP_HEADERS_SETCOOKIE.equals(header)) { for (int i = 0; i < headerList.size(); i++) { Modified: cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HttpServletRequestSnapshot.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HttpServletRequestSnapshot.java?rev=1228848&r1=1228847&r2=1228848&view=diff ============================================================================== --- cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HttpServletRequestSnapshot.java (original) +++ cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HttpServletRequestSnapshot.java Sun Jan 8 13:59:37 2012 @@ -72,7 +72,7 @@ public class HttpServletRequestSnapshot contextPath = request.getContextPath(); cookies = request.getCookies(); requestHeaderNames = request.getHeaderNames(); - Enumeration<String> tmp = (Enumeration<String>)request.getHeaderNames(); + Enumeration<String> tmp = request.getHeaderNames(); while (tmp.hasMoreElements()) { String key = tmp.nextElement(); headersMap.put(key, request.getHeaders(key)); Modified: cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/auth/SpnegoAuthSupplier.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/auth/SpnegoAuthSupplier.java?rev=1228848&r1=1228847&r2=1228848&view=diff ============================================================================== --- cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/auth/SpnegoAuthSupplier.java (original) +++ cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/auth/SpnegoAuthSupplier.java Sun Jan 8 13:59:37 2012 @@ -107,7 +107,7 @@ public class SpnegoAuthSupplier implemen } try { - return (byte[]) Subject.doAs(lc.getSubject(), new CreateServiceTicketAction(context, token)); + return Subject.doAs(lc.getSubject(), new CreateServiceTicketAction(context, token)); } catch (PrivilegedActionException e) { if (e.getCause() instanceof GSSException) { throw (GSSException) e.getCause(); Modified: cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/uri/JMSEndpoint.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/uri/JMSEndpoint.java?rev=1228848&r1=1228847&r2=1228848&view=diff ============================================================================== --- cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/uri/JMSEndpoint.java (original) +++ cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/uri/JMSEndpoint.java Sun Jan 8 13:59:37 2012 @@ -50,7 +50,7 @@ public class JMSEndpoint extends JMSEndp if ("targetService".equals(key)) { continue; } - String value = (String)parameters.get(key); + String value = parameters.get(key); if (first) { requestUri += "?" + key + "=" + value; first = false; @@ -78,7 +78,7 @@ public class JMSEndpoint extends JMSEndp * @return / public String getParameter(String key) { - return (String)parameters.get(key); + return parameters.get(key); } public Map<String, String> getJndiParameters() { Modified: cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/uri/JMSEndpointParser.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/uri/JMSEndpointParser.java?rev=1228848&r1=1228847&r2=1228848&view=diff ============================================================================== --- cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/uri/JMSEndpointParser.java (original) +++ cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/uri/JMSEndpointParser.java Sun Jan 8 13:59:37 2012 @@ -138,7 +138,7 @@ public final class JMSEndpointParser { / private static String getAndRemoveParameter(Map<String, String> parameters, String parameterName) { - String value = (String)parameters.get(parameterName); + String value = parameters.get(parameterName); parameters.remove(parameterName); return value; } Modified: cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/MAPAggregator.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/MAPAggregator.java?rev=1228848&r1=1228847&r2=1228848&view=diff ============================================================================== --- cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/MAPAggregator.java (original) +++ cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/MAPAggregator.java Sun Jan 8 13:59:37 2012 @@ -495,7 +495,7 @@ public class MAPAggregator extends Abstr Iterator<ExtensibilityElement> extensionElements = exts.iterator(); while (extensionElements.hasNext() && !found) { ExtensibilityElement ext = - (ExtensibilityElement)extensionElements.next(); + extensionElements.next(); found = Names.WSAW_USING_ADDRESSING_QNAME.equals(ext.getElementType()); } } Modified: cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/soap/MAPCodec.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/soap/MAPCodec.java?rev=1228848&r1=1228847&r2=1228848&view=diff ============================================================================== --- cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/soap/MAPCodec.java (original) +++ cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/soap/MAPCodec.java Sun Jan 8 13:59:37 2012 @@ -327,7 +327,7 @@ public class MAPCodec extends AbstractSo header.add(holder); childNode = childNode.getNextSibling(); } - ((AddressingPropertiesImpl)maps).setDuplicate(null); + maps.setDuplicate(null); propogateAction(maps.getAction(), message); applyMAPValidation(message); Modified: cxf/trunk/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/MAPAggregatorTest.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/MAPAggregatorTest.java?rev=1228848&r1=1228847&r2=1228848&view=diff ============================================================================== --- cxf/trunk/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/MAPAggregatorTest.java (original) +++ cxf/trunk/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/MAPAggregatorTest.java Sun Jan 8 13:59:37 2012 @@ -727,7 +727,7 @@ public class MAPAggregatorTest extends A if (args.fault) { message.setContent(Exception.class, new SoapFault("blah", - (Throwable) new Exception(), Fault.FAULT_CODE_SERVER)); + new Exception(), Fault.FAULT_CODE_SERVER)); expectedAction = "http://foo/bar/SEI/op/Fault/Exception"; } else { expectedAction = "http://foo/bar/SEI/opResponse"; Modified: cxf/trunk/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/soap/MAPCodecTest.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/soap/MAPCodecTest.java?rev=1228848&r1=1228847&r2=1228848&view=diff ============================================================================== --- cxf/trunk/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/soap/MAPCodecTest.java (original) +++ cxf/trunk/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/soap/MAPCodecTest.java Sun Jan 8 13:59:37 2012 @@ -678,7 +678,7 @@ public class MAPCodecTest extends Assert } private void verifyAction() { - List<?> soapAction = (List<?>)mimeHeaders.get("SOAPAction"); + List<?> soapAction = mimeHeaders.get("SOAPAction"); assertNotNull("expected propogated action", soapAction); assertEquals("expected single action", 1, soapAction.size()); String expectedAction = "\"" + ((AttributedURIType)expectedValues[0]).getValue() + "\""; Modified: cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/EffectivePolicyImpl.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/EffectivePolicyImpl.java?rev=1228848&r1=1228847&r2=1228848&view=diff ============================================================================== --- cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/EffectivePolicyImpl.java (original) +++ cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/EffectivePolicyImpl.java Sun Jan 8 13:59:37 2012 @@ -146,7 +146,7 @@ public class EffectivePolicyImpl impleme if (null != bmi) { policy = policy.merge(engine.getAggregatedMessagePolicy(bmi)); } - policy = (Policy)policy.normalize(engine.getRegistry(), true); + policy = policy.normalize(engine.getRegistry(), true); return assertor; } @@ -157,7 +157,7 @@ public class EffectivePolicyImpl impleme if (bfi != null) { policy = policy.merge(engine.getAggregatedFaultPolicy(bfi)); } - policy = (Policy)policy.normalize(engine.getRegistry(), true); + policy = policy.normalize(engine.getRegistry(), true); } void chooseAlternative(PolicyEngineImpl engine, Assertor assertor) { Modified: cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/EndpointPolicyImpl.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/EndpointPolicyImpl.java?rev=1228848&r1=1228847&r2=1228848&view=diff ============================================================================== --- cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/EndpointPolicyImpl.java (original) +++ cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/EndpointPolicyImpl.java Sun Jan 8 13:59:37 2012 @@ -90,7 +90,7 @@ public class EndpointPolicyImpl implemen if (!PolicyUtils.isEmptyPolicy(p)) { Policy normalizedPolicy - = (Policy)p.normalize(engine == null ? null : engine.getRegistry(), true); + = p.normalize(engine == null ? null : engine.getRegistry(), true); epi.setPolicy(getPolicy().merge(normalizedPolicy)); } else { Policy clonedPolicy = new Policy(); @@ -149,7 +149,7 @@ public class EndpointPolicyImpl implemen policy = engine.getAggregatedServicePolicy(ei.getService()); policy = policy.merge(engine.getAggregatedEndpointPolicy(ei)); if (!policy.isEmpty()) { - policy = (Policy)policy.normalize(engine == null ? null : engine.getRegistry(), + policy = policy.normalize(engine == null ? null : engine.getRegistry(), true); } } Modified: cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyUtils.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyUtils.java?rev=1228848&r1=1228847&r2=1228848&view=diff ============================================================================== --- cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyUtils.java (original) +++ cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyUtils.java Sun Jan 8 13:59:37 2012 @@ -151,7 +151,7 @@ public final class PolicyUtils { buf.append(" (optional)"); } buf.append(" ("); - buf.append((Assertion)pc); + buf.append(pc); buf.append(")"); nl(buf); if (pc instanceof PolicyContainingAssertion) { Modified: cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/attachment/AbstractPolicyProvider.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/attachment/AbstractPolicyProvider.java?rev=1228848&r1=1228847&r2=1228848&view=diff ============================================================================== --- cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/attachment/AbstractPolicyProvider.java (original) +++ cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/attachment/AbstractPolicyProvider.java Sun Jan 8 13:59:37 2012 @@ -58,7 +58,7 @@ public abstract class AbstractPolicyProv bus = b; if (null != bus) { setBuilder(bus.getExtension(PolicyBuilder.class)); - PolicyEngine pe = (PolicyEngine)bus.getExtension(PolicyEngine.class); + PolicyEngine pe = bus.getExtension(PolicyEngine.class); if (pe != null) { setRegistry(pe.getRegistry()); ((PolicyEngineImpl)pe).addPolicyProvider(this); Modified: cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/attachment/external/ExternalAttachmentProvider.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/attachment/external/ExternalAttachmentProvider.java?rev=1228848&r1=1228847&r2=1228848&view=diff ============================================================================== --- cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/attachment/external/ExternalAttachmentProvider.java (original) +++ cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/attachment/external/ExternalAttachmentProvider.java Sun Jan 8 13:59:37 2012 @@ -178,13 +178,13 @@ public class ExternalAttachmentProvider } attachment.setDomainExpressions(des); } else if (Constants.isPolicyElement(qn)) { - Policy p = builder.getPolicy((Element)nd); + Policy p = builder.getPolicy(nd); if (null != attachment.getPolicy()) { p = p.merge(attachment.getPolicy()); } attachment.setPolicy(p); } else if (Constants.isPolicyRef(qn)) { - PolicyReference ref = builder.getPolicyReference((Element)nd); + PolicyReference ref = builder.getPolicyReference(nd); if (null != ref) { Policy p = resolveReference(ref, doc); if (null != attachment.getPolicy()) { Modified: cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/EndpointPolicyImplTest.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/EndpointPolicyImplTest.java?rev=1228848&r1=1228847&r2=1228848&view=diff ============================================================================== --- cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/EndpointPolicyImplTest.java (original) +++ cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/EndpointPolicyImplTest.java Sun Jan 8 13:59:37 2012 @@ -201,7 +201,7 @@ public class EndpointPolicyImplTest exte p2.addAssertion(mockAssertion(aqn2, 5, true)); control.replay(); - epi.setPolicy((Policy)p1.normalize(null, true)); + epi.setPolicy(p1.normalize(null, true)); Policy ep = epi.updatePolicy(p2).getPolicy(); @@ -262,7 +262,7 @@ public class EndpointPolicyImplTest exte EndpointPolicyImpl epi = new TestEndpointPolicy(); control.replay(); - epi.setPolicy((Policy)p1.normalize(true)); + epi.setPolicy(p1.normalize(true)); Policy ep = epi.updatePolicy(emptyPolicy).getPolicy(); Modified: cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/NormalizeTest.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/NormalizeTest.java?rev=1228848&r1=1228847&r2=1228848&view=diff ============================================================================== --- cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/NormalizeTest.java (original) +++ cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/NormalizeTest.java Sun Jan 8 13:59:37 2012 @@ -108,7 +108,7 @@ public class NormalizeTest extends Asser assertNotNull(samplePolicy); assertNotNull(normalisedPolicy); - Policy normalisedSamplePolicy = (Policy)samplePolicy.normalize(true); + Policy normalisedSamplePolicy = samplePolicy.normalize(true); assertTrue(PolicyComparator.compare(normalisedPolicy, normalisedSamplePolicy)); } Modified: cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/AsymmetricBindingBuilder.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/AsymmetricBindingBuilder.java?rev=1228848&r1=1228847&r2=1228848&view=diff ============================================================================== --- cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/AsymmetricBindingBuilder.java (original) +++ cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/AsymmetricBindingBuilder.java Sun Jan 8 13:59:37 2012 @@ -64,7 +64,7 @@ public class AsymmetricBindingBuilder im AsymmetricBinding asymmetricBinding = new AsymmetricBinding(consts, builder); Policy policy = builder.getPolicy(DOMUtils.getFirstElement(element)); - policy = (Policy)policy.normalize(builder.getPolicyRegistry(), false); + policy = policy.normalize(builder.getPolicyRegistry(), false); for (Iterator<List<Assertion>> iterator = policy.getAlternatives(); iterator.hasNext();) { processAlternative(iterator.next(), asymmetricBinding, consts); Modified: cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/InitiatorEncryptionTokenBuilder.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/InitiatorEncryptionTokenBuilder.java?rev=1228848&r1=1228847&r2=1228848&view=diff ============================================================================== --- cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/InitiatorEncryptionTokenBuilder.java (original) +++ cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/InitiatorEncryptionTokenBuilder.java Sun Jan 8 13:59:37 2012 @@ -63,7 +63,7 @@ public class InitiatorEncryptionTokenBui initiatorToken.setIgnorable(PolicyConstants.isIgnorable(element)); Policy policy = builder.getPolicy(DOMUtils.getFirstElement(element)); - policy = (Policy)policy.normalize(builder.getPolicyRegistry(), false); + policy = policy.normalize(builder.getPolicyRegistry(), false); for (Iterator<List<Assertion>> iterator = policy.getAlternatives(); iterator.hasNext();) { processAlternative(iterator.next(), initiatorToken); Modified: cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/InitiatorSignatureTokenBuilder.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/InitiatorSignatureTokenBuilder.java?rev=1228848&r1=1228847&r2=1228848&view=diff ============================================================================== --- cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/InitiatorSignatureTokenBuilder.java (original) +++ cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/InitiatorSignatureTokenBuilder.java Sun Jan 8 13:59:37 2012 @@ -59,7 +59,7 @@ public class InitiatorSignatureTokenBuil initiatorToken.setIgnorable(PolicyConstants.isIgnorable(element)); Policy policy = builder.getPolicy(DOMUtils.getFirstElement(element)); - policy = (Policy)policy.normalize(builder.getPolicyRegistry(), false); + policy = policy.normalize(builder.getPolicyRegistry(), false); for (Iterator<List<Assertion>> iterator = policy.getAlternatives(); iterator.hasNext();) { processAlternative(iterator.next(), initiatorToken); Modified: cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/InitiatorTokenBuilder.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/InitiatorTokenBuilder.java?rev=1228848&r1=1228847&r2=1228848&view=diff ============================================================================== --- cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/InitiatorTokenBuilder.java (original) +++ cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/InitiatorTokenBuilder.java Sun Jan 8 13:59:37 2012 @@ -60,7 +60,7 @@ public class InitiatorTokenBuilder imple initiatorToken.setIgnorable(PolicyConstants.isIgnorable(element)); Policy policy = builder.getPolicy(DOMUtils.getFirstElement(element)); - policy = (Policy)policy.normalize(builder.getPolicyRegistry(), false); + policy = policy.normalize(builder.getPolicyRegistry(), false); for (Iterator<List<Assertion>> iterator = policy.getAlternatives(); iterator.hasNext();) { processAlternative(iterator.next(), initiatorToken); Modified: cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/IssuedTokenBuilder.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/IssuedTokenBuilder.java?rev=1228848&r1=1228847&r2=1228848&view=diff ============================================================================== --- cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/IssuedTokenBuilder.java (original) +++ cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/IssuedTokenBuilder.java Sun Jan 8 13:59:37 2012 @@ -81,7 +81,7 @@ public class IssuedTokenBuilder implemen issuedToken.setRstTemplate(child); } else if (org.apache.neethi.Constants.ELEM_POLICY.equals(ln)) { Policy policy = builder.getPolicy(child); - policy = (Policy)policy.normalize(builder.getPolicyRegistry(), false); + policy = policy.normalize(builder.getPolicyRegistry(), false); for (Iterator<List<Assertion>> iterator = policy.getAlternatives(); iterator.hasNext();) { processAlternative(iterator.next(), issuedToken); Modified: cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/ProtectionTokenBuilder.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/ProtectionTokenBuilder.java?rev=1228848&r1=1228847&r2=1228848&view=diff ============================================================================== --- cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/ProtectionTokenBuilder.java (original) +++ cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/ProtectionTokenBuilder.java Sun Jan 8 13:59:37 2012 @@ -57,7 +57,7 @@ public class ProtectionTokenBuilder impl ProtectionToken protectionToken = new ProtectionToken(consts, builder); Policy policy = builder.getPolicy(DOMUtils.getFirstElement(element)); - policy = (Policy)policy.normalize(builder.getPolicyRegistry(), false); + policy = policy.normalize(builder.getPolicyRegistry(), false); for (Iterator<List<Assertion>> iterator = policy.getAlternatives(); iterator.hasNext();) { processAlternative(iterator.next(), protectionToken); Modified: cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/RecipientEncryptionTokenBuilder.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/RecipientEncryptionTokenBuilder.java?rev=1228848&r1=1228847&r2=1228848&view=diff ============================================================================== --- cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/RecipientEncryptionTokenBuilder.java (original) +++ cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/RecipientEncryptionTokenBuilder.java Sun Jan 8 13:59:37 2012 @@ -62,7 +62,7 @@ public class RecipientEncryptionTokenBui recipientEncryptionToken.setIgnorable(PolicyConstants.isIgnorable(element)); Policy policy = builder.getPolicy(DOMUtils.getFirstElement(element)); - policy = (Policy)policy.normalize(builder.getPolicyRegistry(), false); + policy = policy.normalize(builder.getPolicyRegistry(), false); for (Iterator<List<Assertion>> iterator = policy.getAlternatives(); iterator.hasNext();) { processAlternative(iterator.next(), recipientEncryptionToken); Modified: cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/RecipientSignatureTokenBuilder.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/RecipientSignatureTokenBuilder.java?rev=1228848&r1=1228847&r2=1228848&view=diff ============================================================================== --- cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/RecipientSignatureTokenBuilder.java (original) +++ cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/RecipientSignatureTokenBuilder.java Sun Jan 8 13:59:37 2012 @@ -60,7 +60,7 @@ public class RecipientSignatureTokenBuil recipientSignatureToken.setIgnorable(PolicyConstants.isIgnorable(element)); Policy policy = builder.getPolicy(DOMUtils.getFirstElement(element)); - policy = (Policy)policy.normalize(builder.getPolicyRegistry(), false); + policy = policy.normalize(builder.getPolicyRegistry(), false); for (Iterator<List<Assertion>> iterator = policy.getAlternatives(); iterator.hasNext();) { processAlternative(iterator.next(), recipientSignatureToken); Modified: cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/RecipientTokenBuilder.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/RecipientTokenBuilder.java?rev=1228848&r1=1228847&r2=1228848&view=diff ============================================================================== --- cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/RecipientTokenBuilder.java (original) +++ cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/RecipientTokenBuilder.java Sun Jan 8 13:59:37 2012 @@ -58,7 +58,7 @@ public class RecipientTokenBuilder imple RecipientToken recipientToken = new RecipientToken(consts, builder); Policy policy = builder.getPolicy(DOMUtils.getFirstElement(element)); - policy = (Policy)policy.normalize(builder.getPolicyRegistry(), false); + policy = policy.normalize(builder.getPolicyRegistry(), false); for (Iterator<List<Assertion>> iterator = policy.getAlternatives(); iterator.hasNext();) { processAlternative(iterator.next(), recipientToken); Modified: cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/SupportingTokens12Builder.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/SupportingTokens12Builder.java?rev=1228848&r1=1228847&r2=1228848&view=diff ============================================================================== --- cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/SupportingTokens12Builder.java (original) +++ cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/SupportingTokens12Builder.java Sun Jan 8 13:59:37 2012 @@ -105,7 +105,7 @@ public class SupportingTokens12Builder i } Policy policy = builder.getPolicy(DOMUtils.getFirstElement(element)); - policy = (Policy) policy.normalize(builder.getPolicyRegistry(), false); + policy = policy.normalize(builder.getPolicyRegistry(), false); for (Iterator<List<Assertion>> iterator = policy.getAlternatives(); iterator.hasNext();) { processAlternative(iterator.next(), supportingToken); Modified: cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/SupportingTokensBuilder.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/SupportingTokensBuilder.java?rev=1228848&r1=1228847&r2=1228848&view=diff ============================================================================== --- cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/SupportingTokensBuilder.java (original) +++ cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/SupportingTokensBuilder.java Sun Jan 8 13:59:37 2012 @@ -77,7 +77,7 @@ public class SupportingTokensBuilder imp } Policy policy = builder.getPolicy(DOMUtils.getFirstElement(element)); - policy = (Policy)policy.normalize(builder.getPolicyRegistry(), false); + policy = policy.normalize(builder.getPolicyRegistry(), false); for (Iterator<List<Assertion>> iterator = policy.getAlternatives(); iterator.hasNext();) { processAlternative(iterator.next(), supportingToken); Modified: cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/SymmetricBindingBuilder.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/SymmetricBindingBuilder.java?rev=1228848&r1=1228847&r2=1228848&view=diff ============================================================================== --- cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/SymmetricBindingBuilder.java (original) +++ cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/SymmetricBindingBuilder.java Sun Jan 8 13:59:37 2012 @@ -59,7 +59,7 @@ public class SymmetricBindingBuilder imp SymmetricBinding symmetricBinding = new SymmetricBinding(consts, builder); Policy policy = builder.getPolicy(DOMUtils.getFirstElement(element)); - policy = (Policy)policy.normalize(builder.getPolicyRegistry(), false); + policy = policy.normalize(builder.getPolicyRegistry(), false); for (Iterator<List<Assertion>> iterator = policy.getAlternatives(); iterator.hasNext();) { processAlternatives(iterator.next(), symmetricBinding, consts); Modified: cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/TransportTokenBuilder.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/TransportTokenBuilder.java?rev=1228848&r1=1228847&r2=1228848&view=diff ============================================================================== --- cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/TransportTokenBuilder.java (original) +++ cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/TransportTokenBuilder.java Sun Jan 8 13:59:37 2012 @@ -55,7 +55,7 @@ public class TransportTokenBuilder imple TransportToken transportToken = new TransportToken(consts, builder); Policy policy = builder.getPolicy(DOMUtils.getFirstElement(element)); - policy = (Policy)policy.normalize(builder.getPolicyRegistry(), false); + policy = policy.normalize(builder.getPolicyRegistry(), false); for (Iterator<List<Assertion>> iterator = policy.getAlternatives(); iterator.hasNext();) { transportToken.setToken((Token)((iterator.next()).get(0))); Modified: cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/UsernameTokenBuilder.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/UsernameTokenBuilder.java?rev=1228848&r1=1228847&r2=1228848&view=diff ============================================================================== --- cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/UsernameTokenBuilder.java (original) +++ cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/UsernameTokenBuilder.java Sun Jan 8 13:59:37 2012 @@ -65,7 +65,7 @@ public class UsernameTokenBuilder implem for (int i = 0; i < children.getLength(); i++) { Node child = children.item(i); if (child instanceof Element) { - child = (Element)child; + child = child; QName qname = new QName(child.getNamespaceURI(), child.getLocalName()); if (SPConstants.USERNAME_TOKEN10.equals(qname.getLocalPart())) { usernameToken.setUseUTProfile10(true); Modified: cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/X509TokenBuilder.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/X509TokenBuilder.java?rev=1228848&r1=1228847&r2=1228848&view=diff ============================================================================== --- cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/X509TokenBuilder.java (original) +++ cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/X509TokenBuilder.java Sun Jan 8 13:59:37 2012 @@ -78,7 +78,7 @@ public class X509TokenBuilder implements Policy policy = builder.getPolicy(DOMUtils.getFirstElement(element)); - policy = (Policy)policy.normalize(builder.getPolicyRegistry(), false); + policy = policy.normalize(builder.getPolicyRegistry(), false); for (Iterator<List<Assertion>> iterator = policy.getAlternatives(); iterator.hasNext();) { processAlternative(iterator.next(), x509Token, consts); Modified: cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/AuthPolicyValidatingInterceptor.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/AuthPolicyValidatingInterceptor.java?rev=1228848&r1=1228847&r2=1228848&view=diff ============================================================================== --- cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/AuthPolicyValidatingInterceptor.java (original) +++ cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/AuthPolicyValidatingInterceptor.java Sun Jan 8 13:59:37 2012 @@ -54,7 +54,7 @@ public class AuthPolicyValidatingInterce public void handleMessage(Message message) throws Fault { - AuthorizationPolicy policy = (AuthorizationPolicy)message.get(AuthorizationPolicy.class); + AuthorizationPolicy policy = message.get(AuthorizationPolicy.class); if (policy == null \|\| policy.getUserName() == null \|\| policy.getPassword() == null) { String name = null; String password = null; Modified: cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/SymmetricBindingHandler.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/SymmetricBindingHandler.java?rev=1228848&r1=1228847&r2=1228848&view=diff ============================================================================== --- cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/SymmetricBindingHandler.java (original) +++ cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/SymmetricBindingHandler.java Sun Jan 8 13:59:37 2012 @@ -371,7 +371,7 @@ public class SymmetricBindingHandler ext encrTok = tokenStore.getToken(encrTokId); if (includeToken(encrToken.getInclusion())) { - Element encrTokElem = (Element)encrTok.getToken(); + Element encrTokElem = encrTok.getToken(); //Add the encrToken element before the sigToken element secHeader.getSecurityHeader().insertBefore(encrTokElem, sigTokElem); Modified: cxf/trunk/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/AbstractPolicySecurityTest.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/AbstractPolicySecurityTest.java?rev=1228848&r1=1228847&r2=1228848&view=diff ============================================================================== --- cxf/trunk/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/AbstractPolicySecurityTest.java (original) +++ cxf/trunk/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/AbstractPolicySecurityTest.java Sun Jan 8 13:59:37 2012 @@ -438,7 +438,7 @@ public abstract class AbstractPolicySecu // // This result should contain a reference to the decrypted element // - final Map<String, Object> result = (Map<String, Object>) protectionResults + final Map<String, Object> result = protectionResults .get(0); final List<WSDataRef> protectedElements = CastUtils.cast((List<?>)result.get(WSSecurityEngineResult.TAG_DATA_REF_URIS)); Modified: cxf/trunk/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/TestPwdCallback.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/TestPwdCallback.java?rev=1228848&r1=1228847&r2=1228848&view=diff ============================================================================== --- cxf/trunk/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/TestPwdCallback.java (original) +++ cxf/trunk/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/TestPwdCallback.java Sun Jan 8 13:59:37 2012 @@ -41,7 +41,7 @@ public class TestPwdCallback implements for (int i = 0; i < callbacks.length; i++) { WSPasswordCallback pc = (WSPasswordCallback)callbacks[i]; - String pass = (String)passwords.get(pc.getIdentifier()); + String pass = passwords.get(pc.getIdentifier()); if (pass != null) { pc.setPassword(pass); } Modified: cxf/trunk/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/WSS4JInOutTest.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/WSS4JInOutTest.java?rev=1228848&r1=1228847&r2=1228848&view=diff ============================================================================== --- cxf/trunk/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/WSS4JInOutTest.java (original) +++ cxf/trunk/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/WSS4JInOutTest.java Sun Jan 8 13:59:37 2012 @@ -175,7 +175,7 @@ public class WSS4JInOutTest extends Abst // This should contain exactly 1 protection result // final java.util.List<WSSecurityEngineResult> protectionResults = - (java.util.List<WSSecurityEngineResult>) handlerResults.get(0).getResults(); + handlerResults.get(0).getResults(); assertNotNull(protectionResults); assertSame(protectionResults.size(), 1); // @@ -183,7 +183,7 @@ public class WSS4JInOutTest extends Abst // which should contain the soap:Body Qname // final java.util.Map<String, Object> result = - (java.util.Map<String, Object>) protectionResults.get(0); + protectionResults.get(0); final java.util.List<WSDataRef> protectedElements = CastUtils.cast((List<?>)result.get(WSSecurityEngineResult.TAG_DATA_REF_URIS)); assertNotNull(protectedElements); @@ -237,7 +237,7 @@ public class WSS4JInOutTest extends Abst // This should contain exactly 2 protection results // final java.util.List<WSSecurityEngineResult> protectionResults = - (java.util.List<WSSecurityEngineResult>) handlerResults.get(0).getResults(); + handlerResults.get(0).getResults(); assertNotNull(protectionResults); assertSame(protectionResults.size(), 2); Modified: cxf/trunk/services/sts/sts-core/src/main/java/org/apache/cxf/sts/request/ReceivedToken.java URL: http://svn.apache.org/viewvc/cxf/trunk/services/sts/sts-core/src/main/java/org/apache/cxf/sts/request/ReceivedToken.java?rev=1228848&r1=1228847&r2=1228848&view=diff ============================================================================== --- cxf/trunk/services/sts/sts-core/src/main/java/org/apache/cxf/sts/request/ReceivedToken.java (original) +++ cxf/trunk/services/sts/sts-core/src/main/java/org/apache/cxf/sts/request/ReceivedToken.java Sun Jan 8 13:59:37 2012 @@ -68,7 +68,7 @@ public class ReceivedToken { token = ((JAXBElement<?>)receivedToken).getValue(); } else if (receivedToken instanceof Element) { LOG.fine("Found ValidateTarget element: " + ((Element)receivedToken).getLocalName()); - this.token = (Element)receivedToken; + this.token = receivedToken; isDOMElement = true; } else { LOG.fine("Found ValidateTarget object of unknown type"); Modified: cxf/trunk/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/validator/SCTValidator.java URL: http://svn.apache.org/viewvc/cxf/trunk/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/validator/SCTValidator.java?rev=1228848&r1=1228847&r2=1228848&view=diff ============================================================================== --- cxf/trunk/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/validator/SCTValidator.java (original) +++ cxf/trunk/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/validator/SCTValidator.java Sun Jan 8 13:59:37 2012 @@ -107,7 +107,7 @@ public class SCTValidator implements Tok LOG.fine("Identifier: " + identifier + " is not found in the cache"); return response; } - byte[] secret = (byte[])token.getSecret(); + byte[] secret = token.getSecret(); Map<String, Object> properties = new HashMap<String, Object>(); properties.put(SCT_VALIDATOR_SECRET, secret); response.setAdditionalProperties(properties); Modified: cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/AbstractNotificationBroker.java URL: http://svn.apache.org/viewvc/cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/AbstractNotificationBroker.java?rev=1228848&r1=1228847&r2=1228848&view=diff ============================================================================== --- cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/AbstractNotificationBroker.java (original) +++ cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/AbstractNotificationBroker.java Sun Jan 8 13:59:37 2012 @@ -226,7 +226,7 @@ public abstract class AbstractNotificati } public void unsubscribe(String address) throws UnableToDestroySubscriptionFault { - AbstractSubscription subscription = (AbstractSubscription) subscriptions.remove(address); + AbstractSubscription subscription = subscriptions.remove(address); if (subscription != null) { subscription.unsubscribe(); } Modified: cxf/trunk/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/mtom/MtomTest.java URL: http://svn.apache.org/viewvc/cxf/trunk/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/mtom/MtomTest.java?rev=1228848&r1=1228847&r2=1228848&view=diff ============================================================================== --- cxf/trunk/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/mtom/MtomTest.java (original) +++ cxf/trunk/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/mtom/MtomTest.java Sun Jan 8 13:59:37 2012 @@ -84,8 +84,7 @@ public class MtomTest extends AbstractJU } proxyFac.setProperties(props); - client = (org.apache.cxf.systest.aegis.mtom.fortest.MtomTestService) - proxyFac.create(MtomTestService.class); + client = proxyFac.create(MtomTestService.class); jaxwsClient = jaxwsFac.create(MtomTestService.class); impl = (MtomTestImpl)applicationContext.getBean("mtomImpl"); } Modified: cxf/trunk/systests/databinding/src/test/java/org/apache/cxf/systest/jaxb/TestServiceTest.java URL: http://svn.apache.org/viewvc/cxf/trunk/systests/databinding/src/test/java/org/apache/cxf/systest/jaxb/TestServiceTest.java?rev=1228848&r1=1228847&r2=1228848&view=diff ============================================================================== --- cxf/trunk/systests/databinding/src/test/java/org/apache/cxf/systest/jaxb/TestServiceTest.java (original) +++ cxf/trunk/systests/databinding/src/test/java/org/apache/cxf/systest/jaxb/TestServiceTest.java Sun Jan 8 13:59:37 2012 @@ -55,7 +55,7 @@ public class TestServiceTest extends Abs public void testExtraSubClassWithJaxb() throws Throwable { Widget expected = new ExtendedWidget(42, "blah", "blah", true, true); TestService testClient = getTestClient(); - Widget widgetFromService = testClient.getWidgetById((long)42); + Widget widgetFromService = testClient.getWidgetById(42); Assert.assertEquals(expected, widgetFromService); } @@ -68,7 +68,7 @@ public class TestServiceTest extends Abs ((BindingProvider)testClient).getRequestContext() .put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, "http://localhost:" + PORT + "/service/TestEndpoint"); - Widget widgetFromService = testClient.getWidgetById((long)42); + Widget widgetFromService = testClient.getWidgetById(42); Assert.assertEquals(expected, widgetFromService); } @@ -102,6 +102,6 @@ public class TestServiceTest extends Abs * @return the testClient */ public TestService getTestClient() { - return (TestService)applicationContext.getBean("testClient", TestService.class); + return applicationContext.getBean("testClient", TestService.class); } } Modified: cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSMultipartTest.java URL: http://svn.apache.org/viewvc/cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSMultipartTest.java?rev=1228848&r1=1228847&r2=1228848&view=diff ============================================================================== --- cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSMultipartTest.java (original) +++ cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSMultipartTest.java Sun Jan 8 13:59:37 2012 @@ -380,7 +380,7 @@ public class JAXRSMultipartTest extends Book json2 = readJSONBookFromInputStream(result.get(1).getDataHandler().getInputStream()); assertEquals("json", json2.getName()); assertEquals(2L, json2.getId()); - InputStream is2 = (InputStream)result.get(2).getDataHandler().getInputStream(); + InputStream is2 = result.get(2).getDataHandler().getInputStream(); byte[] image1 = IOUtils.readBytesFromStream( getClass().getResourceAsStream("/org/apache/cxf/systest/jaxrs/resources/java.jpg")); byte[] image2 = IOUtils.readBytesFromStream(is2); @@ -437,7 +437,7 @@ public class JAXRSMultipartTest extends Book json2 = readJSONBookFromInputStream(result.get(1).getDataHandler().getInputStream()); assertEquals("json", json2.getName()); assertEquals(2L, json2.getId()); - InputStream is2 = (InputStream)result.get(2).getDataHandler().getInputStream(); + InputStream is2 = result.get(2).getDataHandler().getInputStream(); byte[] image1 = IOUtils.readBytesFromStream( getClass().getResourceAsStream("/org/apache/cxf/systest/jaxrs/resources/java.jpg")); byte[] image2 = IOUtils.readBytesFromStream(is2);
Mime	Unnamed text/plain (inline, 7-Bit, 88774 bytes)
	View raw message