[2/4] camel git commit: Polished and fixed typo. This closes #2010

2017-10-06 Thread davsclaus
Polished and fixed typo. This closes #2010


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/8ab9bc40
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/8ab9bc40
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/8ab9bc40

Branch: refs/heads/master
Commit: 8ab9bc4085d4316e381acf0beca333f0ad774402
Parents: 7dfd373
Author: Claus Ibsen 
Authored: Fri Oct 6 10:29:21 2017 +0200
Committer: Claus Ibsen 
Committed: Fri Oct 6 10:29:21 2017 +0200

--
 .../apache/camel/component/rabbitmq/RabbitMQConstants.java  | 2 +-
 .../camel/component/rabbitmq/RabbitMQDeclareSupport.java| 9 -
 2 files changed, 5 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/8ab9bc40/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQConstants.java
--
diff --git 
a/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQConstants.java
 
b/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQConstants.java
index fc6a326..cc7bf32 100644
--- 
a/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQConstants.java
+++ 
b/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQConstants.java
@@ -42,7 +42,7 @@ public final class RabbitMQConstants {
 public static final String RABBITMQ_DEAD_LETTER_ROUTING_KEY = 
"x-dead-letter-routing-key";
 public static final String RABBITMQ_DIRECT_REPLY_EXCHANGE = "";
 public static final String RABBITMQ_DIRECT_REPLY_ROUTING_KEY = 
"amq.rabbitmq.reply-to";
-public static final String RABBITMQ_QUEUE_LENGHT_LIMIT_KEY = 
"x-max-length";
+public static final String RABBITMQ_QUEUE_LENGTH_LIMIT_KEY = 
"x-max-length";
 public static final String RABBITMQ_QUEUE_MESSAGE_TTL_KEY = 
"x-message-ttl";
 public static final String RABBITMQ_QUEUE_TTL_KEY = "x-expires";
 

http://git-wip-us.apache.org/repos/asf/camel/blob/8ab9bc40/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQDeclareSupport.java
--
diff --git 
a/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQDeclareSupport.java
 
b/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQDeclareSupport.java
index 982dd27..99c425a 100644
--- 
a/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQDeclareSupport.java
+++ 
b/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQDeclareSupport.java
@@ -66,9 +66,10 @@ public class RabbitMQDeclareSupport {
 }
 
 private void formatSpecialQueueArguments(Map queueArgs) {
-Object queueLengthLimit = 
queueArgs.get(RabbitMQConstants.RABBITMQ_QUEUE_LENGHT_LIMIT_KEY);
+// some arguments must be in numeric values so we need to fix this
+Object queueLengthLimit = 
queueArgs.get(RabbitMQConstants.RABBITMQ_QUEUE_LENGTH_LIMIT_KEY);
 if (queueLengthLimit != null && queueLengthLimit instanceof String) {
-queueArgs.put(RabbitMQConstants.RABBITMQ_QUEUE_LENGHT_LIMIT_KEY, 
Long.parseLong((String) queueLengthLimit));
+queueArgs.put(RabbitMQConstants.RABBITMQ_QUEUE_LENGTH_LIMIT_KEY, 
Long.parseLong((String) queueLengthLimit));
 }
 
 Object queueMessageTtl = 
queueArgs.get(RabbitMQConstants.RABBITMQ_QUEUE_MESSAGE_TTL_KEY);
@@ -82,13 +83,11 @@ public class RabbitMQDeclareSupport {
 }
 }
 
-private Map 
populateQueueArgumentsFromDeadLetterExchange(final Map 
queueArgs) {
+private void populateQueueArgumentsFromDeadLetterExchange(final 
Map queueArgs) {
 if (endpoint.getDeadLetterExchange() != null) {
 queueArgs.put(RabbitMQConstants.RABBITMQ_DEAD_LETTER_EXCHANGE, 
endpoint.getDeadLetterExchange());
 queueArgs.put(RabbitMQConstants.RABBITMQ_DEAD_LETTER_ROUTING_KEY, 
endpoint.getDeadLetterRoutingKey());
 }
-
-return queueArgs;
 }
 
 private Map resolvedExchangeArguments() {



[2/4] camel git commit: Polished test

2017-07-04 Thread davsclaus
Polished test


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/756e56c8
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/756e56c8
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/756e56c8

Branch: refs/heads/master
Commit: 756e56c81fa8e1bcf426b201a788a5243087e518
Parents: 5c08aef
Author: Claus Ibsen 
Authored: Tue Jul 4 10:43:55 2017 +0200
Committer: Claus Ibsen 
Committed: Tue Jul 4 10:52:19 2017 +0200

--
 .../camel/catalog/maven/MavenVersionManagerTest.java  | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/756e56c8/platforms/camel-catalog-maven/src/test/java/org/apache/camel/catalog/maven/MavenVersionManagerTest.java
--
diff --git 
a/platforms/camel-catalog-maven/src/test/java/org/apache/camel/catalog/maven/MavenVersionManagerTest.java
 
b/platforms/camel-catalog-maven/src/test/java/org/apache/camel/catalog/maven/MavenVersionManagerTest.java
index e9cdcb0..bf5fe2f 100644
--- 
a/platforms/camel-catalog-maven/src/test/java/org/apache/camel/catalog/maven/MavenVersionManagerTest.java
+++ 
b/platforms/camel-catalog-maven/src/test/java/org/apache/camel/catalog/maven/MavenVersionManagerTest.java
@@ -156,13 +156,13 @@ public class MavenVersionManagerTest extends TestCase {
 System.out.println("2.18.1 has " + components + " components");
 assertFalse("Should not have ejb component", 
catalog.findComponentNames().contains("ejb"));
 
-loaded = catalog.loadVersion("2.19.0-SNAPSHOT");
-assertTrue("Unable to switch to Camel Catalog 2.19.0-SNAPSHOT", 
loaded);
-loaded = catalog.loadRuntimeProviderVersion("org.apache.camel", 
"camel-catalog-provider-karaf", "2.19.0-SNAPSHOT");
-assertTrue("Unable to load Karaf Provider Camel Catalog 
2.19.0-SNAPSHOT", loaded);
+loaded = catalog.loadVersion("2.19.1");
+assertTrue("Unable to switch to Camel Catalog 2.19.1", loaded);
+loaded = catalog.loadRuntimeProviderVersion("org.apache.camel", 
"camel-catalog-provider-karaf", "2.19.1");
+assertTrue("Unable to load Karaf Provider Camel Catalog 2.19.1", 
loaded);
 int componentsNewer = catalog.findComponentNames().size();
 assertTrue("Both catalog versions shouldn't have the same count of 
components.", components != componentsNewer);
-System.out.println("2.19.0-SNAPSHOT has " + componentsNewer + " 
components");
+System.out.println("2.19.1 has " + componentsNewer + " components");
 assertFalse("Should not have ejb component", 
catalog.findComponentNames().contains("ejb"));
 
 loaded = catalog.loadVersion("2.18.1");



[2/4] camel git commit: Polished

2016-12-01 Thread davsclaus
Polished


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/9e685b19
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/9e685b19
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/9e685b19

Branch: refs/heads/master
Commit: 9e685b1993e18eee7bcd12390e1824ec7d8a58aa
Parents: b002575
Author: Claus Ibsen 
Authored: Thu Dec 1 11:05:00 2016 +0100
Committer: Claus Ibsen 
Committed: Thu Dec 1 12:23:22 2016 +0100

--
 .../java/org/apache/camel/spring/boot/SpringTypeConverter.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/9e685b19/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/SpringTypeConverter.java
--
diff --git 
a/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/SpringTypeConverter.java
 
b/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/SpringTypeConverter.java
index 5f4021a..4e45c8e 100644
--- 
a/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/SpringTypeConverter.java
+++ 
b/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/SpringTypeConverter.java
@@ -42,7 +42,7 @@ public class SpringTypeConverter extends TypeConverterSupport 
{
 return null;
 }
 
-// do not attempt to convert List -> Map. Ognl expression may use this 
converter  as a fallback expecting null
+// do not attempt to convert List -> Map. Ognl expression may use this 
converter as a fallback expecting null
 if (type.isAssignableFrom(Map.class) && (value.getClass().isArray() || 
value instanceof Collection)) {
 return null;
 }



[2/4] camel git commit: Polished

2015-12-15 Thread davsclaus
Polished


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/e3aa8ae4
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/e3aa8ae4
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/e3aa8ae4

Branch: refs/heads/master
Commit: e3aa8ae42160dd5801e979f05f1d0ceb733b492e
Parents: c96a7c8
Author: Claus Ibsen 
Authored: Wed Dec 16 08:12:54 2015 +0100
Committer: Claus Ibsen 
Committed: Wed Dec 16 08:12:54 2015 +0100

--
 .../org/apache/camel/model/rest/RestConfigurationDefinition.java | 2 +-
 .../org/apache/camel/swagger/SwaggerRestApiProcessorFactory.java | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/e3aa8ae4/camel-core/src/main/java/org/apache/camel/model/rest/RestConfigurationDefinition.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/model/rest/RestConfigurationDefinition.java
 
b/camel-core/src/main/java/org/apache/camel/model/rest/RestConfigurationDefinition.java
index 155a513..5dc4804 100644
--- 
a/camel-core/src/main/java/org/apache/camel/model/rest/RestConfigurationDefinition.java
+++ 
b/camel-core/src/main/java/org/apache/camel/model/rest/RestConfigurationDefinition.java
@@ -600,7 +600,7 @@ public class RestConfigurationDefinition {
 }
 
 /**
- * For additional configuration options on data format level
+ * For configuring an api property, such as api.title, or 
api.version.
  */
 public RestConfigurationDefinition apiProperty(String key, String value) {
 RestPropertyDefinition prop = new RestPropertyDefinition();

http://git-wip-us.apache.org/repos/asf/camel/blob/e3aa8ae4/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/SwaggerRestApiProcessorFactory.java
--
diff --git 
a/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/SwaggerRestApiProcessorFactory.java
 
b/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/SwaggerRestApiProcessorFactory.java
index 373db45..7b0f5df 100644
--- 
a/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/SwaggerRestApiProcessorFactory.java
+++ 
b/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/SwaggerRestApiProcessorFactory.java
@@ -50,7 +50,9 @@ public class SwaggerRestApiProcessorFactory implements 
RestApiProcessorFactory {
 }
 // and context path is the base.path
 String path = configuration.getContextPath();
-options.put("base.path", path);
+if (path != null) {
+options.put("base.path", path);
+}
 
 return new RestSwaggerProcessor(contextIdPattern, contextIdListing, 
options);
 }



[2/4] camel git commit: Polished

2015-11-11 Thread davsclaus
Polished


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/19771345
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/19771345
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/19771345

Branch: refs/heads/master
Commit: 19771345d5946f4e925d604ced2d12759bde5ac5
Parents: ed574cb
Author: Claus Ibsen 
Authored: Wed Nov 11 10:36:10 2015 +0100
Committer: Claus Ibsen 
Committed: Wed Nov 11 10:36:10 2015 +0100

--
 .../main/java/org/apache/camel/util/UnsafeUriCharactersEncoder.java | 1 -
 1 file changed, 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/19771345/camel-core/src/main/java/org/apache/camel/util/UnsafeUriCharactersEncoder.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/util/UnsafeUriCharactersEncoder.java
 
b/camel-core/src/main/java/org/apache/camel/util/UnsafeUriCharactersEncoder.java
index e0775a0..783af6c 100644
--- 
a/camel-core/src/main/java/org/apache/camel/util/UnsafeUriCharactersEncoder.java
+++ 
b/camel-core/src/main/java/org/apache/camel/util/UnsafeUriCharactersEncoder.java
@@ -22,7 +22,6 @@ import java.util.List;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-
 /**
  * Encoder for unsafe URI characters.
  * 



[2/4] camel git commit: Polished

2015-05-19 Thread davsclaus
Polished


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/2bd23319
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/2bd23319
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/2bd23319

Branch: refs/heads/master
Commit: 2bd23319fe527b9165a5e20f0d06d4d57a667d25
Parents: 6f5bee1
Author: Claus Ibsen davscl...@apache.org
Authored: Tue May 19 21:49:04 2015 +0200
Committer: Claus Ibsen davscl...@apache.org
Committed: Tue May 19 21:49:04 2015 +0200

--
 .../src/main/java/org/apache/camel/util/ObjectHelper.java | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/2bd23319/camel-core/src/main/java/org/apache/camel/util/ObjectHelper.java
--
diff --git a/camel-core/src/main/java/org/apache/camel/util/ObjectHelper.java 
b/camel-core/src/main/java/org/apache/camel/util/ObjectHelper.java
index 7367d1e..4e9ad05 100644
--- a/camel-core/src/main/java/org/apache/camel/util/ObjectHelper.java
+++ b/camel-core/src/main/java/org/apache/camel/util/ObjectHelper.java
@@ -1825,7 +1825,7 @@ public final class ObjectHelper {
 }
 
 /**
- * Calling the Callable with the setting of TCCL with the camel context 
application classloader;
+ * Calling the Callable with the setting of TCCL with the camel context 
application classloader.
  * 
  * @param call the Callable instance
  * @param exchange the exchange 
@@ -1840,10 +1840,10 @@ public final class ObjectHelper {
 }
 
 /**
- * Calling the Callable with the setting of TCCL with a given classloader;
- * 
- * @param call the Callable instance
- * @param  the exchange 
+ * Calling the Callable with the setting of TCCL with a given classloader.
+ *
+ * @param callthe Callable instance
+ * @param classloader the class loader
  * @return the result of Callable return  
  */
 public static Object callWithTCCL(Callable? call, ClassLoader 
classloader) throws Exception {