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 2007/02/26 23:49:12 UTC
svn commit: r512052 - in /incubator/cxf/trunk:
api/src/main/java/org/apache/cxf/extension/
api/src/main/java/org/apache/cxf/phase/
api/src/test/java/org/apache/cxf/phase/
api/src/test/java/org/apache/cxf/ws/policy/builder/jaxb/
common/common/src/main/j...
Author: dkulp
Date: Mon Feb 26 14:49:09 2007
New Revision: 512052
URL: http://svn.apache.org/viewvc?view=rev&rev=512052
Log:
Minor code cleanup
* Remove a bunch of SuppressWarnings
* Remove log4j from a couple places
Modified:
incubator/cxf/trunk/api/src/main/java/org/apache/cxf/extension/BusExtension.java
incubator/cxf/trunk/api/src/main/java/org/apache/cxf/phase/PhaseInterceptorChain.java
incubator/cxf/trunk/api/src/test/java/org/apache/cxf/phase/PhaseInterceptorChainTest.java
incubator/cxf/trunk/api/src/test/java/org/apache/cxf/ws/policy/builder/jaxb/JaxbAssertionBuilderTest.java
incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/common/util/CollectionUtils.java
incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/configuration/spring/SpringBeanMap.java
incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/helpers/CastUtils.java
incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/jaxb/WrapperHelper.java
incubator/cxf/trunk/common/common/src/test/java/org/apache/cxf/common/util/CollectionUtilsTest.java
incubator/cxf/trunk/common/common/src/test/java/org/apache/cxf/configuration/spring/SpringBeanMapTest.java
incubator/cxf/trunk/common/common/src/test/java/org/apache/cxf/configuration/spring/SpringBeanQNameMapTest.java
incubator/cxf/trunk/integration/jbi/src/main/java/org/apache/cxf/jbi/se/JarLoader.java
incubator/cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/jarloader/JarLoader.java
incubator/cxf/trunk/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/ProxyInvocationHandlerTest.java
incubator/cxf/trunk/parent/pom.xml
incubator/cxf/trunk/rt/bindings/http/src/main/java/org/apache/cxf/binding/http/interceptor/ContentTypeOutInterceptor.java
incubator/cxf/trunk/rt/bindings/http/src/main/java/org/apache/cxf/binding/http/interceptor/URIParameterOutInterceptor.java
incubator/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBinding.java
incubator/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapActionInterceptor.java
incubator/cxf/trunk/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapActionInterceptorTest.java
incubator/cxf/trunk/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapBindingTest.java
incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java
incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/AbstractFaultChainIntiatorObserver.java
incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/phase/PhaseManagerImpl.java
incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLDefinitionBuilder.java
incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLServiceBuilder.java
incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/extension/ExtensionManagerTest.java
incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/DispatchImpl.java
incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointImpl.java
incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointPublisherImpl.java
incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JAXWSMethodInvoker.java
incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/soap/SOAPHandlerInterceptor.java
incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/DispatchInInterceptor.java
incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/DispatchOutInterceptor.java
incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/HolderInInterceptor.java
incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/HolderOutInterceptor.java
incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperClassOutInterceptor.java
incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsImplementorInfo.java
incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBean.java
incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ConfiguredEndpointTest.java
incubator/cxf/trunk/rt/management/pom.xml
incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPDestination.java
incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/JettyHTTPDestination.java
incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/CXFServlet.java
incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletDestination.java
incubator/cxf/trunk/rt/transports/http2/src/main/java/org/apache/cxf/transport/http/AbstractHTTPDestination.java
incubator/cxf/trunk/rt/transports/http2/src/main/java/org/apache/cxf/transport/http/JettyHTTPDestination.java
incubator/cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/soap/MAPCodec.java
incubator/cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/soap/VersionTransformer.java
incubator/cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/AssertionBuilderRegistryImpl.java
incubator/cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyBuilderImpl.java
incubator/cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyEngine.java
incubator/cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyInterceptorProviderRegistryImpl.java
incubator/cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/attachment/external/DomainExpressionBuilderRegistry.java
incubator/cxf/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/soap/RetransmissionQueueImplTest.java
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/handlers/HandlerTestImpl.java
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/handlers/TestHandlerBase.java
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/provider/AttachmentStreamSourceXMLProvider.java
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/rest/RestClientServerHttpBindingTest.java
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/rest/RestClientServerTest.java
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/rest/RestSourcePayloadProvider.java
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/rest/RestSourcePayloadProviderHttpBinding.java
Modified: incubator/cxf/trunk/api/src/main/java/org/apache/cxf/extension/BusExtension.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/api/src/main/java/org/apache/cxf/extension/BusExtension.java?view=diff&rev=512052&r1=512051&r2=512052
==============================================================================
--- incubator/cxf/trunk/api/src/main/java/org/apache/cxf/extension/BusExtension.java (original)
+++ incubator/cxf/trunk/api/src/main/java/org/apache/cxf/extension/BusExtension.java Mon Feb 26 14:49:09 2007
@@ -21,5 +21,5 @@
public interface BusExtension {
- Class getRegistrationType();
+ Class<?> getRegistrationType();
}
Modified: incubator/cxf/trunk/api/src/main/java/org/apache/cxf/phase/PhaseInterceptorChain.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/api/src/main/java/org/apache/cxf/phase/PhaseInterceptorChain.java?view=diff&rev=512052&r1=512051&r2=512052
==============================================================================
--- incubator/cxf/trunk/api/src/main/java/org/apache/cxf/phase/PhaseInterceptorChain.java (original)
+++ incubator/cxf/trunk/api/src/main/java/org/apache/cxf/phase/PhaseInterceptorChain.java Mon Feb 26 14:49:09 2007
@@ -232,7 +232,6 @@
* @param message the message
* @throws Exception
*/
- @SuppressWarnings("unchecked")
public boolean doInterceptInSubChain(Message message) {
subChainState.push(State.SUBCHAIN_EXECUTING);
boolean result = doIntercept(message);
Modified: incubator/cxf/trunk/api/src/test/java/org/apache/cxf/phase/PhaseInterceptorChainTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/api/src/test/java/org/apache/cxf/phase/PhaseInterceptorChainTest.java?view=diff&rev=512052&r1=512051&r2=512052
==============================================================================
--- incubator/cxf/trunk/api/src/test/java/org/apache/cxf/phase/PhaseInterceptorChainTest.java (original)
+++ incubator/cxf/trunk/api/src/test/java/org/apache/cxf/phase/PhaseInterceptorChainTest.java Mon Feb 26 14:49:09 2007
@@ -102,7 +102,6 @@
assertTrue(!it.hasNext());
}
- @SuppressWarnings("unchecked")
public void testAddTwoInterceptorsSamePhase() {
AbstractPhaseInterceptor p1 = setUpPhaseInterceptor("phase1", "p1");
Set<String> after = new HashSet<String>();
@@ -181,7 +180,6 @@
chain.doIntercept(message);
}
- @SuppressWarnings("unchecked")
public void testThreeInterceptorsInSamePhaseSecondFail() {
AbstractPhaseInterceptor p1 = setUpPhaseInterceptor("phase1", "p1");
setUpPhaseInterceptorInvocations(p1, false, true);
@@ -352,7 +350,6 @@
return setUpPhaseInterceptor(phase, id, null);
}
- @SuppressWarnings("unchecked")
AbstractPhaseInterceptor setUpPhaseInterceptor(String phase, String id,
Set<String> a) {
AbstractPhaseInterceptor p = control
@@ -373,8 +370,8 @@
p.handleMessage(message);
if (fail) {
EasyMock.expectLastCall().andThrow(new RuntimeException());
- message.setContent(EasyMock.isA(Class.class), EasyMock
- .isA(Exception.class));
+ message.setContent(EasyMock.isA(Class.class),
+ EasyMock.isA(Exception.class));
EasyMock.expectLastCall();
} else {
EasyMock.expectLastCall();
Modified: incubator/cxf/trunk/api/src/test/java/org/apache/cxf/ws/policy/builder/jaxb/JaxbAssertionBuilderTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/api/src/test/java/org/apache/cxf/ws/policy/builder/jaxb/JaxbAssertionBuilderTest.java?view=diff&rev=512052&r1=512051&r2=512052
==============================================================================
--- incubator/cxf/trunk/api/src/test/java/org/apache/cxf/ws/policy/builder/jaxb/JaxbAssertionBuilderTest.java (original)
+++ incubator/cxf/trunk/api/src/test/java/org/apache/cxf/ws/policy/builder/jaxb/JaxbAssertionBuilderTest.java Mon Feb 26 14:49:09 2007
@@ -59,7 +59,6 @@
assertSame(qn, ab.getKnownElements().iterator().next());
}
- @SuppressWarnings("unchecked")
public void testBuild() throws Exception {
QName qn = new QName("http://cxf.apache.org/test/assertions/foo", "FooType");
JaxbAssertionBuilder<FooType> ab = new JaxbAssertionBuilder<FooType>(FooType.class, qn);
Modified: incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/common/util/CollectionUtils.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/common/util/CollectionUtils.java?view=diff&rev=512052&r1=512051&r2=512052
==============================================================================
--- incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/common/util/CollectionUtils.java (original)
+++ incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/common/util/CollectionUtils.java Mon Feb 26 14:49:09 2007
@@ -28,13 +28,12 @@
}
- @SuppressWarnings("unchecked")
- public static Collection diff(Collection c1, Collection c2) {
+ public static <T> Collection<T> diff(Collection<T> c1, Collection<T> c2) {
if (c1 == null || c1.size() == 0 || c2 == null || c2.size() == 0) {
return c1;
}
- Collection difference = new ArrayList();
- for (Object item : c1) {
+ Collection<T> difference = new ArrayList<T>();
+ for (T item : c1) {
if (!c2.contains(item)) {
difference.add(item);
}
@@ -42,11 +41,11 @@
return difference;
}
- public static boolean isEmpty(Collection c) {
+ public static <T> boolean isEmpty(Collection<T> c) {
if (c == null || c.size() == 0) {
return true;
}
- for (Iterator iter = c.iterator(); iter.hasNext();) {
+ for (Iterator<T> iter = c.iterator(); iter.hasNext();) {
if (iter.next() != null) {
return false;
}
Modified: incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/configuration/spring/SpringBeanMap.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/configuration/spring/SpringBeanMap.java?view=diff&rev=512052&r1=512051&r2=512052
==============================================================================
--- incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/configuration/spring/SpringBeanMap.java (original)
+++ incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/configuration/spring/SpringBeanMap.java Mon Feb 26 14:49:09 2007
@@ -57,7 +57,6 @@
processBeans(context);
}
- @SuppressWarnings("unchecked")
private void processBeans(ApplicationContext beanFactory) {
if (beanFactory == null) {
return;
Modified: incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/helpers/CastUtils.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/helpers/CastUtils.java?view=diff&rev=512052&r1=512051&r2=512052
==============================================================================
--- incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/helpers/CastUtils.java (original)
+++ incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/helpers/CastUtils.java Mon Feb 26 14:49:09 2007
@@ -20,6 +20,7 @@
package org.apache.cxf.helpers;
import java.util.Collection;
+import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -52,6 +53,14 @@
return (List<T>)p;
}
+ public static <T> Iterator<T> cast(Iterator<?> p) {
+ return (Iterator<T>)p;
+ }
+
+ public static <T> Iterator<T> cast(Iterator<?> p, Class<T> cls) {
+ return (Iterator<T>)p;
+ }
+
public static <T> Set<T> cast(Set<?> p) {
return (Set<T>)p;
}
Modified: incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/jaxb/WrapperHelper.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/jaxb/WrapperHelper.java?view=diff&rev=512052&r1=512051&r2=512052
==============================================================================
--- incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/jaxb/WrapperHelper.java (original)
+++ incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/jaxb/WrapperHelper.java Mon Feb 26 14:49:09 2007
@@ -87,7 +87,7 @@
}
}
}
- @SuppressWarnings("unchecked")
+
private static boolean setJAXBElementValueIntoWrapType(Method method, Object wrapType, Object value) {
String typeClassName = wrapType.getClass().getCanonicalName();
String objectFactoryClassName = typeClassName.substring(0, typeClassName.lastIndexOf('.'))
Modified: incubator/cxf/trunk/common/common/src/test/java/org/apache/cxf/common/util/CollectionUtilsTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/common/common/src/test/java/org/apache/cxf/common/util/CollectionUtilsTest.java?view=diff&rev=512052&r1=512051&r2=512052
==============================================================================
--- incubator/cxf/trunk/common/common/src/test/java/org/apache/cxf/common/util/CollectionUtilsTest.java (original)
+++ incubator/cxf/trunk/common/common/src/test/java/org/apache/cxf/common/util/CollectionUtilsTest.java Mon Feb 26 14:49:09 2007
@@ -28,9 +28,9 @@
public class CollectionUtilsTest extends TestCase {
public void testDiff() throws Exception {
- List l1 = Arrays.asList(new String[]{"1", "2", "3"});
- List l2 = Arrays.asList(new String[]{"2", "4", "5"});
- Collection l3 = CollectionUtils.diff(l1, l2);
+ List<String> l1 = Arrays.asList(new String[]{"1", "2", "3"});
+ List<String> l2 = Arrays.asList(new String[]{"2", "4", "5"});
+ Collection<String> l3 = CollectionUtils.diff(l1, l2);
assertTrue(l3.size() == 2);
assertTrue(l3.contains("1"));
assertTrue(l3.contains("3"));
@@ -46,7 +46,7 @@
}
public void testIsEmpty() throws Exception {
- List l = Arrays.asList(new String[]{null, null});
+ List<String> l = Arrays.asList(new String[]{null, null});
assertNotNull(l);
assertTrue(CollectionUtils.isEmpty(l));
}
Modified: incubator/cxf/trunk/common/common/src/test/java/org/apache/cxf/configuration/spring/SpringBeanMapTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/common/common/src/test/java/org/apache/cxf/configuration/spring/SpringBeanMapTest.java?view=diff&rev=512052&r1=512051&r2=512052
==============================================================================
--- incubator/cxf/trunk/common/common/src/test/java/org/apache/cxf/configuration/spring/SpringBeanMapTest.java (original)
+++ incubator/cxf/trunk/common/common/src/test/java/org/apache/cxf/configuration/spring/SpringBeanMapTest.java Mon Feb 26 14:49:09 2007
@@ -25,15 +25,15 @@
import junit.framework.TestCase;
+import org.apache.cxf.helpers.CastUtils;
import org.springframework.context.support.ClassPathXmlApplicationContext;
public class SpringBeanMapTest extends TestCase {
- @SuppressWarnings("unchecked")
public void testPersons() {
ClassPathXmlApplicationContext context =
new ClassPathXmlApplicationContext("org/apache/cxf/configuration/spring/beanMap.xml");
- Map<String, Person> beans = (Map<String, Person>)context.getBean("mapOfPersons");
+ Map<String, Person> beans = CastUtils.cast((Map)context.getBean("mapOfPersons"));
assertNotNull(beans);
assertEquals(2, beans.size());
Modified: incubator/cxf/trunk/common/common/src/test/java/org/apache/cxf/configuration/spring/SpringBeanQNameMapTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/common/common/src/test/java/org/apache/cxf/configuration/spring/SpringBeanQNameMapTest.java?view=diff&rev=512052&r1=512051&r2=512052
==============================================================================
--- incubator/cxf/trunk/common/common/src/test/java/org/apache/cxf/configuration/spring/SpringBeanQNameMapTest.java (original)
+++ incubator/cxf/trunk/common/common/src/test/java/org/apache/cxf/configuration/spring/SpringBeanQNameMapTest.java Mon Feb 26 14:49:09 2007
@@ -27,16 +27,16 @@
import junit.framework.TestCase;
+import org.apache.cxf.helpers.CastUtils;
import org.springframework.context.support.ClassPathXmlApplicationContext;
public class SpringBeanQNameMapTest extends TestCase {
- @SuppressWarnings("unchecked")
public void testPersons() {
ClassPathXmlApplicationContext context =
new ClassPathXmlApplicationContext("org/apache/cxf/configuration/spring/beanQNameMap.xml");
- Map<QName, Person> beans = (Map<QName, Person>)context.getBean("committers");
+ Map<QName, Person> beans = CastUtils.cast((Map)context.getBean("committers"));
assertNotNull(beans);
assertEquals(2, PersonQNameImpl.getLoadCount());
Modified: incubator/cxf/trunk/integration/jbi/src/main/java/org/apache/cxf/jbi/se/JarLoader.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/integration/jbi/src/main/java/org/apache/cxf/jbi/se/JarLoader.java?view=diff&rev=512052&r1=512051&r2=512052
==============================================================================
--- incubator/cxf/trunk/integration/jbi/src/main/java/org/apache/cxf/jbi/se/JarLoader.java (original)
+++ incubator/cxf/trunk/integration/jbi/src/main/java/org/apache/cxf/jbi/se/JarLoader.java Mon Feb 26 14:49:09 2007
@@ -32,6 +32,8 @@
import java.util.zip.ZipEntry;
import java.util.zip.ZipInputStream;
+import org.apache.cxf.helpers.CastUtils;
+
/**
* load jars to memory from an archive
@@ -60,7 +62,6 @@
return (Map)archives.get(path);
}
- @SuppressWarnings("unchecked")
private static void loadArchive(String path) throws MalformedURLException, IOException {
List<String> nameComponents = tokenizePathComponents(path);
@@ -74,8 +75,8 @@
// This byte array has now been exploded into a Map so the raw bytes are
// no longer needed, replace the entry with the exploded Map
//
- Map parentMap =
- (Map)archives.get(buildPartialName(nameComponents, i));
+ Map<String, Object> parentMap =
+ CastUtils.cast((Map)archives.get(buildPartialName(nameComponents, i)));
Map archiveMap =
(Map)archives.get(buildPartialName(nameComponents, i + 1));
Modified: incubator/cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/jarloader/JarLoader.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/jarloader/JarLoader.java?view=diff&rev=512052&r1=512051&r2=512052
==============================================================================
--- incubator/cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/jarloader/JarLoader.java (original)
+++ incubator/cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/jarloader/JarLoader.java Mon Feb 26 14:49:09 2007
@@ -32,6 +32,8 @@
import java.util.zip.ZipEntry;
import java.util.zip.ZipInputStream;
+import org.apache.cxf.helpers.CastUtils;
+
/**
* load jars to memory from an archive
@@ -60,7 +62,6 @@
return (Map)archives.get(path);
}
- @SuppressWarnings("unchecked")
private static void loadArchive(String path) throws MalformedURLException, IOException {
List<String> nameComponents = tokenizePathComponents(path);
@@ -74,8 +75,8 @@
// This byte array has now been exploded into a Map so the raw bytes are
// no longer needed, replace the entry with the exploded Map
//
- Map parentMap =
- (Map)archives.get(buildPartialName(nameComponents, i));
+ Map<String, Object> parentMap =
+ CastUtils.cast((Map)archives.get(buildPartialName(nameComponents, i)));
Map archiveMap =
(Map)archives.get(buildPartialName(nameComponents, i + 1));
Modified: incubator/cxf/trunk/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/ProxyInvocationHandlerTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/ProxyInvocationHandlerTest.java?view=diff&rev=512052&r1=512051&r2=512052
==============================================================================
--- incubator/cxf/trunk/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/ProxyInvocationHandlerTest.java (original)
+++ incubator/cxf/trunk/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/ProxyInvocationHandlerTest.java Mon Feb 26 14:49:09 2007
@@ -40,7 +40,6 @@
}
- @SuppressWarnings("unchecked")
public void setUp() {
super.setUp();
data = new CXFInvocationHandlerDataImpl();
Modified: incubator/cxf/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/parent/pom.xml?view=diff&rev=512052&r1=512051&r2=512052
==============================================================================
--- incubator/cxf/trunk/parent/pom.xml (original)
+++ incubator/cxf/trunk/parent/pom.xml Mon Feb 26 14:49:09 2007
@@ -504,6 +504,24 @@
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
<version>${spring.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>logkit</groupId>
+ <artifactId>logkit</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>avalon-framework</groupId>
+ <artifactId>avalon-framework</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
Modified: incubator/cxf/trunk/rt/bindings/http/src/main/java/org/apache/cxf/binding/http/interceptor/ContentTypeOutInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/http/src/main/java/org/apache/cxf/binding/http/interceptor/ContentTypeOutInterceptor.java?view=diff&rev=512052&r1=512051&r2=512052
==============================================================================
--- incubator/cxf/trunk/rt/bindings/http/src/main/java/org/apache/cxf/binding/http/interceptor/ContentTypeOutInterceptor.java (original)
+++ incubator/cxf/trunk/rt/bindings/http/src/main/java/org/apache/cxf/binding/http/interceptor/ContentTypeOutInterceptor.java Mon Feb 26 14:49:09 2007
@@ -23,6 +23,7 @@
import java.util.List;
import java.util.Map;
+import org.apache.cxf.helpers.CastUtils;
import org.apache.cxf.helpers.HttpHeaderHelper;
import org.apache.cxf.interceptor.Fault;
import org.apache.cxf.message.Message;
@@ -36,9 +37,8 @@
setPhase(Phase.PREPARE_SEND);
}
- @SuppressWarnings("unchecked")
public void handleMessage(Message message) throws Fault {
- Map<String, List<String>> headers = (Map<String, List<String>>)message.get(Message.PROTOCOL_HEADERS);
+ Map<String, List<String>> headers = CastUtils.cast((Map)message.get(Message.PROTOCOL_HEADERS));
if (headers == null) {
headers = new HashMap<String, List<String>>();
message.put(Message.PROTOCOL_HEADERS, headers);
Modified: incubator/cxf/trunk/rt/bindings/http/src/main/java/org/apache/cxf/binding/http/interceptor/URIParameterOutInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/http/src/main/java/org/apache/cxf/binding/http/interceptor/URIParameterOutInterceptor.java?view=diff&rev=512052&r1=512051&r2=512052
==============================================================================
--- incubator/cxf/trunk/rt/bindings/http/src/main/java/org/apache/cxf/binding/http/interceptor/URIParameterOutInterceptor.java (original)
+++ incubator/cxf/trunk/rt/bindings/http/src/main/java/org/apache/cxf/binding/http/interceptor/URIParameterOutInterceptor.java Mon Feb 26 14:49:09 2007
@@ -42,7 +42,6 @@
setPhase(Phase.PREPARE_SEND);
}
- @SuppressWarnings("unchecked")
public void handleMessage(Message message) throws Fault {
Endpoint ep = message.getExchange().get(Endpoint.class);
URIMapper mapper = (URIMapper)ep.getService().get(URIMapper.class.getName());
Modified: incubator/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBinding.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBinding.java?view=diff&rev=512052&r1=512051&r2=512052
==============================================================================
--- incubator/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBinding.java (original)
+++ incubator/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBinding.java Mon Feb 26 14:49:09 2007
@@ -44,7 +44,6 @@
return createMessage(new MessageImpl());
}
- @SuppressWarnings("unchecked")
public Message createMessage(Message m) {
SoapMessage soapMessage = new SoapMessage(m);
soapMessage.setVersion(version);
Modified: incubator/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapActionInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapActionInterceptor.java?view=diff&rev=512052&r1=512051&r2=512052
==============================================================================
--- incubator/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapActionInterceptor.java (original)
+++ incubator/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapActionInterceptor.java Mon Feb 26 14:49:09 2007
@@ -28,6 +28,7 @@
import org.apache.cxf.binding.soap.Soap12;
import org.apache.cxf.binding.soap.SoapMessage;
import org.apache.cxf.binding.soap.model.SoapOperationInfo;
+import org.apache.cxf.helpers.CastUtils;
import org.apache.cxf.interceptor.Fault;
import org.apache.cxf.message.Message;
import org.apache.cxf.phase.Phase;
@@ -40,7 +41,6 @@
setPhase(Phase.POST_LOGICAL);
}
- @SuppressWarnings("unchecked")
public void handleMessage(SoapMessage message) throws Fault {
// TODO Auto-generated method stub
if (!(message == message.getExchange().getInMessage())) {
@@ -48,7 +48,6 @@
}
}
- @SuppressWarnings("unchecked")
private void setSoapAction(SoapMessage message) {
List<String> value = new ArrayList<String>();
@@ -59,8 +58,7 @@
SoapOperationInfo soi = (SoapOperationInfo) boi.getExtensor(SoapOperationInfo.class);
value.add(soi == null ? "\"\"" : soi.getAction() == null ? "\"\"" : soi.getAction());
}
- Map<String, List<String>> reqHeaders = (Map<String, List<String>>)
- message.get(Message.PROTOCOL_HEADERS);
+ Map<String, List<String>> reqHeaders = CastUtils.cast((Map)message.get(Message.PROTOCOL_HEADERS));
if (reqHeaders == null) {
reqHeaders = new HashMap<String, List<String>>();
message.put(Message.PROTOCOL_HEADERS, reqHeaders);
Modified: incubator/cxf/trunk/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapActionInterceptorTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapActionInterceptorTest.java?view=diff&rev=512052&r1=512051&r2=512052
==============================================================================
--- incubator/cxf/trunk/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapActionInterceptorTest.java (original)
+++ incubator/cxf/trunk/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapActionInterceptorTest.java Mon Feb 26 14:49:09 2007
@@ -25,13 +25,13 @@
import junit.framework.TestCase;
import org.apache.cxf.binding.soap.interceptor.SoapActionInterceptor;
+import org.apache.cxf.helpers.CastUtils;
import org.apache.cxf.message.ExchangeImpl;
import org.apache.cxf.message.Message;
import org.apache.cxf.message.MessageImpl;
public class SoapActionInterceptorTest extends TestCase {
- @SuppressWarnings("unchecked")
public void testSoapAction() throws Exception {
Message message = new MessageImpl();
message.setExchange(new ExchangeImpl());
@@ -43,15 +43,14 @@
SoapMessage soapMessage = (SoapMessage) message;
assertEquals(Soap11.getInstance(), soapMessage.getVersion());
(new SoapActionInterceptor()).handleMessage(soapMessage);
- Map<String, List<String>> reqHeaders = (Map<String, List<String>>) soapMessage
- .get(Message.PROTOCOL_HEADERS);
+ Map<String, List<String>> reqHeaders = CastUtils.cast((Map)soapMessage.get(Message.PROTOCOL_HEADERS));
assertNotNull(reqHeaders);
assertEquals("\"\"", reqHeaders.get("SOAPAction").get(0));
sb.setSoapVersion(Soap12.getInstance());
soapMessage = (SoapMessage) sb.createMessage(soapMessage);
(new SoapActionInterceptor()).handleMessage(soapMessage);
- reqHeaders = (Map<String, List<String>>) message.get(Message.PROTOCOL_HEADERS);
+ reqHeaders = CastUtils.cast((Map)message.get(Message.PROTOCOL_HEADERS));
assertNotNull(reqHeaders);
assertEquals("\"\"", reqHeaders.get("action").get(0));
}
Modified: incubator/cxf/trunk/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapBindingTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapBindingTest.java?view=diff&rev=512052&r1=512051&r2=512052
==============================================================================
--- incubator/cxf/trunk/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapBindingTest.java (original)
+++ incubator/cxf/trunk/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapBindingTest.java Mon Feb 26 14:49:09 2007
@@ -26,7 +26,6 @@
public class SoapBindingTest extends TestCase {
- @SuppressWarnings("unchecked")
public void testCreateMessage() throws Exception {
Message message = new MessageImpl();
SoapBinding sb = new SoapBinding();
Modified: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java?view=diff&rev=512052&r1=512051&r2=512052
==============================================================================
--- incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java (original)
+++ incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java Mon Feb 26 14:49:09 2007
@@ -34,6 +34,7 @@
import org.apache.cxf.binding.Binding;
import org.apache.cxf.common.i18n.UncheckedException;
import org.apache.cxf.common.logging.LogUtils;
+import org.apache.cxf.helpers.CastUtils;
import org.apache.cxf.interceptor.AbstractBasicInterceptorProvider;
import org.apache.cxf.interceptor.ClientOutFaultObserver;
import org.apache.cxf.interceptor.Fault;
@@ -105,7 +106,6 @@
return invoke(op, params);
}
- @SuppressWarnings("unchecked")
public Object[] invoke(BindingOperationInfo oi, Object[] params,
Map<String, Object> context) throws Exception {
Map<String, Object> requestContext = null;
@@ -115,8 +115,8 @@
}
Message message = endpoint.getBinding().createMessage();
if (null != context) {
- requestContext = (Map<String, Object>) context.get(REQUEST_CONTEXT);
- responseContext = (Map<String, Object>) context.get(RESPONSE_CONTEXT);
+ requestContext = CastUtils.cast((Map)context.get(REQUEST_CONTEXT));
+ responseContext = CastUtils.cast((Map)context.get(RESPONSE_CONTEXT));
}
//setup the message context
setContext(requestContext, message);
Modified: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/AbstractFaultChainIntiatorObserver.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/AbstractFaultChainIntiatorObserver.java?view=diff&rev=512052&r1=512051&r2=512052
==============================================================================
--- incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/AbstractFaultChainIntiatorObserver.java (original)
+++ incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/AbstractFaultChainIntiatorObserver.java Mon Feb 26 14:49:09 2007
@@ -43,7 +43,6 @@
this.bus = bus;
}
- @SuppressWarnings("unchecked")
public void onMessage(Message m) {
Message faultMessage = getFaultMessage(m);
if (faultMessage == null) {
Modified: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/phase/PhaseManagerImpl.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/phase/PhaseManagerImpl.java?view=diff&rev=512052&r1=512051&r2=512052
==============================================================================
--- incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/phase/PhaseManagerImpl.java (original)
+++ incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/phase/PhaseManagerImpl.java Mon Feb 26 14:49:09 2007
@@ -39,7 +39,7 @@
outPhases = out;
}
- public Class getRegistrationType() {
+ public Class<?> getRegistrationType() {
return PhaseManager.class;
}
Modified: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLDefinitionBuilder.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLDefinitionBuilder.java?view=diff&rev=512052&r1=512051&r2=512052
==============================================================================
--- incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLDefinitionBuilder.java (original)
+++ incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLDefinitionBuilder.java Mon Feb 26 14:49:09 2007
@@ -40,6 +40,7 @@
import org.apache.cxf.common.i18n.Message;
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.common.util.PropertiesLoaderUtils;
+import org.apache.cxf.helpers.CastUtils;
import org.apache.cxf.wsdl.JAXBExtensionHelper;
import org.apache.cxf.wsdl.WSDLBuilder;
import org.apache.cxf.wsdl4jutils.WSDLLocatorImpl;
@@ -98,13 +99,13 @@
}
}
- @SuppressWarnings("unchecked")
private void parseImports(Definition def) {
List<Import> importList = new ArrayList<Import>();
Map imports = def.getImports();
for (Iterator iter = imports.keySet().iterator(); iter.hasNext();) {
String uri = (String)iter.next();
- importList.addAll((List<Import>)imports.get(uri));
+ List<Import> lst = CastUtils.cast((List)imports.get(uri));
+ importList.addAll(lst);
}
for (Import impt : importList) {
parseImports(impt.getDefinition());
Modified: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLServiceBuilder.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLServiceBuilder.java?view=diff&rev=512052&r1=512051&r2=512052
==============================================================================
--- incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLServiceBuilder.java (original)
+++ incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLServiceBuilder.java Mon Feb 26 14:49:09 2007
@@ -55,6 +55,7 @@
import org.apache.cxf.Bus;
import org.apache.cxf.BusException;
import org.apache.cxf.binding.BindingFactory;
+import org.apache.cxf.helpers.CastUtils;
import org.apache.cxf.resource.XmlSchemaURIResolver;
import org.apache.cxf.service.model.AbstractMessageContainer;
import org.apache.cxf.service.model.AbstractPropertiesHolder;
@@ -113,7 +114,6 @@
}
}
- @SuppressWarnings("unchecked")
public List<ServiceInfo> buildService(Definition d) {
DescriptionInfo description = new DescriptionInfo();
description.setProperty(WSDL_DEFINITION, d);
@@ -122,7 +122,8 @@
copyExtensors(description, d.getExtensibilityElements());
List<ServiceInfo> serviceList = new ArrayList<ServiceInfo>();
- for (java.util.Iterator<QName> ite = d.getServices().keySet().iterator(); ite.hasNext();) {
+ for (java.util.Iterator<QName> ite =
+ CastUtils.cast(d.getServices().keySet().iterator()); ite.hasNext();) {
QName qn = ite.next();
serviceList.add(buildService(d, qn, description));
}
@@ -268,7 +269,6 @@
}
}
- @SuppressWarnings("unchecked")
private void addSchema(Schema schema) {
if (schemaList.get(schema.getDocumentBaseURI()) == null) {
schemaList.put(schema.getDocumentBaseURI(), schema.getElement());
@@ -280,12 +280,12 @@
}
}
- Map<String, List> imports = schema.getImports();
+ Map<String, List> imports = CastUtils.cast(schema.getImports());
if (imports != null && imports.size() > 0) {
Collection<String> importKeys = imports.keySet();
for (String importNamespace : importKeys) {
if (!isSchemaParsed(schema.getDocumentBaseURI(), importNamespace)) {
- List<SchemaImport> schemaImports = imports.get(importNamespace);
+ List<SchemaImport> schemaImports = CastUtils.cast(imports.get(importNamespace));
for (SchemaImport schemaImport : schemaImports) {
Schema tempImport = schemaImport.getReferencedSchema();
if (tempImport != null && !schemaList.containsValue(tempImport.getElement())) {
@@ -436,11 +436,11 @@
}
- @SuppressWarnings("unchecked")
private void buildInterfaceOperation(InterfaceInfo inf, Operation op) {
OperationInfo opInfo = inf.addOperation(new QName(inf.getName().getNamespaceURI(), op.getName()));
opInfo.setProperty(WSDL_OPERATION, op);
- opInfo.setParameterOrdering(op.getParameterOrdering());
+ List<String> porderList = CastUtils.cast((List)op.getParameterOrdering());
+ opInfo.setParameterOrdering(porderList);
this.copyExtensors(opInfo, op.getExtensibilityElements());
Input input = op.getInput();
List paramOrder = op.getParameterOrdering();
Modified: incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/extension/ExtensionManagerTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/extension/ExtensionManagerTest.java?view=diff&rev=512052&r1=512051&r2=512052
==============================================================================
--- incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/extension/ExtensionManagerTest.java (original)
+++ incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/extension/ExtensionManagerTest.java Mon Feb 26 14:49:09 2007
@@ -73,7 +73,6 @@
}
- @SuppressWarnings("unchecked")
public void testActivateViaNS() {
Extension e = new Extension();
Modified: incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/DispatchImpl.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/DispatchImpl.java?view=diff&rev=512052&r1=512051&r2=512052
==============================================================================
--- incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/DispatchImpl.java (original)
+++ incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/DispatchImpl.java Mon Feb 26 14:49:09 2007
@@ -280,7 +280,6 @@
return callback;
}
- @SuppressWarnings("unchecked")
public Response<T> invokeAsync(T obj) {
FutureTask<T> f = new FutureTask<T>(new DispatchAsyncCallable<T>(this, obj));
Modified: incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointImpl.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointImpl.java?view=diff&rev=512052&r1=512051&r2=512052
==============================================================================
--- incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointImpl.java (original)
+++ incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointImpl.java Mon Feb 26 14:49:09 2007
@@ -74,7 +74,6 @@
doInit = true;
}
- @SuppressWarnings("unchecked")
public EndpointImpl(Bus b, Object i, String uri, URL wsdl) {
bus = b;
implementor = i;
Modified: incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointPublisherImpl.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointPublisherImpl.java?view=diff&rev=512052&r1=512051&r2=512052
==============================================================================
--- incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointPublisherImpl.java (original)
+++ incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointPublisherImpl.java Mon Feb 26 14:49:09 2007
@@ -30,7 +30,6 @@
public class EndpointPublisherImpl implements EndpointPublisher {
private EndpointImpl ep;
- @SuppressWarnings("unchecked")
public void buildEndpoint(Bus bus,
String implName,
String serviceName,
Modified: incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JAXWSMethodInvoker.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JAXWSMethodInvoker.java?view=diff&rev=512052&r1=512051&r2=512052
==============================================================================
--- incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JAXWSMethodInvoker.java (original)
+++ incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JAXWSMethodInvoker.java Mon Feb 26 14:49:09 2007
@@ -25,6 +25,7 @@
import javax.xml.ws.handler.MessageContext;
import org.apache.cxf.common.util.factory.Factory;
+import org.apache.cxf.helpers.CastUtils;
import org.apache.cxf.jaxws.context.WebServiceContextImpl;
import org.apache.cxf.jaxws.support.ContextPropertiesMapping;
import org.apache.cxf.message.Exchange;
@@ -53,14 +54,13 @@
super(factory, scope);
}
- @SuppressWarnings("unchecked")
protected Object invoke(Exchange exchange, final Object serviceObject, Method m, List<Object> params) {
// set up the webservice request context
MessageContext ctx =
ContextPropertiesMapping.createWebServiceContext(exchange);
WebServiceContextImpl.setMessageContext(ctx);
- List<Object> res = (List<Object>) super.invoke(exchange, serviceObject, m, params);
+ List<Object> res = CastUtils.cast((List)super.invoke(exchange, serviceObject, m, params));
//update the webservice response context
ContextPropertiesMapping.updateWebServiceContext(exchange, ctx);
Modified: incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/soap/SOAPHandlerInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/soap/SOAPHandlerInterceptor.java?view=diff&rev=512052&r1=512051&r2=512052
==============================================================================
--- incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/soap/SOAPHandlerInterceptor.java (original)
+++ incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/soap/SOAPHandlerInterceptor.java Mon Feb 26 14:49:09 2007
@@ -48,6 +48,7 @@
import org.apache.cxf.binding.soap.SoapMessage;
import org.apache.cxf.binding.soap.interceptor.SoapInterceptor;
import org.apache.cxf.common.i18n.BundleUtils;
+import org.apache.cxf.helpers.CastUtils;
import org.apache.cxf.helpers.XMLUtils;
import org.apache.cxf.interceptor.StaxOutInterceptor;
import org.apache.cxf.io.AbstractCachedOutputStream;
@@ -76,12 +77,11 @@
return roles;
}
- @SuppressWarnings("unchecked")
public Set<QName> getUnderstoodHeaders() {
Set<QName> understood = new HashSet<QName>();
for (Handler h : getBinding().getHandlerChain()) {
if (h instanceof SOAPHandler) {
- Set<QName> headers = ((SOAPHandler) h).getHeaders();
+ Set<QName> headers = CastUtils.cast(((SOAPHandler) h).getHeaders());
if (headers != null) {
understood.addAll(headers);
}
Modified: incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/DispatchInInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/DispatchInInterceptor.java?view=diff&rev=512052&r1=512051&r2=512052
==============================================================================
--- incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/DispatchInInterceptor.java (original)
+++ incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/DispatchInInterceptor.java Mon Feb 26 14:49:09 2007
@@ -62,7 +62,6 @@
this.mode = mode;
}
- @SuppressWarnings("unchecked")
public void handleMessage(Message message) throws Fault {
if (isGET(message)) {
Modified: incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/DispatchOutInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/DispatchOutInterceptor.java?view=diff&rev=512052&r1=512051&r2=512052
==============================================================================
--- incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/DispatchOutInterceptor.java (original)
+++ incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/DispatchOutInterceptor.java Mon Feb 26 14:49:09 2007
@@ -53,7 +53,6 @@
setPhase(Phase.WRITE);
}
- @SuppressWarnings("unchecked")
public void handleMessage(Message message) throws Fault {
Service.Mode m = message.getExchange().get(Service.Mode.class);
Modified: incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/HolderInInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/HolderInInterceptor.java?view=diff&rev=512052&r1=512051&r2=512052
==============================================================================
--- incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/HolderInInterceptor.java (original)
+++ incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/HolderInInterceptor.java Mon Feb 26 14:49:09 2007
@@ -23,6 +23,7 @@
import javax.xml.ws.Holder;
+import org.apache.cxf.helpers.CastUtils;
import org.apache.cxf.interceptor.Fault;
import org.apache.cxf.message.Exchange;
import org.apache.cxf.message.Message;
@@ -43,7 +44,7 @@
@SuppressWarnings("unchecked")
public void handleMessage(Message message) throws Fault {
- List<Object> inObjects = message.getContent(List.class);
+ List<Object> inObjects = CastUtils.cast(message.getContent(List.class));
Exchange exchange = message.getExchange();
@@ -65,7 +66,7 @@
}
}
- List<Holder> holders = (List<Holder>) exchange.get(CLIENT_HOLDERS);
+ List<Holder> holders = CastUtils.cast((List)exchange.get(CLIENT_HOLDERS));
for (MessagePartInfo part : parts) {
int idx = part.getIndex();
if (idx >= 0) {
@@ -81,7 +82,7 @@
if (idx >= 0) {
if (part.getProperty(ReflectionServiceFactoryBean.MODE_INOUT) != null) {
Object object = inObjects.get(idx);
- inObjects.set(idx, new Holder(object));
+ inObjects.set(idx, new Holder<Object>(object));
} else {
inObjects.add(idx, new Holder());
}
Modified: incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/HolderOutInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/HolderOutInterceptor.java?view=diff&rev=512052&r1=512051&r2=512052
==============================================================================
--- incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/HolderOutInterceptor.java (original)
+++ incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/HolderOutInterceptor.java Mon Feb 26 14:49:09 2007
@@ -25,6 +25,7 @@
import javax.xml.ws.Holder;
+import org.apache.cxf.helpers.CastUtils;
import org.apache.cxf.interceptor.Fault;
import org.apache.cxf.message.Exchange;
import org.apache.cxf.message.Message;
@@ -45,9 +46,8 @@
setPhase(Phase.PRE_LOGICAL);
}
- @SuppressWarnings("unchecked")
public void handleMessage(Message message) throws Fault {
- List<Object> outObjects = message.getContent(List.class);
+ List<Object> outObjects = CastUtils.cast(message.getContent(List.class));
Exchange exchange = message.getExchange();
OperationInfo op = exchange.get(OperationInfo.class);
@@ -118,7 +118,8 @@
message.getExchange().put(HolderInInterceptor.CLIENT_HOLDERS, holders);
} else {
// Add necessary holders so we match the method signature of the service class
- List<Object> reqObjects = message.getExchange().getInMessage().getContent(List.class);
+ List<Object> reqObjects =
+ CastUtils.cast(message.getExchange().getInMessage().getContent(List.class));
int outIdx = 0;
for (MessagePartInfo part : parts) {
Modified: incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperClassOutInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperClassOutInterceptor.java?view=diff&rev=512052&r1=512051&r2=512052
==============================================================================
--- incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperClassOutInterceptor.java (original)
+++ incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperClassOutInterceptor.java Mon Feb 26 14:49:09 2007
@@ -22,6 +22,7 @@
import java.util.Arrays;
import java.util.List;
+import org.apache.cxf.helpers.CastUtils;
import org.apache.cxf.interceptor.Fault;
import org.apache.cxf.jaxb.WrapperHelper;
import org.apache.cxf.message.Message;
@@ -39,7 +40,6 @@
setPhase(Phase.PRE_LOGICAL);
}
- @SuppressWarnings("unchecked")
public void handleMessage(Message message) throws Fault {
BindingOperationInfo bop = message.getExchange().get(BindingOperationInfo.class);
@@ -63,7 +63,7 @@
}
if (wrapped != null) {
- List<Object> objs = message.getContent(List.class);
+ List<Object> objs = CastUtils.cast(message.getContent(List.class));
try {
Object wrapperType = wrapped.newInstance();
Modified: incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsImplementorInfo.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsImplementorInfo.java?view=diff&rev=512052&r1=512051&r2=512052
==============================================================================
--- incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsImplementorInfo.java (original)
+++ incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsImplementorInfo.java Mon Feb 26 14:49:09 2007
@@ -183,10 +183,9 @@
}
}
- @SuppressWarnings("unchecked")
private String getWSInterfaceName(Class implClz) {
- Class[] clzs = implClz.getInterfaces();
- for (Class clz : clzs) {
+ Class<?>[] clzs = implClz.getInterfaces();
+ for (Class<?> clz : clzs) {
if (null != clz.getAnnotation(WebService.class)) {
return clz.getName();
}
Modified: incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBean.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBean.java?view=diff&rev=512052&r1=512051&r2=512052
==============================================================================
--- incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBean.java (original)
+++ incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBean.java Mon Feb 26 14:49:09 2007
@@ -38,6 +38,7 @@
import org.apache.cxf.databinding.source.SourceDataBinding;
import org.apache.cxf.endpoint.Endpoint;
import org.apache.cxf.endpoint.EndpointException;
+import org.apache.cxf.helpers.CastUtils;
import org.apache.cxf.jaxws.handler.soap.SOAPHandlerInterceptor;
import org.apache.cxf.jaxws.interceptors.ProviderInDatabindingInterceptor;
import org.apache.cxf.jaxws.interceptors.ProviderOutDatabindingInterceptor;
@@ -124,7 +125,6 @@
return new JaxWsEndpointImpl(getBus(), getService(), ei);
}
- @SuppressWarnings("unchecked")
@Override
protected void initializeWSDLOperation(InterfaceInfo intf, OperationInfo o, Method method) {
method = ((JaxWsServiceConfiguration)jaxWsConfiguration).getDeclaredMethod(method);
@@ -139,7 +139,9 @@
method.getParameterTypes());
// Find the Async method whic has a Future & AsyncResultHandler
- List<Class<?>> asyncHandlerParams = new ArrayList(Arrays.asList(method.getParameterTypes()));
+ List<Class<?>> asyncHandlerParams = Arrays.asList(method.getParameterTypes());
+ //copy it to may it non-readonly
+ asyncHandlerParams = new ArrayList<Class<?>>(asyncHandlerParams);
asyncHandlerParams.add(AsyncHandler.class);
Method futureMethod = method.getDeclaringClass()
.getDeclaredMethod(method.getName() + "Async",
@@ -155,7 +157,8 @@
// rpc out-message-part-info class mapping
Operation op = (Operation)o.getProperty(WSDLServiceBuilder.WSDL_OPERATION);
- initializeClassInfo(o, method, op == null ? null : op.getParameterOrdering());
+ initializeClassInfo(o, method, op == null ? null
+ : CastUtils.cast(op.getParameterOrdering(), String.class));
}
@Override
Modified: incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ConfiguredEndpointTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ConfiguredEndpointTest.java?view=diff&rev=512052&r1=512051&r2=512052
==============================================================================
--- incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ConfiguredEndpointTest.java (original)
+++ incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ConfiguredEndpointTest.java Mon Feb 26 14:49:09 2007
@@ -144,7 +144,6 @@
doTestConfiguredClientEndpoint();
}
- @SuppressWarnings("unchecked")
private void doTestConfiguredClientEndpoint() {
javax.xml.ws.Service service = new SOAPService();
@@ -264,7 +263,6 @@
doTestConfiguredServerEndpoint();
}
- @SuppressWarnings("unchecked")
private void doTestConfiguredServerEndpoint() {
Object implementor = new GreeterImpl();
@@ -348,7 +346,6 @@
}
- @SuppressWarnings("unchecked")
static final class TestInterceptor extends AbstractPhaseInterceptor {
public void handleMessage(Message message) throws Fault {
Modified: incubator/cxf/trunk/rt/management/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/management/pom.xml?view=diff&rev=512052&r1=512051&r2=512052
==============================================================================
--- incubator/cxf/trunk/rt/management/pom.xml (original)
+++ incubator/cxf/trunk/rt/management/pom.xml Mon Feb 26 14:49:09 2007
@@ -60,8 +60,7 @@
<dependency>
<groupId>org.springframework</groupId>
- <artifactId>spring</artifactId>
- <version>${spring.version}</version>
+ <artifactId>spring-core</artifactId>
</dependency>
<dependency>
Modified: incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPDestination.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPDestination.java?view=diff&rev=512052&r1=512051&r2=512052
==============================================================================
--- incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPDestination.java (original)
+++ incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPDestination.java Mon Feb 26 14:49:09 2007
@@ -33,6 +33,7 @@
import org.apache.cxf.configuration.Configurable;
import org.apache.cxf.configuration.security.AuthorizationPolicy;
import org.apache.cxf.configuration.security.SSLServerPolicy;
+import org.apache.cxf.helpers.CastUtils;
import org.apache.cxf.helpers.HttpHeaderHelper;
import org.apache.cxf.message.Message;
import org.apache.cxf.service.model.EndpointInfo;
@@ -116,10 +117,9 @@
}
- @SuppressWarnings("unchecked")
protected void updateResponseHeaders(Message message) {
Map<String, List<String>> responseHeaders =
- (Map<String, List<String>>)message.get(Message.PROTOCOL_HEADERS);
+ CastUtils.cast((Map)message.get(Message.PROTOCOL_HEADERS));
if (responseHeaders == null) {
responseHeaders = new HashMap<String, List<String>>();
message.put(Message.PROTOCOL_HEADERS, responseHeaders);
Modified: incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/JettyHTTPDestination.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/JettyHTTPDestination.java?view=diff&rev=512052&r1=512051&r2=512052
==============================================================================
--- incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/JettyHTTPDestination.java (original)
+++ incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/JettyHTTPDestination.java Mon Feb 26 14:49:09 2007
@@ -349,7 +349,6 @@
*
* @param message the message to be sent.
*/
- @SuppressWarnings("unchecked")
public void send(Message message) throws IOException {
message.put(HTTP_RESPONSE, response);
message.setContent(OutputStream.class, new WrappedOutputStream(message, response));
Modified: incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/CXFServlet.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/CXFServlet.java?view=diff&rev=512052&r1=512051&r2=512052
==============================================================================
--- incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/CXFServlet.java (original)
+++ incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/CXFServlet.java Mon Feb 26 14:49:09 2007
@@ -224,7 +224,6 @@
buildEndpoint(publisherName, implName, serviceName, wsdlName, portName, urlPat);
}
- @SuppressWarnings("unchecked")
public void buildEndpoint(String publisherName,
String implName,
String serviceName,
Modified: incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletDestination.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletDestination.java?view=diff&rev=512052&r1=512051&r2=512052
==============================================================================
--- incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletDestination.java (original)
+++ incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletDestination.java Mon Feb 26 14:49:09 2007
@@ -38,6 +38,7 @@
import org.apache.cxf.common.util.Base64Exception;
import org.apache.cxf.common.util.Base64Utility;
import org.apache.cxf.configuration.security.AuthorizationPolicy;
+import org.apache.cxf.helpers.CastUtils;
import org.apache.cxf.helpers.HttpHeaderHelper;
import org.apache.cxf.io.AbstractWrappedOutputStream;
import org.apache.cxf.message.Message;
@@ -120,10 +121,9 @@
}
- @SuppressWarnings("unchecked")
protected void updateResponseHeaders(Message message) {
Map<String, List<String>> responseHeaders =
- (Map<String, List<String>>)message.get(Message.PROTOCOL_HEADERS);
+ CastUtils.cast((Map)message.get(Message.PROTOCOL_HEADERS));
if (responseHeaders == null) {
responseHeaders = new HashMap<String, List<String>>();
message.put(Message.PROTOCOL_HEADERS, responseHeaders);
Modified: incubator/cxf/trunk/rt/transports/http2/src/main/java/org/apache/cxf/transport/http/AbstractHTTPDestination.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/http2/src/main/java/org/apache/cxf/transport/http/AbstractHTTPDestination.java?view=diff&rev=512052&r1=512051&r2=512052
==============================================================================
--- incubator/cxf/trunk/rt/transports/http2/src/main/java/org/apache/cxf/transport/http/AbstractHTTPDestination.java (original)
+++ incubator/cxf/trunk/rt/transports/http2/src/main/java/org/apache/cxf/transport/http/AbstractHTTPDestination.java Mon Feb 26 14:49:09 2007
@@ -33,6 +33,7 @@
import org.apache.cxf.configuration.Configurable;
import org.apache.cxf.configuration.security.AuthorizationPolicy;
import org.apache.cxf.configuration.security.SSLServerPolicy;
+import org.apache.cxf.helpers.CastUtils;
import org.apache.cxf.helpers.HttpHeaderHelper;
import org.apache.cxf.message.Message;
import org.apache.cxf.service.model.EndpointInfo;
@@ -111,10 +112,9 @@
}
- @SuppressWarnings("unchecked")
protected void updateResponseHeaders(Message message) {
Map<String, List<String>> responseHeaders =
- (Map<String, List<String>>)message.get(Message.PROTOCOL_HEADERS);
+ CastUtils.cast((Map)message.get(Message.PROTOCOL_HEADERS));
if (responseHeaders == null) {
responseHeaders = new HashMap<String, List<String>>();
message.put(Message.PROTOCOL_HEADERS, responseHeaders);
Modified: incubator/cxf/trunk/rt/transports/http2/src/main/java/org/apache/cxf/transport/http/JettyHTTPDestination.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/http2/src/main/java/org/apache/cxf/transport/http/JettyHTTPDestination.java?view=diff&rev=512052&r1=512051&r2=512052
==============================================================================
--- incubator/cxf/trunk/rt/transports/http2/src/main/java/org/apache/cxf/transport/http/JettyHTTPDestination.java (original)
+++ incubator/cxf/trunk/rt/transports/http2/src/main/java/org/apache/cxf/transport/http/JettyHTTPDestination.java Mon Feb 26 14:49:09 2007
@@ -372,7 +372,6 @@
*
* @param message the message to be sent.
*/
- @SuppressWarnings("unchecked")
public void send(Message message) throws IOException {
message.put(HTTP_RESPONSE, response);
message.setContent(OutputStream.class, new WrappedOutputStream(message, response));
Modified: incubator/cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/soap/MAPCodec.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/soap/MAPCodec.java?view=diff&rev=512052&r1=512051&r2=512052
==============================================================================
--- incubator/cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/soap/MAPCodec.java (original)
+++ incubator/cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/soap/MAPCodec.java Mon Feb 26 14:49:09 2007
@@ -323,16 +323,15 @@
* @param marshaller the JAXB marshaller to use
* @return the decoded value
*/
- @SuppressWarnings("unchecked")
public <T> T decodeAsNative(String encodedAs,
Class<T> clz,
Element headerElement,
Unmarshaller unmarshaller)
throws JAXBException {
- T value = transformer.decodeAsNative(encodedAs,
+ T value = clz.cast(transformer.decodeAsNative(encodedAs,
clz,
headerElement,
- unmarshaller);
+ unmarshaller));
LOG.log(Level.INFO,
"{0} : {1}",
new Object[] {headerElement.getLocalName(), getLogText(value)});
Modified: incubator/cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/soap/VersionTransformer.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/soap/VersionTransformer.java?view=diff&rev=512052&r1=512051&r2=512052
==============================================================================
--- incubator/cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/soap/VersionTransformer.java (original)
+++ incubator/cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/soap/VersionTransformer.java Mon Feb 26 14:49:09 2007
@@ -140,7 +140,6 @@
* @param marshaller the JAXB marshaller to use
* @return the decoded value
*/
- @SuppressWarnings("unchecked")
public <T> T decodeAsNative(String encodedAs,
Class<T> clz,
Element headerElement,
@@ -154,17 +153,17 @@
ret = codec.decodeMAP(clz, headerElement, unmarshaller);
} else if (Names200408.WSA_NAMESPACE_NAME.equals(encodedAs)) {
if (AttributedURIType.class.equals(clz)) {
- return (T)convert(codec.decodeMAP(AttributedURI.class,
+ return clz.cast(convert(codec.decodeMAP(AttributedURI.class,
headerElement,
- unmarshaller));
+ unmarshaller)));
} else if (EndpointReferenceType.class.equals(clz)) {
- return (T)convert(codec.decodeMAP(Names200408.EPR_TYPE,
+ return clz.cast(convert(codec.decodeMAP(Names200408.EPR_TYPE,
headerElement,
- unmarshaller));
+ unmarshaller)));
} else if (RelatesToType.class.equals(clz)) {
- return (T)convert(codec.decodeMAP(Relationship.class,
+ return clz.cast(convert(codec.decodeMAP(Relationship.class,
headerElement,
- unmarshaller));
+ unmarshaller)));
}
}
return ret;
Modified: incubator/cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/AssertionBuilderRegistryImpl.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/AssertionBuilderRegistryImpl.java?view=diff&rev=512052&r1=512051&r2=512052
==============================================================================
--- incubator/cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/AssertionBuilderRegistryImpl.java (original)
+++ incubator/cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/AssertionBuilderRegistryImpl.java Mon Feb 26 14:49:09 2007
@@ -48,7 +48,7 @@
super(builders);
}
- public Class getRegistrationType() {
+ public Class<?> getRegistrationType() {
return AssertionBuilderRegistry.class;
}
Modified: incubator/cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyBuilderImpl.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyBuilderImpl.java?view=diff&rev=512052&r1=512051&r2=512052
==============================================================================
--- incubator/cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyBuilderImpl.java (original)
+++ incubator/cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyBuilderImpl.java Mon Feb 26 14:49:09 2007
@@ -56,7 +56,7 @@
private AssertionBuilderRegistry assertionBuilderRegistry;
- public Class getRegistrationType() {
+ public Class<?> getRegistrationType() {
return PolicyBuilder.class;
}
Modified: incubator/cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyEngine.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyEngine.java?view=diff&rev=512052&r1=512051&r2=512052
==============================================================================
--- incubator/cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyEngine.java (original)
+++ incubator/cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyEngine.java Mon Feb 26 14:49:09 2007
@@ -74,7 +74,7 @@
registry = new PolicyRegistryImpl();
}
- public Class getRegistrationType() {
+ public Class<?> getRegistrationType() {
return PolicyEngine.class;
}
Modified: incubator/cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyInterceptorProviderRegistryImpl.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyInterceptorProviderRegistryImpl.java?view=diff&rev=512052&r1=512051&r2=512052
==============================================================================
--- incubator/cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyInterceptorProviderRegistryImpl.java (original)
+++ incubator/cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyInterceptorProviderRegistryImpl.java Mon Feb 26 14:49:09 2007
@@ -41,7 +41,7 @@
super(interceptors);
}
- public Class getRegistrationType() {
+ public Class<?> getRegistrationType() {
return PolicyInterceptorProviderRegistry.class;
}
}
Modified: incubator/cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/attachment/external/DomainExpressionBuilderRegistry.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/attachment/external/DomainExpressionBuilderRegistry.java?view=diff&rev=512052&r1=512051&r2=512052
==============================================================================
--- incubator/cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/attachment/external/DomainExpressionBuilderRegistry.java (original)
+++ incubator/cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/attachment/external/DomainExpressionBuilderRegistry.java Mon Feb 26 14:49:09 2007
@@ -49,7 +49,7 @@
super(builders);
}
- public Class getRegistrationType() {
+ public Class<?> getRegistrationType() {
return DomainExpressionBuilderRegistry.class;
}
Modified: incubator/cxf/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/soap/RetransmissionQueueImplTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/soap/RetransmissionQueueImplTest.java?view=diff&rev=512052&r1=512051&r2=512052
==============================================================================
--- incubator/cxf/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/soap/RetransmissionQueueImplTest.java (original)
+++ incubator/cxf/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/soap/RetransmissionQueueImplTest.java Mon Feb 26 14:49:09 2007
@@ -692,7 +692,6 @@
return sequence;
}
- @SuppressWarnings("unchecked")
private SourceSequence setUpSequence(String sid,
BigInteger[] messageNumbers,
boolean[] isAcked) {
Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/handlers/HandlerTestImpl.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/handlers/HandlerTestImpl.java?view=diff&rev=512052&r1=512051&r2=512052
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/handlers/HandlerTestImpl.java (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/handlers/HandlerTestImpl.java Mon Feb 26 14:49:09 2007
@@ -27,6 +27,8 @@
import javax.jws.WebService;
import javax.xml.ws.WebServiceContext;
import javax.xml.ws.handler.MessageContext;
+
+import org.apache.cxf.helpers.CastUtils;
import org.apache.handler_test.HandlerTest;
import org.apache.handler_test.PingException;
import org.apache.handler_test.types.PingFaultDetails;
@@ -80,9 +82,8 @@
context = ctx;
}
- @SuppressWarnings("unchecked")
private List<String> getHandlersInfo(MessageContext ctx) {
- List<String> ret = (List<String>)ctx.get("handler.info");
+ List<String> ret = CastUtils.cast((List)ctx.get("handler.info"));
if (ret == null) {
ret = new ArrayList<String>();
}
Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/handlers/TestHandlerBase.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/handlers/TestHandlerBase.java?view=diff&rev=512052&r1=512051&r2=512052
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/handlers/TestHandlerBase.java (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/handlers/TestHandlerBase.java Mon Feb 26 14:49:09 2007
@@ -29,6 +29,7 @@
import javax.xml.namespace.QName;
import javax.xml.ws.handler.MessageContext;
+import org.apache.cxf.helpers.CastUtils;
import org.apache.handler_test.PingException;
/**
@@ -140,11 +141,10 @@
}
- @SuppressWarnings("unchecked")
protected List<String> getHandlerInfoList(MessageContext ctx) {
List<String> handlerInfoList = null;
if (ctx.containsKey("handler.info")) {
- handlerInfoList = (List<String>)ctx.get("handler.info");
+ handlerInfoList = CastUtils.cast((List)ctx.get("handler.info"));
} else {
handlerInfoList = new ArrayList<String>();
ctx.put("handler.info", handlerInfoList);
Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/provider/AttachmentStreamSourceXMLProvider.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/provider/AttachmentStreamSourceXMLProvider.java?view=diff&rev=512052&r1=512051&r2=512052
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/provider/AttachmentStreamSourceXMLProvider.java (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/provider/AttachmentStreamSourceXMLProvider.java Mon Feb 26 14:49:09 2007
@@ -43,6 +43,7 @@
import org.w3c.dom.Document;
import org.apache.cxf.common.util.Base64Utility;
+import org.apache.cxf.helpers.CastUtils;
import org.apache.cxf.helpers.IOUtils;
import org.apache.cxf.helpers.XMLUtils;
import org.apache.cxf.message.Message;
@@ -55,7 +56,6 @@
@Resource
protected WebServiceContext wsContext;
- @SuppressWarnings("unchecked")
public StreamSource invoke(StreamSource source) {
MessageContext mc = wsContext.getMessageContext();
@@ -75,8 +75,8 @@
// ignore
}
- Map<String, DataHandler> dataHandlers =
- (Map)mc.get(MessageContext.INBOUND_MESSAGE_ATTACHMENTS);
+ Map<String, DataHandler> dataHandlers = CastUtils.cast(
+ (Map)mc.get(MessageContext.INBOUND_MESSAGE_ATTACHMENTS));
StringBuilder buf = new StringBuilder();
buf.append("<response>");
int i = 0;
@@ -99,7 +99,8 @@
}
buf.append("</response>");
- Map<Object, List<?>> respHeaders = (Map)mc.get(MessageContext.HTTP_RESPONSE_HEADERS);
+ Map<Object, List<?>> respHeaders = CastUtils
+ .cast((Map)mc.get(MessageContext.HTTP_RESPONSE_HEADERS));
List<String> contentTypeValues = new ArrayList<String>();
contentTypeValues.add("application/xml+custom");
respHeaders.put(Message.CONTENT_TYPE, contentTypeValues);
Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/rest/RestClientServerHttpBindingTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/rest/RestClientServerHttpBindingTest.java?view=diff&rev=512052&r1=512051&r2=512052
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/rest/RestClientServerHttpBindingTest.java (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/rest/RestClientServerHttpBindingTest.java Mon Feb 26 14:49:09 2007
@@ -44,6 +44,7 @@
import junit.framework.Test;
import junit.framework.TestSuite;
+import org.apache.cxf.helpers.CastUtils;
import org.apache.cxf.systest.common.ClientServerSetupBase;
import org.apache.cxf.systest.common.ClientServerTestBase;
@@ -85,7 +86,6 @@
assertTrue("Result should have CustomerID", tempstring.lastIndexOf("CustomerID>123456<") > 0);
}
- @SuppressWarnings("unchecked")
public void testHttpGETDispatchHTTPBinding() throws Exception {
Service service = Service.create(serviceName);
URI endpointURI = new URI(endpointAddress);
@@ -106,7 +106,7 @@
// varify the responseContext;
Map<String, List<String>> responseHeader =
- (Map<String, List<String>>)responseContext.get(MessageContext.HTTP_RESPONSE_HEADERS);
+ CastUtils.cast((Map)responseContext.get(MessageContext.HTTP_RESPONSE_HEADERS));
assertNotNull("the response header should not be null", responseHeader);
List<String> values = responseHeader.get("REST");
Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/rest/RestClientServerTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/rest/RestClientServerTest.java?view=diff&rev=512052&r1=512051&r2=512052
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/rest/RestClientServerTest.java (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/rest/RestClientServerTest.java Mon Feb 26 14:49:09 2007
@@ -48,6 +48,7 @@
import junit.framework.Test;
import junit.framework.TestSuite;
+import org.apache.cxf.helpers.CastUtils;
import org.apache.cxf.helpers.XMLUtils;
import org.apache.cxf.systest.common.ClientServerSetupBase;
import org.apache.cxf.systest.common.ClientServerTestBase;
@@ -111,7 +112,6 @@
assertTrue("Result should have CustomerID", tempstring.lastIndexOf("CustomerID>123456<") > 0);
}
- @SuppressWarnings("unchecked")
public void testHttpGETDispatchHTTPBinding() throws Exception {
Service service = Service.create(serviceName);
URI endpointURI = new URI(endpointAddress);
@@ -132,7 +132,7 @@
// varify the responseContext;
Map<String, List<String>> responseHeader =
- (Map<String, List<String>>)responseContext.get(MessageContext.HTTP_RESPONSE_HEADERS);
+ CastUtils.cast((Map)responseContext.get(MessageContext.HTTP_RESPONSE_HEADERS));
assertNotNull("the response header should not be null", responseHeader);
List<String> values = responseHeader.get("REST");
Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/rest/RestSourcePayloadProvider.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/rest/RestSourcePayloadProvider.java?view=diff&rev=512052&r1=512051&r2=512052
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/rest/RestSourcePayloadProvider.java (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/rest/RestSourcePayloadProvider.java Mon Feb 26 14:49:09 2007
@@ -37,6 +37,8 @@
import org.w3c.dom.Document;
+import org.apache.cxf.helpers.CastUtils;
+
@WebServiceProvider()
@@ -50,7 +52,6 @@
public RestSourcePayloadProvider() {
}
- @SuppressWarnings("unchecked")
public DOMSource invoke(DOMSource request) {
MessageContext mc = wsContext.getMessageContext();
String path = (String)mc.get(MessageContext.PATH_INFO);
@@ -62,7 +63,7 @@
(Map<String, List<String>>)mc.get(MessageContext.HTTP_REQUEST_HEADERS);*/
Map<String, List<String>> responseHeader =
- (Map<String, List<String>>)mc.get(MessageContext.HTTP_RESPONSE_HEADERS);
+ CastUtils.cast((Map)mc.get(MessageContext.HTTP_RESPONSE_HEADERS));
List<String> values = new ArrayList<String>();
values.add("hello1");
values.add("hello2");
Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/rest/RestSourcePayloadProviderHttpBinding.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/rest/RestSourcePayloadProviderHttpBinding.java?view=diff&rev=512052&r1=512051&r2=512052
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/rest/RestSourcePayloadProviderHttpBinding.java (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/rest/RestSourcePayloadProviderHttpBinding.java Mon Feb 26 14:49:09 2007
@@ -38,6 +38,8 @@
import org.w3c.dom.Document;
+import org.apache.cxf.helpers.CastUtils;
+
@WebServiceProvider()
@ServiceMode(value = Service.Mode.PAYLOAD)
@BindingType("http://cxf.apache.org/bindings/xformat")
@@ -49,7 +51,6 @@
public RestSourcePayloadProviderHttpBinding() {
}
- @SuppressWarnings("unchecked")
public DOMSource invoke(DOMSource request) {
MessageContext mc = wsContext.getMessageContext();
String path = (String)mc.get(MessageContext.PATH_INFO);
@@ -57,7 +58,7 @@
String httpMethod = (String)mc.get(MessageContext.HTTP_REQUEST_METHOD);
Map<String, List<String>> responseHeader =
- (Map<String, List<String>>)mc.get(MessageContext.HTTP_RESPONSE_HEADERS);
+ CastUtils.cast((Map)mc.get(MessageContext.HTTP_RESPONSE_HEADERS));
List<String> values = new ArrayList<String>();
values.add("hello1");
values.add("hello2");