Repository: camel Updated Branches: refs/heads/master 5aa0052f8 -> 811a980da
CAMEL-7999: Fixed the CS errors of camel-mqtt Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/811a980d Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/811a980d Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/811a980d Branch: refs/heads/master Commit: 811a980dab08c59f76f49935c0bb934a3529c6c5 Parents: 5aa0052 Author: Willem Jiang <[email protected]> Authored: Tue Jan 6 17:27:27 2015 +0800 Committer: Willem Jiang <[email protected]> Committed: Tue Jan 6 17:27:43 2015 +0800 ---------------------------------------------------------------------- .../camel/component/mqtt/MQTTComponent.java | 7 +-- .../camel/component/mqtt/MQTTConfiguration.java | 66 ++++++++++---------- 2 files changed, 36 insertions(+), 37 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/811a980d/components/camel-mqtt/src/main/java/org/apache/camel/component/mqtt/MQTTComponent.java ---------------------------------------------------------------------- diff --git a/components/camel-mqtt/src/main/java/org/apache/camel/component/mqtt/MQTTComponent.java b/components/camel-mqtt/src/main/java/org/apache/camel/component/mqtt/MQTTComponent.java index e798662..7b03a83 100644 --- a/components/camel-mqtt/src/main/java/org/apache/camel/component/mqtt/MQTTComponent.java +++ b/components/camel-mqtt/src/main/java/org/apache/camel/component/mqtt/MQTTComponent.java @@ -25,15 +25,14 @@ import org.apache.camel.impl.UriEndpointComponent; * MQTT Component */ public class MQTTComponent extends UriEndpointComponent { + private String host; + private String userName; + private String password; public MQTTComponent() { super(MQTTEndpoint.class); } - private String host; - private String userName; - private String password; - protected Endpoint createEndpoint(String uri, String remaining, Map<String, Object> parameters) throws Exception { MQTTConfiguration configuration = new MQTTConfiguration(); http://git-wip-us.apache.org/repos/asf/camel/blob/811a980d/components/camel-mqtt/src/main/java/org/apache/camel/component/mqtt/MQTTConfiguration.java ---------------------------------------------------------------------- diff --git a/components/camel-mqtt/src/main/java/org/apache/camel/component/mqtt/MQTTConfiguration.java b/components/camel-mqtt/src/main/java/org/apache/camel/component/mqtt/MQTTConfiguration.java index 4526102..428ffad 100644 --- a/components/camel-mqtt/src/main/java/org/apache/camel/component/mqtt/MQTTConfiguration.java +++ b/components/camel-mqtt/src/main/java/org/apache/camel/component/mqtt/MQTTConfiguration.java @@ -32,33 +32,7 @@ import org.fusesource.mqtt.client.Tracer; public class MQTTConfiguration extends MQTT { public static final String MQTT_SUBSCRIBE_TOPIC = "CamelMQTTSubscribeTopic"; public static final String MQTT_PUBLISH_TOPIC = "CamelMQTTPublishTopic"; - - /** - * These a properties that are looked for in an Exchange - to publish to - */ - private String mqttTopicPropertyName = "MQTTTopicPropertyName"; - private String mqttRetainPropertyName = "MQTTRetain"; - private String mqttQosPropertyName = "MQTTQos"; - - /** - * These are set on the Endpoint - together with properties inherited from MQTT - */ - @UriParam - private String subscribeTopicName = ""; - @UriParam(defaultValue = "camel/mqtt/test") - private String publishTopicName = "camel/mqtt/test"; - @UriParam(defaultValue = "10") - private int connectWaitInSeconds = 10; - @UriParam(defaultValue = "5") - private int disconnectWaitInSeconds = 5; - @UriParam(defaultValue = "5") - private int sendWaitInSeconds = 5; - @UriParam(defaultValue = "false") - private boolean byDefaultRetain; - @UriParam - private QoS qos = QoS.AT_LEAST_ONCE; - private String qualityOfService = QoS.AT_LEAST_ONCE.name(); - + // inherited options from MQTT @UriParam URI host; @@ -76,16 +50,16 @@ public class MQTTConfiguration extends MQTT { int maxWriteRate; @UriParam(defaultValue = "" + TcpTransport.IPTOS_THROUGHPUT) int trafficClass = TcpTransport.IPTOS_THROUGHPUT; - @UriParam(defaultValue = "" + 1024*64) - int receiveBufferSize = 1024*64; - @UriParam(defaultValue = "" + 1024*64) - int sendBufferSize = 1024*64; + @UriParam(defaultValue = "" + 1024 * 64) + int receiveBufferSize = 1024 * 64; + @UriParam(defaultValue = "" + 1024 * 64) + int sendBufferSize = 1024 * 64; @UriParam(defaultValue = "true") boolean useLocalHost = true; @UriParam(defaultValue = "10") long reconnectDelay = 10; - @UriParam(defaultValue = "" + 30*1000) - long reconnectDelayMax = 30*1000; + @UriParam(defaultValue = "" + 30 * 1000) + long reconnectDelayMax = 30 * 1000; @UriParam(defaultValue = "2.0") double reconnectBackOffMultiplier = 2.0f; @UriParam(defaultValue = "-1") @@ -95,6 +69,32 @@ public class MQTTConfiguration extends MQTT { @UriParam Tracer tracer; + /** + * These a properties that are looked for in an Exchange - to publish to + */ + private String mqttTopicPropertyName = "MQTTTopicPropertyName"; + private String mqttRetainPropertyName = "MQTTRetain"; + private String mqttQosPropertyName = "MQTTQos"; + + /** + * These are set on the Endpoint - together with properties inherited from MQTT + */ + @UriParam + private String subscribeTopicName = ""; + @UriParam(defaultValue = "camel/mqtt/test") + private String publishTopicName = "camel/mqtt/test"; + @UriParam(defaultValue = "10") + private int connectWaitInSeconds = 10; + @UriParam(defaultValue = "5") + private int disconnectWaitInSeconds = 5; + @UriParam(defaultValue = "5") + private int sendWaitInSeconds = 5; + @UriParam(defaultValue = "false") + private boolean byDefaultRetain; + @UriParam + private QoS qos = QoS.AT_LEAST_ONCE; + private String qualityOfService = QoS.AT_LEAST_ONCE.name(); + public String getQualityOfService() { return qualityOfService; }
