You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by ge...@apache.org on 2009/11/13 21:53:00 UTC
svn commit: r835983 - in
/servicemix/components/engines/servicemix-camel/trunk/src:
main/java/org/apache/servicemix/camel/
main/java/org/apache/servicemix/camel/osgi/
main/java/org/apache/servicemix/camel/util/
test/java/org/apache/servicemix/camel/ te...
Author: gertv
Date: Fri Nov 13 20:52:59 2009
New Revision: 835983
URL: http://svn.apache.org/viewvc?rev=835983&view=rev
Log:
Cleaning up the code based on the -Psourcecheck recommendations
Modified:
servicemix/components/engines/servicemix-camel/trunk/src/main/java/org/apache/servicemix/camel/CamelComponent.java
servicemix/components/engines/servicemix-camel/trunk/src/main/java/org/apache/servicemix/camel/CamelConsumerEndpoint.java
servicemix/components/engines/servicemix-camel/trunk/src/main/java/org/apache/servicemix/camel/CamelJbiComponent.java
servicemix/components/engines/servicemix-camel/trunk/src/main/java/org/apache/servicemix/camel/JbiBinding.java
servicemix/components/engines/servicemix-camel/trunk/src/main/java/org/apache/servicemix/camel/JbiComponent.java
servicemix/components/engines/servicemix-camel/trunk/src/main/java/org/apache/servicemix/camel/JbiEndpoint.java
servicemix/components/engines/servicemix-camel/trunk/src/main/java/org/apache/servicemix/camel/osgi/OsgiCamelJbiComponent.java
servicemix/components/engines/servicemix-camel/trunk/src/main/java/org/apache/servicemix/camel/util/HeaderFilterStrategies.java
servicemix/components/engines/servicemix-camel/trunk/src/test/java/org/apache/servicemix/camel/JbiBindingTest.java
servicemix/components/engines/servicemix-camel/trunk/src/test/java/org/apache/servicemix/camel/JbiCamelAttachmentTest.java
servicemix/components/engines/servicemix-camel/trunk/src/test/java/org/apache/servicemix/camel/JbiCamelErrorHandlingTestSupport.java
servicemix/components/engines/servicemix-camel/trunk/src/test/java/org/apache/servicemix/camel/JbiCamelExceptionsTest.java
servicemix/components/engines/servicemix-camel/trunk/src/test/java/org/apache/servicemix/camel/JbiComponentTest.java
servicemix/components/engines/servicemix-camel/trunk/src/test/java/org/apache/servicemix/camel/JbiConvertExceptionsTest.java
servicemix/components/engines/servicemix-camel/trunk/src/test/java/org/apache/servicemix/camel/JbiEndpointWithMepSpecifiedTest.java
servicemix/components/engines/servicemix-camel/trunk/src/test/java/org/apache/servicemix/camel/JbiInOnlyAsyncCamelTest.java
servicemix/components/engines/servicemix-camel/trunk/src/test/java/org/apache/servicemix/camel/JbiInOnlyTest.java
servicemix/components/engines/servicemix-camel/trunk/src/test/java/org/apache/servicemix/camel/converter/JbiConverterTest.java
Modified: servicemix/components/engines/servicemix-camel/trunk/src/main/java/org/apache/servicemix/camel/CamelComponent.java
URL: http://svn.apache.org/viewvc/servicemix/components/engines/servicemix-camel/trunk/src/main/java/org/apache/servicemix/camel/CamelComponent.java?rev=835983&r1=835982&r2=835983&view=diff
==============================================================================
--- servicemix/components/engines/servicemix-camel/trunk/src/main/java/org/apache/servicemix/camel/CamelComponent.java (original)
+++ servicemix/components/engines/servicemix-camel/trunk/src/main/java/org/apache/servicemix/camel/CamelComponent.java Fri Nov 13 20:52:59 2009
@@ -16,9 +16,9 @@
*/
package org.apache.servicemix.camel;
+import org.apache.servicemix.common.Endpoint;
import org.apache.servicemix.common.ServiceMixComponent;
import org.apache.servicemix.common.ServiceUnit;
-import org.apache.servicemix.common.Endpoint;
/**
*/
Modified: servicemix/components/engines/servicemix-camel/trunk/src/main/java/org/apache/servicemix/camel/CamelConsumerEndpoint.java
URL: http://svn.apache.org/viewvc/servicemix/components/engines/servicemix-camel/trunk/src/main/java/org/apache/servicemix/camel/CamelConsumerEndpoint.java?rev=835983&r1=835982&r2=835983&view=diff
==============================================================================
--- servicemix/components/engines/servicemix-camel/trunk/src/main/java/org/apache/servicemix/camel/CamelConsumerEndpoint.java (original)
+++ servicemix/components/engines/servicemix-camel/trunk/src/main/java/org/apache/servicemix/camel/CamelConsumerEndpoint.java Fri Nov 13 20:52:59 2009
@@ -77,8 +77,8 @@
exchange.setException(messageExchange.getError());
} else if (messageExchange.getStatus() == ExchangeStatus.ACTIVE) {
// first copy the exchange headers
- binding.copyHeadersFromJbiToCamel(messageExchange, exchange);
- // then copy the out/fault message
+ binding.copyHeadersFromJbiToCamel(messageExchange, exchange);
+ // then copy the out/fault message
if (messageExchange.getFault() != null) {
binding.copyFromJbiToCamel(messageExchange.getMessage("fault"), exchange.getOut());
exchange.getOut().setBody(new FaultException("Fault occured for " + exchange.getPattern() + " exchange",
Modified: servicemix/components/engines/servicemix-camel/trunk/src/main/java/org/apache/servicemix/camel/CamelJbiComponent.java
URL: http://svn.apache.org/viewvc/servicemix/components/engines/servicemix-camel/trunk/src/main/java/org/apache/servicemix/camel/CamelJbiComponent.java?rev=835983&r1=835982&r2=835983&view=diff
==============================================================================
--- servicemix/components/engines/servicemix-camel/trunk/src/main/java/org/apache/servicemix/camel/CamelJbiComponent.java (original)
+++ servicemix/components/engines/servicemix-camel/trunk/src/main/java/org/apache/servicemix/camel/CamelJbiComponent.java Fri Nov 13 20:52:59 2009
@@ -94,14 +94,14 @@
if (jbiComponent != null) {
// skip the su-name part
int index = 0;
- for(String name : names) {
+ for (String name : names) {
if (index == 0) {
uriString = name;
}
if (index > 1) {
uriString += ":" + name;
}
- index ++;
+ index++;
}
endpoint = createEndpoint(uriString, jbiComponent);
} else {
@@ -117,7 +117,9 @@
String camelUri = uri.getSchemeSpecificPart();
Endpoint camelEndpoint = jbiComponent.getCamelContext().getEndpoint(camelUri);
Processor processor = jbiComponent.createCamelProcessor(camelEndpoint);
- CamelProviderEndpoint endpoint = new CamelProviderEndpoint(getServiceUnit(), camelEndpoint, jbiComponent.createBinding(camelEndpoint), processor);
+ CamelProviderEndpoint endpoint =
+ new CamelProviderEndpoint(getServiceUnit(), camelEndpoint,
+ jbiComponent.createBinding(camelEndpoint), processor);
IntrospectionSupport.setProperties(endpoint, map);
return endpoint;
@@ -136,7 +138,7 @@
public synchronized JbiComponent getJbiComponent(String suName) {
JbiComponent result = null;
- for (JbiComponent component: jbiComponents) {
+ for (JbiComponent component : jbiComponents) {
if (suName.equals(component.getSuName())) {
result = component;
break;
Modified: servicemix/components/engines/servicemix-camel/trunk/src/main/java/org/apache/servicemix/camel/JbiBinding.java
URL: http://svn.apache.org/viewvc/servicemix/components/engines/servicemix-camel/trunk/src/main/java/org/apache/servicemix/camel/JbiBinding.java?rev=835983&r1=835982&r2=835983&view=diff
==============================================================================
--- servicemix/components/engines/servicemix-camel/trunk/src/main/java/org/apache/servicemix/camel/JbiBinding.java (original)
+++ servicemix/components/engines/servicemix-camel/trunk/src/main/java/org/apache/servicemix/camel/JbiBinding.java Fri Nov 13 20:52:59 2009
@@ -68,7 +68,7 @@
* @param context the CamelContext
*/
public JbiBinding(CamelContext context) {
- this(context, false);
+ this(context, false);
}
public JbiBinding(CamelContext context, boolean strictSerialization) {
@@ -242,7 +242,7 @@
for (String key : message.getHeaders().keySet()) {
Object value = message.getHeader(key);
if (value != null && !strategies.applyFilterToCamelHeaders(key, value, message.getExchange())) {
- normalizedMessage.setProperty(key, value);
+ normalizedMessage.setProperty(key, value);
}
}
@@ -281,11 +281,11 @@
* @return an exception
*/
public Exception extractException(Exchange exchange) {
- Exception e = exchange.getException();
- if (e == null || convertExceptions) {
- e = context.getTypeConverter().convertTo(FaultException.class, exchange);
- }
- return e;
+ Exception e = exchange.getException();
+ if (e == null || convertExceptions) {
+ e = context.getTypeConverter().convertTo(FaultException.class, exchange);
+ }
+ return e;
}
private void copyHeadersFromCamelToJbi(Exchange exchange, MessageExchange messageExchange) {
Modified: servicemix/components/engines/servicemix-camel/trunk/src/main/java/org/apache/servicemix/camel/JbiComponent.java
URL: http://svn.apache.org/viewvc/servicemix/components/engines/servicemix-camel/trunk/src/main/java/org/apache/servicemix/camel/JbiComponent.java?rev=835983&r1=835982&r2=835983&view=diff
==============================================================================
--- servicemix/components/engines/servicemix-camel/trunk/src/main/java/org/apache/servicemix/camel/JbiComponent.java (original)
+++ servicemix/components/engines/servicemix-camel/trunk/src/main/java/org/apache/servicemix/camel/JbiComponent.java Fri Nov 13 20:52:59 2009
@@ -147,11 +147,11 @@
}
protected String createEndpointName() {
- if (idGenerator == null) {
- idGenerator = new IdGenerator("camel");
- }
- return idGenerator.generateSanitizedId();
+ if (idGenerator == null) {
+ idGenerator = new IdGenerator("camel");
}
+ return idGenerator.generateSanitizedId();
+ }
/**
* Returns a JBI endpoint created for the given Camel endpoint
Modified: servicemix/components/engines/servicemix-camel/trunk/src/main/java/org/apache/servicemix/camel/JbiEndpoint.java
URL: http://svn.apache.org/viewvc/servicemix/components/engines/servicemix-camel/trunk/src/main/java/org/apache/servicemix/camel/JbiEndpoint.java?rev=835983&r1=835982&r2=835983&view=diff
==============================================================================
--- servicemix/components/engines/servicemix-camel/trunk/src/main/java/org/apache/servicemix/camel/JbiEndpoint.java (original)
+++ servicemix/components/engines/servicemix-camel/trunk/src/main/java/org/apache/servicemix/camel/JbiEndpoint.java Fri Nov 13 20:52:59 2009
@@ -32,7 +32,7 @@
import org.apache.camel.impl.DefaultProducer;
import org.apache.camel.spi.HeaderFilterStrategy;
import org.apache.camel.spi.HeaderFilterStrategyAware;
-import org.apache.camel.spi.Registry;
+import org.apache.camel.spi.Registry;
import org.apache.camel.util.URISupport;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -54,13 +54,13 @@
private QName operation;
private JbiProducer producer;
-
+
private boolean convertExceptions;
-
+
private boolean strictSerialization;
- private HeaderFilterStrategy headerFilterStrategy;
-
+ private HeaderFilterStrategy headerFilterStrategy;
+
private final JbiComponent jbiComponent;
private final JbiBinding binding;
@@ -73,7 +73,7 @@
//now create the binding based on the information read from the URI
this.binding = createBinding();
}
-
+
public JbiBinding createBinding() {
JbiBinding result = new JbiBinding(this.getCamelContext(), strictSerialization);
result.setConvertExceptions(convertExceptions);
@@ -89,7 +89,7 @@
}
protected class JbiProducer extends DefaultProducer {
-
+
private final Log log = LogFactory.getLog(JbiProducer.class);
private CamelConsumerEndpoint consumer;
@@ -104,7 +104,7 @@
jbiComponent.getCamelJbiComponent().addEndpoint(consumer);
super.start();
}
-
+
@Override
public void stop() throws Exception {
if (isStopped()) {
@@ -117,17 +117,17 @@
}
public void process(final Exchange exchange) throws Exception {
- binding.runWithCamelContextClassLoader(new Callable<Object>() {
+ binding.runWithCamelContextClassLoader(new Callable<Object>() {
public Object call() throws Exception {
consumer.process(exchange);
return null;
}
});
}
-
+
/*
- * Access the underlying JBI Consumer endpoint
- */
+ * Access the underlying JBI Consumer endpoint
+ */
protected CamelConsumerEndpoint getCamelConsumerEndpoint() {
return consumer;
}
@@ -149,28 +149,28 @@
operation = QName.valueOf(oper);
}
this.destinationUri = destinationUri.substring(0, idx);
-
+
String filter = (String) params.get("headerFilterStrategy");
if (StringUtils.hasLength(filter)) {
- Registry registry = jbiComponent.getCamelContext().getRegistry();
- if((idx = filter.indexOf('#')) != -1) {
- filter = filter.substring(1);
- }
- Object object = registry.lookup(filter);
- if (object instanceof HeaderFilterStrategy) {
- headerFilterStrategy = (HeaderFilterStrategy)object;
- }
- params.remove("headerFilterStrategy");
- }
- String convertExceptions = (String) params.get("convertExceptions");
- if (StringUtils.hasLength(convertExceptions)) {
- this.setConvertExceptions(Boolean.valueOf(convertExceptions));
- params.remove("convertExceptions");
+ Registry registry = jbiComponent.getCamelContext().getRegistry();
+ if (filter.indexOf('#') != -1) {
+ filter = filter.substring(1);
+ }
+ Object object = registry.lookup(filter);
+ if (object instanceof HeaderFilterStrategy) {
+ headerFilterStrategy = (HeaderFilterStrategy)object;
+ }
+ params.remove("headerFilterStrategy");
+ }
+ String convert = (String) params.get("convertExceptions");
+ if (StringUtils.hasLength(convert)) {
+ this.setConvertExceptions(Boolean.valueOf(convert));
+ params.remove("convertExceptions");
}
String serialization = (String) params.get("serialization");
if (StringUtils.hasLength(serialization)) {
- this.setStrictSerialization(STRICT_SERIALIZATION.equalsIgnoreCase(serialization));
- params.remove("serialization");
+ this.setStrictSerialization(STRICT_SERIALIZATION.equalsIgnoreCase(serialization));
+ params.remove("serialization");
}
String endpointUri = this.destinationUri + URISupport.createQueryString(params);
this.setEndpointUri(endpointUri);
@@ -228,7 +228,7 @@
public boolean isSingleton() {
return true;
}
-
+
public HeaderFilterStrategy getHeaderFilterStrategy() {
return headerFilterStrategy;
}
Modified: servicemix/components/engines/servicemix-camel/trunk/src/main/java/org/apache/servicemix/camel/osgi/OsgiCamelJbiComponent.java
URL: http://svn.apache.org/viewvc/servicemix/components/engines/servicemix-camel/trunk/src/main/java/org/apache/servicemix/camel/osgi/OsgiCamelJbiComponent.java?rev=835983&r1=835982&r2=835983&view=diff
==============================================================================
--- servicemix/components/engines/servicemix-camel/trunk/src/main/java/org/apache/servicemix/camel/osgi/OsgiCamelJbiComponent.java (original)
+++ servicemix/components/engines/servicemix-camel/trunk/src/main/java/org/apache/servicemix/camel/osgi/OsgiCamelJbiComponent.java Fri Nov 13 20:52:59 2009
@@ -16,11 +16,11 @@
*/
package org.apache.servicemix.camel.osgi;
-import java.util.List;
-import java.util.Collections;
-import java.util.ArrayList;
import java.io.File;
import java.net.URL;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -30,16 +30,16 @@
import org.apache.servicemix.common.Deployer;
import org.apache.servicemix.common.ServiceMixComponent;
import org.apache.servicemix.common.xbean.ClassLoaderXmlPreprocessor;
-import org.apache.xbean.spring.context.SpringApplicationContext;
import org.apache.xbean.classloader.JarFileClassLoader;
+import org.apache.xbean.spring.context.SpringApplicationContext;
+import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleContext;
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.config.BeanFactoryPostProcessor;
import org.springframework.beans.factory.config.BeanPostProcessor;
import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
import org.springframework.osgi.context.BundleContextAware;
import org.springframework.osgi.util.BundleDelegatingClassLoader;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.Bundle;
/**
* When deploying a JBI packaged SU to camel component, camel-spring and camel-osgi
@@ -131,7 +131,9 @@
for (Bundle bundle : bundleContext.getBundles()) {
try {
String symbolicName = bundle.getSymbolicName();
- if (symbolicName.contains("camel-spring") || symbolicName.contains("camel-osgi") || symbolicName.contains("camel-cxf")) {
+ if (symbolicName.contains("camel-spring")
+ || symbolicName.contains("camel-osgi")
+ || symbolicName.contains("camel-cxf")) {
parents.add(BundleDelegatingClassLoader.createBundleClassLoaderFor(bundle));
}
} catch (Throwable e) {
Modified: servicemix/components/engines/servicemix-camel/trunk/src/main/java/org/apache/servicemix/camel/util/HeaderFilterStrategies.java
URL: http://svn.apache.org/viewvc/servicemix/components/engines/servicemix-camel/trunk/src/main/java/org/apache/servicemix/camel/util/HeaderFilterStrategies.java?rev=835983&r1=835982&r2=835983&view=diff
==============================================================================
--- servicemix/components/engines/servicemix-camel/trunk/src/main/java/org/apache/servicemix/camel/util/HeaderFilterStrategies.java (original)
+++ servicemix/components/engines/servicemix-camel/trunk/src/main/java/org/apache/servicemix/camel/util/HeaderFilterStrategies.java Fri Nov 13 20:52:59 2009
@@ -18,14 +18,14 @@
import java.util.LinkedList;
import java.util.List;
-import java.util.Set;
import org.apache.camel.Exchange;
import org.apache.camel.spi.HeaderFilterStrategy;
/**
* {@link HeaderFilterStrategy} implementation that will evaluate a set of
- * strategies
+ * strategies in an OR-like fashion (if one of the strategies filters the property,
+ * the HeaderFilter
*/
public class HeaderFilterStrategies implements HeaderFilterStrategy {
Modified: servicemix/components/engines/servicemix-camel/trunk/src/test/java/org/apache/servicemix/camel/JbiBindingTest.java
URL: http://svn.apache.org/viewvc/servicemix/components/engines/servicemix-camel/trunk/src/test/java/org/apache/servicemix/camel/JbiBindingTest.java?rev=835983&r1=835982&r2=835983&view=diff
==============================================================================
--- servicemix/components/engines/servicemix-camel/trunk/src/test/java/org/apache/servicemix/camel/JbiBindingTest.java (original)
+++ servicemix/components/engines/servicemix-camel/trunk/src/test/java/org/apache/servicemix/camel/JbiBindingTest.java Fri Nov 13 20:52:59 2009
@@ -16,7 +16,6 @@
*/
package org.apache.servicemix.camel;
-import java.util.ArrayList;
import java.util.HashMap;
import javax.activation.DataHandler;
@@ -36,7 +35,6 @@
import org.apache.camel.impl.DefaultExchange;
import org.apache.camel.impl.DefaultMessage;
import org.apache.camel.spi.HeaderFilterStrategy;
-import org.apache.servicemix.camel.JbiInOutPipelineTest.MyHeaderFilterStrategy;
import org.apache.servicemix.jbi.jaxp.StringSource;
import org.apache.servicemix.tck.mock.MockExchangeFactory;
import org.apache.servicemix.tck.mock.MockMessageExchange;
Modified: servicemix/components/engines/servicemix-camel/trunk/src/test/java/org/apache/servicemix/camel/JbiCamelAttachmentTest.java
URL: http://svn.apache.org/viewvc/servicemix/components/engines/servicemix-camel/trunk/src/test/java/org/apache/servicemix/camel/JbiCamelAttachmentTest.java?rev=835983&r1=835982&r2=835983&view=diff
==============================================================================
--- servicemix/components/engines/servicemix-camel/trunk/src/test/java/org/apache/servicemix/camel/JbiCamelAttachmentTest.java (original)
+++ servicemix/components/engines/servicemix-camel/trunk/src/test/java/org/apache/servicemix/camel/JbiCamelAttachmentTest.java Fri Nov 13 20:52:59 2009
@@ -46,13 +46,13 @@
DataHandler attachment = new DataHandler(new FileDataSource(TEST_FILE));
exchange.getIn().addAttachment(ATTACHMENT_ID, attachment);
- MockEndpoint mock_a = getMockEndpoint("mock:a");
- mock_a.expectedMessageCount(1);
+ MockEndpoint mockA = getMockEndpoint("mock:a");
+ mockA.expectedMessageCount(1);
client.send("direct:a", exchange);
- mock_a.assertIsSatisfied();
- Exchange received = mock_a.getReceivedExchanges().get(0);
+ mockA.assertIsSatisfied();
+ Exchange received = mockA.getReceivedExchanges().get(0);
assertNotNull(received.getIn().getAttachment(ATTACHMENT_ID));
if (received.getIn().getAttachment(ATTACHMENT_ID).getDataSource() instanceof FileDataSource) {
FileDataSource fds = (FileDataSource)received.getIn().getAttachment(ATTACHMENT_ID).getDataSource();
Modified: servicemix/components/engines/servicemix-camel/trunk/src/test/java/org/apache/servicemix/camel/JbiCamelErrorHandlingTestSupport.java
URL: http://svn.apache.org/viewvc/servicemix/components/engines/servicemix-camel/trunk/src/test/java/org/apache/servicemix/camel/JbiCamelErrorHandlingTestSupport.java?rev=835983&r1=835982&r2=835983&view=diff
==============================================================================
--- servicemix/components/engines/servicemix-camel/trunk/src/test/java/org/apache/servicemix/camel/JbiCamelErrorHandlingTestSupport.java (original)
+++ servicemix/components/engines/servicemix-camel/trunk/src/test/java/org/apache/servicemix/camel/JbiCamelErrorHandlingTestSupport.java Fri Nov 13 20:52:59 2009
@@ -35,10 +35,10 @@
*/
public abstract class JbiCamelErrorHandlingTestSupport extends JbiTestSupport {
- protected ReceiverComponent receiverComponent = new ReceiverComponent();
-
protected static final String MESSAGE = "<just><a>test</a></just>";
+ protected ReceiverComponent receiverComponent = new ReceiverComponent();
+
@Override
protected void appendJbiActivationSpecs(List<ActivationSpec> activationSpecList) {
ActivationSpec spec;
Modified: servicemix/components/engines/servicemix-camel/trunk/src/test/java/org/apache/servicemix/camel/JbiCamelExceptionsTest.java
URL: http://svn.apache.org/viewvc/servicemix/components/engines/servicemix-camel/trunk/src/test/java/org/apache/servicemix/camel/JbiCamelExceptionsTest.java?rev=835983&r1=835982&r2=835983&view=diff
==============================================================================
--- servicemix/components/engines/servicemix-camel/trunk/src/test/java/org/apache/servicemix/camel/JbiCamelExceptionsTest.java (original)
+++ servicemix/components/engines/servicemix-camel/trunk/src/test/java/org/apache/servicemix/camel/JbiCamelExceptionsTest.java Fri Nov 13 20:52:59 2009
@@ -61,15 +61,13 @@
return new RouteBuilder() {
@Override
public void configure() throws Exception {
-
-
errorHandler(noErrorHandler());
from("jbi:endpoint:urn:test:failsafe:endpoint")
- .doTry()
- .to("jbi:endpoint:urn:test:service:endpoint")
- .doCatch(BusinessException.class)
- .setBody(constant("<response>We handled that pretty well, didn't we?</response>"));
+ .doTry()
+ .to("jbi:endpoint:urn:test:service:endpoint")
+ .doCatch(BusinessException.class)
+ .setBody(constant("<response>We handled that pretty well, didn't we?</response>"));
from("jbi:endpoint:urn:test:service:endpoint").bean(new MyPojo());
}
Modified: servicemix/components/engines/servicemix-camel/trunk/src/test/java/org/apache/servicemix/camel/JbiComponentTest.java
URL: http://svn.apache.org/viewvc/servicemix/components/engines/servicemix-camel/trunk/src/test/java/org/apache/servicemix/camel/JbiComponentTest.java?rev=835983&r1=835982&r2=835983&view=diff
==============================================================================
--- servicemix/components/engines/servicemix-camel/trunk/src/test/java/org/apache/servicemix/camel/JbiComponentTest.java (original)
+++ servicemix/components/engines/servicemix-camel/trunk/src/test/java/org/apache/servicemix/camel/JbiComponentTest.java Fri Nov 13 20:52:59 2009
@@ -23,7 +23,7 @@
*/
public class JbiComponentTest extends TestCase {
- private final static String IN_OUT = "http://www.w3.org/ns/wsdl/in-out";
+ private static final String IN_OUT = "http://www.w3.org/ns/wsdl/in-out";
public void testGetUriWithMep() throws Exception {
JbiComponent component = createJbiComponent();
Modified: servicemix/components/engines/servicemix-camel/trunk/src/test/java/org/apache/servicemix/camel/JbiConvertExceptionsTest.java
URL: http://svn.apache.org/viewvc/servicemix/components/engines/servicemix-camel/trunk/src/test/java/org/apache/servicemix/camel/JbiConvertExceptionsTest.java?rev=835983&r1=835982&r2=835983&view=diff
==============================================================================
--- servicemix/components/engines/servicemix-camel/trunk/src/test/java/org/apache/servicemix/camel/JbiConvertExceptionsTest.java (original)
+++ servicemix/components/engines/servicemix-camel/trunk/src/test/java/org/apache/servicemix/camel/JbiConvertExceptionsTest.java Fri Nov 13 20:52:59 2009
@@ -16,18 +16,14 @@
*/
package org.apache.servicemix.camel;
-import java.io.ByteArrayOutputStream;
import javax.jbi.messaging.ExchangeStatus;
import javax.jbi.messaging.InOut;
import javax.xml.namespace.QName;
import org.apache.camel.Exchange;
-import org.apache.camel.Message;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.converter.jaxp.StringSource;
-import org.apache.servicemix.camel.test.InvalidSerializableObject;
import org.apache.servicemix.client.DefaultServiceMixClient;
import org.apache.servicemix.client.ServiceMixClient;
import org.apache.servicemix.jbi.exception.FaultException;
@@ -61,11 +57,11 @@
errorHandler(noErrorHandler());
from("jbi:endpoint:urn:test:exceptions:endpoint?convertExceptions=true")
- .process(new Processor() {
- public void process(Exchange exchange) throws Exception {
- throw new RuntimeException(EXCEPTION);
- }
- });
+ .process(new Processor() {
+ public void process(Exchange exchange) throws Exception {
+ throw new RuntimeException(EXCEPTION);
+ }
+ });
}
};
}
Modified: servicemix/components/engines/servicemix-camel/trunk/src/test/java/org/apache/servicemix/camel/JbiEndpointWithMepSpecifiedTest.java
URL: http://svn.apache.org/viewvc/servicemix/components/engines/servicemix-camel/trunk/src/test/java/org/apache/servicemix/camel/JbiEndpointWithMepSpecifiedTest.java?rev=835983&r1=835982&r2=835983&view=diff
==============================================================================
--- servicemix/components/engines/servicemix-camel/trunk/src/test/java/org/apache/servicemix/camel/JbiEndpointWithMepSpecifiedTest.java (original)
+++ servicemix/components/engines/servicemix-camel/trunk/src/test/java/org/apache/servicemix/camel/JbiEndpointWithMepSpecifiedTest.java Fri Nov 13 20:52:59 2009
@@ -76,7 +76,7 @@
private int count;
public int getCount() {
- return count;
+ return count;
}
@Override
Modified: servicemix/components/engines/servicemix-camel/trunk/src/test/java/org/apache/servicemix/camel/JbiInOnlyAsyncCamelTest.java
URL: http://svn.apache.org/viewvc/servicemix/components/engines/servicemix-camel/trunk/src/test/java/org/apache/servicemix/camel/JbiInOnlyAsyncCamelTest.java?rev=835983&r1=835982&r2=835983&view=diff
==============================================================================
--- servicemix/components/engines/servicemix-camel/trunk/src/test/java/org/apache/servicemix/camel/JbiInOnlyAsyncCamelTest.java (original)
+++ servicemix/components/engines/servicemix-camel/trunk/src/test/java/org/apache/servicemix/camel/JbiInOnlyAsyncCamelTest.java Fri Nov 13 20:52:59 2009
@@ -68,9 +68,9 @@
errorHandler(deadLetterChannel("mock:dlc").maximumRedeliveries(0).handled(false));
from("jbi:service:urn:test:in-only")
- .threads(1)
- .to("mock:done")
- .to("jbi:service:urn:test:non-existent-service");
+ .threads(1)
+ .to("mock:done")
+ .to("jbi:service:urn:test:non-existent-service");
}
};
}
Modified: servicemix/components/engines/servicemix-camel/trunk/src/test/java/org/apache/servicemix/camel/JbiInOnlyTest.java
URL: http://svn.apache.org/viewvc/servicemix/components/engines/servicemix-camel/trunk/src/test/java/org/apache/servicemix/camel/JbiInOnlyTest.java?rev=835983&r1=835982&r2=835983&view=diff
==============================================================================
--- servicemix/components/engines/servicemix-camel/trunk/src/test/java/org/apache/servicemix/camel/JbiInOnlyTest.java (original)
+++ servicemix/components/engines/servicemix-camel/trunk/src/test/java/org/apache/servicemix/camel/JbiInOnlyTest.java Fri Nov 13 20:52:59 2009
@@ -18,15 +18,15 @@
import java.util.List;
-import javax.jbi.messaging.InOnly;
import javax.jbi.messaging.ExchangeStatus;
+import javax.jbi.messaging.InOnly;
import javax.jbi.messaging.InOut;
import javax.xml.namespace.QName;
+import org.apache.camel.Exchange;
+import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.Processor;
-import org.apache.camel.Exchange;
import org.apache.servicemix.client.DefaultServiceMixClient;
import org.apache.servicemix.client.ServiceMixClient;
import org.apache.servicemix.jbi.container.ActivationSpec;
Modified: servicemix/components/engines/servicemix-camel/trunk/src/test/java/org/apache/servicemix/camel/converter/JbiConverterTest.java
URL: http://svn.apache.org/viewvc/servicemix/components/engines/servicemix-camel/trunk/src/test/java/org/apache/servicemix/camel/converter/JbiConverterTest.java?rev=835983&r1=835982&r2=835983&view=diff
==============================================================================
--- servicemix/components/engines/servicemix-camel/trunk/src/test/java/org/apache/servicemix/camel/converter/JbiConverterTest.java (original)
+++ servicemix/components/engines/servicemix-camel/trunk/src/test/java/org/apache/servicemix/camel/converter/JbiConverterTest.java Fri Nov 13 20:52:59 2009
@@ -27,7 +27,6 @@
import org.apache.camel.impl.DefaultCamelContext;
import org.apache.camel.impl.DefaultExchange;
import org.apache.servicemix.camel.JbiBinding;
-import org.apache.servicemix.camel.converter.JbiConverter;
import org.apache.servicemix.jbi.exception.FaultException;
import org.apache.servicemix.jbi.jaxp.StringSource;
import org.apache.servicemix.tck.mock.MockMessageExchange;
@@ -82,7 +81,7 @@
private void assertEqualStackTraces(StackTraceElement[] trace1, StackTraceElement[] trace2) {
assertEquals(trace1.length, trace2.length);
- for (int i = 0 ; i < trace1.length ; i++) {
+ for (int i = 0; i < trace1.length; i++) {
assertEquals(trace1[i], trace2[i]);
}
}