You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by on...@apache.org on 2018/07/10 07:02:29 UTC
[camel] 04/04: CAMEL-12554 - fix cs and component validation error
This is an automated email from the ASF dual-hosted git repository.
onders pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 33166ad893be00ee8d785291aeb31c32f5bcdd95
Author: onders <on...@apache.org>
AuthorDate: Mon Jul 9 23:11:47 2018 +0300
CAMEL-12554 - fix cs and component validation error
---
.../apache/camel/component/geocoder/GeoCoderEndpoint.java | 14 ++++++++------
.../apache/camel/component/geocoder/GeoCoderProxyTest.java | 14 ++++++++------
2 files changed, 16 insertions(+), 12 deletions(-)
diff --git a/components/camel-geocoder/src/main/java/org/apache/camel/component/geocoder/GeoCoderEndpoint.java b/components/camel-geocoder/src/main/java/org/apache/camel/component/geocoder/GeoCoderEndpoint.java
index c1e4595..ae279da 100644
--- a/components/camel-geocoder/src/main/java/org/apache/camel/component/geocoder/GeoCoderEndpoint.java
+++ b/components/camel-geocoder/src/main/java/org/apache/camel/component/geocoder/GeoCoderEndpoint.java
@@ -6,7 +6,7 @@
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -16,6 +16,9 @@
*/
package org.apache.camel.component.geocoder;
+import java.net.InetSocketAddress;
+import java.net.Proxy;
+
import com.google.maps.GeoApiContext;
import org.apache.camel.Consumer;
import org.apache.camel.Processor;
@@ -26,9 +29,6 @@ import org.apache.camel.spi.UriEndpoint;
import org.apache.camel.spi.UriParam;
import org.apache.camel.spi.UriPath;
-import java.net.InetSocketAddress;
-import java.net.Proxy;
-
/**
* The geocoder component is used for looking up geocodes (latitude and longitude) for a given address, or reverse lookup.
*/
@@ -154,6 +154,9 @@ public class GeoCoderEndpoint extends DefaultEndpoint {
return apiKey;
}
+ /**
+ * To use google apiKey
+ */
public void setApiKey(String apiKey) {
this.apiKey = apiKey;
}
@@ -252,8 +255,7 @@ public class GeoCoderEndpoint extends DefaultEndpoint {
AuthenticationMethod auth = getCamelContext().getTypeConverter().convertTo(AuthenticationMethod.class, proxyAuthMethod);
if (auth == AuthenticationMethod.Basic || auth == AuthenticationMethod.Digest) {
builder = builder.proxyAuthentication(proxyAuthUsername, proxyAuthPassword);
- }
- else{
+ } else {
throw new IllegalArgumentException("Unknown proxyAuthMethod " + proxyAuthMethod);
}
return builder;
diff --git a/components/camel-geocoder/src/test/java/org/apache/camel/component/geocoder/GeoCoderProxyTest.java b/components/camel-geocoder/src/test/java/org/apache/camel/component/geocoder/GeoCoderProxyTest.java
index 58721f7..0da9cad 100644
--- a/components/camel-geocoder/src/test/java/org/apache/camel/component/geocoder/GeoCoderProxyTest.java
+++ b/components/camel-geocoder/src/test/java/org/apache/camel/component/geocoder/GeoCoderProxyTest.java
@@ -31,9 +31,10 @@ public class GeoCoderProxyTest extends GeoCoderApiKeyTestBase {
@Test
public void testGeoCoderProxyNoAuth() throws Exception {
- GeoCoderEndpoint endpoint = context.getEndpoint(
- "geocoder:address:current?headersOnly=true&proxyHost=localhost&proxyPort=8888&apiKey="+getApiKey(),
- GeoCoderEndpoint.class);
+ GeoCoderEndpoint endpoint = context.
+ getEndpoint("geocoder:address:current?headersOnly=true&proxyHost=localhost"
+ + "&proxyPort=8888&apiKey=" + getApiKey(),
+ GeoCoderEndpoint.class);
GeoApiContext context = endpoint.createGeoApiContext();
GeocodingApiRequest geocodingApiRequest = GeocodingApi.reverseGeocode(context, new LatLng(45.4643, 9.1895));
@@ -44,9 +45,10 @@ public class GeoCoderProxyTest extends GeoCoderApiKeyTestBase {
@Test
public void testGeoCoderWithAuth() throws Exception {
- GeoCoderEndpoint endpoint = context.getEndpoint(
- "geocoder:address:current?headersOnly=true&proxyHost=localhost&proxyPort=8888&proxyAuthMethod=Basic&proxyAuthUsername=proxy&proxyAuthPassword=proxy&apiKey="+getApiKey(),
- GeoCoderEndpoint.class);
+ GeoCoderEndpoint endpoint = context.
+ getEndpoint("geocoder:address:current?headersOnly=true&proxyHost=localhost"
+ + "&proxyPort=8888&proxyAuthMethod=Basic&proxyAuthUsername=proxy&proxyAuthPassword=proxy&apiKey=" + getApiKey(),
+ GeoCoderEndpoint.class);
GeoApiContext context = endpoint.createGeoApiContext();
GeocodingApiRequest geocodingApiRequest = GeocodingApi.reverseGeocode(context, new LatLng(45.4643, 9.1895));