From c20cd6fc7fe5a7403584dc3e04f0b8412fa8db6f Mon Sep 17 00:00:00 2001
From: Clemens Valiente <clemens.valiente@trivago.com>
Date: Wed, 26 Jul 2017 17:07:55 +0200
Subject: [PATCH 1/2] make Merger extend Aggregator

---
 .../src/main/java/org/apache/kafka/streams/kstream/Merger.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/streams/src/main/java/org/apache/kafka/streams/kstream/Merger.java b/streams/src/main/java/org/apache/kafka/streams/kstream/Merger.java
index 6e6b01a21b6a5..2c60c505ac804 100644
--- a/streams/src/main/java/org/apache/kafka/streams/kstream/Merger.java
+++ b/streams/src/main/java/org/apache/kafka/streams/kstream/Merger.java
@@ -23,7 +23,7 @@
  * @param <K>   key type
  * @param <V>   aggregate value type
  */
-public interface Merger<K, V> {
+public interface Merger<K, V> extends Aggregator<K,V,V> {
 
     /**
      * Compute a new aggregate from the key and two aggregates.

From 1361e54eb9f2880e3487f0c5b8a954ef5f162573 Mon Sep 17 00:00:00 2001
From: Clemens Valiente <clemens.valiente@trivago.com>
Date: Wed, 26 Jul 2017 17:14:45 +0200
Subject: [PATCH 2/2] fix checkstyle :)

---
 .../src/main/java/org/apache/kafka/streams/kstream/Merger.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/streams/src/main/java/org/apache/kafka/streams/kstream/Merger.java b/streams/src/main/java/org/apache/kafka/streams/kstream/Merger.java
index 2c60c505ac804..2379266de4095 100644
--- a/streams/src/main/java/org/apache/kafka/streams/kstream/Merger.java
+++ b/streams/src/main/java/org/apache/kafka/streams/kstream/Merger.java
@@ -23,7 +23,7 @@
  * @param <K>   key type
  * @param <V>   aggregate value type
  */
-public interface Merger<K, V> extends Aggregator<K,V,V> {
+public interface Merger<K, V> extends Aggregator<K, V, V> {
 
     /**
      * Compute a new aggregate from the key and two aggregates.