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 2008/07/07 16:08:11 UTC
svn commit: r674496 - in /cxf/branches/2.0.x-fixes: ./
api/src/main/java/org/apache/cxf/phase/
api/src/main/java/org/apache/cxf/service/model/
api/src/main/java/org/apache/cxf/wsdl/
api/src/test/java/org/apache/cxf/phase/ api/src/test/java/org/apache/c...
Author: dkulp
Date: Mon Jul 7 07:08:09 2008
New Revision: 674496
URL: http://svn.apache.org/viewvc?rev=674496&view=rev
Log:
Merged revisions 673548 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r673548 | dkulp | 2008-07-02 19:34:15 -0400 (Wed, 02 Jul 2008) | 2 lines
Fix a bunch of warnings that are showing up with the ganymede compiler
........
Modified:
cxf/branches/2.0.x-fixes/ (props changed)
cxf/branches/2.0.x-fixes/api/src/main/java/org/apache/cxf/phase/PhaseInterceptorChain.java
cxf/branches/2.0.x-fixes/api/src/main/java/org/apache/cxf/service/model/ServiceModelUtil.java
cxf/branches/2.0.x-fixes/api/src/main/java/org/apache/cxf/wsdl/EndpointReferenceUtils.java
cxf/branches/2.0.x-fixes/api/src/test/java/org/apache/cxf/phase/PhaseInterceptorChainTest.java
cxf/branches/2.0.x-fixes/api/src/test/java/org/apache/cxf/ws/policy/builder/jaxb/JaxbAssertionBuilderTest.java
cxf/branches/2.0.x-fixes/integration/jca/src/main/java/org/apache/cxf/jca/core/resourceadapter/ResourceAdapterInternalException.java
cxf/branches/2.0.x-fixes/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/XMLFormatValidator.java
cxf/branches/2.0.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/ArrayType.java
cxf/branches/2.0.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/collection/CollectionType.java
cxf/branches/2.0.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/Java5TypeCreator.java
cxf/branches/2.0.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/util/stax/JDOMStreamReader.java
cxf/branches/2.0.x-fixes/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/map/MapsTest.java
cxf/branches/2.0.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/DefaultServiceConfiguration.java
cxf/branches/2.0.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/util/SOAPBindingUtil.java
cxf/branches/2.0.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ParameterProcessor.java
cxf/branches/2.0.x-fixes/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenTest.java
Propchange: cxf/branches/2.0.x-fixes/
------------------------------------------------------------------------------
svn:mergeinfo = /cxf/trunk:673548
Propchange: cxf/branches/2.0.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.0.x-fixes/api/src/main/java/org/apache/cxf/phase/PhaseInterceptorChain.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/api/src/main/java/org/apache/cxf/phase/PhaseInterceptorChain.java?rev=674496&r1=674495&r2=674496&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/api/src/main/java/org/apache/cxf/phase/PhaseInterceptorChain.java (original)
+++ cxf/branches/2.0.x-fixes/api/src/main/java/org/apache/cxf/phase/PhaseInterceptorChain.java Mon Jul 7 07:08:09 2008
@@ -279,7 +279,6 @@
* @param startingAfterInterceptorID the id of the interceptor
* @throws Exception
*/
- @SuppressWarnings("unchecked")
public synchronized boolean doInterceptStartingAfter(Message message,
String startingAfterInterceptorID) {
updateIterator();
@@ -300,7 +299,6 @@
* @param startingAtInterceptorID the id of the interceptor
* @throws Exception
*/
- @SuppressWarnings("unchecked")
public synchronized boolean doInterceptStartingAt(Message message,
String startingAtInterceptorID) {
updateIterator();
Modified: cxf/branches/2.0.x-fixes/api/src/main/java/org/apache/cxf/service/model/ServiceModelUtil.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/api/src/main/java/org/apache/cxf/service/model/ServiceModelUtil.java?rev=674496&r1=674495&r2=674496&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/api/src/main/java/org/apache/cxf/service/model/ServiceModelUtil.java (original)
+++ cxf/branches/2.0.x-fixes/api/src/main/java/org/apache/cxf/service/model/ServiceModelUtil.java Mon Jul 7 07:08:09 2008
@@ -132,7 +132,7 @@
public static List<String> getOperationInputPartNames(OperationInfo operation) {
List<String> names = new ArrayList<String>();
List<MessagePartInfo> parts = operation.getInput().getMessageParts();
- if (parts == null && parts.size() == 0) {
+ if (parts == null || parts.size() == 0) {
return names;
}
Modified: cxf/branches/2.0.x-fixes/api/src/main/java/org/apache/cxf/wsdl/EndpointReferenceUtils.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/api/src/main/java/org/apache/cxf/wsdl/EndpointReferenceUtils.java?rev=674496&r1=674495&r2=674496&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/api/src/main/java/org/apache/cxf/wsdl/EndpointReferenceUtils.java (original)
+++ cxf/branches/2.0.x-fixes/api/src/main/java/org/apache/cxf/wsdl/EndpointReferenceUtils.java Mon Jul 7 07:08:09 2008
@@ -464,7 +464,7 @@
doTransform = false;
}
} else if (source instanceof DOMSource) {
- node = ((DOMSource)node).getNode();
+ node = ((DOMSource)source).getNode();
doTransform = false;
}
Modified: cxf/branches/2.0.x-fixes/api/src/test/java/org/apache/cxf/phase/PhaseInterceptorChainTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/api/src/test/java/org/apache/cxf/phase/PhaseInterceptorChainTest.java?rev=674496&r1=674495&r2=674496&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/api/src/test/java/org/apache/cxf/phase/PhaseInterceptorChainTest.java (original)
+++ cxf/branches/2.0.x-fixes/api/src/test/java/org/apache/cxf/phase/PhaseInterceptorChainTest.java Mon Jul 7 07:08:09 2008
@@ -313,7 +313,6 @@
return setUpPhaseInterceptor(phase, id, null, null);
}
- @SuppressWarnings("unchecked")
AbstractPhaseInterceptor setUpPhaseInterceptor(final String phase,
final String id,
Set<String> b,
Modified: cxf/branches/2.0.x-fixes/api/src/test/java/org/apache/cxf/ws/policy/builder/jaxb/JaxbAssertionBuilderTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/api/src/test/java/org/apache/cxf/ws/policy/builder/jaxb/JaxbAssertionBuilderTest.java?rev=674496&r1=674495&r2=674496&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/api/src/test/java/org/apache/cxf/ws/policy/builder/jaxb/JaxbAssertionBuilderTest.java (original)
+++ cxf/branches/2.0.x-fixes/api/src/test/java/org/apache/cxf/ws/policy/builder/jaxb/JaxbAssertionBuilderTest.java Mon Jul 7 07:08:09 2008
@@ -61,7 +61,6 @@
}
@Test
- @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: cxf/branches/2.0.x-fixes/integration/jca/src/main/java/org/apache/cxf/jca/core/resourceadapter/ResourceAdapterInternalException.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/integration/jca/src/main/java/org/apache/cxf/jca/core/resourceadapter/ResourceAdapterInternalException.java?rev=674496&r1=674495&r2=674496&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/integration/jca/src/main/java/org/apache/cxf/jca/core/resourceadapter/ResourceAdapterInternalException.java (original)
+++ cxf/branches/2.0.x-fixes/integration/jca/src/main/java/org/apache/cxf/jca/core/resourceadapter/ResourceAdapterInternalException.java Mon Jul 7 07:08:09 2008
@@ -72,7 +72,6 @@
}
- @SuppressWarnings("deprecation")
public Exception getLinkedException() {
Exception linkedEx = null;
if (getCause() instanceof Exception) {
Modified: cxf/branches/2.0.x-fixes/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/XMLFormatValidator.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/XMLFormatValidator.java?rev=674496&r1=674495&r2=674496&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/XMLFormatValidator.java (original)
+++ cxf/branches/2.0.x-fixes/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/XMLFormatValidator.java Mon Jul 7 07:08:09 2008
@@ -49,7 +49,6 @@
return checkXMLBindingFormat();
}
- @SuppressWarnings("unchecked")
private boolean checkXMLBindingFormat() {
Collection<BindingInfo> bindings = service.getBindings();
if (bindings != null) {
@@ -63,7 +62,6 @@
return true;
}
- @SuppressWarnings("unchecked")
private boolean checkXMLFormat(BindingInfo binding) {
Collection<BindingOperationInfo> bos = binding.getOperations();
boolean result = true;
Modified: cxf/branches/2.0.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/ArrayType.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/ArrayType.java?rev=674496&r1=674495&r2=674496&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/ArrayType.java (original)
+++ cxf/branches/2.0.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/ArrayType.java Mon Jul 7 07:08:09 2008
@@ -173,6 +173,9 @@
}
Type type = getComponentType();
+ if (type == null) {
+ throw new DatabindingException("Couldn't find type for array.");
+ }
if (XmlSchemaConstants.ANY_TYPE_QNAME.equals(type.getSchemaType())) {
forceXsiWrite = true;
}
@@ -186,9 +189,6 @@
String name = type.getSchemaType().getLocalPart();
- if (type == null) {
- throw new DatabindingException("Couldn't find type for " + type.getTypeClass() + ".");
- }
Class arrayType = type.getTypeClass();
Modified: cxf/branches/2.0.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/collection/CollectionType.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/collection/CollectionType.java?rev=674496&r1=674495&r2=674496&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/collection/CollectionType.java (original)
+++ cxf/branches/2.0.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/collection/CollectionType.java Mon Jul 7 07:08:09 2008
@@ -90,7 +90,7 @@
Type type = getComponentType();
if (type == null) {
- throw new DatabindingException("Couldn't find type for " + type.getTypeClass() + ".");
+ throw new DatabindingException("Couldn't find component type for Collection.");
}
for (Iterator itr = list.iterator(); itr.hasNext();) {
Modified: cxf/branches/2.0.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/Java5TypeCreator.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/Java5TypeCreator.java?rev=674496&r1=674495&r2=674496&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/Java5TypeCreator.java (original)
+++ cxf/branches/2.0.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/Java5TypeCreator.java Mon Jul 7 07:08:09 2008
@@ -212,7 +212,6 @@
return paramClass;
}
- @SuppressWarnings("unchecked")
@Override
public Type createDefaultType(TypeClassInfo info) {
QName typeName = info.getTypeName();
@@ -252,7 +251,6 @@
return type;
}
- @SuppressWarnings("unchecked")
@Override
public QName createQName(Class typeClass) {
String name = null;
Modified: cxf/branches/2.0.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/util/stax/JDOMStreamReader.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/util/stax/JDOMStreamReader.java?rev=674496&r1=674495&r2=674496&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/util/stax/JDOMStreamReader.java (original)
+++ cxf/branches/2.0.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/util/stax/JDOMStreamReader.java Mon Jul 7 07:08:09 2008
@@ -175,10 +175,9 @@
}
@Override
- @SuppressWarnings("unchecked")
protected void endElement() {
if (namespaceStack.size() > 0) {
- prefix2decNs = (Map<String, Namespace>)namespaceStack.pop();
+ prefix2decNs = namespaceStack.pop();
}
}
Modified: cxf/branches/2.0.x-fixes/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/map/MapsTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/map/MapsTest.java?rev=674496&r1=674495&r2=674496&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/map/MapsTest.java (original)
+++ cxf/branches/2.0.x-fixes/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/map/MapsTest.java Mon Jul 7 07:08:09 2008
@@ -73,8 +73,6 @@
@Ignore
@Test
public void testMapWsdl() throws WSDLException {
- @SuppressWarnings("unused")
- //Document wsdl = getWSDLDocument("MapTestService");
Definition wsdlDef = getWSDLDefinition("MapTestService");
StringWriter sink = new StringWriter();
WSDLFactory.newInstance().newWSDLWriter().writeWSDL(wsdlDef, sink);
Modified: cxf/branches/2.0.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/DefaultServiceConfiguration.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/DefaultServiceConfiguration.java?rev=674496&r1=674495&r2=674496&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/DefaultServiceConfiguration.java (original)
+++ cxf/branches/2.0.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/DefaultServiceConfiguration.java Mon Jul 7 07:08:09 2008
@@ -106,7 +106,7 @@
private String getDefaultLocalName(OperationInfo op, Method method, int paramNumber, String prefix) {
Class<?> impl = getServiceFactory().getServiceClass();
// try to grab the implementation class so we can read the debug symbols from it
- if (impl == null) {
+ if (impl != null) {
try {
method = impl.getMethod(method.getName(), method.getParameterTypes());
} catch (Exception e) {
Modified: cxf/branches/2.0.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/util/SOAPBindingUtil.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/util/SOAPBindingUtil.java?rev=674496&r1=674495&r2=674496&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/util/SOAPBindingUtil.java (original)
+++ cxf/branches/2.0.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/util/SOAPBindingUtil.java Mon Jul 7 07:08:09 2008
@@ -276,7 +276,6 @@
return obj instanceof SOAPBinding || obj instanceof SOAP12Binding;
}
- @SuppressWarnings("unchecked")
public static List<SoapFault> getBindingOperationSoapFaults(BindingOperation bop) {
List<SoapFault> faults = new ArrayList<SoapFault>();
Map bindingFaults = bop.getBindingFaults();
Modified: cxf/branches/2.0.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ParameterProcessor.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ParameterProcessor.java?rev=674496&r1=674495&r2=674496&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ParameterProcessor.java (original)
+++ cxf/branches/2.0.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ParameterProcessor.java Mon Jul 7 07:08:09 2008
@@ -51,7 +51,6 @@
private DataBindingProfile dataBinding;
- @SuppressWarnings("unchecked")
public ParameterProcessor(ToolContext penv) {
super(penv);
dataBinding = context.get(DataBindingProfile.class);
Modified: cxf/branches/2.0.x-fixes/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenTest.java?rev=674496&r1=674495&r2=674496&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenTest.java (original)
+++ cxf/branches/2.0.x-fixes/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenTest.java Mon Jul 7 07:08:09 2008
@@ -921,7 +921,6 @@
assertNotNull("method should be generated", method);
}
- @SuppressWarnings("unchecked")
@Test
public void testSupportXMLBindingBare() throws Exception {
env.put(ToolConstants.CFG_WSDLURL, getLocation("/wsdl2java_wsdl/xml_http_bare.wsdl"));