You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by rf...@apache.org on 2007/04/10 02:22:37 UTC
svn commit: r526969 - in /incubator/tuscany/java/sca/modules:
implementation-java-xml/src/main/java/org/apache/tuscany/implementation/java/processor/
implementation-java-xml/src/test/java/org/apache/tuscany/implementation/java/processor/
implementation...
Author: rfeng
Date: Mon Apr 9 17:22:36 2007
New Revision: 526969
URL: http://svn.apache.org/viewvc?view=rev&rev=526969
Log:
Have the Resource to keep JavaElement
Modified:
incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/implementation/java/processor/ContextProcessor.java
incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/implementation/java/processor/ResourceProcessor.java
incubator/tuscany/java/sca/modules/implementation-java-xml/src/test/java/org/apache/tuscany/implementation/java/processor/ResourceProcessorTestCase.java
incubator/tuscany/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/implementation/java/impl/Resource.java
Modified: incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/implementation/java/processor/ContextProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/implementation/java/processor/ContextProcessor.java?view=diff&rev=526969&r1=526968&r2=526969
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/implementation/java/processor/ContextProcessor.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/implementation/java/processor/ContextProcessor.java Mon Apr 9 17:22:36 2007
@@ -21,6 +21,7 @@
import java.lang.reflect.Field;
import java.lang.reflect.Method;
+import org.apache.tuscany.implementation.java.impl.JavaElement;
import org.apache.tuscany.implementation.java.impl.JavaImplementationDefinition;
import org.apache.tuscany.implementation.java.impl.Resource;
import org.apache.tuscany.implementation.java.introspection.ImplementationProcessorExtension;
@@ -46,16 +47,13 @@
throw new IllegalContextException("Context setter must have one parameter", method);
}
Class<?> paramType = method.getParameterTypes()[0];
- if (ComponentContext.class.equals(paramType)) {
- String name = JavaIntrospectionHelper.toPropertyName(method.getName());
- Resource<ComponentContext> resource = new Resource<ComponentContext>(name, ComponentContext.class, method);
- type.getResources().put(name, resource);
- } else if (RequestContext.class.equals(paramType)) {
- String name = JavaIntrospectionHelper.toPropertyName(method.getName());
- Resource<RequestContext> resource = new Resource<RequestContext>(name, RequestContext.class, method);
- // FIXME: Move the association with ObjectFactory to a later stage
- // resource.setObjectFactory(new RequestContextObjectFactory(workContext));
- type.getResources().put(name, resource);
+ String name = JavaIntrospectionHelper.toPropertyName(method.getName());
+ if (ComponentContext.class.equals(paramType) || RequestContext.class.equals(paramType)) {
+ JavaElement element = new JavaElement(method, 0);
+ element.setName(name);
+ element.setClassifer(org.apache.tuscany.api.annotation.Resource.class);
+ Resource resource = new Resource(element);
+ type.getResources().put(resource.getName(), resource);
} else {
throw new UnknownContextTypeException(paramType.getName());
}
@@ -66,18 +64,11 @@
return;
}
Class<?> paramType = field.getType();
- if (ComponentContext.class.equals(paramType)) {
- String name = field.getName();
- Resource<ComponentContext> resource = new Resource<ComponentContext>(name, ComponentContext.class, field);
- type.getResources().put(name, resource);
- } else if (RequestContext.class.equals(paramType)) {
- String name = field.getName();
- name = JavaIntrospectionHelper.toPropertyName(name);
- Resource<RequestContext> resource = new Resource<RequestContext>(name, RequestContext.class, field);
-
- // FIXME: Move the association with ObjectFactory to a later stage
- // resource.setObjectFactory(new RequestContextObjectFactory(workContext));
- type.getResources().put(name, resource);
+ if (ComponentContext.class.equals(paramType) || RequestContext.class.equals(paramType)) {
+ JavaElement element = new JavaElement(field);
+ element.setClassifer(org.apache.tuscany.api.annotation.Resource.class);
+ Resource resource = new Resource(element);
+ type.getResources().put(resource.getName(), resource);
} else {
throw new UnknownContextTypeException(paramType.getName());
}
Modified: incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/implementation/java/processor/ResourceProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/implementation/java/processor/ResourceProcessor.java?view=diff&rev=526969&r1=526968&r2=526969
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/implementation/java/processor/ResourceProcessor.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/implementation/java/processor/ResourceProcessor.java Mon Apr 9 17:22:36 2007
@@ -93,7 +93,9 @@
@SuppressWarnings("unchecked")
public <T> Resource<T> createResource(String name, JavaElement element) {
- return new Resource<T>(name, (Class<T>)element.getType(), (Member)element.getAnchor());
+ element.setClassifer(org.apache.tuscany.api.annotation.Resource.class);
+ element.setName(name);
+ return new Resource<T>(element);
}
public void visitConstructorParameter(Parameter parameter, JavaImplementationDefinition type)
@@ -125,8 +127,6 @@
resource.setMappedName(mappedName);
}
type.add(resource);
- parameter.setClassifer(org.apache.tuscany.api.annotation.Resource.class);
- parameter.setName(name);
}
}
Modified: incubator/tuscany/java/sca/modules/implementation-java-xml/src/test/java/org/apache/tuscany/implementation/java/processor/ResourceProcessorTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-xml/src/test/java/org/apache/tuscany/implementation/java/processor/ResourceProcessorTestCase.java?view=diff&rev=526969&r1=526968&r2=526969
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-xml/src/test/java/org/apache/tuscany/implementation/java/processor/ResourceProcessorTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-xml/src/test/java/org/apache/tuscany/implementation/java/processor/ResourceProcessorTestCase.java Mon Apr 9 17:22:36 2007
@@ -43,7 +43,7 @@
Resource resource = type.getResources().get("bar");
assertFalse(resource.isOptional());
assertNull(resource.getMappedName());
- assertEquals(field.getType(), resource.getType());
+ assertEquals(field.getType(), resource.getElement().getType());
}
public void testVisitMethod() throws Exception {
@@ -52,7 +52,7 @@
Resource resource = type.getResources().get("bar");
assertFalse(resource.isOptional());
assertNull(resource.getMappedName());
- assertEquals(method.getParameterTypes()[0], resource.getType());
+ assertEquals(method.getParameterTypes()[0], resource.getElement().getType());
}
public void testVisitNamedMethod() throws Exception {
Modified: incubator/tuscany/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/implementation/java/impl/Resource.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/implementation/java/impl/Resource.java?view=diff&rev=526969&r1=526968&r2=526969
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/implementation/java/impl/Resource.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/implementation/java/impl/Resource.java Mon Apr 9 17:22:36 2007
@@ -27,17 +27,12 @@
* @param <T> the Java type of the resource
*/
public class Resource<T> {
-
- private String name;
+ private JavaElement element;
private String mappedName;
private boolean optional;
- private Member member;
- private Class<T> type;
- public Resource(String name, Class<T> type, Member member) {
- this.name = name;
- this.type = type;
- this.member = member;
+ public Resource(JavaElement element) {
+ this.element = element;
}
/**
@@ -46,16 +41,7 @@
* @return the name of the resource
*/
public String getName() {
- return name;
- }
-
- /**
- * Sets the name of the resource
- *
- * @param name the name of the resource
- */
- public void setName(String name) {
- this.name = name;
+ return element.getName();
}
/**
@@ -91,37 +77,11 @@
}
/**
- * Returns the Member that this resource is mapped to.
- *
- * @return the Member that this resource is mapped to
- */
- public Member getMember() {
- return member;
- }
-
- /**
- * Sets the Member that this resource is mapped to
- *
- * @param member the Member that this resource is mapped to
- */
- public void setMember(Member member) {
- this.member = member;
- }
-
- /**
- * Returns the resource type
- *
- * @return the resource type
+ * @return the element
*/
- public Class<T> getType() {
- return type;
+ public JavaElement getElement() {
+ return element;
}
- /**
- * Sets the resource type
- */
- public void setType(Class<T> type) {
- this.type = type;
- }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org