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 di...@apache.org on 2004/11/11 14:29:10 UTC
cvs commit: ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp AllParamWriter.java WrapWriter.java
dicka 2004/11/11 05:29:10
Modified: c/src/wsdl/org/apache/axis/wsdl/wsdl2ws Generator.java
SourceWriterFactory.java WsddWriter.java
c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp
AllParamWriter.java WrapWriter.java
Log:
Improvements to code readability of WSDL2Ws
Submitted by: Adrian Dick
Revision Changes Path
1.2 +2 -2 ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/Generator.java
Index: Generator.java
===================================================================
RCS file: /home/cvs/ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/Generator.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Generator.java 29 Oct 2004 12:30:49 -0000 1.1
+++ Generator.java 11 Nov 2004 13:29:10 -0000 1.2
@@ -28,11 +28,11 @@
{
private SourceWriter sourceWriter;
- public Generator(int genaratorType, WebServiceContext wscontext)
+ public Generator(int generatorType, WebServiceContext wscontext)
throws WrapperFault
{
this.sourceWriter =
- SourceWriterFactory.createSourceWriter(genaratorType, wscontext);
+ SourceWriterFactory.createSourceWriter(generatorType, wscontext);
}
public void generate() throws WrapperFault
1.14 +102 -92 ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/SourceWriterFactory.java
Index: SourceWriterFactory.java
===================================================================
RCS file: /home/cvs/ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/SourceWriterFactory.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- SourceWriterFactory.java 5 Nov 2004 14:47:40 -0000 1.13
+++ SourceWriterFactory.java 11 Nov 2004 13:29:10 -0000 1.14
@@ -22,96 +22,106 @@
* @author Srinath Perera (hemapani@opensource.lk)
* @author Dimuthu Leelarathne (muthulee@opensource.lk)
*/
-public class SourceWriterFactory {
- public static SourceWriter createSourceWriter(int genaratorType,WebServiceContext wscontext)throws WrapperFault{
- //write deployment or undeployment wsdd files
- if (genaratorType == WrapperConstants.GENERATOR_DEPLOYMENT){
- return new DeploymentWriter(wscontext);
- }
- else if (genaratorType == WrapperConstants.GENERATOR_UNDEPLOYMENT){
- return new UndeploymentWriter(wscontext);
- }
- else if (genaratorType == WrapperConstants.GENERATOR_BUILDSCRIPT){
- return new BuildScriptWriter(wscontext);
- }
- if("rpc".equals(wscontext.getWrapInfo().getWrapperStyle())){
- //C++
- if(genaratorType == WrapperConstants.GENERATOR_PARAM_CPP_ALL)
- return new org.apache.axis.wsdl.wsdl2ws.cpp.AllParamWriter(wscontext);
- else if(genaratorType == WrapperConstants.GENERATOR_WRAPPER_CPP)
- return new org.apache.axis.wsdl.wsdl2ws.cpp.WrapWriter(wscontext);
- else if(genaratorType == WrapperConstants.GENERATOR_WRAPPER_HPP)
- return new org.apache.axis.wsdl.wsdl2ws.cpp.WrapHeaderWriter(wscontext);
- else if(genaratorType == WrapperConstants.GENERATOR_SERVICE_CPP)
- return new org.apache.axis.wsdl.wsdl2ws.cpp.ServiceWriter(wscontext);
- else if(genaratorType == WrapperConstants.GENERATOR_SERVICE_HPP)
- return new org.apache.axis.wsdl.wsdl2ws.cpp.ServiceHeaderWriter(wscontext);
- else if(genaratorType == WrapperConstants.GENERATOR_CLASSLOADER_CPP)
- return new org.apache.axis.wsdl.wsdl2ws.cpp.ClassLoader(wscontext);
- else if(genaratorType == WrapperConstants.GENERATOR_CLIENT_STUB_HPP)
- return new org.apache.axis.wsdl.wsdl2ws.cpp.ClientStubHeaderWriter(wscontext);
- else if(genaratorType == WrapperConstants.GENERATOR_CLIENT_STUB_CPP)
- return new org.apache.axis.wsdl.wsdl2ws.cpp.ClientStubWriter(wscontext);
- else if(genaratorType == WrapperConstants.GENERATOR_CLIENT_EXCEPTION)
- return new org.apache.axis.wsdl.wsdl2ws.cpp.AllExceptionWriter(wscontext,"Client");
- else if(genaratorType == WrapperConstants.GENERATOR_SERVER_EXCEPTION)
- return new org.apache.axis.wsdl.wsdl2ws.cpp.AllExceptionWriter(wscontext,"Server");
- //C
- else if(genaratorType == WrapperConstants.GENERATOR_PARAM_C_ALL)
- return new org.apache.axis.wsdl.wsdl2ws.c.AllParamWriter(wscontext);
- else if(genaratorType == WrapperConstants.GENERATOR_WRAPPER_C)
- return new org.apache.axis.wsdl.wsdl2ws.c.WrapWriter(wscontext);
- else if(genaratorType == WrapperConstants.GENERATOR_WRAPPER_H)
- return new org.apache.axis.wsdl.wsdl2ws.c.WrapHeaderWriter(wscontext);
- else if(genaratorType == WrapperConstants.GENERATOR_SERVICE_C)
- return new org.apache.axis.wsdl.wsdl2ws.c.ServiceWriter(wscontext);
- else if(genaratorType == WrapperConstants.GENERATOR_CLASSLOADER_C)
- return new org.apache.axis.wsdl.wsdl2ws.c.ClassLoader(wscontext);
- else if(genaratorType == WrapperConstants.GENERATOR_CLIENT_STUB_H)
- return new org.apache.axis.wsdl.wsdl2ws.c.ClientStubHeaderWriter(wscontext);
- else if(genaratorType == WrapperConstants.GENERATOR_CLIENT_STUB_C)
- return new org.apache.axis.wsdl.wsdl2ws.c.ClientStubWriter(wscontext);
- throw new WrapperFault("Source writer type not found");
- }
- else if ("document".equals(wscontext.getWrapInfo().getWrapperStyle())){
- if(genaratorType == WrapperConstants.GENERATOR_PARAM_CPP_ALL)
- return new org.apache.axis.wsdl.wsdl2ws.cpp.literal.AllParamWriter(wscontext);
- else if(genaratorType == WrapperConstants.GENERATOR_WRAPPER_CPP)
- return new org.apache.axis.wsdl.wsdl2ws.cpp.literal.WrapWriter(wscontext);
- else if(genaratorType == WrapperConstants.GENERATOR_WRAPPER_HPP)
- return new org.apache.axis.wsdl.wsdl2ws.cpp.literal.WrapHeaderWriter(wscontext);
- else if(genaratorType == WrapperConstants.GENERATOR_SERVICE_CPP)
- return new org.apache.axis.wsdl.wsdl2ws.cpp.ServiceWriter(wscontext);
- else if(genaratorType == WrapperConstants.GENERATOR_SERVICE_HPP)
- return new org.apache.axis.wsdl.wsdl2ws.cpp.literal.ServiceHeaderWriter(wscontext);
- else if(genaratorType == WrapperConstants.GENERATOR_CLASSLOADER_CPP)
- return new org.apache.axis.wsdl.wsdl2ws.cpp.ClassLoader(wscontext);
- else if(genaratorType == WrapperConstants.GENERATOR_CLIENT_STUB_HPP)
- return new org.apache.axis.wsdl.wsdl2ws.cpp.literal.ClientStubHeaderWriter(wscontext);
- else if(genaratorType == WrapperConstants.GENERATOR_CLIENT_STUB_CPP)
- return new org.apache.axis.wsdl.wsdl2ws.cpp.literal.ClientStubWriter(wscontext);
- else if(genaratorType == WrapperConstants.GENERATOR_CLIENT_EXCEPTION) // nithya
- return new org.apache.axis.wsdl.wsdl2ws.cpp.AllExceptionWriter(wscontext,"Client");
- else if(genaratorType == WrapperConstants.GENERATOR_SERVER_EXCEPTION) // nithya
- return new org.apache.axis.wsdl.wsdl2ws.cpp.AllExceptionWriter(wscontext,"Server");
-
- //C
- else if(genaratorType == WrapperConstants.GENERATOR_PARAM_C_ALL)
- return new org.apache.axis.wsdl.wsdl2ws.c.literal.AllParamWriter(wscontext);
- else if(genaratorType == WrapperConstants.GENERATOR_WRAPPER_C)
- return new org.apache.axis.wsdl.wsdl2ws.c.literal.WrapWriter(wscontext);
- else if(genaratorType == WrapperConstants.GENERATOR_WRAPPER_H)
- return new org.apache.axis.wsdl.wsdl2ws.c.WrapHeaderWriter(wscontext);
- else if(genaratorType == WrapperConstants.GENERATOR_SERVICE_C)
- return new org.apache.axis.wsdl.wsdl2ws.c.literal.ServiceWriter(wscontext);
- else if(genaratorType == WrapperConstants.GENERATOR_CLASSLOADER_C)
- return new org.apache.axis.wsdl.wsdl2ws.c.ClassLoader(wscontext);
- else if(genaratorType == WrapperConstants.GENERATOR_CLIENT_STUB_H)
- return new org.apache.axis.wsdl.wsdl2ws.c.literal.ClientStubHeaderWriter(wscontext);
- else if(genaratorType == WrapperConstants.GENERATOR_CLIENT_STUB_C)
- return new org.apache.axis.wsdl.wsdl2ws.c.literal.ClientStubWriter(wscontext);
- throw new WrapperFault("Source writer type not found");
- }
- throw new WrapperFault("Source writer type not found");
- }
+public class SourceWriterFactory
+{
+ public static SourceWriter createSourceWriter(int generatorType, WebServiceContext wscontext) throws WrapperFault
+ {
+ switch (generatorType)
+ {
+ case WrapperConstants.GENERATOR_DEPLOYMENT :
+ return new DeploymentWriter(wscontext);
+ case WrapperConstants.GENERATOR_UNDEPLOYMENT :
+ return new UndeploymentWriter(wscontext);
+ case WrapperConstants.GENERATOR_BUILDSCRIPT :
+ return new BuildScriptWriter(wscontext);
+ }
+ if ("rpc".equals(wscontext.getWrapInfo().getWrapperStyle()))
+ {
+ switch (generatorType)
+ {
+ // C++
+ case WrapperConstants.GENERATOR_PARAM_CPP_ALL :
+ return new org.apache.axis.wsdl.wsdl2ws.cpp.AllParamWriter(wscontext);
+ case WrapperConstants.GENERATOR_WRAPPER_CPP :
+ return new org.apache.axis.wsdl.wsdl2ws.cpp.WrapWriter(wscontext);
+ case WrapperConstants.GENERATOR_WRAPPER_HPP :
+ return new org.apache.axis.wsdl.wsdl2ws.cpp.WrapHeaderWriter(wscontext);
+ case WrapperConstants.GENERATOR_SERVICE_CPP :
+ return new org.apache.axis.wsdl.wsdl2ws.cpp.ServiceWriter(wscontext);
+ case WrapperConstants.GENERATOR_SERVICE_HPP :
+ return new org.apache.axis.wsdl.wsdl2ws.cpp.ServiceHeaderWriter(wscontext);
+ case WrapperConstants.GENERATOR_CLASSLOADER_CPP :
+ return new org.apache.axis.wsdl.wsdl2ws.cpp.ClassLoader(wscontext);
+ case WrapperConstants.GENERATOR_CLIENT_STUB_HPP :
+ return new org.apache.axis.wsdl.wsdl2ws.cpp.ClientStubHeaderWriter(wscontext);
+ case WrapperConstants.GENERATOR_CLIENT_STUB_CPP :
+ return new org.apache.axis.wsdl.wsdl2ws.cpp.ClientStubWriter(wscontext);
+ case WrapperConstants.GENERATOR_CLIENT_EXCEPTION :
+ return new org.apache.axis.wsdl.wsdl2ws.cpp.AllExceptionWriter(wscontext, "Client");
+ case WrapperConstants.GENERATOR_SERVER_EXCEPTION :
+ return new org.apache.axis.wsdl.wsdl2ws.cpp.AllExceptionWriter(wscontext, "Server");
+ //C
+ case WrapperConstants.GENERATOR_PARAM_C_ALL :
+ return new org.apache.axis.wsdl.wsdl2ws.c.AllParamWriter(wscontext);
+ case WrapperConstants.GENERATOR_WRAPPER_C :
+ return new org.apache.axis.wsdl.wsdl2ws.c.WrapWriter(wscontext);
+ case WrapperConstants.GENERATOR_WRAPPER_H :
+ return new org.apache.axis.wsdl.wsdl2ws.c.WrapHeaderWriter(wscontext);
+ case WrapperConstants.GENERATOR_SERVICE_C :
+ return new org.apache.axis.wsdl.wsdl2ws.c.ServiceWriter(wscontext);
+ case WrapperConstants.GENERATOR_CLASSLOADER_C :
+ return new org.apache.axis.wsdl.wsdl2ws.c.ClassLoader(wscontext);
+ case WrapperConstants.GENERATOR_CLIENT_STUB_H :
+ return new org.apache.axis.wsdl.wsdl2ws.c.ClientStubHeaderWriter(wscontext);
+ case WrapperConstants.GENERATOR_CLIENT_STUB_C :
+ return new org.apache.axis.wsdl.wsdl2ws.c.ClientStubWriter(wscontext);
+ }
+ }
+ else
+ if ("document".equals(wscontext.getWrapInfo().getWrapperStyle()))
+ {
+ switch (generatorType)
+ {
+ // C++
+ case WrapperConstants.GENERATOR_PARAM_CPP_ALL :
+ return new org.apache.axis.wsdl.wsdl2ws.cpp.literal.AllParamWriter(wscontext);
+ case WrapperConstants.GENERATOR_WRAPPER_CPP :
+ return new org.apache.axis.wsdl.wsdl2ws.cpp.literal.WrapWriter(wscontext);
+ case WrapperConstants.GENERATOR_WRAPPER_HPP :
+ return new org.apache.axis.wsdl.wsdl2ws.cpp.literal.WrapHeaderWriter(wscontext);
+ case WrapperConstants.GENERATOR_SERVICE_CPP :
+ return new org.apache.axis.wsdl.wsdl2ws.cpp.ServiceWriter(wscontext);
+ case WrapperConstants.GENERATOR_SERVICE_HPP :
+ return new org.apache.axis.wsdl.wsdl2ws.cpp.literal.ServiceHeaderWriter(wscontext);
+ case WrapperConstants.GENERATOR_CLASSLOADER_CPP :
+ return new org.apache.axis.wsdl.wsdl2ws.cpp.ClassLoader(wscontext);
+ case WrapperConstants.GENERATOR_CLIENT_STUB_HPP :
+ return new org.apache.axis.wsdl.wsdl2ws.cpp.literal.ClientStubHeaderWriter(wscontext);
+ case WrapperConstants.GENERATOR_CLIENT_STUB_CPP :
+ return new org.apache.axis.wsdl.wsdl2ws.cpp.literal.ClientStubWriter(wscontext);
+ case WrapperConstants.GENERATOR_CLIENT_EXCEPTION :
+ // nithya
+ return new org.apache.axis.wsdl.wsdl2ws.cpp.AllExceptionWriter(wscontext, "Client");
+ case WrapperConstants.GENERATOR_SERVER_EXCEPTION :
+ // nithya
+ return new org.apache.axis.wsdl.wsdl2ws.cpp.AllExceptionWriter(wscontext, "Server");
+ //C
+ case WrapperConstants.GENERATOR_PARAM_C_ALL :
+ return new org.apache.axis.wsdl.wsdl2ws.c.literal.AllParamWriter(wscontext);
+ case WrapperConstants.GENERATOR_WRAPPER_C :
+ return new org.apache.axis.wsdl.wsdl2ws.c.literal.WrapWriter(wscontext);
+ case WrapperConstants.GENERATOR_WRAPPER_H :
+ return new org.apache.axis.wsdl.wsdl2ws.c.WrapHeaderWriter(wscontext);
+ case WrapperConstants.GENERATOR_SERVICE_C :
+ return new org.apache.axis.wsdl.wsdl2ws.c.literal.ServiceWriter(wscontext);
+ case WrapperConstants.GENERATOR_CLASSLOADER_C :
+ return new org.apache.axis.wsdl.wsdl2ws.c.ClassLoader(wscontext);
+ case WrapperConstants.GENERATOR_CLIENT_STUB_H :
+ return new org.apache.axis.wsdl.wsdl2ws.c.literal.ClientStubHeaderWriter(wscontext);
+ case WrapperConstants.GENERATOR_CLIENT_STUB_C :
+ return new org.apache.axis.wsdl.wsdl2ws.c.literal.ClientStubWriter(wscontext);
+ }
+ }
+ throw new WrapperFault("Source writer type not found");
+ }
}
1.3 +58 -32 ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/WsddWriter.java
Index: WsddWriter.java
===================================================================
RCS file: /home/cvs/ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/WsddWriter.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- WsddWriter.java 9 Apr 2004 08:49:31 -0000 1.2
+++ WsddWriter.java 11 Nov 2004 13:29:10 -0000 1.3
@@ -31,37 +31,63 @@
* @author Susantha Kumara
*
*/
-public class WsddWriter implements SourceWriter {
- protected String servicename = null;
- protected String providerLang = null;
- protected String providerStyle = null;
- protected String description = null;
- protected Vector allowedmethods = new Vector();
- WebServiceContext wscontext = null;
- public WsddWriter(WebServiceContext wscontext) throws WrapperFault {
- this.wscontext = wscontext;
- servicename = wscontext.getSerInfo().getServicename();
- String language = wscontext.getWrapInfo().getWrapperLanguage();
- providerStyle = ("rpc".equals(wscontext.getWrapInfo().getWrapperStyle()))? "RPC" : "DOCUMENT";
- providerLang = ("c".equalsIgnoreCase(language)) ? "C" : "CPP";
- description = "Axis C++ web service";
- ArrayList methods = wscontext.getSerInfo().getMethods();
- MethodInfo minfo;
- for (int i = 0; i < methods.size(); i++) {
- minfo = (MethodInfo)methods.get(i);
- allowedmethods.add(minfo.getMethodname());
- }
+public class WsddWriter implements SourceWriter
+{
+ protected String servicename = null;
+ protected String providerLang = null;
+ protected String providerStyle = null;
+ protected String description = null;
+ protected Vector allowedmethods = new Vector();
+ WebServiceContext wscontext = null;
+ public WsddWriter(WebServiceContext wscontext) throws WrapperFault
+ {
+ this.wscontext = wscontext;
+ servicename = wscontext.getSerInfo().getServicename();
+ String language = wscontext.getWrapInfo().getWrapperLanguage();
- }
- public void writeSource()throws WrapperFault{
-
- }
- protected File getFilePath(WebServiceContext wscontext, String filename) throws WrapperFault {
- String targetOutputLocation = wscontext.getWrapInfo().getTargetOutputLocation();
- if(targetOutputLocation.endsWith("/"))
- targetOutputLocation = targetOutputLocation.substring(0, targetOutputLocation.length() - 1);
- new File(targetOutputLocation).mkdirs();
- String fileName = targetOutputLocation + "/" + filename + ".wsdd";
- return new File(fileName);
- }
+ if ("rpc".equals(wscontext.getWrapInfo().getWrapperStyle()))
+ {
+ providerStyle = "RPC";
+ }
+ else
+ {
+ providerStyle = "DOCUMENT";
+ }
+
+ if ("c".equalsIgnoreCase(language))
+ {
+ providerLang = "C";
+ }
+ else
+ {
+ providerLang = "CPP";
+ }
+ description = "Axis C++ web service";
+ ArrayList methods = wscontext.getSerInfo().getMethods();
+ MethodInfo minfo;
+ for (int i = 0; i < methods.size(); i++)
+ {
+ minfo = (MethodInfo) methods.get(i);
+ allowedmethods.add(minfo.getMethodname());
+ }
+
+ }
+ public void writeSource() throws WrapperFault
+ {}
+ protected File getFilePath(WebServiceContext wscontext, String filename)
+ throws WrapperFault
+ {
+ String targetOutputLocation =
+ wscontext.getWrapInfo().getTargetOutputLocation();
+ if (targetOutputLocation.endsWith("/"))
+ {
+ targetOutputLocation =
+ targetOutputLocation.substring(
+ 0,
+ targetOutputLocation.length() - 1);
+ }
+ new File(targetOutputLocation).mkdirs();
+ String fileName = targetOutputLocation + "/" + filename + ".wsdd";
+ return new File(fileName);
+ }
}
1.10 +4 -4 ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/AllParamWriter.java
Index: AllParamWriter.java
===================================================================
RCS file: /home/cvs/ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/AllParamWriter.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- AllParamWriter.java 28 Oct 2004 14:14:53 -0000 1.9
+++ AllParamWriter.java 11 Nov 2004 13:29:10 -0000 1.10
@@ -49,13 +49,13 @@
*/
public void writeSource() throws WrapperFault
{
- Iterator enu = wscontext.getTypemap().getTypes().iterator();
+ Iterator types = wscontext.getTypemap().getTypes().iterator();
Type type = null;
- while (enu.hasNext())
+ while (types.hasNext())
{
try
{
- type = (Type) enu.next();
+ type = (Type) types.next();
if (wscontext
.getWrapInfo()
.getImplStyle()
@@ -117,7 +117,7 @@
System.out.println(
"Error occured generating code for "
+ type.getLanguageSpecificName()
- + ". Yet we continue to genarate other classes ... You should check the error");
+ + ". Yet we continue to generate other classes ... You should check the error");
e.printStackTrace();
}
}
1.37 +3 -1 ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/WrapWriter.java
Index: WrapWriter.java
===================================================================
RCS file: /home/cvs/ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/WrapWriter.java,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- WrapWriter.java 9 Nov 2004 10:26:20 -0000 1.36
+++ WrapWriter.java 11 Nov 2004 13:29:10 -0000 1.37
@@ -228,6 +228,7 @@
returntype = null;
}
else
+ {
if (1 == noOfOutParams)
{
returntype =
@@ -240,6 +241,7 @@
{
isAllTreatedAsOutParams = true;
}
+ }
Collection params = minfo.getInputParameterTypes();
String methodName = minfo.getMethodname();
Type retType = null;
@@ -647,10 +649,10 @@
//write end of method
writer.write("}\n");
}
+
/* (non-Javadoc)
* @see org.apache.axis.wsdl.wsdl2ws.cpp.CPPClassWriter#writeGlobalCodes()
*/
-
private void writeExceptions(
String faulttype,
String faultInfoName,