You are viewing a plain text version of this content. The canonical link for it is here.
Posted to muse-commits@ws.apache.org by ae...@apache.org on 2007/02/24 18:18:58 UTC
svn commit: r511310 - in
/webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/generator/synthesizer:
ProxyClassSynthesizer.java ProxyInterfaceSynthesizer.java
Author: aeberbac
Date: Sat Feb 24 09:18:57 2007
New Revision: 511310
URL: http://svn.apache.org/viewvc?view=rev&rev=511310
Log:
MUSE-118: Fixed bugs related to proxy generation. The capabilities that were handled
by the base client class weren't being added to the list of capabilities handled by the notification producer/consumer.
Also fixed some spacing issues and cleaned up the generated code if it
didn't have any methods then no method code was generated.
Modified:
webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/generator/synthesizer/ProxyClassSynthesizer.java
webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/generator/synthesizer/ProxyInterfaceSynthesizer.java
Modified: webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/generator/synthesizer/ProxyClassSynthesizer.java
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/generator/synthesizer/ProxyClassSynthesizer.java?view=diff&rev=511310&r1=511309&r2=511310
==============================================================================
--- webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/generator/synthesizer/ProxyClassSynthesizer.java (original)
+++ webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/generator/synthesizer/ProxyClassSynthesizer.java Sat Feb 24 09:18:57 2007
@@ -43,7 +43,6 @@
ConfigurationData.WSDL_DOCUMENT_LIST_CONFIGURATION
};
- StringBuffer _operationsCode;
StringBuffer _operationNamesCode;
StringBuffer _returnTypesCode;
StringBuffer _actionsCode;
@@ -53,10 +52,10 @@
StringBuffer _requestParamNamesCode;
StringBuffer _propertiesOperationsCode;
- StringBuffer _propertiesCode;
private String _interfaceName;
- private boolean _hasMethods;
+ private boolean _hasMethods = false;
+ private boolean _hasProperties = false;
protected String generateClassName(Document wsdlDocument) {
_interfaceName = super.generateClassName(wsdlDocument);
@@ -149,8 +148,8 @@
protected void updateCode(Capability capability) {
ClassInfo classInfo = new ClassInfo();
classInfo.setCapability(capability);
-
- updateMethods(classInfo, _operationsCode);
+
+ updateMethods(classInfo, _operationsCode);
updateImports(classInfo);
}
@@ -335,7 +334,9 @@
_actionsCode.append(", ");
}
- protected void generatePropertyDeleteBody(JavaProperty property, ClassInfo classInfo, int propertyIndex, StringBuffer code) {
+ protected void generatePropertyDeleteBody(JavaProperty property, ClassInfo classInfo, int propertyIndex, StringBuffer code) {
+ _hasProperties = true;
+
newLine(code);
indent(code);
generateOpenBlock(code);
@@ -351,8 +352,9 @@
}
protected void generatePropertyGetBody(JavaProperty property, ClassInfo classInfo, int propertyIndex, StringBuffer code) {
- Class type = property.getJavaType();
+ _hasProperties = true;
+ Class type = property.getJavaType();
newLine(code);
indent(code);
generateOpenBlock(code);
@@ -400,6 +402,8 @@
}
protected void generatePropertySetBody(JavaProperty property, ClassInfo classInfo, int propertyIndex, String setType, StringBuffer code) {
+ _hasProperties = true;
+
Class type = property.getJavaType();
if(type.isArray()) {
type = ReflectUtils.getClassFromArrayClass(type);
@@ -449,14 +453,22 @@
code.append(_headerCode);
- if(_hasMethods) {
- code.append(_operationsCode);
+ if(_hasProperties || _hasMethods) {
+ code.append(_operationsCode);
+ newLine(code);
+ }
+
+ if(_hasMethods) {
code.append(_operationNamesCode);
+ newLine(code);
code.append(_returnTypesCode);
+ newLine(code);
code.append(_actionsCode);
-
+ newLine(code);
code.append(_requestNamesCode);
+ newLine(code);
code.append(_responseNamesCode);
+ newLine(code);
code.append(_requestParamNamesCode);
}
@@ -483,17 +495,17 @@
StringBuffer code = new StringBuffer();
generateProxyConstructors(code);
-
- newLine(code);
- generateGetHandler(code);
+
+ if(_hasMethods) {
+ generateGetHandler(code);
+
+ newLine(code);
+ generateStatic(code);
+ }
- newLine(code);
- generateStatic(code);
+ generateCloseBlock(code);
newLine(code);
- generateCloseBlock(code);
- newLine(code);
-
return code;
}
@@ -503,7 +515,6 @@
Constructor[] ctors = _baseClientClass.getConstructors();
for (int n = 0; n < ctors.length; ++n) {
- newLine(code);
indent(code);
code.append("public ");
code.append(className);
@@ -531,7 +542,7 @@
indent(code);
generateCloseBlock(code);
- newLine(code);
+ newLine(2, code);
}
}
@@ -542,9 +553,9 @@
}
private void generateGetHandler(StringBuffer code) {
- newLine(code);
indent(code);
code.append("protected ProxyHandler getHandler(String methodName)");
+ addImport(ProxyHandler.class);
newLine(code);
indent(code);
Modified: webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/generator/synthesizer/ProxyInterfaceSynthesizer.java
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/generator/synthesizer/ProxyInterfaceSynthesizer.java?view=diff&rev=511310&r1=511309&r2=511310
==============================================================================
--- webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/generator/synthesizer/ProxyInterfaceSynthesizer.java (original)
+++ webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/generator/synthesizer/ProxyInterfaceSynthesizer.java Sat Feb 24 09:18:57 2007
@@ -69,28 +69,30 @@
static {
_clientCapabilitiesMap = new HashMap();
- Set set = new HashSet();
+ Set baseClientset = new HashSet();
+ baseClientset.add(WsrpConstants.GET_CAPABILITY);
+ baseClientset.add(WsrpConstants.QUERY_CAPABILITY);
+ baseClientset.add(WsrpConstants.SET_CAPABILITY);
+ baseClientset.add(WsrlConstants.IMMEDIATE_TERMINATION_URI);
+ baseClientset.add(WsrlConstants.SCHEDULED_TERMINATION_URI);
+ _clientCapabilitiesMap.put(WsResourceClient.class, baseClientset);
+
+ Set set = new HashSet();
set.add(WsnConstants.PRODUCER_URI);
+ set.addAll(baseClientset);
_clientCapabilitiesMap.put(NotificationProducerClient.class, set);
set = new HashSet();
set.add(WsnConstants.CONSUMER_URI);
+ set.addAll(baseClientset);
_clientCapabilitiesMap.put(NotificationConsumerClient.class, set);
-
- set = new HashSet();
- set.add(WsrpConstants.GET_CAPABILITY);
- set.add(WsrpConstants.QUERY_CAPABILITY);
- set.add(WsrpConstants.SET_CAPABILITY);
- set.add(WsrlConstants.IMMEDIATE_TERMINATION_URI);
- set.add(WsrlConstants.SCHEDULED_TERMINATION_URI);
- _clientCapabilitiesMap.put(WsResourceClient.class, set);
}
protected StringBuffer _headerCode;
- private StringBuffer _operationsCode;
+ protected StringBuffer _operationsCode;
- private StringBuffer _propertiesCode;
+ protected StringBuffer _propertiesCode;
String _className;
@@ -164,7 +166,7 @@
} else { // if(WsResourceClient.class.isAssignableFrom(clientClass)) {
clazz = WsResourceClient.class;
}
-
+
if(clazz != null) {
Set set = (Set)_clientCapabilitiesMap.get(clazz);
if(set.contains(uri) || _ignoredCapabilitySet.contains(uri)) {
---------------------------------------------------------------------
To unsubscribe, e-mail: muse-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: muse-commits-help@ws.apache.org