You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by bv...@apache.org on 2012/05/10 11:31:52 UTC
svn commit: r1336558 - in /camel/trunk:
components/camel-crypto/src/test/java/org/apache/camel/converter/crypto/
components/camel-flatpack/src/main/java/org/apache/camel/component/flatpack/
components/camel-ftp/src/main/java/org/apache/camel/component/...
Author: bvahdat
Date: Thu May 10 09:31:51 2012
New Revision: 1336558
URL: http://svn.apache.org/viewvc?rev=1336558&view=rev
Log:
CAMEL-5172: Remove those 4 ExchangeHelper's utility method usages which we did already deprecate through this ticket (see comments inside the ticket for the details). Also some tiny cleanup of the generics stuff.
Modified:
camel/trunk/components/camel-crypto/src/test/java/org/apache/camel/converter/crypto/AbstractPGPDataFormatTest.java
camel/trunk/components/camel-crypto/src/test/java/org/apache/camel/converter/crypto/CryptoDataFormatTest.java
camel/trunk/components/camel-flatpack/src/main/java/org/apache/camel/component/flatpack/DelimitedEndpoint.java
camel/trunk/components/camel-flatpack/src/main/java/org/apache/camel/component/flatpack/FixedLengthEndpoint.java
camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpOperations.java
camel/trunk/components/camel-jing/src/main/java/org/apache/camel/component/validator/jing/JingValidator.java
camel/trunk/components/camel-jsch/src/main/java/org/apache/camel/component/jsch/ScpOperations.java
camel/trunk/components/camel-juel/src/test/java/org/apache/camel/processor/juel/SimulatorTest.java
camel/trunk/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/examples/AuthenticationExample.java
camel/trunk/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/examples/trading/TradeExecutorComponent.java
camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/junit4/TestSupport.java
camel/trunk/components/camel-testng/src/main/java/org/apache/camel/testng/TestSupport.java
camel/trunk/components/camel-xmlsecurity/src/main/java/org/apache/camel/dataformat/xmlsecurity/XMLSecurityDataFormat.java
camel/trunk/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/policy/ZooKeeperRoutePolicy.java
camel/trunk/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ConsumeChildrenTest.java
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/zookeeper/ZookeeperOSGiTest.java
Modified: camel/trunk/components/camel-crypto/src/test/java/org/apache/camel/converter/crypto/AbstractPGPDataFormatTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-crypto/src/test/java/org/apache/camel/converter/crypto/AbstractPGPDataFormatTest.java?rev=1336558&r1=1336557&r2=1336558&view=diff
==============================================================================
--- camel/trunk/components/camel-crypto/src/test/java/org/apache/camel/converter/crypto/AbstractPGPDataFormatTest.java (original)
+++ camel/trunk/components/camel-crypto/src/test/java/org/apache/camel/converter/crypto/AbstractPGPDataFormatTest.java Thu May 10 09:31:51 2012
@@ -24,7 +24,6 @@ import org.apache.camel.Exchange;
import org.apache.camel.InvalidPayloadException;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.junit4.CamelTestSupport;
-import org.apache.camel.util.ExchangeHelper;
public abstract class AbstractPGPDataFormatTest extends CamelTestSupport {
@@ -44,10 +43,10 @@ public abstract class AbstractPGPDataFor
awaitAndAssert(unencrypted);
awaitAndAssert(encrypted);
for (Exchange e : unencrypted.getReceivedExchanges()) {
- assertEquals(payload, ExchangeHelper.getMandatoryInBody(e, String.class));
+ assertEquals(payload, e.getIn().getMandatoryBody(String.class));
}
for (Exchange e : encrypted.getReceivedExchanges()) {
- byte[] ciphertext = ExchangeHelper.getMandatoryInBody(e, byte[].class);
+ byte[] ciphertext = e.getIn().getMandatoryBody(byte[].class);
assertNotSame(payload, new String(ciphertext));
}
}
Modified: camel/trunk/components/camel-crypto/src/test/java/org/apache/camel/converter/crypto/CryptoDataFormatTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-crypto/src/test/java/org/apache/camel/converter/crypto/CryptoDataFormatTest.java?rev=1336558&r1=1336557&r2=1336558&view=diff
==============================================================================
--- camel/trunk/components/camel-crypto/src/test/java/org/apache/camel/converter/crypto/CryptoDataFormatTest.java (original)
+++ camel/trunk/components/camel-crypto/src/test/java/org/apache/camel/converter/crypto/CryptoDataFormatTest.java Thu May 10 09:31:51 2012
@@ -30,7 +30,7 @@ import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.junit4.CamelTestSupport;
-import org.apache.camel.util.ExchangeHelper;
+
import org.junit.Test;
public class CryptoDataFormatTest extends CamelTestSupport {
@@ -108,10 +108,10 @@ public class CryptoDataFormatTest extend
awaitAndAssert(unencrypted);
awaitAndAssert(encrypted);
for (Exchange e : unencrypted.getReceivedExchanges()) {
- assertEquals(payload, ExchangeHelper.getMandatoryInBody(e, String.class));
+ assertEquals(payload, e.getIn().getMandatoryBody(String.class));
}
for (Exchange e : encrypted.getReceivedExchanges()) {
- byte[] ciphertext = ExchangeHelper.getMandatoryInBody(e, byte[].class);
+ byte[] ciphertext = e.getIn().getMandatoryBody(byte[].class);
assertNotSame(payload, new String(ciphertext));
}
}
Modified: camel/trunk/components/camel-flatpack/src/main/java/org/apache/camel/component/flatpack/DelimitedEndpoint.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-flatpack/src/main/java/org/apache/camel/component/flatpack/DelimitedEndpoint.java?rev=1336558&r1=1336557&r2=1336558&view=diff
==============================================================================
--- camel/trunk/components/camel-flatpack/src/main/java/org/apache/camel/component/flatpack/DelimitedEndpoint.java (original)
+++ camel/trunk/components/camel-flatpack/src/main/java/org/apache/camel/component/flatpack/DelimitedEndpoint.java Thu May 10 09:31:51 2012
@@ -25,7 +25,6 @@ import net.sf.flatpack.Parser;
import org.apache.camel.Component;
import org.apache.camel.Exchange;
import org.apache.camel.InvalidPayloadException;
-import org.apache.camel.util.ExchangeHelper;
import org.apache.camel.util.IOHelper;
import org.apache.camel.util.ObjectHelper;
import org.apache.camel.util.ResourceHelper;
@@ -46,7 +45,7 @@ public class DelimitedEndpoint extends F
}
public Parser createParser(Exchange exchange) throws InvalidPayloadException, IOException {
- Reader bodyReader = ExchangeHelper.getMandatoryInBody(exchange, Reader.class);
+ Reader bodyReader = exchange.getIn().getMandatoryBody(Reader.class);
if (ObjectHelper.isEmpty(getDefinition())) {
return getParserFactory().newDelimitedParser(bodyReader, delimiter, textQualifier);
} else {
Modified: camel/trunk/components/camel-flatpack/src/main/java/org/apache/camel/component/flatpack/FixedLengthEndpoint.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-flatpack/src/main/java/org/apache/camel/component/flatpack/FixedLengthEndpoint.java?rev=1336558&r1=1336557&r2=1336558&view=diff
==============================================================================
--- camel/trunk/components/camel-flatpack/src/main/java/org/apache/camel/component/flatpack/FixedLengthEndpoint.java (original)
+++ camel/trunk/components/camel-flatpack/src/main/java/org/apache/camel/component/flatpack/FixedLengthEndpoint.java Thu May 10 09:31:51 2012
@@ -25,6 +25,7 @@ import net.sf.flatpack.DataSet;
import net.sf.flatpack.DefaultParserFactory;
import net.sf.flatpack.Parser;
import net.sf.flatpack.ParserFactory;
+
import org.apache.camel.Component;
import org.apache.camel.Consumer;
import org.apache.camel.Exchange;
@@ -36,7 +37,6 @@ import org.apache.camel.impl.DefaultPoll
import org.apache.camel.processor.loadbalancer.LoadBalancer;
import org.apache.camel.processor.loadbalancer.LoadBalancerConsumer;
import org.apache.camel.processor.loadbalancer.RoundRobinLoadBalancer;
-import org.apache.camel.util.ExchangeHelper;
import org.apache.camel.util.ResourceHelper;
/**
@@ -80,7 +80,7 @@ public class FixedLengthEndpoint extends
}
public Parser createParser(Exchange exchange) throws InvalidPayloadException, IOException {
- Reader bodyReader = ExchangeHelper.getMandatoryInBody(exchange, Reader.class);
+ Reader bodyReader = exchange.getIn().getMandatoryBody(Reader.class);
return createParser(getDefinition(), bodyReader);
}
Modified: camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpOperations.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpOperations.java?rev=1336558&r1=1336557&r2=1336558&view=diff
==============================================================================
--- camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpOperations.java (original)
+++ camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpOperations.java Thu May 10 09:31:51 2012
@@ -41,10 +41,10 @@ import org.apache.camel.component.file.G
import org.apache.camel.component.file.GenericFileEndpoint;
import org.apache.camel.component.file.GenericFileExist;
import org.apache.camel.component.file.GenericFileOperationFailedException;
-import org.apache.camel.util.ExchangeHelper;
import org.apache.camel.util.FileUtil;
import org.apache.camel.util.IOHelper;
import org.apache.camel.util.ObjectHelper;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -673,7 +673,7 @@ public class SftpOperations implements R
InputStream is = null;
try {
- is = ExchangeHelper.getMandatoryInBody(exchange, InputStream.class);
+ is = exchange.getIn().getMandatoryBody(InputStream.class);
if (endpoint.getFileExist() == GenericFileExist.Append) {
channel.put(is, targetName, ChannelSftp.APPEND);
} else {
Modified: camel/trunk/components/camel-jing/src/main/java/org/apache/camel/component/validator/jing/JingValidator.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jing/src/main/java/org/apache/camel/component/validator/jing/JingValidator.java?rev=1336558&r1=1336557&r2=1336558&view=diff
==============================================================================
--- camel/trunk/components/camel-jing/src/main/java/org/apache/camel/component/validator/jing/JingValidator.java (original)
+++ camel/trunk/components/camel-jing/src/main/java/org/apache/camel/component/validator/jing/JingValidator.java Thu May 10 09:31:51 2012
@@ -78,7 +78,7 @@ public class JingValidator implements Pr
Message in = exchange.getIn();
SAXSource saxSource = in.getBody(SAXSource.class);
if (saxSource == null) {
- Source source = ExchangeHelper.getMandatoryInBody(exchange, Source.class);
+ Source source = exchange.getIn().getMandatoryBody(Source.class);
saxSource = ExchangeHelper.convertToMandatoryType(exchange, SAXSource.class, source);
}
InputSource bodyInput = saxSource.getInputSource();
Modified: camel/trunk/components/camel-jsch/src/main/java/org/apache/camel/component/jsch/ScpOperations.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jsch/src/main/java/org/apache/camel/component/jsch/ScpOperations.java?rev=1336558&r1=1336557&r2=1336558&view=diff
==============================================================================
--- camel/trunk/components/camel-jsch/src/main/java/org/apache/camel/component/jsch/ScpOperations.java (original)
+++ camel/trunk/components/camel-jsch/src/main/java/org/apache/camel/component/jsch/ScpOperations.java Thu May 10 09:31:51 2012
@@ -37,9 +37,9 @@ import org.apache.camel.component.file.G
import org.apache.camel.component.file.GenericFileOperationFailedException;
import org.apache.camel.component.file.remote.RemoteFileConfiguration;
import org.apache.camel.component.file.remote.RemoteFileOperations;
-import org.apache.camel.util.ExchangeHelper;
import org.apache.camel.util.IOHelper;
import org.apache.camel.util.ObjectHelper;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -105,7 +105,7 @@ public class ScpOperations implements Re
LOG.trace("Channel connected to {}", cfg.remoteServerInformation());
try {
- write(channel, file, ExchangeHelper.getMandatoryInBody(exchange, InputStream.class), cfg);
+ write(channel, file, exchange.getIn().getMandatoryBody(InputStream.class), cfg);
} catch (InvalidPayloadException e) {
throw new GenericFileOperationFailedException("Failed extract message body as InputStream", e);
} catch (IOException e) {
Modified: camel/trunk/components/camel-juel/src/test/java/org/apache/camel/processor/juel/SimulatorTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-juel/src/test/java/org/apache/camel/processor/juel/SimulatorTest.java?rev=1336558&r1=1336557&r2=1336558&view=diff
==============================================================================
--- camel/trunk/components/camel-juel/src/test/java/org/apache/camel/processor/juel/SimulatorTest.java (original)
+++ camel/trunk/components/camel-juel/src/test/java/org/apache/camel/processor/juel/SimulatorTest.java Thu May 10 09:31:51 2012
@@ -24,8 +24,8 @@ import org.apache.camel.Message;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.test.junit4.CamelTestSupport;
-import org.apache.camel.util.ExchangeHelper;
import org.apache.camel.util.jndi.JndiContext;
+
import org.junit.Test;
import static org.apache.camel.language.juel.JuelExpression.el;
@@ -63,7 +63,7 @@ public class SimulatorTest extends Camel
assertNotNull("Should receive a response!", response);
- String text = ExchangeHelper.getMandatoryOutBody(response, String.class);
+ String text = response.getOut().getMandatoryBody(String.class);
assertStringContains(text, containedText);
}
Modified: camel/trunk/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/examples/AuthenticationExample.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/examples/AuthenticationExample.java?rev=1336558&r1=1336557&r2=1336558&view=diff
==============================================================================
--- camel/trunk/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/examples/AuthenticationExample.java (original)
+++ camel/trunk/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/examples/AuthenticationExample.java Thu May 10 09:31:51 2012
@@ -28,7 +28,7 @@ import org.apache.camel.component.quickf
import org.apache.camel.component.quickfixj.QuickfixjEventCategory;
import org.apache.camel.component.quickfixj.examples.util.CountDownLatchDecrementer;
import org.apache.camel.impl.DefaultCamelContext;
-import org.apache.camel.util.ExchangeHelper;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -99,7 +99,7 @@ public class AuthenticationExample {
public static class LogonAuthenticator {
public void authenticate(Exchange exchange) throws RejectLogon, InvalidPayloadException, FieldNotFound {
LOG.info("Acceptor is rejecting logon for " + exchange.getIn().getHeader(QuickfixjEndpoint.SESSION_ID_KEY));
- Message message = ExchangeHelper.getMandatoryInBody(exchange, Message.class);
+ Message message = exchange.getIn().getMandatoryBody(Message.class);
if (message.isSetField(RawData.FIELD)) {
LOG.info("Invalid password: " + message.getString(RawData.FIELD));
}
@@ -116,7 +116,7 @@ public class AuthenticationExample {
public void inject(Exchange exchange) throws InvalidPayloadException {
LOG.info("Injecting password into outgoing logon message");
- Message message = ExchangeHelper.getMandatoryInBody(exchange, Message.class);
+ Message message = exchange.getIn().getMandatoryBody(Message.class);
message.setString(RawData.FIELD, password);
message.setInt(RawDataLength.FIELD, password.length());
}
Modified: camel/trunk/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/examples/trading/TradeExecutorComponent.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/examples/trading/TradeExecutorComponent.java?rev=1336558&r1=1336557&r2=1336558&view=diff
==============================================================================
--- camel/trunk/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/examples/trading/TradeExecutorComponent.java (original)
+++ camel/trunk/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/examples/trading/TradeExecutorComponent.java Thu May 10 09:31:51 2012
@@ -35,7 +35,7 @@ import org.apache.camel.impl.DefaultComp
import org.apache.camel.impl.DefaultConsumer;
import org.apache.camel.impl.DefaultEndpoint;
import org.apache.camel.impl.DefaultProducer;
-import org.apache.camel.util.ExchangeHelper;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -130,7 +130,7 @@ public class TradeExecutorComponent exte
executor.execute(new Runnable() {
public void run() {
try {
- tradeExecutor.execute(ExchangeHelper.getMandatoryInBody(exchange, Message.class));
+ tradeExecutor.execute(exchange.getIn().getMandatoryBody(Message.class));
} catch (Exception e) {
log.error("Error during trade execution", e);
}
Modified: camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/junit4/TestSupport.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/junit4/TestSupport.java?rev=1336558&r1=1336557&r2=1336558&view=diff
==============================================================================
--- camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/junit4/TestSupport.java (original)
+++ camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/junit4/TestSupport.java Thu May 10 09:31:51 2012
@@ -37,11 +37,12 @@ import org.apache.camel.builder.ValueBui
import org.apache.camel.impl.DefaultCamelContext;
import org.apache.camel.impl.DefaultExchange;
import org.apache.camel.processor.DelegateProcessor;
-import org.apache.camel.util.ExchangeHelper;
import org.apache.camel.util.PredicateAssertHelper;
+
import org.junit.Assert;
import org.junit.Rule;
import org.junit.rules.TestName;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -180,10 +181,10 @@ public abstract class TestSupport extend
Object actual;
if (expected == null) {
- actual = ExchangeHelper.getMandatoryInBody(exchange);
+ actual = exchange.getIn().getMandatoryBody();
assertEquals("in body of: " + exchange, expected, actual);
} else {
- actual = ExchangeHelper.getMandatoryInBody(exchange, expected.getClass());
+ actual = exchange.getIn().getMandatoryBody(expected.getClass());
}
assertEquals("in body of: " + exchange, expected, actual);
@@ -202,10 +203,10 @@ public abstract class TestSupport extend
Object actual;
if (expected == null) {
- actual = ExchangeHelper.getMandatoryOutBody(exchange);
+ actual = exchange.getOut().getMandatoryBody();
assertEquals("output body of: " + exchange, expected, actual);
} else {
- actual = ExchangeHelper.getMandatoryOutBody(exchange, expected.getClass());
+ actual = exchange.getOut().getMandatoryBody(expected.getClass());
}
assertEquals("output body of: " + exchange, expected, actual);
Modified: camel/trunk/components/camel-testng/src/main/java/org/apache/camel/testng/TestSupport.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-testng/src/main/java/org/apache/camel/testng/TestSupport.java?rev=1336558&r1=1336557&r2=1336558&view=diff
==============================================================================
--- camel/trunk/components/camel-testng/src/main/java/org/apache/camel/testng/TestSupport.java (original)
+++ camel/trunk/components/camel-testng/src/main/java/org/apache/camel/testng/TestSupport.java Thu May 10 09:31:51 2012
@@ -37,10 +37,11 @@ import org.apache.camel.builder.ValueBui
import org.apache.camel.impl.DefaultCamelContext;
import org.apache.camel.impl.DefaultExchange;
import org.apache.camel.processor.DelegateProcessor;
-import org.apache.camel.util.ExchangeHelper;
import org.apache.camel.util.PredicateAssertHelper;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+
import org.testng.Assert;
/**
@@ -170,10 +171,10 @@ public abstract class TestSupport extend
Object actual;
if (expected == null) {
- actual = ExchangeHelper.getMandatoryInBody(exchange);
+ actual = exchange.getIn().getMandatoryBody();
assertEquals(actual, expected, "in body of: " + exchange);
} else {
- actual = ExchangeHelper.getMandatoryInBody(exchange, expected.getClass());
+ actual = exchange.getIn().getMandatoryBody(expected.getClass());
}
assertEquals(actual, expected, "in body of: " + exchange);
@@ -192,10 +193,10 @@ public abstract class TestSupport extend
Object actual;
if (expected == null) {
- actual = ExchangeHelper.getMandatoryOutBody(exchange);
+ actual = exchange.getOut().getMandatoryBody();
assertEquals(actual, expected, "output body of: " + exchange);
} else {
- actual = ExchangeHelper.getMandatoryOutBody(exchange, expected.getClass());
+ actual = exchange.getOut().getMandatoryBody(expected.getClass());
}
assertEquals(actual, expected, "output body of: " + exchange);
Modified: camel/trunk/components/camel-xmlsecurity/src/main/java/org/apache/camel/dataformat/xmlsecurity/XMLSecurityDataFormat.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-xmlsecurity/src/main/java/org/apache/camel/dataformat/xmlsecurity/XMLSecurityDataFormat.java?rev=1336558&r1=1336557&r2=1336558&view=diff
==============================================================================
--- camel/trunk/components/camel-xmlsecurity/src/main/java/org/apache/camel/dataformat/xmlsecurity/XMLSecurityDataFormat.java (original)
+++ camel/trunk/components/camel-xmlsecurity/src/main/java/org/apache/camel/dataformat/xmlsecurity/XMLSecurityDataFormat.java Thu May 10 09:31:51 2012
@@ -48,7 +48,6 @@ import org.apache.camel.Exchange;
import org.apache.camel.builder.xml.DefaultNamespaceContext;
import org.apache.camel.builder.xml.XPathBuilder;
import org.apache.camel.spi.DataFormat;
-import org.apache.camel.util.ExchangeHelper;
import org.apache.camel.util.IOHelper;
import org.apache.camel.util.jsse.KeyStoreParameters;
@@ -439,7 +438,7 @@ public class XMLSecurityDataFormat imple
public Object unmarshal(Exchange exchange, Document document) throws Exception {
- InputStream is = ExchangeHelper.getMandatoryInBody(exchange, InputStream.class);
+ InputStream is = exchange.getIn().getMandatoryBody(InputStream.class);
return unmarshal(exchange, is);
}
Modified: camel/trunk/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/policy/ZooKeeperRoutePolicy.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/policy/ZooKeeperRoutePolicy.java?rev=1336558&r1=1336557&r2=1336558&view=diff
==============================================================================
--- camel/trunk/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/policy/ZooKeeperRoutePolicy.java (original)
+++ camel/trunk/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/policy/ZooKeeperRoutePolicy.java Thu May 10 09:31:51 2012
@@ -41,7 +41,7 @@ import org.apache.camel.component.zookee
import org.apache.camel.impl.JavaUuidGenerator;
import org.apache.camel.impl.RoutePolicySupport;
import org.apache.camel.spi.UuidGenerator;
-import org.apache.camel.util.ExchangeHelper;
+
import org.apache.zookeeper.CreateMode;
/**
@@ -274,9 +274,9 @@ public class ZooKeeperRoutePolicy extend
*/
from(zep).sort(body(), comparator).process(new Processor() {
- @SuppressWarnings("unchecked")
public void process(Exchange e) throws Exception {
- List<String> candidates = (List<String>)ExchangeHelper.getMandatoryInBody(e);
+ @SuppressWarnings("unchecked")
+ List<String> candidates = e.getIn().getMandatoryBody(List.class);
int location = Math.abs(Collections.binarySearch(candidates, candidateName));
/**
Modified: camel/trunk/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ConsumeChildrenTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ConsumeChildrenTest.java?rev=1336558&r1=1336557&r2=1336558&view=diff
==============================================================================
--- camel/trunk/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ConsumeChildrenTest.java (original)
+++ camel/trunk/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ConsumeChildrenTest.java Thu May 10 09:31:51 2012
@@ -27,11 +27,12 @@ import org.apache.camel.builder.RouteBui
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.component.zookeeper.NaturalSortComparator.Order;
import org.apache.camel.util.ExchangeHelper;
+
import org.apache.zookeeper.Watcher;
import org.apache.zookeeper.data.Stat;
+
import org.junit.Test;
-@SuppressWarnings("unchecked")
public class ConsumeChildrenTest extends ZooKeeperTestSupport {
@Override
@@ -60,10 +61,9 @@ public class ConsumeChildrenTest extends
validateExchangesContainListings(mock, createChildListing(), createChildListing("hansel"), createChildListing("hansel", "gretel"), createChildListing("gretel"),
createChildListing());
-
}
- private void validateExchangesContainListings(MockEndpoint mock, List<String>... expected) throws InvalidPayloadException, NoSuchHeaderException {
+ private void validateExchangesContainListings(MockEndpoint mock, List<?>... expected) throws InvalidPayloadException, NoSuchHeaderException {
int index = 0;
for (Exchange received : mock.getReceivedExchanges()) {
Watcher.Event.EventType expectedEvent;
@@ -72,7 +72,7 @@ public class ConsumeChildrenTest extends
} else {
expectedEvent = Watcher.Event.EventType.NodeChildrenChanged;
}
- List<String> actual = ExchangeHelper.getMandatoryInBody(received, List.class);
+ List<?> actual = received.getIn().getMandatoryBody(List.class);
assertEquals(expected[index++], actual);
assertEquals(expectedEvent, ExchangeHelper.getMandatoryHeader(received, ZooKeeperMessage.ZOOKEEPER_EVENT_TYPE, Watcher.Event.EventType.class));
validateChildrenCountChangesEachTime(mock);
Modified: camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/zookeeper/ZookeeperOSGiTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/zookeeper/ZookeeperOSGiTest.java?rev=1336558&r1=1336557&r2=1336558&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/zookeeper/ZookeeperOSGiTest.java (original)
+++ camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/zookeeper/ZookeeperOSGiTest.java Thu May 10 09:31:51 2012
@@ -26,17 +26,18 @@ import org.apache.camel.builder.RouteBui
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.component.zookeeper.ZooKeeperMessage;
import org.apache.camel.component.zookeeper.operations.GetChildrenOperation;
-import org.apache.camel.util.ExchangeHelper;
+
import org.apache.zookeeper.CreateMode;
import org.apache.zookeeper.data.Stat;
import org.junit.Test;
import org.junit.runner.RunWith;
+
import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+
import static org.apache.camel.component.zookeeper.ZooKeeperMessage.ZOOKEEPER_CREATE_MODE;
import static org.apache.camel.component.zookeeper.ZooKeeperMessage.ZOOKEEPER_NODE;
-
@RunWith(JUnit4TestRunner.class)
public class ZookeeperOSGiTest extends ZookeeperOSGiTestSupport {
@@ -67,8 +68,7 @@ public class ZookeeperOSGiTest extends Z
}
}};
}
-
-
+
@Test
public void testRoundtripOfDataToAndFromZnode() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:consumed-from-node");
@@ -109,7 +109,7 @@ public class ZookeeperOSGiTest extends Z
mock.await(5, TimeUnit.SECONDS);
mock.assertIsSatisfied();
}
-
+
@Test
public void setUsingCreateModeFromHeader() throws Exception {
if (client == null) {
@@ -127,7 +127,7 @@ public class ZookeeperOSGiTest extends Z
getConnection(), "/modes-test");
assertEquals(CreateMode.values().length, listing.get().getResult().size());
}
-
+
@Test
public void createWithOtherCreateMode() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:create-mode");
@@ -144,7 +144,6 @@ public class ZookeeperOSGiTest extends Z
}
@Test
- @SuppressWarnings("unchecked")
public void setAndGetListing() throws Exception {
if (client == null) {
client = new TestZookeeperClient(getServerPort(), getTestClientSessionTimeout());
@@ -155,7 +154,7 @@ public class ZookeeperOSGiTest extends Z
exchange.getIn().setHeader(ZOOKEEPER_NODE, "/set-listing/firstborn");
exchange.setPattern(ExchangePattern.InOut);
template.send("zookeeper://localhost:39913/set-listing?create=true&listChildren=true", exchange);
- List<String> children = ExchangeHelper.getMandatoryOutBody(exchange, List.class);
+ List<?> children = exchange.getOut().getMandatoryBody(List.class);
assertEquals(1, children.size());
assertEquals("firstborn", children.get(0));
}