You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by na...@apache.org on 2006/05/17 22:43:42 UTC
svn commit: r407368 -
/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ClientStubWriter.java
Author: nadiramra
Date: Wed May 17 13:43:42 2006
New Revision: 407368
URL: http://svn.apache.org/viewvc?rev=407368&view=rev
Log:
Minor cleanup to code.
Modified:
webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ClientStubWriter.java
Modified: webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ClientStubWriter.java
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ClientStubWriter.java?rev=407368&r1=407367&r2=407368&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ClientStubWriter.java (original)
+++ webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ClientStubWriter.java Wed May 17 13:43:42 2006
@@ -62,13 +62,12 @@
try
{
writer.write("/*\n");
- writer
- .write(" * This file was auto-generated by the Axis C++ Web Service "
+ writer.write(" * This file was auto-generated by the Axis C++ Web Service "
+ "Generator (WSDL2Ws)\n");
- writer
- .write(" * This file contains Client Stub implementation for remote web service.\n");
+ writer.write(" * This file contains Client Stub implementation for remote web service.\n");
writer.write(" */\n\n");
- } catch (IOException e)
+ }
+ catch (IOException e)
{
throw new WrapperFault(e);
}
@@ -83,21 +82,19 @@
{
try
{
- writer.write(classname
- + "::"
- + classname
- + "(const char* pchEndpointUri, AXIS_PROTOCOL_TYPE eProtocol)\n:Stub(pchEndpointUri, eProtocol)\n{\n");
+ writer.write(classname + "::" + classname
+ + "(const char* pchEndpointUri, AXIS_PROTOCOL_TYPE eProtocol)\n:Stub(pchEndpointUri, eProtocol)\n{\n");
writer.write("}\n\n");
writer.write(classname + "::" + classname
+ "()\n:Stub(\" \", APTHTTP1_1)\n{\n");
//TODO get TransportURI from WrapInfo and check what the transport
// is and do the following line accordingly
- writer
- .write("\tm_pCall->setEndpointURI(\""
+ writer.write("\tm_pCall->setEndpointURI(\""
+ wscontext.getWrapInfo().getTargetEndpointURI()
+ "\");\n");
writer.write("}\n\n");
- } catch (IOException e)
+ }
+ catch (IOException e)
{
throw new WrapperFault(e);
}
@@ -113,7 +110,8 @@
try
{
writer.write(classname + "::~" + classname + "()\n{\n}\n\n");
- } catch (IOException e)
+ }
+ catch (IOException e)
{
throw new WrapperFault(e);
}
@@ -128,8 +126,7 @@
{
try
{
- writer
- .write("\n/*Methods corresponding to the web service methods*/\n");
+ writer.write("\n/*Methods corresponding to the web service methods*/\n");
MethodInfo minfo;
for (int i = 0; i < methods.size(); i++)
{
@@ -138,7 +135,8 @@
writer.write("\n");
}
//damitha
- } catch (IOException e)
+ }
+ catch (IOException e)
{
throw new WrapperFault(e);
}
@@ -159,13 +157,12 @@
+ CUtils.CPP_HEADER_SUFFIX + "\"\n\n");
}
else
- {
- writer.write("#include \"" + classname
- + CUtils.CPP_HEADER_SUFFIX + "\"\n\n");
- }
+ writer.write("#include \"" + classname + CUtils.CPP_HEADER_SUFFIX + "\"\n\n");
+
writer.write("#include <axis/AxisWrapperAPI.hpp>\n");
writer.write ("#include <axis/Axis.hpp>\n\n");
- } catch (IOException e)
+ }
+ catch (IOException e)
{
throw new WrapperFault(e);
}
@@ -187,21 +184,12 @@
ParameterInfo returntype = null;
int noOfOutParams = minfo.getOutputParameterTypes().size();
if (0 == noOfOutParams)
- {
returntype = null;
- }
+ else if (1 == noOfOutParams)
+ returntype = (ParameterInfo) minfo.getOutputParameterTypes().iterator().next();
else
- {
- if (1 == noOfOutParams)
- {
- returntype = (ParameterInfo) minfo.getOutputParameterTypes()
- .iterator().next();
- }
- else
- {
- isAllTreatedAsOutParams = true;
- }
- }
+ isAllTreatedAsOutParams = true;
+
Collection params = minfo.getInputParameterTypes();
String methodName = minfo.getMethodname();
@@ -211,11 +199,9 @@
String outparamTypeName = null;
if (returntype != null)
{
- outparamTypeName = WrapperUtils
- .getClassNameFromParamInfoConsideringArrays(returntype,
- wscontext);
- retType = wscontext.getTypemap()
- .getType(returntype.getSchemaName());
+ outparamTypeName =
+ WrapperUtils.getClassNameFromParamInfoConsideringArrays(returntype, wscontext);
+ retType = wscontext.getTypemap().getType(returntype.getSchemaName());
if (retType != null)
{
returntypeisarray = retType.isArray();
@@ -225,14 +211,11 @@
+ "LanguageName .................... ");
}
if (CUtils.isSimpleType(retType.getLanguageSpecificName()))
- {
returntypeissimple = true;
- }
}
}
writer.write("\n/*\n");
- writer.write(" * This method wrap the service method " + methodName
- + "\n");
+ writer.write(" * This method wrap the service method " + methodName + "\n");
writer.write(" */\n");
//method signature
String paramTypeName;
@@ -240,59 +223,44 @@
boolean typeissimple = false;
Type type;
if (returntype == null)
- {
writer.write("void");
- }
else
{
if (returntypeissimple
- && (!(returntype.isNillable() || returntype.isOptional()) || CUtils
- .isPointerType(outparamTypeName)))
- {
- writer.write (outparamTypeName);
- }
+ && (!(returntype.isNillable() || returntype.isOptional())
+ || CUtils.isPointerType(outparamTypeName)))
+ writer.write (outparamTypeName);
else if (outparamTypeName.lastIndexOf ("*") > 0)
- {
writer.write (outparamTypeName);
- }
else
- { //for AnyType too
writer.write (outparamTypeName + "*");
- }
if (WSDL2Ws.verbose)
- {
- System.out.println("Output Parameter type Name :"
- + outparamTypeName);
- }
+ System.out.println("Output Parameter type Name :" + outparamTypeName);
}
+
writer.write(" " + classname + "::" + methodName + "(");
ArrayList paramsB = (ArrayList) params;
for (int i = 0; i < paramsB.size(); i++)
{
- paramTypeName = WrapperUtils
- .getClassNameFromParamInfoConsideringArrays(
- (ParameterInfo) paramsB.get(i), wscontext);
+ paramTypeName =
+ WrapperUtils.getClassNameFromParamInfoConsideringArrays((ParameterInfo) paramsB.get(i), wscontext);
+
if (i > 0)
- {
writer.write(", ");
- }
+
typeissimple = CUtils.isSimpleType(paramTypeName);
if (typeissimple
- && (!(((ParameterInfo) paramsB.get (0)).isNillable () || ((ParameterInfo) paramsB.get (0)).isOptional())
+ && (!(((ParameterInfo) paramsB.get (0)).isNillable ()
+ || ((ParameterInfo) paramsB.get (0)).isOptional())
|| CUtils.isPointerType(paramTypeName)))
- {
writer.write (paramTypeName + " Value" + i);
- }
else if (paramTypeName.lastIndexOf ("*") > 0)
- {
writer.write (paramTypeName + " Value" + i);
- }
else
- { //for AnyType too
writer.write (paramTypeName + "* Value" + i);
- }
}
+
// Multiples parameters so fill the methods prototype
ArrayList paramsC = (ArrayList) minfo.getOutputParameterTypes();
if (isAllTreatedAsOutParams)
@@ -303,54 +271,34 @@
type = wscontext.getTypemap().getType(
((ParameterInfo) paramsC.get(i)).getSchemaName());
writer.write(", AXIS_OUT_PARAM "
- + WrapperUtils
- .getClassNameFromParamInfoConsideringArrays(
- (ParameterInfo) paramsC.get(i),
- wscontext) + " *OutValue" + i);
+ + WrapperUtils.getClassNameFromParamInfoConsideringArrays(
+ (ParameterInfo) paramsC.get(i),wscontext) + " *OutValue" + i);
}
}
+
writer.write(")\n{\n");
+
if (returntype != null)
{
writer.write("\t");
if (returntypeisarray)
- {
- //for arrays
writer.write(outparamTypeName + " *\tRetArray = new " + outparamTypeName + "();\n");
- }
+ else if (!returntypeissimple)
+ writer.write(outparamTypeName + "\tpReturn = NULL;\n");
+ else if (returntype.isNillable() || returntype.isOptional()
+ || CUtils.isPointerType(outparamTypeName))
+ {
+ writer.write(outparamTypeName);
+ if (!CUtils.isPointerType(outparamTypeName))
+ writer.write(" *");
+
+ writer.write("\tRet = NULL;\n");
+ }
+ else if ("xsd__base64Binary".equals(outparamTypeName)
+ || "xsd__hexBinary".equals(outparamTypeName))
+ writer.write(outparamTypeName + "\tRet;\n");
else
- {
- if (!returntypeissimple)
- {
- writer.write(outparamTypeName + "\tpReturn = NULL;\n");
- //for complex types
- }
- else
- {
- //for simple types
- if (returntype.isNillable() || returntype.isOptional()
- || CUtils.isPointerType(outparamTypeName))
- {
- writer.write(outparamTypeName);
- if (!CUtils.isPointerType(outparamTypeName))
- {
- writer.write(" *");
- }
- writer.write("\tRet = NULL;\n");
- }
- else
- {
- if ("xsd__base64Binary".equals(outparamTypeName) || "xsd__hexBinary".equals(outparamTypeName))
- {
- writer.write(outparamTypeName + "\tRet;\n");
- }
- else
- {
- writer.write(outparamTypeName + "\tRet = " + CUtils.getInitValue(outparamTypeName) + ";\n");
- }
- }
- }
- }
+ writer.write(outparamTypeName + "\tRet = " + CUtils.getInitValue(outparamTypeName) + ";\n");
}
//writer.write("\tchar* cFaultcode;\n");
@@ -365,28 +313,17 @@
if (returntype != null)
{
if (returntypeisarray)
- {
writer.write("RetArray;\n");
- }
+ else if (CUtils.isPointerType(outparamTypeName) ||
+ (returntypeissimple && !(returntype.isNillable() || returntype.isOptional())))
+ writer.write("Ret;\n");
+ else if (returntypeissimple)
+ writer.write("*Ret;\n");
else
- if (CUtils.isPointerType(outparamTypeName) || (returntypeissimple && !(returntype.isNillable() || returntype.isOptional())))
- {
- writer.write("Ret;\n");
- }
- else
- if (returntypeissimple)
- {
- writer.write("*Ret;\n");
- }
- else
- {
- writer.write("pReturn;\n");
- }
+ writer.write("pReturn;\n");
}
else
- {
writer.write(";\n");
- }
writer.write("\t\t}\n\n");
@@ -504,9 +441,7 @@
paramTagName = returntype.getParamName();
if( paramTagName.charAt(0) == '_')
- {
paramTagName = paramTagName.substring( 1);
- }
}
if (isAllTreatedAsOutParams)
@@ -602,18 +537,14 @@
if (typeissimple)
{
if( i > 0)
- {
writer.write( "\n");
- }
if (CUtils.isPointerType(currentParaType))
{
String xsdType = WrapperUtils.getClassNameFromParamInfoConsideringArrays ((ParameterInfo) paramsC.get (i), wscontext);
if( !CUtils.isPointerType(xsdType))
- {
xsdType += " *";
- }
writer.write( "\t\t\t" + currentParaType + " pReturn" + i + " = m_pCall->" + CUtils.getParameterGetValueMethodName( currentParaType, false) + "( \"" + currentType.getParamName() + "\", 0);\n");
writer.write( "\n");
@@ -720,14 +651,11 @@
{
writer.write("\t\t\t\t" + outparamTypeName);
if (!CUtils.isPointerType(outparamTypeName))
- {
writer.write(" *");
- }
writer.write(" pReturn = m_pCall->"
+ CUtils.getParameterGetValueMethodName(outparamTypeName,
- false) + "( \"" + paramTagName
- + "\", 0);\n\n");
+ false) + "( \"" + paramTagName + "\", 0);\n\n");
writer.write("\t\t\t\tif( pReturn)\n");
writer.write("\t\t\t\t{\n");
if (CUtils.isPointerType(outparamTypeName))
@@ -735,15 +663,11 @@
writer.write("\t\t\t\t\tRet = new char[strlen( pReturn) + 1];\n");
writer.write("\t\t\t\t\tstrcpy( Ret, pReturn);\n");
}
+ else if (returntype.isOptional() || returntype.isNillable())
+ writer.write("\t\t\t\t\tRet = new " + outparamTypeName + "( *pReturn);\n");
else
- if (returntype.isOptional() || returntype.isNillable())
- {
- writer.write("\t\t\t\t\tRet = new " + outparamTypeName + "( *pReturn);\n");
- }
- else
- {
- writer.write("\t\t\t\t\tRet = *pReturn;\n");
- }
+ writer.write("\t\t\t\t\tRet = *pReturn;\n");
+
writer.write("\t\t\t\t\tAxis::AxisDelete( (void *) pReturn, " + CUtils.getXSDTypeForBasicType(outparamTypeName) + ");\n");
writer.write("\t\t\t\t}\n");
writer.write("\t\t\t}\n");
@@ -914,18 +838,15 @@
writer.write("\t\t\t\t\t\t(void*) Axis_Delete_" + langName + ",\n");
writer.write("\t\t\t\t\t\t\"" + faultInfoName + "\",\n");
writer.write("\t\t\t\t\t\t0);\n\n");
- writer
- .write("\t\t\t\tpFaultDetail->setFaultCode(pSoapFault->getFaultcode());\n");
- writer
- .write("\t\t\t\tpFaultDetail->setFaultString(pSoapFault->getFaultstring());\n");
- writer
- .write("\t\t\t\tpFaultDetail->setFaultActor(pSoapFault->getFaultactor());\n");
- writer
- .write("\t\t\t\tpFaultDetail->setExceptionCode(e.getExceptionCode());\n");
+ writer.write("\t\t\t\tpFaultDetail->setFaultCode(pSoapFault->getFaultcode());\n");
+ writer.write("\t\t\t\tpFaultDetail->setFaultString(pSoapFault->getFaultstring());\n");
+ writer.write("\t\t\t\tpFaultDetail->setFaultActor(pSoapFault->getFaultactor());\n");
+ writer.write("\t\t\t\tpFaultDetail->setExceptionCode(e.getExceptionCode());\n");
writer.write("\t\t\t\tm_pCall->unInitialize();\n");
writer.write("\t\t\t\tthrow *pFaultDetail;\n");
writer.write("\t\t\t}\n");
- } catch (IOException e)
+ }
+ catch (IOException e)
{
throw new WrapperFault(e);
}
@@ -967,7 +888,8 @@
+ "(" + typeName
+ "* param, IWrapperSoapSerializer* pSZ, bool bArray = false);\n\n");
}
- } catch (IOException e)
+ }
+ catch (IOException e)
{
throw new WrapperFault(e);
}