You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by gn...@apache.org on 2007/04/07 10:35:53 UTC
svn commit: r526407 [1/4] - in
/incubator/servicemix/trunk/deployables/serviceengines:
servicemix-bean/src/main/java/org/apache/servicemix/bean/
servicemix-bean/src/main/java/org/apache/servicemix/bean/support/
servicemix-bean/src/test/java/org/apache/...
Author: gnodet
Date: Sat Apr 7 01:35:49 2007
New Revision: 526407
URL: http://svn.apache.org/viewvc?view=rev&rev=526407
Log:
Fix checkstyle and pmd violations
Modified:
incubator/servicemix/trunk/deployables/serviceengines/servicemix-bean/src/main/java/org/apache/servicemix/bean/BeanComponent.java
incubator/servicemix/trunk/deployables/serviceengines/servicemix-bean/src/main/java/org/apache/servicemix/bean/BeanEndpoint.java
incubator/servicemix/trunk/deployables/serviceengines/servicemix-bean/src/main/java/org/apache/servicemix/bean/Callback.java
incubator/servicemix/trunk/deployables/serviceengines/servicemix-bean/src/main/java/org/apache/servicemix/bean/Content.java
incubator/servicemix/trunk/deployables/serviceengines/servicemix-bean/src/main/java/org/apache/servicemix/bean/Correlation.java
incubator/servicemix/trunk/deployables/serviceengines/servicemix-bean/src/main/java/org/apache/servicemix/bean/Endpoint.java
incubator/servicemix/trunk/deployables/serviceengines/servicemix-bean/src/main/java/org/apache/servicemix/bean/EndpointFinder.java
incubator/servicemix/trunk/deployables/serviceengines/servicemix-bean/src/main/java/org/apache/servicemix/bean/ExchangeTarget.java
incubator/servicemix/trunk/deployables/serviceengines/servicemix-bean/src/main/java/org/apache/servicemix/bean/MethodInvocationFailedException.java
incubator/servicemix/trunk/deployables/serviceengines/servicemix-bean/src/main/java/org/apache/servicemix/bean/NoSuchBeanException.java
incubator/servicemix/trunk/deployables/serviceengines/servicemix-bean/src/main/java/org/apache/servicemix/bean/Operation.java
incubator/servicemix/trunk/deployables/serviceengines/servicemix-bean/src/main/java/org/apache/servicemix/bean/Property.java
incubator/servicemix/trunk/deployables/serviceengines/servicemix-bean/src/main/java/org/apache/servicemix/bean/UnknownMessageExchangeTypeException.java
incubator/servicemix/trunk/deployables/serviceengines/servicemix-bean/src/main/java/org/apache/servicemix/bean/XPath.java
incubator/servicemix/trunk/deployables/serviceengines/servicemix-bean/src/main/java/org/apache/servicemix/bean/support/BeanInfo.java
incubator/servicemix/trunk/deployables/serviceengines/servicemix-bean/src/main/java/org/apache/servicemix/bean/support/DefaultMethodInvocationStrategy.java
incubator/servicemix/trunk/deployables/serviceengines/servicemix-bean/src/main/java/org/apache/servicemix/bean/support/DestinationImpl.java
incubator/servicemix/trunk/deployables/serviceengines/servicemix-bean/src/main/java/org/apache/servicemix/bean/support/Holder.java
incubator/servicemix/trunk/deployables/serviceengines/servicemix-bean/src/main/java/org/apache/servicemix/bean/support/MethodInfo.java
incubator/servicemix/trunk/deployables/serviceengines/servicemix-bean/src/main/java/org/apache/servicemix/bean/support/MethodInvocationStrategy.java
incubator/servicemix/trunk/deployables/serviceengines/servicemix-bean/src/main/java/org/apache/servicemix/bean/support/ReflectionUtils.java
incubator/servicemix/trunk/deployables/serviceengines/servicemix-bean/src/main/java/org/apache/servicemix/bean/support/Request.java
incubator/servicemix/trunk/deployables/serviceengines/servicemix-bean/src/main/java/org/apache/servicemix/bean/support/ResolverUtil.java
incubator/servicemix/trunk/deployables/serviceengines/servicemix-bean/src/test/java/org/apache/servicemix/bean/AnnotatedBeanEndpointTest.java
incubator/servicemix/trunk/deployables/serviceengines/servicemix-bean/src/test/java/org/apache/servicemix/bean/AutoDeployedEndpointTest.java
incubator/servicemix/trunk/deployables/serviceengines/servicemix-bean/src/test/java/org/apache/servicemix/bean/ConsumerBeanTest.java
incubator/servicemix/trunk/deployables/serviceengines/servicemix-bean/src/test/java/org/apache/servicemix/bean/DynamicEndpointTest.java
incubator/servicemix/trunk/deployables/serviceengines/servicemix-bean/src/test/java/org/apache/servicemix/bean/ListenerBeanEndpointTest.java
incubator/servicemix/trunk/deployables/serviceengines/servicemix-bean/src/test/java/org/apache/servicemix/bean/PlainBeanEndpointTest.java
incubator/servicemix/trunk/deployables/serviceengines/servicemix-bean/src/test/java/org/apache/servicemix/bean/SpringComponentTest.java
incubator/servicemix/trunk/deployables/serviceengines/servicemix-bean/src/test/java/org/apache/servicemix/bean/UriTest.java
incubator/servicemix/trunk/deployables/serviceengines/servicemix-bean/src/test/java/org/apache/servicemix/bean/beans/AnnotatedBean.java
incubator/servicemix/trunk/deployables/serviceengines/servicemix-bean/src/test/java/org/apache/servicemix/bean/beans/AutoDeployedBean.java
incubator/servicemix/trunk/deployables/serviceengines/servicemix-bean/src/test/java/org/apache/servicemix/bean/beans/ConsumerBean.java
incubator/servicemix/trunk/deployables/serviceengines/servicemix-bean/src/test/java/org/apache/servicemix/bean/beans/ConsumerListener.java
incubator/servicemix/trunk/deployables/serviceengines/servicemix-bean/src/test/java/org/apache/servicemix/bean/beans/ListenerBean.java
incubator/servicemix/trunk/deployables/serviceengines/servicemix-bean/src/test/java/org/apache/servicemix/bean/beans/PlainBean.java
incubator/servicemix/trunk/deployables/serviceengines/servicemix-drools/src/main/java/org/apache/servicemix/drools/DroolsComponent.java
incubator/servicemix/trunk/deployables/serviceengines/servicemix-drools/src/main/java/org/apache/servicemix/drools/DroolsEndpoint.java
incubator/servicemix/trunk/deployables/serviceengines/servicemix-drools/src/main/java/org/apache/servicemix/drools/model/Exchange.java
incubator/servicemix/trunk/deployables/serviceengines/servicemix-drools/src/main/java/org/apache/servicemix/drools/model/JbiHelper.java
incubator/servicemix/trunk/deployables/serviceengines/servicemix-drools/src/main/java/org/apache/servicemix/drools/model/Message.java
incubator/servicemix/trunk/deployables/serviceengines/servicemix-drools/src/main/java/org/apache/servicemix/drools/support/NamespaceContextImpl.java
incubator/servicemix/trunk/deployables/serviceengines/servicemix-drools/src/test/java/org/apache/servicemix/drools/DroolsComponentTest.java
incubator/servicemix/trunk/deployables/serviceengines/servicemix-eip/src/main/java/org/apache/servicemix/eip/EIPComponent.java
incubator/servicemix/trunk/deployables/serviceengines/servicemix-eip/src/main/java/org/apache/servicemix/eip/EIPEndpoint.java
incubator/servicemix/trunk/deployables/serviceengines/servicemix-eip/src/main/java/org/apache/servicemix/eip/packaging/EipServiceUnitAnalyzer.java
incubator/servicemix/trunk/deployables/serviceengines/servicemix-eip/src/main/java/org/apache/servicemix/eip/patterns/ContentBasedRouter.java
incubator/servicemix/trunk/deployables/serviceengines/servicemix-eip/src/main/java/org/apache/servicemix/eip/patterns/ContentEnricher.java
incubator/servicemix/trunk/deployables/serviceengines/servicemix-eip/src/main/java/org/apache/servicemix/eip/patterns/MessageFilter.java
incubator/servicemix/trunk/deployables/serviceengines/servicemix-eip/src/main/java/org/apache/servicemix/eip/patterns/Pipeline.java
incubator/servicemix/trunk/deployables/serviceengines/servicemix-eip/src/main/java/org/apache/servicemix/eip/patterns/SplitAggregator.java
incubator/servicemix/trunk/deployables/serviceengines/servicemix-eip/src/main/java/org/apache/servicemix/eip/patterns/StaticRecipientList.java
incubator/servicemix/trunk/deployables/serviceengines/servicemix-eip/src/main/java/org/apache/servicemix/eip/patterns/StaticRoutingSlip.java
incubator/servicemix/trunk/deployables/serviceengines/servicemix-eip/src/main/java/org/apache/servicemix/eip/patterns/WireTap.java
incubator/servicemix/trunk/deployables/serviceengines/servicemix-eip/src/main/java/org/apache/servicemix/eip/patterns/XPathSplitter.java
incubator/servicemix/trunk/deployables/serviceengines/servicemix-eip/src/main/java/org/apache/servicemix/eip/support/AbstractAggregator.java
incubator/servicemix/trunk/deployables/serviceengines/servicemix-eip/src/main/java/org/apache/servicemix/eip/support/AbstractContentBasedRouter.java
incubator/servicemix/trunk/deployables/serviceengines/servicemix-eip/src/main/java/org/apache/servicemix/eip/support/AbstractSplitter.java
incubator/servicemix/trunk/deployables/serviceengines/servicemix-eip/src/main/java/org/apache/servicemix/eip/support/ExchangeTarget.java
incubator/servicemix/trunk/deployables/serviceengines/servicemix-eip/src/main/java/org/apache/servicemix/eip/support/NamespaceContextImpl.java
incubator/servicemix/trunk/deployables/serviceengines/servicemix-eip/src/main/java/org/apache/servicemix/eip/support/Predicate.java
incubator/servicemix/trunk/deployables/serviceengines/servicemix-eip/src/main/java/org/apache/servicemix/eip/support/XPathPredicate.java
incubator/servicemix/trunk/deployables/serviceengines/servicemix-eip/src/test/java/org/apache/servicemix/eip/AbstractEIPTest.java
incubator/servicemix/trunk/deployables/serviceengines/servicemix-eip/src/test/java/org/apache/servicemix/eip/AbstractEIPTransactionalTest.java
incubator/servicemix/trunk/deployables/serviceengines/servicemix-eip/src/test/java/org/apache/servicemix/eip/ContentBasedRouterTest.java
incubator/servicemix/trunk/deployables/serviceengines/servicemix-eip/src/test/java/org/apache/servicemix/eip/ContentBasedRouterTxTest.java
incubator/servicemix/trunk/deployables/serviceengines/servicemix-eip/src/test/java/org/apache/servicemix/eip/ContentEnricherTest.java
incubator/servicemix/trunk/deployables/serviceengines/servicemix-eip/src/test/java/org/apache/servicemix/eip/DeploymentTest.java
incubator/servicemix/trunk/deployables/serviceengines/servicemix-eip/src/test/java/org/apache/servicemix/eip/PipelineTxTest.java
incubator/servicemix/trunk/deployables/serviceengines/servicemix-eip/src/test/java/org/apache/servicemix/eip/SplitAggregatorTest.java
incubator/servicemix/trunk/deployables/serviceengines/servicemix-eip/src/test/java/org/apache/servicemix/eip/SpringConfigurationTest.java
incubator/servicemix/trunk/deployables/serviceengines/servicemix-eip/src/test/java/org/apache/servicemix/eip/VMEIPTests.java
incubator/servicemix/trunk/deployables/serviceengines/servicemix-eip/src/test/java/org/apache/servicemix/eip/support/NamespaceContextImplTest.java
incubator/servicemix/trunk/deployables/serviceengines/servicemix-lwcontainer/src/main/java/org/apache/servicemix/lwcontainer/LwContainerBootstrap.java
incubator/servicemix/trunk/deployables/serviceengines/servicemix-lwcontainer/src/main/java/org/apache/servicemix/lwcontainer/LwContainerComponent.java
incubator/servicemix/trunk/deployables/serviceengines/servicemix-lwcontainer/src/main/java/org/apache/servicemix/lwcontainer/LwContainerEndpoint.java
incubator/servicemix/trunk/deployables/serviceengines/servicemix-lwcontainer/src/test/java/org/apache/servicemix/lwcontainer/LwContainerComponentTest.java
incubator/servicemix/trunk/deployables/serviceengines/servicemix-quartz/src/main/java/org/apache/servicemix/quartz/QuartzComponent.java
incubator/servicemix/trunk/deployables/serviceengines/servicemix-quartz/src/main/java/org/apache/servicemix/quartz/QuartzEndpoint.java
incubator/servicemix/trunk/deployables/serviceengines/servicemix-quartz/src/main/java/org/apache/servicemix/quartz/support/DefaultQuartzMarshaler.java
incubator/servicemix/trunk/deployables/serviceengines/servicemix-quartz/src/main/java/org/apache/servicemix/quartz/support/QuartzMarshaler.java
incubator/servicemix/trunk/deployables/serviceengines/servicemix-quartz/src/main/java/org/apache/servicemix/quartz/support/ServiceMixJob.java
incubator/servicemix/trunk/deployables/serviceengines/servicemix-quartz/src/test/java/org/apache/servicemix/quartz/CustomMarshaler.java
incubator/servicemix/trunk/deployables/serviceengines/servicemix-quartz/src/test/java/org/apache/servicemix/quartz/QuartzComponentTest.java
incubator/servicemix/trunk/deployables/serviceengines/servicemix-quartz/src/test/java/org/apache/servicemix/quartz/QuartzSpringTest.java
incubator/servicemix/trunk/deployables/serviceengines/servicemix-saxon/src/main/java/org/apache/servicemix/saxon/SaxonComponent.java
incubator/servicemix/trunk/deployables/serviceengines/servicemix-saxon/src/main/java/org/apache/servicemix/saxon/SaxonEndpoint.java
incubator/servicemix/trunk/deployables/serviceengines/servicemix-saxon/src/main/java/org/apache/servicemix/saxon/XQueryEndpoint.java
incubator/servicemix/trunk/deployables/serviceengines/servicemix-saxon/src/main/java/org/apache/servicemix/saxon/XsltEndpoint.java
incubator/servicemix/trunk/deployables/serviceengines/servicemix-saxon/src/test/java/org/apache/servicemix/saxon/SaxonComponentTest.java
Modified: incubator/servicemix/trunk/deployables/serviceengines/servicemix-bean/src/main/java/org/apache/servicemix/bean/BeanComponent.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/deployables/serviceengines/servicemix-bean/src/main/java/org/apache/servicemix/bean/BeanComponent.java?view=diff&rev=526407&r1=526406&r2=526407
==============================================================================
--- incubator/servicemix/trunk/deployables/serviceengines/servicemix-bean/src/main/java/org/apache/servicemix/bean/BeanComponent.java (original)
+++ incubator/servicemix/trunk/deployables/serviceengines/servicemix-bean/src/main/java/org/apache/servicemix/bean/BeanComponent.java Sat Apr 7 01:35:49 2007
@@ -70,6 +70,7 @@
this.searchPackages = searchPackages;
}
+ @SuppressWarnings("unchecked")
protected List getConfiguredEndpoints() {
List list = new ArrayList(asList(getEndpoints()));
if (searchPackages != null) {
@@ -99,16 +100,15 @@
if (uri.getHost() != null) {
// it must start bean://host/path
beanName = uri.getHost();
- }
- else {
+ } else {
// it must be an absolute URI of the form bean:name
beanName = uri.getSchemeSpecificPart();
}
if (beanName != null) {
endpoint.setBeanName(beanName);
- }
- else {
- throw new IllegalArgumentException("No bean name defined for URI: " + uri + ". Please use a URI of bean:name or bean://name?property=value");
+ } else {
+ throw new IllegalArgumentException("No bean name defined for URI: "
+ + uri + ". Please use a URI of bean:name or bean://name?property=value");
}
Map map = URISupport.parseQuery(uri.getQuery());
Modified: incubator/servicemix/trunk/deployables/serviceengines/servicemix-bean/src/main/java/org/apache/servicemix/bean/BeanEndpoint.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/deployables/serviceengines/servicemix-bean/src/main/java/org/apache/servicemix/bean/BeanEndpoint.java?view=diff&rev=526407&r1=526406&r2=526407
==============================================================================
--- incubator/servicemix/trunk/deployables/serviceengines/servicemix-bean/src/main/java/org/apache/servicemix/bean/BeanEndpoint.java (original)
+++ incubator/servicemix/trunk/deployables/serviceengines/servicemix-bean/src/main/java/org/apache/servicemix/bean/BeanEndpoint.java Sat Apr 7 01:35:49 2007
@@ -30,9 +30,9 @@
import javax.jbi.messaging.ExchangeStatus;
import javax.jbi.messaging.InOut;
import javax.jbi.messaging.MessageExchange;
+import javax.jbi.messaging.MessageExchange.Role;
import javax.jbi.messaging.MessagingException;
import javax.jbi.messaging.NormalizedMessage;
-import javax.jbi.messaging.MessageExchange.Role;
import javax.jbi.servicedesc.ServiceEndpoint;
import org.aopalliance.intercept.MethodInvocation;
@@ -55,10 +55,8 @@
import org.apache.servicemix.jbi.resolver.URIResolver;
import org.apache.servicemix.jbi.util.MessageUtil;
import org.springframework.beans.BeansException;
-import org.springframework.beans.factory.BeanFactory;
-import org.springframework.beans.factory.BeanFactoryAware;
-import org.springframework.context.ApplicationContextAware;
import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationContextAware;
/**
* Represents a bean endpoint which consists of a together with a {@link MethodInvocationStrategy}
@@ -89,7 +87,7 @@
public BeanEndpoint(BeanComponent component, ServiceEndpoint serviceEndpoint) {
super(component, serviceEndpoint);
- setApplicationContext(component.getApplicationContext());
+ this.applicationContext = component.getApplicationContext();
}
public void start() throws Exception {
@@ -172,6 +170,7 @@
public BeanInfo getBeanInfo() {
if (beanInfo == null) {
beanInfo = new BeanInfo(beanType, getMethodInvocationStrategy());
+ beanInfo.introspect();
}
return beanInfo;
}
@@ -226,16 +225,16 @@
// Exchange is finished
if (exchange.getStatus() == ExchangeStatus.DONE) {
return;
- }
// Exchange has been aborted with an exception
- else if (exchange.getStatus() == ExchangeStatus.ERROR) {
+ } else if (exchange.getStatus() == ExchangeStatus.ERROR) {
return;
- // Fault message
+ // Fault message
} else if (exchange.getFault() != null) {
// TODO: find a way to send it back to the bean before setting the DONE status
done(exchange);
} else {
- MethodInvocation invocation = getMethodInvocationStrategy().createInvocation(req.getBean(), getBeanInfo(), exchange, this);
+ MethodInvocation invocation = getMethodInvocationStrategy().createInvocation(
+ req.getBean(), getBeanInfo(), exchange, this);
if (invocation == null) {
throw new UnknownMessageExchangeTypeException(exchange, this);
}
@@ -309,27 +308,29 @@
}
protected MethodInvocationStrategy createMethodInvocationStrategy() {
- return new DefaultMethodInvocationStrategy();
+ DefaultMethodInvocationStrategy st = new DefaultMethodInvocationStrategy();
+ st.loadDefaultRegistry();
+ return st;
}
/**
* A strategy method to allow implementations to perform some custom JBI based injection of the POJO
*
- * @param bean the bean to be injected
+ * @param target the bean to be injected
*/
- protected void injectBean(final Object bean) {
+ protected void injectBean(final Object target) {
// Inject fields
- ReflectionUtils.doWithFields(bean.getClass(), new ReflectionUtils.FieldCallback() {
+ ReflectionUtils.doWithFields(target.getClass(), new ReflectionUtils.FieldCallback() {
public void doWith(Field f) throws IllegalArgumentException, IllegalAccessException {
ExchangeTarget et = f.getAnnotation(ExchangeTarget.class);
if (et != null) {
- ReflectionUtils.setField(f, bean, new DestinationImpl(et.uri(), BeanEndpoint.this));
+ ReflectionUtils.setField(f, target, new DestinationImpl(et.uri(), BeanEndpoint.this));
}
if (f.getAnnotation(Resource.class) != null) {
if (ComponentContext.class.isAssignableFrom(f.getType())) {
- ReflectionUtils.setField(f, bean, context);
+ ReflectionUtils.setField(f, target, context);
} else if (DeliveryChannel.class.isAssignableFrom(f.getType())) {
- ReflectionUtils.setField(f, bean, channel);
+ ReflectionUtils.setField(f, target, channel);
}
}
}
@@ -337,24 +338,25 @@
}
protected void evaluateCallbacks(final Request req) {
- final Object bean = req.getBean();
- ReflectionUtils.doWithMethods(bean.getClass(), new ReflectionUtils.MethodCallback() {
+ final Object obj = req.getBean();
+ ReflectionUtils.doWithMethods(obj.getClass(), new ReflectionUtils.MethodCallback() {
@SuppressWarnings("unchecked")
public void doWith(Method method) throws IllegalArgumentException, IllegalAccessException {
if (method.getAnnotation(Callback.class) != null) {
try {
- Expression e = ExpressionFactory.createExpression(method.getAnnotation(Callback.class).condition());
+ Expression e = ExpressionFactory.createExpression(
+ method.getAnnotation(Callback.class).condition());
JexlContext jc = JexlHelper.createContext();
- jc.getVars().put("this", bean);
+ jc.getVars().put("this", obj);
Object r = e.evaluate(jc);
- if (r instanceof Boolean == false) {
+ if (!(r instanceof Boolean)) {
throw new RuntimeException("Expression did not returned a boolean value but: " + r);
}
Boolean oldVal = req.getCallbacks().get(method);
Boolean newVal = (Boolean) r;
- if ((oldVal == null || oldVal == false) && newVal == true) {
+ if ((oldVal == null || !oldVal) && newVal) {
req.getCallbacks().put(method, newVal);
- Object o = method.invoke(bean, new Object[0]);
+ method.invoke(obj, new Object[0]);
// TODO: handle return value and sent it as the answer
}
} catch (Exception e) {
@@ -411,7 +413,8 @@
}
if (correlationExpression == null) {
correlationExpression = new org.apache.servicemix.expression.Expression() {
- public Object evaluate(MessageExchange exchange, NormalizedMessage message) throws MessagingException {
+ public Object evaluate(MessageExchange exchange, NormalizedMessage message)
+ throws MessagingException {
return exchange.getExchangeId();
}
};
Modified: incubator/servicemix/trunk/deployables/serviceengines/servicemix-bean/src/main/java/org/apache/servicemix/bean/Callback.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/deployables/serviceengines/servicemix-bean/src/main/java/org/apache/servicemix/bean/Callback.java?view=diff&rev=526407&r1=526406&r2=526407
==============================================================================
--- incubator/servicemix/trunk/deployables/serviceengines/servicemix-bean/src/main/java/org/apache/servicemix/bean/Callback.java (original)
+++ incubator/servicemix/trunk/deployables/serviceengines/servicemix-bean/src/main/java/org/apache/servicemix/bean/Callback.java Sat Apr 7 01:35:49 2007
@@ -16,15 +16,15 @@
*/
package org.apache.servicemix.bean;
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
+import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-@Retention(RUNTIME)
-@Target( { METHOD })
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.METHOD })
public @interface Callback {
String condition();
+
}
Modified: incubator/servicemix/trunk/deployables/serviceengines/servicemix-bean/src/main/java/org/apache/servicemix/bean/Content.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/deployables/serviceengines/servicemix-bean/src/main/java/org/apache/servicemix/bean/Content.java?view=diff&rev=526407&r1=526406&r2=526407
==============================================================================
--- incubator/servicemix/trunk/deployables/serviceengines/servicemix-bean/src/main/java/org/apache/servicemix/bean/Content.java (original)
+++ incubator/servicemix/trunk/deployables/serviceengines/servicemix-bean/src/main/java/org/apache/servicemix/bean/Content.java Sat Apr 7 01:35:49 2007
@@ -16,13 +16,13 @@
*/
package org.apache.servicemix.bean;
-import org.apache.servicemix.jbi.messaging.PojoMarshaler;
-import org.apache.servicemix.jbi.messaging.DefaultMarshaler;
-
+import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import java.lang.annotation.ElementType;
+
+import org.apache.servicemix.jbi.messaging.DefaultMarshaler;
+import org.apache.servicemix.jbi.messaging.PojoMarshaler;
/**
* Binds a method parameter to the payload of a message exchange
@@ -30,7 +30,7 @@
* @version $Revision: $
*/
@Retention(RetentionPolicy.RUNTIME)
-@Target({ElementType.PARAMETER})
+@Target({ElementType.PARAMETER })
public @interface Content {
/**
Modified: incubator/servicemix/trunk/deployables/serviceengines/servicemix-bean/src/main/java/org/apache/servicemix/bean/Correlation.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/deployables/serviceengines/servicemix-bean/src/main/java/org/apache/servicemix/bean/Correlation.java?view=diff&rev=526407&r1=526406&r2=526407
==============================================================================
--- incubator/servicemix/trunk/deployables/serviceengines/servicemix-bean/src/main/java/org/apache/servicemix/bean/Correlation.java (original)
+++ incubator/servicemix/trunk/deployables/serviceengines/servicemix-bean/src/main/java/org/apache/servicemix/bean/Correlation.java Sat Apr 7 01:35:49 2007
@@ -22,7 +22,7 @@
import java.lang.annotation.Target;
@Retention(RetentionPolicy.RUNTIME)
-@Target({ElementType.TYPE})
+@Target({ElementType.TYPE })
public @interface Correlation {
String property() default "";
Modified: incubator/servicemix/trunk/deployables/serviceengines/servicemix-bean/src/main/java/org/apache/servicemix/bean/Endpoint.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/deployables/serviceengines/servicemix-bean/src/main/java/org/apache/servicemix/bean/Endpoint.java?view=diff&rev=526407&r1=526406&r2=526407
==============================================================================
--- incubator/servicemix/trunk/deployables/serviceengines/servicemix-bean/src/main/java/org/apache/servicemix/bean/Endpoint.java (original)
+++ incubator/servicemix/trunk/deployables/serviceengines/servicemix-bean/src/main/java/org/apache/servicemix/bean/Endpoint.java Sat Apr 7 01:35:49 2007
@@ -16,17 +16,16 @@
*/
package org.apache.servicemix.bean;
-import javax.xml.namespace.QName;
+import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import java.lang.annotation.ElementType;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
/**
* @version $Revision$
*/
-@Retention(RUNTIME)
-@Target({ElementType.TYPE})
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.TYPE })
public @interface Endpoint {
String name() default "";
Modified: incubator/servicemix/trunk/deployables/serviceengines/servicemix-bean/src/main/java/org/apache/servicemix/bean/EndpointFinder.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/deployables/serviceengines/servicemix-bean/src/main/java/org/apache/servicemix/bean/EndpointFinder.java?view=diff&rev=526407&r1=526406&r2=526407
==============================================================================
--- incubator/servicemix/trunk/deployables/serviceengines/servicemix-bean/src/main/java/org/apache/servicemix/bean/EndpointFinder.java (original)
+++ incubator/servicemix/trunk/deployables/serviceengines/servicemix-bean/src/main/java/org/apache/servicemix/bean/EndpointFinder.java Sat Apr 7 01:35:49 2007
@@ -1,33 +1,33 @@
-/**
- *
- * Copyright 2005 LogicBlaze, Inc. http://www.logicblaze.com
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- **/
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package org.apache.servicemix.bean;
-import org.apache.servicemix.bean.support.ResolverUtil;
-import org.springframework.beans.BeansException;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.ApplicationContextAware;
-
-import javax.xml.namespace.QName;
import java.lang.reflect.Modifier;
import java.util.List;
import java.util.Map;
import java.util.Set;
+import javax.xml.namespace.QName;
+
+import org.apache.servicemix.bean.support.ResolverUtil;
+import org.springframework.beans.BeansException;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationContextAware;
+
/**
* Used to find POJOs on the classpath to be auto-exposed as endpoints
*
@@ -71,8 +71,7 @@
}
if (isClient(aClass)) {
registerClient(aClass);
- }
- else if (!Modifier.isAbstract(aClass.getModifiers())) {
+ } else if (!Modifier.isAbstract(aClass.getModifiers())) {
list.add(createBeanEndpoint(aClass));
}
}
Modified: incubator/servicemix/trunk/deployables/serviceengines/servicemix-bean/src/main/java/org/apache/servicemix/bean/ExchangeTarget.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/deployables/serviceengines/servicemix-bean/src/main/java/org/apache/servicemix/bean/ExchangeTarget.java?view=diff&rev=526407&r1=526406&r2=526407
==============================================================================
--- incubator/servicemix/trunk/deployables/serviceengines/servicemix-bean/src/main/java/org/apache/servicemix/bean/ExchangeTarget.java (original)
+++ incubator/servicemix/trunk/deployables/serviceengines/servicemix-bean/src/main/java/org/apache/servicemix/bean/ExchangeTarget.java Sat Apr 7 01:35:49 2007
@@ -16,14 +16,13 @@
*/
package org.apache.servicemix.bean;
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
+import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-@Retention(RUNTIME)
-@Target( { FIELD })
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.FIELD })
public @interface ExchangeTarget {
String uri();
Modified: incubator/servicemix/trunk/deployables/serviceengines/servicemix-bean/src/main/java/org/apache/servicemix/bean/MethodInvocationFailedException.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/deployables/serviceengines/servicemix-bean/src/main/java/org/apache/servicemix/bean/MethodInvocationFailedException.java?view=diff&rev=526407&r1=526406&r2=526407
==============================================================================
--- incubator/servicemix/trunk/deployables/serviceengines/servicemix-bean/src/main/java/org/apache/servicemix/bean/MethodInvocationFailedException.java (original)
+++ incubator/servicemix/trunk/deployables/serviceengines/servicemix-bean/src/main/java/org/apache/servicemix/bean/MethodInvocationFailedException.java Sat Apr 7 01:35:49 2007
@@ -16,21 +16,27 @@
*/
package org.apache.servicemix.bean;
-import org.aopalliance.intercept.MethodInvocation;
-
import javax.jbi.messaging.MessageExchange;
+import org.aopalliance.intercept.MethodInvocation;
+
/**
* @version $Revision: $
*/
+@SuppressWarnings("serial")
public class MethodInvocationFailedException extends Exception {
- private Object pojo;
- private MethodInvocation invocation;
- private MessageExchange messageExchange;
- private BeanEndpoint endpoint;
- public MethodInvocationFailedException(Object pojo, MethodInvocation invocation, MessageExchange messageExchange, BeanEndpoint endpoint, Throwable cause) {
- super("Failed to invoke method: " + invocation + " on object: " + pojo + " on exchange: " + messageExchange + " with endpoint: " + endpoint
+ private final Object pojo;
+ private final MethodInvocation invocation;
+ private final MessageExchange messageExchange;
+ private final BeanEndpoint endpoint;
+
+ public MethodInvocationFailedException(Object pojo, MethodInvocation invocation,
+ MessageExchange messageExchange, BeanEndpoint endpoint, Throwable cause) {
+ super("Failed to invoke method: " + invocation
+ + " on object: " + pojo
+ + " on exchange: " + messageExchange
+ + " with endpoint: " + endpoint
+ ". Reason: " + cause, cause);
this.pojo = pojo;
this.invocation = invocation;
Modified: incubator/servicemix/trunk/deployables/serviceengines/servicemix-bean/src/main/java/org/apache/servicemix/bean/NoSuchBeanException.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/deployables/serviceengines/servicemix-bean/src/main/java/org/apache/servicemix/bean/NoSuchBeanException.java?view=diff&rev=526407&r1=526406&r2=526407
==============================================================================
--- incubator/servicemix/trunk/deployables/serviceengines/servicemix-bean/src/main/java/org/apache/servicemix/bean/NoSuchBeanException.java (original)
+++ incubator/servicemix/trunk/deployables/serviceengines/servicemix-bean/src/main/java/org/apache/servicemix/bean/NoSuchBeanException.java Sat Apr 7 01:35:49 2007
@@ -22,8 +22,9 @@
* @version $Revision: $
*/
public class NoSuchBeanException extends IllegalArgumentException {
- private String beanName;
- private BeanEndpoint endpoint;
+
+ private final String beanName;
+ private final BeanEndpoint endpoint;
public NoSuchBeanException(String beanName, BeanEndpoint endpoint) {
super("No such bean named '" + beanName + "' for endpoint: " + endpoint);
Modified: incubator/servicemix/trunk/deployables/serviceengines/servicemix-bean/src/main/java/org/apache/servicemix/bean/Operation.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/deployables/serviceengines/servicemix-bean/src/main/java/org/apache/servicemix/bean/Operation.java?view=diff&rev=526407&r1=526406&r2=526407
==============================================================================
--- incubator/servicemix/trunk/deployables/serviceengines/servicemix-bean/src/main/java/org/apache/servicemix/bean/Operation.java (original)
+++ incubator/servicemix/trunk/deployables/serviceengines/servicemix-bean/src/main/java/org/apache/servicemix/bean/Operation.java Sat Apr 7 01:35:49 2007
@@ -16,14 +16,13 @@
*/
package org.apache.servicemix.bean;
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
+import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-@Retention(RUNTIME)
-@Target( { METHOD })
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.METHOD })
public @interface Operation {
String name() default "";
Modified: incubator/servicemix/trunk/deployables/serviceengines/servicemix-bean/src/main/java/org/apache/servicemix/bean/Property.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/deployables/serviceengines/servicemix-bean/src/main/java/org/apache/servicemix/bean/Property.java?view=diff&rev=526407&r1=526406&r2=526407
==============================================================================
--- incubator/servicemix/trunk/deployables/serviceengines/servicemix-bean/src/main/java/org/apache/servicemix/bean/Property.java (original)
+++ incubator/servicemix/trunk/deployables/serviceengines/servicemix-bean/src/main/java/org/apache/servicemix/bean/Property.java Sat Apr 7 01:35:49 2007
@@ -16,10 +16,10 @@
*/
package org.apache.servicemix.bean;
+import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import java.lang.annotation.ElementType;
/**
* Binds a method parameter to an XPath expression on the inbound message
@@ -27,7 +27,7 @@
* @version $Revision: $
*/
@Retention(RetentionPolicy.RUNTIME)
-@Target({ElementType.PARAMETER})
+@Target({ElementType.PARAMETER })
public @interface Property {
String name() default "";
Modified: incubator/servicemix/trunk/deployables/serviceengines/servicemix-bean/src/main/java/org/apache/servicemix/bean/UnknownMessageExchangeTypeException.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/deployables/serviceengines/servicemix-bean/src/main/java/org/apache/servicemix/bean/UnknownMessageExchangeTypeException.java?view=diff&rev=526407&r1=526406&r2=526407
==============================================================================
--- incubator/servicemix/trunk/deployables/serviceengines/servicemix-bean/src/main/java/org/apache/servicemix/bean/UnknownMessageExchangeTypeException.java (original)
+++ incubator/servicemix/trunk/deployables/serviceengines/servicemix-bean/src/main/java/org/apache/servicemix/bean/UnknownMessageExchangeTypeException.java Sat Apr 7 01:35:49 2007
@@ -24,8 +24,9 @@
* @version $Revision: $
*/
public class UnknownMessageExchangeTypeException extends IllegalArgumentException {
- private MessageExchange messageExchange;
- private BeanEndpoint endpoint;
+
+ private final MessageExchange messageExchange;
+ private final BeanEndpoint endpoint;
public UnknownMessageExchangeTypeException(MessageExchange messageExchange, BeanEndpoint endpoint) {
super("Unknown message exchange: " + messageExchange + " on endpoint: " + endpoint);
Modified: incubator/servicemix/trunk/deployables/serviceengines/servicemix-bean/src/main/java/org/apache/servicemix/bean/XPath.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/deployables/serviceengines/servicemix-bean/src/main/java/org/apache/servicemix/bean/XPath.java?view=diff&rev=526407&r1=526406&r2=526407
==============================================================================
--- incubator/servicemix/trunk/deployables/serviceengines/servicemix-bean/src/main/java/org/apache/servicemix/bean/XPath.java (original)
+++ incubator/servicemix/trunk/deployables/serviceengines/servicemix-bean/src/main/java/org/apache/servicemix/bean/XPath.java Sat Apr 7 01:35:49 2007
@@ -16,10 +16,10 @@
*/
package org.apache.servicemix.bean;
+import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import java.lang.annotation.ElementType;
/**
* Binds a method parameter to an XPath expression on the inbound message
@@ -27,8 +27,9 @@
* @version $Revision: $
*/
@Retention(RetentionPolicy.RUNTIME)
-@Target({ElementType.PARAMETER})
+@Target({ElementType.PARAMETER })
public @interface XPath {
String xpath() default "";
+
}
Modified: incubator/servicemix/trunk/deployables/serviceengines/servicemix-bean/src/main/java/org/apache/servicemix/bean/support/BeanInfo.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/deployables/serviceengines/servicemix-bean/src/main/java/org/apache/servicemix/bean/support/BeanInfo.java?view=diff&rev=526407&r1=526406&r2=526407
==============================================================================
--- incubator/servicemix/trunk/deployables/serviceengines/servicemix-bean/src/main/java/org/apache/servicemix/bean/support/BeanInfo.java (original)
+++ incubator/servicemix/trunk/deployables/serviceengines/servicemix-bean/src/main/java/org/apache/servicemix/bean/support/BeanInfo.java Sat Apr 7 01:35:49 2007
@@ -16,6 +16,17 @@
*/
package org.apache.servicemix.bean.support;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Method;
+import java.util.Collection;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+import javax.jbi.messaging.MessageExchange;
+import javax.jbi.messaging.MessagingException;
+import javax.jbi.messaging.NormalizedMessage;
+import javax.xml.namespace.QName;
+
import org.aopalliance.intercept.MethodInvocation;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -29,25 +40,15 @@
import org.apache.servicemix.expression.PropertyExpression;
import org.apache.servicemix.jbi.messaging.PojoMarshaler;
-import javax.jbi.messaging.MessageExchange;
-import javax.jbi.messaging.MessagingException;
-import javax.jbi.messaging.NormalizedMessage;
-import javax.xml.namespace.QName;
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Method;
-import java.util.Collection;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-
/**
- * Represents the metadata about a bean type created via a combination of introspection and annotations together with some
- * useful sensible defaults
+ * Represents the metadata about a bean type created via a combination of
+ * introspection and annotations together with some useful sensible defaults
*
* @version $Revision: $
*/
public class BeanInfo {
- private static final Log log = LogFactory.getLog(BeanInfo.class);
+ private static final Log LOG = LogFactory.getLog(BeanInfo.class);
private Class type;
private MethodInvocationStrategy strategy;
@@ -58,7 +59,14 @@
public BeanInfo(Class type, MethodInvocationStrategy strategy) {
this.type = type;
this.strategy = strategy;
- introspect(type);
+ }
+
+ public Class getType() {
+ return type;
+ }
+
+ public void introspect() {
+ introspect(getType());
if (operations.size() == 1) {
Collection<MethodInfo> methodInfos = operations.values();
for (MethodInfo methodInfo : methodInfos) {
@@ -72,8 +80,7 @@
MethodInfo methodInfo = null;
if (operation == null) {
methodInfo = defaultExpression;
- }
- else {
+ } else {
methodInfo = operations.get(operation.getLocalPart());
}
if (methodInfo != null) {
@@ -82,28 +89,29 @@
return null;
}
- protected void introspect(Class type) {
- Method[] methods = type.getDeclaredMethods();
+ protected void introspect(Class clazz) {
+ Method[] methods = clazz.getDeclaredMethods();
for (Method method : methods) {
- introspect(type, method);
+ introspect(clazz, method);
}
-
- Class superclass = type.getSuperclass();
+ Class superclass = clazz.getSuperclass();
if (superclass != null && !superclass.equals(Object.class)) {
introspect(superclass);
}
}
- protected void introspect(Class type, Method method) {
+ protected void introspect(Class clazz, Method method) {
Class[] parameterTypes = method.getParameterTypes();
Annotation[][] parameterAnnotations = method.getParameterAnnotations();
final Expression[] parameterExpressions = new Expression[parameterTypes.length];
for (int i = 0; i < parameterTypes.length; i++) {
Class parameterType = parameterTypes[i];
- Expression expression = createParameterUnmarshalExpression(type, method, parameterType, parameterAnnotations[i]);
+ Expression expression = createParameterUnmarshalExpression(clazz, method,
+ parameterType, parameterAnnotations[i]);
if (expression == null) {
- if (log.isDebugEnabled()) {
- log.debug("No expression available for method: " + method.toString() + " parameter: " + i + " so ignoring method");
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("No expression available for method: "
+ + method.toString() + " parameter: " + i + " so ignoring method");
}
return;
}
@@ -119,13 +127,14 @@
}
}
Expression parametersExpression = createMethodParametersExpression(parameterExpressions);
- operations.put(opName, new MethodInfo(type, method, parametersExpression));
+ operations.put(opName, new MethodInfo(clazz, method, parametersExpression));
}
protected Expression createMethodParametersExpression(final Expression[] parameterExpressions) {
return new Expression() {
- public Object evaluate(MessageExchange messageExchange, NormalizedMessage normalizedMessage) throws MessagingException {
+ public Object evaluate(MessageExchange messageExchange,
+ NormalizedMessage normalizedMessage) throws MessagingException {
Object[] answer = new Object[parameterExpressions.length];
for (int i = 0; i < parameterExpressions.length; i++) {
Expression parameterExpression = parameterExpressions[i];
@@ -137,13 +146,16 @@
}
/**
- * Creates an expression for the given parameter type if the parameter can be mapped automatically or null
- * if the parameter cannot be mapped due to unsufficient annotations or not fitting with the default type conventions.
+ * Creates an expression for the given parameter type if the parameter can be mapped
+ * automatically or null if the parameter cannot be mapped due to unsufficient
+ * annotations or not fitting with the default type conventions.
*/
- protected Expression createParameterUnmarshalExpression(Class type, Method method, Class parameterType, Annotation[] parameterAnnotation) {
+ protected Expression createParameterUnmarshalExpression(Class clazz, Method method,
+ Class parameterType, Annotation[] parameterAnnotation) {
// TODO look for a parameter annotation that converts into an expression
for (Annotation annotation : parameterAnnotation) {
- Expression answer = createParameterUnmarshalExpressionForAnnotation(type, method, parameterType, annotation);
+ Expression answer = createParameterUnmarshalExpressionForAnnotation(
+ clazz, method, parameterType, annotation);
if (answer != null) {
return answer;
}
@@ -151,17 +163,16 @@
return strategy.getDefaultParameterTypeExpression(parameterType);
}
- protected Expression createParameterUnmarshalExpressionForAnnotation(Class type, Method method, Class parameterType, Annotation annotation) {
+ protected Expression createParameterUnmarshalExpressionForAnnotation(Class clazz, Method method,
+ Class parameterType, Annotation annotation) {
if (annotation instanceof Property) {
Property propertyAnnotation = (Property) annotation;
return new PropertyExpression(propertyAnnotation.name());
- }
- else if (annotation instanceof Content) {
+ } else if (annotation instanceof Content) {
Content content = (Content) annotation;
final PojoMarshaler marshaller = newInstance(content);
return createContentExpression(marshaller);
- }
- else if (annotation instanceof XPath) {
+ } else if (annotation instanceof XPath) {
XPath xpathAnnotation = (XPath) annotation;
return new JAXPStringXPathExpression(xpathAnnotation.xpath());
}
@@ -179,11 +190,9 @@
protected PojoMarshaler newInstance(Content content) {
try {
return content.marshalType().newInstance();
- }
- catch (InstantiationException e) {
+ } catch (InstantiationException e) {
throw new RuntimeException(e);
- }
- catch (IllegalAccessException e) {
+ } catch (IllegalAccessException e) {
throw new RuntimeException(e);
}
}
Modified: incubator/servicemix/trunk/deployables/serviceengines/servicemix-bean/src/main/java/org/apache/servicemix/bean/support/DefaultMethodInvocationStrategy.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/deployables/serviceengines/servicemix-bean/src/main/java/org/apache/servicemix/bean/support/DefaultMethodInvocationStrategy.java?view=diff&rev=526407&r1=526406&r2=526407
==============================================================================
--- incubator/servicemix/trunk/deployables/serviceengines/servicemix-bean/src/main/java/org/apache/servicemix/bean/support/DefaultMethodInvocationStrategy.java (original)
+++ incubator/servicemix/trunk/deployables/serviceengines/servicemix-bean/src/main/java/org/apache/servicemix/bean/support/DefaultMethodInvocationStrategy.java Sat Apr 7 01:35:49 2007
@@ -16,29 +16,30 @@
*/
package org.apache.servicemix.bean.support;
-import org.aopalliance.intercept.MethodInvocation;
-import org.apache.servicemix.expression.Expression;
-import org.apache.servicemix.bean.BeanEndpoint;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
import javax.jbi.messaging.MessageExchange;
import javax.jbi.messaging.MessagingException;
import javax.jbi.messaging.NormalizedMessage;
import javax.xml.transform.Source;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
+
+import org.aopalliance.intercept.MethodInvocation;
+import org.apache.servicemix.bean.BeanEndpoint;
+import org.apache.servicemix.expression.Expression;
/**
* Represents the strategy used to figure out how to map a JBI message exchange to a POJO method invocation
*
* @version $Revision: $
- * @org.apache.xbean.XBean element="defaultMethodInvocationStrategy" description="The default strategy for invoking methods on POJOs from a JBI message exchange"
+ * @org.apache.xbean.XBean element="defaultMethodInvocationStrategy"
+ * description="The default strategy for invoking methods on POJOs from a JBI message exchange"
*/
public class DefaultMethodInvocationStrategy implements MethodInvocationStrategy {
private Map<Class, Expression> parameterTypeToExpressionMap = new ConcurrentHashMap<Class, Expression>();
public DefaultMethodInvocationStrategy() {
- loadDefaultRegistry();
}
@@ -58,26 +59,32 @@
* Creates an invocation on the given POJO using annotations to decide which method to invoke
* and to figure out which parameters to use
*/
- public MethodInvocation createInvocation(Object pojo, BeanInfo beanInfo, MessageExchange messageExchange, BeanEndpoint pojoEndpoint) throws MessagingException {
+ public MethodInvocation createInvocation(Object pojo,
+ BeanInfo beanInfo,
+ MessageExchange messageExchange,
+ BeanEndpoint pojoEndpoint) throws MessagingException {
return beanInfo.createInvocation(pojo, messageExchange);
}
- protected void loadDefaultRegistry() {
+ public void loadDefaultRegistry() {
addParameterMapping(MessageExchange.class, new Expression() {
- public Object evaluate(MessageExchange messageExchange, NormalizedMessage normalizedMessage) throws MessagingException {
+ public Object evaluate(MessageExchange messageExchange, NormalizedMessage normalizedMessage)
+ throws MessagingException {
return messageExchange;
}
});
addParameterMapping(NormalizedMessage.class, new Expression() {
- public Object evaluate(MessageExchange messageExchange, NormalizedMessage normalizedMessage) throws MessagingException {
+ public Object evaluate(MessageExchange messageExchange, NormalizedMessage normalizedMessage)
+ throws MessagingException {
return normalizedMessage;
}
});
addParameterMapping(Source.class, new Expression() {
- public Object evaluate(MessageExchange messageExchange, NormalizedMessage normalizedMessage) throws MessagingException {
+ public Object evaluate(MessageExchange messageExchange, NormalizedMessage normalizedMessage)
+ throws MessagingException {
return normalizedMessage.getContent();
}
});
Modified: incubator/servicemix/trunk/deployables/serviceengines/servicemix-bean/src/main/java/org/apache/servicemix/bean/support/DestinationImpl.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/deployables/serviceengines/servicemix-bean/src/main/java/org/apache/servicemix/bean/support/DestinationImpl.java?view=diff&rev=526407&r1=526406&r2=526407
==============================================================================
--- incubator/servicemix/trunk/deployables/serviceengines/servicemix-bean/src/main/java/org/apache/servicemix/bean/support/DestinationImpl.java (original)
+++ incubator/servicemix/trunk/deployables/serviceengines/servicemix-bean/src/main/java/org/apache/servicemix/bean/support/DestinationImpl.java Sat Apr 7 01:35:49 2007
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.servicemix.bean.support;
import java.util.concurrent.Future;
Modified: incubator/servicemix/trunk/deployables/serviceengines/servicemix-bean/src/main/java/org/apache/servicemix/bean/support/Holder.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/deployables/serviceengines/servicemix-bean/src/main/java/org/apache/servicemix/bean/support/Holder.java?view=diff&rev=526407&r1=526406&r2=526407
==============================================================================
--- incubator/servicemix/trunk/deployables/serviceengines/servicemix-bean/src/main/java/org/apache/servicemix/bean/support/Holder.java (original)
+++ incubator/servicemix/trunk/deployables/serviceengines/servicemix-bean/src/main/java/org/apache/servicemix/bean/support/Holder.java Sat Apr 7 01:35:49 2007
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.servicemix.bean.support;
import java.util.concurrent.ExecutionException;
@@ -38,7 +37,8 @@
}
return extract(object);
}
- public synchronized NormalizedMessage get(long timeout, TimeUnit unit) throws InterruptedException, ExecutionException {
+ public synchronized NormalizedMessage get(long timeout, TimeUnit unit)
+ throws InterruptedException, ExecutionException {
if (object == null) {
wait(unit.toMillis(timeout));
}
Modified: incubator/servicemix/trunk/deployables/serviceengines/servicemix-bean/src/main/java/org/apache/servicemix/bean/support/MethodInfo.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/deployables/serviceengines/servicemix-bean/src/main/java/org/apache/servicemix/bean/support/MethodInfo.java?view=diff&rev=526407&r1=526406&r2=526407
==============================================================================
--- incubator/servicemix/trunk/deployables/serviceengines/servicemix-bean/src/main/java/org/apache/servicemix/bean/support/MethodInfo.java (original)
+++ incubator/servicemix/trunk/deployables/serviceengines/servicemix-bean/src/main/java/org/apache/servicemix/bean/support/MethodInfo.java Sat Apr 7 01:35:49 2007
@@ -16,15 +16,16 @@
*/
package org.apache.servicemix.bean.support;
-import org.aopalliance.intercept.MethodInvocation;
-import org.apache.servicemix.expression.Expression;
-
-import javax.jbi.messaging.MessageExchange;
-import javax.jbi.messaging.MessagingException;
import java.lang.reflect.AccessibleObject;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
+import javax.jbi.messaging.MessageExchange;
+import javax.jbi.messaging.MessagingException;
+
+import org.aopalliance.intercept.MethodInvocation;
+import org.apache.servicemix.expression.Expression;
+
/**
* @version $Revision: $
*/
@@ -40,26 +41,23 @@
}
- public MethodInvocation createMethodInvocation(final Object pojo, final MessageExchange messageExchange) throws MessagingException {
- final Object[] arguments = (Object[]) parametersExpression.evaluate(messageExchange, messageExchange.getMessage("in"));
-
+ public MethodInvocation createMethodInvocation(final Object pojo,
+ final MessageExchange messageExchange) throws MessagingException {
+ final Object[] arguments = (Object[]) parametersExpression.evaluate(
+ messageExchange, messageExchange.getMessage("in"));
return new MethodInvocation() {
public Method getMethod() {
return method;
}
-
public Object[] getArguments() {
return arguments;
}
-
public Object proceed() throws Throwable {
return invoke(method, pojo, arguments, messageExchange);
}
-
public Object getThis() {
return pojo;
}
-
public AccessibleObject getStaticPart() {
return method;
}
@@ -79,7 +77,8 @@
return parametersExpression;
}
- protected Object invoke(Method method, Object pojo, Object[] arguments, MessageExchange exchange) throws IllegalAccessException, InvocationTargetException {
- return method.invoke(pojo, arguments);
+ protected Object invoke(Method mth, Object pojo, Object[] arguments,
+ MessageExchange exchange) throws IllegalAccessException, InvocationTargetException {
+ return mth.invoke(pojo, arguments);
}
}
Modified: incubator/servicemix/trunk/deployables/serviceengines/servicemix-bean/src/main/java/org/apache/servicemix/bean/support/MethodInvocationStrategy.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/deployables/serviceengines/servicemix-bean/src/main/java/org/apache/servicemix/bean/support/MethodInvocationStrategy.java?view=diff&rev=526407&r1=526406&r2=526407
==============================================================================
--- incubator/servicemix/trunk/deployables/serviceengines/servicemix-bean/src/main/java/org/apache/servicemix/bean/support/MethodInvocationStrategy.java (original)
+++ incubator/servicemix/trunk/deployables/serviceengines/servicemix-bean/src/main/java/org/apache/servicemix/bean/support/MethodInvocationStrategy.java Sat Apr 7 01:35:49 2007
@@ -16,13 +16,13 @@
*/
package org.apache.servicemix.bean.support;
+import javax.jbi.messaging.MessageExchange;
+import javax.jbi.messaging.MessagingException;
+
import org.aopalliance.intercept.MethodInvocation;
import org.apache.servicemix.bean.BeanEndpoint;
import org.apache.servicemix.expression.Expression;
-import javax.jbi.messaging.MessageExchange;
-import javax.jbi.messaging.MessagingException;
-
/**
* @version $Revision: $
*/
@@ -31,7 +31,10 @@
* Creates an invocation on the given POJO using annotations to decide which method to invoke
* and to figure out which parameters to use
*/
- MethodInvocation createInvocation(Object pojo, BeanInfo beanInfo, MessageExchange messageExchange, BeanEndpoint pojoEndpoint) throws MessagingException;
+ MethodInvocation createInvocation(Object pojo,
+ BeanInfo beanInfo,
+ MessageExchange messageExchange,
+ BeanEndpoint pojoEndpoint) throws MessagingException;
Expression getDefaultParameterTypeExpression(Class parameterType);
}
Modified: incubator/servicemix/trunk/deployables/serviceengines/servicemix-bean/src/main/java/org/apache/servicemix/bean/support/ReflectionUtils.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/deployables/serviceengines/servicemix-bean/src/main/java/org/apache/servicemix/bean/support/ReflectionUtils.java?view=diff&rev=526407&r1=526406&r2=526407
==============================================================================
--- incubator/servicemix/trunk/deployables/serviceengines/servicemix-bean/src/main/java/org/apache/servicemix/bean/support/ReflectionUtils.java (original)
+++ incubator/servicemix/trunk/deployables/serviceengines/servicemix-bean/src/main/java/org/apache/servicemix/bean/support/ReflectionUtils.java Sat Apr 7 01:35:49 2007
@@ -31,11 +31,13 @@
try {
method.invoke(bean, (Object[]) null);
} catch (IllegalArgumentException ex) {
- throw new IllegalStateException("Failure to invoke " + method + " on " + bean.getClass() + ": args=[]", ex);
+ throw new IllegalStateException("Failure to invoke " + method + " on "
+ + bean.getClass() + ": args=[]", ex);
} catch (IllegalAccessException ex) {
throw new UnsupportedOperationException(ex.toString());
} catch (InvocationTargetException ex) {
- throw new UnsupportedOperationException("PostConstruct method on bean threw exception", ex.getTargetException());
+ throw new UnsupportedOperationException("PostConstruct method on bean threw exception",
+ ex.getTargetException());
}
}
}
@@ -45,7 +47,7 @@
public static void setField(Field f, Object instance, Object value) {
try {
boolean oldAccessible = f.isAccessible();
- boolean shouldSetAccessible = (!Modifier.isPublic(f.getModifiers()) && !oldAccessible);
+ boolean shouldSetAccessible = !Modifier.isPublic(f.getModifiers()) && !oldAccessible;
if (shouldSetAccessible) {
f.setAccessible(true);
}
@@ -54,7 +56,8 @@
f.setAccessible(oldAccessible);
}
} catch (IllegalArgumentException ex) {
- throw new UnsupportedOperationException("Cannot inject value of class '" + value.getClass() + "' into " + f);
+ throw new UnsupportedOperationException("Cannot inject value of class '"
+ + value.getClass() + "' into " + f);
} catch (IllegalAccessException ex) {
ReflectionUtils.handleReflectionException(ex);
}
Modified: incubator/servicemix/trunk/deployables/serviceengines/servicemix-bean/src/main/java/org/apache/servicemix/bean/support/Request.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/deployables/serviceengines/servicemix-bean/src/main/java/org/apache/servicemix/bean/support/Request.java?view=diff&rev=526407&r1=526406&r2=526407
==============================================================================
--- incubator/servicemix/trunk/deployables/serviceengines/servicemix-bean/src/main/java/org/apache/servicemix/bean/support/Request.java (original)
+++ incubator/servicemix/trunk/deployables/serviceengines/servicemix-bean/src/main/java/org/apache/servicemix/bean/support/Request.java Sat Apr 7 01:35:49 2007
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.servicemix.bean.support;
import java.lang.reflect.Method;
@@ -47,6 +46,7 @@
public Object getBean() {
return bean;
}
+
/**
* @param bean the bean to set
*/
Modified: incubator/servicemix/trunk/deployables/serviceengines/servicemix-bean/src/main/java/org/apache/servicemix/bean/support/ResolverUtil.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/deployables/serviceengines/servicemix-bean/src/main/java/org/apache/servicemix/bean/support/ResolverUtil.java?view=diff&rev=526407&r1=526406&r2=526407
==============================================================================
--- incubator/servicemix/trunk/deployables/serviceengines/servicemix-bean/src/main/java/org/apache/servicemix/bean/support/ResolverUtil.java (original)
+++ incubator/servicemix/trunk/deployables/serviceengines/servicemix-bean/src/main/java/org/apache/servicemix/bean/support/ResolverUtil.java Sat Apr 7 01:35:49 2007
@@ -1,10 +1,12 @@
-/* Copyright 2005-2006 Tim Fennell
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -14,8 +16,9 @@
*/
package org.apache.servicemix.bean.support;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+/*
+ * Copyright 2005-2006 Tim Fennell
+ */
import java.io.File;
import java.io.FileInputStream;
@@ -29,6 +32,9 @@
import java.util.jar.JarEntry;
import java.util.jar.JarInputStream;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
/**
* <p>ResolverUtil is used to locate classes that are available in the/a class path and meet
* arbitrary conditions. The two most common conditions are that a class implements/extends
@@ -62,7 +68,8 @@
* @author Tim Fennell
*/
public class ResolverUtil<T> {
- private static final transient Log log = LogFactory.getLog(ResolverUtil.class);
+
+ private static final transient Log LOG = LogFactory.getLog(ResolverUtil.class);
/**
* A simple interface that specifies how to test classes to determine if they
@@ -149,9 +156,11 @@
* Sets an explicit ClassLoader that should be used when scanning for classes. If none
* is set then the context classloader will be used.
*
- * @param classloader a ClassLoader to use when scanning for classes
+ * @param cl a ClassLoader to use when scanning for classes
*/
- public void setClassLoader(ClassLoader classloader) { this.classloader = classloader; }
+ public void setClassLoader(ClassLoader cl) {
+ this.classloader = cl;
+ }
/**
* Attempts to discover classes that are assignable to the type provided. In the case
@@ -163,8 +172,9 @@
* @param packageNames one or more package names to scan (including subpackages) for classes
*/
public void findImplementations(Class parent, String... packageNames) {
- if (packageNames == null) return;
-
+ if (packageNames == null) {
+ return;
+ }
Test test = new IsA(parent);
for (String pkg : packageNames) {
find(test, pkg);
@@ -179,8 +189,9 @@
* @param packageNames one or more package names to scan (including subpackages) for classes
*/
public void findAnnotated(Class<? extends Annotation> annotation, String... packageNames) {
- if (packageNames == null) return;
-
+ if (packageNames == null) {
+ return;
+ }
Test test = new AnnotatedWith(annotation);
for (String pkg : packageNames) {
find(test, pkg);
@@ -201,41 +212,33 @@
packageName = packageName.replace('.', '/');
ClassLoader loader = getClassLoader();
Enumeration<URL> urls;
-
try {
urls = loader.getResources(packageName);
- }
- catch (IOException ioe) {
- log.warn("Could not read package: " + packageName, ioe);
+ } catch (IOException ioe) {
+ LOG.warn("Could not read package: " + packageName, ioe);
return;
}
-
while (urls.hasMoreElements()) {
try {
String urlPath = urls.nextElement().getFile();
urlPath = URLDecoder.decode(urlPath, "UTF-8");
-
// If it's a file in a directory, trim the stupid file: spec
- if ( urlPath.startsWith("file:") ) {
+ if (urlPath.startsWith("file:")) {
urlPath = urlPath.substring(5);
}
-
// Else it's in a JAR, grab the path to the jar
if (urlPath.indexOf('!') > 0) {
urlPath = urlPath.substring(0, urlPath.indexOf('!'));
}
-
- log.info("Scanning for classes in [" + urlPath + "] matching criteria: " + test);
+ LOG.info("Scanning for classes in [" + urlPath + "] matching criteria: " + test);
File file = new File(urlPath);
- if ( file.isDirectory() ) {
+ if (file.isDirectory()) {
loadImplementationsInDirectory(test, packageName, file);
- }
- else {
+ } else {
loadImplementationsInJar(test, packageName, file);
}
- }
- catch (IOException ioe) {
- log.warn("could not read entries", ioe);
+ } catch (IOException ioe) {
+ LOG.warn("could not read entries", ioe);
}
}
}
@@ -256,16 +259,13 @@
private void loadImplementationsInDirectory(Test test, String parent, File location) {
File[] files = location.listFiles();
StringBuilder builder = null;
-
for (File file : files) {
builder = new StringBuilder(100);
builder.append(parent).append("/").append(file.getName());
- String packageOrClass = ( parent == null ? file.getName() : builder.toString() );
-
+ String packageOrClass = parent == null ? file.getName() : builder.toString();
if (file.isDirectory()) {
loadImplementationsInDirectory(test, packageOrClass, file);
- }
- else if (file.getName().endsWith(".class")) {
+ } else if (file.getName().endsWith(".class")) {
addIfMatching(test, packageOrClass);
}
}
@@ -283,19 +283,16 @@
private void loadImplementationsInJar(Test test, String parent, File jarfile) {
try {
- JarEntry entry;
JarInputStream jarStream = new JarInputStream(new FileInputStream(jarfile));
-
- while ( (entry = jarStream.getNextJarEntry() ) != null) {
+ for (JarEntry entry = jarStream.getNextJarEntry(); entry != null; entry = jarStream.getNextJarEntry()) {
String name = entry.getName();
if (!entry.isDirectory() && name.startsWith(parent) && name.endsWith(".class")) {
addIfMatching(test, name);
}
}
- }
- catch (IOException ioe) {
- log.error("Could not search jar file '" + jarfile + "' for classes matching criteria: " +
- test + "due to an IOException: " + ioe.getMessage());
+ } catch (IOException ioe) {
+ LOG.error("Could not search jar file '" + jarfile + "' for classes matching criteria: "
+ + test + "due to an IOException: " + ioe.getMessage());
}
}
@@ -310,16 +307,15 @@
try {
String externalName = fqn.substring(0, fqn.indexOf('.')).replace('/', '.');
ClassLoader loader = getClassLoader();
- log.trace("Checking to see if class " + externalName + " matches criteria [" + test+ "]");
+ LOG.trace("Checking to see if class " + externalName + " matches criteria [" + test + "]");
Class type = loader.loadClass(externalName);
- if (test.matches(type) ) {
- matches.add( (Class<T>) type);
+ if (test.matches(type)) {
+ matches.add((Class<T>) type);
}
- }
- catch (Throwable t) {
- log.warn("Could not examine class '"+ fqn + "' due to a " +
- t.getClass().getName()+ " with message: " + t.getMessage());
+ } catch (Throwable t) {
+ LOG.warn("Could not examine class '" + fqn + "' due to a "
+ + t.getClass().getName() + " with message: " + t.getMessage());
}
}
}
Modified: incubator/servicemix/trunk/deployables/serviceengines/servicemix-bean/src/test/java/org/apache/servicemix/bean/AnnotatedBeanEndpointTest.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/deployables/serviceengines/servicemix-bean/src/test/java/org/apache/servicemix/bean/AnnotatedBeanEndpointTest.java?view=diff&rev=526407&r1=526406&r2=526407
==============================================================================
--- incubator/servicemix/trunk/deployables/serviceengines/servicemix-bean/src/test/java/org/apache/servicemix/bean/AnnotatedBeanEndpointTest.java (original)
+++ incubator/servicemix/trunk/deployables/serviceengines/servicemix-bean/src/test/java/org/apache/servicemix/bean/AnnotatedBeanEndpointTest.java Sat Apr 7 01:35:49 2007
@@ -16,21 +16,22 @@
*/
package org.apache.servicemix.bean;
+import javax.jbi.messaging.ExchangeStatus;
+import javax.jbi.messaging.InOnly;
+import javax.jbi.messaging.MessageExchange;
+import javax.jbi.servicedesc.ServiceEndpoint;
+import javax.xml.namespace.QName;
+
+import org.w3c.dom.DocumentFragment;
+
+import org.apache.servicemix.bean.beans.AnnotatedBean;
import org.apache.servicemix.client.DefaultServiceMixClient;
import org.apache.servicemix.jbi.jaxp.SourceTransformer;
import org.apache.servicemix.jbi.jaxp.StringSource;
import org.apache.servicemix.jbi.resolver.URIResolver;
-import org.apache.servicemix.bean.beans.AnnotatedBean;
import org.apache.servicemix.tck.SpringTestSupport;
import org.apache.xbean.spring.context.ClassPathXmlApplicationContext;
import org.springframework.context.support.AbstractXmlApplicationContext;
-import org.w3c.dom.DocumentFragment;
-
-import javax.jbi.messaging.ExchangeStatus;
-import javax.jbi.messaging.InOnly;
-import javax.jbi.messaging.MessageExchange;
-import javax.jbi.servicedesc.ServiceEndpoint;
-import javax.xml.namespace.QName;
public class AnnotatedBeanEndpointTest extends SpringTestSupport {
@@ -107,7 +108,8 @@
assertEquals("Bean's methodWithPropertyParameter() method should bave been invoked", "James", answer);
}
- public void testSendingToDynamicEndpointForAnnotatedBeanWithPropertyAndXPathExpressionParamameter() throws Exception {
+ public void testSendingToDynamicEndpointForAnnotatedBeanWithPropertyAndXPathExpressionParamameter()
+ throws Exception {
// now lets make a request on this endpoint
DefaultServiceMixClient client = new DefaultServiceMixClient(jbi);
@@ -128,7 +130,8 @@
AnnotatedBean bean = (AnnotatedBean) getBean("annotatedBean");
Object property = bean.getPropertyParameter();
Object xpath = bean.getXpathParameter();
- log.info("Bean's methodWithPropertyParameterAndXPath() method has been with property: " + property + " and xpath: " + xpath);
+ log.info("Bean's methodWithPropertyParameterAndXPath() method has been with property: "
+ + property + " and xpath: " + xpath);
assertEquals("property parameter", "James", property);
assertEquals("xpath parameter", "London", xpath);
@@ -139,12 +142,10 @@
if (me.getStatus() == ExchangeStatus.ERROR) {
if (me.getError() != null) {
throw me.getError();
- }
- else {
+ } else {
fail("Received ERROR status");
}
- }
- else if (me.getFault() != null) {
+ } else if (me.getFault() != null) {
fail("Received fault: " + new SourceTransformer().toString(me.getFault().getContent()));
}
}
Modified: incubator/servicemix/trunk/deployables/serviceengines/servicemix-bean/src/test/java/org/apache/servicemix/bean/AutoDeployedEndpointTest.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/deployables/serviceengines/servicemix-bean/src/test/java/org/apache/servicemix/bean/AutoDeployedEndpointTest.java?view=diff&rev=526407&r1=526406&r2=526407
==============================================================================
--- incubator/servicemix/trunk/deployables/serviceengines/servicemix-bean/src/test/java/org/apache/servicemix/bean/AutoDeployedEndpointTest.java (original)
+++ incubator/servicemix/trunk/deployables/serviceengines/servicemix-bean/src/test/java/org/apache/servicemix/bean/AutoDeployedEndpointTest.java Sat Apr 7 01:35:49 2007
@@ -1,5 +1,4 @@
-/**
- *
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -7,7 +6,7 @@
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,23 +16,18 @@
*/
package org.apache.servicemix.bean;
-import org.apache.servicemix.tck.SpringTestSupport;
+import javax.jbi.messaging.ExchangeStatus;
+import javax.jbi.messaging.InOnly;
+import javax.jbi.messaging.MessageExchange;
+import javax.xml.namespace.QName;
+
import org.apache.servicemix.client.DefaultServiceMixClient;
-import org.apache.servicemix.jbi.resolver.URIResolver;
-import org.apache.servicemix.jbi.jaxp.StringSource;
import org.apache.servicemix.jbi.jaxp.SourceTransformer;
-import org.apache.servicemix.bean.beans.PlainBean;
+import org.apache.servicemix.jbi.jaxp.StringSource;
+import org.apache.servicemix.tck.SpringTestSupport;
import org.apache.xbean.spring.context.ClassPathXmlApplicationContext;
-import org.w3c.dom.DocumentFragment;
import org.springframework.context.support.AbstractXmlApplicationContext;
-import javax.jbi.servicedesc.ServiceEndpoint;
-import javax.jbi.messaging.InOnly;
-import javax.jbi.messaging.MessageExchange;
-import javax.jbi.messaging.NormalizedMessage;
-import javax.jbi.messaging.ExchangeStatus;
-import javax.xml.namespace.QName;
-
public class AutoDeployedEndpointTest extends SpringTestSupport {
public void testSendingToDynamicEndpointForPlainBeanWithFooOperation() throws Exception {
@@ -83,12 +77,10 @@
if (me.getStatus() == ExchangeStatus.ERROR) {
if (me.getError() != null) {
throw me.getError();
- }
- else {
+ } else {
fail("Received ERROR status");
}
- }
- else if (me.getFault() != null) {
+ } else if (me.getFault() != null) {
fail("Received fault: " + new SourceTransformer().toString(me.getFault().getContent()));
}
}
Modified: incubator/servicemix/trunk/deployables/serviceengines/servicemix-bean/src/test/java/org/apache/servicemix/bean/ConsumerBeanTest.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/deployables/serviceengines/servicemix-bean/src/test/java/org/apache/servicemix/bean/ConsumerBeanTest.java?view=diff&rev=526407&r1=526406&r2=526407
==============================================================================
--- incubator/servicemix/trunk/deployables/serviceengines/servicemix-bean/src/test/java/org/apache/servicemix/bean/ConsumerBeanTest.java (original)
+++ incubator/servicemix/trunk/deployables/serviceengines/servicemix-bean/src/test/java/org/apache/servicemix/bean/ConsumerBeanTest.java Sat Apr 7 01:35:49 2007
@@ -48,7 +48,7 @@
ep.setService(new QName("bean"));
ep.setEndpoint("endpoint");
ep.setBeanType(ConsumerBean.class);
- bc.setEndpoints(new BeanEndpoint[] { ep });
+ bc.setEndpoints(new BeanEndpoint[] {ep });
jbi.activateComponent(bc, "servicemix-bean");
EchoComponent echo1 = new EchoComponent(new QName("urn", "service1"), "endpoint");
@@ -74,12 +74,10 @@
if (me.getStatus() == ExchangeStatus.ERROR) {
if (me.getError() != null) {
throw me.getError();
- }
- else {
+ } else {
fail("Received ERROR status");
}
- }
- else if (me.getFault() != null) {
+ } else if (me.getFault() != null) {
fail("Received fault: " + new SourceTransformer().toString(me.getFault().getContent()));
}
}
Modified: incubator/servicemix/trunk/deployables/serviceengines/servicemix-bean/src/test/java/org/apache/servicemix/bean/DynamicEndpointTest.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/deployables/serviceengines/servicemix-bean/src/test/java/org/apache/servicemix/bean/DynamicEndpointTest.java?view=diff&rev=526407&r1=526406&r2=526407
==============================================================================
--- incubator/servicemix/trunk/deployables/serviceengines/servicemix-bean/src/test/java/org/apache/servicemix/bean/DynamicEndpointTest.java (original)
+++ incubator/servicemix/trunk/deployables/serviceengines/servicemix-bean/src/test/java/org/apache/servicemix/bean/DynamicEndpointTest.java Sat Apr 7 01:35:49 2007
@@ -16,6 +16,11 @@
*/
package org.apache.servicemix.bean;
+import javax.jbi.messaging.ExchangeStatus;
+import javax.jbi.messaging.InOnly;
+import javax.jbi.messaging.MessageExchange;
+import javax.jbi.servicedesc.ServiceEndpoint;
+
import org.apache.servicemix.bean.beans.ListenerBean;
import org.apache.servicemix.client.DefaultServiceMixClient;
import org.apache.servicemix.client.ServiceMixClient;
@@ -25,11 +30,6 @@
import org.apache.xbean.spring.context.ClassPathXmlApplicationContext;
import org.springframework.context.support.AbstractXmlApplicationContext;
-import javax.jbi.messaging.ExchangeStatus;
-import javax.jbi.messaging.InOnly;
-import javax.jbi.messaging.MessageExchange;
-import javax.jbi.servicedesc.ServiceEndpoint;
-
public class DynamicEndpointTest extends SpringTestSupport {
public void testSendingToDynamicEndpointForListenerBeanUsingAbsoluteUri() throws Exception {
@@ -66,12 +66,10 @@
if (me.getStatus() == ExchangeStatus.ERROR) {
if (me.getError() != null) {
throw me.getError();
- }
- else {
+ } else {
fail("Received ERROR status");
}
- }
- else if (me.getFault() != null) {
+ } else if (me.getFault() != null) {
fail("Received fault: " + new SourceTransformer().toString(me.getFault().getContent()));
}
}
Modified: incubator/servicemix/trunk/deployables/serviceengines/servicemix-bean/src/test/java/org/apache/servicemix/bean/ListenerBeanEndpointTest.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/deployables/serviceengines/servicemix-bean/src/test/java/org/apache/servicemix/bean/ListenerBeanEndpointTest.java?view=diff&rev=526407&r1=526406&r2=526407
==============================================================================
--- incubator/servicemix/trunk/deployables/serviceengines/servicemix-bean/src/test/java/org/apache/servicemix/bean/ListenerBeanEndpointTest.java (original)
+++ incubator/servicemix/trunk/deployables/serviceengines/servicemix-bean/src/test/java/org/apache/servicemix/bean/ListenerBeanEndpointTest.java Sat Apr 7 01:35:49 2007
@@ -16,6 +16,13 @@
*/
package org.apache.servicemix.bean;
+import javax.jbi.messaging.ExchangeStatus;
+import javax.jbi.messaging.InOnly;
+import javax.jbi.messaging.MessageExchange;
+import javax.jbi.servicedesc.ServiceEndpoint;
+
+import org.w3c.dom.DocumentFragment;
+
import org.apache.servicemix.bean.beans.ListenerBean;
import org.apache.servicemix.client.DefaultServiceMixClient;
import org.apache.servicemix.jbi.jaxp.SourceTransformer;
@@ -24,12 +31,6 @@
import org.apache.servicemix.tck.SpringTestSupport;
import org.apache.xbean.spring.context.ClassPathXmlApplicationContext;
import org.springframework.context.support.AbstractXmlApplicationContext;
-import org.w3c.dom.DocumentFragment;
-
-import javax.jbi.messaging.ExchangeStatus;
-import javax.jbi.messaging.InOnly;
-import javax.jbi.messaging.MessageExchange;
-import javax.jbi.servicedesc.ServiceEndpoint;
public class ListenerBeanEndpointTest extends SpringTestSupport {
@@ -60,12 +61,10 @@
if (me.getStatus() == ExchangeStatus.ERROR) {
if (me.getError() != null) {
throw me.getError();
- }
- else {
+ } else {
fail("Received ERROR status");
}
- }
- else if (me.getFault() != null) {
+ } else if (me.getFault() != null) {
fail("Received fault: " + new SourceTransformer().toString(me.getFault().getContent()));
}
}