Modified: cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java URL: http://svn.apache.org/viewvc/cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java?rev=1227822&r1=1227821&r2=1227822&view=diff ============================================================================== --- cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java (original) +++ cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java Thu Jan 5 20:45:57 2012 @@ -98,7 +98,7 @@ public class CodeGenBugTest extends Abst assertNotNull("Trouble processing logical only wsdl", output); - Class clz = classLoader.loadClass("org.apache.cxf.cxf1678.hello_world_soap_http.GreeterImpl"); + Class<?> clz = classLoader.loadClass("org.apache.cxf.cxf1678.hello_world_soap_http.GreeterImpl"); WebService webServiceAnn = AnnotationUtil.getPrivClassAnnotation(clz, WebService.class); assertEquals("org.apache.cxf.cxf1678.hello_world_soap_http.Greeter", webServiceAnn.endpointInterface()); @@ -123,7 +123,7 @@ public class CodeGenBugTest extends Abst env.put(ToolConstants.CFG_WSDLURL, getLocation("/wsdl2java_wsdl/bug305773/hello_world.wsdl")); processor.setContext(env); processor.execute(); - Class clz = classLoader.loadClass("org.apache.cxf.w2j.hello_world_soap_http.GreeterImpl"); + Class<?> clz = classLoader.loadClass("org.apache.cxf.w2j.hello_world_soap_http.GreeterImpl"); WebService webServiceAnn = AnnotationUtil.getPrivClassAnnotation(clz, WebService.class); assertTrue("Impl class should note generate name property value in webService annotation", @@ -166,7 +166,7 @@ public class CodeGenBugTest extends Abst files = types.listFiles(); assertEquals(17, files.length); - Class clz = classLoader.loadClass("org.apache.types.GreetMe"); + Class<?> clz = classLoader.loadClass("org.apache.types.GreetMe"); assertNotNull(clz); } @@ -186,7 +186,7 @@ public class CodeGenBugTest extends Abst File types = new File(apache, "types"); assertTrue("types directory is not found", types.exists()); - Class clz = classLoader.loadClass("org.apache.types.GreetMe"); + Class<?> clz = classLoader.loadClass("org.apache.types.GreetMe"); assertTrue("Generate " + clz.getName() + "error", Modifier.isPublic(clz.getModifiers())); clz = classLoader.loadClass("org.apache.Greeter"); } @@ -205,7 +205,7 @@ public class CodeGenBugTest extends Abst File[] files = cxf.listFiles(); assertEquals(25, files.length); - Class clz = classLoader.loadClass("org.cxf.Greeter"); + Class<?> clz = classLoader.loadClass("org.cxf.Greeter"); assertTrue("Generate " + clz.getName() + "error", clz.isInterface()); } @@ -278,7 +278,7 @@ public class CodeGenBugTest extends Abst "-server", "-impl", getLocation("/wsdl2java_wsdl/hello_world.wsdl")}; WSDLToJava.main(args); - Class clz = classLoader.loadClass("org.cxf.Greeter"); + Class<?> clz = classLoader.loadClass("org.cxf.Greeter"); assertTrue("Generate " + clz.getName() + "error", clz.isInterface()); } @@ -341,7 +341,7 @@ public class CodeGenBugTest extends Abst fail("Error during wsdl2java: \n" + e.getMessage()); } try { - Class clz = classLoader + Class<?> clz = classLoader .loadClass("org.apache.cxf.w2j.hello_world_soap_http.types.CreateProcess$MyProcess"); assertNotNull("Customization binding code should be generated", clz); } catch (ClassNotFoundException e) { @@ -362,7 +362,7 @@ public class CodeGenBugTest extends Abst e.printStackTrace(System.err); } try { - Class clz = classLoader + Class<?> clz = classLoader .loadClass("org.apache.cxf.w2j.hello_world_soap_http.types.CreateProcess$MyProcess"); assertNotNull("Customization binding code should be generated", clz); } catch (ClassNotFoundException e) { @@ -389,7 +389,7 @@ public class CodeGenBugTest extends Abst env.put(ToolConstants.CFG_WSDLURL, getLocation("/wsdl2java_wsdl/helloworld_noservice_import.wsdl")); processor.setContext(env); processor.execute(); - Class cls = classLoader.loadClass("org.apache.cxf.w2j.hello_world1.Greeter"); + Class<?> cls = classLoader.loadClass("org.apache.cxf.w2j.hello_world1.Greeter"); assertNotNull(cls); cls = classLoader.loadClass("org.apache.cxf.w2j.hello_world2.Greeter2"); } @@ -402,7 +402,7 @@ public class CodeGenBugTest extends Abst processor.setContext(env); processor.execute(); - Class clz = classLoader + Class<?> clz = classLoader .loadClass("org.apache.cxf.w2j.hello_world_soap_http.service.SOAPServiceTest1"); WebServiceClient webServiceClient = AnnotationUtil .getPrivClassAnnotation(clz, WebServiceClient.class); @@ -434,7 +434,7 @@ public class CodeGenBugTest extends Abst env.put(ToolConstants.CFG_WSDLURL, getLocation("/wsdl2java_wsdl/no_port_or_service.wsdl")); processor.setContext(env); processor.execute(); - Class clz = classLoader.loadClass("org.apache.cxf.no_port_or_service.types.TheComplexType"); + Class<?> clz = classLoader.loadClass("org.apache.cxf.no_port_or_service.types.TheComplexType"); assertNotNull(clz); } @@ -585,7 +585,7 @@ public class CodeGenBugTest extends Abst // ignore } - Class clz = classLoader.loadClass("org.apache.cxf.w2j.hello_world_soap_http.Greeter"); + Class<?> clz = classLoader.loadClass("org.apache.cxf.w2j.hello_world_soap_http.Greeter"); assertEquals(3, clz.getDeclaredMethods().length); } @@ -809,9 +809,10 @@ public class CodeGenBugTest extends Abst getLocation("/wsdl2java_wsdl/cxf1095/binding1.xml")}); processor.setContext(env); processor.execute(); - Class clz = classLoader.loadClass("org.apache.cxf.w2j.hello_world.messages.CustomizedFault"); + Class<?> clz = classLoader.loadClass("org.apache.cxf.w2j.hello_world.messages.CustomizedFault"); assertNotNull("Customization Fault Class is not generated", clz); - Class serviceClz = classLoader.loadClass("org.apache.cxf.w2j.hello_world.services.CustomizedService"); + Class<?> serviceClz = classLoader + .loadClass("org.apache.cxf.w2j.hello_world.services.CustomizedService"); assertNotNull("Customization Fault Class is not generated", serviceClz); } @@ -850,7 +851,7 @@ public class CodeGenBugTest extends Abst env.put(ToolConstants.CFG_BINDING, getLocation("/wsdl2java_wsdl/cxf1094/jaxbbinding.xml")); processor.setContext(env); processor.execute(); - Class clz = classLoader + Class<?> clz = classLoader .loadClass("org.apache.cxf.w2j.hello_world_soap_http.types.CreateProcess$MyProcess"); assertNotNull("Failed to generate customized class for hello_world.wsdl", clz); @@ -858,7 +859,7 @@ public class CodeGenBugTest extends Abst env.put(ToolConstants.CFG_BINDING, getLocation("/wsdl2java_wsdl/cxf1094/jaxbbinding.xml")); processor.setContext(env); processor.execute(); - Class customizedClz = classLoader.loadClass("org.apache.oneway.types.CreateProcess$MyProcess"); + Class<?> customizedClz = classLoader.loadClass("org.apache.oneway.types.CreateProcess$MyProcess"); assertNotNull("Failed to generate customized class for hello_world_oneway.wsdl", customizedClz); } @@ -868,7 +869,7 @@ public class CodeGenBugTest extends Abst env.put(ToolConstants.CFG_BINDING, getLocation("/wsdl2java_wsdl/cxf1106/binding.xml")); processor.setContext(env); processor.execute(); - Class clz = classLoader.loadClass("org.apache.cxf.w2j.hello_world_soap_http.Greeter"); + Class<?> clz = classLoader.loadClass("org.apache.cxf.w2j.hello_world_soap_http.Greeter"); assertNotNull("Failed to generate SEI class", clz); Method[] methods = clz.getMethods(); assertEquals("jaxws binding file parse error, number of generated method is not expected", 14, @@ -890,7 +891,7 @@ public class CodeGenBugTest extends Abst env.put(ToolConstants.CFG_BINDING, getLocation("/wsdl2java_wsdl/cxf1112/jaxbbinding.xml")); processor.setContext(env); processor.execute(); - Class clz = classLoader.loadClass("org.mytest.ObjectFactory"); + Class<?> clz = classLoader.loadClass("org.mytest.ObjectFactory"); assertNotNull("Customization types class should be generated", clz); } @@ -1028,7 +1029,7 @@ public class CodeGenBugTest extends Abst env.put(ToolConstants.CFG_WSDLURL, getLocation("/wsdl2java_wsdl/cxf1048/test.wsdl")); processor.setContext(env); processor.execute(); - Class clz = classLoader.loadClass("org.apache.hello_world_soap_http.PingImpl"); + Class<?> clz = classLoader.loadClass("org.apache.hello_world_soap_http.PingImpl"); WebService webServiceAnn = AnnotationUtil.getPrivClassAnnotation(clz, WebService.class); assertEquals("org.apache.hello_world_soap_http.Ping", webServiceAnn.endpointInterface());
Modified: cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenOptionTest.java URL: http://svn.apache.org/viewvc/cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenOptionTest.java?rev=1227822&r1=1227821&r2=1227822&view=diff ============================================================================== --- cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenOptionTest.java (original) +++ cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenOptionTest.java Thu Jan 5 20:45:57 2012 @@ -50,7 +50,7 @@ public class CodeGenOptionTest extends A processor.setContext(env); processor.execute(); - Class greeterServer = classLoader + Class<?> greeterServer = classLoader .loadClass("org.apache.cxf.w2j.hello_world_soap_http.Greeter_SoapPort_Server"); assertNotNull("Server should be generated", greeterServer); @@ -65,7 +65,7 @@ public class CodeGenOptionTest extends A processor.setContext(env); processor.execute(); - Class greeterServer = classLoader + Class<?> greeterServer = classLoader .loadClass("org.apache.cxf.w2j.hello_world_soap_http.Greeter_SoapPort_Server"); assertNotNull("Server should be generated", greeterServer); } @@ -85,11 +85,11 @@ public class CodeGenOptionTest extends A doWSDLListOptionTest(null, Arrays.asList(wsdl1, wsdl2)); - Class greeterServer = classLoader + Class<?> greeterServer = classLoader .loadClass("org.apache.cxf.w2j.hello_world_soap_http.Greeter_SoapPort_Server"); assertNotNull("Server should be generated", greeterServer); - Class carDealerServer = classLoader + Class<?> carDealerServer = classLoader .loadClass("type_substitution.server.CarDealer_CarDealerPort_Server"); assertNotNull("Server should be generated", carDealerServer); @@ -109,7 +109,7 @@ public class CodeGenOptionTest extends A doWSDLListOptionTest(null, Arrays.asList(wsdl1)); - Class greeterServer = classLoader + Class<?> greeterServer = classLoader .loadClass("org.apache.cxf.w2j.hello_world_soap_http.Greeter_SoapPort_Server"); assertNotNull("Server should be generated", greeterServer); } @@ -206,7 +206,7 @@ public class CodeGenOptionTest extends A File apache = new File(org, "apache"); assertTrue(apache.exists()); - Class clz = classLoader.loadClass("org.apache.cxf.w2j.hello_world_async_soap_http.GreeterAsync"); + Class<?> clz = classLoader.loadClass("org.apache.cxf.w2j.hello_world_async_soap_http.GreeterAsync"); assertEquals(3, clz.getMethods().length); } Modified: cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenTest.java URL: http://svn.apache.org/viewvc/cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenTest.java?rev=1227822&r1=1227821&r2=1227822&view=diff ============================================================================== --- cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenTest.java (original) +++ cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenTest.java Thu Jan 5 20:45:57 2012 @@ -62,7 +62,7 @@ public class CodeGenTest extends Abstrac assertNotNull(output); - Class clz = classLoader.loadClass("com.mypizzaco.pizza.PizzaPortType"); + Class<?> clz = classLoader.loadClass("com.mypizzaco.pizza.PizzaPortType"); Method meths[] = clz.getMethods(); for (Method m : meths) { @@ -121,7 +121,7 @@ public class CodeGenTest extends Abstrac assertNotNull(output); - Class clz = classLoader.loadClass("com.mypizzaco.pizza.PizzaPortType"); + Class<?> clz = classLoader.loadClass("com.mypizzaco.pizza.PizzaPortType"); Method meths[] = clz.getMethods(); for (Method m : meths) { @@ -154,7 +154,7 @@ public class CodeGenTest extends Abstrac assertNotNull(output); - Class clz = classLoader.loadClass("com.mypizzaco.pizza.PizzaPortType"); + Class<?> clz = classLoader.loadClass("com.mypizzaco.pizza.PizzaPortType"); Method meths[] = clz.getMethods(); for (Method m : meths) { @@ -189,7 +189,7 @@ public class CodeGenTest extends Abstrac assertNotNull(output); - Class clz = classLoader.loadClass("org.apache.cxf.pizza_wrapped.Pizza"); + Class<?> clz = classLoader.loadClass("org.apache.cxf.pizza_wrapped.Pizza"); Method meths[] = clz.getMethods(); for (Method m : meths) { @@ -222,7 +222,7 @@ public class CodeGenTest extends Abstrac assertNotNull(output); - Class clz = classLoader.loadClass("org.apache.cxf.bugs.oobh.LoginInterface"); + Class<?> clz = classLoader.loadClass("org.apache.cxf.bugs.oobh.LoginInterface"); Method meths[] = clz.getMethods(); for (Method m : meths) { if ("login".equals(m.getName())) { @@ -503,7 +503,7 @@ public class CodeGenTest extends Abstrac assertEquals(method.getName() + "()" + " Annotation : WebMethod.operationName ", "pingMe", webMethodAnno.operationName()); } - Class[] exceptionCls = method.getExceptionTypes(); + Class<?>[] exceptionCls = method.getExceptionTypes(); assertEquals(1, exceptionCls.length); assertEquals("org.apache.cxf.w2j.hello_world_soap12_http.PingMeFault", exceptionCls[0].getName()); @@ -791,7 +791,7 @@ public class CodeGenTest extends Abstrac File serviceCollision = new File(apache, "Greeter_Service.java"); assertTrue(serviceCollision.exists()); - Class clz = classLoader.loadClass("org.apache.Greeter"); + Class<?> clz = classLoader.loadClass("org.apache.Greeter"); assertTrue("SEI class Greeter modifier should be interface", clz.isInterface()); clz = classLoader.loadClass("org.apache.Greeter_Exception"); @@ -819,7 +819,7 @@ public class CodeGenTest extends Abstrac File serviceCollision = new File(apache, "HelloWorldServiceImpl_Service.java"); assertTrue(serviceCollision.exists()); - Class clz = classLoader.loadClass("org.apache.HelloWorldServiceImpl"); + Class<?> clz = classLoader.loadClass("org.apache.HelloWorldServiceImpl"); assertTrue("SEI class HelloWorldServiceImpl modifier should be interface", clz.isInterface()); clz = classLoader.loadClass("org.apache.HelloWorldServiceImpl_Service"); @@ -1040,7 +1040,7 @@ public class CodeGenTest extends Abstrac processor.setContext(env); processor.execute(); Class<?> clz = classLoader.loadClass("org.apache.header2.Header2Test"); - Class header = classLoader.loadClass("org.apache.header2.Header"); + Class<?> header = classLoader.loadClass("org.apache.header2.Header"); Method method = clz.getMethod("headerMethod", new Class[] {Holder.class, header}); assertNotNull("method should be generated", method); } @@ -1129,7 +1129,7 @@ public class CodeGenTest extends Abstrac env.put(ToolConstants.CFG_WSDLURL, getLocation("/wsdl2java_wsdl/hello_world_with_enum_type.wsdl")); processor.setContext(env); processor.execute(); - Class clz = classLoader.loadClass("org.apache.cxf.w2j.hello_world_soap_http.types.ActionType"); + Class<?> clz = classLoader.loadClass("org.apache.cxf.w2j.hello_world_soap_http.types.ActionType"); assertNotNull("Enum class could not be found", clz); } @@ -1149,7 +1149,7 @@ public class CodeGenTest extends Abstrac Type[] types = method1.getGenericParameterTypes(); ParameterizedType paraType = (ParameterizedType)types[1]; - Class typeClass = (Class)paraType.getActualTypeArguments()[0]; + Class<?> typeClass = (Class<?>)paraType.getActualTypeArguments()[0]; assertEquals("javax.activation.DataHandler", typeClass.getName()); } @@ -1158,7 +1158,7 @@ public class CodeGenTest extends Abstrac env.put(ToolConstants.CFG_WSDLURL, getLocation("/wsdl2java_wsdl/soapheader_rpc.wsdl")); processor.setContext(env); processor.execute(); - Class cls = classLoader.loadClass("org.apache.header_test.rpc.TestRPCHeader"); + Class<?> cls = classLoader.loadClass("org.apache.header_test.rpc.TestRPCHeader"); Method meths[] = cls.getMethods(); for (Method m : meths) { @@ -1233,7 +1233,7 @@ public class CodeGenTest extends Abstrac env.put(ToolConstants.CFG_SERVICENAME, "HelloWorldService"); processor.setContext(env); processor.execute(); - Class cls = classLoader.loadClass("org.apache.cxf.w2j.hello_world_jms.BadRecordLitFault"); + Class<?> cls = classLoader.loadClass("org.apache.cxf.w2j.hello_world_jms.BadRecordLitFault"); WebFault webFault = AnnotationUtil.getPrivClassAnnotation(cls, WebFault.class); assertEquals("http://www.w3.org/2001/XMLSchema";, webFault.targetNamespace()); @@ -1366,7 +1366,7 @@ public class CodeGenTest extends Abstrac processor.setContext(env); processor.execute(); - Class sei = classLoader.loadClass("org.apache.stringarray.StringListTest"); + Class<?> sei = classLoader.loadClass("org.apache.stringarray.StringListTest"); Method method = sei.getMethods()[0]; assertNotNull("@XmlList is not generated for method", method.getAnnotation(XmlList.class)); boolean xmlListGenerated = false; @@ -1384,7 +1384,7 @@ public class CodeGenTest extends Abstrac env.put(ToolConstants.CFG_WSDLURL, getLocation("/wsdl2java_wsdl/cxf-1404/hello_world.wsdl")); processor.setContext(env); processor.execute(); - Class sei = classLoader.loadClass("org.apache.cxf.cxf1404.hello_world_soap_http.Greeter"); + Class<?> sei = classLoader.loadClass("org.apache.cxf.cxf1404.hello_world_soap_http.Greeter"); assertEquals(1, sei.getMethods().length); assertFalse(Void.TYPE.equals(sei.getMethods()[0].getReturnType())); } @@ -1397,7 +1397,7 @@ public class CodeGenTest extends Abstrac File seif = new File(output, "org/apache/cxf/helloworld/HelloWorldServiceImpl.java"); assertTrue(seif.exists()); - Class sei = classLoader.loadClass("org.apache.cxf.helloworld.HelloWorldServiceImpl"); + Class<?> sei = classLoader.loadClass("org.apache.cxf.helloworld.HelloWorldServiceImpl"); Method m[] = sei.getDeclaredMethods(); assertEquals(1, m.length); assertTrue(m[0].getParameterAnnotations()[1][0] instanceof WebParam); Modified: cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/JAXWSContainerTest.java URL: http://svn.apache.org/viewvc/cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/JAXWSContainerTest.java?rev=1227822&r1=1227821&r2=1227822&view=diff ============================================================================== --- cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/JAXWSContainerTest.java (original) +++ cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/JAXWSContainerTest.java Thu Jan 5 20:45:57 2012 @@ -159,7 +159,7 @@ public class JAXWSContainerTest extends assertEquals(0, output.list().length); // Now you can get the JavaModel from the context. - Map<QName, JavaModel> map = CastUtils.cast((Map)context.get(WSDLToJavaProcessor.MODEL_MAP)); + Map<QName, JavaModel> map = CastUtils.cast((Map<?, ?>)context.get(WSDLToJavaProcessor.MODEL_MAP)); JavaModel javaModel = map.get(new QName("http://cxf.apache.org/w2j/hello_world_soap_http";, "SOAPService")); assertNotNull(javaModel); Modified: cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/wsdl11/JAXWSDefinitionBuilderTest.java URL: http://svn.apache.org/viewvc/cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/wsdl11/JAXWSDefinitionBuilderTest.java?rev=1227822&r1=1227821&r2=1227822&view=diff ============================================================================== --- cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/wsdl11/JAXWSDefinitionBuilderTest.java (original) +++ cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/wsdl11/JAXWSDefinitionBuilderTest.java Thu Jan 5 20:45:57 2012 @@ -58,13 +58,13 @@ public class JAXWSDefinitionBuilderTest 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, "XMLService")); assertNotNull(service); - Map ports = service.getPorts(); + Map<?, ?> ports = service.getPorts(); assertNotNull(ports); assertEquals(1, ports.size()); Port port = service.getPort("XMLPort"); @@ -98,13 +98,13 @@ public class JAXWSDefinitionBuilderTest Definition def = builder.build(wsdlUrl); assertNotNull(def); - Map services = def.getServices(); + Map<?, ?> services = def.getServices(); assertNotNull(services); assertEquals(8, services.size()); Service service = (Service)services.get(new QName(qname, "HelloWorldQueueBinMsgService")); assertNotNull(service); - Map ports = service.getPorts(); + Map<?, ?> ports = service.getPorts(); assertNotNull(ports); assertEquals(1, ports.size()); Port port = service.getPort("HelloWorldQueueBinMsgPort");
