You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2012/01/06 16:28:42 UTC
svn commit: r1228230 - in /cxf/trunk/tools:
common/src/main/java/org/apache/cxf/tools/common/
common/src/main/java/org/apache/cxf/tools/common/model/
common/src/main/java/org/apache/cxf/tools/util/
corba/src/main/java/org/apache/cxf/tools/corba/common/...
Author: dkulp
Date: Fri Jan 6 15:28:41 2012
New Revision: 1228230
URL: http://svn.apache.org/viewvc?rev=1228230&view=rev
Log:
Warning fixes in tools that can be ported back
Modified:
cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/ExtensionInvocationHandler.java
cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/model/JAnnotationElement.java
cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/util/URLFactory.java
cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/common/SchemaFactory.java
cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/common/WSDLCorbaFactory.java
cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2ws/util/JavaFirstUtil.java
cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/FrontendFactory.java
cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/FaultBean.java
cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/JAXWSFrontEndProcessor.java
cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/ResponseWrapper.java
cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/Wrapper.java
cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/DateTypeCustomGeneratorTest.java
cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/FaultBeanGeneratorTest.java
cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/WrapperBeanGeneratorTest.java
cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/RequestWrapperTest.java
cxf/trunk/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/WADLToJava.java
cxf/trunk/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/WSDLToJava.java
cxf/trunk/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/core/PluginLoader.java
cxf/trunk/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java
cxf/trunk/tools/wsdlto/frontend/javascript/src/main/java/org/apache/cxf/tools/wsdlto/javascript/WSDLToJavaScript.java
cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/JAXWSBindingDeserializer.java
cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/JAXWSBindingSerializer.java
cxf/trunk/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/WSDLToSoapProcessor.java
cxf/trunk/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/WSDLToXMLProcessor.java
cxf/trunk/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/XSDToWSDLProcessor.java
Modified: cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/ExtensionInvocationHandler.java
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/ExtensionInvocationHandler.java?rev=1228230&r1=1228229&r2=1228230&view=diff
==============================================================================
--- cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/ExtensionInvocationHandler.java (original)
+++ cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/ExtensionInvocationHandler.java Fri Jan 6 15:28:41 2012
@@ -30,7 +30,7 @@ public class ExtensionInvocationHandler
}
public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
- Class[] clzs = null;
+ Class<?>[] clzs = null;
if (args != null) {
clzs = new Class[args.length];
for (int i = 0; i < args.length; i++) {
Modified: cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/model/JAnnotationElement.java
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/model/JAnnotationElement.java?rev=1228230&r1=1228229&r2=1228230&view=diff
==============================================================================
--- cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/model/JAnnotationElement.java (original)
+++ cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/model/JAnnotationElement.java Fri Jan 6 15:28:41 2012
@@ -74,7 +74,7 @@ public final class JAnnotationElement {
sb.append(" = ");
}
if (value instanceof List) {
- List list = (List) value;
+ List<?> list = (List<?>) value;
sb.append("{");
for (int i = 0; i < list.size(); i++) {
appendValue(sb, list.get(i));
@@ -107,7 +107,7 @@ public final class JAnnotationElement {
getStringValue(sb, obj);
}
} else if (obj instanceof Class) {
- Class clz = (Class) obj;
+ Class<?> clz = (Class<?>) obj;
if (containsSameClassName(clz) && !imports.contains(clz.getName())) {
sb.append(clz.getName());
} else {
@@ -149,7 +149,7 @@ public final class JAnnotationElement {
sb.append("\"");
}
- private boolean containsSameClassName(Class clz) {
+ private boolean containsSameClassName(Class<?> clz) {
return imports.contains(clz.getName());
}
Modified: cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/util/URLFactory.java
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/util/URLFactory.java?rev=1228230&r1=1228229&r2=1228230&view=diff
==============================================================================
--- cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/util/URLFactory.java (original)
+++ cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/util/URLFactory.java Fri Jan 6 15:28:41 2012
@@ -65,7 +65,7 @@ public final class URLFactory {
String packagePrefix = packagePrefixIter.nextToken().trim();
try {
String clsName = packagePrefix + "." + protocol + ".Handler";
- Class cls = null;
+ Class<?> cls = null;
try {
cls = Class.forName(clsName);
} catch (ClassNotFoundException e) {
Modified: cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/common/SchemaFactory.java
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/common/SchemaFactory.java?rev=1228230&r1=1228229&r2=1228230&view=diff
==============================================================================
--- cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/common/SchemaFactory.java (original)
+++ cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/common/SchemaFactory.java Fri Jan 6 15:28:41 2012
@@ -74,7 +74,7 @@ public abstract class SchemaFactory {
try {
// get the appropriate class for the loading.
ClassLoader loader = Thread.currentThread().getContextClassLoader();
- Class cl = loader.loadClass(factoryImplName);
+ Class<?> cl = loader.loadClass(factoryImplName);
return (SchemaFactory)cl.newInstance();
} catch (Exception e) {
Modified: cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/common/WSDLCorbaFactory.java
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/common/WSDLCorbaFactory.java?rev=1228230&r1=1228229&r2=1228230&view=diff
==============================================================================
--- cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/common/WSDLCorbaFactory.java (original)
+++ cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/common/WSDLCorbaFactory.java Fri Jan 6 15:28:41 2012
@@ -76,7 +76,7 @@ public abstract class WSDLCorbaFactory {
try {
// get the appropriate class for the loading.
ClassLoader loader = Thread.currentThread().getContextClassLoader();
- Class cl = loader.loadClass(factoryImplName);
+ Class<?> cl = loader.loadClass(factoryImplName);
return (WSDLCorbaFactory)cl.newInstance();
} catch (Exception e) {
Modified: cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2ws/util/JavaFirstUtil.java
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2ws/util/JavaFirstUtil.java?rev=1228230&r1=1228229&r2=1228230&view=diff
==============================================================================
--- cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2ws/util/JavaFirstUtil.java (original)
+++ cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2ws/util/JavaFirstUtil.java Fri Jan 6 15:28:41 2012
@@ -82,7 +82,7 @@ public final class JavaFirstUtil {
public static String getClassName(Type type) {
if (type instanceof Class) {
- Class clz = (Class)type;
+ Class<?> clz = (Class<?>)type;
if (clz.isArray()) {
return clz.getComponentType().getName() + "[]";
} else {
Modified: cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/FrontendFactory.java
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/FrontendFactory.java?rev=1228230&r1=1228229&r2=1228230&view=diff
==============================================================================
--- cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/FrontendFactory.java (original)
+++ cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/FrontendFactory.java Fri Jan 6 15:28:41 2012
@@ -19,6 +19,7 @@
package org.apache.cxf.tools.java2wsdl.processor;
+import java.lang.annotation.Annotation;
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
import java.util.ArrayList;
@@ -35,11 +36,12 @@ import org.apache.cxf.tools.util.Annotat
public final class FrontendFactory {
private static FrontendFactory instance;
- private Class serviceClass;
+ private Class<?> serviceClass;
private List<Method> wsMethods;
- private Class[] annotations = new Class[] {SOAPBinding.class,
- WebService.class,
- WebServiceProvider.class};
+ private Class<? extends Annotation>[] annotations
+ = new Class[] {SOAPBinding.class,
+ WebService.class,
+ WebServiceProvider.class};
public enum Style {
Jaxws,
@@ -56,13 +58,12 @@ public final class FrontendFactory {
return instance;
}
- @SuppressWarnings("unchecked")
private boolean isJaxws() {
if (serviceClass == null) {
return true;
}
- for (Class annotation : annotations) {
- if (serviceClass.getAnnotation(annotation) != null) {
+ for (Class<? extends Annotation> annotation : annotations) {
+ if (serviceClass.isAnnotationPresent(annotation)) {
return true;
}
}
@@ -117,7 +118,7 @@ public final class FrontendFactory {
return Style.Simple;
}
- public void setServiceClass(Class c) {
+ public void setServiceClass(Class<?> c) {
this.serviceClass = c;
if (c != null) {
this.wsMethods = getWSMethods();
Modified: cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/FaultBean.java
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/FaultBean.java?rev=1228230&r1=1228229&r2=1228230&view=diff
==============================================================================
--- cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/FaultBean.java (original)
+++ cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/FaultBean.java Fri Jan 6 15:28:41 2012
@@ -65,11 +65,11 @@ public final class FaultBean {
return fault.faultBean();
}
- private boolean isWebFaultAbsent(final Class exceptionClass) {
+ private boolean isWebFaultAbsent(final Class<?> exceptionClass) {
return StringUtils.isEmpty(getWebFaultBean(exceptionClass));
}
- public WrapperBeanClass transform(final Class exceptionClass, final String defaultPackage) {
+ public WrapperBeanClass transform(final Class<?> exceptionClass, final String defaultPackage) {
WrapperBeanClass jClass = new WrapperBeanClass();
if (isWebFaultAbsent(exceptionClass)) {
jClass.setName(exceptionClass.getSimpleName() + "Bean");
@@ -105,7 +105,7 @@ public final class FaultBean {
&& !Arrays.asList(EXCLUDED_GETTER).contains(method.getName());
}
- private void buildBeanFields(final Class exceptionClass, final JavaClass jClass) {
+ private void buildBeanFields(final Class<?> exceptionClass, final JavaClass jClass) {
Map<String, JavaField> fields = new TreeMap<String, JavaField>();
for (Method method : exceptionClass.getMethods()) {
Modified: cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/JAXWSFrontEndProcessor.java
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/JAXWSFrontEndProcessor.java?rev=1228230&r1=1228229&r2=1228230&view=diff
==============================================================================
--- cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/JAXWSFrontEndProcessor.java (original)
+++ cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/JAXWSFrontEndProcessor.java Fri Jan 6 15:28:41 2012
@@ -139,7 +139,7 @@ public class JAXWSFrontEndProcessor impl
public String getClassName(Type type) {
if (type instanceof Class) {
- Class clz = (Class)type;
+ Class<?> clz = (Class<?>)type;
if (clz.isArray()) {
return clz.getComponentType().getName() + "[]";
} else {
@@ -170,15 +170,15 @@ public class JAXWSFrontEndProcessor impl
}
- private boolean isImplRmiRemote(Class claz) {
+ private boolean isImplRmiRemote(Class<?> claz) {
for (Method method : claz.getMethods()) {
if (Modifier.isPublic(method.getModifiers()) && !Modifier.isStatic(method.getModifiers())
&& !method.getDeclaringClass().getName().equals("java.lang.Object")) {
- Class[] paraClasses = method.getParameterTypes();
- for (Class clz : paraClasses) {
+ Class<?>[] paraClasses = method.getParameterTypes();
+ for (Class<?> clz : paraClasses) {
getInfClass(clz);
}
- Class returnClass = method.getReturnType();
+ Class<?> returnClass = method.getReturnType();
getInfClass(returnClass);
}
}
@@ -189,8 +189,8 @@ public class JAXWSFrontEndProcessor impl
}
- private void getInfClass(Class claz) {
- for (Class inf : claz.getInterfaces()) {
+ private void getInfClass(Class<?> claz) {
+ for (Class<?> inf : claz.getInterfaces()) {
getInfClass(inf);
}
if (claz.getSuperclass() != null) {
Modified: cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/ResponseWrapper.java
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/ResponseWrapper.java?rev=1228230&r1=1228229&r2=1228230&view=diff
==============================================================================
--- cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/ResponseWrapper.java (original)
+++ cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/ResponseWrapper.java Fri Jan 6 15:28:41 2012
@@ -110,7 +110,7 @@ public final class ResponseWrapper exten
jf.setJaxbAnnotations(jaxbAnns.toArray(new Annotation[jaxbAnns.size()]));
if (t instanceof ParameterizedType) {
ParameterizedType pt = (ParameterizedType)t;
- Class c = (Class)pt.getRawType();
+ Class<?> c = (Class<?>)pt.getRawType();
if (Holder.class.isAssignableFrom(c)) {
Annotation[][] paramAnnotations = method.getParameterAnnotations();
WebParam wParam = getWebParamAnnotation(paramAnnotations[idx]);
Modified: cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/Wrapper.java
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/Wrapper.java?rev=1228230&r1=1228229&r2=1228230&view=diff
==============================================================================
--- cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/Wrapper.java (original)
+++ cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/Wrapper.java Fri Jan 6 15:28:41 2012
@@ -168,7 +168,7 @@ public class Wrapper {
return !isSamePackage;
}
- public Class getWrapperClass() {
+ public Class<?> getWrapperClass() {
try {
return AnnotationUtil.loadClass(getJavaClass().getFullClassName(),
getClass().getClassLoader());
@@ -201,7 +201,7 @@ public class Wrapper {
protected String getTypeString(Type t) {
String type = "Object";
if (t instanceof Class) {
- Class clz = (Class) t;
+ Class<?> clz = (Class<?>) t;
if (clz.isArray()) {
if (isBuiltInTypes(clz.getComponentType())) {
type = clz.getComponentType().getSimpleName() + "[]";
@@ -213,7 +213,7 @@ public class Wrapper {
}
} else if (t instanceof ParameterizedType) {
ParameterizedType pt = (ParameterizedType) t;
- Class c = (Class)pt.getRawType();
+ Class<?> c = (Class<?>)pt.getRawType();
if (Holder.class.isAssignableFrom(c)
&& pt.getActualTypeArguments().length == 1
&& pt.getActualTypeArguments()[0] instanceof Class) {
Modified: cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/DateTypeCustomGeneratorTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/DateTypeCustomGeneratorTest.java?rev=1228230&r1=1228229&r2=1228230&view=diff
==============================================================================
--- cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/DateTypeCustomGeneratorTest.java (original)
+++ cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/DateTypeCustomGeneratorTest.java Fri Jan 6 15:28:41 2012
@@ -55,7 +55,7 @@ public class DateTypeCustomGeneratorTest
assertTrue(gen.getJAXBCustFile(new File(".")).toString().endsWith("demo.xjb"));
}
- private ServiceInfo getServiceInfo(Class clz) {
+ private ServiceInfo getServiceInfo(Class<?> clz) {
env.put(ToolConstants.CFG_CLASSNAME, clz.getName());
return processor.getServiceBuilder().createService();
}
Modified: cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/FaultBeanGeneratorTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/FaultBeanGeneratorTest.java?rev=1228230&r1=1228229&r2=1228230&view=diff
==============================================================================
--- cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/FaultBeanGeneratorTest.java (original)
+++ cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/FaultBeanGeneratorTest.java Fri Jan 6 15:28:41 2012
@@ -94,9 +94,9 @@ public class FaultBeanGeneratorTest exte
@Test
public void testGetExceptionClasses() throws Exception {
- Class seiClass = Class.forName("org.apache.hello_world.Greeter");
+ Class<?> seiClass = Class.forName("org.apache.hello_world.Greeter");
FaultBeanGenerator generator = new FaultBeanGenerator();
- Set<Class> classes = new HashSet<Class>();
+ Set<Class<?>> classes = new HashSet<Class<?>>();
for (Method method : seiClass.getMethods()) {
classes.addAll(generator.getExceptionClasses(method));
}
Modified: cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/WrapperBeanGeneratorTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/WrapperBeanGeneratorTest.java?rev=1228230&r1=1228229&r2=1228230&view=diff
==============================================================================
--- cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/WrapperBeanGeneratorTest.java (original)
+++ cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/WrapperBeanGeneratorTest.java Fri Jan 6 15:28:41 2012
@@ -131,7 +131,7 @@ public class WrapperBeanGeneratorTest ex
generator.setServiceModel(getServiceInfo());
generator.generate(output);
- Class clz = classLoader.loadClass("org.apache.cxf.SayHi");
+ Class<?> clz = classLoader.loadClass("org.apache.cxf.SayHi");
assertNotNull(clz);
Field field = clz.getDeclaredField("arg0");
assertNotNull(field.getAnnotation(XmlList.class));
Modified: cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/RequestWrapperTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/RequestWrapperTest.java?rev=1228230&r1=1228229&r2=1228230&view=diff
==============================================================================
--- cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/RequestWrapperTest.java (original)
+++ cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/RequestWrapperTest.java Fri Jan 6 15:28:41 2012
@@ -37,7 +37,7 @@ import org.junit.Test;
public class RequestWrapperTest extends Assert {
JaxwsServiceBuilder builder = new JaxwsServiceBuilder();
- private OperationInfo getOperation(Class clz, String opName) {
+ private OperationInfo getOperation(Class<?> clz, String opName) {
builder.setServiceClass(clz);
ServiceInfo serviceInfo = builder.createService();
@@ -53,7 +53,7 @@ public class RequestWrapperTest extends
@Test
public void testBuildRequestFields() {
// Test String[]
- Class testingClass = GreeterArray.class;
+ Class<?> testingClass = GreeterArray.class;
OperationInfo opInfo = getOperation(testingClass, "sayStringArray");
assertNotNull(opInfo);
@@ -100,7 +100,7 @@ public class RequestWrapperTest extends
@Test
public void testNoAnnotationNoClass() throws Exception {
String pkgName = "org.apache.cxf.tools.fortest.classnoanno.docwrapped";
- Class testingClass = Class.forName(pkgName + ".Stock");
+ Class<?> testingClass = Class.forName(pkgName + ".Stock");
OperationInfo opInfo = getOperation(testingClass, "getPrice");
Wrapper wrapper = new RequestWrapper();
@@ -136,7 +136,7 @@ public class RequestWrapperTest extends
@Test
public void testWithAnnotationNoClass() throws Exception {
String pkgName = "org.apache.cxf.tools.fortest.withannotation.doc";
- Class testingClass = Class.forName(pkgName + ".Stock");
+ Class<?> testingClass = Class.forName(pkgName + ".Stock");
OperationInfo opInfo = getOperation(testingClass, "getPrice");
Wrapper wrapper = new RequestWrapper();
@@ -152,7 +152,7 @@ public class RequestWrapperTest extends
@Test
public void testWithAnnotationWithClass() throws Exception {
String pkgName = "org.apache.cxf.tools.fortest.withannotation.doc";
- Class testingClass = Class.forName(pkgName + ".Greeter");
+ Class<?> testingClass = Class.forName(pkgName + ".Greeter");
OperationInfo opInfo = getOperation(testingClass, "sayHi");
Modified: cxf/trunk/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/WADLToJava.java
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/WADLToJava.java?rev=1228230&r1=1228229&r2=1228230&view=diff
==============================================================================
--- cxf/trunk/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/WADLToJava.java (original)
+++ cxf/trunk/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/WADLToJava.java Fri Jan 6 15:28:41 2012
@@ -123,7 +123,7 @@ public class WADLToJava {
}
}
- private static InputStream getResourceAsStream(Class clz, String file) {
+ private static InputStream getResourceAsStream(Class<?> clz, String file) {
return clz.getResourceAsStream(file);
}
}
Modified: cxf/trunk/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/WSDLToJava.java
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/WSDLToJava.java?rev=1228230&r1=1228229&r2=1228230&view=diff
==============================================================================
--- cxf/trunk/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/WSDLToJava.java (original)
+++ cxf/trunk/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/WSDLToJava.java Fri Jan 6 15:28:41 2012
@@ -208,7 +208,7 @@ public class WSDLToJava {
}
}
- private static InputStream getResourceAsStream(Class clz, String file) {
+ private static InputStream getResourceAsStream(Class<?> clz, String file) {
return clz.getResourceAsStream(file);
}
}
Modified: cxf/trunk/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/core/PluginLoader.java
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/core/PluginLoader.java?rev=1228230&r1=1228229&r2=1228230&view=diff
==============================================================================
--- cxf/trunk/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/core/PluginLoader.java (original)
+++ cxf/trunk/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/core/PluginLoader.java Fri Jan 6 15:28:41 2012
@@ -261,7 +261,7 @@ public final class PluginLoader {
try {
for (Generator generator : frontend.getGenerators().getGenerator()) {
fullClzName = getGeneratorClass(frontend, generator);
- Class clz = ClassLoaderUtils.loadClass(fullClzName, this.getClass());
+ Class<?> clz = ClassLoaderUtils.loadClass(fullClzName, this.getClass());
generators.add((FrontEndGenerator)clz.newInstance());
}
} catch (Exception e) {
@@ -276,7 +276,7 @@ public final class PluginLoader {
private FrontEndProfile loadFrontEndProfile(String fullClzName) {
FrontEndProfile profile = null;
try {
- Class clz = ClassLoaderUtils.loadClass(fullClzName, this.getClass());
+ Class<?> clz = ClassLoaderUtils.loadClass(fullClzName, this.getClass());
profile = (FrontEndProfile)clz.newInstance();
} catch (Exception e) {
Message msg = new Message("FRONTEND_PROFILE_LOAD_FAIL", LOG, fullClzName);
Modified: cxf/trunk/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java?rev=1228230&r1=1228229&r2=1228230&view=diff
==============================================================================
--- cxf/trunk/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java (original)
+++ cxf/trunk/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java Fri Jan 6 15:28:41 2012
@@ -999,7 +999,7 @@ public class JAXBDataBinding implements
try {
Field f = tp2.getClass().getDeclaredField("_class");
f.setAccessible(true);
- Class<?> cls = (Class)f.get(tp2);
+ Class<?> cls = (Class<?>)f.get(tp2);
if (List.class.isAssignableFrom(cls)) {
found = true;
@@ -1009,7 +1009,7 @@ public class JAXBDataBinding implements
f = tp.getClass().getDeclaredField("args");
f.setAccessible(true);
- List<JClass> lcl = CastUtils.cast((List)f.get(tp));
+ List<JClass> lcl = CastUtils.cast((List<?>)f.get(tp));
JClass cl = lcl.get(0);
int cnt = defaultValues.getListLength(path + "/" + varName);
Modified: cxf/trunk/tools/wsdlto/frontend/javascript/src/main/java/org/apache/cxf/tools/wsdlto/javascript/WSDLToJavaScript.java
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/wsdlto/frontend/javascript/src/main/java/org/apache/cxf/tools/wsdlto/javascript/WSDLToJavaScript.java?rev=1228230&r1=1228229&r2=1228230&view=diff
==============================================================================
--- cxf/trunk/tools/wsdlto/frontend/javascript/src/main/java/org/apache/cxf/tools/wsdlto/javascript/WSDLToJavaScript.java (original)
+++ cxf/trunk/tools/wsdlto/frontend/javascript/src/main/java/org/apache/cxf/tools/wsdlto/javascript/WSDLToJavaScript.java Fri Jan 6 15:28:41 2012
@@ -121,7 +121,7 @@ public class WSDLToJavaScript {
}
}
- private static InputStream getResourceAsStream(Class clz, String file) {
+ private static InputStream getResourceAsStream(Class<?> clz, String file) {
return clz.getResourceAsStream(file);
}
}
Modified: cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/JAXWSBindingDeserializer.java
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/JAXWSBindingDeserializer.java?rev=1228230&r1=1228229&r2=1228230&view=diff
==============================================================================
--- cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/JAXWSBindingDeserializer.java (original)
+++ cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/JAXWSBindingDeserializer.java Fri Jan 6 15:28:41 2012
@@ -37,7 +37,7 @@ public class JAXWSBindingDeserializer im
}
- public ExtensibilityElement unmarshall(Class parentType,
+ public ExtensibilityElement unmarshall(@SuppressWarnings("rawtypes") Class parentType,
QName elementType,
Element el,
Definition def,
Modified: cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/JAXWSBindingSerializer.java
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/JAXWSBindingSerializer.java?rev=1228230&r1=1228229&r2=1228230&view=diff
==============================================================================
--- cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/JAXWSBindingSerializer.java (original)
+++ cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/JAXWSBindingSerializer.java Fri Jan 6 15:28:41 2012
@@ -31,7 +31,7 @@ import javax.xml.namespace.QName;
public class JAXWSBindingSerializer implements ExtensionSerializer, Serializable {
public static final long serialVersionUID = 1;
- public void marshall(Class parentType,
+ public void marshall(@SuppressWarnings("rawtypes") Class parentType,
QName elementType,
ExtensibilityElement extension,
PrintWriter pw,
Modified: cxf/trunk/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/WSDLToSoapProcessor.java
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/WSDLToSoapProcessor.java?rev=1228230&r1=1228229&r2=1228230&view=diff
==============================================================================
--- cxf/trunk/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/WSDLToSoapProcessor.java (original)
+++ cxf/trunk/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/WSDLToSoapProcessor.java Fri Jan 6 15:28:41 2012
@@ -272,7 +272,7 @@ public class WSDLToSoapProcessor extends
return bo;
}
- private SoapBody getSoapBody(Class parent) throws ToolException {
+ private SoapBody getSoapBody(Class<?> parent) throws ToolException {
if (extReg == null) {
extReg = wsdlFactory.newPopulatedExtensionRegistry();
}
Modified: cxf/trunk/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/WSDLToXMLProcessor.java
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/WSDLToXMLProcessor.java?rev=1228230&r1=1228229&r2=1228230&view=diff
==============================================================================
--- cxf/trunk/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/WSDLToXMLProcessor.java (original)
+++ cxf/trunk/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/WSDLToXMLProcessor.java Fri Jan 6 15:28:41 2012
@@ -225,7 +225,7 @@ public class WSDLToXMLProcessor extends
// TODO
}
- private ExtensibilityElement getXMLBody(Class clz, String operationName) throws ToolException {
+ private ExtensibilityElement getXMLBody(Class<?> clz, String operationName) throws ToolException {
if (extReg == null) {
extReg = wsdlFactory.newPopulatedExtensionRegistry();
}
Modified: cxf/trunk/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/XSDToWSDLProcessor.java
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/XSDToWSDLProcessor.java?rev=1228230&r1=1228229&r2=1228230&view=diff
==============================================================================
--- cxf/trunk/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/XSDToWSDLProcessor.java (original)
+++ cxf/trunk/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/XSDToWSDLProcessor.java Fri Jan 6 15:28:41 2012
@@ -162,7 +162,7 @@ public class XSDToWSDLProcessor implemen
}
}
- private void registerJAXWSBinding(Class clz) {
+ private void registerJAXWSBinding(Class<?> clz) {
registry.registerSerializer(clz, ToolConstants.JAXWS_BINDINGS, new JAXWSBindingSerializer());
registry.registerDeserializer(clz, ToolConstants.JAXWS_BINDINGS, new JAXWSBindingDeserializer());