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 ba...@apache.org on 2007/02/28 23:00:32 UTC

svn commit: r513002 - in /webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/builder: DescriptionBuilderComposite.java MethodDescriptionComposite.java ParameterDescriptionComposite.java

Author: barrettj
Date: Wed Feb 28 14:00:31 2007
New Revision: 513002

URL: http://svn.apache.org/viewvc?view=rev&rev=513002
Log:
Cleanup and condense Description composites toString output.

Modified:
    webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/builder/DescriptionBuilderComposite.java
    webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/builder/MethodDescriptionComposite.java
    webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/builder/ParameterDescriptionComposite.java

Modified: webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/builder/DescriptionBuilderComposite.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/builder/DescriptionBuilderComposite.java?view=diff&rev=513002&r1=513001&r2=513002
==============================================================================
--- webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/builder/DescriptionBuilderComposite.java (original)
+++ webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/builder/DescriptionBuilderComposite.java Wed Feb 28 14:00:31 2007
@@ -447,100 +447,108 @@
 	
 	public String toString() {
 		StringBuffer sb = new StringBuffer();
-		String newLine = "\n";
-		sb.append("***** BEGIN DescriptionBuilderComposite *****");
-		sb.append(newLine);
-		sb.append("DBC.className= " + className);
-		sb.append(newLine);
-		sb.append("DBC.superClass=" + extendsClass);
-		sb.append(newLine);
+		final String newLine = "\n";
+        final String sameLine = "; ";
+        sb.append(super.toString());
+		sb.append(newLine);
+		sb.append("ClassName: " + className);
+		sb.append(sameLine);
+		sb.append("SuperClass:" + extendsClass);
+		
+        sb.append(newLine);
+        sb.append("Class modifiers: "); 
 		if(classModifiers != null) {
 			for(int i=0; i < classModifiers.length; i++) {
-				sb.append("DBC.classModifier=" + classModifiers[i]);
-				sb.append(newLine);
+				sb.append(classModifiers[i]);
+				sb.append(sameLine);
 			}
 		}
-		sb.append(newLine);
+	
+        sb.append(newLine);
+        sb.append("Interfaces: ");
 		Iterator<String> intIter = interfacesList.iterator();
 		while(intIter.hasNext()) {
 			String inter = intIter.next();
-			sb.append("DBC.interface= " + inter);
-			sb.append(newLine);
+			sb.append(inter);
+			sb.append(sameLine);
 		}
-		sb.append(newLine);
+		
 		if(webServiceAnnot != null) {
-			sb.append("\t ** @WebService **");
-			sb.append(newLine);
-			sb.append("\t" + webServiceAnnot.toString());
+            sb.append(newLine);
+            sb.append("WebService: ");
+			sb.append(webServiceAnnot.toString());
 		}
-		sb.append(newLine);
+		
 		if(webServiceProviderAnnot != null) {
-			sb.append("\t ** @WebServiceProvider **");
-			sb.append(newLine);
-			sb.append("\t" + webServiceProviderAnnot.toString());
+            sb.append(newLine);
+            sb.append("WebServiceProvider: ");
+			sb.append(webServiceProviderAnnot.toString());
 		}
-		sb.append(newLine);
+        
 		if(bindingTypeAnnot != null) {
-			sb.append("\t ** @BindingType **");
-			sb.append(newLine);
-			sb.append("\t" + bindingTypeAnnot.toString());
+            sb.append(newLine);
+            sb.append("BindingType: ");
+			sb.append(bindingTypeAnnot.toString());
 		}
-		sb.append(newLine);
+        
 		if(webServiceClientAnnot != null) {
-			sb.append("\t ** @WebServiceClient **");
-			sb.append(newLine);
-			sb.append("\t" + webServiceClientAnnot.toString());
+            sb.append(newLine);
+            sb.append("WebServiceClient: ");
+			sb.append(webServiceClientAnnot.toString());
 		}
-		sb.append(newLine);
+        
 		if(webFaultAnnot != null) {
-			sb.append("\t ** @WebFault **");
-			sb.append(newLine);
-			sb.append("\t" + webFaultAnnot.toString());
+            sb.append(newLine);
+            sb.append("WebFault: ");
+			sb.append(webFaultAnnot.toString());
 		}
-		sb.append(newLine);
+        
 		if(serviceModeAnnot != null) {
-			sb.append("\t ** @ServiceMode **");
-			sb.append(newLine);
-			sb.append("\t" + serviceModeAnnot.toString());
+            sb.append(newLine);
+            sb.append("ServiceMode: ");
+			sb.append(serviceModeAnnot.toString());
 		}
-		sb.append(newLine);
+        
 		if(soapBindingAnnot != null) {
-			sb.append("\t ** @SOAPBinding **");
-			sb.append(newLine);
-			sb.append("\t" + soapBindingAnnot.toString());
+            sb.append(newLine);
+            sb.append("SOAPBinding: ");
+			sb.append(soapBindingAnnot.toString());
 		}
-		sb.append(newLine);
+        
 		if(handlerChainAnnot != null) {
-			sb.append("\t ** @HandlerChain **");
-			sb.append(newLine);
-			sb.append("\t" + handlerChainAnnot.toString());
-		}
-		sb.append(newLine);
-		Iterator<WebServiceRefAnnot> wsrIter = webServiceRefAnnotList.iterator();
-		while(wsrIter.hasNext()) {
-			WebServiceRefAnnot wsr = wsrIter.next();
-			sb.append("\t ** @WebServiceRef **");
-			sb.append(newLine);
-			sb.append("\t" + wsr.toString());
-			sb.append(newLine);
-		}
+            sb.append(newLine);
+            sb.append("HandlerChain: ");
+			sb.append(handlerChainAnnot.toString());
+		}
+		
+        if (webServiceRefAnnotList.size() > 0) {
+            sb.append(newLine);
+            sb.append("Number of WebServiceRef:  " + webServiceRefAnnotList.size());
+            Iterator<WebServiceRefAnnot> wsrIter = webServiceRefAnnotList.iterator();
+            while(wsrIter.hasNext()) {
+                WebServiceRefAnnot wsr = wsrIter.next();
+                sb.append(wsr.toString());
+                sb.append(sameLine);
+            }
+        }
+        
 		sb.append(newLine);
