You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ha...@apache.org on 2012/06/13 16:42:33 UTC
svn commit: r1349883 - in /camel/trunk/components/camel-mqtt/src:
main/java/org/apache/camel/component/mqtt/
test/java/org/apache/camel/component/mqtt/
Author: hadrian
Date: Wed Jun 13 14:42:32 2012
New Revision: 1349883
URL: http://svn.apache.org/viewvc?rev=1349883&view=rev
Log:
CS fixes
Modified:
camel/trunk/components/camel-mqtt/src/main/java/org/apache/camel/component/mqtt/MQTTComponent.java
camel/trunk/components/camel-mqtt/src/main/java/org/apache/camel/component/mqtt/MQTTConfiguration.java
camel/trunk/components/camel-mqtt/src/main/java/org/apache/camel/component/mqtt/MQTTProducer.java
camel/trunk/components/camel-mqtt/src/test/java/org/apache/camel/component/mqtt/MQTTBaseTest.java
camel/trunk/components/camel-mqtt/src/test/java/org/apache/camel/component/mqtt/MQTTConsumerTest.java
camel/trunk/components/camel-mqtt/src/test/java/org/apache/camel/component/mqtt/MQTTProducerTest.java
Modified: camel/trunk/components/camel-mqtt/src/main/java/org/apache/camel/component/mqtt/MQTTComponent.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mqtt/src/main/java/org/apache/camel/component/mqtt/MQTTComponent.java?rev=1349883&r1=1349882&r2=1349883&view=diff
==============================================================================
--- camel/trunk/components/camel-mqtt/src/main/java/org/apache/camel/component/mqtt/MQTTComponent.java (original)
+++ camel/trunk/components/camel-mqtt/src/main/java/org/apache/camel/component/mqtt/MQTTComponent.java Wed Jun 13 14:42:32 2012
@@ -26,9 +26,7 @@ import org.apache.camel.impl.DefaultComp
*/
public class MQTTComponent extends DefaultComponent {
- protected Endpoint createEndpoint(String uri, String remaining, Map<String, Object> parameters)
- throws Exception {
-
+ protected Endpoint createEndpoint(String uri, String remaining, Map<String, Object> parameters) throws Exception {
MQTTConfiguration configuration = new MQTTConfiguration();
// and then override from parameters
Modified: camel/trunk/components/camel-mqtt/src/main/java/org/apache/camel/component/mqtt/MQTTConfiguration.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mqtt/src/main/java/org/apache/camel/component/mqtt/MQTTConfiguration.java?rev=1349883&r1=1349882&r2=1349883&view=diff
==============================================================================
--- camel/trunk/components/camel-mqtt/src/main/java/org/apache/camel/component/mqtt/MQTTConfiguration.java (original)
+++ camel/trunk/components/camel-mqtt/src/main/java/org/apache/camel/component/mqtt/MQTTConfiguration.java Wed Jun 13 14:42:32 2012
@@ -37,7 +37,7 @@ public class MQTTConfiguration extends M
private int connectWaitInSeconds = 10;
private int disconnectWaitInSeconds = 5;
private int sendWaitInSeconds = 5;
- private boolean byDefaultRetain = false;
+ private boolean byDefaultRetain;
private QoS qos = QoS.AT_LEAST_ONCE;
Modified: camel/trunk/components/camel-mqtt/src/main/java/org/apache/camel/component/mqtt/MQTTProducer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mqtt/src/main/java/org/apache/camel/component/mqtt/MQTTProducer.java?rev=1349883&r1=1349882&r2=1349883&view=diff
==============================================================================
--- camel/trunk/components/camel-mqtt/src/main/java/org/apache/camel/component/mqtt/MQTTProducer.java (original)
+++ camel/trunk/components/camel-mqtt/src/main/java/org/apache/camel/component/mqtt/MQTTProducer.java Wed Jun 13 14:42:32 2012
@@ -39,13 +39,13 @@ public class MQTTProducer extends Defaul
try {
doProcess(exchange);
} catch (Exception e) {
- exchange.setException(e);
+ exchange.setException(e);
}
asyncCallback.done(true);
return true;
}
- void doProcess(Exchange exchange) throws Exception {
+ void doProcess(Exchange exchange) throws Exception {
byte[] body = exchange.getIn().getBody(byte[].class);
if (body != null) {
@@ -69,6 +69,5 @@ public class MQTTProducer extends Defaul
mqttEndpoint.publish(topicName, body, qoS, retain);
}
-
}
}
Modified: camel/trunk/components/camel-mqtt/src/test/java/org/apache/camel/component/mqtt/MQTTBaseTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mqtt/src/test/java/org/apache/camel/component/mqtt/MQTTBaseTest.java?rev=1349883&r1=1349882&r2=1349883&view=diff
==============================================================================
--- camel/trunk/components/camel-mqtt/src/test/java/org/apache/camel/component/mqtt/MQTTBaseTest.java (original)
+++ camel/trunk/components/camel-mqtt/src/test/java/org/apache/camel/component/mqtt/MQTTBaseTest.java Wed Jun 13 14:42:32 2012
@@ -26,7 +26,7 @@ import org.slf4j.LoggerFactory;
*/
public abstract class MQTTBaseTest extends CamelTestSupport {
protected static final transient Logger LOG = LoggerFactory.getLogger(MQTTBaseTest.class);
- protected static String TEST_TOPIC = "ComponentTestTopic";
+ protected static final String TEST_TOPIC = "ComponentTestTopic";
protected BrokerService brokerService;
protected int numberOfMessages = 100;
Modified: camel/trunk/components/camel-mqtt/src/test/java/org/apache/camel/component/mqtt/MQTTConsumerTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mqtt/src/test/java/org/apache/camel/component/mqtt/MQTTConsumerTest.java?rev=1349883&r1=1349882&r2=1349883&view=diff
==============================================================================
--- camel/trunk/components/camel-mqtt/src/test/java/org/apache/camel/component/mqtt/MQTTConsumerTest.java (original)
+++ camel/trunk/components/camel-mqtt/src/test/java/org/apache/camel/component/mqtt/MQTTConsumerTest.java Wed Jun 13 14:42:32 2012
@@ -29,7 +29,7 @@ import org.junit.Test;
public class MQTTConsumerTest extends MQTTBaseTest {
- @Test
+ @Test
public void testConsume() throws Exception {
MQTT mqtt = new MQTT();
Modified: camel/trunk/components/camel-mqtt/src/test/java/org/apache/camel/component/mqtt/MQTTProducerTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mqtt/src/test/java/org/apache/camel/component/mqtt/MQTTProducerTest.java?rev=1349883&r1=1349882&r2=1349883&view=diff
==============================================================================
--- camel/trunk/components/camel-mqtt/src/test/java/org/apache/camel/component/mqtt/MQTTProducerTest.java (original)
+++ camel/trunk/components/camel-mqtt/src/test/java/org/apache/camel/component/mqtt/MQTTProducerTest.java Wed Jun 13 14:42:32 2012
@@ -60,13 +60,13 @@ public class MQTTProducerTest extends MQ
thread.start();
Producer producer = context.getEndpoint("direct:foo").createProducer();
- for (int i = 0; i < numberOfMessages; i++){
+ for (int i = 0; i < numberOfMessages; i++) {
Exchange exchange = producer.createExchange();
exchange.getIn().setBody("test message " + i);
producer.process(exchange);
}
latch.await(20, TimeUnit.SECONDS);
- assertTrue("Messages not consumed = " + latch.getCount(),latch.getCount()==0);
+ assertTrue("Messages not consumed = " + latch.getCount(), latch.getCount() == 0);
}
@@ -74,7 +74,7 @@ public class MQTTProducerTest extends MQ
return new RouteBuilder() {
public void configure() {
- from("direct:foo").to("mqtt:boo?publishTopicName=" + TEST_TOPIC);
+ from("direct:foo").to("mqtt:boo?publishTopicName=" + TEST_TOPIC);
}
};
}