You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2017/01/07 08:39:56 UTC
camel git commit: Fixed test due kafka upgrade. Thanks for the API
change Kafka
Repository: camel
Updated Branches:
refs/heads/camel-2.18.x 14c4c0aa0 -> e074e2796
Fixed test due kafka upgrade. Thanks for the API change Kafka
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/e074e279
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/e074e279
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/e074e279
Branch: refs/heads/camel-2.18.x
Commit: e074e2796e74359481e65bba80117098bdc89b5c
Parents: 14c4c0a
Author: Claus Ibsen <da...@apache.org>
Authored: Sat Jan 7 09:35:21 2017 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Sat Jan 7 09:39:48 2017 +0100
----------------------------------------------------------------------
.../camel/component/kafka/embedded/EmbeddedKafkaCluster.java | 3 ++-
.../org/apache/camel/component/kafka/embedded/SystemTime.java | 7 +++++++
2 files changed, 9 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/e074e279/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/embedded/EmbeddedKafkaCluster.java
----------------------------------------------------------------------
diff --git a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/embedded/EmbeddedKafkaCluster.java b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/embedded/EmbeddedKafkaCluster.java
index 37f3b21..5dd7377 100644
--- a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/embedded/EmbeddedKafkaCluster.java
+++ b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/embedded/EmbeddedKafkaCluster.java
@@ -29,6 +29,7 @@ import kafka.server.KafkaConfig;
import kafka.server.KafkaServer;
import kafka.utils.ZkUtils;
import scala.Option;
+import scala.collection.mutable.ArraySeq;
public class EmbeddedKafkaCluster {
private final List<Integer> ports;
@@ -123,7 +124,7 @@ public class EmbeddedKafkaCluster {
private KafkaServer startBroker(Properties props) {
- KafkaServer server = new KafkaServer(new KafkaConfig(props), new SystemTime(), Option.<String>empty());
+ KafkaServer server = new KafkaServer(new KafkaConfig(props), new SystemTime(), Option.<String>empty(), new ArraySeq<>(0));
server.startup();
return server;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/e074e279/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/embedded/SystemTime.java
----------------------------------------------------------------------
diff --git a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/embedded/SystemTime.java b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/embedded/SystemTime.java
index 7ad4965..630ca42 100644
--- a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/embedded/SystemTime.java
+++ b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/embedded/SystemTime.java
@@ -16,6 +16,8 @@
*/
package org.apache.camel.component.kafka.embedded;
+import java.util.concurrent.TimeUnit;
+
import kafka.utils.Time;
class SystemTime implements Time {
@@ -34,4 +36,9 @@ class SystemTime implements Time {
// Ignore
}
}
+
+ @Override
+ public long hiResClockMs() {
+ return TimeUnit.NANOSECONDS.toMillis(nanoseconds());
+ }
}