Return-Path: X-Original-To: apmail-cxf-commits-archive@www.apache.org Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id A812CBAC5 for ; Fri, 6 Jan 2012 23:25:21 +0000 (UTC) Received: (qmail 81807 invoked by uid 500); 6 Jan 2012 23:25:21 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 81636 invoked by uid 500); 6 Jan 2012 23:25:21 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 81615 invoked by uid 99); 6 Jan 2012 23:25:20 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 06 Jan 2012 23:25:20 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 06 Jan 2012 23:25:09 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 14B5D23889EB for ; Fri, 6 Jan 2012 23:24:46 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1228499 [1/4] - in /cxf/trunk: integration/jca/src/main/java/org/apache/cxf/jca/core/resourceadapter/ integration/jca/src/main/java/org/apache/cxf/jca/cxf/ integration/jca/src/main/java/org/apache/cxf/jca/cxf/handlers/ integration/jca/src/... Date: Fri, 06 Jan 2012 23:24:38 -0000 To: commits@cxf.apache.org From: dkulp@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120106232446.14B5D23889EB@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: dkulp Date: Fri Jan 6 23:24:33 2012 New Revision: 1228499 URL: http://svn.apache.org/viewvc?rev=1228499&view=rev Log: Non-backportable warning fixes. Down to 600 warnings. Modified: cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/core/resourceadapter/AbstractManagedConnectionFactoryImpl.java cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/core/resourceadapter/AbstractManagedConnectionImpl.java cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/cxf/AssociatedManagedConnectionFactoryImpl.java cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/cxf/CXFConnectionRequestInfo.java cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/cxf/ManagedConnectionImpl.java cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/cxf/ResourceAdapterImpl.java cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/cxf/handlers/CXFInvocationHandlerBase.java cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/outbound/ManagedConnectionFactoryImpl.java cxf/trunk/integration/jca/src/test/java/org/apache/cxf/jca/jarloader/JarLoaderTest.java cxf/trunk/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaDestination.java cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/osgi/CXFExtensionBundleListener.java cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/osgi/OSGIBusListener.java cxf/trunk/rt/databinding/aegis/src/main/generated/org/apache/cxf/aegis/util/jdom/StaxBuilder.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/ElementDataReader.java cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/XMLStreamDataReader.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/AegisType.java cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/XMLTypeCreator.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/basic/XMLBeanTypeInfo.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/type/encoded/SoapRefType.java cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/AnnotatedTypeInfo.java cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/AnnotationReader.java cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/EnumType.java cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/Java5TypeCreator.java cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/XmlAttribute.java cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/XmlElement.java cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/XmlParamType.java cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/XmlReturnType.java cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/XmlType.java cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/util/ServiceUtils.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/MapTest.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/JAXBDataBinding.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/JAXBWrapperHelper.java cxf/trunk/rt/databinding/jibx/src/main/java/org/apache/cxf/jibx/JibxDataReader.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/jibx/src/main/java/org/apache/cxf/jibx/JibxWrapperHelper.java cxf/trunk/rt/databinding/sdo/src/main/java/org/apache/cxf/sdo/DataReaderImpl.java cxf/trunk/rt/databinding/xmlbeans/src/main/java/org/apache/cxf/xmlbeans/DataReaderImpl.java cxf/trunk/rt/databinding/xmlbeans/src/main/java/org/apache/cxf/xmlbeans/XmlBeansWrapperHelper.java cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/WebClient.java cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/JAXRSOutInterceptor.java cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/AbstractJAXBProvider.java cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/AtomPojoProvider.java cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/MultipartProvider.java cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ProviderFactory.java cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/FormUtils.java cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/InjectionUtils.java cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/JAXBUtils.java cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/JAXRSUtils.java cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/Customer.java cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/fortest/GenericEntityImpl2.java cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/wadl/FormInterface.java cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/wadl/jaxb/Book.java cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/AegisJSONProviderTest.java cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/JAXBElementProviderTest.java cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/JSONProviderTest.java cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/resources/CollectionsResource.java cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointImpl.java cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxWsClientFactoryBean.java cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxWsProxyFactoryBean.java cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/WrapperClassGenerator.java cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/AnnotationHandlerChainBuilder.java cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/HandlerChainBuilder.java cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/HolderInInterceptor.java cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/spring/JaxWsProxyFactoryBeanDefinitionParser.java cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceConfiguration.java cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBean.java cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/CodeFirstWSDLTest.java cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ServiceImplTest.java cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/AnnotationHandlerChainBuilderTest.java cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/LogicalMessageImplTest.java cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/soap/SOAPHandlerInterceptorTest.java cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/AbstractServiceFactory.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/service/factory/AbstractServiceConfiguration.java cxf/trunk/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/saml/SamlFormOutInterceptor.java cxf/trunk/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/saml/SamlHeaderOutInterceptor.java cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPDestination.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/PolicyOutInterceptor.java cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/ManagedRMEndpoint.java cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/AbstractCXFToolContainer.java cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/model/JavaPort.java cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/toolspec/ToolSpec.java cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/toolspec/parser/BadUsageException.java cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/toolspec/parser/CommandDocument.java cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/toolspec/parser/ErrorVisitor.java cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/util/AnnotationUtil.java cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/util/SOAPBindingUtil.java cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/common/idltypes/IdlArrayBase.java cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/common/idltypes/IdlEnum.java cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/common/idltypes/IdlOperation.java cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/common/idltypes/IdlRoot.java cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/common/idltypes/IdlScopeBase.java cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/common/idltypes/IdlStructBase.java cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/common/idltypes/IdlUnionBranch.java cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/DeferredActionCollection.java cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/IDLToWSDLProcessor.java cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/ModuleToNSMapper.java cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/ObjectReferenceVisitor.java cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/PortTypeVisitor.java cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/ScopedNameVisitor.java cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/StructVisitor.java cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/UnionVisitor.java cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/WSDLASTVisitor.java cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLParameter.java cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLToCorbaBinding.java cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLToCorbaHelper.java cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLToIDLAction.java cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLTypes.java cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/utils/FileOutputStreamFactory.java cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/utils/OutputStreamFactory.java cxf/trunk/tools/corba/src/test/java/org/apache/cxf/tools/corba/processors/WSDLToCorbaBindingTest.java cxf/trunk/tools/corba/src/test/java/org/apache/cxf/tools/corba/processors/WSDLToCorbaBindingTypeTest.java cxf/trunk/tools/corba/src/test/java/org/apache/cxf/tools/corba/utils/TestWSDLCorbaWriterImpl.java cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/generator/WSDLGeneratorFactory.java cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/DateTypeCustomGenerator.java cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/FaultBeanGenerator.java cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/FaultBeanGeneratorTest.java cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/MIMEBindingValidator.java cxf/trunk/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainer.java cxf/trunk/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/core/AbstractWSDLBuilder.java cxf/trunk/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/core/FrontEndProfile.java cxf/trunk/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/core/PluginLoader.java cxf/trunk/tools/wsdlto/frontend/javascript/src/main/java/org/apache/cxf/tools/wsdlto/javascript/JavaScriptContainer.java cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/JAXWSBindingParser.java cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/wsdl11/JAXWSDefinitionBuilder.java cxf/trunk/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/JAXWSProfileTest.java cxf/trunk/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/AbstractWSDLToProcessor.java Modified: cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/core/resourceadapter/AbstractManagedConnectionFactoryImpl.java URL: http://svn.apache.org/viewvc/cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/core/resourceadapter/AbstractManagedConnectionFactoryImpl.java?rev=1228499&r1=1228498&r2=1228499&view=diff ============================================================================== --- cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/core/resourceadapter/AbstractManagedConnectionFactoryImpl.java (original) +++ cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/core/resourceadapter/AbstractManagedConnectionFactoryImpl.java Fri Jan 6 23:24:33 2012 @@ -68,13 +68,13 @@ public abstract class AbstractManagedCon throws ResourceAdapterInternalException; public ManagedConnection matchManagedConnections( - Set aMCSet, Subject subject, ConnectionRequestInfo crInfo) + @SuppressWarnings("rawtypes") Set aMCSet, Subject subject, ConnectionRequestInfo crInfo) throws ResourceException { LOG.log(Level.FINE, "MATCHING_CONNECTIONS", new Object[] {new Integer(aMCSet.size()), crInfo, subject}); - for (Iterator iterator = aMCSet.iterator(); iterator.hasNext();) { + for (@SuppressWarnings("rawtypes") Iterator iterator = aMCSet.iterator(); iterator.hasNext();) { AbstractManagedConnectionImpl conn = (AbstractManagedConnectionImpl)iterator.next(); LOG.log(Level.FINE, "MATCH_CONNECTION_AGAINST", Modified: cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/core/resourceadapter/AbstractManagedConnectionImpl.java URL: http://svn.apache.org/viewvc/cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/core/resourceadapter/AbstractManagedConnectionImpl.java?rev=1228499&r1=1228498&r2=1228499&view=diff ============================================================================== --- cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/core/resourceadapter/AbstractManagedConnectionImpl.java (original) +++ cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/core/resourceadapter/AbstractManagedConnectionImpl.java Fri Jan 6 23:24:33 2012 @@ -129,10 +129,8 @@ public abstract class AbstractManagedCon } protected void sendEvent(ConnectionEvent coEvent) { - Iterator iter = connectionEventListeners.iterator(); - - while (iter.hasNext()) { - sendEventToListener(coEvent, (ConnectionEventListener)iter.next()); + for (ConnectionEventListener l : connectionEventListeners) { + sendEventToListener(coEvent, l); } } Modified: cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/cxf/AssociatedManagedConnectionFactoryImpl.java URL: http://svn.apache.org/viewvc/cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/cxf/AssociatedManagedConnectionFactoryImpl.java?rev=1228499&r1=1228498&r2=1228499&view=diff ============================================================================== --- cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/cxf/AssociatedManagedConnectionFactoryImpl.java (original) +++ cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/cxf/AssociatedManagedConnectionFactoryImpl.java Fri Jan 6 23:24:33 2012 @@ -73,7 +73,7 @@ public class AssociatedManagedConnection protected void mergeResourceAdapterProps() { Properties raProps = ((ResourceAdapterImpl)ra).getPluginProps(); Properties props = getPluginProps(); - Enumeration raPropsEnum = raProps.propertyNames(); + Enumeration raPropsEnum = raProps.propertyNames(); while (raPropsEnum.hasMoreElements()) { String key = (String)raPropsEnum.nextElement(); if (!props.containsKey(key)) { Modified: cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/cxf/CXFConnectionRequestInfo.java URL: http://svn.apache.org/viewvc/cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/cxf/CXFConnectionRequestInfo.java?rev=1228499&r1=1228498&r2=1228499&view=diff ============================================================================== --- cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/cxf/CXFConnectionRequestInfo.java (original) +++ cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/cxf/CXFConnectionRequestInfo.java Fri Jan 6 23:24:33 2012 @@ -33,7 +33,7 @@ public class CXFConnectionRequestInfo ex super(); } - public CXFConnectionRequestInfo(Class aIface, URL aWsdlLocation, + public CXFConnectionRequestInfo(Class aIface, URL aWsdlLocation, QName aServiceName, QName aPortName) { super(aIface, aWsdlLocation, aServiceName, aPortName); } Modified: cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/cxf/ManagedConnectionImpl.java URL: http://svn.apache.org/viewvc/cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/cxf/ManagedConnectionImpl.java?rev=1228499&r1=1228498&r2=1228499&view=diff ============================================================================== --- cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/cxf/ManagedConnectionImpl.java (original) +++ cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/cxf/ManagedConnectionImpl.java Fri Jan 6 23:24:33 2012 @@ -192,7 +192,7 @@ public class ManagedConnectionImpl private Object createConnectionProxy(Object obj, CXFConnectionRequestInfo cri, Subject subject) throws ResourceException { - Class classes[] = {Connection.class, BindingProvider.class, cri.getInterface()}; + Class classes[] = {Connection.class, BindingProvider.class, cri.getInterface()}; return Proxy.newProxyInstance(cri.getInterface().getClassLoader(), classes, createInvocationHandler(obj, subject)); Modified: cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/cxf/ResourceAdapterImpl.java URL: http://svn.apache.org/viewvc/cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/cxf/ResourceAdapterImpl.java?rev=1228499&r1=1228498&r2=1228499&view=diff ============================================================================== --- cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/cxf/ResourceAdapterImpl.java (original) +++ cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/cxf/ResourceAdapterImpl.java Fri Jan 6 23:24:33 2012 @@ -19,7 +19,6 @@ package org.apache.cxf.jca.cxf; import java.util.HashSet; -import java.util.Iterator; import java.util.Map; import java.util.Properties; import java.util.Set; @@ -50,7 +49,7 @@ public class ResourceAdapterImpl extends private static final long serialVersionUID = 5318740621610762307L; private static final Logger LOG = LogUtils.getL7dLogger(ResourceAdapterImpl.class); private BootstrapContext ctx; - private Set busCache = new HashSet(); + private Set busCache = new HashSet(); private Map endpoints = new ConcurrentHashMap(); public ResourceAdapterImpl() { @@ -66,7 +65,7 @@ public class ResourceAdapterImpl extends busCache.add(bus); } - protected Set getBusCache() { + protected Set getBusCache() { return busCache; } @@ -85,10 +84,7 @@ public class ResourceAdapterImpl extends public void stop() { LOG.fine("Resource Adapter is being stopped by appserver..."); if (!busCache.isEmpty()) { - Iterator busIterator = busCache.iterator(); - Bus bus = null; - while (busIterator.hasNext()) { - bus = (Bus)busIterator.next(); + for (Bus bus : busCache) { bus.shutdown(true); } } Modified: cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/cxf/handlers/CXFInvocationHandlerBase.java URL: http://svn.apache.org/viewvc/cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/cxf/handlers/CXFInvocationHandlerBase.java?rev=1228499&r1=1228498&r2=1228499&view=diff ============================================================================== --- cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/cxf/handlers/CXFInvocationHandlerBase.java (original) +++ cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/cxf/handlers/CXFInvocationHandlerBase.java Fri Jan 6 23:24:33 2012 @@ -30,7 +30,7 @@ import org.apache.cxf.jca.cxf.CXFInvocat import org.apache.cxf.jca.cxf.CXFInvocationHandlerData; import org.apache.cxf.jca.cxf.CXFManagedConnection; -abstract class CXFInvocationHandlerBase implements CXFInvocationHandler { +abstract class CXFInvocationHandlerBase implements CXFInvocationHandler { private static final Logger LOG = LogUtils.getL7dLogger(CXFInvocationHandlerBase.class); Modified: cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/outbound/ManagedConnectionFactoryImpl.java URL: http://svn.apache.org/viewvc/cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/outbound/ManagedConnectionFactoryImpl.java?rev=1228499&r1=1228498&r2=1228499&view=diff ============================================================================== --- cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/outbound/ManagedConnectionFactoryImpl.java (original) +++ cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/outbound/ManagedConnectionFactoryImpl.java Fri Jan 6 23:24:33 2012 @@ -137,7 +137,7 @@ public class ManagedConnectionFactoryImp LoggerHelper.initializeLoggingOnWriter(printWriter); } - public ManagedConnection matchManagedConnections(Set mcs, Subject subject, + public ManagedConnection matchManagedConnections(@SuppressWarnings("rawtypes") Set mcs, Subject subject, ConnectionRequestInfo reqInfo) throws ResourceException { if (LOG.isLoggable(Level.FINER)) { @@ -146,6 +146,7 @@ public class ManagedConnectionFactoryImp } // find the first managed connection that matches the bus and request info + @SuppressWarnings("rawtypes") Iterator iter = mcs.iterator(); while (iter.hasNext()) { Object obj = iter.next(); Modified: cxf/trunk/integration/jca/src/test/java/org/apache/cxf/jca/jarloader/JarLoaderTest.java URL: http://svn.apache.org/viewvc/cxf/trunk/integration/jca/src/test/java/org/apache/cxf/jca/jarloader/JarLoaderTest.java?rev=1228499&r1=1228498&r2=1228499&view=diff ============================================================================== --- cxf/trunk/integration/jca/src/test/java/org/apache/cxf/jca/jarloader/JarLoaderTest.java (original) +++ cxf/trunk/integration/jca/src/test/java/org/apache/cxf/jca/jarloader/JarLoaderTest.java Fri Jan 6 23:24:33 2012 @@ -55,7 +55,7 @@ public class JarLoaderTest extends Asser LOG.info("URLPath: " + urlPath); - Map map = JarLoader.getJarContents(urlPath + "!/blackbox-notx.jar!/"); + Map map = JarLoader.getJarContents(urlPath + "!/blackbox-notx.jar!/"); assertNotNull("map must not be null", map); assertNotNull("class must be included in map " + map.get("com/sun/connector/blackbox/JdbcDataSource.class")); Modified: cxf/trunk/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaDestination.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaDestination.java?rev=1228499&r1=1228498&r2=1228499&view=diff ============================================================================== --- cxf/trunk/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaDestination.java (original) +++ cxf/trunk/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaDestination.java Fri Jan 6 23:24:33 2012 @@ -450,7 +450,7 @@ public class CorbaDestination implements return ref; } - public String getId(Map contextMap) { + public String getId(Map contextMap) { String id = null; try { Current currentPoa = (Current) orb Modified: cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/osgi/CXFExtensionBundleListener.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/osgi/CXFExtensionBundleListener.java?rev=1228499&r1=1228498&r2=1228499&view=diff ============================================================================== --- cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/osgi/CXFExtensionBundleListener.java (original) +++ cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/osgi/CXFExtensionBundleListener.java Fri Jan 6 23:24:33 2012 @@ -67,7 +67,7 @@ public class CXFExtensionBundleListener } protected void register(final Bundle bundle) { - Enumeration e = bundle.findEntries("META-INF/cxf/", "bus-extensions.txt", false); + Enumeration e = bundle.findEntries("META-INF/cxf/", "bus-extensions.txt", false); while (e != null && e.hasMoreElements()) { List orig = new TextExtensionFragmentParser().getExtensions((URL)e.nextElement()); addExtensions(bundle, orig); Modified: cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/osgi/OSGIBusListener.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/osgi/OSGIBusListener.java?rev=1228499&r1=1228498&r2=1228499&view=diff ============================================================================== --- cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/osgi/OSGIBusListener.java (original) +++ cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/osgi/OSGIBusListener.java Fri Jan 6 23:24:33 2012 @@ -154,7 +154,7 @@ public class OSGIBusListener implements } private Version getBundleVersion(Bundle bundle) { - Dictionary headers = bundle.getHeaders(); + Dictionary headers = bundle.getHeaders(); String version = (String) headers.get(Constants.BUNDLE_VERSION); return (version != null) ? Version.parseVersion(version) : Version.emptyVersion; } Modified: cxf/trunk/rt/databinding/aegis/src/main/generated/org/apache/cxf/aegis/util/jdom/StaxBuilder.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/main/generated/org/apache/cxf/aegis/util/jdom/StaxBuilder.java?rev=1228499&r1=1228498&r2=1228499&view=diff ============================================================================== --- cxf/trunk/rt/databinding/aegis/src/main/generated/org/apache/cxf/aegis/util/jdom/StaxBuilder.java (original) +++ cxf/trunk/rt/databinding/aegis/src/main/generated/org/apache/cxf/aegis/util/jdom/StaxBuilder.java Fri Jan 6 23:24:33 2012 @@ -122,7 +122,7 @@ public class StaxBuilder { private JDOMFactory factory; - private Map additionalNamespaces; + private Map additionalNamespaces; // This is set to 'true' when we are reading the middle of a stream, // and need to stop at the end of the element we start. private boolean isReadingMidStream; @@ -133,16 +133,16 @@ public class StaxBuilder { public StaxBuilder() { } - public StaxBuilder(Map namespaces) { + public StaxBuilder(Map namespaces) { this.additionalNamespaces = namespaces; } - public Map getAdditionalNamespaces() { + public Map getAdditionalNamespaces() { return additionalNamespaces; } - public void setAdditionalNamespaces(Map additionalNamespaces) { + public void setAdditionalNamespaces(Map additionalNamespaces) { this.additionalNamespaces = additionalNamespaces; } @@ -325,9 +325,9 @@ public class StaxBuilder { if (current == null) { // at root doc.setRootElement(newElem); if (additionalNamespaces != null) { - for (Iterator iter = additionalNamespaces.keySet().iterator(); iter.hasNext();) { - String prefix = (String)iter.next(); - String uri = (String)additionalNamespaces.get(prefix); + for (Iterator iter = additionalNamespaces.keySet().iterator(); iter.hasNext();) { + String prefix = iter.next(); + String uri = additionalNamespaces.get(prefix); newElem.addNamespaceDeclaration(Namespace.getNamespace(prefix, uri)); } 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=1228499&r1=1228498&r2=1228499&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 23:24:33 2012 @@ -179,7 +179,7 @@ public class AegisContext { * @param clazz * @return */ - public AegisType getRootType(Class clazz) { + public AegisType getRootType(Class clazz) { if (rootClasses.contains(clazz)) { return typeMapping.getType(clazz); } else { Modified: cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/ElementDataReader.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/ElementDataReader.java?rev=1228499&r1=1228498&r2=1228499&view=diff ============================================================================== --- cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/ElementDataReader.java (original) +++ cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/ElementDataReader.java Fri Jan 6 23:24:33 2012 @@ -68,7 +68,7 @@ public class ElementDataReader implement } /** {@inheritDoc}*/ - public Object read(QName name, Element input, Class typeClass) { + public Object read(QName name, Element input, Class typeClass) { try { // TODO: pay attention to the typeClass parameter. return reader.read(input); Modified: cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/XMLStreamDataReader.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/XMLStreamDataReader.java?rev=1228499&r1=1228498&r2=1228499&view=diff ============================================================================== --- cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/XMLStreamDataReader.java (original) +++ cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/XMLStreamDataReader.java Fri Jan 6 23:24:33 2012 @@ -59,7 +59,7 @@ public class XMLStreamDataReader impleme } } - public Object read(QName name, XMLStreamReader input, Class typeClass) { + public Object read(QName name, XMLStreamReader input, Class typeClass) { MessagePartInfo info = databinding.getPartFromClass(typeClass); return info == null ? read(input) : read(info, input); } 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=1228499&r1=1228498&r2=1228499&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 23:24:33 2012 @@ -153,7 +153,7 @@ public abstract class AbstractTypeCreato } - protected boolean isHolder(Class javaType) { + protected boolean isHolder(Class javaType) { return "javax.xml.ws.Holder".equals(javaType.getName()); } @@ -169,7 +169,7 @@ public abstract class AbstractTypeCreato } - protected boolean isArray(Class javaType) { + protected boolean isArray(Class javaType) { return javaType.isArray() && !javaType.equals(byte[].class); } @@ -229,7 +229,7 @@ public abstract class AbstractTypeCreato return type; } - protected QName createQName(Class javaType) { + protected QName createQName(Class javaType) { String clsName = javaType.getName(); String ns = NamespaceHelper.makeNamespaceFromClassName(clsName, "http"); @@ -238,7 +238,7 @@ public abstract class AbstractTypeCreato return new QName(ns, localName); } - protected boolean isCollection(Class javaType) { + protected boolean isCollection(Class javaType) { return Collection.class.isAssignableFrom(javaType); } @@ -313,13 +313,13 @@ public abstract class AbstractTypeCreato return new QName(tm.getMappingIdentifierURI(), name); } - protected boolean isMap(Class javaType) { + protected boolean isMap(Class javaType) { return Map.class.isAssignableFrom(javaType); } public abstract TypeClassInfo createClassInfo(PropertyDescriptor pd); - protected boolean isEnum(Class javaType) { + protected boolean isEnum(Class javaType) { return false; } @@ -422,7 +422,7 @@ public abstract class AbstractTypeCreato } - public AegisType createType(Class clazz) { + public AegisType createType(Class clazz) { TypeClassInfo info = createBasicClassInfo(clazz); info.setDescription(clazz.toString()); return createTypeForClass(info); Modified: cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/AegisType.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/AegisType.java?rev=1228499&r1=1228498&r2=1228499&view=diff ============================================================================== --- cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/AegisType.java (original) +++ cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/AegisType.java Fri Jan 6 23:24:33 2012 @@ -104,7 +104,7 @@ public abstract class AegisType { * For a generic, return the raw type. For something * truly exotic, return null. */ - public Class getTypeClass() { + public Class getTypeClass() { return TypeUtil.getTypeRelatedClass(typeClass); } Modified: cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/XMLTypeCreator.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/XMLTypeCreator.java?rev=1228499&r1=1228498&r2=1228499&view=diff ============================================================================== --- cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/XMLTypeCreator.java (original) +++ cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/XMLTypeCreator.java Fri Jan 6 23:24:33 2012 @@ -101,7 +101,7 @@ import org.apache.cxf.helpers.XPathUtils */ public class XMLTypeCreator extends AbstractTypeCreator { private static final Logger LOG = LogUtils.getL7dLogger(XMLTypeCreator.class); - private static List stopClasses = new ArrayList(); + private static List> stopClasses = new ArrayList>(); static { stopClasses.add(Object.class); stopClasses.add(Exception.class); @@ -191,7 +191,7 @@ public class XMLTypeCreator extends Abst return doc; } - protected Document getDocument(Class clazz) { + protected Document getDocument(Class clazz) { if (clazz == null) { return null; } @@ -217,7 +217,7 @@ public class XMLTypeCreator extends Abst } @Override - protected boolean isEnum(Class javaType) { + protected boolean isEnum(Class javaType) { Element mapping = findMapping(javaType); if (mapping != null) { return super.isEnum(javaType); @@ -293,7 +293,7 @@ public class XMLTypeCreator extends Abst } protected List findMappings(Type type) { - Class clazz = TypeUtil.getTypeClass(type, false); + Class clazz = TypeUtil.getTypeClass(type, false); List mappings = new ArrayList(); if (clazz == null) { return mappings; @@ -304,18 +304,18 @@ public class XMLTypeCreator extends Abst mappings.add(top); } - Class parent = clazz; + Class parent = clazz; while (true) { // Read mappings for interfaces as well - Class[] interfaces = parent.getInterfaces(); + Class[] interfaces = parent.getInterfaces(); for (int i = 0; i < interfaces.length; i++) { - Class interfaze = interfaces[i]; + Class interfaze = interfaces[i]; List interfaceMappings = findMappings(interfaze); mappings.addAll(interfaceMappings); } - Class sup = parent.getSuperclass(); + Class sup = parent.getSuperclass(); if (sup == null || stopClasses.contains(sup)) { break; @@ -552,7 +552,7 @@ public class XMLTypeCreator extends Abst if (cType instanceof TypeClassInfo) { return createTypeForClass((TypeClassInfo)cType); } else if (cType instanceof Class) { - return createType((Class)cType); + return createType((Class)cType); } else { return null; } @@ -633,7 +633,7 @@ public class XMLTypeCreator extends Abst } } - private Class loadComponentClass(String componentType) { + private Class loadComponentClass(String componentType) { try { return ClassLoaderUtils.loadClass(componentType, getClass()); } catch (ClassNotFoundException e) { @@ -645,7 +645,7 @@ public class XMLTypeCreator extends Abst String type = DOMUtils.getAttributeValueEmptyNull(parameter, "type"); if (type != null) { try { - Class aegisTypeClass = ClassLoaderUtils.loadClass(type, getClass()); + Class aegisTypeClass = ClassLoaderUtils.loadClass(type, getClass()); info.setAegisTypeClass(Java5TypeCreator.castToAegisTypeClass(aegisTypeClass)); } catch (ClassNotFoundException e) { throw new DatabindingException("Unable to load type class " + type, e); @@ -668,16 +668,16 @@ public class XMLTypeCreator extends Abst return null; } // if the method has no params, then more than one mapping is pointless - Class[] parameterTypes = method.getParameterTypes(); + Class[] parameterTypes = method.getParameterTypes(); if (parameterTypes.length == 0) { return nodes.get(0); } // here's the fun part. // we go through the method parameters, ruling out matches for (int i = 0; i < parameterTypes.length; i++) { - Class parameterType = parameterTypes[i]; - for (Iterator iterator = nodes.iterator(); iterator.hasNext();) { - Element element = (Element)iterator.next(); + Class parameterType = parameterTypes[i]; + for (Iterator iterator = nodes.iterator(); iterator.hasNext();) { + Element element = iterator.next(); // first we check if the parameter index is specified Element match = getMatch(element, "parameter[@index='" + i + "']"); if (match != null @@ -700,8 +700,8 @@ public class XMLTypeCreator extends Abst // the best one is the one with the most parameters specified Element bestCandidate = null; int highestSpecified = 0; - for (Iterator iterator = nodes.iterator(); iterator.hasNext();) { - Element element = (Element)iterator.next(); + for (Iterator iterator = nodes.iterator(); iterator.hasNext();) { + Element element = iterator.next(); List params = DOMUtils.getChildrenWithName(element, "", "parameter"); int availableParameters = params.size(); 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=1228499&r1=1228498&r2=1228499&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 23:24:33 2012 @@ -61,7 +61,7 @@ public class ArrayType extends AegisType Context context, boolean asArray) throws DatabindingException { try { - Collection values = readCollection(reader, flatElementName, context); + Collection values = readCollection(reader, flatElementName, context); if (asArray) { return makeArray(getComponentType().getTypeClass(), values); } @@ -92,8 +92,8 @@ public class ArrayType extends AegisType * @return a collection of the objects. * @throws DatabindingException */ - protected Collection readCollection(MessageReader reader, QName flatElementName, - Context context) throws DatabindingException { + protected Collection readCollection(MessageReader reader, QName flatElementName, + Context context) throws DatabindingException { Collection values = createCollection(); /** @@ -145,8 +145,7 @@ public class ArrayType extends AegisType } } - @SuppressWarnings("unchecked") - protected Object makeArray(Class arrayType, Collection values) { + protected Object makeArray(Class arrayType, Collection values) { int i; int n; Object array = null; 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=1228499&r1=1228498&r2=1228499&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 23:24:33 2012 @@ -199,7 +199,7 @@ public class ObjectType extends AegisTyp } } - public AegisType determineType(Context context, Class clazz) { + public AegisType determineType(Context context, Class clazz) { TypeMapping tm = context.getTypeMapping(); if (tm == null) { tm = getTypeMapping(); Modified: cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/XMLBeanTypeInfo.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/XMLBeanTypeInfo.java?rev=1228499&r1=1228498&r2=1228499&view=diff ============================================================================== --- cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/XMLBeanTypeInfo.java (original) +++ cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/XMLBeanTypeInfo.java Fri Jan 6 23:24:33 2012 @@ -20,7 +20,6 @@ package org.apache.cxf.aegis.type.basic; import java.beans.PropertyDescriptor; import java.util.HashMap; -import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.logging.Logger; @@ -38,14 +37,14 @@ import org.apache.cxf.helpers.DOMUtils; public class XMLBeanTypeInfo extends BeanTypeInfo { private static final Logger LOG = LogUtils.getL7dLogger(XMLBeanTypeInfo.class); - private List mappings; + private List mappings; /** * Map used for storing meta data about each property */ private Map name2PropertyInfo = new HashMap(); - public XMLBeanTypeInfo(Class typeClass, List mappings, String defaultNS) { + public XMLBeanTypeInfo(Class typeClass, List mappings, String defaultNS) { super(typeClass, defaultNS); this.mappings = mappings; @@ -177,8 +176,7 @@ public class XMLBeanTypeInfo extends Bea } private Element getPropertyElement(String name2) { - for (Iterator itr = mappings.iterator(); itr.hasNext();) { - Element mapping2 = (Element)itr.next(); + for (Element mapping2 : mappings) { List elements = DOMUtils.getChildrenWithName(mapping2, "", "property"); for (int i = 0; i < elements.size(); i++) { Element e = (Element)elements.get(i); 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=1228499&r1=1228498&r2=1228499&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 23:24:33 2012 @@ -240,7 +240,7 @@ public class SoapArrayType extends Aegis + ", but was " + positionString); } - protected Object makeArray(List values, List dimensions, Class componentType) { + protected Object makeArray(List values, List dimensions, Class componentType) { // if this is an array of arrays, recurse into this function // for each nested array @@ -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()); Modified: cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/encoded/SoapRefType.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/encoded/SoapRefType.java?rev=1228499&r1=1228498&r2=1228499&view=diff ============================================================================== --- cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/encoded/SoapRefType.java (original) +++ cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/encoded/SoapRefType.java Fri Jan 6 23:24:33 2012 @@ -91,11 +91,11 @@ public class SoapRefType extends AegisTy baseType.setTypeMapping(typeMapping); } - public Class getTypeClass() { + public Class getTypeClass() { return baseType.getTypeClass(); } - public void setTypeClass(Class typeClass) { + public void setTypeClass(Class typeClass) { baseType.setTypeClass(typeClass); } Modified: cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/AnnotatedTypeInfo.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/AnnotatedTypeInfo.java?rev=1228499&r1=1228498&r2=1228499&view=diff ============================================================================== --- cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/AnnotatedTypeInfo.java (original) +++ cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/AnnotatedTypeInfo.java Fri Jan 6 23:24:33 2012 @@ -31,12 +31,12 @@ import org.apache.cxf.aegis.util.Namespa public class AnnotatedTypeInfo extends BeanTypeInfo { private final AnnotationReader annotationReader; - public AnnotatedTypeInfo(TypeMapping tm, Class typeClass, + public AnnotatedTypeInfo(TypeMapping tm, Class typeClass, String ns, TypeCreationOptions typeCreationOptions) { this(tm, typeClass, ns, new AnnotationReader(), typeCreationOptions); } - public AnnotatedTypeInfo(TypeMapping tm, Class typeClass, String ns, AnnotationReader annotationReader, + public AnnotatedTypeInfo(TypeMapping tm, Class typeClass, String ns, AnnotationReader annotationReader, TypeCreationOptions typeCreationOptions) { super(typeClass, ns); this.annotationReader = annotationReader; @@ -70,7 +70,7 @@ public class AnnotatedTypeInfo extends B protected boolean registerType(PropertyDescriptor desc) { Method readMethod = desc.getReadMethod(); - Class type = annotationReader.getType(readMethod); + Class type = annotationReader.getType(readMethod); return type == null && super.registerType(desc); } Modified: cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/AnnotationReader.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/AnnotationReader.java?rev=1228499&r1=1228498&r2=1228499&view=diff ============================================================================== --- cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/AnnotationReader.java (original) +++ cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/AnnotationReader.java Fri Jan 6 23:24:33 2012 @@ -84,15 +84,15 @@ public class AnnotationReader { } @SuppressWarnings("unchecked") - public Class getType(AnnotatedElement element) { - Class value = (Class) getAnnotationValue("type", + public Class getType(AnnotatedElement element) { + Class value = (Class) getAnnotationValue("type", element, AegisType.class, XmlAttribute.class, XmlElement.class); // jaxb uses a different default value if (value == null) { - value = (Class) getAnnotationValue("type", + value = (Class) getAnnotationValue("type", element, javax.xml.bind.annotation.XmlElement.DEFAULT.class, XML_ELEMENT); @@ -102,8 +102,8 @@ public class AnnotationReader { } @SuppressWarnings("unchecked") - public Class getParamType(Method method, int index) { - return (Class) getAnnotationValue("type", + public Class getParamType(Method method, int index) { + return (Class) getAnnotationValue("type", method, index, AegisType.class, @@ -111,8 +111,8 @@ public class AnnotationReader { } @SuppressWarnings("unchecked") - public Class getReturnType(AnnotatedElement element) { - return (Class) getAnnotationValue("type", + public Class getReturnType(AnnotatedElement element) { + return (Class) getAnnotationValue("type", element, AegisType.class, XmlReturnType.class); 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=1228499&r1=1228498&r2=1228499&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 23:24:33 2012 @@ -46,7 +46,7 @@ public class EnumType extends AegisType @Override public void writeObject(Object object, MessageWriter writer, Context context) { // match the reader. - writer.writeValue(((Enum)object).name()); + writer.writeValue(((Enum)object).name()); } @Override @@ -77,7 +77,7 @@ public class EnumType extends AegisType List facets = restriction.getFacets(); for (Object constant : constants) { XmlSchemaEnumerationFacet f = new XmlSchemaEnumerationFacet(); - f.setValue(((Enum)constant).name()); + f.setValue(((Enum)constant).name()); facets.add(f); } } Modified: cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/Java5TypeCreator.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/Java5TypeCreator.java?rev=1228499&r1=1228498&r2=1228499&view=diff ============================================================================== --- cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/Java5TypeCreator.java (original) +++ cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/Java5TypeCreator.java Fri Jan 6 23:24:33 2012 @@ -73,7 +73,7 @@ public class Java5TypeCreator extends Ab info.setType(genericType); } - Class paramTypeClass = annotationReader.getParamType(m, index); + Class paramTypeClass = annotationReader.getParamType(m, index); info.setAegisTypeClass(castToAegisTypeClass(paramTypeClass)); String paramName = annotationReader.getParamTypeName(m, index); if (paramName != null) { @@ -159,7 +159,7 @@ public class Java5TypeCreator extends Ab } /* null arises when the index-th parameter to generic is something list List */ - Class clazz = TypeUtil.getTypeRelatedClass(paramType); + Class clazz = TypeUtil.getTypeRelatedClass(paramType); if (clazz == null) { return createObjectType(); } @@ -240,13 +240,13 @@ public class Java5TypeCreator extends Ab } @Override - public QName createQName(Class typeClass) { + public QName createQName(Class typeClass) { String name = annotationReader.getName(typeClass); String ns = annotationReader.getNamespace(typeClass); return createQName(typeClass, null, name, ns); } - private QName createQName(Class typeClass, Type type, String name, String ns) { + private QName createQName(Class typeClass, Type type, String name, String ns) { if (typeClass.isArray()) { typeClass = typeClass.getComponentType(); } @@ -254,7 +254,7 @@ public class Java5TypeCreator extends Ab && type instanceof ParameterizedType) { type = ((ParameterizedType)type).getActualTypeArguments()[0]; if (type instanceof Class) { - typeClass = (Class)type; + typeClass = (Class)type; } } @@ -277,7 +277,7 @@ public class Java5TypeCreator extends Ab } @Override - protected boolean isEnum(Class javaType) { + protected boolean isEnum(Class javaType) { return javaType.isEnum(); } } Modified: cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/XmlAttribute.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/XmlAttribute.java?rev=1228499&r1=1228498&r2=1228499&view=diff ============================================================================== --- cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/XmlAttribute.java (original) +++ cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/XmlAttribute.java Fri Jan 6 23:24:33 2012 @@ -28,7 +28,7 @@ import org.apache.cxf.aegis.type.AegisTy @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.METHOD) public @interface XmlAttribute { - Class type() default AegisType.class; + Class type() default AegisType.class; String name() default ""; Modified: cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/XmlElement.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/XmlElement.java?rev=1228499&r1=1228498&r2=1228499&view=diff ============================================================================== --- cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/XmlElement.java (original) +++ cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/XmlElement.java Fri Jan 6 23:24:33 2012 @@ -28,7 +28,7 @@ import org.apache.cxf.aegis.type.AegisTy @Retention(RetentionPolicy.RUNTIME) @Target({ ElementType.METHOD, ElementType.PARAMETER }) public @interface XmlElement { - Class type() default AegisType.class; + Class type() default AegisType.class; String name() default ""; Modified: cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/XmlParamType.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/XmlParamType.java?rev=1228499&r1=1228498&r2=1228499&view=diff ============================================================================== --- cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/XmlParamType.java (original) +++ cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/XmlParamType.java Fri Jan 6 23:24:33 2012 @@ -34,7 +34,7 @@ import org.apache.cxf.aegis.type.AegisTy @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.PARAMETER) public @interface XmlParamType { - Class type() default AegisType.class; + Class type() default AegisType.class; String name() default ""; Modified: cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/XmlReturnType.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/XmlReturnType.java?rev=1228499&r1=1228498&r2=1228499&view=diff ============================================================================== --- cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/XmlReturnType.java (original) +++ cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/XmlReturnType.java Fri Jan 6 23:24:33 2012 @@ -34,7 +34,7 @@ import org.apache.cxf.aegis.type.AegisTy @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.METHOD) public @interface XmlReturnType { - Class type() default AegisType.class; + Class type() default AegisType.class; String name() default ""; Modified: cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/XmlType.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/XmlType.java?rev=1228499&r1=1228498&r2=1228499&view=diff ============================================================================== --- cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/XmlType.java (original) +++ cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/XmlType.java Fri Jan 6 23:24:33 2012 @@ -28,7 +28,7 @@ import org.apache.cxf.aegis.type.AegisTy @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.TYPE) public @interface XmlType { - Class type() default AegisType.class; + Class type() default AegisType.class; String name() default ""; 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=1228499&r1=1228498&r2=1228499&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 23:24:33 2012 @@ -39,7 +39,7 @@ public final class ServiceUtils { * @param clazz the class. * @return the name. */ - public static String makeServiceNameFromClassName(Class clazz) { + public static String makeServiceNameFromClassName(Class clazz) { String name = clazz.getName(); int last = name.lastIndexOf("."); if (last != -1) { @@ -54,7 +54,7 @@ public final class ServiceUtils { return name; } - public static QName makeQualifiedNameFromClass(Class clazz) { + public static QName makeQualifiedNameFromClass(Class clazz) { String namespace = NamespaceHelper.makeNamespaceFromClassName(clazz.getName(), "http"); String localPart = makeServiceNameFromClassName(clazz); return new QName(namespace, localPart); 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=1228499&r1=1228498&r2=1228499&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 23:24:33 2012 @@ -58,7 +58,6 @@ public class CollectionTest extends Abst tm.setTypeCreator(creator); } - @SuppressWarnings("unchecked") @Test public void testType() throws Exception { Method m = CollectionService.class.getMethod("getStrings", new Class[0]); @@ -78,7 +77,6 @@ public class CollectionTest extends Abst assertTrue(type.getTypeClass().isAssignableFrom(String.class)); } - @SuppressWarnings("unchecked") @Test public void testRecursiveCollections() throws Exception { Method m = CollectionService.class.getMethod("getStringCollections", new Class[0]); @@ -105,7 +103,6 @@ public class CollectionTest extends Abst assertTrue(type.getTypeClass().isAssignableFrom(String.class)); } - @SuppressWarnings("unchecked") @Test public void testPDType() throws Exception { PropertyDescriptor pd = Introspector.getBeanInfo(CollectionDTO.class, Object.class) 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=1228499&r1=1228498&r2=1228499&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 23:24:33 2012 @@ -53,7 +53,6 @@ public class MapTest extends AbstractAeg tm.setTypeCreator(creator); } - @SuppressWarnings("unchecked") @Test public void testType() throws Exception { Method m = MapService.class.getMethod("getMap", new Class[0]); @@ -98,7 +97,6 @@ public class MapTest extends AbstractAeg assertEquals(Double.class, ((CollectionType)type).getComponentType().getTypeClass()); } - @SuppressWarnings("unchecked") @Test public void testPDType() throws Exception { PropertyDescriptor pd = Introspector.getBeanInfo(MapDTO.class, @@ -120,7 +118,6 @@ public class MapTest extends AbstractAeg assertTrue(type.getTypeClass().isAssignableFrom(Integer.class)); } - @SuppressWarnings("unchecked") @Test public void testMapDTO() { tm = new DefaultTypeMapping(); 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=1228499&r1=1228498&r2=1228499&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 23:24:33 2012 @@ -287,6 +287,7 @@ class JAXBContextInitializer extends Ser } XmlJavaTypeAdapter xjta = cls.getAnnotation(XmlJavaTypeAdapter.class); if (xjta != null) { + @SuppressWarnings("rawtypes") Class c2 = xjta.value(); inspectTypeAdapter(c2); } @@ -300,7 +301,7 @@ class JAXBContextInitializer extends Ser } } - private void inspectTypeAdapter(Class aclass) { + private void inspectTypeAdapter(@SuppressWarnings("rawtypes") Class aclass) { Class c2 = aclass; Type sp = c2.getGenericSuperclass(); while (!XmlAdapter.class.equals(c2) && c2 != null) { 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=1228499&r1=1228498&r2=1228499&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 23:24:33 2012 @@ -383,11 +383,11 @@ public class JAXBDataBinding extends Abs return tns; } - public void setExtraClass(Class[] userExtraClass) { + public void setExtraClass(Class[] userExtraClass) { extraClass = userExtraClass; } - public Class[] getExtraClass() { + public Class[] getExtraClass() { return extraClass; } 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=1228499&r1=1228498&r2=1228499&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 23:24:33 2012 @@ -178,7 +178,6 @@ public final class JAXBEncoderDecoder { private JAXBEncoderDecoder() { } - @SuppressWarnings("unchecked") public static void marshall(Marshaller marshaller, Object elValue, MessagePartInfo part, @@ -224,7 +223,7 @@ public final class JAXBEncoderDecoder { && ((XmlSchemaSimpleType)el.getSchemaType()). getContent() instanceof XmlSchemaSimpleTypeList) { mObj = Arrays.asList((Object[])mObj); - writeObject(marshaller, source, new JAXBElement(elName, cls, mObj)); + writeObject(marshaller, source, newJAXBElement(elName, cls, mObj)); } else if (part.getMessageInfo().getOperation().isUnwrapped() && (mObj.getClass().isArray() || mObj instanceof List) && el.getMaxOccurs() != 1) { @@ -233,20 +232,20 @@ public final class JAXBEncoderDecoder { elName, mObj); } else { - writeObject(marshaller, source, new JAXBElement(elName, cls, mObj)); + writeObject(marshaller, source, newJAXBElement(elName, cls, mObj)); } } else if (byte[].class == cls && part.getTypeQName() != null && part.getTypeQName().getLocalPart().equals("hexBinary")) { mObj = new HexBinaryAdapter().marshal((byte[])mObj); - writeObject(marshaller, source, new JAXBElement(elName, String.class, mObj)); + writeObject(marshaller, source, newJAXBElement(elName, String.class, mObj)); } else if (mObj instanceof JAXBElement) { writeObject(marshaller, source, mObj); } else if (marshaller.getSchema() != null) { //force xsi:type so types can be validated instead of trying to //use the RPC/lit element names that aren't in the schema - writeObject(marshaller, source, new JAXBElement(elName, Object.class, mObj)); + writeObject(marshaller, source, newJAXBElement(elName, Object.class, mObj)); } else { - writeObject(marshaller, source, new JAXBElement(elName, cls, mObj)); + writeObject(marshaller, source, newJAXBElement(elName, cls, mObj)); } } else { writeObject(marshaller, source, mObj); @@ -264,6 +263,11 @@ public final class JAXBEncoderDecoder { } } } + @SuppressWarnings({ "unchecked", "rawtypes" }) + private static JAXBElement newJAXBElement(QName elName, Class cls, Object mObj) { + return new JAXBElement(elName, cls, mObj); + } + //TODO: cache the JAXBRIContext public static void marshalWithBridge(QName qname, Class cls, @@ -334,9 +338,7 @@ public final class JAXBEncoderDecoder { } } - - @SuppressWarnings("unchecked") public static void marshallException(Marshaller marshaller, Exception elValue, MessagePartInfo part, Object source) { XMLStreamWriter writer = getStreamWriter(source); @@ -370,7 +372,7 @@ public final class JAXBEncoderDecoder { if (JAXBSchemaInitializer.isArray(f.getGenericType())) { writeArrayObject(marshaller, writer, fname, f.get(elValue)); } else { - writeObject(marshaller, writer, new JAXBElement(fname, String.class, + writeObject(marshaller, writer, newJAXBElement(fname, String.class, f.get(elValue))); } } @@ -385,7 +387,7 @@ public final class JAXBEncoderDecoder { if (JAXBSchemaInitializer.isArray(m.getGenericReturnType())) { writeArrayObject(marshaller, writer, mname, m.invoke(elValue)); } else { - writeObject(marshaller, writer, new JAXBElement(mname, String.class, + writeObject(marshaller, writer, newJAXBElement(mname, String.class, m.invoke(elValue))); } } @@ -398,7 +400,6 @@ public final class JAXBEncoderDecoder { } } - @SuppressWarnings("unchecked") private static void writeArrayObject(Marshaller marshaller, Object source, QName mname, @@ -422,7 +423,7 @@ public final class JAXBEncoderDecoder { for (int x = 0; x < len; x++) { Object o = Array.get(objArray, x); writeObject(marshaller, source, - new JAXBElement(mname, cls == null ? o.getClass() : cls, o)); + newJAXBElement(mname, cls == null ? o.getClass() : cls, o)); } } @@ -571,13 +572,12 @@ public final class JAXBEncoderDecoder { } - @SuppressWarnings("unchecked") public static void marshallNullElement(Marshaller marshaller, Object source, MessagePartInfo part) { Class clazz = part != null ? (Class)part.getTypeClass() : null; try { - writeObject(marshaller, source, new JAXBElement(part.getElementQName(), clazz, null)); + writeObject(marshaller, source, newJAXBElement(part.getElementQName(), clazz, null)); } catch (JAXBException e) { throw new Fault(new Message("MARSHAL_ERROR", LOG, e.getMessage()), e); } @@ -880,7 +880,7 @@ public final class JAXBEncoderDecoder { Field f = ReflectionUtil.getDeclaredField(c.getClass(), "fNamespaceContext"); f.setAccessible(true); Object c2 = f.get(c); - Enumeration enm = (Enumeration)c2.getClass().getMethod("getAllPrefixes").invoke(c2); + Enumeration enm = (Enumeration)c2.getClass().getMethod("getAllPrefixes").invoke(c2); while (enm.hasMoreElements()) { String s = (String)enm.nextElement(); if (s == null) { @@ -988,7 +988,7 @@ public final class JAXBEncoderDecoder { while (reader.getName().equals(elName)) { Object obj = u.unmarshal(reader, clazz); if (obj instanceof JAXBElement) { - obj = ((JAXBElement)obj).getValue(); + obj = ((JAXBElement)obj).getValue(); } ret.add(obj); while (reader.getEventType() != XMLStreamConstants.START_ELEMENT 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=1228499&r1=1228498&r2=1228499&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 23:24:33 2012 @@ -261,7 +261,8 @@ class JAXBSchemaInitializer extends Serv return null; } - private JAXBBeanInfo findFromTypeAdapter(Class aclass) { + private JAXBBeanInfo findFromTypeAdapter(@SuppressWarnings("rawtypes") + Class aclass) { Class c2 = aclass; Type sp = c2.getGenericSuperclass(); while (!XmlAdapter.class.equals(c2) && c2 != null) { 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=1228499&r1=1228498&r2=1228499&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 23:24:33 2012 @@ -42,7 +42,7 @@ public class JAXBWrapperHelper extends A } @Override - protected Object createWrapperObject(Class typeClass) throws Exception { + protected Object createWrapperObject(Class typeClass) throws Exception { return typeClass.newInstance(); } Modified: cxf/trunk/rt/databinding/jibx/src/main/java/org/apache/cxf/jibx/JibxDataReader.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/jibx/src/main/java/org/apache/cxf/jibx/JibxDataReader.java?rev=1228499&r1=1228498&r2=1228499&view=diff ============================================================================== --- cxf/trunk/rt/databinding/jibx/src/main/java/org/apache/cxf/jibx/JibxDataReader.java (original) +++ cxf/trunk/rt/databinding/jibx/src/main/java/org/apache/cxf/jibx/JibxDataReader.java Fri Jan 6 23:24:33 2012 @@ -61,7 +61,7 @@ public class JibxDataReader implements D } } - public Object read(QName elementQName, XMLStreamReader input, Class type) { + public Object read(QName elementQName, XMLStreamReader input, Class type) { throw new UnsupportedOperationException("Not Implemented"); } @@ -74,7 +74,8 @@ public class JibxDataReader implements D public void setSchema(Schema s) { } - private static UnmarshallingContext getUnmarshallingContext(XMLStreamReader reader, Class jtype) + private static UnmarshallingContext getUnmarshallingContext(XMLStreamReader reader, + Class jtype) throws JiBXException { IBindingFactory factory; if (JibxSimpleTypes.isSimpleType(jtype)) { 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=1228499&r1=1228498&r2=1228499&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 23:24:33 2012 @@ -169,13 +169,13 @@ public final class JibxSimpleTypes { return value.toString(); } - public static boolean isSimpleType(final Class type) { + public static boolean isSimpleType(final Class type) { String jtype = type.getName(); return simplePrimitiveTypeMap.containsKey(jtype) || simpleObjectTypeMap.containsKey(jtype) || "void".equals(jtype); } - public static QName schemaType(final Class type) { + public static QName schemaType(final Class type) { String jtype = type.getName(); QName stype = (QName)simplePrimitiveTypeMap.get(jtype); if (stype == null) { 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=1228499&r1=1228498&r2=1228499&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 23:24:33 2012 @@ -168,7 +168,7 @@ public final class JibxUtil { || "void".equals(type); } - public static boolean isSimpleValue(final Class type) { + public static boolean isSimpleValue(final Class type) { return isSimpleValue(type.getName()); } Modified: cxf/trunk/rt/databinding/jibx/src/main/java/org/apache/cxf/jibx/JibxWrapperHelper.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/jibx/src/main/java/org/apache/cxf/jibx/JibxWrapperHelper.java?rev=1228499&r1=1228498&r2=1228499&view=diff ============================================================================== --- cxf/trunk/rt/databinding/jibx/src/main/java/org/apache/cxf/jibx/JibxWrapperHelper.java (original) +++ cxf/trunk/rt/databinding/jibx/src/main/java/org/apache/cxf/jibx/JibxWrapperHelper.java Fri Jan 6 23:24:33 2012 @@ -34,7 +34,7 @@ public class JibxWrapperHelper extends A } @Override - protected Object createWrapperObject(Class clazz) throws Exception { + protected Object createWrapperObject(Class clazz) throws Exception { return clazz.newInstance(); } Modified: cxf/trunk/rt/databinding/sdo/src/main/java/org/apache/cxf/sdo/DataReaderImpl.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/sdo/src/main/java/org/apache/cxf/sdo/DataReaderImpl.java?rev=1228499&r1=1228498&r2=1228499&view=diff ============================================================================== --- cxf/trunk/rt/databinding/sdo/src/main/java/org/apache/cxf/sdo/DataReaderImpl.java (original) +++ cxf/trunk/rt/databinding/sdo/src/main/java/org/apache/cxf/sdo/DataReaderImpl.java Fri Jan 6 23:24:33 2012 @@ -70,7 +70,7 @@ public class DataReaderImpl implements D return null; } - public Object read(QName name, XMLStreamReader input, Class type) { + public Object read(QName name, XMLStreamReader input, Class type) { return read(null, input); } Modified: cxf/trunk/rt/databinding/xmlbeans/src/main/java/org/apache/cxf/xmlbeans/DataReaderImpl.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/xmlbeans/src/main/java/org/apache/cxf/xmlbeans/DataReaderImpl.java?rev=1228499&r1=1228498&r2=1228499&view=diff ============================================================================== --- cxf/trunk/rt/databinding/xmlbeans/src/main/java/org/apache/cxf/xmlbeans/DataReaderImpl.java (original) +++ cxf/trunk/rt/databinding/xmlbeans/src/main/java/org/apache/cxf/xmlbeans/DataReaderImpl.java Fri Jan 6 23:24:33 2012 @@ -67,7 +67,7 @@ public class DataReaderImpl implements D unwrap); } - public Object read(QName name, XMLStreamReader reader, Class typeClass) { + public Object read(QName name, XMLStreamReader reader, Class typeClass) { SchemaType st = null; try { Field f = typeClass.getField("type"); Modified: cxf/trunk/rt/databinding/xmlbeans/src/main/java/org/apache/cxf/xmlbeans/XmlBeansWrapperHelper.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/xmlbeans/src/main/java/org/apache/cxf/xmlbeans/XmlBeansWrapperHelper.java?rev=1228499&r1=1228498&r2=1228499&view=diff ============================================================================== --- cxf/trunk/rt/databinding/xmlbeans/src/main/java/org/apache/cxf/xmlbeans/XmlBeansWrapperHelper.java (original) +++ cxf/trunk/rt/databinding/xmlbeans/src/main/java/org/apache/cxf/xmlbeans/XmlBeansWrapperHelper.java Fri Jan 6 23:24:33 2012 @@ -44,7 +44,7 @@ public class XmlBeansWrapperHelper exten } @Override - protected Object createWrapperObject(Class typeClass) throws Exception { + protected Object createWrapperObject(Class typeClass) throws Exception { Class cls[] = typeClass.getDeclaredClasses(); Method newType = null; for (Method method : typeClass.getMethods()) { Modified: cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/WebClient.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/WebClient.java?rev=1228499&r1=1228498&r2=1228499&view=diff ============================================================================== --- cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/WebClient.java (original) +++ cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/WebClient.java Fri Jan 6 23:24:33 2012 @@ -347,7 +347,7 @@ public class WebClient extends AbstractC Class memberClass) { Response r = doInvoke(httpMethod, body, null, Collection.class, new ParameterizedCollectionType(memberClass)); - return CastUtils.cast((Collection)r.getEntity(), memberClass); + return CastUtils.cast((Collection)r.getEntity(), memberClass); } /** @@ -387,7 +387,7 @@ public class WebClient extends AbstractC Class responseClass) { Response r = doInvoke("POST", collection, new ParameterizedCollectionType(memberClass), Collection.class, new ParameterizedCollectionType(responseClass)); - return CastUtils.cast((Collection)r.getEntity(), responseClass); + return CastUtils.cast((Collection)r.getEntity(), responseClass); } /** @@ -689,10 +689,10 @@ public class WebClient extends AbstractC Exchange exchange, Map invContext) throws Throwable { - Map reqContext = CastUtils.cast((Map)invContext.get(REQUEST_CONTEXT)); + Map reqContext = CastUtils.cast((Map)invContext.get(REQUEST_CONTEXT)); String httpMethod = (String)reqContext.get(Message.HTTP_REQUEST_METHOD); Type inType = (Type)reqContext.get(REQUEST_TYPE); - Class respClass = (Class)reqContext.get(RESPONSE_CLASS); + Class respClass = (Class)reqContext.get(RESPONSE_CLASS); Type outType = (Type)reqContext.get(RESPONSE_TYPE); return doChainedInvocation(httpMethod, headers, body, inType, respClass, outType, exchange, invContext); @@ -792,7 +792,7 @@ public class WebClient extends AbstractC return; } MultivaluedMap headers = - (MultivaluedMap)outMessage.get(Message.PROTOCOL_HEADERS); + (MultivaluedMap)outMessage.get(Message.PROTOCOL_HEADERS); Object body = objs.get(0); Map requestContext = WebClient.this.getRequestContext(outMessage);