+        sb.append("Number of Method Descriptions: " + methodDescriptions.size());
 		Iterator<MethodDescriptionComposite> mdcIter =  methodDescriptions.iterator();
-		sb.append(newLine);
 		while(mdcIter.hasNext()) {
+            sb.append(newLine);
 			MethodDescriptionComposite mdc = mdcIter.next();
-			sb.append("\t\t" + mdc.toString());
-			sb.append(newLine);
+			sb.append(mdc.toString());
 		}
-		sb.append(newLine);
+		
+        sb.append(newLine);
+        sb.append("Number of Field Descriptions: " + fieldDescriptions.size());
 		Iterator<FieldDescriptionComposite> fdcIter = fieldDescriptions.iterator();
-		sb.append(newLine);
 		while(fdcIter.hasNext()) {
+            sb.append(newLine);
 			FieldDescriptionComposite fdc = fdcIter.next();
-			sb.append("\t\t" + fdc.toString());
-			sb.append(newLine);
+			sb.append(fdc.toString());
 		}
-		sb.append("***** END DescriptionBuilderComposite *****");
 		return sb.toString();
 	}
 	

Modified: webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/builder/MethodDescriptionComposite.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/builder/MethodDescriptionComposite.java?view=diff&rev=513002&r1=513001&r2=513002
==============================================================================
--- webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/builder/MethodDescriptionComposite.java (original)
+++ webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/builder/MethodDescriptionComposite.java Wed Feb 28 14:00:31 2007
@@ -404,84 +404,84 @@
 	 */
 	public String toString() {
 		StringBuffer sb = new StringBuffer();
-		String newLine = "\n";
-		sb.append("***** BEGIN MethodDescriptionComposite *****");
-		sb.append(newLine);
-		sb.append("MDC.name= " + methodName);
-		sb.append(newLine);
-		sb.append("MDC.returnType= " + returnType);
+		final String newLine = "\n";
+        final String sameLine = "; ";
+        sb.append(super.toString());
+		sb.append(newLine);
+		sb.append("Name: " + methodName);
+		sb.append(sameLine);
+		sb.append("ReturnType: " + returnType);
+        
+        sb.append(newLine);
+        sb.append("Exceptions: ");
 		if(exceptions != null) {
 			for(int i=0; i < exceptions.length; i++) {
-				sb.append("MDC.exception= " + exceptions[i]);
-				sb.append(newLine);
+				sb.append(exceptions[i]);
+				sb.append(sameLine);
 			}
 		}
-		sb.append(newLine);
-		sb.append("\t ** @OneWay **");
-		sb.append(newLine);
-		sb.append("\t isOneWay= ");
+        
 		if(oneWayAnnotated) {
-			sb.append("true");
+            sb.append(newLine);
+            sb.append("OneWay");
 		}
-		else {
-			sb.append("false");
-		}
-		sb.append(newLine);
+
 		if(webMethodAnnot != null) {
-			sb.append("\t ** @WebMethod **");
-			sb.append(newLine);
-			sb.append("\t" + webMethodAnnot.toString());
+            sb.append(newLine);
+            sb.append("WebMethod: ");
+			sb.append(webMethodAnnot.toString());
 		}
-		sb.append(newLine);
+        
 		if(requestWrapperAnnot != null) {
-			sb.append("\t ** @RequestWrapper **");
-			sb.append(newLine);
-			sb.append("\t" + requestWrapperAnnot.toString());
+            sb.append(newLine);
+            sb.append("RequestWrapper: ");
+			sb.append(requestWrapperAnnot.toString());
 		}
-		sb.append(newLine);
+        
 		if(responseWrapperAnnot != null) {
-			sb.append("\t ** @ResponsetWrapper **");
-			sb.append(newLine);
-			sb.append("\t" + responseWrapperAnnot.toString());
+            sb.append(newLine);
+            sb.append("ResponsetWrapper: ");
+			sb.append(responseWrapperAnnot.toString());
 		}
-		sb.append(newLine);
+        
 		if(soapBindingAnnot != null) {
-			sb.append("\t ** @SOAPBinding **");
-			sb.append(newLine);
-			sb.append("\t" + soapBindingAnnot.toString());
+            sb.append(newLine);
+            sb.append("SOAPBinding: ");
+			sb.append(soapBindingAnnot.toString());
 		}
-		sb.append(newLine);
+        
 		if(webEndpointAnnot != null) {
-			sb.append("\t ** @WebEndpoint **");
-			sb.append(newLine);
-			sb.append("\t" + webEndpointAnnot.toString());
+            sb.append(newLine);
+            sb.append("WebEndpoint: ");
+			sb.append(webEndpointAnnot.toString());
 		}
-		sb.append(newLine);
+
 		if(webResultAnnot != null) {
-			sb.append("\t ** @WebResult **");
-			sb.append(newLine);
-			sb.append("\t" + webResultAnnot.toString());
+            sb.append(newLine);
+            sb.append("WebResult: ");
+			sb.append(webResultAnnot.toString());
 		}
-		sb.append(newLine);
+        
 		if(webServiceRefAnnot != null) {
-			sb.append("\t ** @WebServiceRef **");
-			sb.append(newLine);
-			sb.append("\t" + webServiceRefAnnot.toString());
+            sb.append(newLine);
+            sb.append("WebServiceRef: ");
+			sb.append(webServiceRefAnnot.toString());
 		}
-		sb.append(newLine);
+        
 		if(handlerChainAnnot != null) {
-			sb.append("\t ** @HandlerChain **");
-			sb.append(newLine);
-			sb.append("\t" + handlerChainAnnot.toString());
+            sb.append(newLine);
+            sb.append("HandlerChain: ");
+			sb.append(handlerChainAnnot.toString());
 		}
+        
 		sb.append(newLine);
+        sb.append("Number of Parameter Descriptions: " + parameterDescriptions.size());
 		Iterator<ParameterDescriptionComposite> pdcIter = parameterDescriptions.iterator();
 		while(pdcIter.hasNext()) {
+            sb.append(newLine);
 			ParameterDescriptionComposite pdc = pdcIter.next();
-			sb.append("\t\t" + pdc.toString());
-			sb.append(newLine);
+			sb.append(pdc.toString());
 		}
-		sb.append("***** END MethodDescriptionComposite *****");
 		return sb.toString();
 	}
 }

