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=1227899&r1=1227898&r2=1227899&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 Thu Jan 5 23:58:20 2012 @@ -210,13 +210,13 @@ public class WSDLServiceBuilder { parseImports(d, defList); for (Definition def : defList) { - for (Iterator ite = def.getPortTypes().entrySet().iterator(); ite.hasNext();) { - Entry entry = (Entry)ite.next(); + for (Iterator<?> ite = def.getPortTypes().entrySet().iterator(); ite.hasNext();) { + Entry<?, ?> entry = (Entry<?, ?>)ite.next(); PortType portType = def.getPortType((QName)entry.getKey()); ServiceInfo serviceInfo = this.buildMockService(def, portType); serviceList.add(serviceInfo); - for (Iterator it2 = d.getAllBindings().values().iterator(); it2.hasNext();) { + for (Iterator<?> it2 = d.getAllBindings().values().iterator(); it2.hasNext();) { Binding b = (Binding)it2.next(); if (b.getPortType() == portType) { this.buildBinding(serviceInfo, b); @@ -400,7 +400,7 @@ public class WSDLServiceBuilder { } public EndpointInfo buildEndpoint(ServiceInfo service, BindingInfo bi, Port port) { - List elements = port.getExtensibilityElements(); + List<?> elements = port.getExtensibilityElements(); String ns = null; DestinationFactory factory = null; @@ -583,7 +583,7 @@ public class WSDLServiceBuilder { opInfo.setProperty(WSDL_OPERATION, op); } copyDocumentation(opInfo, op); - List<String> porderList = CastUtils.cast((List)op.getParameterOrdering()); + List<String> porderList = CastUtils.cast((List<?>)op.getParameterOrdering()); opInfo.setParameterOrdering(porderList); this.copyExtensors(opInfo, op.getExtensibilityElements()); this.copyExtensionAttributes(opInfo, op); @@ -849,7 +849,7 @@ public class WSDLServiceBuilder { private void buildMessage(AbstractMessageContainer minfo, Message msg) { SchemaCollection schemas = minfo.getOperation().getInterface().getService() .getXmlSchemaCollection(); - List orderedParam = msg.getOrderedParts(null); + List<?> orderedParam = msg.getOrderedParts(null); for (Part part : cast(orderedParam, Part.class)) { MessagePartInfo pi = minfo.addMessagePart(new QName(minfo.getName().getNamespaceURI(), part .getName()));
Modified: cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/CXFBusImplTest.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/CXFBusImplTest.java?rev=1227899&r1=1227898&r2=1227899&view=diff ============================================================================== --- cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/CXFBusImplTest.java (original) +++ cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/CXFBusImplTest.java Thu Jan 5 23:58:20 2012 @@ -62,7 +62,7 @@ public class CXFBusImplTest extends Asse control = EasyMock.createNiceControl(); - Map<Class, Object> extensions = new HashMap<Class, Object>(); + Map<Class<?>, Object> extensions = new HashMap<Class<?>, Object>(); bindingFactoryManager = control.createMock(BindingFactoryManager.class); wsdlManager = control.createMock(WSDLManager.class); instrumentationManager = control.createMock(InstrumentationManager.class); Modified: cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/extension/ExtensionManagerTest.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/extension/ExtensionManagerTest.java?rev=1227899&r1=1227898&r2=1227899&view=diff ============================================================================== --- cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/extension/ExtensionManagerTest.java (original) +++ cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/extension/ExtensionManagerTest.java Thu Jan 5 23:58:20 2012 @@ -34,14 +34,14 @@ public class ExtensionManagerTest extend private static final String EXTENSIONMANAGER_TEST_RESOURECE_NAME = "extensionManagerTest"; private ExtensionManagerImpl manager; - private Map<Class, Object> extensions; + private Map<Class<?>, Object> extensions; @Before public void setUp() { ResourceResolver resolver = new SinglePropertyResolver(EXTENSIONMANAGER_TEST_RESOURECE_NAME, this); ResourceManager rm = new DefaultResourceManager(resolver); - extensions = new HashMap<Class, Object>(); + extensions = new HashMap<Class<?>, Object>(); extensions.put(Integer.class, new Integer(0)); manager = new ExtensionManagerImpl("test-extension.xml", Modified: cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/spring/BusDefinitionParserTest.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/spring/BusDefinitionParserTest.java?rev=1227899&r1=1227898&r2=1227899&view=diff ============================================================================== --- cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/spring/BusDefinitionParserTest.java (original) +++ cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/spring/BusDefinitionParserTest.java Thu Jan 5 23:58:20 2012 @@ -48,7 +48,7 @@ public class BusDefinitionParserTest ext List<Interceptor<? extends Message>> in = bus.getInInterceptors(); boolean found = false; - for (Interceptor i : in) { + for (Interceptor<? extends Message> i : in) { if (i instanceof LoggingInInterceptor) { found = true; } @@ -132,7 +132,7 @@ public class BusDefinitionParserTest ext List<Interceptor<? extends Message>> in = bus.getInInterceptors(); boolean found = false; - for (Interceptor i : in) { + for (Interceptor<? extends Message> i : in) { if (i instanceof LoggingInInterceptor) { found = true; } Modified: cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/spring/SpringBusFactoryTest.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/spring/SpringBusFactoryTest.java?rev=1227899&r1=1227898&r2=1227899&view=diff ============================================================================== --- cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/spring/SpringBusFactoryTest.java (original) +++ cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/spring/SpringBusFactoryTest.java Thu Jan 5 23:58:20 2012 @@ -181,7 +181,7 @@ public class SpringBusFactoryTest extend } - static class TestInterceptor implements Interceptor { + static class TestInterceptor implements Interceptor<Message> { private String name; Modified: cxf/trunk/rt/core/src/test/java/org/apache/cxf/wsdl11/WSDLDefinitionBuilderTest.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/test/java/org/apache/cxf/wsdl11/WSDLDefinitionBuilderTest.java?rev=1227899&r1=1227898&r2=1227899&view=diff ============================================================================== --- cxf/trunk/rt/core/src/test/java/org/apache/cxf/wsdl11/WSDLDefinitionBuilderTest.java (original) +++ cxf/trunk/rt/core/src/test/java/org/apache/cxf/wsdl11/WSDLDefinitionBuilderTest.java Thu Jan 5 23:58:20 2012 @@ -51,13 +51,13 @@ public class WSDLDefinitionBuilderTest e Definition def = builder.build(wsdlUrl); assertNotNull(def); - Map services = def.getServices(); + Map<?, ?> services = def.getServices(); assertNotNull(services); assertEquals(1, services.size()); Service service = (Service)services.get(new QName(qname, "SOAPService")); assertNotNull(service); - Map ports = service.getPorts(); + Map<?, ?> ports = service.getPorts(); assertNotNull(ports); assertEquals(1, ports.size()); Port port = service.getPort("SoapPort"); @@ -72,7 +72,7 @@ public class WSDLDefinitionBuilderTest e Definition def = builder.build(wsdlUrl); assertNotNull(def); - Map services = def.getServices(); + Map<?, ?> services = def.getServices(); assertNotNull(services); assertEquals(1, services.size()); @@ -80,7 +80,7 @@ public class WSDLDefinitionBuilderTest e Service service = (Service)services.get(new QName(serviceQName, "SOAPService")); assertNotNull(service); - Map ports = service.getPorts(); + Map<?, ?> ports = service.getPorts(); assertNotNull(ports); assertEquals(1, ports.size()); Port port = service.getPort("SoapPort"); @@ -112,7 +112,7 @@ public class WSDLDefinitionBuilderTest e Definition def = builder.build(wsdlUrl); assertNotNull(def); - Map services = def.getServices(); + Map<?, ?> services = def.getServices(); assertNotNull(services); assertEquals(1, services.size()); @@ -120,7 +120,7 @@ public class WSDLDefinitionBuilderTest e Service service = (Service)services.get(new QName(serviceQName, "S1importsS2S3TestService")); assertNotNull(service); - Map ports = service.getPorts(); + Map<?, ?> ports = service.getPorts(); assertNotNull(ports); assertEquals(1, ports.size()); Port port = service.getPort("S1importsS2S3TestPort"); Modified: cxf/trunk/rt/core/src/test/java/org/apache/cxf/wsdl11/WSDLManagerImplTest.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/test/java/org/apache/cxf/wsdl11/WSDLManagerImplTest.java?rev=1227899&r1=1227898&r2=1227899&view=diff ============================================================================== --- cxf/trunk/rt/core/src/test/java/org/apache/cxf/wsdl11/WSDLManagerImplTest.java (original) +++ cxf/trunk/rt/core/src/test/java/org/apache/cxf/wsdl11/WSDLManagerImplTest.java Thu Jan 5 23:58:20 2012 @@ -44,13 +44,13 @@ public class WSDLManagerImplTest extends Definition def = builder.getDefinition(wsdlUrl); assertNotNull(def); - Map services = def.getServices(); + Map<?, ?> services = def.getServices(); assertNotNull(services); assertEquals(1, services.size()); Service service = (Service)services.get(new QName(qname, "SOAPService")); assertNotNull(service); - Map ports = service.getPorts(); + Map<?, ?> ports = service.getPorts(); assertNotNull(ports); assertEquals(1, ports.size()); Port port = service.getPort("SoapPort"); @@ -65,7 +65,7 @@ public class WSDLManagerImplTest extends Definition def = builder.getDefinition(wsdlUrl); assertNotNull(def); - Map services = def.getServices(); + Map<?, ?> services = def.getServices(); assertNotNull(services); assertEquals(1, services.size()); @@ -73,7 +73,7 @@ public class WSDLManagerImplTest extends Service service = (Service)services.get(new QName(serviceQName, "SOAPService")); assertNotNull(service); - Map ports = service.getPorts(); + Map<?, ?> ports = service.getPorts(); assertNotNull(ports); assertEquals(1, ports.size()); Port port = service.getPort("SoapPort"); Modified: cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/bus/BusExtensionLoadingTest.java URL: http://svn.apache.org/viewvc/cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/bus/BusExtensionLoadingTest.java?rev=1227899&r1=1227898&r2=1227899&view=diff ============================================================================== --- cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/bus/BusExtensionLoadingTest.java (original) +++ cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/bus/BusExtensionLoadingTest.java Thu Jan 5 23:58:20 2012 @@ -51,7 +51,7 @@ public class BusExtensionLoadingTest ext try { Thread.currentThread().setContextClassLoader(new TestClassLoader()); BusFactory factory = new CXFBusFactory() { - public Bus createBus(Map<Class, Object> e, Map<String, Object> properties) { + public Bus createBus(Map<Class<?>, Object> e, Map<String, Object> properties) { return new ExtensionManagerBus(e, properties, this.getClass().getClassLoader()); } };
