You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2012/01/06 16:22:59 UTC
svn commit: r1228228 [1/2] - in /cxf/trunk:
integration/jca/src/test/java/org/apache/cxf/jca/core/classloader/
integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/
rt/bindings/coloc/src/main/java/org/apache/cxf/binding/coloc/spring/
rt/bindin...
Author: dkulp
Date: Fri Jan 6 15:22:56 2012
New Revision: 1228228
URL: http://svn.apache.org/viewvc?rev=1228228&view=rev
Log:
Fix a bunch more warnings inside methods, private methods, and tests that can be ported back.
Modified:
cxf/trunk/integration/jca/src/test/java/org/apache/cxf/jca/core/classloader/PlugInClassLoaderTest.java
cxf/trunk/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/InvocationHandlerFactoryTest.java
cxf/trunk/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/InvokingInvocationHandlerTest.java
cxf/trunk/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/ObjectMethodInvocationHandlerTest.java
cxf/trunk/rt/bindings/coloc/src/main/java/org/apache/cxf/binding/coloc/spring/ColocBeanDefinitionParser.java
cxf/trunk/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/interceptors/CorbaStreamFaultOutInterceptor.java
cxf/trunk/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/interceptors/CorbaStreamInInterceptor.java
cxf/trunk/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/runtime/CorbaDSIServant.java
cxf/trunk/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/runtime/CorbaStreamWriter.java
cxf/trunk/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaObjectReferenceEventProducer.java
cxf/trunk/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/utils/CorbaObjectReferenceHelper.java
cxf/trunk/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/utils/CorbaUtils.java
cxf/trunk/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/XMLFormatValidator.java
cxf/trunk/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/wsdl11/XmlIoPlugin.java
cxf/trunk/rt/bindings/xml/src/test/java/org/apache/cxf/binding/xml/XMLBindingFactoryTest.java
cxf/trunk/rt/bindings/xml/src/test/java/org/apache/cxf/binding/xml/interceptor/TestBase.java
cxf/trunk/rt/bindings/xml/src/test/java/org/apache/cxf/binding/xml/interceptor/XMLMessageInInterceptorTest.java
cxf/trunk/rt/bindings/xml/src/test/java/org/apache/cxf/binding/xml/interceptor/XMLMessageOutInterceptorTest.java
cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/AegisXMLStreamDataWriter.java
cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/DefaultTypeMapping.java
cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/TypeUtil.java
cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/BeanType.java
cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/BeanTypeInfo.java
cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/encoded/ArrayTypeInfo.java
cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/EnumType.java
cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/inheritance/ExceptionInheritanceTest.java
cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/endpoint/dynamic/TypeClassInitializer.java
cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBContextInitializer.java
cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java
cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBSchemaInitializer.java
cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/attachment/JAXBAttachmentSchemaValidationHack.java
cxf/trunk/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBDataBindingTest.java
cxf/trunk/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/io/XMLStreamDataReaderTest.java
cxf/trunk/rt/databinding/jibx/src/main/java/org/apache/cxf/jibx/JibxDataWriter.java
cxf/trunk/rt/databinding/jibx/src/test/java/org/apache/cxf/jibx/AbstractJibxTest.java
cxf/trunk/rt/databinding/sdo/src/main/java/org/apache/cxf/sdo/SDODataBinding.java
cxf/trunk/rt/databinding/sdo/src/test/java/org/apache/cxf/sdo/AbstractSDOTest.java
cxf/trunk/rt/databinding/sdo/src/test/java/org/apache/cxf/sdo/HelloWorldDynamicTest.java
cxf/trunk/rt/databinding/sdo/src/test/java/org/apache/cxf/sdo/HelloWorldStaticTest.java
cxf/trunk/rt/databinding/xmlbeans/src/main/java/org/apache/cxf/xmlbeans/XmlBeansSchemaInitializer.java
cxf/trunk/rt/databinding/xmlbeans/src/test/java/org/apache/cxf/xmlbeans/AbstractXmlBeansTest.java
cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/RuntimeDelegateImpl.java
cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/AtomPojoProvider.java
cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/AbstractJAXWSMethodInvoker.java
cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/DispatchImpl.java
cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JAXWSMethodDispatcher.java
cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JAXWSMethodInvoker.java
cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxWsClientProxy.java
cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/blueprint/JAXWSBPNamespaceHandler.java
cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/context/WrappedMessageContext.java
cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/soap/SOAPMessageContextImpl.java
cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/HolderOutInterceptor.java
cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/spi/ProviderImpl.java
cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/spring/EndpointDefinitionParser.java
cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsImplementorInfo.java
cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ConfiguredEndpointTest.java
cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/JaxWsServerFactoryBeanTest.java
cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ServiceModelUtilsTest.java
cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/URIMappingInterceptorDocLitTest.java
cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/URIMappingInterceptorRPCTest.java
cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/WrapperClassGeneratorTest.java
cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/context/WebServiceContextImplTest.java
cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/dispatch/DispatchTest.java
cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/service/AnnotationInterceptorTest.java
cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/service/Test2Interceptor.java
cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/service/TestInterceptor.java
cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/support/ContextPropertiesMappingTest.java
cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBeanTest.java
cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ClientFactoryBean.java
cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/blueprint/SimpleBPNamespaceHandler.java
cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/spring/ServerFactoryBeanDefinitionParser.java
cxf/trunk/rt/frontend/simple/src/test/java/org/apache/cxf/service/factory/ClientFactoryBeanTest.java
cxf/trunk/rt/frontend/simple/src/test/java/org/apache/cxf/service/factory/ServerFactoryTest.java
cxf/trunk/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/JavascriptUtils.java
cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/spring/HttpConduitBeanDefinitionParser.java
cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/VersionTransformer.java
cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/blueprint/WsBPHandler.java
cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/attachment/external/EndpointReferenceDomainExpressionBuilder.java
cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/spring/PolicyBeanDefinitionParser.java
cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyBuilderTest.java
cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyExtensionsTest.java
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/SamlTokenInterceptor.java
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java
cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/FaultBeanTest.java
cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/JaxwsServiceBuilderTest.java
cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/ResponseWrapperTest.java
Modified: cxf/trunk/integration/jca/src/test/java/org/apache/cxf/jca/core/classloader/PlugInClassLoaderTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/integration/jca/src/test/java/org/apache/cxf/jca/core/classloader/PlugInClassLoaderTest.java?rev=1228228&r1=1228227&r2=1228228&view=diff
==============================================================================
--- cxf/trunk/integration/jca/src/test/java/org/apache/cxf/jca/core/classloader/PlugInClassLoaderTest.java (original)
+++ cxf/trunk/integration/jca/src/test/java/org/apache/cxf/jca/core/classloader/PlugInClassLoaderTest.java Fri Jan 6 15:22:56 2012
@@ -52,7 +52,7 @@ public class PlugInClassLoaderTest exten
@Test
public void testLoadClassWithPlugInClassLoader() throws Exception {
- Class resultClass = plugInClassLoader.loadClass(
+ Class<?> resultClass = plugInClassLoader.loadClass(
"org.apache.cxf.jca.dummy.Dummy");
assertEquals("wrong class", "org.apache.cxf.jca.dummy.Dummy",
resultClass.getName());
@@ -63,7 +63,7 @@ public class PlugInClassLoaderTest exten
@Test
public void testInheritsClassLoaderProtectionDomain()
throws Exception {
- Class resultClass = plugInClassLoader.loadClass(
+ Class<?> resultClass = plugInClassLoader.loadClass(
"org.apache.cxf.jca.dummy.Dummy");
ProtectionDomain pd1 = plugInClassLoader.getClass().getProtectionDomain();
ProtectionDomain pd2 = resultClass.getProtectionDomain();
@@ -75,7 +75,7 @@ public class PlugInClassLoaderTest exten
@Test
public void testLoadClassWithParentClassLoader() throws Exception {
- Class resultClass = plugInClassLoader.loadClass("org.omg.CORBA.ORB");
+ Class<?> resultClass = plugInClassLoader.loadClass("org.omg.CORBA.ORB");
assertEquals("wrong class", "org.omg.CORBA.ORB", resultClass.getName());
assertTrue("class loader must NOT be the plugInClassLoader",
!(plugInClassLoader.equals(resultClass.getClassLoader())));
@@ -102,7 +102,7 @@ public class PlugInClassLoaderTest exten
// ensure it is available
getClass().getClassLoader().loadClass(className);
try {
- Class claz = plugInClassLoader.loadClass(className);
+ Class<?> claz = plugInClassLoader.loadClass(className);
assertEquals("That should be same classloader ", claz.getClassLoader(),
getClass().getClassLoader());
@@ -114,7 +114,7 @@ public class PlugInClassLoaderTest exten
@Test
public void testLoadResourceWithPluginClassLoader()
throws Exception {
- Class resultClass = plugInClassLoader.loadClass(
+ Class<?> resultClass = plugInClassLoader.loadClass(
"org.apache.cxf.jca.dummy.Dummy");
URL url = resultClass.getResource("dummy.txt");
LOG.info("URL: " + url);
@@ -137,7 +137,7 @@ public class PlugInClassLoaderTest exten
@Test
public void testLoadSlashResourceWithPluginClassLoader()
throws Exception {
- Class resultClass = plugInClassLoader.loadClass(
+ Class<?> resultClass = plugInClassLoader.loadClass(
"org.apache.cxf.jca.dummy.Dummy");
URL url = resultClass.getResource("/META-INF/MANIFEST.MF");
LOG.info("URL: " + url);
@@ -159,7 +159,7 @@ public class PlugInClassLoaderTest exten
@Test
public void testLoadNonExistentResourceWithPluginClassLoader()
throws Exception {
- Class resultClass = plugInClassLoader.loadClass(
+ Class<?> resultClass = plugInClassLoader.loadClass(
"org.apache.cxf.jca.dummy.Dummy");
URL url = resultClass.getResource("foo.txt");
assertNull("url must be null. ", url);
Modified: cxf/trunk/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/InvocationHandlerFactoryTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/InvocationHandlerFactoryTest.java?rev=1228228&r1=1228227&r2=1228228&view=diff
==============================================================================
--- cxf/trunk/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/InvocationHandlerFactoryTest.java (original)
+++ cxf/trunk/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/InvocationHandlerFactoryTest.java Fri Jan 6 15:22:56 2012
@@ -62,7 +62,7 @@ public class InvocationHandlerFactoryTes
assertNotNull("handler must not be null", handler);
int count = 0;
- Set<Class> allHandlerTypes = new HashSet<Class>();
+ Set<Class<?>> allHandlerTypes = new HashSet<Class<?>>();
while (handler != null) {
@@ -85,10 +85,11 @@ public class InvocationHandlerFactoryTes
assertTrue("last handler must be an InvokingInvocationHandler",
last instanceof InvokingInvocationHandler);
- Class[] types = {ProxyInvocationHandler.class,
- ObjectMethodInvocationHandler.class,
- InvokingInvocationHandler.class,
- SecurityTestHandler.class};
+ Class<?>[] types
+ = {ProxyInvocationHandler.class,
+ ObjectMethodInvocationHandler.class,
+ InvokingInvocationHandler.class,
+ SecurityTestHandler.class};
for (int i = 0; i < types.length; i++) {
assertTrue("handler chain must contain type: " + types[i], allHandlerTypes.contains(types[i]));
Modified: cxf/trunk/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/InvokingInvocationHandlerTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/InvokingInvocationHandlerTest.java?rev=1228228&r1=1228227&r2=1228228&view=diff
==============================================================================
--- cxf/trunk/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/InvokingInvocationHandlerTest.java (original)
+++ cxf/trunk/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/InvokingInvocationHandlerTest.java Fri Jan 6 15:22:56 2012
@@ -45,7 +45,7 @@ public class InvokingInvocationHandlerTe
data = new CXFInvocationHandlerDataImpl();
data.setTarget(target);
handler = new InvokingInvocationHandler(data);
- Class[] interfaces = {TestInterface.class};
+ Class<?>[] interfaces = {TestInterface.class};
test = (TestInterface)Proxy.newProxyInstance(TestInterface.class.getClassLoader(), interfaces,
handler);
Modified: cxf/trunk/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/ObjectMethodInvocationHandlerTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/ObjectMethodInvocationHandlerTest.java?rev=1228228&r1=1228227&r2=1228228&view=diff
==============================================================================
--- cxf/trunk/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/ObjectMethodInvocationHandlerTest.java (original)
+++ cxf/trunk/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/ObjectMethodInvocationHandlerTest.java Fri Jan 6 15:22:56 2012
@@ -95,7 +95,7 @@ public class ObjectMethodInvocationHandl
@Test
public void testEqualsThroughProxies() {
- Class[] interfaces = {TestInterface.class};
+ Class<?>[] interfaces = {TestInterface.class};
CXFInvocationHandlerData data1 = new CXFInvocationHandlerDataImpl();
CXFInvocationHandlerData data2 = new CXFInvocationHandlerDataImpl();
data1.setTarget(new TestTarget());
Modified: cxf/trunk/rt/bindings/coloc/src/main/java/org/apache/cxf/binding/coloc/spring/ColocBeanDefinitionParser.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/coloc/src/main/java/org/apache/cxf/binding/coloc/spring/ColocBeanDefinitionParser.java?rev=1228228&r1=1228227&r2=1228228&view=diff
==============================================================================
--- cxf/trunk/rt/bindings/coloc/src/main/java/org/apache/cxf/binding/coloc/spring/ColocBeanDefinitionParser.java (original)
+++ cxf/trunk/rt/bindings/coloc/src/main/java/org/apache/cxf/binding/coloc/spring/ColocBeanDefinitionParser.java Fri Jan 6 15:22:56 2012
@@ -26,7 +26,7 @@ import org.springframework.beans.factory
public class ColocBeanDefinitionParser extends AbstractSimpleBeanDefinitionParser {
@Override
- protected Class getBeanClass(Element arg0) {
+ protected Class<?> getBeanClass(Element arg0) {
return ColocFeature.class;
}
Modified: cxf/trunk/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/interceptors/CorbaStreamFaultOutInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/interceptors/CorbaStreamFaultOutInterceptor.java?rev=1228228&r1=1228227&r2=1228228&view=diff
==============================================================================
--- cxf/trunk/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/interceptors/CorbaStreamFaultOutInterceptor.java (original)
+++ cxf/trunk/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/interceptors/CorbaStreamFaultOutInterceptor.java Fri Jan 6 15:22:56 2012
@@ -138,12 +138,12 @@ public class CorbaStreamFaultOutIntercep
String opName = message.getExchange().get(String.class);
- Iterator iter = bInfo.getOperations().iterator();
+ Iterator<BindingOperationInfo> iter = bInfo.getOperations().iterator();
BindingOperationInfo bopInfo = null;
OperationType opType = null;
while (iter.hasNext()) {
- bopInfo = (BindingOperationInfo)iter.next();
+ bopInfo = iter.next();
if (bopInfo.getName().getLocalPart().equals(opName)) {
opType = bopInfo.getExtensor(OperationType.class);
break;
@@ -252,7 +252,7 @@ public class CorbaStreamFaultOutIntercep
// This creates a default instance of the class representing the exception schema type if
// one has not been created on the servant side which throws the UserException.
if (fault == null) {
- Class faultClass = faultMethod.getReturnType();
+ Class<?> faultClass = faultMethod.getReturnType();
fault = faultClass.newInstance();
}
Modified: cxf/trunk/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/interceptors/CorbaStreamInInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/interceptors/CorbaStreamInInterceptor.java?rev=1228228&r1=1228227&r2=1228228&view=diff
==============================================================================
--- cxf/trunk/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/interceptors/CorbaStreamInInterceptor.java (original)
+++ cxf/trunk/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/interceptors/CorbaStreamInInterceptor.java Fri Jan 6 15:22:56 2012
@@ -153,12 +153,12 @@ public class CorbaStreamInInterceptor ex
BindingInfo bInfo = destination.getBindingInfo();
InterfaceInfo info = bInfo.getInterface();
String opName = exchange.get(String.class);
- Iterator i = bInfo.getOperations().iterator();
+ Iterator<BindingOperationInfo> i = bInfo.getOperations().iterator();
OperationType opType = null;
BindingOperationInfo bopInfo = null;
QName opQName = null;
while (i.hasNext()) {
- bopInfo = (BindingOperationInfo)i.next();
+ bopInfo = i.next();
if (bopInfo.getName().getLocalPart().equals(opName)) {
opType = bopInfo.getExtensor(OperationType.class);
opQName = bopInfo.getName();
Modified: cxf/trunk/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/runtime/CorbaDSIServant.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/runtime/CorbaDSIServant.java?rev=1228228&r1=1228227&r2=1228228&view=diff
==============================================================================
--- cxf/trunk/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/runtime/CorbaDSIServant.java (original)
+++ cxf/trunk/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/runtime/CorbaDSIServant.java Fri Jan 6 15:22:56 2012
@@ -101,7 +101,7 @@ public class CorbaDSIServant extends Dyn
// Build the list of CORBA operations and the WSDL operations they map to. Note that
// the WSDL operation name may not always match the CORBA operation name.
BindingInfo bInfo = destination.getBindingInfo();
- Iterator i = bInfo.getOperations().iterator();
+ Iterator<BindingOperationInfo> i = bInfo.getOperations().iterator();
operationMap = new HashMap<String, QName>(bInfo.getOperations().size());
Modified: cxf/trunk/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/runtime/CorbaStreamWriter.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/runtime/CorbaStreamWriter.java?rev=1228228&r1=1228227&r2=1228228&view=diff
==============================================================================
--- cxf/trunk/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/runtime/CorbaStreamWriter.java (original)
+++ cxf/trunk/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/runtime/CorbaStreamWriter.java Fri Jan 6 15:22:56 2012
@@ -343,8 +343,7 @@ public class CorbaStreamWriter implement
}
public String getPrefix(String namespaceURI) {
- for (Iterator iter = map.entrySet().iterator(); iter.hasNext();) {
- Map.Entry entry = (Map.Entry) iter.next();
+ for (Map.Entry<String, String> entry: map.entrySet()) {
if (namespaceURI.equals(entry.getValue())) {
return (String) entry.getKey();
}
@@ -355,7 +354,7 @@ public class CorbaStreamWriter implement
return null;
}
- public Iterator getPrefixes(String namespaceURI) {
+ public Iterator<String> getPrefixes(String namespaceURI) {
Set<String> set = new HashSet<String>();
for (Map.Entry<String, String> entry : map.entrySet()) {
if (namespaceURI.equals(entry.getValue())) {
@@ -363,7 +362,7 @@ public class CorbaStreamWriter implement
}
}
if (parent != null) {
- Iterator iter = parent.getPrefixes(namespaceURI);
+ Iterator<?> iter = parent.getPrefixes(namespaceURI);
while (iter.hasNext()) {
set.add((String)iter.next());
}
Modified: cxf/trunk/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaObjectReferenceEventProducer.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaObjectReferenceEventProducer.java?rev=1228228&r1=1228227&r2=1228228&view=diff
==============================================================================
--- cxf/trunk/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaObjectReferenceEventProducer.java (original)
+++ cxf/trunk/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaObjectReferenceEventProducer.java Fri Jan 6 15:22:56 2012
@@ -20,9 +20,7 @@ package org.apache.cxf.binding.corba.typ
import java.util.ArrayList;
import java.util.Collection;
-import java.util.Iterator;
import java.util.List;
-import java.util.Map;
import java.util.logging.Level;
import java.util.logging.Logger;
@@ -39,6 +37,7 @@ import org.apache.cxf.binding.corba.util
import org.apache.cxf.binding.corba.utils.EprMetaData;
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.common.util.StringUtils;
+import org.apache.cxf.helpers.CastUtils;
import org.apache.cxf.service.model.ServiceInfo;
import org.apache.cxf.wsdl11.WSDLServiceBuilder;
import org.omg.CORBA.ORB;
@@ -144,10 +143,8 @@ public final class CorbaObjectReferenceE
// get the list of all bindings and compare their local parts against our name.
if (wsdlBinding == null && bindingName.getNamespaceURI().equals("")
&& !bindingName.getLocalPart().equals("")) {
- Map bindings = wsdlDef.getBindings();
- Collection bindingsCollection = bindings.values();
- for (Iterator i = bindingsCollection.iterator(); i.hasNext();) {
- Binding b = (Binding)i.next();
+ Collection<Binding> bindingsCollection = CastUtils.cast(wsdlDef.getBindings().values());
+ for (Binding b: bindingsCollection) {
if (b.getQName().getLocalPart().equals(bindingName.getLocalPart())) {
wsdlBinding = b;
break;
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=1228228&r1=1228227&r2=1228228&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 15:22:56 2012
@@ -35,6 +35,7 @@ import javax.xml.namespace.QName;
import org.apache.cxf.binding.corba.wsdl.BindingType;
import org.apache.cxf.common.logging.LogUtils;
+import org.apache.cxf.helpers.CastUtils;
import org.omg.CORBA.Object;
public final class CorbaObjectReferenceHelper {
@@ -55,12 +56,10 @@ public final class CorbaObjectReferenceH
public static QName getServiceName(Binding binding, Definition wsdlDef) {
LOG.log(Level.FINE, "Getting service name for an object reference");
- 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(binding)) {
return serv.getQName();
}
@@ -71,12 +70,10 @@ public final class CorbaObjectReferenceH
public static String getEndpointName(Binding binding, Definition wsdlDef) {
LOG.log(Level.FINE, "Getting endpoint name for an object reference");
- 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(binding)) {
return pt.getName();
}
Modified: cxf/trunk/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/utils/CorbaUtils.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/utils/CorbaUtils.java?rev=1228228&r1=1228227&r2=1228228&view=diff
==============================================================================
--- cxf/trunk/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/utils/CorbaUtils.java (original)
+++ cxf/trunk/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/utils/CorbaUtils.java Fri Jan 6 15:22:56 2012
@@ -204,7 +204,7 @@ public final class CorbaUtils {
} else if (obj instanceof Enum) {
Enum enumType = (Enum)obj;
String name = enumType.getName();
- List enums = enumType.getEnumerator();
+ List<Enumerator> enums = enumType.getEnumerator();
String[] members = new String[enums.size()];
for (int i = 0; i < members.length; ++i) {
@@ -216,7 +216,7 @@ public final class CorbaUtils {
Exception exceptType = (Exception)obj;
// TODO: check to see if this is a recursive type.
- List list = exceptType.getMember();
+ List<MemberType> list = exceptType.getMember();
StructMember[] members = new StructMember[list.size()];
for (int i = 0; i < members.length; ++i) {
MemberType member = (MemberType) list.get(i);
@@ -250,7 +250,7 @@ public final class CorbaUtils {
tc = orb.create_recursive_tc(structType.getRepositoryID());
} else {
seenTypes.push(new QName(structType.getName()));
- List list = structType.getMember();
+ List<MemberType> list = structType.getMember();
StructMember[] members = new StructMember[list.size()];
for (int i = 0; i < members.length; ++i) {
MemberType member = (MemberType) list.get(i);
Modified: cxf/trunk/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/XMLFormatValidator.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/XMLFormatValidator.java?rev=1228228&r1=1228227&r2=1228228&view=diff
==============================================================================
--- cxf/trunk/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/XMLFormatValidator.java (original)
+++ cxf/trunk/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/XMLFormatValidator.java Fri Jan 6 15:22:56 2012
@@ -78,7 +78,7 @@ public class XMLFormatValidator extends
+ "):BindingOperation(" + bo.getName() + ")";
List<ExtensibilityElement> inExtensors =
bo.getInput().getExtensors(ExtensibilityElement.class);
- Iterator itIn = null;
+ Iterator<ExtensibilityElement> itIn = null;
if (inExtensors != null) {
itIn = inExtensors.iterator();
}
@@ -95,7 +95,7 @@ public class XMLFormatValidator extends
if (needRootNode) {
List<ExtensibilityElement> outExtensors =
bo.getOutput().getExtensors(ExtensibilityElement.class);
- Iterator itOut = null;
+ Iterator<ExtensibilityElement> itOut = null;
if (outExtensors != null) {
itOut = outExtensors.iterator();
}
@@ -111,9 +111,11 @@ public class XMLFormatValidator extends
return true;
}
- private boolean findXMLFormatRootNode(Iterator it, BindingOperationInfo bo, String errorPath) {
+ private boolean findXMLFormatRootNode(Iterator<ExtensibilityElement> it,
+ BindingOperationInfo bo,
+ String errorPath) {
while (it != null && it.hasNext()) {
- Object ext = it.next();
+ ExtensibilityElement ext = it.next();
if (ext instanceof XMLBindingMessageFormat) {
XMLBindingMessageFormat xmlFormat = (XMLBindingMessageFormat)ext;
if (xmlFormat.getRootNode() == null) {
Modified: cxf/trunk/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/wsdl11/XmlIoPlugin.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/wsdl11/XmlIoPlugin.java?rev=1228228&r1=1228227&r2=1228228&view=diff
==============================================================================
--- cxf/trunk/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/wsdl11/XmlIoPlugin.java (original)
+++ cxf/trunk/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/wsdl11/XmlIoPlugin.java Fri Jan 6 15:22:56 2012
@@ -33,7 +33,7 @@ public final class XmlIoPlugin extends A
public ExtensibilityElement createExtension(final Map<String, Object> args) throws WSDLException {
XMLBindingMessageFormat xmlFormat = null;
- Class clz = getOption(args, Class.class);
+ Class<?> clz = getOption(args, Class.class);
QName qname = getOption(args, QName.class);
xmlFormat = (XMLBindingMessageFormat)registry.createExtension(clz, ToolConstants.XML_FORMAT);
Modified: cxf/trunk/rt/bindings/xml/src/test/java/org/apache/cxf/binding/xml/XMLBindingFactoryTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/xml/src/test/java/org/apache/cxf/binding/xml/XMLBindingFactoryTest.java?rev=1228228&r1=1228227&r2=1228228&view=diff
==============================================================================
--- cxf/trunk/rt/bindings/xml/src/test/java/org/apache/cxf/binding/xml/XMLBindingFactoryTest.java (original)
+++ cxf/trunk/rt/bindings/xml/src/test/java/org/apache/cxf/binding/xml/XMLBindingFactoryTest.java Fri Jan 6 15:22:56 2012
@@ -22,6 +22,7 @@ package org.apache.cxf.binding.xml;
import org.apache.cxf.binding.Binding;
import org.apache.cxf.interceptor.AttachmentInInterceptor;
import org.apache.cxf.interceptor.Interceptor;
+import org.apache.cxf.message.Message;
import org.apache.cxf.service.model.BindingInfo;
import org.junit.Assert;
import org.junit.Test;
@@ -34,7 +35,7 @@ public class XMLBindingFactoryTest exten
Binding b = xbf.createBinding(new BindingInfo(null, null));
boolean found = false;
- for (Interceptor interseptor : b.getInInterceptors()) {
+ for (Interceptor<? extends Message> interseptor : b.getInInterceptors()) {
if (interseptor instanceof AttachmentInInterceptor) {
found = true;
}
Modified: cxf/trunk/rt/bindings/xml/src/test/java/org/apache/cxf/binding/xml/interceptor/TestBase.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/xml/src/test/java/org/apache/cxf/binding/xml/interceptor/TestBase.java?rev=1228228&r1=1228227&r2=1228228&view=diff
==============================================================================
--- cxf/trunk/rt/bindings/xml/src/test/java/org/apache/cxf/binding/xml/interceptor/TestBase.java (original)
+++ cxf/trunk/rt/bindings/xml/src/test/java/org/apache/cxf/binding/xml/interceptor/TestBase.java Fri Jan 6 15:22:56 2012
@@ -113,7 +113,7 @@ public class TestBase extends Assert {
return null;
}
- protected void common(String wsdl, QName portName, Class... jaxbClasses) throws Exception {
+ protected void common(String wsdl, QName portName, Class<?>... jaxbClasses) throws Exception {
control = EasyMock.createNiceControl();
bus = control.createMock(Bus.class);
Modified: cxf/trunk/rt/bindings/xml/src/test/java/org/apache/cxf/binding/xml/interceptor/XMLMessageInInterceptorTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/xml/src/test/java/org/apache/cxf/binding/xml/interceptor/XMLMessageInInterceptorTest.java?rev=1228228&r1=1228227&r2=1228228&view=diff
==============================================================================
--- cxf/trunk/rt/bindings/xml/src/test/java/org/apache/cxf/binding/xml/interceptor/XMLMessageInInterceptorTest.java (original)
+++ cxf/trunk/rt/bindings/xml/src/test/java/org/apache/cxf/binding/xml/interceptor/XMLMessageInInterceptorTest.java Fri Jan 6 15:22:56 2012
@@ -57,7 +57,7 @@ public class XMLMessageInInterceptorTest
in.handleMessage(xmlMessage);
docLitIn.handleMessage(xmlMessage);
- List list = xmlMessage.getContent(List.class);
+ List<?> list = xmlMessage.getContent(List.class);
assertNotNull(list);
assertEquals("expect 2 param", 2, list.size());
assertEquals("method input in2 is MyComplexStructType", true,
@@ -76,7 +76,7 @@ public class XMLMessageInInterceptorTest
in.handleMessage(xmlMessage);
docLitIn.handleMessage(xmlMessage);
- List list = xmlMessage.getContent(List.class);
+ List<?> list = xmlMessage.getContent(List.class);
assertNotNull(list);
assertEquals("expect 1 param", 1, list.size());
assertEquals("method input me is String tli", true, ((String) list.get(0)).indexOf("tli") >= 0);
@@ -94,7 +94,7 @@ public class XMLMessageInInterceptorTest
in.handleMessage(xmlMessage);
docLitIn.handleMessage(xmlMessage);
- List list = xmlMessage.getContent(List.class);
+ List<?> list = xmlMessage.getContent(List.class);
assertNotNull(list);
assertEquals("expect 1 param", 1, list.size());
assertEquals("method input me is String tli", true, list.get(0) instanceof GreetMe);
Modified: cxf/trunk/rt/bindings/xml/src/test/java/org/apache/cxf/binding/xml/interceptor/XMLMessageOutInterceptorTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/xml/src/test/java/org/apache/cxf/binding/xml/interceptor/XMLMessageOutInterceptorTest.java?rev=1228228&r1=1228227&r2=1228228&view=diff
==============================================================================
--- cxf/trunk/rt/bindings/xml/src/test/java/org/apache/cxf/binding/xml/interceptor/XMLMessageOutInterceptorTest.java (original)
+++ cxf/trunk/rt/bindings/xml/src/test/java/org/apache/cxf/binding/xml/interceptor/XMLMessageOutInterceptorTest.java Fri Jan 6 15:22:56 2012
@@ -176,7 +176,7 @@ public class XMLMessageOutInterceptorTes
assertEquals(greetMe.getRequestType(), dxr.getText());
}
- private void prepareMessage(List paramsList) throws Exception {
+ private void prepareMessage(List<?> paramsList) throws Exception {
outputStream = new ByteArrayOutputStream();
// all test case here use input message to do test,
// that means the out interceptor's role is Server-Out
Modified: cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/AegisXMLStreamDataWriter.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/AegisXMLStreamDataWriter.java?rev=1228228&r1=1228227&r2=1228228&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/AegisXMLStreamDataWriter.java (original)
+++ cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/AegisXMLStreamDataWriter.java Fri Jan 6 15:22:56 2012
@@ -112,7 +112,7 @@ public class AegisXMLStreamDataWriter ex
java.lang.reflect.Type objectType) throws Exception {
AegisType aegisType = null;
if (objectType instanceof Class) {
- aegisType = getContext().getTypeMapping().getType((Class)objectType);
+ aegisType = getContext().getTypeMapping().getType((Class<?>)objectType);
}
if (aegisType == null) {
TypeCreator creator = getContext().getTypeMapping().getTypeCreator();
Modified: cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/DefaultTypeMapping.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/DefaultTypeMapping.java?rev=1228228&r1=1228227&r2=1228228&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/DefaultTypeMapping.java (original)
+++ cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/DefaultTypeMapping.java Fri Jan 6 15:22:56 2012
@@ -205,7 +205,8 @@ public class DefaultTypeMapping implemen
return nextTM;
}
- private static void defaultRegister(TypeMapping tm, boolean defaultNillable, Class class1, QName name,
+ private static void defaultRegister(TypeMapping tm, boolean defaultNillable, Class<?> class1,
+ QName name,
AegisType type) {
if (!defaultNillable) {
type.setNillable(false);
Modified: cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/TypeUtil.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/TypeUtil.java?rev=1228228&r1=1228227&r2=1228228&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/TypeUtil.java (original)
+++ cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/TypeUtil.java Fri Jan 6 15:22:56 2012
@@ -198,7 +198,7 @@ public final class TypeUtil {
*/
public static Class<?> getTypeClass(Type type, boolean throwForNonClass) {
if (type instanceof Class) {
- return (Class) type;
+ return (Class<?>) type;
} else if (throwForNonClass) {
throw new RuntimeException("Attempt to derive Class from reflection Type " + type);
} else {
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=1228228&r1=1228227&r2=1228228&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 Fri Jan 6 15:22:56 2012
@@ -105,7 +105,7 @@ public class BeanType extends AegisType
BeanTypeInfo inf = getTypeInfo();
try {
- Class clazz = getTypeClass();
+ Class<?> clazz = getTypeClass();
Object object;
// the target for properties; either the object or the proxy handler
Object target;
@@ -294,7 +294,7 @@ public class BeanType extends AegisType
}
}
- Class propertyType = desc.getPropertyType();
+ Class<?> propertyType = desc.getPropertyType();
if ((property == null && !propertyType.isPrimitive()) || (property != null)) {
m.invoke(object, new Object[] {
property
@@ -573,7 +573,7 @@ public class BeanType extends AegisType
*/
public AegisType getSuperType() {
BeanTypeInfo inf = getTypeInfo();
- Class c = inf.getTypeClass();
+ Class<?> c = inf.getTypeClass();
if (c.isInterface() && c.getInterfaces().length == 1) {
c = c.getInterfaces()[0];
} else {
@@ -635,7 +635,7 @@ public class BeanType extends AegisType
StringBuilder sb = new StringBuilder();
sb.append(getClass().getName());
sb.append(": [class=");
- Class c = getTypeClass();
+ Class<?> c = getTypeClass();
sb.append((c == null) ? "<null>" : c.getName());
sb.append(",\nQName=");
QName q = getSchemaType();
Modified: cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/BeanTypeInfo.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/BeanTypeInfo.java?rev=1228228&r1=1228227&r2=1228228&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/BeanTypeInfo.java (original)
+++ cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/BeanTypeInfo.java Fri Jan 6 15:22:56 2012
@@ -326,7 +326,7 @@ public class BeanTypeInfo {
classes.add(clazz);
try {
- Class[] interfaces = clazz.getInterfaces();
+ Class<?>[] interfaces = clazz.getInterfaces();
/**
* add base interface information
Modified: cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/encoded/ArrayTypeInfo.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/encoded/ArrayTypeInfo.java?rev=1228228&r1=1228227&r2=1228228&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/encoded/ArrayTypeInfo.java (original)
+++ cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/encoded/ArrayTypeInfo.java Fri Jan 6 15:22:56 2012
@@ -75,7 +75,7 @@ public class ArrayTypeInfo {
type = tm.getType(typeName);
if (ranks > 0) {
- Class componentType = type.getTypeClass();
+ Class<?> componentType = type.getTypeClass();
for (int i = 1; i < ranks + dimensions.size(); i++) {
componentType = Array.newInstance(componentType, 0).getClass();
}
Modified: cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/EnumType.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/EnumType.java?rev=1228228&r1=1228227&r2=1228228&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/EnumType.java (original)
+++ cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/EnumType.java Fri Jan 6 15:22:56 2012
@@ -38,8 +38,9 @@ public class EnumType extends AegisType
@Override
public Object readObject(MessageReader reader, Context context) {
String value = reader.getValue();
-
- return Enum.valueOf(getTypeClass(), value.trim());
+ @SuppressWarnings("rawtypes")
+ Class<? extends Enum> cls = (Class<? extends Enum>)getTypeClass();
+ return Enum.valueOf(cls, value.trim());
}
@Override
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=1228228&r1=1228227&r2=1228228&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 15:22:56 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/jaxb/src/main/java/org/apache/cxf/endpoint/dynamic/TypeClassInitializer.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/endpoint/dynamic/TypeClassInitializer.java?rev=1228228&r1=1228227&r2=1228228&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/endpoint/dynamic/TypeClassInitializer.java (original)
+++ cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/endpoint/dynamic/TypeClassInitializer.java Fri Jan 6 15:22:56 2012
@@ -123,7 +123,7 @@ public class TypeClassInitializer extend
throw new ServiceConstructionException(new Message("NO_JAXB_CLASSMapping", LOG, name));
}
- Class cls;
+ Class<?> cls;
try {
int arrayCount = 0;
@@ -166,12 +166,12 @@ public class TypeClassInitializer extend
super.begin(part);
}
- private Class<?> createFaultClass(Class cls) {
+ private Class<?> createFaultClass(Class<?> cls) {
return new ExceptionCreator().createExceptionClass(cls);
}
- private Class getClassByName(JType jType) throws ClassNotFoundException {
- Class cls;
+ private Class<?> getClassByName(JType jType) throws ClassNotFoundException {
+ Class<?> cls;
if (!jType.isPrimitive()) {
cls = ClassLoaderUtils.loadClass(jType.binaryName(), getClass());
Modified: cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBContextInitializer.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBContextInitializer.java?rev=1228228&r1=1228227&r2=1228228&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBContextInitializer.java (original)
+++ cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBContextInitializer.java Fri Jan 6 15:22:56 2012
@@ -114,8 +114,8 @@ class JAXBContextInitializer extends Ser
boolean isList = Collection.class.isAssignableFrom(clazz);
if (isFromWrapper) {
if (genericType instanceof Class
- && ((Class)genericType).isArray()) {
- Class cl2 = (Class)genericType;
+ && ((Class<?>)genericType).isArray()) {
+ Class<?> cl2 = (Class<?>)genericType;
if (cl2.isArray()
&& !Byte.TYPE.equals(cl2.getComponentType())) {
genericType = cl2.getComponentType();
@@ -135,7 +135,7 @@ class JAXBContextInitializer extends Ser
&& pt.getActualTypeArguments()[0] instanceof Class) {
Class<? extends Object> arrayCls =
- Array.newInstance((Class) pt.getActualTypeArguments()[0], 0).getClass();
+ Array.newInstance((Class<?>) pt.getActualTypeArguments()[0], 0).getClass();
clazz = arrayCls;
part.setTypeClass(clazz);
if (isFromWrapper) {
@@ -146,7 +146,7 @@ class JAXBContextInitializer extends Ser
GenericArrayType gat = (GenericArrayType)pt.getActualTypeArguments()[0];
gat.getGenericComponentType();
Class<? extends Object> arrayCls =
- Array.newInstance((Class) gat.getGenericComponentType(), 0).getClass();
+ Array.newInstance((Class<?>) gat.getGenericComponentType(), 0).getClass();
clazz = Array.newInstance(arrayCls, 0).getClass();
part.setTypeClass(clazz);
if (isFromWrapper) {
@@ -213,10 +213,10 @@ class JAXBContextInitializer extends Ser
}
private void addType(Type cls, boolean allowArray) {
if (cls instanceof Class) {
- if (((Class)cls).isArray() && !allowArray) {
- addClass(((Class)cls).getComponentType());
+ if (((Class<?>)cls).isArray() && !allowArray) {
+ addClass(((Class<?>)cls).getComponentType());
} else {
- addClass((Class)cls);
+ addClass((Class<?>)cls);
}
} else if (cls instanceof ParameterizedType) {
addType(((ParameterizedType)cls).getRawType());
@@ -224,17 +224,17 @@ class JAXBContextInitializer extends Ser
addType(t2);
}
} else if (cls instanceof GenericArrayType) {
- Class ct;
+ Class<?> ct;
GenericArrayType gt = (GenericArrayType)cls;
Type componentType = gt.getGenericComponentType();
if (componentType instanceof Class) {
- ct = (Class)componentType;
+ ct = (Class<?>)componentType;
} else {
- TypeVariable tv = (TypeVariable)componentType;
+ TypeVariable<?> tv = (TypeVariable<?>)componentType;
Type[] bounds = tv.getBounds();
if (bounds != null && bounds.length == 1) {
if (bounds[0] instanceof Class) {
- ct = (Class)bounds[0];
+ ct = (Class<?>)bounds[0];
} else {
throw new IllegalArgumentException("Unable to determine type for: " + tv);
}
@@ -253,7 +253,7 @@ class JAXBContextInitializer extends Ser
addType(t);
}
} else if (cls instanceof TypeVariable) {
- for (Type t : ((TypeVariable)cls).getBounds()) {
+ for (Type t : ((TypeVariable<?>)cls).getBounds()) {
addType(t);
}
}
@@ -281,7 +281,7 @@ class JAXBContextInitializer extends Ser
//may have some interesting annoations we should consider
XmlSeeAlso xsa = cls.getAnnotation(XmlSeeAlso.class);
if (xsa != null) {
- for (Class c : xsa.value()) {
+ for (Class<?> c : xsa.value()) {
addClass(c);
}
}
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=1228228&r1=1228227&r2=1228228&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 Fri Jan 6 15:22:56 2012
@@ -409,9 +409,9 @@ public final class JAXBEncoderDecoder {
return;
}
Object objArray;
- Class cls = null;
+ Class<?> cls = null;
if (mObj instanceof List) {
- List<?> l = (List)mObj;
+ List<?> l = (List<?>)mObj;
objArray = l.toArray(new Object[l.size()]);
cls = null;
} else {
@@ -575,7 +575,7 @@ public final class JAXBEncoderDecoder {
public static void marshallNullElement(Marshaller marshaller,
Object source,
MessagePartInfo part) {
- Class<?> clazz = part != null ? (Class)part.getTypeClass() : null;
+ Class<?> clazz = part != null ? (Class<?>)part.getTypeClass() : null;
try {
writeObject(marshaller, source, new JAXBElement(part.getElementQName(), clazz, null));
} catch (JAXBException e) {
@@ -589,7 +589,7 @@ public final class JAXBEncoderDecoder {
Object source,
MessagePartInfo part,
boolean unwrap) {
- Class<?> clazz = part != null ? (Class)part.getTypeClass() : null;
+ Class<?> clazz = part != null ? (Class<?>)part.getTypeClass() : null;
if (clazz != null && Exception.class.isAssignableFrom(clazz) && part != null
&& Boolean.TRUE.equals(part.getProperty(JAXBDataBinding.class.getName() + ".CUSTOM_EXCEPTION"))) {
return unmarshallException(u, source, part);
@@ -606,8 +606,8 @@ public final class JAXBEncoderDecoder {
Object obj = unmarshall(u, source, elName, null, unwrap);
if (clazz.isArray() && obj instanceof List) {
- return ((List)obj).toArray((Object[])Array.newInstance(clazz.getComponentType(),
- ((List)obj).size()));
+ return ((List<?>)obj).toArray((Object[])Array.newInstance(clazz.getComponentType(),
+ ((List<?>)obj).size()));
}
return obj;
@@ -664,7 +664,7 @@ public final class JAXBEncoderDecoder {
private static Object createSet(MessagePartInfo part, List<Object> ret) {
Type genericType = (Type)part.getProperty("generic.type");
- Class tp2 = (Class)((ParameterizedType)genericType).getRawType();
+ Class<?> tp2 = (Class<?>)((ParameterizedType)genericType).getRawType();
if (tp2.isInterface()) {
return new HashSet<Object>(ret);
}
@@ -704,10 +704,10 @@ public final class JAXBEncoderDecoder {
if (genericType instanceof ParameterizedType) {
Type tp2 = ((ParameterizedType)genericType).getRawType();
if (tp2 instanceof Class) {
- Class<?> cls = (Class)tp2;
+ Class<?> cls = (Class<?>)tp2;
if (!cls.isInterface() && List.class.isAssignableFrom((Class<?>)cls)) {
try {
- return CastUtils.cast((List)cls.newInstance());
+ return CastUtils.cast((List<?>)cls.newInstance());
} catch (Exception e) {
// ignore, just return an ArrayList
}
@@ -959,7 +959,7 @@ public final class JAXBEncoderDecoder {
public static Class<?> getClassFromType(Type t) {
if (t instanceof Class) {
- return (Class)t;
+ return (Class<?>)t;
} else if (t instanceof GenericArrayType) {
GenericArrayType g = (GenericArrayType)t;
return Array.newInstance(getClassFromType(g.getGenericComponentType()), 0).getClass();
Modified: cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBSchemaInitializer.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBSchemaInitializer.java?rev=1228228&r1=1228227&r2=1228228&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBSchemaInitializer.java (original)
+++ cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBSchemaInitializer.java Fri Jan 6 15:22:56 2012
@@ -83,10 +83,10 @@ class JAXBSchemaInitializer extends Serv
static Class<?> getArrayComponentType(Type cls) {
if (cls instanceof Class) {
- if (((Class)cls).isArray()) {
- return ((Class)cls).getComponentType();
+ if (((Class<?>)cls).isArray()) {
+ return ((Class<?>)cls).getComponentType();
} else {
- return (Class)cls;
+ return (Class<?>)cls;
}
} else if (cls instanceof ParameterizedType) {
for (Type t2 : ((ParameterizedType)cls).getActualTypeArguments()) {
@@ -94,7 +94,7 @@ class JAXBSchemaInitializer extends Serv
}
} else if (cls instanceof GenericArrayType) {
GenericArrayType gt = (GenericArrayType)cls;
- Class ct = (Class) gt.getGenericComponentType();
+ Class<?> ct = (Class<?>) gt.getGenericComponentType();
return Array.newInstance(ct, 0).getClass();
}
return null;
@@ -102,10 +102,10 @@ class JAXBSchemaInitializer extends Serv
public JAXBBeanInfo getBeanInfo(Type cls) {
if (cls instanceof Class) {
- if (((Class)cls).isArray()) {
- return getBeanInfo(((Class)cls).getComponentType());
+ if (((Class<?>)cls).isArray()) {
+ return getBeanInfo(((Class<?>)cls).getComponentType());
} else {
- return getBeanInfo((Class)cls);
+ return getBeanInfo((Class<?>)cls);
}
} else if (cls instanceof ParameterizedType) {
for (Type t2 : ((ParameterizedType)cls).getActualTypeArguments()) {
@@ -113,7 +113,7 @@ class JAXBSchemaInitializer extends Serv
}
} else if (cls instanceof GenericArrayType) {
GenericArrayType gt = (GenericArrayType)cls;
- Class ct = (Class) gt.getGenericComponentType();
+ Class<?> ct = (Class<?>) gt.getGenericComponentType();
ct = Array.newInstance(ct, 0).getClass();
return getBeanInfo(ct);
@@ -365,7 +365,7 @@ class JAXBSchemaInitializer extends Serv
public void end(FaultInfo fault) {
MessagePartInfo part = fault.getMessageParts().get(0);
Class<?> cls = part.getTypeClass();
- Class<?> cl2 = (Class)fault.getProperty(Class.class.getName());
+ Class<?> cl2 = (Class<?>)fault.getProperty(Class.class.getName());
if (cls != cl2) {
QName name = (QName)fault.getProperty("elementName");
part.setElementQName(name);
@@ -559,12 +559,12 @@ class JAXBSchemaInitializer extends Serv
static boolean isArray(Type cls) {
if (cls instanceof Class) {
- return ((Class)cls).isArray();
+ return ((Class<?>)cls).isArray();
} else if (cls instanceof ParameterizedType) {
ParameterizedType pt = (ParameterizedType)cls;
return pt.getActualTypeArguments().length == 1
&& pt.getRawType() instanceof Class
- && Collection.class.isAssignableFrom((Class)pt.getRawType());
+ && Collection.class.isAssignableFrom((Class<?>)pt.getRawType());
} else if (cls instanceof GenericArrayType) {
return true;
}
Modified: cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/attachment/JAXBAttachmentSchemaValidationHack.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/attachment/JAXBAttachmentSchemaValidationHack.java?rev=1228228&r1=1228227&r2=1228228&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/attachment/JAXBAttachmentSchemaValidationHack.java (original)
+++ cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/attachment/JAXBAttachmentSchemaValidationHack.java Fri Jan 6 15:22:56 2012
@@ -27,7 +27,6 @@ import java.util.List;
import org.apache.cxf.attachment.AttachmentDataSource;
import org.apache.cxf.helpers.CastUtils;
import org.apache.cxf.interceptor.Fault;
-import org.apache.cxf.interceptor.Interceptor;
import org.apache.cxf.message.Attachment;
import org.apache.cxf.message.Message;
import org.apache.cxf.phase.AbstractPhaseInterceptor;
@@ -37,7 +36,8 @@ import org.apache.cxf.phase.Phase;
*
*/
public final class JAXBAttachmentSchemaValidationHack extends AbstractPhaseInterceptor<Message> {
- public static final Interceptor INSTANCE = new JAXBAttachmentSchemaValidationHack();
+ public static final JAXBAttachmentSchemaValidationHack INSTANCE
+ = new JAXBAttachmentSchemaValidationHack();
private static final String SAVED_DATASOURCES
= JAXBAttachmentSchemaValidationHack.class.getName() + ".SAVED_DATASOURCES";
Modified: cxf/trunk/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBDataBindingTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBDataBindingTest.java?rev=1228228&r1=1228227&r2=1228228&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBDataBindingTest.java (original)
+++ cxf/trunk/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBDataBindingTest.java Fri Jan 6 15:22:56 2012
@@ -120,7 +120,7 @@ public class JAXBDataBindingTest extends
@Test
public void testCreateReader() {
- DataReader reader = jaxbDataBinding.createReader(XMLStreamReader.class);
+ DataReader<?> reader = jaxbDataBinding.createReader(XMLStreamReader.class);
assertTrue(reader instanceof DataReaderImpl);
reader = jaxbDataBinding.createReader(XMLEventReader.class);
@@ -153,7 +153,7 @@ public class JAXBDataBindingTest extends
@Test
public void testCreateWriter() {
- DataWriter writer = jaxbDataBinding.createWriter(XMLStreamWriter.class);
+ DataWriter<?> writer = jaxbDataBinding.createWriter(XMLStreamWriter.class);
assertTrue(writer instanceof DataWriterImpl);
writer = jaxbDataBinding.createWriter(XMLEventWriter.class);
@@ -168,7 +168,7 @@ public class JAXBDataBindingTest extends
@Test
public void testExtraClass() {
- Class[] extraClass = new Class[] {GreetMe.class, GreetMeOneWay.class};
+ Class<?>[] extraClass = new Class[] {GreetMe.class, GreetMeOneWay.class};
jaxbDataBinding.setExtraClass(extraClass);
assertEquals(jaxbDataBinding.getExtraClass().length, 2);
assertEquals(jaxbDataBinding.getExtraClass()[0], GreetMe.class);
Modified: cxf/trunk/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/io/XMLStreamDataReaderTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/io/XMLStreamDataReaderTest.java?rev=1228228&r1=1228227&r2=1228228&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/io/XMLStreamDataReaderTest.java (original)
+++ cxf/trunk/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/io/XMLStreamDataReaderTest.java Fri Jan 6 15:22:56 2012
@@ -135,7 +135,7 @@ public class XMLStreamDataReaderTest ext
assertEquals(new Float(1.0f), new Float(((TradePriceData)val).getTickerPrice()));
}
- private JAXBDataBinding getDataBinding(Class... clz) throws Exception {
+ private JAXBDataBinding getDataBinding(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/JibxDataWriter.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/jibx/src/main/java/org/apache/cxf/jibx/JibxDataWriter.java?rev=1228228&r1=1228227&r2=1228228&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/jibx/src/main/java/org/apache/cxf/jibx/JibxDataWriter.java (original)
+++ cxf/trunk/rt/databinding/jibx/src/main/java/org/apache/cxf/jibx/JibxDataWriter.java Fri Jan 6 15:22:56 2012
@@ -43,7 +43,7 @@ public class JibxDataWriter implements D
}
public void write(Object obj, MessagePartInfo part, XMLStreamWriter output) {
- Class jtype = part.getTypeClass();
+ Class<?> jtype = part.getTypeClass();
QName stype = part.getTypeQName();
if (JibxSimpleTypes.isSimpleType(jtype)) {
try {
Modified: cxf/trunk/rt/databinding/jibx/src/test/java/org/apache/cxf/jibx/AbstractJibxTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/jibx/src/test/java/org/apache/cxf/jibx/AbstractJibxTest.java?rev=1228228&r1=1228227&r2=1228228&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/jibx/src/test/java/org/apache/cxf/jibx/AbstractJibxTest.java (original)
+++ cxf/trunk/rt/databinding/jibx/src/test/java/org/apache/cxf/jibx/AbstractJibxTest.java Fri Jan 6 15:22:56 2012
@@ -79,12 +79,13 @@ public abstract class AbstractJibxTest e
addNamespace("xsd", SOAPConstants.XSD);
}
- 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();
}
- protected ServerFactoryBean createServiceFactory(Class serviceClass, Object serviceBean, String address,
+ protected ServerFactoryBean createServiceFactory(Class<?> serviceClass,
+ Object serviceBean, String address,
QName name, JibxDataBinding binding) {
JaxWsServerFactoryBean sf = new JaxWsServerFactoryBean();
sf.setServiceClass(serviceClass);
Modified: cxf/trunk/rt/databinding/sdo/src/main/java/org/apache/cxf/sdo/SDODataBinding.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/sdo/src/main/java/org/apache/cxf/sdo/SDODataBinding.java?rev=1228228&r1=1228227&r2=1228228&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/sdo/src/main/java/org/apache/cxf/sdo/SDODataBinding.java (original)
+++ cxf/trunk/rt/databinding/sdo/src/main/java/org/apache/cxf/sdo/SDODataBinding.java Fri Jan 6 15:22:56 2012
@@ -139,7 +139,7 @@ public class SDODataBinding extends Abst
String pkg = cls.getPackage().getName();
if (!pkgs.contains(pkg)) {
try {
- Class fact = Class.forName(pkg + ".SdoFactory", false, cls.getClassLoader());
+ Class<?> fact = Class.forName(pkg + ".SdoFactory", false, cls.getClassLoader());
registerFactory(fact);
pkgs.add(pkg);
} catch (Throwable t) {
@@ -166,7 +166,7 @@ public class SDODataBinding extends Abst
Method method = factory.getClass().getMethod("register", new Class[] {HelperContext.class});
method.invoke(factory, new Object[] {context});
}
- boolean register(Class javaType) {
+ boolean register(Class<?> javaType) {
if (javaType == null || DataObject.class == javaType) {
return false;
}
Modified: cxf/trunk/rt/databinding/sdo/src/test/java/org/apache/cxf/sdo/AbstractSDOTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/sdo/src/test/java/org/apache/cxf/sdo/AbstractSDOTest.java?rev=1228228&r1=1228227&r2=1228228&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/sdo/src/test/java/org/apache/cxf/sdo/AbstractSDOTest.java (original)
+++ cxf/trunk/rt/databinding/sdo/src/test/java/org/apache/cxf/sdo/AbstractSDOTest.java Fri Jan 6 15:22:56 2012
@@ -112,26 +112,26 @@ public abstract class AbstractSDOTest ex
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, SDODataBinding binding) {
+ protected Server createService(Class<?> serviceClass, QName name, SDODataBinding binding) {
return createService(serviceClass, serviceClass.getSimpleName(), name, binding);
}
- protected Server createService(Class serviceClass,
+ protected Server createService(Class<?> serviceClass,
String address, QName name,
SDODataBinding binding) {
ServerFactoryBean sf = createServiceFactory(serviceClass, null, address, name, binding);
return sf.create();
}
- public Server createService(Class serviceClass,
+ public Server createService(Class<?> serviceClass,
Object serviceBean,
String address,
QName name) {
@@ -139,7 +139,7 @@ public abstract class AbstractSDOTest ex
return sf.create();
}
- protected ServerFactoryBean createServiceFactory(Class serviceClass,
+ protected ServerFactoryBean createServiceFactory(Class<?> serviceClass,
Object serviceBean,
String address,
QName name,
Modified: cxf/trunk/rt/databinding/sdo/src/test/java/org/apache/cxf/sdo/HelloWorldDynamicTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/sdo/src/test/java/org/apache/cxf/sdo/HelloWorldDynamicTest.java?rev=1228228&r1=1228227&r2=1228228&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/sdo/src/test/java/org/apache/cxf/sdo/HelloWorldDynamicTest.java (original)
+++ cxf/trunk/rt/databinding/sdo/src/test/java/org/apache/cxf/sdo/HelloWorldDynamicTest.java Fri Jan 6 15:22:56 2012
@@ -69,7 +69,7 @@ public class HelloWorldDynamicTest exten
}
- protected ServerFactoryBean createServiceFactory(Class serviceClass,
+ protected ServerFactoryBean createServiceFactory(Class<?> serviceClass,
Object serviceBean,
String address,
QName name,
Modified: cxf/trunk/rt/databinding/sdo/src/test/java/org/apache/cxf/sdo/HelloWorldStaticTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/sdo/src/test/java/org/apache/cxf/sdo/HelloWorldStaticTest.java?rev=1228228&r1=1228227&r2=1228228&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/sdo/src/test/java/org/apache/cxf/sdo/HelloWorldStaticTest.java (original)
+++ cxf/trunk/rt/databinding/sdo/src/test/java/org/apache/cxf/sdo/HelloWorldStaticTest.java Fri Jan 6 15:22:56 2012
@@ -69,7 +69,7 @@ public class HelloWorldStaticTest extend
}
- protected ServerFactoryBean createServiceFactory(Class serviceClass,
+ protected ServerFactoryBean createServiceFactory(Class<?> serviceClass,
Object serviceBean,
String address,
QName name,
Modified: cxf/trunk/rt/databinding/xmlbeans/src/main/java/org/apache/cxf/xmlbeans/XmlBeansSchemaInitializer.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/xmlbeans/src/main/java/org/apache/cxf/xmlbeans/XmlBeansSchemaInitializer.java?rev=1228228&r1=1228227&r2=1228228&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/xmlbeans/src/main/java/org/apache/cxf/xmlbeans/XmlBeansSchemaInitializer.java (original)
+++ cxf/trunk/rt/databinding/xmlbeans/src/main/java/org/apache/cxf/xmlbeans/XmlBeansSchemaInitializer.java Fri Jan 6 15:22:56 2012
@@ -237,7 +237,7 @@ class XmlBeansSchemaInitializer extends
}
mapClass(part, clazz);
}
- private void mapClass(MessagePartInfo part, Class clazz) {
+ private void mapClass(MessagePartInfo part, Class<?> clazz) {
if (!XmlObject.class.isAssignableFrom(clazz)) {
Modified: cxf/trunk/rt/databinding/xmlbeans/src/test/java/org/apache/cxf/xmlbeans/AbstractXmlBeansTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/xmlbeans/src/test/java/org/apache/cxf/xmlbeans/AbstractXmlBeansTest.java?rev=1228228&r1=1228227&r2=1228228&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/xmlbeans/src/test/java/org/apache/cxf/xmlbeans/AbstractXmlBeansTest.java (original)
+++ cxf/trunk/rt/databinding/xmlbeans/src/test/java/org/apache/cxf/xmlbeans/AbstractXmlBeansTest.java Fri Jan 6 15:22:56 2012
@@ -114,26 +114,26 @@ public abstract class AbstractXmlBeansTe
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, XmlBeansDataBinding binding) {
+ protected Server createService(Class<?> serviceClass, QName name, XmlBeansDataBinding binding) {
return createService(serviceClass, serviceClass.getSimpleName(), name, binding);
}
- protected Server createService(Class serviceClass,
+ protected Server createService(Class<?> serviceClass,
String address, QName name,
XmlBeansDataBinding binding) {
ServerFactoryBean sf = createServiceFactory(serviceClass, null, address, name, binding);
return sf.create();
}
- public Server createService(Class serviceClass,
+ public Server createService(Class<?> serviceClass,
Object serviceBean,
String address,
QName name) {
@@ -141,7 +141,7 @@ public abstract class AbstractXmlBeansTe
return sf.create();
}
- protected ServerFactoryBean createServiceFactory(Class serviceClass,
+ protected ServerFactoryBean createServiceFactory(Class<?> serviceClass,
Object serviceBean,
String address,
QName name,
Modified: cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/RuntimeDelegateImpl.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/RuntimeDelegateImpl.java?rev=1228228&r1=1228227&r2=1228228&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/RuntimeDelegateImpl.java (original)
+++ cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/RuntimeDelegateImpl.java Fri Jan 6 15:22:56 2012
@@ -40,8 +40,8 @@ import org.apache.cxf.jaxrs.utils.Resour
public class RuntimeDelegateImpl extends RuntimeDelegate {
- protected Map<Class, HeaderDelegate> headerProviders
- = new HashMap<Class, HeaderDelegate>();
+ protected Map<Class<?>, HeaderDelegate> headerProviders
+ = new HashMap<Class<?>, HeaderDelegate>();
public RuntimeDelegateImpl() {
headerProviders.put(MediaType.class, new MediaTypeHeaderProvider());
Modified: cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/AtomPojoProvider.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/AtomPojoProvider.java?rev=1228228&r1=1228227&r2=1228228&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/AtomPojoProvider.java (original)
+++ cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/AtomPojoProvider.java Fri Jan 6 15:22:56 2012
@@ -87,13 +87,13 @@ public class AtomPojoProvider extends Ab
@Context
public void setMessageContext(MessageContext context) {
mc = context;
- for (AbstractAtomElementBuilder builder : atomBuilders.values()) {
+ for (AbstractAtomElementBuilder<?> builder : atomBuilders.values()) {
builder.setMessageContext(context);
}
- for (AtomElementWriter writer : atomWriters.values()) {
+ for (AtomElementWriter<?, ?> writer : atomWriters.values()) {
tryInjectMessageContext(writer);
}
- for (AtomElementReader reader : atomReaders.values()) {
+ for (AtomElementReader<?, ?> reader : atomReaders.values()) {
tryInjectMessageContext(reader);
}
}
@@ -201,7 +201,7 @@ public class AtomPojoProvider extends Ab
if (methodName == null) {
try {
methodName = (getter ? "get" : "set") + cls.getSimpleName();
- Class[] params = getter ? new Class[]{} : new Class[]{List.class};
+ Class<?>[] params = getter ? new Class[]{} : new Class[]{List.class};
cls.getMethod(methodName, params);
} catch (Exception ex) {
String type = getter ? "getter" : "setter";
Modified: cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/AbstractJAXWSMethodInvoker.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/AbstractJAXWSMethodInvoker.java?rev=1228228&r1=1228227&r2=1228228&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/AbstractJAXWSMethodInvoker.java (original)
+++ cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/AbstractJAXWSMethodInvoker.java Fri Jan 6 15:22:56 2012
@@ -129,11 +129,11 @@ public abstract class AbstractJAXWSMetho
// Need to copy header only if the message is going out.
if (ctx.containsKey(Header.HEADER_LIST)
&& ctx.get(Header.HEADER_LIST) instanceof List<?>) {
- List list = (List) ctx.get(Header.HEADER_LIST);
+ List<?> list = (List<?>) ctx.get(Header.HEADER_LIST);
if (list != null && !list.isEmpty()) {
SoapMessage sm = (SoapMessage) createResponseMessage(exchange);
if (sm != null) {
- Iterator iter = list.iterator();
+ Iterator<?> iter = list.iterator();
while (iter.hasNext()) {
sm.getHeaders().add((Header) iter.next());
}
@@ -171,11 +171,11 @@ public abstract class AbstractJAXWSMetho
protected void updateHeader(Exchange exchange, MessageContext ctx) {
if (ctx.containsKey(Header.HEADER_LIST)
&& ctx.get(Header.HEADER_LIST) instanceof List<?>) {
- List list = (List) ctx.get(Header.HEADER_LIST);
+ List<?> list = (List<?>) ctx.get(Header.HEADER_LIST);
if (list != null && !list.isEmpty()) {
SoapMessage sm = (SoapMessage) createResponseMessage(exchange);
if (sm != null) {
- Iterator iter = list.iterator();
+ Iterator<?> iter = list.iterator();
while (iter.hasNext()) {
Header header = (Header) iter.next();
if (!header.getName().getNamespaceURI().
Modified: cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/DispatchImpl.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/DispatchImpl.java?rev=1228228&r1=1228227&r2=1228228&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/DispatchImpl.java (original)
+++ cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/DispatchImpl.java Fri Jan 6 15:22:56 2012
@@ -421,7 +421,7 @@ public class DispatchImpl<T> implements
@SuppressWarnings("unchecked")
public Response<T> invokeAsync(T obj) {
- return (Response)invokeAsync(obj, null);
+ return (Response<T>)invokeAsync(obj, null);
}
public void invokeOneWay(T obj) {
Modified: cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JAXWSMethodDispatcher.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JAXWSMethodDispatcher.java?rev=1228228&r1=1228227&r2=1228228&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JAXWSMethodDispatcher.java (original)
+++ cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JAXWSMethodDispatcher.java Fri Jan 6 15:22:56 2012
@@ -62,7 +62,7 @@ public class JAXWSMethodDispatcher exten
i++;
continue;
}
- Class endpointClass = implInfo.getImplementorClass();
+ Class<?> endpointClass = implInfo.getImplementorClass();
Message msg = new Message("SEI_METHOD_NOT_FOUND", LOG,
m.getName(), endpointClass.getName());
throw new ServiceConstructionException(msg, e);
@@ -89,14 +89,14 @@ public class JAXWSMethodDispatcher exten
(Class[])method.getParameterTypes());
if (Modifier.isVolatile(m2.getModifiers())) {
//bridge method, need to map the generics
- Class params[] = method.getParameterTypes();
+ Class<?> params[] = method.getParameterTypes();
for (Type t : method.getGenericParameterTypes()) {
if (t instanceof TypeVariable) {
- TypeVariable tv = (TypeVariable)t;
+ TypeVariable<?> tv = (TypeVariable<?>)t;
for (int x = 0; x < implInfo.getSEIClass().getTypeParameters().length; x++) {
- TypeVariable t2 = implInfo.getSEIClass().getTypeParameters()[x];
+ TypeVariable<?> t2 = implInfo.getSEIClass().getTypeParameters()[x];
if (t2.getName().equals(tv.getName())) {
- params[x] = (Class)implInfo.getSEIType().getActualTypeArguments()[x];
+ params[x] = (Class<?>)implInfo.getSEIType().getActualTypeArguments()[x];
}
}
}