Modified: webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/builder/ParameterDescriptionComposite.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/builder/ParameterDescriptionComposite.java?view=diff&rev=513002&r1=513001&r2=513002
==============================================================================
--- webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/builder/ParameterDescriptionComposite.java (original)
+++ webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/builder/ParameterDescriptionComposite.java Wed Feb 28 14:00:31 2007
@@ -205,23 +205,23 @@
 	 */
 	public String toString() {
 		StringBuffer sb = new StringBuffer();
-		String newLine = "\n";
-		sb.append("***** BEGIN ParameterDescriptionComposite *****");
-		sb.append("PDC.parameterType= " + parameterType);
-		sb.append(newLine);
+		final String newLine = "\n";
+        final String sameLine = "; ";
+		sb.append(super.toString());
+        sb.append(sameLine);
+		sb.append("ParameterType: " + parameterType);
+
 		if(webParamAnnot != null) {
-			sb.append("\t @WebParam");
-			sb.append(newLine);
-			sb.append("\t" + webParamAnnot.toString());
+            sb.append(newLine);
+            sb.append("WebParam: ");
+			sb.append(webParamAnnot.toString());
 		}
-		sb.append(newLine);
+        
 		if(webServiceRefAnnot != null) {
-			sb.append("\t @WebServiceRef");
-			sb.append(newLine);
-			sb.append("\t" + webServiceRefAnnot.toString());
+            sb.append(newLine);
+            sb.append("WebServiceRef: ");
+			sb.append(webServiceRefAnnot.toString());
 		}
-		sb.append(newLine);
-		sb.append("***** END ParameterDescriptionComposite *****");
 		return sb.toString();
 	}
     



---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org