Return-Path: X-Original-To: apmail-camel-commits-archive@www.apache.org Delivered-To: apmail-camel-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 34C4CC7EB for ; Sat, 29 Jun 2013 12:39:41 +0000 (UTC) Received: (qmail 85188 invoked by uid 500); 29 Jun 2013 12:39:41 -0000 Delivered-To: apmail-camel-commits-archive@camel.apache.org Received: (qmail 85161 invoked by uid 500); 29 Jun 2013 12:39:41 -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 85149 invoked by uid 99); 29 Jun 2013 12:39:40 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 29 Jun 2013 12:39:40 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id A004D3C89F; Sat, 29 Jun 2013 12:39:40 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: cmueller@apache.org To: commits@camel.apache.org Message-Id: <5bb2568abad54f9bbb852e9002471faa@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: fixed the CS error Date: Sat, 29 Jun 2013 12:39:40 +0000 (UTC) Updated Branches: refs/heads/master 97516739b -> 8a1c55a65 fixed the CS error Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/8a1c55a6 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/8a1c55a6 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/8a1c55a6 Branch: refs/heads/master Commit: 8a1c55a65f4d6ceeb2c29febac6451cc3cb71441 Parents: 9751673 Author: cmueller Authored: Sat Jun 29 14:39:33 2013 +0200 Committer: cmueller Committed: Sat Jun 29 14:39:33 2013 +0200 ---------------------------------------------------------------------- .../component/geocoder/GeoCoderProducer.java | 24 ++++++++++---------- .../geocoder/GeoCoderComponentAddressTest.java | 8 +++---- .../geocoder/GeoCoderCurrentAddressTest.java | 8 +++---- .../geocoder/GeoCoderLatLngComponentTest.java | 10 ++++---- 4 files changed, 25 insertions(+), 25 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/8a1c55a6/components/camel-geocoder/src/main/java/org/apache/camel/component/geocoder/GeoCoderProducer.java ---------------------------------------------------------------------- diff --git a/components/camel-geocoder/src/main/java/org/apache/camel/component/geocoder/GeoCoderProducer.java b/components/camel-geocoder/src/main/java/org/apache/camel/component/geocoder/GeoCoderProducer.java index ab10fc5..d410c97 100644 --- a/components/camel-geocoder/src/main/java/org/apache/camel/component/geocoder/GeoCoderProducer.java +++ b/components/camel-geocoder/src/main/java/org/apache/camel/component/geocoder/GeoCoderProducer.java @@ -114,22 +114,22 @@ public class GeoCoderProducer extends DefaultProducer { String resLatlng = latitudeNode.asText() + "," + longitudeNode.asText(); exchange.getIn().setHeader(GeoCoderConstants.LATLNG, resLatlng); - JsonNode country_code = node.get("country_code"); - JsonNode country_name = node.get("country_name"); - if (country_code != null) { - exchange.getIn().setHeader(GeoCoderConstants.COUNTRY_SHORT, country_code.asText()); + JsonNode countryCode = node.get("country_code"); + JsonNode countryName = node.get("country_name"); + if (countryCode != null) { + exchange.getIn().setHeader(GeoCoderConstants.COUNTRY_SHORT, countryCode.asText()); } - if (country_name != null) { - exchange.getIn().setHeader(GeoCoderConstants.COUNTRY_LONG, country_name.asText()); + if (countryName != null) { + exchange.getIn().setHeader(GeoCoderConstants.COUNTRY_LONG, countryName.asText()); } - JsonNode region_code = node.get("region_code"); - JsonNode region_name = node.get("region_name"); - if (region_code != null) { - exchange.getIn().setHeader(GeoCoderConstants.REGION_CODE, region_code.asText()); + JsonNode regionCode = node.get("region_code"); + JsonNode regionName = node.get("region_name"); + if (regionCode != null) { + exchange.getIn().setHeader(GeoCoderConstants.REGION_CODE, regionCode.asText()); } - if (region_name != null) { - exchange.getIn().setHeader(GeoCoderConstants.REGION_NAME, region_name.asText()); + if (regionName != null) { + exchange.getIn().setHeader(GeoCoderConstants.REGION_NAME, regionName.asText()); } JsonNode city = node.get("city"); http://git-wip-us.apache.org/repos/asf/camel/blob/8a1c55a6/components/camel-geocoder/src/test/java/org/apache/camel/component/geocoder/GeoCoderComponentAddressTest.java ---------------------------------------------------------------------- diff --git a/components/camel-geocoder/src/test/java/org/apache/camel/component/geocoder/GeoCoderComponentAddressTest.java b/components/camel-geocoder/src/test/java/org/apache/camel/component/geocoder/GeoCoderComponentAddressTest.java index 37f10a8..16d8bd6 100644 --- a/components/camel-geocoder/src/test/java/org/apache/camel/component/geocoder/GeoCoderComponentAddressTest.java +++ b/components/camel-geocoder/src/test/java/org/apache/camel/component/geocoder/GeoCoderComponentAddressTest.java @@ -39,10 +39,10 @@ public class GeoCoderComponentAddressTest extends CamelTestSupport { return new RouteBuilder() { public void configure() { from("direct:start") - .to("geocoder:address:Paris, France") - .to("log:result") - .log("Location ${header.CamelGeocoderAddress} is at lat/lng: ${header.CamelGeocoderLatlng} in city ${header.CamelGeocoderCity}") - .to("mock:result"); + .to("geocoder:address:Paris, France") + .to("log:result") + .log("Location ${header.CamelGeocoderAddress} is at lat/lng: ${header.CamelGeocoderLatlng} in city ${header.CamelGeocoderCity}") + .to("mock:result"); } }; } http://git-wip-us.apache.org/repos/asf/camel/blob/8a1c55a6/components/camel-geocoder/src/test/java/org/apache/camel/component/geocoder/GeoCoderCurrentAddressTest.java ---------------------------------------------------------------------- diff --git a/components/camel-geocoder/src/test/java/org/apache/camel/component/geocoder/GeoCoderCurrentAddressTest.java b/components/camel-geocoder/src/test/java/org/apache/camel/component/geocoder/GeoCoderCurrentAddressTest.java index 6f351c1..23cd1d4 100644 --- a/components/camel-geocoder/src/test/java/org/apache/camel/component/geocoder/GeoCoderCurrentAddressTest.java +++ b/components/camel-geocoder/src/test/java/org/apache/camel/component/geocoder/GeoCoderCurrentAddressTest.java @@ -39,10 +39,10 @@ public class GeoCoderCurrentAddressTest extends CamelTestSupport { return new RouteBuilder() { public void configure() { from("direct:start") - .to("geocoder:address:current?headersOnly=true") - .to("log:result") - .log("You are at ${header.CamelGeoCoderLatlng} in city ${header.CamelGeoCoderCity} in country ${header.CamelGeoCoderCountryLong}") - .to("mock:result"); + .to("geocoder:address:current?headersOnly=true") + .to("log:result") + .log("You are at ${header.CamelGeoCoderLatlng} in city ${header.CamelGeoCoderCity} in country ${header.CamelGeoCoderCountryLong}") + .to("mock:result"); } }; } http://git-wip-us.apache.org/repos/asf/camel/blob/8a1c55a6/components/camel-geocoder/src/test/java/org/apache/camel/component/geocoder/GeoCoderLatLngComponentTest.java ---------------------------------------------------------------------- diff --git a/components/camel-geocoder/src/test/java/org/apache/camel/component/geocoder/GeoCoderLatLngComponentTest.java b/components/camel-geocoder/src/test/java/org/apache/camel/component/geocoder/GeoCoderLatLngComponentTest.java index ed6b631..314e223 100644 --- a/components/camel-geocoder/src/test/java/org/apache/camel/component/geocoder/GeoCoderLatLngComponentTest.java +++ b/components/camel-geocoder/src/test/java/org/apache/camel/component/geocoder/GeoCoderLatLngComponentTest.java @@ -41,11 +41,11 @@ public class GeoCoderLatLngComponentTest extends CamelTestSupport { return new RouteBuilder() { public void configure() { from("direct:start") - .to("geocoder:latlng:40.714224,-73.961452") - .to("log:result") - .log("Location ${header.CamelGeocoderAddress} is at lat/lng: ${header.CamelGeocoderLatlng}" - + " and in city ${header.CamelGeoCoderCity} in country ${header.CamelGeoCoderCountryLong}") - .to("mock:result"); + .to("geocoder:latlng:40.714224,-73.961452") + .to("log:result") + .log("Location ${header.CamelGeocoderAddress} is at lat/lng: ${header.CamelGeocoderLatlng}" + + " and in city ${header.CamelGeoCoderCity} in country ${header.CamelGeoCoderCountryLong}") + .to("mock:result"); } }; }