Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id C170C200C39 for ; Thu, 16 Mar 2017 16:04:46 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id C0243160B78; Thu, 16 Mar 2017 15:04:46 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id E4F75160B8B for ; Thu, 16 Mar 2017 16:04:45 +0100 (CET) Received: (qmail 13917 invoked by uid 500); 16 Mar 2017 15:04:45 -0000 Mailing-List: contact commits-help@camel.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@camel.apache.org Delivered-To: mailing list commits@camel.apache.org Received: (qmail 13908 invoked by uid 99); 16 Mar 2017 15:04:45 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 16 Mar 2017 15:04:45 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 108E8DFC15; Thu, 16 Mar 2017 15:04:45 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: acosentino@apache.org To: commits@camel.apache.org Date: Thu, 16 Mar 2017 15:04:45 -0000 Message-Id: <3a42ef73cb374ffe810ee349381797c8@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/2] camel git commit: Fixed CS archived-at: Thu, 16 Mar 2017 15:04:46 -0000 Repository: camel Updated Branches: refs/heads/master a7e9acda4 -> bc05a54d5 Fixed CS Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/bc05a54d Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/bc05a54d Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/bc05a54d Branch: refs/heads/master Commit: bc05a54d578a968335244eff73910213f5d1f145 Parents: 619b0d4 Author: Andrea Cosentino Authored: Thu Mar 16 16:04:14 2017 +0100 Committer: Andrea Cosentino Committed: Thu Mar 16 16:04:29 2017 +0100 ---------------------------------------------------------------------- .../hazelcast/HazelcastDefaultEndpoint.java | 2 +- .../topic/HazelcastTopicConfiguration.java | 21 ++++++++++---------- .../hazelcast/topic/HazelcastTopicConsumer.java | 2 +- .../HazelcastReliableTopicProducerTest.java | 3 ++- 4 files changed, 14 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/bc05a54d/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/HazelcastDefaultEndpoint.java ---------------------------------------------------------------------- diff --git a/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/HazelcastDefaultEndpoint.java b/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/HazelcastDefaultEndpoint.java index f93be82..cb6f08d 100644 --- a/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/HazelcastDefaultEndpoint.java +++ b/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/HazelcastDefaultEndpoint.java @@ -114,7 +114,7 @@ public abstract class HazelcastDefaultEndpoint extends DefaultEndpoint { this.hazelcastInstanceName = hazelcastInstanceName; } - /** + /** * To specify a default operation to use, if no operation header has been provided. */ public void setDefaultOperation(String defaultOperation) { http://git-wip-us.apache.org/repos/asf/camel/blob/bc05a54d/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/topic/HazelcastTopicConfiguration.java ---------------------------------------------------------------------- diff --git a/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/topic/HazelcastTopicConfiguration.java b/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/topic/HazelcastTopicConfiguration.java index d83d268..640d247 100644 --- a/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/topic/HazelcastTopicConfiguration.java +++ b/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/topic/HazelcastTopicConfiguration.java @@ -24,19 +24,18 @@ import org.apache.camel.spi.UriParams; */ @UriParams public class HazelcastTopicConfiguration { - - @UriParam(label = "common", defaultValue = "false") - private boolean reliable = false; - + + @UriParam(label = "common", defaultValue = "false") + private boolean reliable; + /** * Define if the endpoint will use a reliable Topic struct or not. */ - public boolean isReliable() { - return reliable; - } - - public void setReliable(boolean reliable) { - this.reliable = reliable; - } + public boolean isReliable() { + return reliable; + } + public void setReliable(boolean reliable) { + this.reliable = reliable; + } } http://git-wip-us.apache.org/repos/asf/camel/blob/bc05a54d/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/topic/HazelcastTopicConsumer.java ---------------------------------------------------------------------- diff --git a/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/topic/HazelcastTopicConsumer.java b/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/topic/HazelcastTopicConsumer.java index 13a802b..66240be 100644 --- a/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/topic/HazelcastTopicConsumer.java +++ b/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/topic/HazelcastTopicConsumer.java @@ -34,7 +34,7 @@ public class HazelcastTopicConsumer extends HazelcastDefaultConsumer { if (!reliable) { topic = hazelcastInstance.getTopic(cacheName); } else { - topic = hazelcastInstance.getReliableTopic(cacheName); + topic = hazelcastInstance.getReliableTopic(cacheName); } topic.addMessageListener(new CamelMessageListener(this, cacheName)); } http://git-wip-us.apache.org/repos/asf/camel/blob/bc05a54d/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastReliableTopicProducerTest.java ---------------------------------------------------------------------- diff --git a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastReliableTopicProducerTest.java b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastReliableTopicProducerTest.java index bb8f1b5..196c6f6 100644 --- a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastReliableTopicProducerTest.java +++ b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastReliableTopicProducerTest.java @@ -72,7 +72,8 @@ public class HazelcastReliableTopicProducerTest extends HazelcastCamelTestSuppor from("direct:publishInvalid").setHeader(HazelcastConstants.OPERATION, constant("bogus")).to(String.format("hazelcast:%sbar?reliable=true", HazelcastConstants.TOPIC_PREFIX)); - from("direct:publish").setHeader(HazelcastConstants.OPERATION, constant(HazelcastConstants.PUBLISH_OPERATION)).to(String.format("hazelcast:%sbar?reliable=true", HazelcastConstants.TOPIC_PREFIX)); + from("direct:publish").setHeader(HazelcastConstants.OPERATION, constant(HazelcastConstants.PUBLISH_OPERATION)).to(String.format("hazelcast:%sbar?reliable=true", + HazelcastConstants.TOPIC_PREFIX)); } }; }