[3/5] camel git commit: Polished test

[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/f8f60691
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/f8f60691
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/f8f60691

Branch: refs/heads/master
Commit: f8f606915e39ca61e1f039d27214dd180b12abe3
Parents: 44010a5
Author: Claus Ibsen 
Authored: Thu Oct 5 10:49:19 2017 +0200
Committer: Claus Ibsen 
Committed: Thu Oct 5 13:37:17 2017 +0200

--
 .../org/apache/camel/component/restlet/RestletProducerTest.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/f8f60691/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletProducerTest.java
--
diff --git 
a/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletProducerTest.java
 
b/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletProducerTest.java
index 4ea65b6..34ccd05 100644
--- 
a/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletProducerTest.java
+++ 
b/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletProducerTest.java
@@ -43,9 +43,9 @@ public class RestletProducerTest extends RestletTestSupport {
 return new RouteBuilder() {
 @Override
 public void configure() throws Exception {
-from("direct:start").to("restlet:http://localhost:; + portNum 
+ "/users/123/basic").to("log:reply");
+from("direct:start").to("restlet:http://localhost:; + portNum 
+ "/users/{id}/basic").to("log:reply");
 
-from("direct:delete").to("restlet:http://localhost:; + portNum 
+ "/users/123/basic?restletMethod=DELETE");
+from("direct:delete").to("restlet:http://localhost:; + portNum 
+ "/users/{id}/basic?restletMethod=DELETE");
 
 from("restlet:http://localhost:; + portNum + 
"/users/{id}/basic?restletMethods=GET,DELETE")
 .process(new Processor() {

[3/5] camel git commit: Polished

[davsclaus]

Polished


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

Branch: refs/heads/master
Commit: 3c96c8b673f293b1df1208bc92bd4a684e80286e
Parents: 4a72341
Author: Claus Ibsen 
Authored: Sat Jun 24 13:56:31 2017 +0200
Committer: Claus Ibsen 
Committed: Sat Jun 24 13:56:31 2017 +0200

--
 .../main/java/org/apache/camel/converter/ObjectConverter.java| 4 
 1 file changed, 4 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/3c96c8b6/camel-core/src/main/java/org/apache/camel/converter/ObjectConverter.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/converter/ObjectConverter.java 
b/camel-core/src/main/java/org/apache/camel/converter/ObjectConverter.java
index a8e445d..c9616fa 100644
--- a/camel-core/src/main/java/org/apache/camel/converter/ObjectConverter.java
+++ b/camel-core/src/main/java/org/apache/camel/converter/ObjectConverter.java
@@ -38,6 +38,10 @@ public final class ObjectConverter {
 private ObjectConverter() {
 }
 
+/**
+ * @deprecated not in use
+ */
+@Deprecated
 public static boolean isCollection(Object value) {
 return value instanceof Collection || (value != null && 
value.getClass().isArray());
 }

[3/5] camel git commit: Polished

[davsclaus]

Polished


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

Branch: refs/heads/master
Commit: 413646ad765be1f5927f0b6b0c6d4b585a21f46f
Parents: d997788
Author: Claus Ibsen 
Authored: Thu Jun 1 19:38:42 2017 +0200
Committer: Claus Ibsen 
Committed: Thu Jun 1 19:38:42 2017 +0200

--
 .../src/main/java/org/apache/camel/util/StopWatch.java   | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/413646ad/camel-core/src/main/java/org/apache/camel/util/StopWatch.java
--
diff --git a/camel-core/src/main/java/org/apache/camel/util/StopWatch.java 
b/camel-core/src/main/java/org/apache/camel/util/StopWatch.java
index e82adbc..831eb89 100644
--- a/camel-core/src/main/java/org/apache/camel/util/StopWatch.java
+++ b/camel-core/src/main/java/org/apache/camel/util/StopWatch.java
@@ -46,11 +46,11 @@ public final class StopWatch {
 /**
  * Creates the stop watch
  *
- * @param started whether it should start immediately
+ * @param start whether it should start immediately
  */
-public StopWatch(boolean started) {
-if (started) {
-restart();
+public StopWatch(boolean start) {
+if (start) {
+this.start = System.currentTimeMillis();
 }
 }
 

[3/5] camel git commit: Polished

[davsclaus]

Polished


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

Branch: refs/heads/master
Commit: 91ff7d0b61713dc8c661cac5f1f50205a8914213
Parents: 14efed0
Author: Claus Ibsen davscl...@apache.org
Authored: Fri Aug 7 16:22:36 2015 +0200
Committer: Claus Ibsen davscl...@apache.org
Committed: Fri Aug 7 16:22:36 2015 +0200

--
 .../src/main/java/org/apache/camel/support/ServiceSupport.java | 6 ++
 1 file changed, 6 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/91ff7d0b/camel-core/src/main/java/org/apache/camel/support/ServiceSupport.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/support/ServiceSupport.java 
b/camel-core/src/main/java/org/apache/camel/support/ServiceSupport.java
index 6cf6105..9280f78 100644
--- a/camel-core/src/main/java/org/apache/camel/support/ServiceSupport.java
+++ b/camel-core/src/main/java/org/apache/camel/support/ServiceSupport.java
@@ -243,10 +243,16 @@ public abstract class ServiceSupport implements 
StatefulService {
 return !isStoppingOrStopped();
 }
 
+/**
+ * Is the service in progress of being stopped or already stopped
+ */
 public boolean isStoppingOrStopped() {
 return stopping.get() || stopped.get();
 }
 
+/**
+ * Is the service in progress of being suspended or already suspended
+ */
 public boolean isSuspendingOrSuspended() {
 return suspending.get() || suspended.get();
 }

[3/5] camel git commit: Polished

[davsclaus]

Polished


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

Branch: refs/heads/master
Commit: a8949a83f5d4abb53105b016bf7a88ad63401d6a
Parents: e82caec
Author: Claus Ibsen davscl...@apache.org
Authored: Wed May 6 11:53:28 2015 +0200
Committer: Claus Ibsen davscl...@apache.org
Committed: Wed May 6 12:01:58 2015 +0200

--
 .../java/org/apache/camel/component/jms/JmsConfiguration.java| 4 
 .../java/org/apache/camel/component/jms/JmsPollingConsumer.java  | 1 -
 .../org/apache/camel/component/jms/issues/JmsHammerTest.java | 3 +--
 3 files changed, 1 insertion(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/a8949a83/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConfiguration.java
--
diff --git 
a/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConfiguration.java
 
b/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConfiguration.java
index 58a290c..e372293 100644
--- 
a/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConfiguration.java
+++ 
b/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConfiguration.java
@@ -1133,10 +1133,6 @@ public class JmsConfiguration implements Cloneable {
 listener.setReplyToDestination(getReplyTo());
 }
 
-// TODO: REVISIT: We really ought to change the model and let 
JmsProducer
-// and JmsConsumer have their own JmsConfiguration instance
-// This way producer's and consumer's QoS can differ and be
-// independently configured
 JmsOperations operations = listener.getTemplate();
 if (operations instanceof JmsTemplate) {
 JmsTemplate template = (JmsTemplate) operations;

http://git-wip-us.apache.org/repos/asf/camel/blob/a8949a83/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsPollingConsumer.java
--
diff --git 
a/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsPollingConsumer.java
 
b/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsPollingConsumer.java
index cbb74b0..1ad9cdc 100644
--- 
a/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsPollingConsumer.java
+++ 
b/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsPollingConsumer.java
@@ -56,7 +56,6 @@ public class JmsPollingConsumer extends 
PollingConsumerSupport implements Servic
 }
 
 public Exchange receive(long timeout) {
-// TODO: use api so we can get hold of session
 setReceiveTimeout(timeout);
 Message message;
 // using the selector

http://git-wip-us.apache.org/repos/asf/camel/blob/a8949a83/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsHammerTest.java
--
diff --git 
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsHammerTest.java
 
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsHammerTest.java
index 36a0d72..07076b3 100644
--- 
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsHammerTest.java
+++ 
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsHammerTest.java
@@ -53,8 +53,7 @@ public class JmsHammerTest extends CamelTestSupport {
 
 protected CamelContext createCamelContext() throws Exception {
 CamelContext camelContext = super.createCamelContext();
-// TODO: MR-170
-ActiveMQComponent activemq = 
+ActiveMQComponent activemq =
 
activeMQComponent(vm://localhost?broker.persistent=falsebroker.useJmx=falsejms.redeliveryPolicy.maximumRedeliveries=0
 
   + 
jms.redeliveryPolicy.initialRedeliveryDelay=500jms.useAsyncSend=falsejms.sendTimeout=1
   + 
jms.maxReconnectAttempts=1jms.timeout=3000);