Author: dkulp
Date: Mon Jun 8 19:16:46 2009
New Revision: 782729
URL: http://svn.apache.org/viewvc?rev=782729&view=rev
Log:
[CXF-2271] Fix problem where autoNameResolution isn't working for
unwrapped operation parts.
Modified:
cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ParameterProcessor.java
cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/validator/WrapperStyleNameCollisionValidator.java
Modified:
cxf/trunk/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/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ParameterProcessor.java?rev=782729&r1=782728&r2=782729&view=diff
==============================================================================
---
cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ParameterProcessor.java
(original)
+++
cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ParameterProcessor.java
Mon Jun 8 19:16:46 2009
@@ -114,7 +114,8 @@
String name = parameter.getName();
int count = 0;
while (method.getParameter(parameter.getName()) != null
- && context.optionSet(ToolConstants.CFG_AUTORESOLVE)) {
+ && context.optionSet(ToolConstants.CFG_AUTORESOLVE)
+ && parameter.getStyle() != JavaType.Style.INOUT) {
parameter.setName(name + (++count));
}
@@ -363,13 +364,23 @@
if (outputWrapElement.size() > 1) {
for (QName inElement : inputWrapElement) {
if (isSameWrapperChild(inElement, outElement)) {
- JavaParameter jp =
getParameterFromQName(outputPart.getElementQName(), outElement,
-
JavaType.Style.INOUT, outputPart);
+ JavaParameter jpIn = null;
+ for (JavaParameter j : method.getParameters()) {
+ if (inElement.equals(j.getQName())) {
+ jpIn = j;
+ }
+ }
+ JavaParameter jp =
getParameterFromQName(outputPart.getElementQName(), outElement,
+
JavaType.Style.INOUT, outputPart);
if (!qualified) {
jp.setTargetNamespace("");
}
+ if (!jpIn.getClassName().equals(jp.getClassName())) {
+ jp.setStyle(JavaType.Style.OUT);
+ }
addParameter(method, jp);
sameWrapperChild = true;
+
if (method.getReturn() == null) {
addVoidReturn(method);
}
@@ -406,11 +417,21 @@
if (inputWrapElement != null) {
for (QName inElement : inputWrapElement) {
if (isSameWrapperChild(inElement, outElement)) {
- JavaParameter jp =
getParameterFromQName(outputPart.getElementQName(), outElement,
-
JavaType.Style.INOUT, outputPart);
+
+ JavaParameter jpIn = null;
+ for (JavaParameter j : method.getParameters()) {
+ if (inElement.equals(j.getQName())) {
+ jpIn = j;
+ }
+ }
+ JavaParameter jp =
getParameterFromQName(outputPart.getElementQName(), outElement,
+
JavaType.Style.INOUT, outputPart);
if (!qualified) {
jp.setTargetNamespace("");
}
+ if (!jpIn.getClassName().equals(jp.getClassName())) {
+ jp.setStyle(JavaType.Style.OUT);
+ }
addParameter(method, jp);
sameWrapperChild = true;
break;
Modified:
cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/validator/WrapperStyleNameCollisionValidator.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/validator/WrapperStyleNameCollisionValidator.java?rev=782729&r1=782728&r2=782729&view=diff
==============================================================================
---
cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/validator/WrapperStyleNameCollisionValidator.java
(original)
+++
cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/validator/WrapperStyleNameCollisionValidator.java
Mon Jun 8 19:16:46 2009
@@ -31,6 +31,7 @@
import org.apache.cxf.service.model.MessagePartInfo;
import org.apache.cxf.service.model.OperationInfo;
import org.apache.cxf.service.model.ServiceInfo;
+import org.apache.cxf.tools.common.ToolConstants;
import org.apache.cxf.tools.common.ToolContext;
import org.apache.cxf.tools.validator.ServiceValidator;
import org.apache.cxf.tools.wsdlto.frontend.jaxws.customization.JAXWSBinding;
@@ -66,6 +67,8 @@
private boolean isValidOperation(OperationInfo operation) {
ToolContext context = service.getProperty(ToolContext.class.getName(),
ToolContext.class);
+
+ boolean c = context.optionSet(ToolConstants.CFG_AUTORESOLVE);
boolean valid = false;
if (operation.getUnwrappedOperation() == null) {
@@ -101,27 +104,13 @@
&& operation.getOutput().getMessageParts().size() == 1) {
output = operation.getOutput().getMessageParts().iterator().next();
}
-
- Map<QName, QName> names = new HashMap<QName, QName>();
- if (input != null) {
- for (WrapperElement element :
ProcessorUtil.getWrappedElement(context, input.getElementQName())) {
- if (names.containsKey(element.getElementName())
- && (names.get(element.getElementName()) ==
element.getSchemaTypeName()
- ||
names.get(element.getElementName()).equals(element.getSchemaTypeName()))) {
- handleErrors(names.get(element.getElementName()), element);
- return false;
- } else {
- names.put(element.getElementName(),
element.getSchemaTypeName());
- }
- }
- }
-
- if (output != null) {
- List<WrapperElement> els =
ProcessorUtil.getWrappedElement(context, output.getElementQName());
- if (els.size() > 1) {
- for (WrapperElement element : els) {
+ if (!c) {
+ Map<QName, QName> names = new HashMap<QName, QName>();
+ if (input != null) {
+ for (WrapperElement element :
ProcessorUtil.getWrappedElement(context,
+
input.getElementQName())) {
if (names.containsKey(element.getElementName())
- && !(names.get(element.getElementName()) ==
element.getSchemaTypeName()
+ && (names.get(element.getElementName()) ==
element.getSchemaTypeName()
||
names.get(element.getElementName()).equals(element.getSchemaTypeName()))) {
handleErrors(names.get(element.getElementName()),
element);
return false;
@@ -130,6 +119,22 @@
}
}
}
+
+ if (output != null) {
+ List<WrapperElement> els =
ProcessorUtil.getWrappedElement(context, output.getElementQName());
+ if (els.size() > 1) {
+ for (WrapperElement element : els) {
+ if (names.containsKey(element.getElementName())
+ && !(names.get(element.getElementName()) ==
element.getSchemaTypeName()
+ ||
names.get(element.getElementName()).equals(element.getSchemaTypeName()))) {
+ handleErrors(names.get(element.getElementName()),
element);
+ return false;
+ } else {
+ names.put(element.getElementName(),
element.getSchemaTypeName());
+ }
+ }
+ }
+ }
}
return true;
}
