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 17:57:54 UTC
svn commit: r1228268 [1/3] - in /cxf/trunk:
rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/utils/
rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/
rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/
rt/databinding...
Author: dkulp
Date: Fri Jan 6 16:57:50 2012
New Revision: 1228268
URL: http://svn.apache.org/viewvc?rev=1228268&view=rev
Log:
Another 300+ backportable rawtypes warning fixes
Modified:
cxf/trunk/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/utils/CorbaObjectReferenceHelper.java
cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/AegisContext.java
cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/AegisDatabinding.java
cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/AbstractTypeCreator.java
cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/ArrayType.java
cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/ObjectType.java
cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/collection/MapType.java
cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/encoded/SoapArrayType.java
cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/util/ServiceUtils.java
cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/util/jdom/StaxSerializer.java
cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/util/stax/JDOMNamespaceContext.java
cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/util/stax/JDOMStreamReader.java
cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/util/stax/JDOMStreamWriter.java
cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/AbstractAegisTest.java
cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/inheritance/ExceptionInheritanceTest.java
cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/inheritance/ws1/WS1.java
cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/inheritance/ws1/impl/WS1Impl.java
cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/AnnotatedTypeTest.java
cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/CollectionService.java
cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/CollectionServiceInterface.java
cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/CollectionTest.java
cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/JaxbTypeTest.java
cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/MapTest.java
cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/XFireTypeTest.java
cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/map/fortest/MapTest.java
cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/map/fortest/MapTestImpl.java
cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java
cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBWrapperHelper.java
cxf/trunk/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBEncoderDecoderTest.java
cxf/trunk/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/io/XMLStreamDataWriterTest.java
cxf/trunk/rt/databinding/jibx/src/main/java/org/apache/cxf/jibx/JibxSimpleTypes.java
cxf/trunk/rt/databinding/jibx/src/main/java/org/apache/cxf/jibx/JibxUtil.java
cxf/trunk/rt/databinding/xmlbeans/src/main/java/org/apache/cxf/xmlbeans/tools/XMLBeansToolingDataBinding.java
cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/AnnotationUtils.java
cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/InjectionUtils.java
cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/AbstractWSDLBasedEndpointFactory.java
cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ClientProxyFactoryBean.java
cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/blueprint/ClientProxyFactoryBeanDefinitionParser.java
cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/blueprint/ServerFactoryBeanDefinitionParser.java
cxf/trunk/rt/frontend/simple/src/test/java/org/apache/cxf/service/factory/HelloServiceProxyFactory.java
cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/spring/JettyHTTPServerEngineBeanDefinitionParser.java
cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/spring/JettyHTTPServerEngineFactoryBeanDefinitionParser.java
cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestinationTest.java
cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPTransportFactory.java
cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/https/CertificateHostnameVerifier.java
cxf/trunk/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HeadersTest.java
cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSOldConfigHolder.java
cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSUtils.java
cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/uri/JMSEndpoint.java
cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/uri/JMSEndpointParser.java
cxf/trunk/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/uri/JMSEndpointTest.java
cxf/trunk/rt/transports/local/src/main/java/org/apache/cxf/transport/local/LocalTransportFactory.java
cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/soap/MAPCodec.java
cxf/trunk/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/MAPAggregatorTest.java
cxf/trunk/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/soap/MAPCodecTest.java
cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/AssertionBuilderRegistryImpl.java
cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyUtils.java
cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/blueprint/PolicyBPHandler.java
cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/EffectivePolicyImplTest.java
cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/EndpointPolicyImplTest.java
cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyEngineTest.java
cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyInterceptorsTest.java
cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/soap/RMSoapInterceptor.java
cxf/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/AbstractRMInterceptorTest.java
cxf/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/ProxyTest.java
cxf/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMInInterceptorTest.java
cxf/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMOutInterceptorTest.java
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/AsymmetricBindingBuilder.java
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/InitiatorEncryptionTokenBuilder.java
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/InitiatorSignatureTokenBuilder.java
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/InitiatorTokenBuilder.java
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/IssuedTokenBuilder.java
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/ProtectionTokenBuilder.java
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/RecipientEncryptionTokenBuilder.java
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/RecipientSignatureTokenBuilder.java
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/RecipientTokenBuilder.java
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/SupportingTokens12Builder.java
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/SupportingTokensBuilder.java
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/SymmetricBindingBuilder.java
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/TransportTokenBuilder.java
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/X509TokenBuilder.java
cxf/trunk/services/wsn/wsn-api/src/main/java/org/apache/cxf/wsn/client/Publisher.java
cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/AbstractSubscription.java
cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/jms/JmsTopicExpressionConverter.java
cxf/trunk/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/AegisJaxWs.java
cxf/trunk/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/AegisJaxWsImpl.java
cxf/trunk/systests/databinding/src/test/java/org/apache/cxf/systest/jaxb/util/ClassArrayFactoryBean.java
cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/dispatch/DispatchClientServerWithMalformedResponseTest.java
cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/DispatchHandlerInvocationTest.java
cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/HandlerInvocationTest.java
cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/HandlerInvocationUsingAddNumbersTest.java
cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/HandlerTestImpl.java
cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/LoggingHandler.java
cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/ModifyNumberHandler.java
cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/SmallNumberHandler.java
cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/TestHandler.java
cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/TestHandlerBase.java
cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/TestSOAPHandler.java
cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/TestUnusedHandler.java
cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/AttachmentStreamSourceXMLProvider.java
cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/TestSOAPHandler.java
cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/clustering/FailoverTest.java
Modified: cxf/trunk/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/utils/CorbaObjectReferenceHelper.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/utils/CorbaObjectReferenceHelper.java?rev=1228268&r1=1228267&r2=1228268&view=diff
==============================================================================
--- cxf/trunk/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/utils/CorbaObjectReferenceHelper.java (original)
+++ cxf/trunk/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/utils/CorbaObjectReferenceHelper.java Fri Jan 6 16:57:50 2012
@@ -84,13 +84,11 @@ public final class CorbaObjectReferenceH
public static Binding getDefaultBinding(Object obj, Definition wsdlDef) {
LOG.log(Level.FINEST, "Getting binding for a default object reference");
- Collection bindings = wsdlDef.getBindings().values();
- for (Iterator iter = bindings.iterator(); iter.hasNext();) {
- Binding b = (Binding)iter.next();
- List extElements = b.getExtensibilityElements();
-
+ Collection<Binding> bindings = CastUtils.cast(wsdlDef.getBindings().values());
+ for (Binding b: bindings) {
+ List<?> extElements = b.getExtensibilityElements();
// Get the list of all extensibility elements
- for (Iterator extIter = extElements.iterator(); extIter.hasNext();) {
+ for (Iterator<?> extIter = extElements.iterator(); extIter.hasNext();) {
java.lang.Object element = extIter.next();
// Find a binding type so we can check against its repository ID
@@ -102,7 +100,6 @@ public final class CorbaObjectReferenceH
}
}
}
-
return null;
}
@@ -110,13 +107,12 @@ public final class CorbaObjectReferenceH
LOG.log(Level.FINE, "RepositoryId " + repId
+ ", wsdl namespace " + wsdlDef.getTargetNamespace());
EprMetaData ret = new EprMetaData();
- Collection bindings = wsdlDef.getBindings().values();
- for (Iterator iter = bindings.iterator(); iter.hasNext();) {
- Binding b = (Binding)iter.next();
- List extElements = b.getExtensibilityElements();
+ Collection<Binding> bindings = CastUtils.cast(wsdlDef.getBindings().values());
+ for (Binding b : bindings) {
+ List<?> extElements = b.getExtensibilityElements();
// Get the list of all extensibility elements
- for (Iterator extIter = extElements.iterator(); extIter.hasNext();) {
+ for (Iterator<?> extIter = extElements.iterator(); extIter.hasNext();) {
java.lang.Object element = extIter.next();
// Find a binding type so we can check against its repository ID
@@ -133,9 +129,9 @@ public final class CorbaObjectReferenceH
if (!ret.isValid()) {
// recursivly check imports
- Iterator importLists = wsdlDef.getImports().values().iterator();
+ Iterator<?> importLists = wsdlDef.getImports().values().iterator();
while (importLists.hasNext()) {
- List imports = (List) importLists.next();
+ List<?> imports = (List<?>) importLists.next();
for (java.lang.Object imp : imports) {
if (imp instanceof Import) {
Definition importDef = ((Import)imp).getDefinition();
@@ -193,12 +189,10 @@ public final class CorbaObjectReferenceH
}
Binding match = info.getBinding();
Definition wsdlDef = info.getCandidateWsdlDef();
- Collection services = wsdlDef.getServices().values();
- for (Iterator iter = services.iterator(); iter.hasNext();) {
- Service serv = (Service)iter.next();
- Collection ports = serv.getPorts().values();
- for (Iterator portIter = ports.iterator(); portIter.hasNext();) {
- Port pt = (Port)portIter.next();
+ Collection<Service> services = CastUtils.cast(wsdlDef.getServices().values());
+ for (Service serv : services) {
+ Collection<Port> ports = CastUtils.cast(serv.getPorts().values());
+ for (Port pt : ports) {
if (pt.getBinding().equals(match)) {
info.setPortName(pt.getName());
info.setServiceQName(serv.getQName());
@@ -208,9 +202,9 @@ public final class CorbaObjectReferenceH
}
if (info.getServiceQName() == null) {
- Iterator importLists = wsdlDef.getImports().values().iterator();
+ Iterator<?> importLists = wsdlDef.getImports().values().iterator();
while (info.getServiceQName() == null && importLists.hasNext()) {
- List imports = (List) importLists.next();
+ List<?> imports = (List<?>) importLists.next();
for (java.lang.Object imp : imports) {
if (imp instanceof Import) {
Definition importDef = ((Import)imp).getDefinition();
Modified: cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/AegisContext.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/AegisContext.java?rev=1228268&r1=1228267&r2=1228268&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/AegisContext.java (original)
+++ cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/AegisContext.java Fri Jan 6 16:57:50 2012
@@ -222,7 +222,7 @@ public class AegisContext {
}
} else if (jtype instanceof GenericArrayType) {
GenericArrayType gt = (GenericArrayType)jtype;
- Class ct = (Class) gt.getGenericComponentType();
+ Class<?> ct = (Class<?>) gt.getGenericComponentType();
// this looks nutty, but there's no other way. Make an array and take it's class.
ct = Array.newInstance(ct, 0).getClass();
rootClasses.add(ct);
@@ -244,7 +244,7 @@ public class AegisContext {
rootTypeQNames = new HashSet<QName>();
if (this.rootClassNames != null) {
for (String typeName : rootClassNames) {
- Class c = null;
+ Class<?> c = null;
try {
c = ClassLoaderUtils.loadClass(typeName, TypeUtil.class);
} catch (ClassNotFoundException e) {
Modified: cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/AegisDatabinding.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/AegisDatabinding.java?rev=1228268&r1=1228267&r2=1228268&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/AegisDatabinding.java (original)
+++ cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/AegisDatabinding.java Fri Jan 6 16:57:50 2012
@@ -23,7 +23,6 @@ import java.lang.reflect.Method;
import java.util.Collection;
import java.util.HashMap;
import java.util.HashSet;
-import java.util.Iterator;
import java.util.Map;
import java.util.Set;
import java.util.logging.Logger;
@@ -313,9 +312,7 @@ public class AegisDatabinding extends Ab
if (container == null) {
return;
}
- for (Iterator itr = container.getMessageParts().iterator(); itr.hasNext();) {
- MessagePartInfo part = (MessagePartInfo)itr.next();
-
+ for (MessagePartInfo part : container.getMessageParts()) {
AegisType type = getParameterType(s, serviceTM, part, partType);
if (part.getXmlSchema() == null) {
@@ -380,8 +377,7 @@ public class AegisDatabinding extends Ab
return;
}
SchemaCollection col = s.getXmlSchemaCollection();
- for (Iterator itr = container.getMessageParts().iterator(); itr.hasNext();) {
- MessagePartInfo part = (MessagePartInfo)itr.next();
+ for (MessagePartInfo part: container.getMessageParts()) {
if (part.getXmlSchema() == null) {
if (part.isElement()) {
XmlSchemaAnnotated tp = col.getElementByQName(part.getElementQName());
Modified: cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/AbstractTypeCreator.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/AbstractTypeCreator.java?rev=1228268&r1=1228267&r2=1228268&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/AbstractTypeCreator.java (original)
+++ cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/AbstractTypeCreator.java Fri Jan 6 16:57:50 2012
@@ -92,7 +92,7 @@ public abstract class AbstractTypeCreato
public TypeClassInfo createBasicClassInfo(Type type) {
TypeClassInfo info = new TypeClassInfo();
- Class typeClass = TypeUtil.getTypeClass(type, false);
+ Class<?> typeClass = TypeUtil.getTypeClass(type, false);
if (typeClass != null) {
info.setDescription("class '" + typeClass.getName() + "'");
} else {
@@ -105,7 +105,7 @@ public abstract class AbstractTypeCreato
public AegisType createTypeForClass(TypeClassInfo info) {
- Class javaClass = TypeUtil.getTypeRelatedClass(info.getType());
+ Class<?> javaClass = TypeUtil.getTypeRelatedClass(info.getType());
AegisType result = null;
boolean newType = true;
if (info.getType() instanceof TypeVariable) {
Modified: cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/ArrayType.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/ArrayType.java?rev=1228268&r1=1228267&r2=1228268&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/ArrayType.java (original)
+++ cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/ArrayType.java Fri Jan 6 16:57:50 2012
@@ -227,7 +227,7 @@ public class ArrayType extends AegisType
return;
}
if (values instanceof Collection) {
- Collection c = (Collection)values;
+ Collection<?> c = (Collection<?>)values;
values = c.toArray();
}
@@ -260,7 +260,7 @@ public class ArrayType extends AegisType
name = type.getSchemaType().getLocalPart();
}
- Class arrayType = type.getTypeClass();
+ Class<?> arrayType = type.getTypeClass();
boolean oldXsiWrite = context.getGlobalContext().isWriteXsiTypes();
try {
@@ -422,7 +422,7 @@ public class ArrayType extends AegisType
* @return
*/
public AegisType getComponentType() {
- Class compType = getTypeClass().getComponentType();
+ Class<?> compType = getTypeClass().getComponentType();
AegisType type;
Modified: cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/ObjectType.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/ObjectType.java?rev=1228268&r1=1228267&r2=1228268&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/ObjectType.java (original)
+++ cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/ObjectType.java Fri Jan 6 16:57:50 2012
@@ -210,10 +210,10 @@ public class ObjectType extends AegisTyp
return type;
}
- Class[] interfaces = clazz.getInterfaces();
+ Class<?>[] interfaces = clazz.getInterfaces();
for (int i = 0; i < interfaces.length; i++) {
- Class anInterface = interfaces[i];
+ Class<?> anInterface = interfaces[i];
type = tm.getType(anInterface);
@@ -222,7 +222,7 @@ public class ObjectType extends AegisTyp
}
}
- Class superclass = clazz.getSuperclass();
+ Class<?> superclass = clazz.getSuperclass();
if (null == superclass || Object.class.equals(superclass)) {
return null;
Modified: cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/collection/MapType.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/collection/MapType.java?rev=1228268&r1=1228267&r2=1228268&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/collection/MapType.java (original)
+++ cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/collection/MapType.java Fri Jan 6 16:57:50 2012
@@ -145,13 +145,13 @@ public class MapType extends AegisType {
}
try {
- Map map = (Map)object;
+ Map<?, ?> map = (Map<?, ?>)object;
AegisType kType = getKeyType();
AegisType vType = getValueType();
- for (Iterator itr = map.entrySet().iterator(); itr.hasNext();) {
- Map.Entry entry = (Map.Entry)itr.next();
+ for (Iterator<?> itr = map.entrySet().iterator(); itr.hasNext();) {
+ Map.Entry<?, ?> entry = (Map.Entry<?, ?>)itr.next();
writeEntry(writer, context, kType, vType, entry);
}
@@ -162,7 +162,7 @@ public class MapType extends AegisType {
private void writeEntry(MessageWriter writer, Context context,
AegisType kType, AegisType vType,
- Map.Entry entry) throws DatabindingException {
+ Map.Entry<?, ?> entry) throws DatabindingException {
kType = TypeUtil.getWriteType(context.getGlobalContext(), entry.getKey(), kType);
vType = TypeUtil.getWriteType(context.getGlobalContext(), entry.getValue(), vType);
Modified: cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/encoded/SoapArrayType.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/encoded/SoapArrayType.java?rev=1228268&r1=1228267&r2=1228268&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/encoded/SoapArrayType.java (original)
+++ cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/encoded/SoapArrayType.java Fri Jan 6 16:57:50 2012
@@ -252,7 +252,7 @@ public class SoapArrayType extends Aegis
}
Object[] array = (Object[]) Array.newInstance(componentType, dimensions.get(0));
for (int i = 0; i < array.length; i++) {
- List chunk = values.subList(i * chunkSize, (i + 1) * chunkSize);
+ List<?> chunk = values.subList(i * chunkSize, (i + 1) * chunkSize);
Object value = makeArray(chunk,
dimensions.subList(1, dimensions.size()),
componentType.getComponentType());
@@ -384,7 +384,7 @@ public class SoapArrayType extends Aegis
* When reading the type is solely determined by the required arrayType soap attribute.
*/
public AegisType getComponentType() {
- Class compType = getTypeClass().getComponentType();
+ Class<?> compType = getTypeClass().getComponentType();
AegisType type;
if (componentName == null) {
@@ -427,7 +427,7 @@ public class SoapArrayType extends Aegis
*/
private int getDimensions() {
int dimensions = 0;
- for (Class type = getTypeClass(); type.isArray(); type = type.getComponentType()) {
+ for (Class<?> type = getTypeClass(); type.isArray(); type = type.getComponentType()) {
dimensions++;
}
return dimensions;
Modified: cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/util/ServiceUtils.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/util/ServiceUtils.java?rev=1228268&r1=1228267&r2=1228268&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/util/ServiceUtils.java (original)
+++ cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/util/ServiceUtils.java Fri Jan 6 16:57:50 2012
@@ -66,9 +66,9 @@ public final class ServiceUtils {
sb.append('.');
sb.append(m.getName());
sb.append('(');
- Class[] params = m.getParameterTypes();
+ Class<?>[] params = m.getParameterTypes();
for (int i = 0; i < params.length; i++) {
- Class param = params[i];
+ Class<?> param = params[i];
sb.append(param.getName());
if (i < params.length - 1) {
sb.append(", ");
Modified: cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/util/jdom/StaxSerializer.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/util/jdom/StaxSerializer.java?rev=1228268&r1=1228267&r2=1228268&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/util/jdom/StaxSerializer.java (original)
+++ cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/util/jdom/StaxSerializer.java Fri Jan 6 16:57:50 2012
@@ -38,7 +38,7 @@ public class StaxSerializer {
public void writeDocument(Document doc, XMLStreamWriter writer) throws XMLStreamException {
writer.writeStartDocument("1.0");
- for (Iterator itr = doc.getContent().iterator(); itr.hasNext();) {
+ for (Iterator<?> itr = doc.getContent().iterator(); itr.hasNext();) {
Content content = (Content)itr.next();
if (content instanceof Element) {
@@ -63,8 +63,8 @@ public class StaxSerializer {
writer.writeStartElement(elPrefix, e.getName(), elUri);
- List namespaces = e.getAdditionalNamespaces();
- for (Iterator itr = namespaces.iterator(); itr.hasNext();) {
+ List<?> namespaces = e.getAdditionalNamespaces();
+ for (Iterator<?> itr = namespaces.iterator(); itr.hasNext();) {
Namespace ns = (Namespace)itr.next();
String prefix = ns.getPrefix();
@@ -78,7 +78,7 @@ public class StaxSerializer {
}
}
- for (Iterator itr = e.getAttributes().iterator(); itr.hasNext();) {
+ for (Iterator<?> itr = e.getAttributes().iterator(); itr.hasNext();) {
Attribute attr = (Attribute)itr.next();
String attPrefix = attr.getNamespacePrefix();
String attUri = attr.getNamespaceURI();
@@ -111,7 +111,7 @@ public class StaxSerializer {
}
}
- for (Iterator itr = e.getContent().iterator(); itr.hasNext();) {
+ for (Iterator<?> itr = e.getContent().iterator(); itr.hasNext();) {
Content n = (Content)itr.next();
if (n instanceof CDATA) {
writer.writeCData(n.getValue());
@@ -137,7 +137,7 @@ public class StaxSerializer {
* @throws XMLStreamException
*/
private boolean isDeclared(XMLStreamWriter writer, String prefix, String uri) throws XMLStreamException {
- for (Iterator pxs = writer.getNamespaceContext().getPrefixes(uri); pxs.hasNext();) {
+ for (Iterator<?> pxs = writer.getNamespaceContext().getPrefixes(uri); pxs.hasNext();) {
String px = (String)pxs.next();
if (px.equals(prefix)) {
return true;
Modified: cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/util/stax/JDOMNamespaceContext.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/util/stax/JDOMNamespaceContext.java?rev=1228268&r1=1228267&r2=1228268&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/util/stax/JDOMNamespaceContext.java (original)
+++ cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/util/stax/JDOMNamespaceContext.java Fri Jan 6 16:57:50 2012
@@ -62,9 +62,9 @@ public class JDOMNamespaceContext implem
return element.getNamespacePrefix();
}
- List namespaces = element.getAdditionalNamespaces();
+ List<?> namespaces = element.getAdditionalNamespaces();
- for (Iterator itr = namespaces.iterator(); itr.hasNext();) {
+ for (Iterator<?> itr = namespaces.iterator(); itr.hasNext();) {
Namespace ns = (Namespace)itr.next();
if (ns.getURI().equals(namespaceURI)) {
@@ -84,9 +84,9 @@ public class JDOMNamespaceContext implem
prefixes.add(element.getNamespacePrefix());
}
- List namespaces = element.getAdditionalNamespaces();
+ List<?> namespaces = element.getAdditionalNamespaces();
- for (Iterator itr = namespaces.iterator(); itr.hasNext();) {
+ for (Iterator<?> itr = namespaces.iterator(); itr.hasNext();) {
Namespace ns = (Namespace)itr.next();
if (ns.getURI().equals(namespaceURI)) {
Modified: cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/util/stax/JDOMStreamReader.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/util/stax/JDOMStreamReader.java?rev=1228268&r1=1228267&r2=1228268&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/util/stax/JDOMStreamReader.java (original)
+++ cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/util/stax/JDOMStreamReader.java Fri Jan 6 16:57:50 2012
@@ -124,7 +124,7 @@ public class JDOMStreamReader extends Ab
prefix2decNs = new HashMap<String, Namespace>();
namespaces.clear();
- for (Iterator itr = element.getAdditionalNamespaces().iterator(); itr.hasNext();) {
+ for (Iterator<?> itr = element.getAdditionalNamespaces().iterator(); itr.hasNext();) {
declare((Namespace)itr.next());
}
@@ -134,7 +134,7 @@ public class JDOMStreamReader extends Ab
declare(ns);
}
- for (Iterator itr = element.getAttributes().iterator(); itr.hasNext();) {
+ for (Iterator<?> itr = element.getAttributes().iterator(); itr.hasNext();) {
ns = ((Attribute)itr.next()).getNamespace();
if (shouldDeclare(ns)) {
declare(ns);
Modified: cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/util/stax/JDOMStreamWriter.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/util/stax/JDOMStreamWriter.java?rev=1228268&r1=1228267&r2=1228268&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/util/stax/JDOMStreamWriter.java (original)
+++ cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/util/stax/JDOMStreamWriter.java Fri Jan 6 16:57:50 2012
@@ -43,7 +43,7 @@ public class JDOMStreamWriter implements
private NamespaceContext context;
- private Map properties = new HashMap();
+ private Map<String, Object> properties = new HashMap<String, Object>();
public JDOMStreamWriter() {
}
Modified: cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/AbstractAegisTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/AbstractAegisTest.java?rev=1228268&r1=1228267&r2=1228268&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/AbstractAegisTest.java (original)
+++ cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/AbstractAegisTest.java Fri Jan 6 16:57:50 2012
@@ -129,35 +129,37 @@ public abstract class AbstractAegisTest
return invoke("local://" + service, LocalTransportFactory.TRANSPORT_ID, message);
}
- public Server createService(Class serviceClass, QName name) {
+ public Server createService(Class<?> serviceClass, QName name) {
return createService(serviceClass, null, name);
}
- public Server createService(Class serviceClass, Object serviceBean, QName name) {
+ public Server createService(Class<?> serviceClass, Object serviceBean, QName name) {
return createService(serviceClass, serviceBean, serviceClass.getSimpleName(), name);
}
- protected Server createService(Class serviceClass, QName name, AegisDatabinding binding) {
+ protected Server createService(Class<?> serviceClass, QName name, AegisDatabinding binding) {
return createService(serviceClass, serviceClass.getSimpleName(), name, binding);
}
- protected Server createService(Class serviceClass, String address, QName name, AegisDatabinding binding) {
+ protected Server createService(Class<?> serviceClass, String address, QName name,
+ AegisDatabinding binding) {
ServerFactoryBean sf = createServiceFactory(serviceClass, null, address, name, binding);
return sf.create();
}
- protected Server createService(Class serviceClass, String address) {
+ protected Server createService(Class<?> serviceClass, String address) {
ServerFactoryBean sf = createServiceFactory(serviceClass, null, address, null, null);
return sf.create();
}
- protected Server createService(Class serviceClass) {
+ protected Server createService(Class<?> serviceClass) {
ServerFactoryBean sf = createServiceFactory(serviceClass, null, serviceClass.getSimpleName(), null,
null);
return sf.create();
}
- protected Server createJaxwsService(Class serviceClass, Object serviceBean, String address, QName name) {
+ protected Server createJaxwsService(Class<?> serviceClass,
+ Object serviceBean, String address, QName name) {
if (address == null) {
address = serviceClass.getSimpleName();
}
@@ -179,18 +181,19 @@ public abstract class AbstractAegisTest
return serverFactoryBean.create();
}
- public Server createService(Class serviceClass, Object serviceBean, String address, QName name) {
+ public Server createService(Class<?> serviceClass, Object serviceBean, String address, QName name) {
ServerFactoryBean sf = createServiceFactory(serviceClass, serviceBean, address, name, null);
return sf.create();
}
- public Server createService(Class serviceClass, Object serviceBean, String address,
+ public Server createService(Class<?> serviceClass, Object serviceBean, String address,
AegisDatabinding binding) {
ServerFactoryBean sf = createServiceFactory(serviceClass, serviceBean, address, null, binding);
return sf.create();
}
- protected ServerFactoryBean createServiceFactory(Class serviceClass, Object serviceBean, String address,
+ protected ServerFactoryBean createServiceFactory(Class<?> serviceClass,
+ Object serviceBean, String address,
QName name, AegisDatabinding binding) {
ServerFactoryBean sf = new ServerFactoryBean();
sf.setServiceClass(serviceClass);
Modified: cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/inheritance/ExceptionInheritanceTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/inheritance/ExceptionInheritanceTest.java?rev=1228268&r1=1228267&r2=1228268&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/inheritance/ExceptionInheritanceTest.java (original)
+++ cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/inheritance/ExceptionInheritanceTest.java Fri Jan 6 16:57:50 2012
@@ -69,7 +69,7 @@ public class ExceptionInheritanceTest ex
}
@Override
- protected ServerFactoryBean createServiceFactory(Class serviceClass,
+ protected ServerFactoryBean createServiceFactory(Class<?> serviceClass,
Object serviceBean,
String address,
QName name,
Modified: cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/inheritance/ws1/WS1.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/inheritance/ws1/WS1.java?rev=1228268&r1=1228267&r2=1228268&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/inheritance/ws1/WS1.java (original)
+++ cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/inheritance/ws1/WS1.java Fri Jan 6 16:57:50 2012
@@ -35,8 +35,8 @@ public interface WS1 {
ResultBean getResultBean();
- Map echoMap(Map beans);
- Map echoRawMap(Map rawMap);
+ Map<?, ?> echoMap(Map<?, ?> beans);
+ Map<?, ?> echoRawMap(Map<?, ?> rawMap);
void throwException(boolean extendedOne) throws WS1Exception;
}
Modified: cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/inheritance/ws1/impl/WS1Impl.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/inheritance/ws1/impl/WS1Impl.java?rev=1228268&r1=1228267&r2=1228268&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/inheritance/ws1/impl/WS1Impl.java (original)
+++ cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/inheritance/ws1/impl/WS1Impl.java Fri Jan 6 16:57:50 2012
@@ -108,7 +108,7 @@ public class WS1Impl implements WS1 {
return resultBean;
}
- public Map echoMap(Map beans) {
+ public Map<?, ?> echoMap(Map<?, ?> beans) {
return beans;
}
@@ -122,7 +122,7 @@ public class WS1Impl implements WS1 {
}
}
- public Map echoRawMap(Map rawMap) {
+ public Map<?, ?> echoRawMap(Map<?, ?> rawMap) {
return rawMap;
}
}
Modified: cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/AnnotatedTypeTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/AnnotatedTypeTest.java?rev=1228268&r1=1228267&r2=1228268&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/AnnotatedTypeTest.java (original)
+++ cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/AnnotatedTypeTest.java Fri Jan 6 16:57:50 2012
@@ -64,9 +64,9 @@ public class AnnotatedTypeTest extends A
AnnotatedTypeInfo info = new AnnotatedTypeInfo(tm, AnnotatedBean1.class, "urn:foo",
new TypeCreationOptions());
- Iterator elements = info.getElements().iterator();
+ Iterator<QName> elements = info.getElements().iterator();
assertTrue(elements.hasNext());
- QName element = (QName)elements.next();
+ QName element = elements.next();
assertTrue(elements.hasNext());
AegisType custom = info.getType(element);
@@ -91,7 +91,7 @@ public class AnnotatedTypeTest extends A
fail("Unexpected element name: " + element.getLocalPart());
}
- Iterator atts = info.getAttributes().iterator();
+ Iterator<QName> atts = info.getAttributes().iterator();
assertTrue(atts.hasNext());
atts.next();
assertFalse(atts.hasNext());
@@ -110,9 +110,9 @@ public class AnnotatedTypeTest extends A
assertEquals(0, type.getTypeInfo().getAttributes().size());
- Iterator itr = type.getTypeInfo().getElements().iterator();
+ Iterator<QName> itr = type.getTypeInfo().getElements().iterator();
assertTrue(itr.hasNext());
- QName q = (QName)itr.next();
+ QName q = itr.next();
assertEquals("attProp", q.getLocalPart());
}
@@ -128,10 +128,10 @@ public class AnnotatedTypeTest extends A
public void testNillableAndMinOccurs() {
BeanType type = (BeanType)tm.getTypeCreator().createType(AnnotatedBean4.class);
AnnotatedTypeInfo info = (AnnotatedTypeInfo)type.getTypeInfo();
- Iterator elements = info.getElements().iterator();
+ Iterator<QName> elements = info.getElements().iterator();
assertTrue(elements.hasNext());
// nillable first
- QName element = (QName)elements.next();
+ QName element = elements.next();
if ("minOccursProperty".equals(element.getLocalPart())) {
assertEquals(1, info.getMinOccurs(element));
} else {
Modified: cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/CollectionService.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/CollectionService.java?rev=1228268&r1=1228267&r2=1228268&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/CollectionService.java (original)
+++ cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/CollectionService.java Fri Jan 6 16:57:50 2012
@@ -48,7 +48,7 @@ public class CollectionService implement
}
/** {@inheritDoc}*/
- public Collection getUnannotatedStrings() {
+ public Collection<?> getUnannotatedStrings() {
return null;
}
Modified: cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/CollectionServiceInterface.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/CollectionServiceInterface.java?rev=1228268&r1=1228267&r2=1228268&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/CollectionServiceInterface.java (original)
+++ cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/CollectionServiceInterface.java Fri Jan 6 16:57:50 2012
@@ -35,7 +35,7 @@ public interface CollectionServiceInterf
void setLongs(Collection<Long> longs);
- Collection getUnannotatedStrings();
+ Collection<?> getUnannotatedStrings();
Collection<Collection<String>> getStringCollections();
Modified: cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/CollectionTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/CollectionTest.java?rev=1228268&r1=1228267&r2=1228268&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/CollectionTest.java (original)
+++ cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/CollectionTest.java Fri Jan 6 16:57:50 2012
@@ -129,9 +129,9 @@ public class CollectionTest extends Abst
tm.setTypeCreator(creator);
AegisType dto = creator.createType(CollectionDTO.class);
- Set deps = dto.getDependencies();
+ Set<AegisType> deps = dto.getDependencies();
- AegisType type = (AegisType)deps.iterator().next();
+ AegisType type = deps.iterator().next();
assertTrue(type instanceof CollectionType);
@@ -152,11 +152,11 @@ public class CollectionTest extends Abst
tm.setTypeCreator(creator);
AegisType dto = creator.createType(ObjectDTO.class);
- Set deps = dto.getDependencies();
+ Set<AegisType> deps = dto.getDependencies();
assertFalse(deps.isEmpty());
- AegisType type = (AegisType)deps.iterator().next();
+ AegisType type = deps.iterator().next();
assertTrue(type instanceof CollectionType);
Modified: cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/JaxbTypeTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/JaxbTypeTest.java?rev=1228268&r1=1228267&r2=1228268&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/JaxbTypeTest.java (original)
+++ cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/JaxbTypeTest.java Fri Jan 6 16:57:50 2012
@@ -64,9 +64,9 @@ public class JaxbTypeTest extends Abstra
AnnotatedTypeInfo info = new AnnotatedTypeInfo(tm, JaxbBean1.class, "urn:foo",
new TypeCreationOptions());
- Iterator elements = info.getElements().iterator();
+ Iterator<QName> elements = info.getElements().iterator();
assertTrue(elements.hasNext());
- QName element = (QName)elements.next();
+ QName element = elements.next();
assertTrue(elements.hasNext());
AegisType custom = info.getType(element);
@@ -91,7 +91,7 @@ public class JaxbTypeTest extends Abstra
fail("Unexpected element name: " + element.getLocalPart());
}
- Iterator atts = info.getAttributes().iterator();
+ Iterator<QName> atts = info.getAttributes().iterator();
assertTrue(atts.hasNext());
atts.next();
assertFalse(atts.hasNext());
@@ -110,9 +110,9 @@ public class JaxbTypeTest extends Abstra
assertEquals(0, type.getTypeInfo().getAttributes().size());
- Iterator itr = type.getTypeInfo().getElements().iterator();
+ Iterator<QName> itr = type.getTypeInfo().getElements().iterator();
assertTrue(itr.hasNext());
- QName q = (QName)itr.next();
+ QName q = itr.next();
assertEquals("attProp", q.getLocalPart());
}
@@ -128,10 +128,10 @@ public class JaxbTypeTest extends Abstra
public void testNillableAndMinOccurs() {
BeanType type = (BeanType)tm.getTypeCreator().createType(JaxbBean4.class);
AnnotatedTypeInfo info = (AnnotatedTypeInfo)type.getTypeInfo();
- Iterator elements = info.getElements().iterator();
+ Iterator<QName> elements = info.getElements().iterator();
assertTrue(elements.hasNext());
// nillable first
- QName element = (QName)elements.next();
+ QName element = elements.next();
if ("minOccursProperty".equals(element.getLocalPart())) {
assertEquals(1, info.getMinOccurs(element));
} else {
Modified: cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/MapTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/MapTest.java?rev=1228268&r1=1228267&r2=1228268&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/MapTest.java (original)
+++ cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/MapTest.java Fri Jan 6 16:57:50 2012
@@ -129,9 +129,9 @@ public class MapTest extends AbstractAeg
tm.setTypeCreator(creator);
AegisType dto = creator.createType(MapDTO.class);
- Set deps = dto.getDependencies();
+ Set<AegisType> deps = dto.getDependencies();
- AegisType type = (AegisType)deps.iterator().next();
+ AegisType type = deps.iterator().next();
assertTrue(type instanceof MapType);
MapType mapType = (MapType)type;
Modified: cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/XFireTypeTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/XFireTypeTest.java?rev=1228268&r1=1228267&r2=1228268&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/XFireTypeTest.java (original)
+++ cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/XFireTypeTest.java Fri Jan 6 16:57:50 2012
@@ -64,9 +64,9 @@ public class XFireTypeTest extends Abstr
AnnotatedTypeInfo info = new AnnotatedTypeInfo(tm, XFireBean1.class, "urn:foo",
new TypeCreationOptions());
- Iterator elements = info.getElements().iterator();
+ Iterator<QName> elements = info.getElements().iterator();
assertTrue(elements.hasNext());
- QName element = (QName)elements.next();
+ QName element = elements.next();
assertTrue(elements.hasNext());
AegisType custom = info.getType(element);
@@ -91,7 +91,7 @@ public class XFireTypeTest extends Abstr
fail("Unexpected element name: " + element.getLocalPart());
}
- Iterator atts = info.getAttributes().iterator();
+ Iterator<QName> atts = info.getAttributes().iterator();
assertTrue(atts.hasNext());
atts.next();
assertFalse(atts.hasNext());
@@ -110,9 +110,9 @@ public class XFireTypeTest extends Abstr
assertEquals(0, type.getTypeInfo().getAttributes().size());
- Iterator itr = type.getTypeInfo().getElements().iterator();
+ Iterator<QName> itr = type.getTypeInfo().getElements().iterator();
assertTrue(itr.hasNext());
- QName q = (QName)itr.next();
+ QName q = itr.next();
assertEquals("attProp", q.getLocalPart());
}
@@ -128,10 +128,10 @@ public class XFireTypeTest extends Abstr
public void testNillableAndMinOccurs() {
BeanType type = (BeanType)tm.getTypeCreator().createType(XFireBean4.class);
AnnotatedTypeInfo info = (AnnotatedTypeInfo)type.getTypeInfo();
- Iterator elements = info.getElements().iterator();
+ Iterator<QName> elements = info.getElements().iterator();
assertTrue(elements.hasNext());
// nillable first
- QName element = (QName)elements.next();
+ QName element = elements.next();
if ("minOccursProperty".equals(element.getLocalPart())) {
assertEquals(1, info.getMinOccurs(element));
} else {
Modified: cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/map/fortest/MapTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/map/fortest/MapTest.java?rev=1228268&r1=1228267&r2=1228268&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/map/fortest/MapTest.java (original)
+++ cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/map/fortest/MapTest.java Fri Jan 6 16:57:50 2012
@@ -34,7 +34,7 @@ public interface MapTest {
ObjectWithAMap returnObjectWithAMap();
void takeMap(ObjectWithAMap map);
Map<String, Long> getMapStringToLong();
- Map getRawMapStringToInteger();
+ Map<?, ?> getRawMapStringToInteger();
Map<Long, String> getMapLongToString();
ObjectWithAMapNs2 returnObjectWithAMapNs2();
Modified: cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/map/fortest/MapTestImpl.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/map/fortest/MapTestImpl.java?rev=1228268&r1=1228267&r2=1228268&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/map/fortest/MapTestImpl.java (original)
+++ cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/map/fortest/MapTestImpl.java Fri Jan 6 16:57:50 2012
@@ -63,8 +63,8 @@ public class MapTestImpl implements MapT
public void takeMapNs2(ObjectWithAMapNs2 map) {
}
- @SuppressWarnings("unchecked")
- public Map getRawMapStringToInteger() {
+ @SuppressWarnings({ "unchecked", "rawtypes" })
+ public Map<?, ?> getRawMapStringToInteger() {
Map r = new HashMap();
r.put("key", new Integer(12));
return r;
Modified: cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java?rev=1228268&r1=1228267&r2=1228268&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java (original)
+++ cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java Fri Jan 6 16:57:50 2012
@@ -159,7 +159,7 @@ public class JAXBDataBinding extends Abs
}
}
- Class[] extraClass;
+ Class<?>[] extraClass;
JAXBContext context;
Set<Class<?>> contextClasses;
@@ -409,7 +409,7 @@ public class JAXBDataBinding extends Abs
throws JAXBException {
//add user extra class into jaxb context
if (extraClass != null && extraClass.length > 0) {
- for (Class clz : extraClass) {
+ for (Class<?> clz : extraClass) {
classes.add(clz);
}
}
@@ -676,7 +676,7 @@ public class JAXBDataBinding extends Abs
t = ((ParameterizedType)t).getActualTypeArguments()[0];
}
if (t instanceof Class) {
- pcls = (Class)t;
+ pcls = (Class<?>)t;
}
String methodName = "create" + wrapperType.getSimpleName()
Modified: cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBWrapperHelper.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBWrapperHelper.java?rev=1228268&r1=1228267&r2=1228268&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBWrapperHelper.java (original)
+++ cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBWrapperHelper.java Fri Jan 6 16:57:50 2012
@@ -55,7 +55,7 @@ public class JAXBWrapperHelper extends A
protected Object getValue(Method method, Object in) throws IllegalAccessException,
InvocationTargetException {
if ("javax.xml.bind.JAXBElement".equals(method.getReturnType().getCanonicalName())) {
- JAXBElement je = (JAXBElement)method.invoke(in);
+ JAXBElement<?> je = (JAXBElement<?>)method.invoke(in);
return je == null ? je : je.getValue();
} else {
return method.invoke(in);
Modified: cxf/trunk/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBEncoderDecoderTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBEncoderDecoderTest.java?rev=1228268&r1=1228267&r2=1228268&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBEncoderDecoderTest.java (original)
+++ cxf/trunk/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBEncoderDecoderTest.java Fri Jan 6 16:57:50 2012
@@ -282,7 +282,7 @@ public class JAXBEncoderDecoderTest exte
Unmarshaller um = context.createUnmarshaller();
Object val = um.unmarshal(reader, GreetMe.class);
assertTrue(val instanceof JAXBElement);
- val = ((JAXBElement)val).getValue();
+ val = ((JAXBElement<?>)val).getValue();
assertTrue(val instanceof GreetMe);
assertEquals(obj.getRequestType(),
((GreetMe)val).getRequestType());
@@ -455,7 +455,7 @@ public class JAXBEncoderDecoderTest exte
Unmarshaller um = context.createUnmarshaller();
Object val = um.unmarshal(reader, GreetMe.class);
assertTrue(val instanceof JAXBElement);
- val = ((JAXBElement)val).getValue();
+ val = ((JAXBElement<?>)val).getValue();
assertTrue(val instanceof GreetMe);
assertEquals(obj.getRequestType(),
((GreetMe)val).getRequestType());
Modified: cxf/trunk/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/io/XMLStreamDataWriterTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/io/XMLStreamDataWriterTest.java?rev=1228268&r1=1228267&r2=1228268&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/io/XMLStreamDataWriterTest.java (original)
+++ cxf/trunk/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/io/XMLStreamDataWriterTest.java Fri Jan 6 16:57:50 2012
@@ -224,7 +224,7 @@ public class XMLStreamDataWriterTest ext
assertEquals("TESTOUTPUTMESSAGE", reader.getText());
}
- private JAXBDataBinding getTestWriterFactory(Class... clz) throws Exception {
+ private JAXBDataBinding getTestWriterFactory(Class<?>... clz) throws Exception {
JAXBContext ctx = JAXBContext.newInstance(clz);
return new JAXBDataBinding(ctx);
}
Modified: cxf/trunk/rt/databinding/jibx/src/main/java/org/apache/cxf/jibx/JibxSimpleTypes.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/jibx/src/main/java/org/apache/cxf/jibx/JibxSimpleTypes.java?rev=1228268&r1=1228267&r2=1228268&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/jibx/src/main/java/org/apache/cxf/jibx/JibxSimpleTypes.java (original)
+++ cxf/trunk/rt/databinding/jibx/src/main/java/org/apache/cxf/jibx/JibxSimpleTypes.java Fri Jan 6 16:57:50 2012
@@ -151,7 +151,7 @@ public final class JibxSimpleTypes {
String serializeMethod = format.getSerializeMethod();
if (serializeMethod != null) {
String jtype = format.getTypeName();
- Class[] paraTypes = (JibxSimpleTypes.isPrimitiveType(jtype)) ? new Class[] {
+ Class<?>[] paraTypes = (JibxSimpleTypes.isPrimitiveType(jtype)) ? new Class[] {
JibxSimpleTypes.primitiveType(jtype)
} : new Class[] {
value.getClass()
Modified: cxf/trunk/rt/databinding/jibx/src/main/java/org/apache/cxf/jibx/JibxUtil.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/jibx/src/main/java/org/apache/cxf/jibx/JibxUtil.java?rev=1228268&r1=1228267&r2=1228268&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/jibx/src/main/java/org/apache/cxf/jibx/JibxUtil.java (original)
+++ cxf/trunk/rt/databinding/jibx/src/main/java/org/apache/cxf/jibx/JibxUtil.java Fri Jan 6 16:57:50 2012
@@ -145,7 +145,7 @@ public final class JibxUtil {
String serializeMethod = format.getSerializeMethod();
if (serializeMethod != null) {
String jtype = format.getTypeName();
- Class[] paraTypes = (JibxUtil.isPrimitiveType(jtype)) ? new Class[] {
+ Class<?>[] paraTypes = (JibxUtil.isPrimitiveType(jtype)) ? new Class[] {
JibxUtil.getPrimitiveType(jtype)
} : new Class[] {
value.getClass()
Modified: cxf/trunk/rt/databinding/xmlbeans/src/main/java/org/apache/cxf/xmlbeans/tools/XMLBeansToolingDataBinding.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/xmlbeans/src/main/java/org/apache/cxf/xmlbeans/tools/XMLBeansToolingDataBinding.java?rev=1228268&r1=1228267&r2=1228268&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/xmlbeans/src/main/java/org/apache/cxf/xmlbeans/tools/XMLBeansToolingDataBinding.java (original)
+++ cxf/trunk/rt/databinding/xmlbeans/src/main/java/org/apache/cxf/xmlbeans/tools/XMLBeansToolingDataBinding.java Fri Jan 6 16:57:50 2012
@@ -291,7 +291,7 @@ public class XMLBeansToolingDataBinding
private SchemaTypeSystem loadTypeSystem(String wsdlFile,
String[] configFiles,
- Set mdefNamespaces,
+ Set<?> mdefNamespaces,
File baseDir,
File schemasDir,
EntityResolver entResolver) {
Modified: cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/AnnotationUtils.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/AnnotationUtils.java?rev=1228268&r1=1228267&r2=1228268&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/AnnotationUtils.java (original)
+++ cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/AnnotationUtils.java Fri Jan 6 16:57:50 2012
@@ -59,9 +59,9 @@ public final class AnnotationUtils {
private static final Logger LOG = LogUtils.getL7dLogger(AnnotationUtils.class);
private static final ResourceBundle BUNDLE = BundleUtils.getBundle(AnnotationUtils.class);
- private static final Set<Class> CONTEXT_CLASSES;
- private static final Set<Class> PARAM_ANNOTATION_CLASSES;
- private static final Set<Class> METHOD_ANNOTATION_CLASSES;
+ private static final Set<Class<?>> CONTEXT_CLASSES;
+ private static final Set<Class<?>> PARAM_ANNOTATION_CLASSES;
+ private static final Set<Class<?>> METHOD_ANNOTATION_CLASSES;
static {
CONTEXT_CLASSES = initContextClasses();
PARAM_ANNOTATION_CLASSES = initParamAnnotationClasses();
@@ -72,8 +72,8 @@ public final class AnnotationUtils {
}
- private static Set<Class> initContextClasses() {
- Set<Class> classes = new HashSet<Class>();
+ private static Set<Class<?>> initContextClasses() {
+ Set<Class<?>> classes = new HashSet<Class<?>>();
classes.add(UriInfo.class);
classes.add(SecurityContext.class);
classes.add(HttpHeaders.class);
@@ -98,8 +98,8 @@ public final class AnnotationUtils {
return classes;
}
- private static Set<Class> initParamAnnotationClasses() {
- Set<Class> classes = new HashSet<Class>();
+ private static Set<Class<?>> initParamAnnotationClasses() {
+ Set<Class<?>> classes = new HashSet<Class<?>>();
classes.add(PathParam.class);
classes.add(QueryParam.class);
classes.add(MatrixParam.class);
@@ -109,8 +109,8 @@ public final class AnnotationUtils {
return classes;
}
- private static Set<Class> initMethodAnnotationClasses() {
- Set<Class> classes = new HashSet<Class>();
+ private static Set<Class<?>> initMethodAnnotationClasses() {
+ Set<Class<?>> classes = new HashSet<Class<?>>();
classes.add(HttpMethod.class);
classes.add(Path.class);
classes.add(Produces.class);
Modified: cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/InjectionUtils.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/InjectionUtils.java?rev=1228268&r1=1228267&r2=1228268&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/InjectionUtils.java (original)
+++ cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/InjectionUtils.java Fri Jan 6 16:57:50 2012
@@ -110,7 +110,7 @@ public final class InjectionUtils {
public static Type getSuperType(Class<?> serviceClass, TypeVariable var) {
int pos = 0;
- TypeVariable[] vars = var.getGenericDeclaration().getTypeParameters();
+ TypeVariable<?>[] vars = var.getGenericDeclaration().getTypeParameters();
for (; pos < vars.length; pos++) {
if (vars[pos].getName().equals(var.getName())) {
break;
@@ -153,11 +153,10 @@ public final class InjectionUtils {
return methodToInvoke;
}
- @SuppressWarnings("unchecked")
public static void injectFieldValue(final Field f,
final Object o,
final Object v) {
- AccessController.doPrivileged(new PrivilegedAction() {
+ AccessController.doPrivileged(new PrivilegedAction<Object>() {
public Object run() {
f.setAccessible(true);
try {
@@ -172,10 +171,9 @@ public final class InjectionUtils {
}
- @SuppressWarnings("unchecked")
public static Object extractFieldValue(final Field f,
final Object o) {
- return AccessController.doPrivileged(new PrivilegedAction() {
+ return AccessController.doPrivileged(new PrivilegedAction<Object>() {
public Object run() {
f.setAccessible(true);
try {
@@ -201,7 +199,7 @@ public final class InjectionUtils {
}
if (!ParameterizedType.class.isAssignableFrom(genericType.getClass())) {
if (genericType instanceof TypeVariable) {
- genericType = getType(((TypeVariable)genericType).getBounds(), pos);
+ genericType = getType(((TypeVariable<?>)genericType).getBounds(), pos);
} else if (genericType instanceof WildcardType) {
WildcardType wildcardType = (WildcardType)genericType;
Type[] bounds = wildcardType.getLowerBounds();
@@ -231,12 +229,12 @@ public final class InjectionUtils {
if (genericType == null) {
return null;
} else if (genericType instanceof Class) {
- return (Class) genericType;
+ return (Class<?>) genericType;
} else if (genericType instanceof ParameterizedType) {
ParameterizedType paramType = (ParameterizedType)genericType;
Type t = paramType.getRawType();
if (t instanceof Class) {
- return (Class)t;
+ return (Class<?>)t;
}
}
// it might be a TypeVariable, or a GenericArray.
@@ -570,7 +568,7 @@ public final class InjectionUtils {
if (first == null) {
return second;
} else if (first instanceof Map) {
- Map.class.cast(first).putAll((Map) second);
+ Map.class.cast(first).putAll((Map<?, ?>) second);
return first;
}
return null;
@@ -696,7 +694,7 @@ public final class InjectionUtils {
if (first == null) {
return second;
} else if (first instanceof Collection) {
- Collection.class.cast(first).addAll((Collection) second);
+ Collection.class.cast(first).addAll((Collection<?>) second);
return first;
} else {
int firstLen = Array.getLength(first);
@@ -874,7 +872,7 @@ public final class InjectionUtils {
return name.startsWith("javax.servlet.");
}
- private static ThreadLocalProxy createThreadLocalServletApiContext(String name) {
+ private static ThreadLocalProxy<?> createThreadLocalServletApiContext(String name) {
String proxyClassName = null;
if (HTTP_SERVLET_REQUEST_CLASS_NAME.equals(name)) {
proxyClassName = "org.apache.cxf.jaxrs.impl.tl.ThreadLocalHttpServletRequest";
@@ -886,7 +884,7 @@ public final class InjectionUtils {
proxyClassName = "org.apache.cxf.jaxrs.impl.tl.ThreadLocalServletConfig";
}
try {
- return (ThreadLocalProxy)ClassLoaderUtils.loadClass(proxyClassName, InjectionUtils.class)
+ return (ThreadLocalProxy<?>)ClassLoaderUtils.loadClass(proxyClassName, InjectionUtils.class)
.newInstance();
} catch (Throwable t) {
throw new RuntimeException(t);
@@ -913,7 +911,7 @@ public final class InjectionUtils {
}
for (Field f : cri.getResourceFields()) {
- ThreadLocalProxy proxy = cri.getResourceFieldProxy(f);
+ ThreadLocalProxy<?> proxy = cri.getResourceFieldProxy(f);
InjectionUtils.injectFieldValue(f, instance, proxy);
}
}
Modified: cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/AbstractWSDLBasedEndpointFactory.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/AbstractWSDLBasedEndpointFactory.java?rev=1228268&r1=1228267&r2=1228268&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/AbstractWSDLBasedEndpointFactory.java (original)
+++ cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/AbstractWSDLBasedEndpointFactory.java Fri Jan 6 16:57:50 2012
@@ -52,7 +52,7 @@ import org.apache.cxf.wsdl11.WSDLEndpoin
public abstract class AbstractWSDLBasedEndpointFactory extends AbstractEndpointFactory {
private static final Logger LOG = LogUtils.getL7dLogger(AbstractWSDLBasedEndpointFactory.class);
- private Class serviceClass;
+ private Class<?> serviceClass;
private ReflectionServiceFactoryBean serviceFactory;
protected AbstractWSDLBasedEndpointFactory(ReflectionServiceFactoryBean sbean) {
@@ -226,7 +226,7 @@ public abstract class AbstractWSDLBasedE
}
protected void initializeServiceFactory() {
- Class cls = getServiceClass();
+ Class<?> cls = getServiceClass();
serviceFactory.setServiceClass(cls);
serviceFactory.setBus(getBus());
Modified: cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ClientProxyFactoryBean.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ClientProxyFactoryBean.java?rev=1228268&r1=1228267&r2=1228268&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ClientProxyFactoryBean.java (original)
+++ cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ClientProxyFactoryBean.java Fri Jan 6 16:57:50 2012
@@ -168,7 +168,7 @@ public class ClientProxyFactoryBean exte
ClientProxy handler = clientClientProxy(c);
- Class classes[] = getImplementingClasses();
+ Class<?> classes[] = getImplementingClasses();
Object obj = Proxy.newProxyInstance(clientFactoryBean.getServiceClass().getClassLoader(),
classes,
Modified: cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/blueprint/ClientProxyFactoryBeanDefinitionParser.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/blueprint/ClientProxyFactoryBeanDefinitionParser.java?rev=1228268&r1=1228267&r2=1228268&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/blueprint/ClientProxyFactoryBeanDefinitionParser.java (original)
+++ cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/blueprint/ClientProxyFactoryBeanDefinitionParser.java Fri Jan 6 16:57:50 2012
@@ -32,7 +32,7 @@ public class ClientProxyFactoryBeanDefin
public ClientProxyFactoryBeanDefinitionParser() {
this(ClientProxyFactoryBean.class);
}
- public ClientProxyFactoryBeanDefinitionParser(Class cls) {
+ public ClientProxyFactoryBeanDefinitionParser(Class<?> cls) {
super(cls);
}
@Override
Modified: cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/blueprint/ServerFactoryBeanDefinitionParser.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/blueprint/ServerFactoryBeanDefinitionParser.java?rev=1228268&r1=1228267&r2=1228268&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/blueprint/ServerFactoryBeanDefinitionParser.java (original)
+++ cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/blueprint/ServerFactoryBeanDefinitionParser.java Fri Jan 6 16:57:50 2012
@@ -37,7 +37,7 @@ public class ServerFactoryBeanDefinition
public ServerFactoryBeanDefinitionParser() {
this(ServerFactoryBean.class);
}
- public ServerFactoryBeanDefinitionParser(Class cls) {
+ public ServerFactoryBeanDefinitionParser(Class<?> cls) {
super(cls);
}
Modified: cxf/trunk/rt/frontend/simple/src/test/java/org/apache/cxf/service/factory/HelloServiceProxyFactory.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/simple/src/test/java/org/apache/cxf/service/factory/HelloServiceProxyFactory.java?rev=1228268&r1=1228267&r2=1228268&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/simple/src/test/java/org/apache/cxf/service/factory/HelloServiceProxyFactory.java (original)
+++ cxf/trunk/rt/frontend/simple/src/test/java/org/apache/cxf/service/factory/HelloServiceProxyFactory.java Fri Jan 6 16:57:50 2012
@@ -21,14 +21,14 @@ package org.apache.cxf.service.factory;
import org.springframework.aop.framework.ProxyFactory;
import org.springframework.beans.factory.FactoryBean;
-public class HelloServiceProxyFactory implements FactoryBean {
+public class HelloServiceProxyFactory implements FactoryBean<Object> {
public Object getObject() throws Exception {
return new ProxyFactory(HelloService.class, new HelloServiceInterceptor()).getProxy();
}
- public Class getObjectType() {
+ public Class<?> getObjectType() {
return HelloServiceInterceptor.class;
}
Modified: cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/spring/JettyHTTPServerEngineBeanDefinitionParser.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/spring/JettyHTTPServerEngineBeanDefinitionParser.java?rev=1228268&r1=1228267&r2=1228268&view=diff
==============================================================================
--- cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/spring/JettyHTTPServerEngineBeanDefinitionParser.java (original)
+++ cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/spring/JettyHTTPServerEngineBeanDefinitionParser.java Fri Jan 6 16:57:50 2012
@@ -113,11 +113,11 @@ public class JettyHTTPServerEngineBeanDe
);
} else if ("connector".equals(name)) {
// only deal with the one connector here
- List list =
+ List<?> list =
ctx.getDelegate().parseListElement(elem, bean.getBeanDefinition());
bean.addPropertyValue("connector", list.get(0));
} else if ("handlers".equals(name)) {
- List handlers =
+ List<?> handlers =
ctx.getDelegate().parseListElement(elem, bean.getBeanDefinition());
bean.addPropertyValue("handlers", handlers);
} else if ("sessionSupport".equals(name) || "reuseAddress".equals(name)) {
Modified: cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/spring/JettyHTTPServerEngineFactoryBeanDefinitionParser.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/spring/JettyHTTPServerEngineFactoryBeanDefinitionParser.java?rev=1228268&r1=1228267&r2=1228268&view=diff
==============================================================================
--- cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/spring/JettyHTTPServerEngineFactoryBeanDefinitionParser.java (original)
+++ cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/spring/JettyHTTPServerEngineFactoryBeanDefinitionParser.java Fri Jan 6 16:57:50 2012
@@ -95,7 +95,7 @@ public class JettyHTTPServerEngineFactor
"createThreadingParametersMap"));
// parser the engine list
- List list =
+ List<Object> list =
getRequiredElementsList(element, ctx, new QName(HTTP_JETTY_NS, "engine"), bean);
if (list.size() > 0) {
bean.addPropertyValue("enginesList", list);
@@ -105,14 +105,13 @@ public class JettyHTTPServerEngineFactor
}
}
- @SuppressWarnings("unchecked")
- private List getRequiredElementsList(Element parent, ParserContext ctx, QName name,
+ private List<Object> getRequiredElementsList(Element parent, ParserContext ctx, QName name,
BeanDefinitionBuilder bean) {
List<Element> elemList = DOMUtils.findAllElementsByTagNameNS(parent,
name.getNamespaceURI(),
name.getLocalPart());
- ManagedList list = new ManagedList(elemList.size());
+ ManagedList<Object> list = new ManagedList<Object>(elemList.size());
list.setSource(ctx.extractSource(parent));
for (Element elem : elemList) {
Modified: cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestinationTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestinationTest.java?rev=1228268&r1=1228267&r2=1228268&view=diff
==============================================================================
--- cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestinationTest.java (original)
+++ cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestinationTest.java Fri Jan 6 16:57:50 2012
@@ -461,7 +461,7 @@ public class JettyHTTPDestinationTest ex
assertNotNull(refWithId.getReferenceParameters().getAny());
assertTrue("it is an element",
refWithId.getReferenceParameters().getAny().get(0) instanceof JAXBElement);
- JAXBElement el = (JAXBElement) refWithId.getReferenceParameters().getAny().get(0);
+ JAXBElement<?> el = (JAXBElement<?>) refWithId.getReferenceParameters().getAny().get(0);
assertEquals("match our id", el.getValue(), id);
}
Modified: cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPTransportFactory.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPTransportFactory.java?rev=1228268&r1=1228267&r2=1228268&view=diff
==============================================================================
--- cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPTransportFactory.java (original)
+++ cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPTransportFactory.java Fri Jan 6 16:57:50 2012
@@ -128,7 +128,7 @@ public class HTTPTransportFactory
List<?> ees
) {
if (ees != null) {
- for (Iterator itr = ees.iterator(); itr.hasNext();) {
+ for (Iterator<?> itr = ees.iterator(); itr.hasNext();) {
Object extensor = itr.next();
if (extensor instanceof HTTPAddress) {
Modified: cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/https/CertificateHostnameVerifier.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/https/CertificateHostnameVerifier.java?rev=1228268&r1=1228267&r2=1228268&view=diff
==============================================================================
--- cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/https/CertificateHostnameVerifier.java (original)
+++ cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/https/CertificateHostnameVerifier.java Fri Jan 6 16:57:50 2012
@@ -566,9 +566,9 @@ public interface CertificateHostnameVeri
cpe.printStackTrace();
}
if (c != null) {
- Iterator it = c.iterator();
+ Iterator<List<?>> it = c.iterator();
while (it.hasNext()) {
- List list = (List) it.next();
+ List<?> list = it.next();
int type = ((Integer) list.get(0)).intValue();
// If type is 2, then we've got a dNSName
if (type == 2) {