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/05 21:46:03 UTC
svn commit: r1227822 [2/4] - in /cxf/trunk:
api/src/main/java/org/apache/cxf/databinding/
api/src/main/java/org/apache/cxf/phase/
api/src/main/java/org/apache/cxf/service/
api/src/main/java/org/apache/cxf/ws/addressing/
common/common/src/main/java/org/...
Modified: cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/cxf/handlers/InvocationHandlerFactory.java
URL: http://svn.apache.org/viewvc/cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/cxf/handlers/InvocationHandlerFactory.java?rev=1227822&r1=1227821&r2=1227822&view=diff
==============================================================================
--- cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/cxf/handlers/InvocationHandlerFactory.java (original)
+++ cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/cxf/handlers/InvocationHandlerFactory.java Thu Jan 5 20:45:57 2012
@@ -82,7 +82,7 @@ public class InvocationHandlerFactory {
for (int i = 0; i < handlerChainTypes.length; i++) {
CXFInvocationHandler newHandler;
try {
- Constructor newHandlerConstructor = handlerChainTypes[i]
+ Constructor<?> newHandlerConstructor = handlerChainTypes[i]
.getDeclaredConstructor(new Class[] {CXFInvocationHandlerData.class});
newHandler = (CXFInvocationHandler)newHandlerConstructor.newInstance(new Object[] {data});
} catch (Exception ex) {
@@ -115,7 +115,7 @@ public class InvocationHandlerFactory {
loadProperties(handlersMap, url);
}
- Class[] handlers = new Class[handlersMap.size()];
+ Class<?>[] handlers = new Class[handlersMap.size()];
String[] handlerClasses = new String[handlersMap.size()];
handlersMap.values().toArray(handlerClasses);
for (int i = 0; i < handlerClasses.length; i++) {
Modified: cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/jarloader/JarLoader.java
URL: http://svn.apache.org/viewvc/cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/jarloader/JarLoader.java?rev=1227822&r1=1227821&r2=1227822&view=diff
==============================================================================
--- cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/jarloader/JarLoader.java (original)
+++ cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/jarloader/JarLoader.java Thu Jan 5 20:45:57 2012
@@ -54,12 +54,13 @@ public final class JarLoader {
return getBytesFromInputStream(is, -1);
}
- public static synchronized Map getJarContents(String path) throws MalformedURLException, IOException {
+ public static synchronized Map<?, ?> getJarContents(String path)
+ throws MalformedURLException, IOException {
if (!archives.containsKey(path)) {
loadArchive(path);
}
- return (Map)archives.get(path);
+ return (Map<?, ?>)archives.get(path);
}
private static void loadArchive(String path) throws MalformedURLException, IOException {
@@ -76,9 +77,9 @@ public final class JarLoader {
// no longer needed, replace the entry with the exploded Map
//
Map<String, Object> parentMap =
- CastUtils.cast((Map)archives.get(buildPartialName(nameComponents, i)));
- Map archiveMap =
- (Map)archives.get(buildPartialName(nameComponents, i + 1));
+ CastUtils.cast((Map<?, ?>)archives.get(buildPartialName(nameComponents, i)));
+ Map<?, ?> archiveMap =
+ (Map<?, ?>)archives.get(buildPartialName(nameComponents, i + 1));
parentMap.put(nameComponents.get(i), archiveMap);
}
@@ -135,7 +136,8 @@ public final class JarLoader {
if (nameComponents.size() == 1) {
map = readZipStream((new URL(getRootArchiveName(name))).openStream());
} else {
- Map parentMap = (Map)archives.get(buildPartialName(nameComponents, nameComponents.size() - 1));
+ Map<?, ?> parentMap
+ = (Map<?, ?>)archives.get(buildPartialName(nameComponents, nameComponents.size() - 1));
byte bytes[] = (byte[])(parentMap.get(nameComponents.get(nameComponents.size() - 1)));
if (null == bytes) {
Modified: cxf/trunk/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/WsdlUtilities.java
URL: http://svn.apache.org/viewvc/cxf/trunk/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/WsdlUtilities.java?rev=1227822&r1=1227821&r2=1227822&view=diff
==============================================================================
--- cxf/trunk/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/WsdlUtilities.java (original)
+++ cxf/trunk/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/WsdlUtilities.java Thu Jan 5 20:45:57 2012
@@ -81,7 +81,7 @@ public final class WsdlUtilities {
String ex = joinWithComma(exList.toArray(new String[exList.size()]));
try {
- List newfiles = org.codehaus.plexus.util.FileUtils.getFiles(dir, inc, ex);
+ List<?> newfiles = org.codehaus.plexus.util.FileUtils.getFiles(dir, inc, ex);
return CastUtils.cast(newfiles);
} catch (IOException exc) {
throw new MojoExecutionException(exc.getMessage(), exc);
Modified: cxf/trunk/maven-plugins/corba/src/main/java/org/apache/cxf/maven_plugin/corba/maven/plugins/WSDLToIDLPlugin.java
URL: http://svn.apache.org/viewvc/cxf/trunk/maven-plugins/corba/src/main/java/org/apache/cxf/maven_plugin/corba/maven/plugins/WSDLToIDLPlugin.java?rev=1227822&r1=1227821&r2=1227822&view=diff
==============================================================================
--- cxf/trunk/maven-plugins/corba/src/main/java/org/apache/cxf/maven_plugin/corba/maven/plugins/WSDLToIDLPlugin.java (original)
+++ cxf/trunk/maven-plugins/corba/src/main/java/org/apache/cxf/maven_plugin/corba/maven/plugins/WSDLToIDLPlugin.java Thu Jan 5 20:45:57 2012
@@ -91,7 +91,7 @@ public class WSDLToIDLPlugin extends Abs
buf.append(File.pathSeparatorChar);
- List artifacts = useCompileClasspath ? project.getCompileArtifacts() : project.getTestArtifacts();
+ List<?> artifacts = useCompileClasspath ? project.getCompileArtifacts() : project.getTestArtifacts();
for (Artifact a : CastUtils.cast(artifacts, Artifact.class)) {
try {
if (a.getFile() != null
Modified: cxf/trunk/maven-plugins/java2ws-plugin/src/main/java/org/apache/cxf/maven_plugin/ClassLoaderSwitcher.java
URL: http://svn.apache.org/viewvc/cxf/trunk/maven-plugins/java2ws-plugin/src/main/java/org/apache/cxf/maven_plugin/ClassLoaderSwitcher.java?rev=1227822&r1=1227821&r2=1227822&view=diff
==============================================================================
--- cxf/trunk/maven-plugins/java2ws-plugin/src/main/java/org/apache/cxf/maven_plugin/ClassLoaderSwitcher.java (original)
+++ cxf/trunk/maven-plugins/java2ws-plugin/src/main/java/org/apache/cxf/maven_plugin/ClassLoaderSwitcher.java Thu Jan 5 20:45:57 2012
@@ -58,7 +58,7 @@ public class ClassLoaderSwitcher {
public String switchClassLoader(MavenProject project,
boolean useCompileClasspath,
String classpath,
- List classpathElements) {
+ List<?> classpathElements) {
List<URL> urlList = new ArrayList<URL>();
StringBuilder buf = new StringBuilder();
Modified: cxf/trunk/maven-plugins/java2ws-plugin/src/main/java/org/apache/cxf/maven_plugin/Java2WSMojo.java
URL: http://svn.apache.org/viewvc/cxf/trunk/maven-plugins/java2ws-plugin/src/main/java/org/apache/cxf/maven_plugin/Java2WSMojo.java?rev=1227822&r1=1227821&r2=1227822&view=diff
==============================================================================
--- cxf/trunk/maven-plugins/java2ws-plugin/src/main/java/org/apache/cxf/maven_plugin/Java2WSMojo.java (original)
+++ cxf/trunk/maven-plugins/java2ws-plugin/src/main/java/org/apache/cxf/maven_plugin/Java2WSMojo.java Thu Jan 5 20:45:57 2012
@@ -92,7 +92,7 @@ public class Java2WSMojo extends Abstrac
* @parameter expression="${project.compileClasspathElements}"
* @required
*/
- private List classpathElements;
+ private List<?> classpathElements;
/**
* @parameter expression="${project}"
Modified: cxf/trunk/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/wadlto/AbstractCodeGeneratorMojo.java
URL: http://svn.apache.org/viewvc/cxf/trunk/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/wadlto/AbstractCodeGeneratorMojo.java?rev=1227822&r1=1227821&r2=1227822&view=diff
==============================================================================
--- cxf/trunk/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/wadlto/AbstractCodeGeneratorMojo.java (original)
+++ cxf/trunk/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/wadlto/AbstractCodeGeneratorMojo.java Thu Jan 5 20:45:57 2012
@@ -181,7 +181,7 @@ public abstract class AbstractCodeGenera
* @readonly
* @required
*/
- private List repositories;
+ private List<?> repositories;
/**
* Artifact repository factory component.
@@ -242,7 +242,7 @@ public abstract class AbstractCodeGenera
*/
@SuppressWarnings("unchecked")
- private Artifact resolveRemoteWsdlArtifact(List remoteRepos, Artifact artifact)
+ private Artifact resolveRemoteWsdlArtifact(List<?> remoteRepos, Artifact artifact)
throws MojoExecutionException {
/**
@@ -278,7 +278,7 @@ public abstract class AbstractCodeGenera
}
protected void downloadRemoteDocs(List<WadlOption> effectiveOptions) throws MojoExecutionException {
- List remoteRepos;
+ List<?> remoteRepos;
try {
remoteRepos = ProjectUtils.buildArtifactRepositories(repositories, artifactRepositoryFactory,
mavenSession.getContainer());
@@ -480,7 +480,7 @@ public abstract class AbstractCodeGenera
return javaExe;
}
- private void runForked(Set<URI> classPath, Class cls, String[] args) throws MojoExecutionException {
+ private void runForked(Set<URI> classPath, Class<?> cls, String[] args) throws MojoExecutionException {
getLog().info("Running wsdl2java in fork mode...");
Commandline cmd = new Commandline();
Modified: cxf/trunk/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/wadlto/OptionLoader.java
URL: http://svn.apache.org/viewvc/cxf/trunk/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/wadlto/OptionLoader.java?rev=1227822&r1=1227821&r2=1227822&view=diff
==============================================================================
--- cxf/trunk/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/wadlto/OptionLoader.java (original)
+++ cxf/trunk/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/wadlto/OptionLoader.java Thu Jan 5 20:45:57 2012
@@ -138,7 +138,7 @@ public final class OptionLoader {
String ex = joinWithComma(exList.toArray(new String[exList.size()]));
try {
- List newfiles = org.codehaus.plexus.util.FileUtils.getFiles(dir, inc, ex);
+ List<?> newfiles = org.codehaus.plexus.util.FileUtils.getFiles(dir, inc, ex);
return CastUtils.cast(newfiles);
} catch (IOException exc) {
throw new MojoExecutionException(exc.getMessage(), exc);
Modified: cxf/trunk/maven-plugins/wsdl-validator-plugin/src/main/java/org/apache/cxf/maven_plugin/WSDLValidatorMojo.java
URL: http://svn.apache.org/viewvc/cxf/trunk/maven-plugins/wsdl-validator-plugin/src/main/java/org/apache/cxf/maven_plugin/WSDLValidatorMojo.java?rev=1227822&r1=1227821&r2=1227822&view=diff
==============================================================================
--- cxf/trunk/maven-plugins/wsdl-validator-plugin/src/main/java/org/apache/cxf/maven_plugin/WSDLValidatorMojo.java (original)
+++ cxf/trunk/maven-plugins/wsdl-validator-plugin/src/main/java/org/apache/cxf/maven_plugin/WSDLValidatorMojo.java Thu Jan 5 20:45:57 2012
@@ -109,7 +109,7 @@ public class WSDLValidatorMojo extends A
String ex = getIncludeExcludeString(exList.toArray(new String[exList.size()]));
try {
- List newfiles = org.codehaus.plexus.util.FileUtils.getFiles(dir, inc, ex);
+ List<?> newfiles = org.codehaus.plexus.util.FileUtils.getFiles(dir, inc, ex);
return CastUtils.cast(newfiles);
} catch (IOException exc) {
throw new MojoExecutionException(exc.getMessage(), exc);
Modified: cxf/trunk/rt/bindings/coloc/src/main/java/org/apache/cxf/binding/coloc/blueprint/ColocBPNamespaceHandler.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/coloc/src/main/java/org/apache/cxf/binding/coloc/blueprint/ColocBPNamespaceHandler.java?rev=1227822&r1=1227821&r2=1227822&view=diff
==============================================================================
--- cxf/trunk/rt/bindings/coloc/src/main/java/org/apache/cxf/binding/coloc/blueprint/ColocBPNamespaceHandler.java (original)
+++ cxf/trunk/rt/bindings/coloc/src/main/java/org/apache/cxf/binding/coloc/blueprint/ColocBPNamespaceHandler.java Thu Jan 5 20:45:57 2012
@@ -36,6 +36,7 @@ public class ColocBPNamespaceHandler imp
return getClass().getClassLoader().getResource("/schemas/coloc-feature.xsd");
}
+ @SuppressWarnings("rawtypes")
public Set<Class> getManagedClasses() {
return null;
}
Modified: cxf/trunk/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/runtime/CorbaObjectReader.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/runtime/CorbaObjectReader.java?rev=1227822&r1=1227821&r2=1227822&view=diff
==============================================================================
--- cxf/trunk/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/runtime/CorbaObjectReader.java (original)
+++ cxf/trunk/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/runtime/CorbaObjectReader.java Thu Jan 5 20:45:57 2012
@@ -563,7 +563,7 @@ public class CorbaObjectReader {
}
private CorbaObjectHandler initializeCorbaObjectHandler(CorbaObjectHandler template) {
- Constructor templateConstructor = template.getClass().getDeclaredConstructors()[0];
+ Constructor<?> templateConstructor = template.getClass().getDeclaredConstructors()[0];
Object[] params = new Object[4];
// Check to see if the template type is a recursive type. If so, it means that it is part
Modified: cxf/trunk/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/utils/CorbaAnyHelper.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/utils/CorbaAnyHelper.java?rev=1227822&r1=1227821&r2=1227822&view=diff
==============================================================================
--- cxf/trunk/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/utils/CorbaAnyHelper.java (original)
+++ cxf/trunk/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/utils/CorbaAnyHelper.java Thu Jan 5 20:45:57 2012
@@ -46,7 +46,7 @@ public final class CorbaAnyHelper {
private static final Map<QName, QName> SCHEMA_TO_IDL_TYPES = new HashMap<QName, QName>();
private static final Map<QName, QName> IDL_TO_SCHEMA_TYPES = new HashMap<QName, QName>();
- private static Constructor fixedAnyConstructor;
+ private static Constructor<?> fixedAnyConstructor;
private CorbaAnyHelper() {
//utility class
Modified: cxf/trunk/rt/bindings/http/src/main/java/org/apache/cxf/binding/http/HttpBindingFactory.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/http/src/main/java/org/apache/cxf/binding/http/HttpBindingFactory.java?rev=1227822&r1=1227821&r2=1227822&view=diff
==============================================================================
--- cxf/trunk/rt/bindings/http/src/main/java/org/apache/cxf/binding/http/HttpBindingFactory.java (original)
+++ cxf/trunk/rt/bindings/http/src/main/java/org/apache/cxf/binding/http/HttpBindingFactory.java Thu Jan 5 20:45:57 2012
@@ -110,7 +110,7 @@ public class HttpBindingFactory extends
Method m = md.getMethod(bop);
try {
- Class<?> c = (Class) service.get(ReflectionServiceFactoryBean.ENDPOINT_CLASS);
+ Class<?> c = (Class<?>) service.get(ReflectionServiceFactoryBean.ENDPOINT_CLASS);
if (c != null) {
m = c.getMethod(m.getName(), m.getParameterTypes());
}
Modified: cxf/trunk/rt/bindings/http/src/main/java/org/apache/cxf/binding/http/URIMapper.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/http/src/main/java/org/apache/cxf/binding/http/URIMapper.java?rev=1227822&r1=1227821&r2=1227822&view=diff
==============================================================================
--- cxf/trunk/rt/bindings/http/src/main/java/org/apache/cxf/binding/http/URIMapper.java (original)
+++ cxf/trunk/rt/bindings/http/src/main/java/org/apache/cxf/binding/http/URIMapper.java Thu Jan 5 20:45:57 2012
@@ -126,7 +126,7 @@ public class URIMapper {
}
}
- public List getParameters(MessageInfo msgInfo, String path) {
+ public List<Object> getParameters(MessageInfo msgInfo, String path) {
String resource = locations.get(msgInfo.getOperation());
Map<String, String> paramMap = ResourceUtil.getURIParameters(path, resource);
Modified: cxf/trunk/rt/bindings/http/src/main/java/org/apache/cxf/binding/http/interceptor/ContentTypeOutInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/http/src/main/java/org/apache/cxf/binding/http/interceptor/ContentTypeOutInterceptor.java?rev=1227822&r1=1227821&r2=1227822&view=diff
==============================================================================
--- cxf/trunk/rt/bindings/http/src/main/java/org/apache/cxf/binding/http/interceptor/ContentTypeOutInterceptor.java (original)
+++ cxf/trunk/rt/bindings/http/src/main/java/org/apache/cxf/binding/http/interceptor/ContentTypeOutInterceptor.java Thu Jan 5 20:45:57 2012
@@ -40,7 +40,7 @@ public class ContentTypeOutInterceptor e
}
public void handleMessage(Message message) throws Fault {
- Map<String, List<String>> headers = CastUtils.cast((Map)message.get(Message.PROTOCOL_HEADERS));
+ Map<String, List<String>> headers = CastUtils.cast((Map<?, ?>)message.get(Message.PROTOCOL_HEADERS));
if (headers == null) {
headers = new TreeMap<String, List<String>>(String.CASE_INSENSITIVE_ORDER);
message.put(Message.PROTOCOL_HEADERS, headers);
Modified: cxf/trunk/rt/bindings/object/src/main/java/org/apache/cxf/binding/object/blueprint/ObjectBindingBPHandler.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/object/src/main/java/org/apache/cxf/binding/object/blueprint/ObjectBindingBPHandler.java?rev=1227822&r1=1227821&r2=1227822&view=diff
==============================================================================
--- cxf/trunk/rt/bindings/object/src/main/java/org/apache/cxf/binding/object/blueprint/ObjectBindingBPHandler.java (original)
+++ cxf/trunk/rt/bindings/object/src/main/java/org/apache/cxf/binding/object/blueprint/ObjectBindingBPHandler.java Thu Jan 5 20:45:57 2012
@@ -36,6 +36,7 @@ public class ObjectBindingBPHandler impl
return getClass().getClassLoader().getResource("/schemas/bindings/blueprint/object.xsd");
}
+ @SuppressWarnings("rawtypes")
public Set<Class> getManagedClasses() {
return null;
}
Modified: cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingFactory.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingFactory.java?rev=1227822&r1=1227821&r2=1227822&view=diff
==============================================================================
--- cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingFactory.java (original)
+++ cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingFactory.java Thu Jan 5 20:45:57 2012
@@ -708,7 +708,7 @@ public class SoapBindingFactory extends
SoapBodyInfo bodyInfo = new SoapBodyInfo();
SoapBody soapBody = SOAPBindingUtil.getSoapBody(bmsg.getExtensors(ExtensibilityElement.class));
- List parts = null;
+ List<?> parts = null;
if (soapBody == null) {
MIMEMultipartRelated mmr = bmsg.getExtensor(MIMEMultipartRelated.class);
if (mmr != null) {
@@ -724,7 +724,7 @@ public class SoapBindingFactory extends
List<MessagePartInfo> attParts = null;
if (parts != null) {
List<MessagePartInfo> bodyParts = new ArrayList<MessagePartInfo>();
- for (Iterator itr = parts.iterator(); itr.hasNext();) {
+ for (Iterator<?> itr = parts.iterator(); itr.hasNext();) {
Object part = itr.next();
if (part instanceof MIMEPart) {
MIMEPart mpart = (MIMEPart) part;
Modified: cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapTransportFactory.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapTransportFactory.java?rev=1227822&r1=1227821&r2=1227822&view=diff
==============================================================================
--- cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapTransportFactory.java (original)
+++ cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapTransportFactory.java Thu Jan 5 20:45:57 2012
@@ -180,7 +180,7 @@ public class SoapTransportFactory extend
EndpointInfo info = new SoapEndpointInfo(serviceInfo, transportURI);
if (ees != null) {
- for (Iterator itr = ees.iterator(); itr.hasNext();) {
+ for (Iterator<?> itr = ees.iterator(); itr.hasNext();) {
Object extensor = itr.next();
if (SOAPBindingUtil.isSOAPAddress(extensor)) {
Modified: cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/blueprint/SoapBindingBPHandler.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/blueprint/SoapBindingBPHandler.java?rev=1227822&r1=1227821&r2=1227822&view=diff
==============================================================================
--- cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/blueprint/SoapBindingBPHandler.java (original)
+++ cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/blueprint/SoapBindingBPHandler.java Thu Jan 5 20:45:57 2012
@@ -35,6 +35,7 @@ public class SoapBindingBPHandler implem
return getClass().getClassLoader().getResource("/schemas/configuration/blueprint/soap.xsd");
}
+ @SuppressWarnings("rawtypes")
public Set<Class> getManagedClasses() {
return null;
}
Modified: cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/MustUnderstandInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/MustUnderstandInterceptor.java?rev=1227822&r1=1227821&r2=1227822&view=diff
==============================================================================
--- cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/MustUnderstandInterceptor.java (original)
+++ cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/MustUnderstandInterceptor.java Thu Jan 5 20:45:57 2012
@@ -160,7 +160,8 @@ public class MustUnderstandInterceptor e
if (paramHeaders != null) {
mustUnderstandQNames.addAll(paramHeaders);
}
- for (Interceptor interceptorInstance : soapMessage.getInterceptorChain()) {
+ for (Interceptor<? extends org.apache.cxf.message.Message> interceptorInstance
+ : soapMessage.getInterceptorChain()) {
if (interceptorInstance instanceof SoapInterceptor) {
SoapInterceptor si = (SoapInterceptor) interceptorInstance;
Set<URI> roles = si.getRoles();
Modified: cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapActionInInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapActionInInterceptor.java?rev=1227822&r1=1227821&r2=1227822&view=diff
==============================================================================
--- cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapActionInInterceptor.java (original)
+++ cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapActionInInterceptor.java Thu Jan 5 20:45:57 2012
@@ -53,7 +53,7 @@ public class SoapActionInInterceptor ext
SoapMessage message = (SoapMessage)m;
if (message.getVersion() instanceof Soap11) {
Map<String, List<String>> headers
- = CastUtils.cast((Map)message.get(Message.PROTOCOL_HEADERS));
+ = CastUtils.cast((Map<?, ?>)message.get(Message.PROTOCOL_HEADERS));
if (headers != null) {
List<String> sa = headers.get(SoapBindingConstants.SOAP_ACTION);
if (sa != null && sa.size() > 0) {
Modified: cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapPreProtocolOutInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapPreProtocolOutInterceptor.java?rev=1227822&r1=1227821&r2=1227822&view=diff
==============================================================================
--- cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapPreProtocolOutInterceptor.java (original)
+++ cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapPreProtocolOutInterceptor.java Thu Jan 5 20:45:57 2012
@@ -108,7 +108,8 @@ public class SoapPreProtocolOutIntercept
String action = getSoapAction(message, boi);
if (message.getVersion() instanceof Soap11) {
- Map<String, List<String>> reqHeaders = CastUtils.cast((Map)message.get(Message.PROTOCOL_HEADERS));
+ Map<String, List<String>> reqHeaders
+ = CastUtils.cast((Map<?, ?>)message.get(Message.PROTOCOL_HEADERS));
if (reqHeaders == null) {
reqHeaders = new TreeMap<String, List<String>>(String.CASE_INSENSITIVE_ORDER);
}
Modified: cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/jms/interceptor/SoapJMSInInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/jms/interceptor/SoapJMSInInterceptor.java?rev=1227822&r1=1227821&r2=1227822&view=diff
==============================================================================
--- cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/jms/interceptor/SoapJMSInInterceptor.java (original)
+++ cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/jms/interceptor/SoapJMSInInterceptor.java Thu Jan 5 20:45:57 2012
@@ -43,7 +43,7 @@ public class SoapJMSInInterceptor extend
}
public void handleMessage(SoapMessage message) throws Fault {
- Map<String, List<String>> headers = CastUtils.cast((Map)message
+ Map<String, List<String>> headers = CastUtils.cast((Map<?, ?>)message
.get(Message.PROTOCOL_HEADERS));
if (headers != null) {
checkContentType(message, headers);
Modified: cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/spring/SoapBindingInfoConfigBeanDefinitionParser.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/spring/SoapBindingInfoConfigBeanDefinitionParser.java?rev=1227822&r1=1227821&r2=1227822&view=diff
==============================================================================
--- cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/spring/SoapBindingInfoConfigBeanDefinitionParser.java (original)
+++ cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/spring/SoapBindingInfoConfigBeanDefinitionParser.java Thu Jan 5 20:45:57 2012
@@ -26,7 +26,7 @@ import org.apache.cxf.configuration.spri
public class SoapBindingInfoConfigBeanDefinitionParser extends AbstractBeanDefinitionParser {
@Override
- protected Class getBeanClass(Element arg0) {
+ protected Class<?> getBeanClass(Element arg0) {
return SoapBindingConfiguration.class;
}
Modified: cxf/trunk/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapActionInterceptorTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapActionInterceptorTest.java?rev=1227822&r1=1227821&r2=1227822&view=diff
==============================================================================
--- cxf/trunk/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapActionInterceptorTest.java (original)
+++ cxf/trunk/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapActionInterceptorTest.java Thu Jan 5 20:45:57 2012
@@ -55,7 +55,8 @@ public class SoapActionInterceptorTest e
soapMessage.put(Message.REQUESTOR_ROLE, Boolean.TRUE);
assertEquals(Soap11.getInstance(), soapMessage.getVersion());
(new SoapPreProtocolOutInterceptor()).handleMessage(soapMessage);
- Map<String, List<String>> reqHeaders = CastUtils.cast((Map)soapMessage.get(Message.PROTOCOL_HEADERS));
+ Map<String, List<String>> reqHeaders
+ = CastUtils.cast((Map<?, ?>)soapMessage.get(Message.PROTOCOL_HEADERS));
assertNotNull(reqHeaders);
assertEquals("\"\"", reqHeaders.get(SoapBindingConstants.SOAP_ACTION).get(0));
Modified: cxf/trunk/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/interceptor/SoapPreProtocolOutInterceptorTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/interceptor/SoapPreProtocolOutInterceptorTest.java?rev=1227822&r1=1227821&r2=1227822&view=diff
==============================================================================
--- cxf/trunk/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/interceptor/SoapPreProtocolOutInterceptorTest.java (original)
+++ cxf/trunk/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/interceptor/SoapPreProtocolOutInterceptorTest.java Thu Jan 5 20:45:57 2012
@@ -64,7 +64,8 @@ public class SoapPreProtocolOutIntercept
interceptor.handleMessage(message);
control.verify();
- Map<String, List<String>> reqHeaders = CastUtils.cast((Map)message.get(Message.PROTOCOL_HEADERS));
+ Map<String, List<String>> reqHeaders
+ = CastUtils.cast((Map<?, ?>)message.get(Message.PROTOCOL_HEADERS));
assertNotNull(reqHeaders);
List<String> soapaction = reqHeaders.get("soapaction");
assertTrue(null != soapaction && soapaction.size() == 1);
@@ -88,7 +89,8 @@ public class SoapPreProtocolOutIntercept
interceptor.handleMessage(message);
control.verify();
- Map<String, List<String>> reqHeaders = CastUtils.cast((Map)message.get(Message.PROTOCOL_HEADERS));
+ Map<String, List<String>> reqHeaders
+ = CastUtils.cast((Map<?, ?>)message.get(Message.PROTOCOL_HEADERS));
assertNotNull(reqHeaders);
List<String> soapaction = reqHeaders.get("soapaction");
assertTrue(null != soapaction && soapaction.size() == 1);
Modified: cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/extension/Extension.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/extension/Extension.java?rev=1227822&r1=1227821&r2=1227822&view=diff
==============================================================================
--- cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/extension/Extension.java (original)
+++ cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/extension/Extension.java Thu Jan 5 20:45:57 2012
@@ -164,11 +164,11 @@ public class Extension {
try {
//if there is a Bus constructor, use it.
if (b != null && args == null) {
- Constructor con = cls.getConstructor(Bus.class);
+ Constructor<?> con = cls.getConstructor(Bus.class);
obj = con.newInstance(b);
return obj;
} else if (b != null && args != null) {
- Constructor con;
+ Constructor<?> con;
boolean noBus = false;
try {
con = cls.getConstructor(Bus.class, Object[].class);
@@ -183,7 +183,7 @@ public class Extension {
}
return obj;
} else if (args != null) {
- Constructor con = cls.getConstructor(Object[].class);
+ Constructor<?> con = cls.getConstructor(Object[].class);
obj = con.newInstance(args);
return obj;
}
@@ -199,7 +199,7 @@ public class Extension {
return obj;
}
- public Class loadInterface(ClassLoader cl) {
+ public Class<?> loadInterface(ClassLoader cl) {
if (intf != null) {
return intf;
}
Modified: cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/spring/BusDefinitionParser.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/spring/BusDefinitionParser.java?rev=1227822&r1=1227821&r2=1227822&view=diff
==============================================================================
--- cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/spring/BusDefinitionParser.java (original)
+++ cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/spring/BusDefinitionParser.java Thu Jan 5 20:45:57 2012
@@ -111,10 +111,10 @@ public class BusDefinitionParser extends
if ("inInterceptors".equals(name) || "inFaultInterceptors".equals(name)
|| "outInterceptors".equals(name) || "outFaultInterceptors".equals(name)
|| "features".equals(name)) {
- List list = ctx.getDelegate().parseListElement(e, bean.getBeanDefinition());
+ List<?> list = ctx.getDelegate().parseListElement(e, bean.getBeanDefinition());
bean.addPropertyValue(name, list);
} else if ("properties".equals(name)) {
- Map map = ctx.getDelegate().parseMapElement(e, bean.getBeanDefinition());
+ Map<?, ?> map = ctx.getDelegate().parseMapElement(e, bean.getBeanDefinition());
bean.addPropertyValue("properties", map);
}
}
Modified: cxf/trunk/rt/core/src/main/java/org/apache/cxf/clustering/spring/FailoverBeanDefinitionParser.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/java/org/apache/cxf/clustering/spring/FailoverBeanDefinitionParser.java?rev=1227822&r1=1227821&r2=1227822&view=diff
==============================================================================
--- cxf/trunk/rt/core/src/main/java/org/apache/cxf/clustering/spring/FailoverBeanDefinitionParser.java (original)
+++ cxf/trunk/rt/core/src/main/java/org/apache/cxf/clustering/spring/FailoverBeanDefinitionParser.java Thu Jan 5 20:45:57 2012
@@ -28,7 +28,7 @@ import org.springframework.beans.factory
public class FailoverBeanDefinitionParser extends AbstractBeanDefinitionParser {
@Override
- protected Class getBeanClass(Element element) {
+ protected Class<?> getBeanClass(Element element) {
return FailoverFeature.class;
}
Modified: cxf/trunk/rt/core/src/main/java/org/apache/cxf/clustering/spring/LoadDistributorBeanDefinitionParser.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/java/org/apache/cxf/clustering/spring/LoadDistributorBeanDefinitionParser.java?rev=1227822&r1=1227821&r2=1227822&view=diff
==============================================================================
--- cxf/trunk/rt/core/src/main/java/org/apache/cxf/clustering/spring/LoadDistributorBeanDefinitionParser.java (original)
+++ cxf/trunk/rt/core/src/main/java/org/apache/cxf/clustering/spring/LoadDistributorBeanDefinitionParser.java Thu Jan 5 20:45:57 2012
@@ -28,7 +28,7 @@ import org.springframework.beans.factory
public class LoadDistributorBeanDefinitionParser extends AbstractBeanDefinitionParser {
@Override
- protected Class getBeanClass(Element element) {
+ protected Class<?> getBeanClass(Element element) {
return LoadDistributorFeature.class;
}
Modified: cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/ClientFaultConverter.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/ClientFaultConverter.java?rev=1227822&r1=1227821&r2=1227822&view=diff
==============================================================================
--- cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/ClientFaultConverter.java (original)
+++ cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/ClientFaultConverter.java Thu Jan 5 20:45:57 2012
@@ -168,12 +168,12 @@ public class ClientFaultConverter extend
try {
Class<?> exClass = faultWanted.getProperty(Class.class.getName(), Class.class);
if (e == null) {
- Constructor constructor = exClass.getConstructor(new Class[]{String.class});
+ Constructor<?> constructor = exClass.getConstructor(new Class[]{String.class});
e = constructor.newInstance(new Object[]{fault.getMessage()});
} else {
try {
- Constructor constructor = getConstructor(exClass, e);
+ Constructor<?> constructor = getConstructor(exClass, e);
e = constructor.newInstance(new Object[]{fault.getMessage(), e});
} catch (NoSuchMethodException e1) {
//Use reflection to convert fault bean to exception
@@ -199,10 +199,10 @@ public class ClientFaultConverter extend
}
}
- private Constructor getConstructor(Class<?> faultClass, Object e) throws NoSuchMethodException {
+ private Constructor<?> getConstructor(Class<?> faultClass, Object e) throws NoSuchMethodException {
Class<?> beanClass = e.getClass();
- Constructor cons[] = faultClass.getConstructors();
- for (Constructor c : cons) {
+ Constructor<?> cons[] = faultClass.getConstructors();
+ for (Constructor<?> c : cons) {
if (c.getParameterTypes().length == 2
&& String.class.equals(c.getParameterTypes()[0])
&& c.getParameterTypes()[1].isInstance(e)) {
@@ -224,7 +224,7 @@ public class ClientFaultConverter extend
private boolean isDOMSupported(DataBinding db) {
boolean supportsDOM = false;
- for (Class c : db.getSupportedReaderFormats()) {
+ for (Class<?> c : db.getSupportedReaderFormats()) {
if (c.equals(Node.class)) {
supportsDOM = true;
}
@@ -271,7 +271,7 @@ public class ClientFaultConverter extend
Object obj = (Object)cls;
Object type = field.get(obj);
if (type instanceof Class) {
- return (Class)type;
+ return (Class<?>)type;
}
} catch (Exception e) {
// do nothing
@@ -280,7 +280,7 @@ public class ClientFaultConverter extend
}
private Exception convertFaultBean(Class<?> exClass, Object faultBean, Fault fault) throws Exception {
- Constructor constructor = exClass.getConstructor(new Class[]{String.class});
+ Constructor<?> constructor = exClass.getConstructor(new Class[]{String.class});
Exception e = (Exception)constructor.newInstance(new Object[]{fault.getMessage()});
//Copy fault bean fields to exception
Modified: cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/BeanType.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/BeanType.java?rev=1227822&r1=1227821&r2=1227822&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/BeanType.java (original)
+++ cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/BeanType.java Thu Jan 5 20:45:57 2012
@@ -222,7 +222,7 @@ public class BeanType extends AegisType
protected Object createFromFault(Context context) throws SecurityException, InstantiationException,
IllegalAccessException, IllegalArgumentException, InvocationTargetException {
Class<?> clazz = getTypeClass();
- Constructor ctr;
+ Constructor<?> ctr;
Object o;
Fault fault = context.getFault();
@@ -262,7 +262,8 @@ public class BeanType extends AegisType
/**
* Write the specified property to a field.
*/
- protected void writeProperty(QName name, Object object, Object property, Class impl, BeanTypeInfo inf)
+ protected void writeProperty(QName name, Object object, Object property,
+ Class<?> impl, BeanTypeInfo inf)
throws DatabindingException {
if (object instanceof InterfaceInvocationHandler) {
Modified: cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/collection/CollectionType.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/collection/CollectionType.java?rev=1227822&r1=1227821&r2=1227822&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/collection/CollectionType.java (original)
+++ cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/collection/CollectionType.java Thu Jan 5 20:45:57 2012
@@ -58,7 +58,7 @@ public class CollectionType extends Arra
@Override
@SuppressWarnings("unchecked")
protected Collection<Object> createCollection() {
- Collection values = null;
+ Collection<Object> values = null;
/*
* getTypeClass returns the type of the object. These 'if's asked if the proposed
@@ -66,21 +66,21 @@ public class CollectionType extends Arra
* Vector and Set before SortedSet.
*/
- Class userTypeClass = getTypeClass();
+ Class<?> userTypeClass = getTypeClass();
if (userTypeClass.isAssignableFrom(List.class)) {
- values = new ArrayList();
+ values = new ArrayList<Object>();
} else if (userTypeClass.isAssignableFrom(LinkedList.class)) {
- values = new LinkedList();
+ values = new LinkedList<Object>();
} else if (userTypeClass.isAssignableFrom(Set.class)) {
- values = new HashSet();
+ values = new HashSet<Object>();
} else if (userTypeClass.isAssignableFrom(SortedSet.class)) {
- values = new TreeSet();
+ values = new TreeSet<Object>();
} else if (userTypeClass.isAssignableFrom(Vector.class)) {
- values = new Vector();
+ values = new Vector<Object>();
} else if (userTypeClass.isAssignableFrom(Stack.class)) {
- values = new Stack();
+ values = new Stack<Object>();
} else if (userTypeClass.isInterface()) {
- values = new ArrayList();
+ values = new ArrayList<Object>();
} else {
try {
values = (Collection<Object>)userTypeClass.newInstance();
@@ -102,7 +102,7 @@ public class CollectionType extends Arra
}
try {
- Collection list = (Collection)object;
+ Collection<?> list = (Collection<?>)object;
AegisType type = getComponentType();
@@ -110,7 +110,7 @@ public class CollectionType extends Arra
throw new DatabindingException("Couldn't find component type for Collection.");
}
- for (Iterator itr = list.iterator(); itr.hasNext();) {
+ for (Iterator<?> itr = list.iterator(); itr.hasNext();) {
String ns = null;
if (type.isAbstract()) {
ns = getSchemaType().getNamespaceURI();
Modified: cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/encoded/StructType.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/encoded/StructType.java?rev=1227822&r1=1227821&r2=1227822&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/encoded/StructType.java (original)
+++ cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/encoded/StructType.java Thu Jan 5 20:45:57 2012
@@ -95,7 +95,7 @@ public class StructType extends BeanType
protected void writeProperty(QName name,
Object object,
Object property,
- Class impl,
+ Class<?> impl,
BeanTypeInfo inf) throws DatabindingException {
// nested elements use unqualified names
@@ -174,12 +174,12 @@ public class StructType extends BeanType
private final class WritePropertyAction implements SoapRef.Action {
private final QName name;
private final Object targetObject;
- private final Class targetClass;
+ private final Class<?> targetClass;
private final BeanTypeInfo beanTypeInfo;
private WritePropertyAction(QName name,
Object targetObject,
- Class targetClass,
+ Class<?> targetClass,
BeanTypeInfo beanTypeInfo) {
this.name = name;
this.targetObject = targetObject;
Modified: cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/array/DuplicateArrayReturnItem.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/array/DuplicateArrayReturnItem.java?rev=1227822&r1=1227821&r2=1227822&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/array/DuplicateArrayReturnItem.java (original)
+++ cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/array/DuplicateArrayReturnItem.java Thu Jan 5 20:45:57 2012
@@ -19,7 +19,7 @@
package org.apache.cxf.aegis.type.array;
-public class DuplicateArrayReturnItem implements Comparable {
+public class DuplicateArrayReturnItem implements Comparable<Object> {
String name;
Modified: cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java?rev=1227822&r1=1227821&r2=1227822&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java (original)
+++ cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java Thu Jan 5 20:45:57 2012
@@ -452,10 +452,10 @@ public final class JAXBEncoderDecoder {
Class<?> cls = part.getTypeClass();
Object obj = null;
try {
- Constructor cons = cls.getConstructor();
+ Constructor<?> cons = cls.getConstructor();
obj = cons.newInstance();
} catch (NoSuchMethodException nse) {
- Constructor cons = cls.getConstructor(new Class[] {String.class});
+ Constructor<?> cons = cls.getConstructor(new Class[] {String.class});
obj = cons.newInstance(new Object[1]);
}
Modified: cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSServerFactoryBean.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSServerFactoryBean.java?rev=1227822&r1=1227821&r2=1227822&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSServerFactoryBean.java (original)
+++ cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSServerFactoryBean.java Thu Jan 5 20:45:57 2012
@@ -243,7 +243,7 @@ public class JAXRSServerFactoryBean exte
* setResourceClasses method accepting the array of Class parameters.
* @param clazz the service/resource class
*/
- public void setServiceClass(Class clazz) {
+ public void setServiceClass(Class<?> clazz) {
serviceFactory.setResourceClasses(clazz);
}
Modified: cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/blueprint/BlueprintResourceFactory.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/blueprint/BlueprintResourceFactory.java?rev=1227822&r1=1227821&r2=1227822&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/blueprint/BlueprintResourceFactory.java (original)
+++ cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/blueprint/BlueprintResourceFactory.java Thu Jan 5 20:45:57 2012
@@ -94,7 +94,7 @@ public class BlueprintResourceFactory im
this.beanId = serviceBeanId;
}
- Constructor getBeanConstructor() {
+ Constructor<?> getBeanConstructor() {
return c;
}
Modified: cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/servlet/CXFNonSpringJaxrsServlet.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/servlet/CXFNonSpringJaxrsServlet.java?rev=1227822&r1=1227821&r2=1227822&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/servlet/CXFNonSpringJaxrsServlet.java (original)
+++ cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/servlet/CXFNonSpringJaxrsServlet.java Thu Jan 5 20:45:57 2012
@@ -276,7 +276,7 @@ public class CXFNonSpringJaxrsServlet ex
protected Object createSingletonInstance(Class<?> cls, Map<String, String> props, ServletConfig sc)
throws ServletException {
- Constructor c = ResourceUtils.findResourceConstructor(cls, false);
+ Constructor<?> c = ResourceUtils.findResourceConstructor(cls, false);
if (c == null) {
throw new ServletException("No valid constructor found for " + cls.getName());
}
Modified: cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/JAXRSClientFactoryBeanDefinitionParser.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/JAXRSClientFactoryBeanDefinitionParser.java?rev=1227822&r1=1227821&r2=1227822&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/JAXRSClientFactoryBeanDefinitionParser.java (original)
+++ cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/JAXRSClientFactoryBeanDefinitionParser.java Thu Jan 5 20:45:57 2012
@@ -47,7 +47,7 @@ public class JAXRSClientFactoryBeanDefin
}
@Override
- protected Class getFactoryClass() {
+ protected Class<?> getFactoryClass() {
return JAXRSClientFactoryBean.class;
}
Modified: cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/SpringResourceFactory.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/SpringResourceFactory.java?rev=1227822&r1=1227821&r2=1227822&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/SpringResourceFactory.java (original)
+++ cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/SpringResourceFactory.java Thu Jan 5 20:45:57 2012
@@ -108,7 +108,7 @@ public class SpringResourceFactory imple
return ac;
}
- Constructor getBeanConstructor() {
+ Constructor<?> getBeanConstructor() {
return c;
}
Modified: cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/ResourceUtils.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/ResourceUtils.java?rev=1227822&r1=1227821&r2=1227822&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/ResourceUtils.java (original)
+++ cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/ResourceUtils.java Thu Jan 5 20:45:57 2012
@@ -238,9 +238,9 @@ public final class ResourceUtils {
cri.setMethodDispatcher(md);
}
- public static Constructor findResourceConstructor(Class<?> resourceClass, boolean perRequest) {
- List<Constructor> cs = new LinkedList<Constructor>();
- for (Constructor c : resourceClass.getConstructors()) {
+ public static Constructor<?> findResourceConstructor(Class<?> resourceClass, boolean perRequest) {
+ List<Constructor<?>> cs = new LinkedList<Constructor<?>>();
+ for (Constructor<?> c : resourceClass.getConstructors()) {
Class<?>[] params = c.getParameterTypes();
Annotation[][] anns = c.getParameterAnnotations();
boolean match = true;
@@ -260,9 +260,9 @@ public final class ResourceUtils {
cs.add(c);
}
}
- Collections.sort(cs, new Comparator<Constructor>() {
+ Collections.sort(cs, new Comparator<Constructor<?>>() {
- public int compare(Constructor c1, Constructor c2) {
+ public int compare(Constructor<?> c1, Constructor<?> c2) {
int p1 = c1.getParameterTypes().length;
int p2 = c2.getParameterTypes().length;
return p1 > p2 ? -1 : p1 < p2 ? 1 : 0;
@@ -554,7 +554,7 @@ public final class ResourceUtils {
}
@SuppressWarnings("unchecked")
- public static Object[] createConstructorArguments(Constructor c, Message m) {
+ public static Object[] createConstructorArguments(Constructor<?> c, Message m) {
Class<?>[] params = c.getParameterTypes();
Annotation[][] anns = c.getParameterAnnotations();
Type[] genericTypes = c.getGenericParameterTypes();
@@ -580,7 +580,7 @@ public final class ResourceUtils {
List<Class> resourceClasses = new ArrayList<Class>();
List<Object> providers = new ArrayList<Object>();
- Map<Class, ResourceProvider> map = new HashMap<Class, ResourceProvider>();
+ Map<Class<?>, ResourceProvider> map = new HashMap<Class<?>, ResourceProvider>();
// Note, app.getClasse() returns a list of per-resource classes
// or singleton provider classes
@@ -621,7 +621,7 @@ public final class ResourceUtils {
bean.setAddress(address);
bean.setResourceClasses(resourceClasses);
bean.setProviders(providers);
- for (Map.Entry<Class, ResourceProvider> entry : map.entrySet()) {
+ for (Map.Entry<Class<?>, ResourceProvider> entry : map.entrySet()) {
bean.setResourceProvider(entry.getKey(), entry.getValue());
}
bean.setApplication(app);
@@ -667,7 +667,7 @@ public final class ResourceUtils {
}
//TODO : consider moving JAXBDataBinding.createContext to JAXBUtils
- public static JAXBContext createJaxbContext(Set<Class<?>> classes, Class[] extraClass,
+ public static JAXBContext createJaxbContext(Set<Class<?>> classes, Class<?>[] extraClass,
Map<String, Object> contextProperties) {
if (classes == null || classes.isEmpty()) {
return null;
Modified: cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/spring/SpringResourceFactoryTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/spring/SpringResourceFactoryTest.java?rev=1227822&r1=1227821&r2=1227822&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/spring/SpringResourceFactoryTest.java (original)
+++ cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/spring/SpringResourceFactoryTest.java Thu Jan 5 20:45:57 2012
@@ -68,8 +68,8 @@ public class SpringResourceFactoryTest e
assertNotNull(bean);
SpringResourceFactory sf = (SpringResourceFactory)bean;
assertNotNull(sf.getApplicationContext());
- Constructor c = sf.getBeanConstructor();
- Constructor c2 = BookStore.class.getConstructor(new Class[]{});
+ Constructor<?> c = sf.getBeanConstructor();
+ Constructor<BookStore> c2 = BookStore.class.getConstructor(new Class[]{});
assertEquals(c.getParameterTypes().length, c2.getParameterTypes().length);
assertEquals(isSingleton, sf.isSingleton());
Modified: cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/ResourceUtilsTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/ResourceUtilsTest.java?rev=1227822&r1=1227821&r2=1227822&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/ResourceUtilsTest.java (original)
+++ cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/ResourceUtilsTest.java Thu Jan 5 20:45:57 2012
@@ -46,7 +46,7 @@ public class ResourceUtilsTest extends A
@Test
public void testFindResourceConstructor() {
- Constructor c = ResourceUtils.findResourceConstructor(Customer.class, true);
+ Constructor<?> c = ResourceUtils.findResourceConstructor(Customer.class, true);
assertNotNull(c);
assertEquals(2, c.getParameterTypes().length);
assertEquals(UriInfo.class, c.getParameterTypes()[0]);
Modified: cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/spring/JaxWsProxyFactoryBeanDefinitionParser.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/spring/JaxWsProxyFactoryBeanDefinitionParser.java?rev=1227822&r1=1227821&r2=1227822&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/spring/JaxWsProxyFactoryBeanDefinitionParser.java (original)
+++ cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/spring/JaxWsProxyFactoryBeanDefinitionParser.java Thu Jan 5 20:45:57 2012
@@ -42,12 +42,12 @@ public class JaxWsProxyFactoryBeanDefini
}
- protected Class getRawFactoryClass() {
+ protected Class<?> getRawFactoryClass() {
return JaxWsProxyFactoryBean.class;
}
@Override
- protected Class getFactoryClass() {
+ protected Class<?> getFactoryClass() {
return JAXWSSpringClientProxyFactoryBean.class;
}
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=1227822&r1=1227821&r2=1227822&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 Thu Jan 5 20:45:57 2012
@@ -227,7 +227,7 @@ public class ServiceImplTest extends Abs
ServiceImpl service = new ServiceImpl(getBus(), wsdl1, SERVICE_1, ServiceImpl.class);
- Dispatch dispatch = service.createDispatch(PORT_1, Source.class, Service.Mode.PAYLOAD);
+ Dispatch<Source> dispatch = service.createDispatch(PORT_1, Source.class, Service.Mode.PAYLOAD);
assertNotNull(dispatch);
}
Modified: cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/dispatch/DispatchTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/dispatch/DispatchTest.java?rev=1227822&r1=1227821&r2=1227822&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/dispatch/DispatchTest.java (original)
+++ cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/dispatch/DispatchTest.java Thu Jan 5 20:45:57 2012
@@ -158,7 +158,7 @@ public class DispatchTest extends Abstra
serviceName, null);
Dispatch<Source> disp = service.createDispatch(portName, Source.class, Service.Mode.MESSAGE);
- List<Interceptor<? extends Message>> interceptors = ((DispatchImpl)disp).getClient()
+ List<Interceptor<? extends Message>> interceptors = ((DispatchImpl<?>)disp).getClient()
.getInInterceptors();
boolean exists = false;
for (Interceptor interceptor : interceptors) {
@@ -181,7 +181,7 @@ public class DispatchTest extends Abstra
d.setMessageObserver(new MessageReplayObserver("/org/apache/cxf/jaxws/sayHiResponse.xml"));
BindingOperationVerifier bov = new BindingOperationVerifier();
- ((DispatchImpl)disp).getClient().getOutInterceptors().add(bov);
+ ((DispatchImpl<?>)disp).getClient().getOutInterceptors().add(bov);
Document doc = DOMUtils.readXml(getResourceAsStream("/org/apache/cxf/jaxws/sayHi2.xml"));
DOMSource source = new DOMSource(doc);
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=1227822&r1=1227821&r2=1227822&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 Thu Jan 5 20:45:57 2012
@@ -92,7 +92,7 @@ public class WSDLGetUtils {
params, ctxUri,
endpointInfo);
- Map<String, Definition> mp = CastUtils.cast((Map)endpointInfo.getService()
+ Map<String, Definition> mp = CastUtils.cast((Map<?, ?>)endpointInfo.getService()
.getProperty(WSDLS_KEY));
return mp.keySet();
}
@@ -109,7 +109,7 @@ public class WSDLGetUtils {
params, ctxUri,
endpointInfo);
- Map<String, SchemaReference> mp = CastUtils.cast((Map)endpointInfo.getService()
+ Map<String, SchemaReference> mp = CastUtils.cast((Map<?, ?>)endpointInfo.getService()
.getProperty(SCHEMAS_KEY));
Map<String, String> schemas = new HashMap<String, String>();
@@ -152,21 +152,21 @@ public class WSDLGetUtils {
xsd = URLDecoder.decode(xsd, "utf-8");
}
- Map<String, Definition> mp = CastUtils.cast((Map)endpointInfo.getService()
+ Map<String, Definition> mp = CastUtils.cast((Map<?, ?>)endpointInfo.getService()
.getProperty(WSDLS_KEY));
- Map<String, SchemaReference> smp = CastUtils.cast((Map)endpointInfo.getService()
+ Map<String, SchemaReference> smp = CastUtils.cast((Map<?, ?>)endpointInfo.getService()
.getProperty(SCHEMAS_KEY));
if (mp == null) {
endpointInfo.getService().setProperty(WSDLS_KEY,
- new ConcurrentHashMap());
- mp = CastUtils.cast((Map)endpointInfo.getService()
+ new ConcurrentHashMap<String, Definition>());
+ mp = CastUtils.cast((Map<?, ?>)endpointInfo.getService()
.getProperty(WSDLS_KEY));
}
if (smp == null) {
endpointInfo.getService().setProperty(SCHEMAS_KEY,
- new ConcurrentHashMap());
- smp = CastUtils.cast((Map)endpointInfo.getService()
+ new ConcurrentHashMap<String, SchemaReference>());
+ smp = CastUtils.cast((Map<?, ?>)endpointInfo.getService()
.getProperty(SCHEMAS_KEY));
}
@@ -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((List<?>)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/frontend/spring/ClientProxyFactoryBeanDefinitionParser.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/spring/ClientProxyFactoryBeanDefinitionParser.java?rev=1227822&r1=1227821&r2=1227822&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/spring/ClientProxyFactoryBeanDefinitionParser.java (original)
+++ cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/spring/ClientProxyFactoryBeanDefinitionParser.java Thu Jan 5 20:45:57 2012
@@ -49,10 +49,10 @@ public class ClientProxyFactoryBeanDefin
setBeanClass(SpringClientProxyFactoryBean.class);
}
@Override
- protected Class getFactoryClass() {
+ protected Class<?> getFactoryClass() {
return SpringClientProxyFactoryBean.class;
}
- protected Class getRawFactoryClass() {
+ protected Class<?> getRawFactoryClass() {
return ClientProxyFactoryBean.class;
}
@@ -79,14 +79,14 @@ public class ClientProxyFactoryBeanDefin
@Override
protected void mapElement(ParserContext ctx, BeanDefinitionBuilder bean, Element e, String name) {
if ("properties".equals(name)) {
- Map map = ctx.getDelegate().parseMapElement(e, bean.getBeanDefinition());
+ Map<?, ?> map = ctx.getDelegate().parseMapElement(e, bean.getBeanDefinition());
bean.addPropertyValue("properties", map);
} else if ("binding".equals(name)) {
setFirstChildAsProperty(e, ctx, bean, "bindingConfig");
} else if ("inInterceptors".equals(name) || "inFaultInterceptors".equals(name)
|| "outInterceptors".equals(name) || "outFaultInterceptors".equals(name)
|| "features".equals(name) || "handlers".equals(name)) {
- List list = ctx.getDelegate().parseListElement(e, bean.getBeanDefinition());
+ List<?> list = ctx.getDelegate().parseListElement(e, bean.getBeanDefinition());
bean.addPropertyValue(name, list);
} else {
setFirstChildAsProperty(e, ctx, bean, name);
@@ -95,7 +95,7 @@ public class ClientProxyFactoryBeanDefin
@NoJSR250Annotations
public static class SpringClientProxyFactoryBean extends ClientProxyFactoryBean
- implements ApplicationContextAware, FactoryBean, DisposableBean {
+ implements ApplicationContextAware, FactoryBean<Object>, DisposableBean {
private Object obj;
@@ -121,7 +121,7 @@ public class ClientProxyFactoryBeanDefin
}
return obj;
}
- public Class getObjectType() {
+ public Class<?> getObjectType() {
return this.getServiceClass();
}
public boolean isSingleton() {
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=1227822&r1=1227821&r2=1227822&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 Thu Jan 5 20:45:57 2012
@@ -193,7 +193,7 @@ public class DefaultServiceConfiguration
@Override
public Boolean isInParam(Method method, int j) {
if (j >= 0) {
- Class c = method.getParameterTypes()[j];
+ Class<?> c = method.getParameterTypes()[j];
if (Exchange.class.equals(c)) {
return false;
}
@@ -274,17 +274,17 @@ public class DefaultServiceConfiguration
return null;
}
- private static Class getHolderClass(ParameterizedType paramType) {
+ private static Class<?> getHolderClass(ParameterizedType paramType) {
Object rawType = paramType.getActualTypeArguments()[0];
- Class rawClass;
+ Class<?> rawClass;
if (rawType instanceof GenericArrayType) {
- rawClass = (Class)((GenericArrayType)rawType).getGenericComponentType();
+ rawClass = (Class<?>)((GenericArrayType)rawType).getGenericComponentType();
rawClass = Array.newInstance(rawClass, 0).getClass();
} else {
if (rawType instanceof ParameterizedType) {
- rawType = (Class)((ParameterizedType)rawType).getRawType();
+ rawType = (Class<?>)((ParameterizedType)rawType).getRawType();
}
- rawClass = (Class)rawType;
+ rawClass = (Class<?>)rawType;
}
return rawClass;
}