You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beehive.apache.org by mm...@apache.org on 2004/10/21 02:28:58 UTC
svn commit: rev 55188 - in incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/processor: apt reflection
Author: mmerz
Date: Wed Oct 20 17:28:58 2004
New Revision: 55188
Modified:
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/processor/apt/WsmAnnotationProcessor.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/processor/reflection/WsmReflectionAnnotationProcessor.java
Log:
Clean ups.
Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/processor/apt/WsmAnnotationProcessor.java
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/processor/apt/WsmAnnotationProcessor.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/processor/apt/WsmAnnotationProcessor.java Wed Oct 20 17:28:58 2004
@@ -45,8 +45,6 @@
import com.sun.tools.apt.Main;
-//import org.apache.beehive.controls.runtime.generator.apt.TwoPhaseAnnotationProcessor;
-
import org.apache.beehive.wsm.jsr181.model.AnnotationModel;
import org.apache.beehive.wsm.jsr181.model.WebServiceMETHODMetadata;
import org.apache.beehive.wsm.jsr181.model.WebServicePARAMETERMetadata;
@@ -101,8 +99,12 @@
else
{
try {
- Class clazz = Class.forName(ws.endpointInterface());
- checkObjectModel(clazz, ws);
+ Class seiClass = Class.forName(ws.endpointInterface());
+ if (null == WsmReflectionAnnotationProcessor.getInstance().getObjectModelFromServiceEndpointInterface(seiClass))
+ {
+ throw new ProcessorException("Failed to create object model for class: " + seiClass.getName());
+ // todo: proper error handling
+ }
}
catch (ClassNotFoundException e) {
e.printStackTrace(); // todo: proper error handling
@@ -161,26 +163,6 @@
return wstm;
}
- /**
- * Check object model for service endpoint interface.
- * @param clazz
- * @param ws
- * @return
- */
- protected AnnotationModel checkObjectModel(Class clazz, javax.jws.WebService ws)
- {
- WebServiceTYPEMetadata wstm =
- (WebServiceTYPEMetadata) WsmReflectionAnnotationProcessor.getInstance().getObjectModel(clazz);
-
- if (null == wstm)
- {
- throw new ProcessorException("Failed to create object model for class: " + clazz.getName());
- // todo: proper error handling
- }
-
- return wstm;
- }
-
protected WebServiceMETHODMetadata getWebServiceMETHODMetadata(
MethodDeclaration decl)
{
@@ -198,7 +180,7 @@
Collection<Annotation> annotations = getAnnotations(decl);
wsmm = new WebServiceMETHODMetadata(
decl.getSimpleName(),
- classForName(decl.getReturnType()),
+ TypeMirrorUtil.classForName(decl.getReturnType()),
(0 < decl.getThrownTypes().size()),
annotations,
webParams
@@ -219,7 +201,7 @@
try {
Collection<Annotation> annotations = getAnnotations(decl);
wspm = new WebServicePARAMETERMetadata(
- classForName(decl.getType()),
+ TypeMirrorUtil.classForName(decl.getType()),
decl.getSimpleName(),
annotations
);
@@ -248,11 +230,6 @@
catch (ClassNotFoundException e) { }
}
return annotations;
- }
-
- private Class classForName(TypeMirror type) throws ClassNotFoundException
- {
- return TypeMirrorUtil.classForName(type);
}
public static AnnotationModel getObjectModel(String name)
Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/processor/reflection/WsmReflectionAnnotationProcessor.java
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/processor/reflection/WsmReflectionAnnotationProcessor.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/processor/reflection/WsmReflectionAnnotationProcessor.java Wed Oct 20 17:28:58 2004
@@ -77,11 +77,14 @@
{
try {
Class seiClass = Class.forName(ws.endpointInterface());
- wstm = (WebServiceTYPEMetadata) getObjectModelFromServiceEndpointInterface(clazz, seiClass);
+ wstm = (WebServiceTYPEMetadata) getObjectModelFromServiceEndpointInterface(seiClass);
+
+ // todo: pass in parameters rather than adding serviceName and endpointInterface afterwards
+
wstm.setWsServiceName(ws.serviceName());
wstm.setWsEndpointInterface(ws.endpointInterface());
- // todo verify equivalence of SEI and SIB
+ // todo: verify equivalence of SEI and SIB
}
catch (ClassNotFoundException e)
{
@@ -93,25 +96,23 @@
}
/**
- * todo: needs to move into "object model"
- *
- * Create object model from service endpoint interface.
- * @param clazz
+ * Creates object model from service endpoint interface.
+ * @param seiClass
* @return
*/
- public AnnotationModel getObjectModelFromServiceEndpointInterface(Class clazz, Class seiClass)
+ public AnnotationModel getObjectModelFromServiceEndpointInterface(Class seiClass)
{
return getWebServiceTYPEMetadata(seiClass, false);
}
/**
- * Create object model from service implementation bean.
- * @param clazz
+ * Creates object model from service implementation bean.
+ * @param sibClass
* @return
*/
- public AnnotationModel getObjectModelFromServiceImplementationBean(Class clazz)
+ public AnnotationModel getObjectModelFromServiceImplementationBean(Class sibClass)
{
- return getWebServiceTYPEMetadata(clazz, true);
+ return getWebServiceTYPEMetadata(sibClass, true);
}
/**