Repository: samza Updated Branches: refs/heads/master c9cc0368f -> ad23e69b7
SAMZA-837 Support Gradle 2.9 Project: http://git-wip-us.apache.org/repos/asf/samza/repo Commit: http://git-wip-us.apache.org/repos/asf/samza/commit/ad23e69b Tree: http://git-wip-us.apache.org/repos/asf/samza/tree/ad23e69b Diff: http://git-wip-us.apache.org/repos/asf/samza/diff/ad23e69b Branch: refs/heads/master Commit: ad23e69b73077e1d29323926d025756ae4a00f67 Parents: c9cc036 Author: Aleksandar Bircakovic <[email protected]> Authored: Thu Apr 14 21:42:26 2016 -0700 Committer: Navina Ramesh <[email protected]> Committed: Thu Apr 14 21:42:26 2016 -0700 ---------------------------------------------------------------------- .../apache/samza/storage/StorageEngineFactory.java | 16 ++++++++-------- .../MockCoordinatorStreamWrappedConsumer.java | 2 +- .../stream/TestCoordinatorStreamSystemConsumer.java | 4 +++- 3 files changed, 12 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/samza/blob/ad23e69b/samza-api/src/main/java/org/apache/samza/storage/StorageEngineFactory.java ---------------------------------------------------------------------- diff --git a/samza-api/src/main/java/org/apache/samza/storage/StorageEngineFactory.java b/samza-api/src/main/java/org/apache/samza/storage/StorageEngineFactory.java index 963ccf2..adb6264 100644 --- a/samza-api/src/main/java/org/apache/samza/storage/StorageEngineFactory.java +++ b/samza-api/src/main/java/org/apache/samza/storage/StorageEngineFactory.java @@ -47,12 +47,12 @@ public interface StorageEngineFactory<K, V> { * @return The storage engine instance. */ public StorageEngine getStorageEngine( - String storeName, - File storeDir, - Serde<K> keySerde, - Serde<V> msgSerde, - MessageCollector collector, - MetricsRegistry registry, - SystemStreamPartition changeLogSystemStreamPartition, - SamzaContainerContext containerContext); + String storeName, + File storeDir, + Serde<K> keySerde, + Serde<V> msgSerde, + MessageCollector collector, + MetricsRegistry registry, + SystemStreamPartition changeLogSystemStreamPartition, + SamzaContainerContext containerContext); } http://git-wip-us.apache.org/repos/asf/samza/blob/ad23e69b/samza-core/src/test/java/org/apache/samza/coordinator/stream/MockCoordinatorStreamWrappedConsumer.java ---------------------------------------------------------------------- diff --git a/samza-core/src/test/java/org/apache/samza/coordinator/stream/MockCoordinatorStreamWrappedConsumer.java b/samza-core/src/test/java/org/apache/samza/coordinator/stream/MockCoordinatorStreamWrappedConsumer.java index d7e8654..b50aa3c 100644 --- a/samza-core/src/test/java/org/apache/samza/coordinator/stream/MockCoordinatorStreamWrappedConsumer.java +++ b/samza-core/src/test/java/org/apache/samza/coordinator/stream/MockCoordinatorStreamWrappedConsumer.java @@ -101,7 +101,7 @@ public class MockCoordinatorStreamWrappedConsumer extends BlockingEnvelopeMap { @Override public Map<SystemStreamPartition, List<IncomingMessageEnvelope>> poll( - Set<SystemStreamPartition> systemStreamPartitions, long timeout) + Set<SystemStreamPartition> systemStreamPartitions, long timeout) throws InterruptedException { if (blockpollFlag) { http://git-wip-us.apache.org/repos/asf/samza/blob/ad23e69b/samza-core/src/test/java/org/apache/samza/coordinator/stream/TestCoordinatorStreamSystemConsumer.java ---------------------------------------------------------------------- diff --git a/samza-core/src/test/java/org/apache/samza/coordinator/stream/TestCoordinatorStreamSystemConsumer.java b/samza-core/src/test/java/org/apache/samza/coordinator/stream/TestCoordinatorStreamSystemConsumer.java index 417772c..9499027 100644 --- a/samza-core/src/test/java/org/apache/samza/coordinator/stream/TestCoordinatorStreamSystemConsumer.java +++ b/samza-core/src/test/java/org/apache/samza/coordinator/stream/TestCoordinatorStreamSystemConsumer.java @@ -175,7 +175,9 @@ public class TestCoordinatorStreamSystemConsumer { assertEquals(expectedSystemStreamPartition, systemStreamPartition); } - public int getRegisterCount() { return registerCount; } + public int getRegisterCount() { + return registerCount; + } public Map<SystemStreamPartition, List<IncomingMessageEnvelope>> poll(Set<SystemStreamPartition> systemStreamPartitions, long timeout) throws InterruptedException { Map<SystemStreamPartition, List<IncomingMessageEnvelope>> map = new LinkedHashMap<SystemStreamPartition, List<IncomingMessageEnvelope>>();
